diff --git a/src/Mod/Part/BasicShapes/CommandShapes.py b/src/Mod/Part/BasicShapes/CommandShapes.py
index 03c776f427..8c0086b531 100644
--- a/src/Mod/Part/BasicShapes/CommandShapes.py
+++ b/src/Mod/Part/BasicShapes/CommandShapes.py
@@ -44,7 +44,7 @@ class CommandTube:
         return {'MenuText': Qt.QT_TRANSLATE_NOOP("Part_Tube","Create tube"),
                 'Accel': "",
                 'CmdType': "AlterDoc:Alter3DView:AlterSelection",
-                'Pixmap': "Part_Tube",
+                'Pixmap': "Part_Tube_Parametric",
                 'ToolTip': Qt.QT_TRANSLATE_NOOP("Part_Tube","Creates a tube")}
 
     def Activated(self):
diff --git a/src/Mod/Part/Gui/Command.cpp b/src/Mod/Part/Gui/Command.cpp
index 422daa40da..4290cf30c7 100644
--- a/src/Mod/Part/Gui/Command.cpp
+++ b/src/Mod/Part/Gui/Command.cpp
@@ -131,7 +131,7 @@ CmdPartBox2::CmdPartBox2()
     sToolTipText  = QT_TR_NOOP("Create a box solid without dialog");
     sWhatsThis    = "Part_Box2";
     sStatusTip    = sToolTipText;
-    sPixmap       = "Part_Box";
+    sPixmap       = "Part_Box_Parametric";
 }
 
 void CmdPartBox2::activated(int iMsg)
@@ -172,7 +172,7 @@ CmdPartBox3::CmdPartBox3()
     sToolTipText  = QT_TR_NOOP("Create a box solid without dialog");
     sWhatsThis    = "Part_Box3";
     sStatusTip    = sToolTipText;
-    sPixmap       = "Part_Box";
+    sPixmap       = "Part_Box_Parametric";
 }
 
 void CmdPartBox3::activated(int iMsg)
@@ -1059,7 +1059,7 @@ CmdPartImportCurveNet::CmdPartImportCurveNet()
     sToolTipText= QT_TR_NOOP("Import a curve network");
     sWhatsThis  = "Part_ImportCurveNet";
     sStatusTip  = sToolTipText;
-    sPixmap     = "Part_Box";
+    sPixmap     = "Part_Box_Parametric";
 }
 
 void CmdPartImportCurveNet::activated(int iMsg)
diff --git a/src/Mod/Part/Gui/CommandParametric.cpp b/src/Mod/Part/Gui/CommandParametric.cpp
index 815b69617e..262f611597 100644
--- a/src/Mod/Part/Gui/CommandParametric.cpp
+++ b/src/Mod/Part/Gui/CommandParametric.cpp
@@ -66,7 +66,7 @@ CmdPartCylinder::CmdPartCylinder()
     sToolTipText  = QT_TR_NOOP("Create a Cylinder");
     sWhatsThis    = "Part_Cylinder";
     sStatusTip    = sToolTipText;
-    sPixmap       = "Part_Cylinder";
+    sPixmap       = "Part_Cylinder_Parametric";
 }
 
 void CmdPartCylinder::activated(int iMsg)
@@ -108,7 +108,7 @@ CmdPartBox::CmdPartBox()
     sToolTipText  = QT_TR_NOOP("Create a cube solid");
     sWhatsThis    = "Part_Box";
     sStatusTip    = sToolTipText;
-    sPixmap       = "Part_Box";
+    sPixmap       = "Part_Box_Parametric";
 }
 
 void CmdPartBox::activated(int iMsg)
@@ -150,7 +150,7 @@ CmdPartSphere::CmdPartSphere()
     sToolTipText  = QT_TR_NOOP("Create a sphere solid");
     sWhatsThis    = "Part_Sphere";
     sStatusTip    = sToolTipText;
-    sPixmap       = "Part_Sphere";
+    sPixmap       = "Part_Sphere_Parametric";
 }
 
 void CmdPartSphere::activated(int iMsg)
@@ -192,7 +192,7 @@ CmdPartCone::CmdPartCone()
     sToolTipText  = QT_TR_NOOP("Create a cone solid");
     sWhatsThis    = "Part_Cone";
     sStatusTip    = sToolTipText;
-    sPixmap       = "Part_Cone";
+    sPixmap       = "Part_Cone_Parametric";
 }
 
 void CmdPartCone::activated(int iMsg)
@@ -234,7 +234,7 @@ CmdPartTorus::CmdPartTorus()
     sToolTipText  = QT_TR_NOOP("Create a torus solid");
     sWhatsThis    = "Part_Torus";
     sStatusTip    = sToolTipText;
-    sPixmap       = "Part_Torus";
+    sPixmap       = "Part_Torus_Parametric";
 }
 
 void CmdPartTorus::activated(int iMsg)
diff --git a/src/Mod/Part/Gui/CommandSimple.cpp b/src/Mod/Part/Gui/CommandSimple.cpp
index 16e9936fe0..fb156b524d 100644
--- a/src/Mod/Part/Gui/CommandSimple.cpp
+++ b/src/Mod/Part/Gui/CommandSimple.cpp
@@ -57,7 +57,7 @@ CmdPartSimpleCylinder::CmdPartSimpleCylinder()
     sToolTipText  = QT_TR_NOOP("Create a Cylinder");
     sWhatsThis    = "Part_SimpleCylinder";
     sStatusTip    = sToolTipText;
