diff --git a/src/Mod/Path/CMakeLists.txt b/src/Mod/Path/CMakeLists.txt
index 736b8ba82e..31aa0f66c8 100644
--- a/src/Mod/Path/CMakeLists.txt
+++ b/src/Mod/Path/CMakeLists.txt
@@ -89,7 +89,6 @@ SET(PathScripts_SRCS
     PathScripts/PathUtils.py
     PathScripts/PathSimulatorGui.py
     PathScripts/PostUtils.py
-    PathScripts/TaskPathSimulator.ui
     PathScripts/__init__.py
 )
 
diff --git a/src/Mod/Path/Gui/Resources/Path.qrc b/src/Mod/Path/Gui/Resources/Path.qrc
index 23cd4b8f89..6f8a10d0eb 100644
--- a/src/Mod/Path/Gui/Resources/Path.qrc
+++ b/src/Mod/Path/Gui/Resources/Path.qrc
@@ -53,6 +53,11 @@
         <file>icons/Path-Area-View.svg</file>
         <file>icons/Path-Area-Workplane.svg</file>
         <file>icons/Path-Simulator.svg</file>
+        <file>icons/Path-BFastForward.svg</file>
+        <file>icons/Path-BPause.svg</file>
+        <file>icons/Path-BPlay.svg</file>
+        <file>icons/Path-BStep.svg</file>
+        <file>icons/Path-BStop.svg</file>
         <file>icons/preferences-path.svg</file>
         <file>panels/DlgJobChooser.ui</file>
         <file>panels/DlgJobCreate.ui</file>
@@ -79,6 +84,7 @@
         <file>panels/PointEdit.ui</file>
         <file>panels/ToolEdit.ui</file>
         <file>panels/ToolLibraryEditor.ui</file>
+        <file>panels/TaskPathSimulator.ui</file>
         <file>preferences/PathDressupHoldingTags.ui</file>
         <file>preferences/PathJob.ui</file>
         <file>translations/Path_af.qm</file>
