diff --git a/src/Mod/Part/Gui/Command.cpp b/src/Mod/Part/Gui/Command.cpp
index 37be52474..2c5c49b13 100644
--- a/src/Mod/Part/Gui/Command.cpp
+++ b/src/Mod/Part/Gui/Command.cpp
@@ -203,7 +203,7 @@ CmdPartPrimitives::CmdPartPrimitives()
     sToolTipText  = QT_TR_NOOP("Creation of parametrized geometric primitives");
     sWhatsThis    = "Part_Primitives";
     sStatusTip    = sToolTipText;
-    sPixmap       = "Part_CreatePrimitives";
+    sPixmap       = "Part_CreatePrimitives.png";
 }
 
 void CmdPartPrimitives::activated(int iMsg)
@@ -890,6 +890,7 @@ CmdPartBuilder::CmdPartBuilder()
     sToolTipText  = QT_TR_NOOP("Advanced utility to create shapes");
     sWhatsThis    = sToolTipText;
     sStatusTip    = sToolTipText;
+    sPixmap       = "Part_Shapebuilder";
 }
 
 void CmdPartBuilder::activated(int iMsg)
diff --git a/src/Mod/Part/Gui/Makefile.am b/src/Mod/Part/Gui/Makefile.am
index c277b56ca..7329a30ab 100644
--- a/src/Mod/Part/Gui/Makefile.am
+++ b/src/Mod/Part/Gui/Makefile.am
@@ -191,6 +191,8 @@ EXTRA_DIST = \
 		Resources/icons/Part_Chamfer.svg \
 		Resources/icons/Part_Cut.svg \
 		Resources/icons/Part_Common.svg \
+		Resources/icons/Part_CreatePrimitives.png \
+		Resources/icons/Part_CreatePrimitives.svg \
 		Resources/icons/Part_Fuse.svg \
 		Resources/icons/Part_Section.svg \
 		Resources/icons/Part_Extrude.svg \
@@ -199,6 +201,10 @@ EXTRA_DIST = \
 		Resources/icons/Part_Import.svg \
 		Resources/icons/Part_Mirror.svg \
 		Resources/icons/Part_MirrorPNG.png \
+		Resources/icons/Part_RuledSurface.png \
+		Resources/icons/Part_Shapebuilder.png \
+		Resources/icons/Part_Shapebuilder.svg \
+		Resources/icons/Part_ShapeInfo.png \
 		Resources/icons/Tree_Part.svg \
 		Resources/icons/preferences-part_design.svg \
 		Resources/icons/PartFeature.svg \
diff --git a/src/Mod/Part/Gui/Resources/Part.qrc b/src/Mod/Part/Gui/Resources/Part.qrc
index 644540054..213e2c47a 100644
--- a/src/Mod/Part/Gui/Resources/Part.qrc
+++ b/src/Mod/Part/Gui/Resources/Part.qrc
@@ -9,7 +9,8 @@
         <file>icons/Part_Common.svg</file>
         <file>icons/Part_Cone.svg</file>
         <file>icons/Part_Cut.svg</file>
-        <file>icons/Part_CreatePrimitives.svg</file>        
+        <file>icons/Part_CreatePrimitives.png</file>
+        <file>icons/Part_CreatePrimitives.svg</file>
         <file>icons/Part_Cylinder.svg</file>
         <file>icons/Part_Extrude.svg</file>
         <file>icons/Part_Fillet.svg</file>
@@ -20,6 +21,7 @@
         <file>icons/Part_Revolve.svg</file>
         <file>icons/Part_RuledSurface.svg</file>
         <file>icons/Part_Section.svg</file>
+        <file>icons/Part_Shapebuilder.png</file>
         <file>icons/Part_ShapeInfo.svg</file>
         <file>icons/Part_Sphere.svg</file>
         <file>icons/Part_Torus.svg</file>