-    sPixmap       = "Part_Cylinder";
+    sPixmap       = "Part_Cylinder_Parametric";
 }
 
 void CmdPartSimpleCylinder::activated(int iMsg)
diff --git a/src/Mod/Part/Gui/Resources/Part.qrc b/src/Mod/Part/Gui/Resources/Part.qrc
index e4b86645ea..d9cdb30c36 100644
--- a/src/Mod/Part/Gui/Resources/Part.qrc
+++ b/src/Mod/Part/Gui/Resources/Part.qrc
@@ -21,14 +21,8 @@
         <file>icons/booleans/Part_XOR.svg</file>
     </qresource>
     <qresource>
-        <file>icons/create/Part_Box.svg</file>
-        <file>icons/create/Part_Cone.svg</file>
-        <file>icons/create/Part_Cylinder.svg</file>
         <file>icons/create/Part_Primitives.svg</file>
         <file>icons/create/Part_Shapebuilder.svg</file>
-        <file>icons/create/Part_Sphere.svg</file>
-        <file>icons/create/Part_Torus.svg</file>
-        <file>icons/create/Part_Tube.svg</file>
     </qresource>
     <qresource>
         <file>icons/parametric/Part_Box_Parametric.svg</file>
diff --git a/src/Mod/Part/Gui/Resources/icons/create/Part_Box.svg b/src/Mod/Part/Gui/Resources/icons/create/Part_Box.svg
deleted file mode 100644
index 35d69df517..0000000000
--- a/src/Mod/Part/Gui/Resources/icons/create/Part_Box.svg
+++ /dev/null
@@ -1,70 +0,0 @@
-<?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" 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="svg2980" sodipodi:version="0.32" inkscape:version="0.48.5 r10040" sodipodi:docname="PartWorkbench.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape" version="1.1">
-  <defs id="defs2982">
-    <linearGradient inkscape:collect="always" id="linearGradient3794">
-      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop3796"/>
-      <stop style="stop-color:#000000;stop-opacity:0;" offset="1" id="stop3798"/>
-    </linearGradient>
-    <linearGradient id="linearGradient3864">
-      <stop id="stop3866" offset="0" style="stop-color:#71b2f8;stop-opacity:1;"/>
-      <stop id="stop3868" 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="perspective2988"/>
-    <linearGradient gradientTransform="translate(0,-4)" inkscape:collect="always" xlink:href="#linearGradient3767" id="linearGradient3773" x1="22.116516" y1="55.717518" x2="17.328547" y2="21.31134" gradientUnits="userSpaceOnUse"/>
-    <linearGradient inkscape:collect="always" id="linearGradient3767">
-      <stop style="stop-color:#edd400;stop-opacity:1" offset="0" id="stop3769"/>
-      <stop style="stop-color:#fce94f;stop-opacity:1" offset="1" id="stop3771"/>
-    </linearGradient>
-    <linearGradient gradientTransform="translate(0,-4)" inkscape:collect="always" xlink:href="#linearGradient3777" id="linearGradient3783" x1="53.896763" y1="51.179787" x2="47.502235" y2="21.83742" gradientUnits="userSpaceOnUse"/>
-    <linearGradient inkscape:collect="always" id="linearGradient3777">
-      <stop style="stop-color:#c4a000;stop-opacity:1" offset="0" id="stop3779"/>
-      <stop style="stop-color:#edd400;stop-opacity:1" offset="1" id="stop3781"/>
-    </linearGradient>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3794" id="radialGradient3800" cx="1" cy="45" fx="1" fy="45" r="41" gradientTransform="matrix(0.93348213,-2.2905276e-8,0,0.28687573,0.06651751,32.090592)" gradientUnits="userSpaceOnUse"/>
-  </defs>
-  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="5.9632948" inkscape:cx="27.839479" inkscape:cy="40.869908" inkscape:current-layer="layer1" showgrid="true" inkscape:document-units="px" inkscape:grid-bbox="true" inkscape:window-width="800" inkscape:window-height="836" inkscape:window-x="0" inkscape:window-y="27" inkscape:snap-bbox="true" inkscape:snap-nodes="false" inkscape:window-maximized="0">
-    <inkscape:grid type="xygrid" id="grid2991" empspacing="2" visible="true" enabled="true" snapvisiblegridlinesonly="true"/>
-  </sodipodi:namedview>
-  <metadata id="metadata2985">
-    <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_Box</dc:title>
-        <dc:date>2011-10-10</dc:date>
-        <dc:relation>https://www.freecad.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_Box.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">
-    <path style="fill:#fce94f;stroke:#302b00;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" d="M 3,13 37,19 61,11 31,7 z" id="path2993" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
-    <path style="fill:url(#linearGradient3783);fill-opacity:1;stroke:#302b00;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" d="M 61,11 61,47 37,57 37,19 z" id="path2995" inkscape:connector-curvature="0"/>
-    <path inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc" id="path3825" d="M 3,13 37,19 37,57 3,51 z" style="fill:url(#linearGradient3773);fill-opacity:1;fill-rule:evenodd;stroke:#302b00;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"/>
-    <path style="fill:none;stroke:#fce94f;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 5,15.42772 0.00867,33.919116 30.008671,5.268799 -0.0087,-33.933614 z" id="path3765" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
-    <path style="fill:none;stroke:#edd400;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 39.01243,20.433833 -0.01226,33.535301 20.001105,-8.300993 3.6e-4,-31.867363 z" id="path3775" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
-  </g>
-</svg>
diff --git a/src/Mod/Part/Gui/Resources/icons/create/Part_Cone.svg b/src/Mod/Part/Gui/Resources/icons/create/Part_Cone.svg
deleted file mode 100644
index 10f8f5990e..0000000000
--- a/src/Mod/Part/Gui/Resources/icons/create/Part_Cone.svg
+++ /dev/null
@@ -1,62 +0,0 @@
-<?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" 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_Cone.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape" version="1.1">
-  <defs id="defs2945">
-    <linearGradient id="linearGradient3011" inkscape:collect="always">
-      <stop id="stop3013" offset="0" style="stop-color:#fce94f;stop-opacity:1"/>
-      <stop id="stop3015" offset="1" style="stop-color:#c4a000;stop-opacity:1"/>
-    </linearGradient>
-    <linearGradient id="linearGradient3377">
-      <stop id="stop3379" offset="0" style="stop-color:#faff2b;stop-opacity:1;"/>
-      <stop id="stop3381" offset="1" style="stop-color:#ffaa00;stop-opacity:1;"/>
-    </linearGradient>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3377" id="radialGradient3713" gradientUnits="userSpaceOnUse" cx="271.96695" cy="103.54697" fx="271.96695" fy="103.54697" r="19.467436" gradientTransform="matrix(0.9271142,0.3747789,-0.7448337,1.8425422,97.364191,-190.34757)"/>
-    <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"/>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3809" id="radialGradient3815" cx="225.93762" cy="91.956673" fx="225.93762" fy="91.956673" r="22" gradientTransform="matrix(-1.4090915,3.8636359,-0.97565325,-0.35582669,693.7938,-749.33348)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient inkscape:collect="always" id="linearGradient3809">
-      <stop style="stop-color:#729fcf;stop-opacity:1" offset="0" id="stop3811"/>
-      <stop style="stop-color:#204a87;stop-opacity:1" offset="1" id="stop3813"/>
-    </linearGradient>
-    <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,437.08461,-816.22007)" gradientUnits="userSpaceOnUse" id="radialGradient3062" xlink:href="#linearGradient3011" inkscape:collect="always"/>
-  </defs>
-  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="7.2080078" inkscape:cx="58.23801" inkscape:cy="26.872187" inkscape:current-layer="layer1" 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="grid2990" 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:creator>
-          <cc:Agent>
-            <dc:title>[wmayer]</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:title>Part_Cone</dc:title>
-        <dc:date>2011-10-10</dc:date>
-        <dc:relation>https://www.freecad.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_Cone.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">
-    <path style="fill:url(#radialGradient3062);fill-opacity:1;stroke:#302b00;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" d="M 32,3 11,55.000002 c 0,8 42,8 42,0 z" id="path3039" inkscape:connector-curvature="0" sodipodi:nodetypes="cccc"/>
-    <path style="fill:none;stroke:#fce94f;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="M 32,8 13,55.000002 c 3,6 35,6 38,0 z" id="path3817" inkscape:connector-curvature="0" sodipodi:nodetypes="cccc"/>
-  </g>
-</svg>
diff --git a/src/Mod/Part/Gui/Resources/icons/create/Part_Cylinder.svg b/src/Mod/Part/Gui/Resources/icons/create/Part_Cylinder.svg
deleted file mode 100644
index 005992a355..0000000000
--- a/src/Mod/Part/Gui/Resources/icons/create/Part_Cylinder.svg
+++ /dev/null
@@ -1,65 +0,0 @@
-<?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" 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="svg2821" sodipodi:version="0.32" inkscape:version="0.48.5 r10040" sodipodi:docname="Part_Cylinder.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape" version="1.1">
-  <defs id="defs2823">
-    <linearGradient inkscape:collect="always" id="linearGradient3801">
-      <stop style="stop-color:#c4a000;stop-opacity:1" offset="0" id="stop3803"/>
-      <stop style="stop-color:#fce94f;stop-opacity:1" offset="1" id="stop3805"/>
-    </linearGradient>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3377" id="radialGradient3701" gradientUnits="userSpaceOnUse" cx="84.883324" cy="77.042847" fx="84.883324" fy="77.042847" r="19.467436" gradientTransform="matrix(2.8492421,1.2585119,-0.4040415,0.9147407,-125.84131,-100.25805)"/>
-    <linearGradient id="linearGradient3377">
-      <stop id="stop3379" offset="0" style="stop-color:#faff2b;stop-opacity:1;"/>
-      <stop id="stop3381" offset="1" style="stop-color:#ffaa00;stop-opacity:1;"/>
-    </linearGradient>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3377" id="radialGradient3699" gradientUnits="userSpaceOnUse" cx="76.383331" cy="94.369568" fx="76.383331" fy="94.369568" r="19.467436" gradientTransform="matrix(0.9818943,0.1894295,-0.4109427,2.1300924,40.163453,-121.11559)"/>
-    <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="perspective2829"/>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3801" id="linearGradient3807" x1="110" y1="35" x2="85" y2="35" gradientUnits="userSpaceOnUse" spreadMethod="reflect" gradientTransform="translate(-62,0)"/>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3801-5" id="linearGradient3807-7" x1="110" y1="35" x2="85" y2="35" gradientUnits="userSpaceOnUse" spreadMethod="reflect" gradientTransform="translate(-62,-16)"/>
-    <linearGradient inkscape:collect="always" id="linearGradient3801-5">
-      <stop style="stop-color:#c4a000;stop-opacity:1" offset="0" id="stop3803-3"/>
-      <stop style="stop-color:#fce94f;stop-opacity:1" offset="1" id="stop3805-5"/>
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="3.6040039" inkscape:cx="-26.570904" inkscape:cy="26.018042" inkscape:current-layer="layer1" 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="grid2992" empspacing="2" visible="true" enabled="true" snapvisiblegridlinesonly="true"/>
-  </sodipodi:namedview>
-  <metadata id="metadata2826">
-    <rdf:RDF>
-      <cc:Work rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>[wmayer]</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:title>Part_Cylinder</dc:title>
-        <dc:date>2011-10-10</dc:date>
-        <dc:relation>https://www.freecad.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_Cylinder.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">
-    <path style="fill:#fce94f;stroke:#302b00;stroke-width:1.99999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.5;stroke-opacity:1;stroke-dashoffset:20.4" d="m 55.000001,53 c 0,4.418278 -10.745166,8 -24,8 C 17.745168,61 7.000002,57.418278 7.000002,53 L 7,11 54.999999,11 z" id="path2994-3" inkscape:connector-curvature="0" sodipodi:nodetypes="sscccs"/>
-    <path style="fill:url(#linearGradient3807);fill-opacity:1;stroke:#fce94f;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.5;stroke-opacity:1;stroke-dashoffset:20.4" d="M 53,51.727273 C 53,55.743889 43.15027,59 31,59 18.849736,59 9.000001,55.743889 9.000001,51.727273 l -2e-6,-38 44.000001,0 z" id="path2994-3-6" inkscape:connector-curvature="0" sodipodi:nodetypes="sscccs"/>
-    <path style="fill:none;stroke:#fce94f;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.5;stroke-opacity:1;stroke-dashoffset:20.4" d="M 53,15.727273 C 51,19 43.15027,21 31,21 18.849736,21 12,19 9.000001,15.727273" id="path2994-3-6-9" inkscape:connector-curvature="0" sodipodi:nodetypes="csc"/>
-    <path sodipodi:type="arc" style="fill:#fce94f;stroke:#302b00;stroke-width:1.75;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.5;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:20.4" id="path2994" sodipodi:cx="-35" sodipodi:cy="25" sodipodi:rx="21" sodipodi:ry="7" d="m -14,25 a 21,7 0 1 1 -42,0 21,7 0 1 1 42,0 z" transform="matrix(1.1428571,0,0,1.1428571,71,-17.571428)"/>
-  </g>
-</svg>
diff --git a/src/Mod/Part/Gui/Resources/icons/create/Part_Sphere.svg b/src/Mod/Part/Gui/Resources/icons/create/Part_Sphere.svg
deleted file mode 100644
index 39a603b566..0000000000
--- a/src/Mod/Part/Gui/Resources/icons/create/Part_Sphere.svg
+++ /dev/null
@@ -1,71 +0,0 @@
-<?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" 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="svg2784" sodipodi:version="0.32" inkscape:version="0.48.5 r10040" sodipodi:docname="Part_Sphere.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape" version="1.1">
-  <defs id="defs2786">
-    <linearGradient id="linearGradient3377">
-      <stop id="stop3379" offset="0" style="stop-color:#faff2b;stop-opacity:1;"/>
-      <stop id="stop3381" offset="1" style="stop-color:#ffaa00;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="perspective2792"/>
-    <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter3871" x="-0.45363569" width="1.9072714" y="-0.45363569" height="1.9072714">
-      <feGaussianBlur inkscape:collect="always" stdDeviation="9.8975056" id="feGaussianBlur3873"/>
-    </filter>
-    <linearGradient id="linearGradient3600">
-      <stop style="stop-color:#fce94f;stop-opacity:1" offset="0" id="stop3602"/>
-      <stop style="stop-color:#c4a000;stop-opacity:1" offset="1" id="stop3604"/>
-    </linearGradient>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3836-0-6-92-4-62" id="linearGradient3801-1-3-14-0-35" gradientUnits="userSpaceOnUse" x1="-18" y1="18" x2="-22" y2="5" gradientTransform="matrix(0.76342439,0,0,0.75750425,-4.596389,2.7525637)"/>
-    <linearGradient id="linearGradient3836-0-6-92-4-62">
-      <stop style="stop-color:#a40000;stop-opacity:1" offset="0" id="stop3838-2-7-06-8-9"/>
-      <stop style="stop-color:#ef2929;stop-opacity:1" offset="1" id="stop3840-5-5-8-7-1"/>
-    </linearGradient>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3836-0-6-92-4-6" id="linearGradient3801-1-3-14-0-3" gradientUnits="userSpaceOnUse" x1="-18" y1="18" x2="-22" y2="5" gradientTransform="matrix(0.76342439,0,0,0.75750425,-4.596389,2.7525637)"/>
-    <linearGradient id="linearGradient3836-0-6-92-4-6">
-      <stop style="stop-color:#a40000;stop-opacity:1" offset="0" id="stop3838-2-7-06-8-7"/>
-      <stop style="stop-color:#ef2929;stop-opacity:1" offset="1" id="stop3840-5-5-8-7-5"/>
-    </linearGradient>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3600" id="radialGradient3808" cx="20.802507" cy="18.626959" fx="20.802507" fy="18.626959" r="27.084639" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.66666671,0.70000004,-1.3510775,1.2867404,32.100634,-19.902858)"/>
-  </defs>
-  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="18.145532" inkscape:cx="44.097702" inkscape:cy="11.993139" inkscape:current-layer="layer1" showgrid="true" inkscape:document-units="px" inkscape:grid-bbox="true" inkscape:window-width="1600" inkscape:window-height="873" inkscape:window-x="0" inkscape:window-y="27" inkscape:window-maximized="1" inkscape:snap-bbox="false" inkscape:snap-nodes="true">
-    <inkscape:grid type="xygrid" id="grid2990" empspacing="2" visible="true" enabled="true" snapvisiblegridlinesonly="true"/>
-  </sodipodi:namedview>
-  <metadata id="metadata2789">
-    <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_Sphere</dc:title>
-        <dc:date>2011-10-10</dc:date>
-        <dc:relation>https://www.freecad.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_Sphere.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">
-    <path sodipodi:type="arc" style="color:#000000;fill:url(#radialGradient3808);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:1.80564272000000003;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" id="path2826" sodipodi:cx="31.636364" sodipodi:cy="30.363636" sodipodi:rx="26.181818" sodipodi:ry="26.181818" d="m 57.818182,30.363636 a 26.181818,26.181818 0 1 1 -52.363636,0 26.181818,26.181818 0 1 1 52.363636,0 z" transform="matrix(1.1076389,0,0,1.1076389,-3.0416672,-1.6319442)"/>
-    <path sodipodi:type="arc" style="color:#000000;fill:none;stroke:#fce94f;stroke-width:1.93939412000000000;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" id="path2826-4" sodipodi:cx="31.636364" sodipodi:cy="30.363636" sodipodi:rx="26.181818" sodipodi:ry="26.181818" d="m 57.818182,30.363636 a 26.181818,26.181818 0 1 1 -52.363636,0 26.181818,26.181818 0 1 1 52.363636,0 z" transform="matrix(1.03125,0,0,1.03125,-0.62500046,0.68750048)"/>
-    <path sodipodi:type="arc" style="color:#000000;fill:none;stroke:#302b00;stroke-width:1.80564272000000003;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" id="path2826-5" sodipodi:cx="31.636364" sodipodi:cy="30.363636" sodipodi:rx="26.181818" sodipodi:ry="26.181818" d="m 57.818182,30.363636 a 26.181818,26.181818 0 1 1 -52.363636,0 26.181818,26.181818 0 1 1 52.363636,0 z" transform="matrix(1.1076389,0,0,1.1076389,-3.0416672,-1.631944)"/>
-  </g>
-</svg>
diff --git a/src/Mod/Part/Gui/Resources/icons/create/Part_Torus.svg b/src/Mod/Part/Gui/Resources/icons/create/Part_Torus.svg
deleted file mode 100644
index ee69daf84e..0000000000
--- a/src/Mod/Part/Gui/Resources/icons/create/Part_Torus.svg
+++ /dev/null
@@ -1,104 +0,0 @@
-<?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" 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="svg2901" sodipodi:version="0.32" inkscape:version="0.48.5 r10040" sodipodi:docname="Tree_Part_Torus_Parametric.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape" version="1.1">
-  <defs id="defs2903">
-    <linearGradient inkscape:collect="always" id="linearGradient3826">
-      <stop style="stop-color:#fce94f;stop-opacity:1" offset="0" id="stop3828"/>
-      <stop style="stop-color:#c4a000;stop-opacity:1" offset="1" id="stop3830"/>
-    </linearGradient>
-    <linearGradient id="linearGradient3763">
-      <stop style="stop-color:#71b2f8;stop-opacity:1;" offset="0" id="stop3765"/>
-      <stop style="stop-color:#002795;stop-opacity:1;" offset="1" id="stop3767"/>
-    </linearGradient>
-    <linearGradient id="linearGradient3273">
-      <stop id="stop3275" offset="0" style="stop-color:#71b2f8;stop-opacity:1;"/>
-      <stop id="stop3277" offset="1" style="stop-color:#71b2f8;stop-opacity:0.01568628;"/>
-    </linearGradient>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3273" id="radialGradient3590" cx="235.36554" cy="100.66685" fx="235.36554" fy="100.66685" r="12.369295" gradientTransform="matrix(1.0443156,-0.09990741,0.05709833,0.596839,-16.178266,64.099723)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient id="linearGradient3377">
-      <stop id="stop3379" offset="0" style="stop-color:#faff2b;stop-opacity:1;"/>
-      <stop id="stop3381" offset="1" style="stop-color:#ffaa00;stop-opacity:1;"/>
-    </linearGradient>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3763" id="radialGradient3711" gradientUnits="userSpaceOnUse" cx="210.14677" cy="90.154442" fx="210.14677" fy="90.154442" r="19.467436" gradientTransform="matrix(0.4753781,0.8155084,-1.8390522,1.0720245,273.2829,-177.15465)"/>
-    <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="perspective2909"/>
-    <radialGradient r="19.467436" fy="28.869568" fx="45.883327" cy="28.869568" cx="45.883327" gradientTransform="matrix(0.9452733,-0.32627961,0.32627961,0.9452733,-259.24878,22.335965)" gradientUnits="userSpaceOnUse" id="radialGradient4514" xlink:href="#linearGradient3377-3" inkscape:collect="always"/>
-    <linearGradient id="linearGradient3377-3">
-      <stop id="stop3379-8" offset="0" style="stop-color:#faff2b;stop-opacity:1;"/>
-      <stop id="stop3381-3" offset="1" style="stop-color:#ffaa00;stop-opacity:1;"/>
-    </linearGradient>
-    <linearGradient id="linearGradient3377-3-0">
-      <stop id="stop3379-8-4" offset="0" style="stop-color:#faff2b;stop-opacity:1;"/>
-      <stop id="stop3381-3-1" offset="1" style="stop-color:#ffaa00;stop-opacity:1;"/>
-    </linearGradient>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3377-3-0" id="radialGradient3907" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.3990463,-0.91693078,0.91693078,0.3990463,-85.814215,159.38744)" cx="45.883327" cy="28.869568" fx="45.883327" fy="28.869568" r="19.467436"/>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3273" id="radialGradient3016" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.1506979,0.14837255,-0.08606299,0.68919097,-220.79669,-72.063076)" cx="235.36554" cy="100.66685" fx="235.36554" fy="100.66685" r="12.369295"/>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3763" id="radialGradient3019" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.31084091,1.0411383,-2.2480376,0.7520029,150.97542,-272.43232)" cx="210.14677" cy="90.154442" fx="210.14677" fy="90.154442" r="19.467436"/>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3826" id="linearGradient3832" x1="10.202547" y1="20.352594" x2="29.541351" y2="54.686111" gradientUnits="userSpaceOnUse" spreadMethod="reflect"/>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3836-0-6-92-4-62" id="linearGradient3801-1-3-14-0-35" gradientUnits="userSpaceOnUse" x1="-18" y1="18" x2="-22" y2="5" gradientTransform="matrix(0.76342439,0,0,0.75750425,-4.596389,2.7525637)"/>
-    <linearGradient id="linearGradient3836-0-6-92-4-62">
-      <stop style="stop-color:#a40000;stop-opacity:1" offset="0" id="stop3838-2-7-06-8-9"/>
-      <stop style="stop-color:#ef2929;stop-opacity:1" offset="1" id="stop3840-5-5-8-7-1"/>
-    </linearGradient>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3836-0-6-92-4-62-5" id="linearGradient3801-1-3-14-0-35-7" gradientUnits="userSpaceOnUse" x1="-18" y1="18" x2="-22" y2="5" gradientTransform="matrix(0.76342439,0,0,0.75750425,-4.596389,2.7525637)"/>
-    <linearGradient id="linearGradient3836-0-6-92-4-62-5">
-      <stop style="stop-color:#a40000;stop-opacity:1" offset="0" id="stop3838-2-7-06-8-9-3"/>
-      <stop style="stop-color:#ef2929;stop-opacity:1" offset="1" id="stop3840-5-5-8-7-1-5"/>
-    </linearGradient>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3836-0-6-92-4-62-7" id="linearGradient3801-1-3-14-0-35-2" gradientUnits="userSpaceOnUse" x1="-18" y1="18" x2="-22" y2="5" gradientTransform="matrix(0.76342439,0,0,0.75750425,-4.596389,2.7525637)"/>
-    <linearGradient id="linearGradient3836-0-6-92-4-62-7">
-      <stop style="stop-color:#a40000;stop-opacity:1" offset="0" id="stop3838-2-7-06-8-9-0"/>
-      <stop style="stop-color:#ef2929;stop-opacity:1" offset="1" id="stop3840-5-5-8-7-1-9"/>
-    </linearGradient>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3836-0-6-92-4-62-1" id="linearGradient3801-1-3-14-0-35-26" gradientUnits="userSpaceOnUse" x1="-18" y1="18" x2="-22" y2="5" gradientTransform="matrix(0.76342439,0,0,0.75750425,-4.596389,2.7525637)"/>
-    <linearGradient id="linearGradient3836-0-6-92-4-62-1">
-      <stop style="stop-color:#a40000;stop-opacity:1" offset="0" id="stop3838-2-7-06-8-9-8"/>
-      <stop style="stop-color:#ef2929;stop-opacity:1" offset="1" id="stop3840-5-5-8-7-1-7"/>
-    </linearGradient>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3836-0-6-92-4-62-9" id="linearGradient3801-1-3-14-0-35-75" gradientUnits="userSpaceOnUse" x1="-18" y1="18" x2="-22" y2="5" gradientTransform="matrix(0.76342439,0,0,0.75750425,-4.596389,2.7525637)"/>
-    <linearGradient id="linearGradient3836-0-6-92-4-62-9">
-      <stop style="stop-color:#a40000;stop-opacity:1" offset="0" id="stop3838-2-7-06-8-9-2"/>
-      <stop style="stop-color:#ef2929;stop-opacity:1" offset="1" id="stop3840-5-5-8-7-1-2"/>
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="4.1613904" inkscape:cx="109.11406" inkscape:cy="61.386836" inkscape:current-layer="layer1" showgrid="true" inkscape:document-units="px" inkscape:grid-bbox="true" inkscape:window-width="1600" inkscape:window-height="873" inkscape:window-x="0" inkscape:window-y="27" inkscape:window-maximized="1" inkscape:snap-bbox="false" inkscape:snap-nodes="true" inkscape:snap-global="true">
-    <inkscape:grid type="xygrid" id="grid3017" empspacing="2" visible="true" enabled="true" snapvisiblegridlinesonly="true"/>
-  </sodipodi:namedview>
-  <metadata id="metadata2906">
-    <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_Torus</dc:title>
-        <dc:date>2011-10-10</dc:date>
-        <dc:relation>https://www.freecad.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_Torus.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">
-    <path style="fill:url(#linearGradient3832);fill-opacity:1;stroke:#302b00;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.50000000000000000;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:20.39999999999999858" d="M 32 13 C 15.983742 13 3 22.849736 3 35 C 3 47.150264 15.983742 57 32 57 C 48.016258 57 61 47.150264 61 35 C 61 22.849736 48.016258 13 32 13 z M 32 27 C 40.284271 27 47 30.134007 47 34 C 47 37.865993 40.284271 41 32 41 C 23.715729 41 17 37.865993 17 34 C 17 30.134007 23.715729 27 32 27 z " id="path3019"/>
-    <path inkscape:connector-curvature="0" style="fill:none;stroke:#fce94f;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.50000000000000000;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:20.39999999999999858" d="M 32,15 C 17.088312,15 5,23.954306 5,35 5,46.045694 17.088312,55 32,55 46.911688,55 59,46.045694 59,35 59,23.954306 46.911688,15 32,15 z m -0.994299,10.044301 c 13.922413,-0.179 17.882659,5.366352 17.882659,8.880891 0,3.51454 -4.10346,9.253215 -17.031272,9.109362 -11.637733,-0.129499 -16.899763,-5.677681 -16.899763,-9.192221 0,-3.514539 4.409998,-8.648397 16.048376,-8.798032 z" id="path3019-6" sodipodi:nodetypes="ssssssssss"/>
-  </g>
-</svg>
diff --git a/src/Mod/Part/Gui/Resources/icons/create/Part_Tube.svg b/src/Mod/Part/Gui/Resources/icons/create/Part_Tube.svg
deleted file mode 100644
index 62fbe9c215..0000000000
--- a/src/Mod/Part/Gui/Resources/icons/create/Part_Tube.svg
+++ /dev/null
@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<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:xlink="http://www.w3.org/1999/xlink"
-   version="1.1"
-   id="svg2821"
-   height="64px"
-   width="64px">
-  <defs
-     id="defs2823">
-    <linearGradient
-       id="linearGradient3801">
-      <stop
-         id="stop3803"
-         offset="0"
-         style="stop-color:#c4a000;stop-opacity:1" />
-      <stop
-         id="stop3805"
-         offset="1"
-         style="stop-color:#fce94f;stop-opacity:1" />
-    </linearGradient>
-    <radialGradient
-       gradientTransform="matrix(2.8492421,1.2585119,-0.4040415,0.9147407,-125.84131,-100.25805)"
-       r="19.467436"
-       fy="77.042847"
-       fx="84.883324"
-       cy="77.042847"
-       cx="84.883324"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient3701"
-       xlink:href="#linearGradient3377" />
-    <linearGradient
-       id="linearGradient3377">
-      <stop
-         style="stop-color:#faff2b;stop-opacity:1;"
-         offset="0"
-         id="stop3379" />
-      <stop
-         style="stop-color:#ffaa00;stop-opacity:1;"
-         offset="1"
-         id="stop3381" />
-    </linearGradient>
-    <radialGradient
-       gradientTransform="matrix(0.9818943,0.1894295,-0.4109427,2.1300924,40.163453,-121.11559)"
-       r="19.467436"
-       fy="94.369568"
-       fx="76.383331"
-       cy="94.369568"
-       cx="76.383331"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient3699"
-       xlink:href="#linearGradient3377" />
-    <linearGradient
-       gradientTransform="translate(-62,0)"
-       spreadMethod="reflect"
-       gradientUnits="userSpaceOnUse"
-       y2="35"
-       x2="85"
-       y1="35"
-       x1="110"
-       id="linearGradient3807"
-       xlink:href="#linearGradient3801" />
-    <linearGradient
-       gradientTransform="translate(-62,-16)"
-       spreadMethod="reflect"
-       gradientUnits="userSpaceOnUse"
-       y2="35"
-       x2="85"
-       y1="35"
-       x1="110"
-       id="linearGradient3807-7"
-       xlink:href="#linearGradient3801-5" />
-    <linearGradient
-       id="linearGradient3801-5">
-      <stop
-         id="stop3803-3"
-         offset="0"
-         style="stop-color:#c4a000;stop-opacity:1" />
-      <stop
-         id="stop3805-5"
-         offset="1"
-         style="stop-color:#fce94f;stop-opacity:1" />
-    </linearGradient>
-  </defs>
-  <metadata
-     id="metadata2826">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>[wmayer]</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:title></dc:title>
-        <dc:date>2011-10-10</dc:date>
-        <dc:relation>https://www.freecad.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_Cylinder.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">
-    <path
-       id="path2994-3"
-       d="m 55.000001,53 c 0,4.418278 -10.745166,8 -24,8 C 17.745168,61 7.000002,57.418278 7.000002,53 L 7,11 54.999999,11 z"
-       style="fill:#fce94f;stroke:#302b00;stroke-width:1.99999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.5;stroke-opacity:1;stroke-dashoffset:20.4" />
-    <path
-       id="path2994-3-6"
-       d="M 53,51.727273 C 53,55.743889 43.15027,59 31,59 18.849736,59 9.000001,55.743889 9.000001,51.727273 l -2e-6,-38 44.000001,0 z"
-       style="fill:url(#linearGradient3807);fill-opacity:1;stroke:#fce94f;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.5;stroke-opacity:1;stroke-dashoffset:20.4" />
-    <path
-       id="path2994-3-6-9"
-       d="M 53,15.727273 C 51,19 43.15027,21 31,21 18.849736,21 12,19 9.000001,15.727273"
-       style="fill:none;stroke:#fce94f;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.5;stroke-opacity:1;stroke-dashoffset:20.4" />
-    <path
-       transform="matrix(1.1428571,0,0,1.1428571,71,-17.571428)"
-       d="m -14,25 a 21,7 0 1 1 -42,0 21,7 0 1 1 42,0 z"
-       id="path2994"
-       style="fill:#fce94f;stroke:#302b00;stroke-width:1.75;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.5;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:20.4" />
-    <ellipse
-       ry="3.3391562"
-       rx="13.913092"
-       cy="10.815742"
-       cx="31.204308"
-       style="fill:#c4a000;fill-opacity:1;stroke:#302b00;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.5;stroke-dasharray:none;stroke-dashoffset:20.4;stroke-opacity:1"
-       id="path2994-0" />
-  </g>
-</svg>
diff --git a/src/Mod/PartDesign/Gui/Workbench.cpp b/src/Mod/PartDesign/Gui/Workbench.cpp
index 539f856705..d65f7f3913 100644
--- a/src/Mod/PartDesign/Gui/Workbench.cpp
+++ b/src/Mod/PartDesign/Gui/Workbench.cpp
@@ -279,7 +279,7 @@ void Workbench::activated()
         "SELECT Part::Feature SUBELEMENT Vertex COUNT 1..",
         Vertex,
         "Vertex tools",