diff --git a/src/Mod/Path/Gui/Resources/icons/Path-BFastForward.svg b/src/Mod/Path/Gui/Resources/icons/Path-BFastForward.svg
new file mode 100644
index 0000000000..17ecb90d4b
--- /dev/null
+++ b/src/Mod/Path/Gui/Resources/icons/Path-BFastForward.svg
@@ -0,0 +1,118 @@
+<?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="48"
+   height="48"
+   viewBox="0 0 12.7 12.7"
+   version="1.1"
+   id="svg8"
+   sodipodi:docname="BFastForward.svg"
+   inkscape:version="0.92.1 r15371">
+  <defs
+     id="defs2">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4495">
+      <stop
+         style="stop-color:#808080;stop-opacity:1"
+         offset="0"
+         id="stop4491" />
+      <stop
+         style="stop-color:#999999;stop-opacity:0;"
+         offset="1"
+         id="stop4493" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4495"
+       id="linearGradient4499"
+       gradientUnits="userSpaceOnUse"
+       x1="5.6006212"
+       y1="287.26596"
+       x2="3.0606213"
+       y2="291.39935"
+       gradientTransform="matrix(0.37684731,0,0,1,7.1020319,0.32736376)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4495"
+       id="linearGradient5205"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.37684731,0,0,1,1.6035424,0.32736376)"
+       x1="5.6006212"
+       y1="287.26596"
+       x2="3.0606213"
+       y2="291.39935" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="8.3854167"
+     inkscape:cx="21.031561"
+     inkscape:cy="20.381051"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     showguides="false"
+     inkscape:window-width="1680"
+     inkscape:window-height="987"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:snap-nodes="false" />
+  <metadata
+     id="metadata5">
+    <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
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-284.29998)">
+    <path
+       style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.32291663;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 7.4658885,295.38403 v -9.41289 l 3.4485725,4.67196 z"
+       id="path4485"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="fill:url(#linearGradient4499);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.16242212px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 7.5003666,290.52771 -0.019743,-2.9975 c 0,0 -0.066844,-0.79266 0.2868112,-0.88349 0.239548,-0.0615 0.7084599,0.70994 0.7084599,0.70994 0,0 1.293258,1.77771 1.7949753,2.49267 0.333335,0.67295 -0.231866,0.70994 -0.231866,0.70994 z"
+       id="path4489"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccscccc" />
+    <path
+       style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.32291663;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 1.967399,295.38403 v -9.41289 l 3.448572,4.67196 z"
+       id="path4485-3"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="fill:url(#linearGradient5205);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.16242212px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 2.0018771,290.52771 -0.019743,-2.9975 c 0,0 -0.066844,-0.79266 0.2868112,-0.88349 0.239548,-0.0615 0.7084599,0.70994 0.7084599,0.70994 0,0 1.293258,1.77771 1.7949753,2.49267 0.3333345,0.67295 -0.231866,0.70994 -0.231866,0.70994 z"
+       id="path4489-4"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccscccc" />
+  </g>
+</svg>
diff --git a/src/Mod/Path/Gui/Resources/icons/Path-BPause.svg b/src/Mod/Path/Gui/Resources/icons/Path-BPause.svg
new file mode 100644
index 0000000000..439edcd6b7
--- /dev/null
+++ b/src/Mod/Path/Gui/Resources/icons/Path-BPause.svg
@@ -0,0 +1,121 @@
+<?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="48"
+   height="48"
+   viewBox="0 0 12.7 12.7"
+   version="1.1"
+   id="svg8"
+   sodipodi:docname="BPause.svg"
+   inkscape:version="0.92.1 r15371">
+  <defs
+     id="defs2">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4495">
+      <stop
+         style="stop-color:#808080;stop-opacity:1"
+         offset="0"
+         id="stop4491" />
+      <stop
+         style="stop-color:#999999;stop-opacity:0;"
+         offset="1"
+         id="stop4493" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4495"
+       id="linearGradient4499-8"
+       gradientUnits="userSpaceOnUse"
+       x1="5.6006212"
+       y1="287.26596"
+       x2="3.0606213"
+       y2="291.39935"
+       gradientTransform="matrix(0.60226968,0,0,1,2.9973516,-0.46564767)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4495"
+       id="linearGradient4499-8-0"
+       gradientUnits="userSpaceOnUse"
+       x1="5.6006212"
+       y1="287.26596"
+       x2="3.0606213"
+       y2="291.39935"
+       gradientTransform="matrix(0.60226968,0,0,1,7.0045565,-0.46567031)" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="8.3854167"
+     inkscape:cx="40.887462"
+     inkscape:cy="20.381051"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     showguides="false"
+     inkscape:window-width="1680"
+     inkscape:window-height="987"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata5">
+    <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
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-284.29998)">
+    <rect
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect4507"
+       width="2.0193791"
+       height="11.453665"
+       x="2.9975154"
+       y="284.84427"
+       ry="1.1043478" />
+    <path
+       style="fill:url(#linearGradient4499-8);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.20533264px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 3.633962,289.73469 0.0095,-3.62856 c 0,0 -0.071726,-0.67244 0.1710297,-0.72572 0.4498756,-0.0987 0.9083372,0.17876 0.8510261,1.08857 -0.067956,1.37009 0.2406352,2.77217 -0.287398,3.29727 z"
+       id="path4489-9"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccaccc" />
+    <rect
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect4507-5"
+       width="2.0193791"
+       height="11.453666"
+       x="7.0047202"
+       y="284.84427"
+       ry="1.1043478" />
+    <path
+       style="fill:url(#linearGradient4499-8-0);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.20533264px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 7.6411669,289.73467 0.0095,-3.62856 c 0,0 -0.071726,-0.67244 0.1710297,-0.72572 0.4498756,-0.0987 0.9083371,0.17876 0.8510261,1.08857 -0.067956,1.37009 0.2406351,2.77217 -0.287398,3.29727 z"
+       id="path4489-9-5"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccaccc" />
+  </g>
+</svg>
diff --git a/src/Mod/Path/Gui/Resources/icons/Path-BPlay.svg b/src/Mod/Path/Gui/Resources/icons/Path-BPlay.svg
new file mode 100644
index 0000000000..6cf1536fa6
--- /dev/null
+++ b/src/Mod/Path/Gui/Resources/icons/Path-BPlay.svg
@@ -0,0 +1,60 @@
+<?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"
+   width="48"
+   height="48"
+   viewBox="0 0 12.7 12.7"
+   version="1.1"
+   id="svg8">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="linearGradient4495">
+      <stop
+         style="stop-color:#808080;stop-opacity:1"
+         offset="0"
+         id="stop4491" />
+      <stop
+         style="stop-color:#999999;stop-opacity:0;"
+         offset="1"
+         id="stop4493" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#linearGradient4495"
+       id="linearGradient4499"
+       gradientUnits="userSpaceOnUse"
+       x1="5.6006212"
+       y1="287.26596"
+       x2="3.0606213"
+       y2="291.39935" />
+  </defs>
+  <metadata
+     id="metadata5">
+    <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"
+     transform="matrix(0.91816734,0,0,0.91816734,1.3643136,-260.40431)">
+    <path
+       style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.05833328;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 1.1201242,295.81675 v -10.4282 l 8.9136648,5.00112 z"
+       id="path4485" />
+    <path
+       style="fill:url(#linearGradient4499);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 1.0570186,290.20035 0.015776,-3.62856 c 0,0 0.050346,-0.61216 0.2839752,-0.72572 0.3112249,-0.15128 0.993913,0.29975 0.993913,0.29975 0,0 4.7267824,2.66119 6.0581364,3.37615 0.8845329,0.67295 -0.6152792,0.70994 -0.6152792,0.70994 z"
+       id="path4489" />
+  </g>
+</svg>
diff --git a/src/Mod/Path/Gui/Resources/icons/Path-BStep.svg b/src/Mod/Path/Gui/Resources/icons/Path-BStep.svg
new file mode 100644
index 0000000000..898b343ed1
--- /dev/null
+++ b/src/Mod/Path/Gui/Resources/icons/Path-BStep.svg
@@ -0,0 +1,118 @@
+<?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="48"
+   height="48"
+   viewBox="0 0 12.7 12.7"
+   version="1.1"
+   id="svg8"
+   sodipodi:docname="BStep.svg"
+   inkscape:version="0.92.1 r15371">
+  <defs
+     id="defs2">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4495">
+      <stop
+         style="stop-color:#808080;stop-opacity:1"
+         offset="0"
+         id="stop4491" />
+      <stop
+         style="stop-color:#999999;stop-opacity:0;"
+         offset="1"
+         id="stop4493" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4495"
+       id="linearGradient4499"
+       gradientUnits="userSpaceOnUse"
+       x1="5.6006212"
+       y1="287.26596"
+       x2="3.0606213"
+       y2="291.39935"
+       gradientTransform="matrix(0.60226969,0,0,1,5.2361606,0)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4495"
+       id="linearGradient4499-8"
+       gradientUnits="userSpaceOnUse"
+       x1="5.6006212"
+       y1="287.26596"
+       x2="3.0606213"
+       y2="291.39935"
+       gradientTransform="matrix(0.60226968,0,0,1,1.703687,-0.36311337)" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="8.3854167"
+     inkscape:cx="40.887462"
+     inkscape:cy="20.381051"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     showguides="false"
+     inkscape:window-width="1680"
+     inkscape:window-height="987"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata5">
+    <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
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-284.29998)">
+    <path
+       style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.82974553;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 5.8169018,295.81675 v -10.4282 l 5.4789992,5.00112 z"
+       id="path4485"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:url(#linearGradient4499);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.20533264px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 5.8727709,290.20035 0.0095,-3.62856 c 0,0 0.030321,-0.61216 0.1710297,-0.72572 0.1874413,-0.15128 0.5986037,0.29975 0.5986037,0.29975 0,0 2.8467977,2.66119 3.6486317,3.37615 0.532727,0.67295 -0.3705638,0.70994 -0.3705638,0.70994 z"
+       id="path4489"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccacccc" />
+    <rect
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect4507"
+       width="2.0193791"
+       height="11.453665"
+       x="1.7038509"
+       y="284.94681"
+       ry="1.1043478" />
+    <path
+       style="fill:url(#linearGradient4499-8);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.20533264px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 2.3402974,289.83723 0.0095,-3.62856 c 0,0 -0.071726,-0.67244 0.1710297,-0.72572 0.4498756,-0.0987 0.9083372,0.17876 0.8510261,1.08857 -0.067956,1.37009 0.2406352,2.77217 -0.287398,3.29727 z"
+       id="path4489-9"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccaccc" />
+  </g>
+</svg>
diff --git a/src/Mod/Path/Gui/Resources/icons/Path-BStop.svg b/src/Mod/Path/Gui/Resources/icons/Path-BStop.svg
new file mode 100644
index 0000000000..8ae4161a69
--- /dev/null
+++ b/src/Mod/Path/Gui/Resources/icons/Path-BStop.svg
@@ -0,0 +1,97 @@
+<?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="48"
+   height="48"
+   viewBox="0 0 12.7 12.7"
+   version="1.1"
+   id="svg8"
+   sodipodi:docname="BStop.svg"
+   inkscape:version="0.92.1 r15371">
+  <defs
+     id="defs2">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5233">
+      <stop
+         style="stop-color:#999999;stop-opacity:1;"
+         offset="0"
+         id="stop5229" />
+      <stop
+         style="stop-color:#999999;stop-opacity:0;"
+         offset="1"
+         id="stop5231" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5233"
+       id="linearGradient5235"
+       x1="8.6454659"
+       y1="287.28171"
+       x2="4.9853415"
+       y2="292.0462"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="8.3854167"
+     inkscape:cx="21.031561"
+     inkscape:cy="20.381051"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     showguides="false"
+     inkscape:window-width="1680"
+     inkscape:window-height="987"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:snap-nodes="false" />
+  <metadata
+     id="metadata5">
+    <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
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-284.29998)">
+    <rect
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.32291663;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect5211"
+       width="8.9609938"
+       height="9.1818638"
+       x="1.9878261"
+       y="286.1774"
+       ry="1.104347" />
+    <path
+       style="opacity:1;fill:url(#linearGradient5235);fill-opacity:1;stroke:none;stroke-width:1.32291663;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 4.0387567,287.1713 h 4.8591464 c 0.6118083,0 1.1043469,0.49254 1.1043469,1.10435 v 3.02909 H 2.9344095 v -3.02909 c 0,-0.61181 0.4925389,-1.10435 1.1043472,-1.10435 z"
+       id="rect5211-8"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="sssccss" />
+  </g>
+</svg>
diff --git a/src/Mod/Path/PathScripts/TaskPathSimulator.ui b/src/Mod/Path/Gui/Resources/panels/TaskPathSimulator.ui
similarity index 92%
rename from src/Mod/Path/PathScripts/TaskPathSimulator.ui
rename to src/Mod/Path/Gui/Resources/panels/TaskPathSimulator.ui
index 3a60df4f0c..b184337a6f 100644
--- a/src/Mod/Path/PathScripts/TaskPathSimulator.ui
+++ b/src/Mod/Path/Gui/Resources/panels/TaskPathSimulator.ui
@@ -39,7 +39,7 @@
        </property>
        <property name="icon">
         <iconset resource="Resources/CAM_Sim.qrc">