diff --git a/src/Mod/Part/Gui/Resources/icons/Part_CreatePrimitives.png b/src/Mod/Part/Gui/Resources/icons/Part_CreatePrimitives.png
new file mode 100644
index 000000000..a4d4cc809
Binary files /dev/null and b/src/Mod/Part/Gui/Resources/icons/Part_CreatePrimitives.png differ
diff --git a/src/Mod/Part/Gui/Resources/icons/Part_Shapebuilder.png b/src/Mod/Part/Gui/Resources/icons/Part_Shapebuilder.png
new file mode 100644
index 000000000..a0aef325b
Binary files /dev/null and b/src/Mod/Part/Gui/Resources/icons/Part_Shapebuilder.png differ
diff --git a/src/Mod/Part/Gui/Resources/icons/Part_Shapebuilder.svg b/src/Mod/Part/Gui/Resources/icons/Part_Shapebuilder.svg
new file mode 100644
index 000000000..a70a9ea18
--- /dev/null
+++ b/src/Mod/Part/Gui/Resources/icons/Part_Shapebuilder.svg
@@ -0,0 +1,329 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="64px"
+   height="64px"
+   id="svg2860"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.1 r9760"
+   sodipodi:docname="Part_Shapebuilder.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.1"
+   inkscape:export-filename="/home/user/Downloads/cad/freecad1_oce/mystuff/stuffchanged/newicons/Shape_builder/Part_Shapebuilder22.png"
+   inkscape:export-xdpi="30.9375"
+   inkscape:export-ydpi="30.9375">
+  <defs
+     id="defs2862">
+    <linearGradient
+       id="linearGradient3812"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop3814" />
+    </linearGradient>
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect4415"
+       is_visible="true" />
+    <linearGradient
+       id="linearGradient4362">
+      <stop
+         id="stop4364"
+         offset="0"
+         style="stop-color:#faff2b;stop-opacity:1;" />
+      <stop
+         id="stop4366"
+         offset="1"
+         style="stop-color:#ffaa00;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4356">
+      <stop
+         id="stop4358"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1;" />
+      <stop
+         id="stop4360"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3786">
+      <stop
+         style="stop-color:#faff2b;stop-opacity:1;"
+         offset="0"
+         id="stop3788" />
+      <stop
+         style="stop-color:#ffaa00;stop-opacity:1;"
+         offset="1"
+         id="stop3790" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3377"
+       id="radialGradient3692"
+       cx="45.883327"
+       cy="28.869568"
+       fx="45.883327"
+       fy="28.869568"
+       r="19.467436"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3377"
+       id="radialGradient3703"
+       gradientUnits="userSpaceOnUse"
+       cx="135.38333"
+       cy="97.369568"
+       fx="135.38333"
+       fy="97.369568"
+       r="19.467436"
+       gradientTransform="matrix(0.97435,0.2250379,-0.4623105,2.0016728,48.487554,-127.99883)" />
+    <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="#linearGradient3786"
+       id="radialGradient3705"
+       gradientUnits="userSpaceOnUse"
+       cx="148.88333"
+       cy="81.869568"
+       fx="148.88333"
+       fy="81.869568"
+       r="19.467436"
+       gradientTransform="matrix(1.3852588,-0.05136783,0.03705629,0.9993132,-60.392403,7.7040438)" />
+    <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="perspective2868" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3377-1"
+       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)" />
+    <linearGradient
+       id="linearGradient3377-1">
+      <stop
+         id="stop3379-5"
+         offset="0"
+         style="stop-color:#c8ff43;stop-opacity:1;" />
+      <stop
+         id="stop3381-9"
+         offset="1"
+         style="stop-color:#04aa00;stop-opacity:1;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3864"
+       id="radialGradient3784"
+       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
+       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>
+    <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="radialGradient3009"
+       xlink:href="#linearGradient3864"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4362"
+       id="linearGradient3784"
+       x1="259.61429"
+       y1="99.250221"
+       x2="317.44043"
+       y2="99.250221"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.71875"
+     inkscape:cx="32"
+     inkscape:cy="32"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     inkscape:window-width="1280"
+     inkscape:window-height="939"
+     inkscape:window-x="-2"
+     inkscape:window-y="-3"
+     inkscape:window-maximized="1"
+     showborder="true"
+     inkscape:showpageshadow="false" />
+  <metadata
+     id="metadata2865">
+    <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:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <g
+       id="g3618"
+       transform="matrix(0.63220856,0,0,0.63123234,-82.15775,-17.28678)">
+      <path
+         style="opacity:0.66523605;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.07586193;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 164.25407,125.89934 21.50437,-5.36633 5.55806,-5.36631 -9.85894,-1.43102 -17.20349,12.16366 z"
+         id="path3546"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:url(#radialGradient3705);fill-opacity:1;fill-rule:evenodd;stroke:#7b5600;stroke-width:2.20000005;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"
+         d="m 153.5571,77.341943 -20.48929,7.449581 30.49556,4.148871 -0.11442,36.178655 17.18957,-11.67182 0.036,-33.708918 z"
+         id="rect3522"
+         sodipodi:nodetypes="ccccccc"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:url(#radialGradient3703);fill-opacity:1;fill-rule:evenodd;stroke:#7b5600;stroke-width:2.20020413;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"
+         d="m 132.93292,84.863132 30.03396,4.311911 0.13497,35.801267 -30.17899,-5.19997 z"
+         id="rect3520"
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:url(#radialGradient3692);fill-opacity:1;fill-rule:evenodd;stroke:#7b5600;stroke-width:2.20000005;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"
+         d="m 163.40786,89.220007 17.13091,-9.219912"
+         id="path3536"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc" />
+    </g>
+    <path
+       inkscape:connector-curvature="0"
+       id="path3818"
+       d="m 36.95083,1.4778087 23.806507,0 0,2.7030572 -23.70731,0 z"
+       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1.70399261;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       sodipodi:nodetypes="ccccccccc"
+       id="path8643"
+       d="m 14.377826,9.193661 1.828438,4.032158 7.618711,-3.361117 1.881377,3.735652 L 31.971765,3.5859272 20.149006,1.9186229 21.971972,5.9387132 14.412865,9.270931 z"
+       style="color:#000000;fill:#cc0000;fill-opacity:1;fill-rule:evenodd;stroke:#a40000;stroke-width:0.69277561;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       style="color:#000000;fill:#cc0000;fill-opacity:1;fill-rule:evenodd;stroke:#a40000;stroke-width:0.70743012;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       d="m 55.848747,7.9278807 -4.926639,0 0.170667,7.3608343 -4.811056,-0.0818 7.245662,9.428686 7.034273,-9.324652 -4.799631,0.163598 0.0016,-7.5466674 z"
+       id="path3982"
+       sodipodi:nodetypes="ccccccccc" />
+    <g
+       id="g3800"
+       transform="matrix(1.327668,0,0,1.1594344,1.5888298,10.220787)">
+      <path
+         transform="matrix(1.6489112,0,0,1.5366301,-1.614021,-1.353813)"
+         sodipodi:end="6.2789351"
+         sodipodi:start="0"
+         d="m 6.0586667,5.4613333 c 0,1.0368226 -0.7067931,1.8773334 -1.5786667,1.8773334 -0.8718735,0 -1.5786667,-0.8405108 -1.5786667,-1.8773334 0,-1.0368226 0.7067932,-1.8773334 1.5786667,-1.8773334 0.8692544,0 1.5749579,0.8356557 1.5786524,1.8693543 L 4.48,5.4613333 z"
+         sodipodi:ry="1.8773334"
+         sodipodi:rx="1.5786667"
+         sodipodi:cy="5.4613333"
+         sodipodi:cx="4.48"
+         id="path3022"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.06771958;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         sodipodi:type="arc" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0"
+         id="path3792"
+         d="m 5.5086843,2.8885164 0,8.9233996 0.5129879,0 0,-8.9317352 z"
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:2.30800009;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0"
+         id="path3792-3"
+         d="m 1.8900902,7.6691387 7.8789308,-0.038486 0.00765,-0.674272 -7.8961957,0.03851 z"
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    </g>
+    <g
+       id="g4049"
+       transform="matrix(1.1586342,0,0,1.1811076,-10.980314,7.9420184)"
+       style="stroke:#000000;stroke-width:0.51290077;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none">
+      <path
+         inkscape:connector-curvature="0"
+         id="path3818-6"
+         d="m 43.654902,16.256 17.182504,0 0,1.450666 -17.11091,0 z"
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.51290077;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3818-4"
+         d="m 43.684289,31.701333 17.057237,0 0,1.450666 -16.986165,0 z"
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.51290077;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3818-7"
+         d="m 43.721393,33.039953 0.02388,-16.641221 1.450665,0.0015 -0.02378,16.571882 z"
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.51290077;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         sodipodi:nodetypes="cccccc"
+         inkscape:connector-curvature="0"
+         id="path3818-8"
+         d="m 59.445157,33.139934 -0.02098,-16.671905 1.450666,-0.0013 0.01626,12.920726 0.0046,3.681713 z"
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.51290077;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    </g>
+    <path
+       sodipodi:nodetypes="ccccccccc"
+       id="path3982-7"
+       d="m 59.473005,55.347851 -1.129287,-4.131256 -9.522615,2.780119 -1.277435,-4.364064 -6.797197,9.102352 10.465027,2.846661 -1.080078,-3.685418 9.317891,-2.630294 z"
+       style="color:#000000;fill:#cc0000;fill-opacity:1;fill-rule:evenodd;stroke:#a40000;stroke-width:0.68694234;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/src/Mod/Part/Gui/TaskShapeBuilder.cpp b/src/Mod/Part/Gui/TaskShapeBuilder.cpp
index 1171940d4..a3c2f3bfa 100644
--- a/src/Mod/Part/Gui/TaskShapeBuilder.cpp
+++ b/src/Mod/Part/Gui/TaskShapeBuilder.cpp
@@ -36,6 +36,7 @@
 #include "ViewProviderExt.h"
 
 #include <Gui/Application.h>
+#include <Gui/BitmapFactory.h>
 #include <Gui/Document.h>
 #include <Gui/Selection.h>
 #include <Gui/SelectionFilter.h>
@@ -379,7 +380,8 @@ TaskShapeBuilder::TaskShapeBuilder()
 {
     widget = new ShapeBuilderWidget();
     taskbox = new Gui::TaskView::TaskBox(
-        QPixmap(), widget->windowTitle(), true, 0);
+        Gui::BitmapFactory().pixmap("Part_Shapebuilder"),
+        widget->windowTitle(), true, 0);
     taskbox->groupLayout()->addWidget(widget);
     Content.push_back(taskbox);
 }