-        "Part_Box"
+        "Part_Box_Parametric"
     ));
 
     const char* Edge[] = {
@@ -294,7 +294,7 @@ void Workbench::activated()
         "SELECT Part::Feature SUBELEMENT Edge COUNT 1..",
         Edge,
         "Edge tools",
-        "Part_Box"
+        "Part_Box_Parametric"
     ));
 
     const char* Face[] = {
@@ -312,7 +312,7 @@ void Workbench::activated()
         "SELECT Part::Feature SUBELEMENT Face COUNT 1",
         Face,
         "Face tools",
-        "Part_Box"
+        "Part_Box_Parametric"
     ));
 
     const char* Body[] = {
@@ -322,7 +322,7 @@ void Workbench::activated()
         "SELECT PartDesign::Body COUNT 1",
         Body,
         "Start Body",
-        "Part_Box"
+        "Part_Box_Parametric"
     ));
 
     const char* Body2[] = {
@@ -332,7 +332,7 @@ void Workbench::activated()
         "SELECT PartDesign::Body COUNT 1..",
         Body2,
         "Start Boolean",
-        "Part_Box"
+        "Part_Box_Parametric"
     ));
 
     const char* Plane1[] = {
@@ -346,7 +346,7 @@ void Workbench::activated()
         "SELECT App::Plane COUNT 1",
         Plane1,
         "Start Part",
-        "Part_Box"
+        "Part_Box_Parametric"
     ));
     const char* Plane2[] = {
         "PartDesign_NewSketch",
@@ -359,7 +359,7 @@ void Workbench::activated()
         "SELECT PartDesign::Plane COUNT 1",
         Plane2,
         "Start Part",
-        "Part_Box"
+        "Part_Box_Parametric"
     ));
 
     const char* Line[] = {
@@ -371,7 +371,7 @@ void Workbench::activated()
         "SELECT PartDesign::Line COUNT 1",
         Line,
         "Start Part",
-        "Part_Box"
+        "Part_Box_Parametric"
     ));
 
     const char* Point[] = {
@@ -384,7 +384,7 @@ void Workbench::activated()
         "SELECT PartDesign::Point COUNT 1",
         Point,
         "Start Part",
-        "Part_Box"
+        "Part_Box_Parametric"
     ));
 
     const char* NoSel[] = {
@@ -393,7 +393,7 @@ void Workbench::activated()
     Watcher.push_back(new Gui::TaskView::TaskWatcherCommandsEmptySelection(
         NoSel,
         "Start Part",
-        "Part_Box"
+        "Part_Box_Parametric"
     ));
 
     const char* Faces[] = {
@@ -406,7 +406,7 @@ void Workbench::activated()
         "SELECT Part::Feature SUBELEMENT Face COUNT 2..",
         Faces,
         "Face tools",
-        "Part_Box"
+        "Part_Box_Parametric"
     ));
 
     const char* Sketch[] = {
@@ -427,7 +427,7 @@ void Workbench::activated()
         "SELECT Sketcher::SketchObject COUNT 1",
         Sketch,
         "Sketch tools",
-        "Part_Box"
+        "Part_Box_Parametric"
     ));
 
     const char* Transformed[] = {
diff --git a/src/Mod/TemplatePyMod/TaskPanel.py b/src/Mod/TemplatePyMod/TaskPanel.py
index cc8e301aaa..f18b1167aa 100644
--- a/src/Mod/TemplatePyMod/TaskPanel.py
+++ b/src/Mod/TemplatePyMod/TaskPanel.py
@@ -30,7 +30,7 @@ class TaskWatcherFilter:
         self.commands = ["Sketcher_NewSketch", "PartDesign_Fillet", "PartDesign_Chamfer"]
         self.filter = "SELECT Part::Feature SUBELEMENT Face COUNT 1"
         self.title = "Face tools"
-        self.icon = "Part_Box"
+        self.icon = "Part_Box_Parametric"
 
 class TaskPanel:
     def __init__(self):