-         <normaloff>:/Icons/BStop.svg</normaloff>:/Icons/BStop.svg</iconset>
+         <normaloff>:/icons/Path-BStop.svg</normaloff>:/icons/Path-BStop.svg</iconset>
        </property>
        <property name="iconSize">
         <size>
@@ -59,7 +59,7 @@
        </property>
        <property name="icon">
         <iconset resource="Resources/CAM_Sim.qrc">
-         <normaloff>:/Icons/BPlay.svg</normaloff>:/Icons/BPlay.svg</iconset>
+         <normaloff>:/icons/Path-BPlay.svg</normaloff>:/icons/Path-BPlay.svg</iconset>
        </property>
        <property name="iconSize">
         <size>
@@ -79,7 +79,7 @@
        </property>
        <property name="icon">
         <iconset resource="Resources/CAM_Sim.qrc">
-         <normaloff>:/Icons/BPause.svg</normaloff>:/Icons/BPause.svg</iconset>
+         <normaloff>:/icons/Path-BPause.svg</normaloff>:/icons/Path-BPause.svg</iconset>
        </property>
        <property name="iconSize">
         <size>
@@ -99,7 +99,7 @@
        </property>
        <property name="icon">
         <iconset resource="Resources/CAM_Sim.qrc">
-         <normaloff>:/Icons/BStep.svg</normaloff>:/Icons/BStep.svg</iconset>
+         <normaloff>:/icons/Path-BStep.svg</normaloff>:/icons/Path-BStep.svg</iconset>
        </property>
        <property name="iconSize">
         <size>
@@ -119,7 +119,7 @@
        </property>
        <property name="icon">
         <iconset resource="Resources/CAM_Sim.qrc">
-         <normaloff>:/Icons/BFastForward.svg</normaloff>:/Icons/BFastForward.svg</iconset>
+         <normaloff>:/icons/Path-BFastForward.svg</normaloff>:/icons/Path-BFastForward.svg</iconset>
        </property>
        <property name="iconSize">
         <size>
diff --git a/src/Mod/Path/InitGui.py b/src/Mod/Path/InitGui.py
index d1a8dd317e..6f09f8b60d 100644
--- a/src/Mod/Path/InitGui.py
+++ b/src/Mod/Path/InitGui.py
@@ -73,10 +73,11 @@ class PathWorkbench (Workbench):
         from PathScripts import PathToolController
         from PathScripts import PathToolLenOffset
         from PathScripts import PathToolLibraryManager
+        from PathScripts import PathSimulatorGui
         import PathCommands
 
         # build commands list
-        projcmdlist = ["Path_Job", "Path_Post", "Path_Inspect", "Path_Sanity"]
+        projcmdlist = ["Path_Job", "Path_Post", "Path_Inspect", "Path_Sanity", "Path_Simulator"]
         toolcmdlist = ["Path_ToolLibraryEdit"]
         prepcmdlist = ["Path_Plane", "Path_Fixture", "Path_ToolLenOffset", "Path_Comment", "Path_Stop", "Path_Custom", "Path_Shape"]
         twodopcmdlist = ["Path_Contour", "Path_Profile_Faces", "Path_Profile_Edges", "Path_Pocket_Shape", "Path_Drilling", "Path_Engrave", "Path_MillFace", "Path_Helix"]
diff --git a/src/Mod/Path/PathScripts/PathSimulatorGui.py b/src/Mod/Path/PathScripts/PathSimulatorGui.py
index 0272feb44f..b8afe2cf7f 100644
--- a/src/Mod/Path/PathScripts/PathSimulatorGui.py
+++ b/src/Mod/Path/PathScripts/PathSimulatorGui.py
@@ -13,12 +13,11 @@ if FreeCAD.GuiUp:
     from PySide import QtGui, QtCore
 
 #compiled with pyrcc4 -py3 Resources\CAM_Sim.qrc -o CAM_Sim_rc.py
-import CAM_Sim_rc
        
 class CAMSimTaskUi:
     def __init__(self, parent):
         # this will create a Qt widget from our ui file
-        self.form = FreeCADGui.PySideUic.loadUi(_filePath + "/TaskPathSimulator.ui")
+        self.form = FreeCADGui.PySideUic.loadUi(":/panels/TaskPathSimulator.ui")
         self.parent = parent
 
     def accept(self):