diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..4b780f37
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,36 @@
+# file types to ignore
+
+*.pyc
+*.obj
+*.lib
+*.pch
+*.vcproj
+*.exp
+*.dep
+*.manifest
+qrc_*.cpp
+BuildLog.htm
+cmake_install.cmake
+*~
+CMakeFiles/
+*qrc.depends
+ui_*.h
+moc_*.cpp
+Makefile
+CMakeCache.txt
+config.h
+install_manifest.txt
+/bin/
+/ALL_BUILD.dir/
+/doc/
+/lib/
+/Mod/
+/ZERO_CHECK.dir/
+/build/
+/src/Tools/offlinedoc/localwiki/
+/src/Tools/offlinedoc/*.txt
+OpenSCAD_rc.py
+.subuser-dev
+/\.idea/
+.tags
+tags
diff --git a/InitGui.py b/InitGui.py
index 199bbf24..0abbf587 100644
--- a/InitGui.py
+++ b/InitGui.py
@@ -51,38 +51,76 @@ def Initialize(self):
         import a2p_solversystem
         import a2p_MuxAssembly
 
-        commandslist = [
+        partCommands = [
             'a2p_ImportPart',
             'a2p_updateImportedParts',
             'a2p_movePart',
             'a2p_duplicatePart',
             'a2p_editImportedPart',
+            ]
+        constraintCommands = [
             'a2p_PointIdentityConnectionCommand',
             'a2p_PointOnLineConstraintCommand',
             'a2p_PointOnPlaneConstraintCommand',
             'a2p_CircularEdgeConnection',
+            'a2p_AxialConnection',
             'a2p_PlanesParallelConnectionCommand',
             'a2p_PlaneConnection',
-            'a2p_AxialConnection',
             'a2p_AngledPlanesCommand',
             'a2p_SphericalConnection',
-            'a2p_SolverCommand',
             'a2p_DeleteConnectionsCommand',
+            ]
+        solverCommands = [
+            'a2p_SolverCommand',
+            'a2p_ToggleAutoSolveCommand',
+            'a2p_TogglePartialProcessingCommand',
+            ]
+        viewCommands = [
             'a2p_ViewConnectionsCommand',
-            'a2p_SimpleAssemblyShapeCommand',
             'a2p_ToggleTransparencyCommand',
             'a2p_isolateCommand',
-            'a2p_ToggleAutoSolveCommand',
-            'a2p_TogglePartialProcessingCommand',
-            'a2p_repairTreeViewCommand'
             ]
-        menuEntries = [
+        miscCommands = [
+            'a2p_SimpleAssemblyShapeCommand',
             'a2p_repairTreeViewCommand'
             ]
+
         self.appendToolbar(
-               'A2p',
-               commandslist
+               'A2p_Part',
+               partCommands
                )
+        self.appendToolbar(
+               'A2p_Constraint',
+               constraintCommands
+               )
+        self.appendToolbar(
+               'A2p_Solver',
+               solverCommands
+               )
+        self.appendToolbar(
+               'A2p_View',
+               viewCommands
+               )
+        self.appendToolbar(
+               'A2p_Misc',
+               miscCommands
+               )
+
+        commandslist = list()
+        commandslist.extend(partCommands)
+        commandslist.extend(constraintCommands)
+        commandslist.extend(solverCommands)
+        commandslist.extend(viewCommands)
+        commandslist.extend(miscCommands)
+
+        self.appendMenu(
+            'A2p',
+            commandslist
+            )
+
+        menuEntries = [
+            'a2p_repairTreeViewCommand'
+            ]
         self.appendMenu(
             'A2p',
             menuEntries
diff --git a/a2p_AxialConnection.py b/a2p_AxialConnection.py
index 267770cf..ed4b7ca9 100644
--- a/a2p_AxialConnection.py
+++ b/a2p_AxialConnection.py
@@ -81,7 +81,7 @@ def parseSelection(selection, objectToUpdate=None):
         c.Proxy = ConstraintObjectProxy()
         c.ViewObject.Proxy = ConstraintViewProviderProxy(
             c,
-            path_a2p + '/icons/a2p_axialConstraint.svg',
+            path_a2p + '/icons/a2p_AxialConstraint.svg',
             True,
             cParms[1][2],
             cParms[0][2]
@@ -130,7 +130,7 @@ def Activated(self):
                  )
     def GetResources(self):
         return {
-             'Pixmap' : path_a2p + '/icons/a2p_axialConstraint.svg',
+             'Pixmap' : path_a2p + '/icons/a2p_AxialConstraint.svg',
              'MenuText': 'Add axial constraint',
              'ToolTip': toolTipText
              }
diff --git a/a2p_CircularEdgeConnection.py b/a2p_CircularEdgeConnection.py
index 77c2c718..aa18c58b 100644
--- a/a2p_CircularEdgeConnection.py
+++ b/a2p_CircularEdgeConnection.py
@@ -87,7 +87,7 @@ def parseSelection(selection, objectToUpdate=None, callSolveConstraints=True, lo
         c.Proxy = ConstraintObjectProxy()
         c.ViewObject.Proxy = ConstraintViewProviderProxy(
             c,
-            path_a2p + '/icons/a2p_circularEdgeConstraint.svg',
+            path_a2p + '/icons/a2p_CircularEdgeConstraint.svg',
             True,
             cParms[1][2],
             cParms[0][2]
@@ -141,7 +141,7 @@ def Activated(self):
 
     def GetResources(self):
         return {
-            'Pixmap' : path_a2p + '/icons/a2p_circularEdgeConstraint.svg' ,
+            'Pixmap' : path_a2p + '/icons/a2p_CircularEdgeConstraint.svg' ,
             'MenuText': 'Add circular edge connection',
             'ToolTip': toolTipText
             }
diff --git a/a2p_MuxAssembly.py b/a2p_MuxAssembly.py
index 02b0e1eb..7fbd2695 100644
--- a/a2p_MuxAssembly.py
+++ b/a2p_MuxAssembly.py
@@ -115,7 +115,7 @@ def __setstate__(self, state):
         return None
 
     def getIcon(self):
-        return a2plib.path_a2p + '/icons/simpleAssemblyShape.svg'
+        return a2plib.path_a2p + '/icons/SimpleAssemblyShape.svg'
 
     def attach(self, obj):
         self.object_Name = obj.Object.Name
@@ -172,7 +172,7 @@ class a2p_SimpleAssemblyShapeCommand():
 
     def GetResources(self):
         import a2plib
-        return {'Pixmap'  : a2plib.path_a2p +'/icons/a2p_simpleAssemblyShape.svg',
+        return {'Pixmap'  : a2plib.path_a2p +'/icons/a2p_SimpleAssemblyShape.svg',
                 'MenuText': "create or refresh simple Shape of complete Assembly",
                 'ToolTip': "create or refresh simple Shape of complete Assembly"
                 }
diff --git a/a2p_angleConnection.py b/a2p_angleConnection.py
index 89c3e7a1..8ffde679 100644
--- a/a2p_angleConnection.py
+++ b/a2p_angleConnection.py
@@ -93,7 +93,7 @@ def parseSelection(selection, objectToUpdate=None):
         c.Proxy = ConstraintObjectProxy()
         c.ViewObject.Proxy = ConstraintViewProviderProxy(
             c,
-            path_a2p +'/icons/a2p_angleConstraint.svg',
+            path_a2p +'/icons/a2p_AngleConstraint.svg',
             True,
             cParms[1][2],
             cParms[0][2]
@@ -157,7 +157,7 @@ def Activated(self):
 
     def GetResources(self):
         return {
-             'Pixmap' : path_a2p + '/icons/a2p_angleConstraint.svg',
+             'Pixmap' : path_a2p + '/icons/a2p_AngleConstraint.svg',
              'MenuText': 'angle between planes constraint',
              'ToolTip': toolTipText,
              }
diff --git a/a2p_importpart.py b/a2p_importpart.py
index fad64936..22842c59 100644
--- a/a2p_importpart.py
+++ b/a2p_importpart.py
@@ -308,7 +308,7 @@ def Activated(self):
 
     def GetResources(self):
         return {
-            'Pixmap' : a2plib.path_a2p + '/icons/a2p_importPart_update.svg',
+            'Pixmap' : a2plib.path_a2p + '/icons/a2p_ImportPart_Update.svg',
             'MenuText': 'Update parts imported into the assembly',
             'ToolTip': 'Update parts imported into the assembly'
             }
@@ -466,8 +466,8 @@ def Activated(self):
 
     def GetResources(self):
         return {
-            #'Pixmap' : ':/assembly2/icons/Draft_Move.svg',
-            'Pixmap'  : a2plib.pathOfModule()+'/icons/a2p_Draft_Move.svg',
+            #'Pixmap' : ':/assembly2/icons/MovePart.svg',
+            'Pixmap'  : a2plib.pathOfModule()+'/icons/a2p_MovePart.svg',
             'MenuText': 'move',
             'ToolTip': 'move part  ( shift+click to copy )'
             }
@@ -498,7 +498,7 @@ def Activated(self):
                     a2plib.removeConstraint(c)
     def GetResources(self):
         return {
-            'Pixmap'  : a2plib.pathOfModule()+'/icons/a2p_deleteConnections.svg',
+            'Pixmap'  : a2plib.pathOfModule()+'/icons/a2p_DeleteConnections.svg',
             'MenuText': 'delete constraints',
             }
 FreeCADGui.addCommand('a2p_DeleteConnectionsCommand', DeleteConnectionsCommand())
@@ -530,7 +530,7 @@ def IsActive(self):
 
     def GetResources(self):
         return {
-            'Pixmap'  :     a2plib.pathOfModule()+'/icons/a2p_viewConnection.svg',
+            'Pixmap'  :     a2plib.pathOfModule()+'/icons/a2p_ViewConnection.svg',
             'MenuText':     'show connected elements',
             'ToolTip':      'show connected elements',
             }
@@ -588,7 +588,7 @@ def Activated(self):
 
     def GetResources(self):
         return {
-            'Pixmap'  : a2plib.pathOfModule()+'/icons/a2p_isolate.svg',
+            'Pixmap'  : a2plib.pathOfModule()+'/icons/a2p_Isolate_Element.svg',
             'MenuText': 'show only selected elements, or all if none is selected',
             'ToolTip': 'show only selected elements, or all if none is selected'
             }
@@ -611,7 +611,7 @@ def IsChecked(self):
 
     def GetResources(self):
         return {
-            'Pixmap'  :     a2plib.pathOfModule()+'/icons/a2p_glasses.svg',
+            'Pixmap'  :     a2plib.pathOfModule()+'/icons/a2p_ToggleTranparency.svg',
             'MenuText':     'toggle transparency of assembly',
             'ToolTip':      'toggle transparency of assembly',
             'Checkable':    self.IsChecked()
diff --git a/a2p_planeConstraint.py b/a2p_planeConstraint.py
index cce4f626..c502ab02 100644
--- a/a2p_planeConstraint.py
+++ b/a2p_planeConstraint.py
@@ -88,7 +88,7 @@ def parseSelection(selection, objectToUpdate=None):
         c.Proxy = ConstraintObjectProxy()
         c.ViewObject.Proxy = ConstraintViewProviderProxy(
             c,
-            path_a2p + '/icons/a2p_planeConstraint.svg',
+            path_a2p + '/icons/a2p_PlaneCoincidentConstraint.svg',
             True, cParms[1][2],
             cParms[0][2],
             extraText
@@ -137,7 +137,7 @@ def Activated(self):
 
     def GetResources(self):
         return {
-             'Pixmap' : path_a2p + '/icons/a2p_planeConstraint.svg',
+             'Pixmap' : path_a2p + '/icons/a2p_PlaneCoincidentConstraint.svg',
              'MenuText': 'Add plane constraint',
              'ToolTip': toolTipText
              }
diff --git a/a2p_planesParallelConstraint.py b/a2p_planesParallelConstraint.py
index 25523e6c..856ab5e1 100644
--- a/a2p_planesParallelConstraint.py
+++ b/a2p_planesParallelConstraint.py
@@ -88,7 +88,7 @@ def parseSelection(selection, objectToUpdate=None):
         c.Proxy = ConstraintObjectProxy()
         c.ViewObject.Proxy = ConstraintViewProviderProxy(
             c,
-            path_a2p + '/icons/a2p_planesParallelConstraint.svg',
+            path_a2p + '/icons/a2p_PlanesParallelConstraint.svg',
             True, cParms[1][2],
             cParms[0][2],
             extraText
@@ -140,7 +140,7 @@ def Activated(self):
 
     def GetResources(self):
         return {
-             'Pixmap' : path_a2p + '/icons/a2p_planesParallelConstraint.svg',
+             'Pixmap' : path_a2p + '/icons/a2p_PlanesParallelConstraint.svg',
              'MenuText': 'Add planesParallel constraint',
              'ToolTip': toolTipText
              }
diff --git a/a2p_pointIdentityConnection.py b/a2p_pointIdentityConnection.py
index baa0b10b..12b3a6ad 100644
--- a/a2p_pointIdentityConnection.py
+++ b/a2p_pointIdentityConnection.py
@@ -74,7 +74,7 @@ def parseSelection(selection, objectToUpdate=None):
         c.Proxy = ConstraintObjectProxy()
         c.ViewObject.Proxy = ConstraintViewProviderProxy(
             c,
-            path_a2p + '/icons/a2p_pointIdentity.svg',
+            path_a2p + '/icons/a2p_PointIdentity.svg',
             True,
             cParms[1][2],
             cParms[0][2]
@@ -117,12 +117,12 @@ def Activated(self):
                  parseSelection,
                  taskDialog_title ='add point Identity constraint',
                  #taskDialog_iconPath = self.GetResources()['Pixmap'],
-                 taskDialog_iconPath = path_a2p + '/icons/a2p_pointIdentity.svg',
+                 taskDialog_iconPath = path_a2p + '/icons/a2p_PointIdentity.svg',
                  taskDialog_text = selection_text
                  )
     def GetResources(self):
         return {
-             'Pixmap' : path_a2p + '/icons/a2p_pointIdentity.svg',
+             'Pixmap' : path_a2p + '/icons/a2p_PointIdentity.svg',
              'MenuText': 'Add PointIdentity Constraint',
              'ToolTip': toolTipText
              }
diff --git a/a2p_pointOnLineConstraint.py b/a2p_pointOnLineConstraint.py
index 3a752f41..71bb3799 100644
--- a/a2p_pointOnLineConstraint.py
+++ b/a2p_pointOnLineConstraint.py
@@ -83,7 +83,7 @@ def parseSelection(selection, objectToUpdate=None):
         c.Proxy = ConstraintObjectProxy()
         c.ViewObject.Proxy = ConstraintViewProviderProxy( 
             c, 
-            path_a2p + '/icons/a2p_pointOnLineConstraint.svg', 
+            path_a2p + '/icons/a2p_PointOnLineConstraint.svg', 
             True, 
             cParms[1][2], 
             cParms[0][2], 
@@ -124,13 +124,13 @@ def Activated(self):
                  PointOnLineSelectionGate(), 
                  parseSelection, 
                  taskDialog_title ='add PointOnLine constraint', 
-                 taskDialog_iconPath = path_a2p + '/icons/a2p_pointOnLineConstraint.svg', 
+                 taskDialog_iconPath = path_a2p + '/icons/a2p_PointOnLineConstraint.svg', 
                  taskDialog_text = selection_text,
                  secondSelectionGate = PointOnLineSelectionGate2() )
               
     def GetResources(self): 
         return {
-             'Pixmap' : path_a2p + '/icons/a2p_pointOnLineConstraint.svg', 
+             'Pixmap' : path_a2p + '/icons/a2p_PointOnLineConstraint.svg', 
              'MenuText': 'Add PointOnPlane constraint', 
              'ToolTip': toolTipText
              } 
diff --git a/a2p_pointOnPlaneConstraint.py b/a2p_pointOnPlaneConstraint.py
index b10f102b..83045c07 100644
--- a/a2p_pointOnPlaneConstraint.py
+++ b/a2p_pointOnPlaneConstraint.py
@@ -83,7 +83,7 @@ def parseSelection(selection, objectToUpdate=None):
         c.Proxy = ConstraintObjectProxy()
         c.ViewObject.Proxy = ConstraintViewProviderProxy(
             c,
-            path_a2p + '/icons/a2p_pointOnPlaneConstraint.svg',
+            path_a2p + '/icons/a2p_PointOnPlaneConstraint.svg',
             True,
             cParms[1][2],
             cParms[0][2],
@@ -125,13 +125,13 @@ def Activated(self):
                  PointOnPlaneSelectionGate(),
                  parseSelection,
                  taskDialog_title ='add pointOnPlane constraint',
-                 taskDialog_iconPath = path_a2p + '/icons/a2p_pointOnPlaneConstraint.svg',
+                 taskDialog_iconPath = path_a2p + '/icons/a2p_PointOnPlaneConstraint.svg',
                  taskDialog_text = selection_text,
                  secondSelectionGate = PointOnPlaneSelectionGate2() )
 
     def GetResources(self):
         return {
-             'Pixmap' : path_a2p + '/icons/a2p_pointOnPlaneConstraint.svg',
+             'Pixmap' : path_a2p + '/icons/a2p_PointOnPlaneConstraint.svg',
              'MenuText': 'Add PointOnPlane constraint',
              'ToolTip': toolTipText
              }
diff --git a/a2p_sphericalConnection.py b/a2p_sphericalConnection.py
index 04dc827c..02944994 100644
--- a/a2p_sphericalConnection.py
+++ b/a2p_sphericalConnection.py
@@ -85,7 +85,7 @@ def parseSelection(selection, objectToUpdate=None):
         c.Proxy = ConstraintObjectProxy()
         c.ViewObject.Proxy = ConstraintViewProviderProxy(
             c,
-            path_a2p + '/icons/a2p_sphericalSurfaceConstraint.svg',
+            path_a2p + '/icons/a2p_SphericalSurfaceConstraint.svg',
             True, cParms[1][2],
             cParms[0][2]
             )
@@ -133,7 +133,7 @@ def Activated(self):
 
     def GetResources(self):
         return {
-            'Pixmap' : path_a2p + '/icons/a2p_sphericalSurfaceConstraint.svg',
+            'Pixmap' : path_a2p + '/icons/a2p_SphericalSurfaceConstraint.svg',
             'MenuText': 'Add a spherical constraint',
             'ToolTip': toolTipText
             }
diff --git a/icons/a2p_planesParallelConstraint.svg b/icons/a2p_AngleConstraint.svg
similarity index 75%
rename from icons/a2p_planesParallelConstraint.svg
rename to icons/a2p_AngleConstraint.svg
index 5aab6228..cdf0aa97 100644
--- a/icons/a2p_planesParallelConstraint.svg
+++ b/icons/a2p_AngleConstraint.svg
@@ -14,8 +14,8 @@
    height="64"
    id="svg3085"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="a2p_planesParallelConstraint.svg">
+   inkscape:version="0.92.3 (unknown)"
+   sodipodi:docname="a2p_AngleConstraint.svg">
   <defs
      id="defs3087">
     <linearGradient
@@ -341,29 +341,18 @@
        y1="26"
        x2="10"
        y2="-27"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       gradientTransform="translate(36,0)"
-       inkscape:collect="always"
-       xlink:href="#linearGradient3987-5"
-       id="linearGradient3993-7"
-       x1="19"
-       y1="26"
-       x2="10"
-       y2="-27"
-       gradientUnits="userSpaceOnUse" />
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-10.921161,12.614738)" />
     <linearGradient
        inkscape:collect="always"
-       id="linearGradient3987-5">
-      <stop
-         style="stop-color:#a40000;stop-opacity:1"
-         offset="0"
-         id="stop3989-3" />
-      <stop
-         style="stop-color:#ef2929;stop-opacity:1"
-         offset="1"
-         id="stop3991-5" />
-    </linearGradient>
+       xlink:href="#linearGradient3916-0"
+       id="linearGradient3246"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.80000007,0,0,0.78431368,-0.799999,-4.098038)"
+       x1="38.241375"
+       y1="23.159998"
+       x2="41.689651"
+       y2="40.84" />
     <linearGradient
        id="linearGradient3916-0">
       <stop
@@ -394,18 +383,18 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="5.12"
-     inkscape:cx="4.3039317"
-     inkscape:cy="61.850728"
+     inkscape:zoom="3.6203867"
+     inkscape:cx="-19.140777"
+     inkscape:cy="40.401981"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:document-units="px"
-     inkscape:window-width="1166"
-     inkscape:window-height="1244"
-     inkscape:window-x="1632"
-     inkscape:window-y="556"
-     inkscape:window-maximized="0">
+     inkscape:window-width="1366"
+     inkscape:window-height="716"
+     inkscape:window-x="0"
+     inkscape:window-y="26"
+     inkscape:window-maximized="1">
     <inkscape:grid
        type="xygrid"
        id="grid3113"
@@ -422,7 +411,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -431,51 +420,52 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
      transform="translate(0,32)">
-    <rect
-       style="fill:#729fcf;stroke:#0b1521;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:6.00000035999999959"
-       id="rect3115"
-       width="22"
-       height="58"
-       x="3"
-       y="-29" />
-    <rect
-       style="fill:url(#linearGradient3993);stroke:#729fcf;stroke-width:1.99999975999999990;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:6.00000035999999959;fill-opacity:1"
-       id="rect3115-6"
-       width="18"
-       height="54"
-       x="5"
-       y="-27" />
-    <rect
-       style="fill:#ef2929;stroke:#280000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:6.00000035999999959"
-       id="rect3115-62"
-       width="22"
-       height="58"
-       x="39"
-       y="-29" />
-    <rect
-       style="fill:url(#linearGradient3993-7);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999975999999990;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:6.00000035999999959"
-       id="rect3115-6-9"
-       width="18"
-       height="54"
-       x="41"
-       y="-27" />
-    <rect
-       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#4bda64;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.02355003;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-       id="rect3413"
-       width="4.1717625"
-       height="38.171761"
-       x="14.102743"
-       y="-47.699883"
-       transform="matrix(0.70525379,0.70895493,-0.70895493,0.70525379,0,0)"
-       inkscape:transform-center-x="44.53125"
-       inkscape:transform-center-y="-55.078125" />
-    <rect
-       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#4bda64;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.02355003;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-       id="rect3413-3"
-       width="4.1717625"
-       height="38.171761"
-       x="25.070271"
-       y="-38.563789"
-       transform="matrix(0.70525379,0.70895493,-0.70895493,0.70525379,0,0)" />
+    <g
+       id="g9194"
+       transform="translate(3.208177)">
+      <g
+         transform="matrix(0.79617026,0,0,1.0080734,11.456409,9.062405)"
+         id="g9185">
+        <g
+           id="g7315">
+          <rect
+             transform="matrix(1,0,-0.25881905,0.96592583,0,0)"
+             y="-29.826717"
+             x="7.0267754"
+             height="42.966885"
+             width="41.502823"
+             id="rect7306"
+             style="fill:#729fcf;fill-opacity:1;stroke:#000000;stroke-width:2.03497052;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" />
+        </g>
+        <rect
+           transform="matrix(1,0,-0.25881905,0.96592583,0,0)"
+           y="-23.811352"
+           x="12.837169"
+           height="30.936157"
+           width="29.882032"
+           id="rect7308"
+           style="fill:#3465a4;fill-opacity:1;stroke:#3465a4;stroke-width:1.40657163;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" />
+      </g>
+      <g
+         transform="matrix(0.79617026,0,0,-1.0080734,-4.8276639,7.1856879)"
+         id="g7304">
+        <rect
+           transform="matrix(1,0,-0.25881905,0.96592583,0,0)"
+           y="-13.140169"
+           x="15.470407"
+           height="42.966885"
+           width="41.502823"
+           id="rect991"
+           style="fill:#ef2929;fill-opacity:1;stroke:#000000;stroke-width:2.03497052;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" />
+        <rect
+           style="fill:#a40000;fill-opacity:1;stroke:#a40000;stroke-width:1.40657163;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+           id="rect993"
+           width="29.882032"
+           height="30.936157"
+           x="21.2808"
+           y="-7.1248045"
+           transform="matrix(1,0,-0.25881905,0.96592583,0,0)" />
+      </g>
+    </g>
   </g>
 </svg>
diff --git a/icons/a2p_axialConstraint.svg b/icons/a2p_AxialConstraint.svg
similarity index 61%
rename from icons/a2p_axialConstraint.svg
rename to icons/a2p_AxialConstraint.svg
index 65f15e4a..7c2c70ec 100644
--- a/icons/a2p_axialConstraint.svg
+++ b/icons/a2p_AxialConstraint.svg
@@ -14,8 +14,8 @@
    height="64"
    id="svg249"
    sodipodi:version="0.32"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="axialConstraint.svg"
+   inkscape:version="0.92.3 (unknown)"
+   sodipodi:docname="a2p_AxialConstraint.svg"
    inkscape:export-filename="/home/jimmac/gfx/novell/pdes/trunk/docs/BIGmime-text.png"
    inkscape:export-xdpi="240.00000"
    inkscape:export-ydpi="240.00000"
@@ -305,16 +305,6 @@
        x2="26.370924"
        y2="13.086601"
        gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3859"
-       id="linearGradient3895"
-       gradientUnits="userSpaceOnUse"
-       x1="27.312"
-       y1="18.168932"
-       x2="26.370924"
-       y2="13.086601"
-       gradientTransform="matrix(-1.4376536,0,0,1.4757011,95.2652,-15.311912)" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient3895-9"
@@ -367,26 +357,6 @@
          offset="1"
          style="stop-color:#4e9a06;stop-opacity:1" />
     </linearGradient>
-    <linearGradient
-       y2="40.84"
-       x2="41.689651"
-       y1="23.159998"
-       x1="38.241375"
-       gradientTransform="matrix(0.80000007,0,0,0.78431368,0.200001,11.901962)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3938"
-       xlink:href="#linearGradient3916-0"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3916"
-       id="linearGradient3963"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.80000007,0,0,0.78431368,0.20000082,-30.098038)"
-       x1="42.249996"
-       y1="23.074999"
-       x2="39.749996"
-       y2="40.924999" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -395,21 +365,23 @@
      borderopacity="0.32941176"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="6.8701325"
-     inkscape:cx="18.165553"
-     inkscape:cy="34.122331"
+     inkscape:zoom="8.25"
+     inkscape:cx="32"
+     inkscape:cy="32"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:document-units="px"
-     inkscape:window-width="1600"
-     inkscape:window-height="837"
+     inkscape:window-width="1366"
+     inkscape:window-height="716"
      inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:showpageshadow="false"
+     inkscape:window-y="26"
+     inkscape:showpageshadow="true"
      inkscape:snap-bbox="false"
-     inkscape:snap-nodes="true"
-     inkscape:window-maximized="1">
+     inkscape:snap-nodes="false"
+     inkscape:window-maximized="1"
+     borderlayer="true"
+     inkscape:snap-global="false">
     <inkscape:grid
        type="xygrid"
        id="grid3027"
@@ -426,7 +398,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
         <dc:creator>
           <cc:Agent>
             <dc:title>Jakub Steiner</dc:title>
@@ -465,143 +437,40 @@
      style="display:inline"
      transform="translate(0,16)">
     <g
-       style="display:inline"
-       id="g3037-3"
-       transform="translate(-24,0)">
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         id="path2223-6"
-         d="m 31.997778,-9.9289754 0,51.8930194"
-         style="fill:none;stroke:#2e3436;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         id="path2223-1-75"
-         d="M 32,-9.8930194 32,42"
-         style="fill:none;stroke:#888a85;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;display:inline" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         id="path2223-1-7-3"
-         d="M 31,-9.89302 31,42"
-         style="fill:#d3d7cf;stroke:#d3d7cf;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;display:inline" />
-    </g>
-    <g
-       id="g3037"
-       transform="translate(24,0)">
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         id="path2223"
-         d="m 31.997778,-9.9289754 0,51.8930194"
-         style="fill:none;stroke:#2e3436;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         id="path2223-1"
-         d="M 32,-9.8930194 32,42"
-         style="fill:none;stroke:#888a85;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;display:inline" />
-      <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         id="path2223-1-7"
-         d="M 31,-9.89302 31,42"
-         style="fill:#d3d7cf;stroke:#d3d7cf;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;display:inline" />
-    </g>
-    <path
-       style="fill:url(#linearGradient3895);fill-opacity:1;stroke:#280000;stroke-width:2;stroke-linejoin:round;stroke-opacity:1"
-       d="m 33,7.000001 c 0,3.313707 10.297451,6 23.000001,6 1.721641,0 3.386372,0.09356 5,-2e-6 0,-11.9999995 0,0 0,-11.9999995 -1.615619,-0.09381 -3.276052,0 -5,0 C 43.297451,0.9999995 33,3.686292 33,7.000001 z"
-       id="path2219"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ssccss" />
-    <path
-       style="fill:#729fcf;fill-opacity:1;stroke:#0b1521;stroke-width:2;stroke-linejoin:round;stroke-opacity:1;display:inline"
-       d="m 3.004407,29 c 1.671646,0.06201 3.239927,0 4.997796,0 C 24.017244,29 37,26.313707 37,23 37,19.686291 24.017244,16.999999 8.002203,16.999999 c -1.711167,0 -3.368002,-0.05882 -4.997796,1e-6 0,12 0,0 0,12 z"
-       id="path2225"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cssscc" />
-    <g
-       id="g3959"
-       transform="matrix(-1,0,0,1,66,0)">
-      <path
-         inkscape:export-ydpi="4.1683898"
-         inkscape:export-xdpi="4.1683898"
-         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
-         sodipodi:nodetypes="cccccccc"
-         id="path3343-0"
-         d="m 35,-13 0,4 -18,0 0,8 18,0 0,4 14,-8 z"
-         style="fill:url(#linearGradient3963);fill-opacity:1;fill-rule:evenodd;stroke:#172a04;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:export-ydpi="4.1683898"
-         inkscape:export-xdpi="4.1683898"
-         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
-         sodipodi:nodetypes="cccccccc"
-         id="path3343-2-9"
-         d="M 37,-9.5822304 37,-7 l -18,0 0,4 18,0 0,2.5822304 L 45,-5 z"
-         style="fill:none;stroke:#8ae234;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-         inkscape:connector-curvature="0" />
-    </g>
-    <path
-       inkscape:connector-curvature="0"
-       style="fill:url(#linearGradient3938);fill-opacity:1;fill-rule:evenodd;stroke:#172a04;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       d="m 35,29 0,4 -18,0 0,8 18,0 0,4 14,-8 z"
-       id="path3343-0-6"
-       sodipodi:nodetypes="cccccccc"
-       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
-       inkscape:export-xdpi="4.1683898"
-       inkscape:export-ydpi="4.1683898" />
-    <path
-       inkscape:connector-curvature="0"
-       style="fill:none;stroke:#8ae234;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       d="M 37,32.41777 37,35 l -18,0 0,4 18,0 0,2.58223 L 45,37 z"
-       id="path3343-2-9-1"
-       sodipodi:nodetypes="cccccccc"
-       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
-       inkscape:export-xdpi="4.1683898"
-       inkscape:export-ydpi="4.1683898" />
-    <g
-       style="display:inline"
-       id="g3037-3-3"
-       transform="translate(14.002222,0.035956)">
+       id="g1251"
+       transform="translate(-0.39886738,1.0489611)">
       <path
-         sodipodi:nodetypes="cc"
          inkscape:connector-curvature="0"
-         id="path2223-6-6"
-         d="m 41.997778,-9.9289754 0,13.8930194"
-         style="fill:none;stroke:#2e3436;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+         id="path1181"
+         d="m 42.73384,29.927019 6.54189,12.300545"
+         style="fill:none;fill-rule:evenodd;stroke:#2e3436;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <ellipse
+         transform="rotate(-15)"
+         ry="10.099369"
+         rx="25.840393"
+         cy="30.875559"
+         cx="29.789465"
+         id="path1131"
+         style="opacity:1;fill:#729fcf;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0" />
       <path
-         sodipodi:nodetypes="cc"
          inkscape:connector-curvature="0"
-         id="path2223-1-75-7"
-         d="M 42,-9.8930194 42,4"
-         style="fill:none;stroke:#888a85;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;display:inline" />
+         id="path1179"
+         d="m 34.413106,15.466141 3.55789,6.504401"
+         style="fill:none;fill-rule:evenodd;stroke:#2e3436;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <ellipse
+         style="opacity:1;fill:#ef2929;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0"
+         id="ellipse1142"
+         cx="25.422285"
+         cy="13.430607"
+         rx="25.840393"
+         ry="10.099369"
+         transform="rotate(-15)" />
       <path
-         sodipodi:nodetypes="cc"
          inkscape:connector-curvature="0"
-         id="path2223-1-7-3-5"
-         d="M 41,-9.89302 41,4"
-         style="fill:#d3d7cf;stroke:#d3d7cf;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;display:inline" />
+         id="path1177"
+         d="m 19.564183,-12.32535 9.1285,18.0665561"
+         style="fill:none;fill-rule:evenodd;stroke:#2e3436;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
     </g>
-    <path
-       sodipodi:nodetypes="cc"
-       inkscape:connector-curvature="0"
-       id="path2223-6-6-3"
-       d="M 8,-9.893019 8,20"
-       style="fill:none;stroke:#2e3436;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;display:inline" />
-    <path
-       sodipodi:nodetypes="cc"
-       inkscape:connector-curvature="0"
-       id="path2223-1-75-7-5"
-       d="m 8.002222,-9.857063 0,29.893019"
-       style="fill:none;stroke:#888a85;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;display:inline" />
-    <path
-       sodipodi:nodetypes="cc"
-       inkscape:connector-curvature="0"
-       id="path2223-1-7-3-5-6"
-       d="m 7.002222,-9.857064 0,29.89302"
-       style="fill:#d3d7cf;stroke:#d3d7cf;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;display:inline" />
   </g>
   <g
      inkscape:groupmode="layer"
diff --git a/icons/a2p_pointOnPlaneConstraint.svg b/icons/a2p_CircularEdgeConstraint.svg
similarity index 69%
rename from icons/a2p_pointOnPlaneConstraint.svg
rename to icons/a2p_CircularEdgeConstraint.svg
index f7a25a18..dbc7eeac 100644
--- a/icons/a2p_pointOnPlaneConstraint.svg
+++ b/icons/a2p_CircularEdgeConstraint.svg
@@ -14,8 +14,8 @@
    height="64"
    id="svg3085"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="pointOnPlaneConstraint.svg">
+   inkscape:version="0.92.3 (unknown)"
+   sodipodi:docname="a2p_CircularEdgeConstraint.svg">
   <defs
      id="defs3087">
     <linearGradient
@@ -310,7 +310,7 @@
        x2="39.360435"
        y2="16.048664"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-62,-20)" />
+       gradientTransform="translate(-2,0)" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient3871"
@@ -320,39 +320,28 @@
        x2="8.7007294"
        y2="16.186771"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(57.861891,-20)" />
+       gradientTransform="translate(-2.1381092,0)" />
     <linearGradient
-       gradientTransform="translate(36,0)"
-       inkscape:collect="always"
-       xlink:href="#linearGradient3987-5"
-       id="linearGradient3993-7"
-       x1="19"
-       y1="26"
-       x2="10"
-       y2="-27"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3987-5">
+       id="linearGradient3916">
       <stop
-         style="stop-color:#a40000;stop-opacity:1"
+         id="stop3918"
          offset="0"
-         id="stop3989-3" />
+         style="stop-color:#8ae234;stop-opacity:1" />
       <stop
-         style="stop-color:#ef2929;stop-opacity:1"
+         id="stop3920"
          offset="1"
-         id="stop3991-5" />
+         style="stop-color:#4e9a06;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3916-0"
-       id="linearGradient3246"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.80000007,0,0,0.78431368,-0.799999,-4.098038)"
-       x1="38.241375"
-       y1="23.159998"
+       y2="40.84"
        x2="41.689651"
-       y2="40.84" />
+       y1="23.159998"
+       x1="38.241375"
+       gradientTransform="matrix(0.80000007,0,0,0.78431368,-0.799999,-4.098038)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3938"
+       xlink:href="#linearGradient3916-0"
+       inkscape:collect="always" />
     <linearGradient
        id="linearGradient3916-0">
       <stop
@@ -364,27 +353,6 @@
          offset="1"
          style="stop-color:#4e9a06;stop-opacity:1" />
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3916"
-       id="linearGradient3963"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.80000007,0,0,0.78431368,0.20000082,-30.098038)"
-       x1="42.249996"
-       y1="23.074999"
-       x2="39.749996"
-       y2="40.924999" />
-    <linearGradient
-       id="linearGradient3916">
-      <stop
-         id="stop3918"
-         offset="0"
-         style="stop-color:#8ae234;stop-opacity:1" />
-      <stop
-         id="stop3920"
-         offset="1"
-         style="stop-color:#4e9a06;stop-opacity:1" />
-    </linearGradient>
   </defs>
   <sodipodi:namedview
      id="base"
@@ -393,21 +361,21 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="10.24"
-     inkscape:cx="25.255733"
-     inkscape:cy="37.535174"
+     inkscape:zoom="0.5"
+     inkscape:cx="32"
+     inkscape:cy="32"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:document-units="px"
-     inkscape:window-width="3840"
-     inkscape:window-height="2082"
+     inkscape:window-width="1366"
+     inkscape:window-height="716"
      inkscape:window-x="0"
-     inkscape:window-y="0"
+     inkscape:window-y="26"
      inkscape:window-maximized="1">
     <inkscape:grid
        type="xygrid"
-       id="grid3113"
+       id="grid3130"
        empspacing="2"
        visible="true"
        enabled="true"
@@ -421,7 +389,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -430,75 +398,59 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
      transform="translate(0,32)">
-    <rect
-       style="fill:#ef2929;stroke:#280000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:6.00000035999999959"
-       id="rect3115-62"
-       width="22"
-       height="58"
-       x="39"
-       y="-29" />
-    <rect
-       style="fill:url(#linearGradient3993-7);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999975999999990;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:6.00000035999999959"
-       id="rect3115-6-9"
-       width="18"
-       height="54"
-       x="41"
-       y="-27" />
     <g
-       style="display:inline"
-       id="g3959"
-       transform="matrix(-1,0,0,1,64,-7.58223)">
-      <path
-         inkscape:export-ydpi="4.1683898"
-         inkscape:export-xdpi="4.1683898"
-         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
-         sodipodi:nodetypes="cccccccc"
-         id="path3343-0"
-         d="m 35,-13 0,4 -18,0 0,8 18,0 0,4 14,-8 z"
-         style="fill:url(#linearGradient3963);fill-opacity:1;fill-rule:evenodd;stroke:#172a04;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:export-ydpi="4.1683898"
-         inkscape:export-xdpi="4.1683898"
-         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
-         sodipodi:nodetypes="cccccccc"
-         id="path3343-2-9"
-         d="M 37,-9.5822304 37,-7 l -18,0 0,4 18,0 0,2.5822304 L 45,-5 z"
-         style="fill:none;stroke:#8ae234;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-         inkscape:connector-curvature="0" />
-    </g>
-    <g
-       id="g3242"
-       transform="translate(1,-8)">
-      <path
-         inkscape:export-ydpi="4.1683898"
-         inkscape:export-xdpi="4.1683898"
-         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
-         sodipodi:nodetypes="cccccccc"
-         id="path3343-0-6"
-         d="m 34,13 0,4 -18,0 0,8 18,0 0,4 14,-8 z"
-         style="fill:url(#linearGradient3246);fill-opacity:1;fill-rule:evenodd;stroke:#172a04;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:export-ydpi="4.1683898"
-         inkscape:export-xdpi="4.1683898"
-         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
-         sodipodi:nodetypes="cccccccc"
-         id="path3343-2-9-1"
-         d="M 36,16.41777 36,19 l -18,0 0,4 18,0 0,2.58223 L 44,21 z"
-         style="fill:none;stroke:#8ae234;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-         inkscape:connector-curvature="0" />
+       id="g5367"
+       transform="translate(0.08571073)">
+      <g
+         transform="translate(-15.770624,0.85709912)"
+         id="g5352">
+        <ellipse
+           ry="24.086018"
+           rx="7.0860171"
+           cy="-0.85709912"
+           cx="62.169888"
+           id="ellipse4410"
+           style="fill:none;stroke:#ef2929;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:6.00000048;stroke-opacity:1" />
+        <ellipse
+           ry="27"
+           rx="10"
+           cy="-0.85709912"
+           cx="62.169888"
+           id="ellipse4408"
+           style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:6.00000048;stroke-opacity:1" />
+        <ellipse
+           style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:6.00000048;stroke-opacity:1"
+           id="ellipse4412"
+           cx="62.169888"
+           cy="-0.85709912"
+           rx="4.2165799"
+           ry="21.216579" />
+      </g>
+      <g
+         transform="translate(-14.570685)"
+         id="g5357">
+        <ellipse
+           style="fill:none;stroke:#729fcf;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:6.00000048;stroke-opacity:1"
+           id="ellipse5343"
+           cx="32"
+           cy="0"
+           rx="7.0860171"
+           ry="24.086018" />
+        <ellipse
+           style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:6.00000048;stroke-opacity:1"
+           id="ellipse5345"
+           cx="32"
+           cy="0"
+           rx="10"
+           ry="27" />
+        <ellipse
+           ry="21.216579"
+           rx="4.2165799"
+           cy="0"
+           cx="32"
+           id="ellipse5347"
+           style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:6.00000048;stroke-opacity:1" />
+      </g>
     </g>
-    <path
-       style="fill:#0003ff;fill-opacity:1;stroke:#4e5593;stroke-width:0.46062991;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path3411"
-       sodipodi:type="arc"
-       sodipodi:cx="10.097656"
-       sodipodi:cy="-0.98828125"
-       sodipodi:rx="10"
-       sodipodi:ry="10.5"
-       sodipodi:start="2.3763356"
-       sodipodi:end="2.3742412"
-       d="M 2.8856131,6.2853041 A 10,10.5 0 0 1 3.1666569,-8.5571171 10,10.5 0 0 1 17.302441,-8.2697926 10,10.5 0 0 1 17.0362,6.5729294 10,10.5 0 0 1 2.9001373,6.3011482 l 7.1975187,-7.28942945 z" />
   </g>
 </svg>
diff --git a/icons/a2p_DeleteConnections.svg b/icons/a2p_DeleteConnections.svg
new file mode 100644
index 00000000..0fe4652d
--- /dev/null
+++ b/icons/a2p_DeleteConnections.svg
@@ -0,0 +1,151 @@
+<?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="64"
+   height="64"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.3 (unknown)"
+   sodipodi:docname="a2p_DeleteConnections.svg"
+   viewBox="0 0 64 64">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3879"
+       inkscape:collect="always">
+      <stop
+         id="stop3881"
+         offset="0"
+         style="stop-color:#a40000;stop-opacity:1" />
+      <stop
+         id="stop3883"
+         offset="1"
+         style="stop-color:#ef2929;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3869">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3871" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3873" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3869"
+       id="linearGradient3875"
+       x1="-45"
+       y1="1044.3622"
+       x2="-55"
+       y2="994.36218"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.86647727,0,0,0.86647739,73.653409,136.30391)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3879"
+       id="linearGradient3877"
+       x1="-45"
+       y1="1044.3622"
+       x2="-55"
+       y2="994.36218"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.86647727,0,0,0.86647739,73.653409,136.30391)" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="6.557738"
+     inkscape:cx="50.271958"
+     inkscape:cy="32.900924"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1366"
+     inkscape:window-height="716"
+     inkscape:window-x="0"
+     inkscape:window-y="26"
+     inkscape:window-maximized="1"
+     inkscape:snap-global="true"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid11521"
+       empspacing="2"
+       dotted="false"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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,-988.36218)">
+    <path
+       style="fill:none;stroke:#280000;stroke-width:16;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 13,1001.3622 38.125,38.125"
+       id="path3002"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#280000;stroke-width:16;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 51.125,1001.3622 13,1039.4872"
+       id="path3002-6"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#ef2929;stroke-width:12;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 13,1001.3622 38.125,38.125"
+       id="path3002-7"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#ef2929;stroke-width:12;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="M 51.125,1001.3622 13,1039.4872"
+       id="path3002-6-5"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:url(#linearGradient3877);stroke-width:8;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 13,1001.3622 38.125,38.125"
+       id="path3002-7-6"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:url(#linearGradient3875);stroke-width:8;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="M 51.125,1001.3622 13,1039.4872"
+       id="path3002-6-5-2"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+  </g>
+</svg>
diff --git a/icons/a2p_Draft_Move.svg b/icons/a2p_Draft_Move.svg
deleted file mode 100644
index 6d85c939..00000000
--- a/icons/a2p_Draft_Move.svg
+++ /dev/null
@@ -1,369 +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="svg2963"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="Draft_Move.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.1">
-  <defs
-     id="defs2965">
-    <linearGradient
-       id="linearGradient3354">
-      <stop
-         style="stop-color:#2157c7;stop-opacity:1;"
-         offset="0"
-         id="stop3356" />
-      <stop
-         style="stop-color:#6daaff;stop-opacity:1;"
-         offset="1"
-         id="stop3358" />
-    </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="perspective2971" />
-    <linearGradient
-       gradientTransform="matrix(0,-1.4500001,1.4705882,0,-15.05882,91.45)"
-       y2="36.079998"
-       x2="21.689653"
-       y1="29.279999"
-       x1="56.172409"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3036"
-       xlink:href="#linearGradient3895"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3895">
-      <stop
-         style="stop-color:#729fcf;stop-opacity:1;"
-         offset="0"
-         id="stop3897" />
-      <stop
-         style="stop-color:#204a87;stop-opacity:1;"
-         offset="1"
-         id="stop3899" />
-    </linearGradient>
-    <linearGradient
-       y2="36.079998"
-       x2="21.689653"
-       y1="29.279999"
-       x1="56.172409"
-       gradientTransform="matrix(0,-0.58000003,0.58823527,0,13.176471,38.379999)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3918-3"
-       xlink:href="#linearGradient3895-6"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3895-6">
-      <stop
-         style="stop-color:#729fcf;stop-opacity:1;"
-         offset="0"
-         id="stop3897-7" />
-      <stop
-         style="stop-color:#204a87;stop-opacity:1;"
-         offset="1"
-         id="stop3899-5" />
-    </linearGradient>
-    <linearGradient
-       y2="36.079998"
-       x2="21.689653"
-       y1="29.279999"
-       x1="56.172409"
-       gradientTransform="matrix(0.58000003,0,0,0.58823527,25.620001,13.176471)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3029-6"
-       xlink:href="#linearGradient3895-6-2"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3895-6-2">
-      <stop
-         style="stop-color:#729fcf;stop-opacity:1;"
-         offset="0"
-         id="stop3897-7-9" />
-      <stop
-         style="stop-color:#204a87;stop-opacity:1;"
-         offset="1"
-         id="stop3899-5-1" />
-    </linearGradient>
-    <linearGradient
-       y2="36.079998"
-       x2="21.689653"
-       y1="29.279999"
-       x1="56.172409"
-       gradientTransform="matrix(0,-0.58000003,0.58823527,0,13.176471,38.379999)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3918-0"
-       xlink:href="#linearGradient3895-9"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3895-9">
-      <stop
-         style="stop-color:#729fcf;stop-opacity:1;"
-         offset="0"
-         id="stop3897-3" />
-      <stop
-         style="stop-color:#204a87;stop-opacity:1;"
-         offset="1"
-         id="stop3899-6" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3895"
-       id="linearGradient3154"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0,-0.58000003,0.58823527,0,13.176471,38.379999)"
-       x1="45.482754"
-       y1="11.599999"
-       x2="-23.482759"
-       y2="52.400002" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3895-6-2"
-       id="linearGradient3156"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.58000003,0,0,0.58823527,38.379999,13.176471)"
-       x1="31.689651"
-       y1="-2.0000007"
-       x2="-9.6896563"
-       y2="66" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3895-6"
-       id="linearGradient3158"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.58000003,0,0,0.58823527,25.620001,13.176471)"
-       x1="-9.6896563"
-       y1="-2.0000007"
-       x2="31.689651"
-       y2="66" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3895-9"
-       id="linearGradient3160"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0,0.58000003,0.58823527,0,13.176471,25.620001)"
-       x1="-23.482759"
-       y1="11.599999"
-       x2="45.482754"
-       y2="52.400002" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3895-9"
-       id="linearGradient3936"
-       x1="20"
-       y1="12"
-       x2="44"
-       y2="52"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3895-9"
-       id="linearGradient3944"
-       x1="20"
-       y1="12"
-       x2="44"
-       y2="52"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="10.193662"
-     inkscape:cx="21.49082"
-     inkscape:cy="36.860521"
-     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:snap-global="true"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3009"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-    <inkscape:grid
-       type="xygrid"
-       id="grid3011"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       spacingx="16px"
-       spacingy="16px"
-       empcolor="#ff0000"
-       empopacity="0.25098039"
-       color="#ff0000"
-       opacity="0.1254902" />
-  </sodipodi:namedview>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <rect
-       style="fill:url(#linearGradient3936);fill-opacity:1;stroke:none"
-       id="rect3126"
-       width="12"
-       height="6"
-       x="26"
-       y="29" />
-    <rect
-       style="fill:url(#linearGradient3944);fill-opacity:1;stroke:none"
-       id="rect3126-2"
-       width="6"
-       height="11.999999"
-       x="29"
-       y="26" />
-    <g
-       id="g4351"
-       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/move.png"
-       inkscape:export-xdpi="6.5591564"
-       inkscape:export-ydpi="6.5591564"
-       transform="matrix(0.1378133,0,0,0.1378133,-221.39699,-138.35275)" />
-    <path
-       inkscape:connector-curvature="0"
-       style="fill:url(#linearGradient3154);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 37,28 0,-15 6,0 -11,-10 -11,10 6,0 0,15"
-       id="path3343"
-       sodipodi:nodetypes="ccccccc"
-       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
-       inkscape:export-xdpi="4.1683898"
-       inkscape:export-ydpi="4.1683898" />
-    <path
-       inkscape:connector-curvature="0"
-       style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="M 35,29 35,11 37.831259,11 32,5.7026937 26.168741,11 29,11 29,29"
-       id="path3343-2"
-       sodipodi:nodetypes="ccccccc"
-       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
-       inkscape:export-xdpi="4.1683898"
-       inkscape:export-ydpi="4.1683898" />
-    <path
-       inkscape:connector-curvature="0"
-       style="fill:url(#linearGradient3158);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 37,37 14,0 0,6 10,-11 -10,-11 0,6 -14,0"
-       id="path3343-3"
-       sodipodi:nodetypes="ccccccc"
-       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
-       inkscape:export-xdpi="4.1683898"
-       inkscape:export-ydpi="4.1683898" />
-    <path
-       inkscape:connector-curvature="0"
-       style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 35,35 18,0 0,2.831259 L 58.297306,32 53,26.168741 53,29 34,29"
-       id="path3343-2-5"
-       sodipodi:nodetypes="ccccccc"
-       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
-       inkscape:export-xdpi="4.1683898"
-       inkscape:export-ydpi="4.1683898" />
-    <path
-       inkscape:connector-curvature="0"
-       style="fill:url(#linearGradient3156);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 27,37 -14,0 0,6 -10,-11 10,-11 0,6 14,0"
-       id="path3343-3-2"
-       sodipodi:nodetypes="ccccccc"
-       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
-       inkscape:export-xdpi="4.1683898"
-       inkscape:export-ydpi="4.1683898" />
-    <path
-       inkscape:connector-curvature="0"
-       style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="M 29,35 11,35 11,37.831259 5.702694,32 11,26.168741 11,29 30,29"
-       id="path3343-2-5-7"
-       sodipodi:nodetypes="ccccccc"
-       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
-       inkscape:export-xdpi="4.1683898"
-       inkscape:export-ydpi="4.1683898" />
-    <path
-       inkscape:connector-curvature="0"
-       style="fill:url(#linearGradient3160);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 37,36 0,15 6,0 -11,10 -11,-10 6,0 0,-15"
-       id="path3343-0"
-       sodipodi:nodetypes="ccccccc"
-       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
-       inkscape:export-xdpi="4.1683898"
-       inkscape:export-ydpi="4.1683898" />
-    <path
-       inkscape:connector-curvature="0"
-       style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 35,34 0,19 2.831259,0 L 32,58.297306 26.168741,53 29,53 29,34"
-       id="path3343-2-6"
-       sodipodi:nodetypes="ccccccc"
-       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
-       inkscape:export-xdpi="4.1683898"
-       inkscape:export-ydpi="4.1683898" />
-  </g>
-  <metadata
-     id="metadata5006">
-    <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>Draft_Move</dc:title>
-        <cc:license
-           rdf:resource="" />
-        <dc:date>Mon Oct 10 13:44:52 2011 +0000</dc:date>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>[wmayer]</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:rights>
-          <cc:Agent>
-            <dc:title>FreeCAD LGPL2+</dc:title>
-          </cc:Agent>
-        </dc:rights>
-        <dc:publisher>
-          <cc:Agent>
-            <dc:title>FreeCAD</dc:title>
-          </cc:Agent>
-        </dc:publisher>
-        <dc:identifier>FreeCAD/src/Mod/Draft/Resources/icons/Draft_Move.svg</dc:identifier>
-        <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title>[agryson] Alexander Gryson</dc:title>
-          </cc:Agent>
-        </dc:contributor>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>arrow</rdf:li>
-            <rdf:li>move</rdf:li>
-            <rdf:li>arrows</rdf:li>
-            <rdf:li>compass</rdf:li>
-            <rdf:li>cross</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <dc:description>Four equally sized arrow heads at 90° to eachother, all joined at the tail</dc:description>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-</svg>
diff --git a/icons/a2p_DuplicatePart.svg b/icons/a2p_DuplicatePart.svg
index 2f2db201..7f405328 100644
--- a/icons/a2p_DuplicatePart.svg
+++ b/icons/a2p_DuplicatePart.svg
@@ -7,17 +7,212 @@
    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 48 48.000001"
-   id="svg2"
+   width="64"
+   height="64"
+   id="svg3559"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="a3_DuplicatePart.svg">
+   inkscape:version="0.92.3 (unknown)"
+   sodipodi:docname="a2p_DuplicatePart.svg"
+   viewBox="0 0 64 64">
   <defs
-     id="defs4" />
+     id="defs3561">
+    <linearGradient
+       id="linearGradient4383-3"
+       inkscape:collect="always">
+      <stop
+         id="stop73188"
+         offset="0"
+         style="stop-color:#3465a4;stop-opacity:1" />
+      <stop
+         id="stop73190"
+         offset="1"
+         style="stop-color:#729fcf;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4383-3"
+       id="linearGradient4389-0"
+       x1="27.243532"
+       y1="54.588112"
+       x2="21.243532"
+       y2="30.588112"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-1.243533,-2.588112)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4393-9"
+       id="linearGradient4399-7"
+       x1="48.714352"
+       y1="45.585785"
+       x2="40.714352"
+       y2="24.585787"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(1.2856487,1.4142136)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4393-9">
+      <stop
+         style="stop-color:#204a87;stop-opacity:1"
+         offset="0"
+         id="stop4395-8" />
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1"
+         offset="1"
+         id="stop4397-1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient73194"
+       id="linearGradient4389"
+       x1="20.243532"
+       y1="37.588112"
+       x2="17.243532"
+       y2="27.588112"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-1.243533,-2.588112)" />
+    <linearGradient
+       id="linearGradient73194"
+       inkscape:collect="always">
+      <stop
+         id="stop73202"
+         offset="0"
+         style="stop-color:#c4a000;stop-opacity:1" />
+      <stop
+         id="stop73204"
+         offset="1"
+         style="stop-color:#fce94f;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient73194"
+       id="linearGradient69056"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-1.243533,-2.588112)"
+       x1="27.243532"
+       y1="54.588112"
+       x2="22.243532"
+       y2="40.588112" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient73208"
+       id="linearGradient4399"
+       x1="48.714352"
+       y1="45.585785"
+       x2="46.714352"
+       y2="34.585785"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(1.2856487,1.4142136)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient73208">
+      <stop
+         style="stop-color:#c4a000;stop-opacity:1"
+         offset="0"
+         id="stop73210" />
+      <stop
+         style="stop-color:#edd400;stop-opacity:1"
+         offset="1"
+         id="stop73212" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient73208"
+       id="linearGradient69042"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-12.714351,-17.585786)"
+       x1="48.714352"
+       y1="45.585785"
+       x2="46.714352"
+       y2="35.585785" />
+    <radialGradient
+       r="10.31934"
+       fy="35.127438"
+       fx="23.070683"
+       cy="35.127438"
+       cx="23.070683"
+       gradientTransform="matrix(0.914812,0.01265023,-0.00821502,0.213562,2.253914,27.18889)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3071"
+       xlink:href="#linearGradient2091"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2091">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2093" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop2095" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3057">
+      <stop
+         style="stop-color:#8ae234;stop-opacity:1"
+         offset="0.0000000"
+         id="stop3059" />
+      <stop
+         style="stop-color:#4e9a06;stop-opacity:1"
+         offset="1.0000000"
+         id="stop3061" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient73194"
+       id="linearGradient7834"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-1.243533,-2.588112)"
+       x1="20.243532"
+       y1="37.588112"
+       x2="17.243532"
+       y2="27.588112" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient73194"
+       id="linearGradient7836"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-1.243533,-2.588112)"
+       x1="27.243532"
+       y1="54.588112"
+       x2="22.243532"
+       y2="40.588112" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient73208"
+       id="linearGradient7838"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(1.2856487,1.4142136)"
+       x1="48.714352"
+       y1="45.585785"
+       x2="46.714352"
+       y2="34.585785" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient73208"
+       id="linearGradient7840"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-12.714351,-17.585786)"
+       x1="48.714352"
+       y1="45.585785"
+       x2="46.714352"
+       y2="35.585785" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2091"
+       id="radialGradient7842"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.914812,0.01265023,-0.00821502,0.213562,2.253914,27.18889)"
+       cx="23.070683"
+       cy="35.127438"
+       fx="23.070683"
+       fy="35.127438"
+       r="10.31934" />
+  </defs>
   <sodipodi:namedview
      id="base"
      pagecolor="#ffffff"
@@ -25,20 +220,31 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="7.9195959"
-     inkscape:cx="34.721275"
-     inkscape:cy="24.565115"
+     inkscape:zoom="1"
+     inkscape:cx="32"
+     inkscape:cy="32"
+     inkscape:current-layer="g6897"
+     showgrid="true"
      inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     units="px"
-     inkscape:window-width="1395"
-     inkscape:window-height="1099"
-     inkscape:window-x="592"
-     inkscape:window-y="498"
-     inkscape:window-maximized="0" />
+     inkscape:grid-bbox="true"
+     inkscape:window-width="1358"
+     inkscape:window-height="712"
+     inkscape:window-x="0"
+     inkscape:window-y="26"
+     inkscape:window-maximized="0"
+     inkscape:snap-global="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3007"
+       empspacing="4"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       spacingx="0.5"
+       spacingy="0.5" />
+  </sodipodi:namedview>
   <metadata
-     id="metadata7">
+     id="metadata3564">
     <rdf:RDF>
       <cc:Work
          rdf:about="">
@@ -46,32 +252,188 @@
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <dc:title></dc:title>
+        <dc:title>Path-Stock</dc:title>
+        <dc:date>2015-07-04</dc:date>
+        <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
+        <dc:publisher>
+          <cc:Agent>
+            <dc:title>FreeCAD</dc:title>
+          </cc:Agent>
+        </dc:publisher>
+        <dc:identifier>FreeCAD/src/Mod/Path/Gui/Resources/icons/Path-Stock.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
-     inkscape:label="Ebene 1"
-     inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(0,-1004.3622)">
-    <rect
-       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffff3e;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.74197865;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-       id="rect3336"
-       width="46.356384"
-       height="46.356388"
-       x="0.74979645"
-       y="1005.3823" />
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:21.5116806px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="1.8927504"
-       y="983.15283"
-       id="text3355"
-       sodipodi:linespacing="125%"
-       transform="scale(0.9489283,1.0538204)"><tspan
-         sodipodi:role="line"
-         id="tspan3357"
-         x="1.8927504"
-         y="983.15283">DUP</tspan></text>
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <g
+       transform="matrix(0.52345945,0,0,0.5430726,28.848909,8.1057686)"
+       id="g6897">
+      <g
+         id="g7806"
+         transform="matrix(0.75,0,0,0.75,-19.031517,-4.1918013)">
+        <g
+           id="g7553"
+           transform="matrix(1.9103677,0,0,1.8413744,-55.112023,-14.925729)">
+          <path
+             sodipodi:nodetypes="ccccc"
+             inkscape:connector-curvature="0"
+             id="path69052"
+             d="M 9,35 V 21 l 14,5 v 14 z"
+             style="fill:url(#linearGradient4389);fill-opacity:1;fill-rule:nonzero;stroke:#302b00;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" />
+          <path
+             style="fill:url(#linearGradient69056);fill-opacity:1;fill-rule:nonzero;stroke:#302b00;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+             d="M 9,49 V 35 l 28,10 v 14 z"
+             id="path4381"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="ccccc" />
+          <path
+             style="fill:url(#linearGradient4399);fill-opacity:1;fill-rule:nonzero;stroke:#302b00;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+             d="M 37,59 V 45 L 55,28 v 13 z"
+             id="path4391"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="ccccc" />
+          <path
+             style="fill:#fce94f;fill-opacity:1;fill-rule:nonzero;stroke:#302b00;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+             d="M 9,21 29,5 42,10 23,26 Z"
+             id="path4403"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="ccccc" />
+          <path
+             style="fill:none;stroke:#fce94f;stroke-width:2;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"
+             d="M 11.008035,47.60627 11,38 l 24,8 0.0081,10.184812 z"
+             id="path4381-7"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="ccccc" />
+          <path
+             style="fill:none;stroke:#edd400;stroke-width:2;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"
+             d="M 39.005041,54.16825 39,46 53,32.5 l 0.0021,7.676847 z"
+             id="path4391-0"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="ccccc" />
+          <path
+             sodipodi:nodetypes="ccccc"
+             inkscape:connector-curvature="0"
+             id="path69038"
+             d="M 23,40 42,23 55,28 37,45 Z"
+             style="fill:#fce94f;fill-opacity:1;fill-rule:nonzero;stroke:#302b00;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" />
+          <path
+             sodipodi:nodetypes="ccccc"
+             inkscape:connector-curvature="0"
+             id="path69040"
+             d="M 23,40 V 26 L 42,10 v 13 z"
+             style="fill:url(#linearGradient69042);fill-opacity:1;fill-rule:nonzero;stroke:#302b00;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" />
+          <path
+             sodipodi:nodetypes="ccccc"
+             inkscape:connector-curvature="0"
+             id="path69044"
+             d="M 25,36 V 27 L 40,14 v 8 z"
+             style="fill:none;stroke:#edd400;stroke-width:2;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none" />
+          <path
+             sodipodi:nodetypes="ccccc"
+             inkscape:connector-curvature="0"
+             id="path69048"
+             d="M 11.008,33.60627 11,24 21,27 v 10 z"
+             style="fill:none;stroke:#fce94f;stroke-width:2;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none" />
+        </g>
+        <ellipse
+           style="opacity:0.10824741;fill:url(#radialGradient3071);fill-opacity:1;stroke:none"
+           id="path1361"
+           transform="matrix(2.7768748,0,0,1.9840737,-30.033844,-30.850663)"
+           cx="22.958872"
+           cy="34.94062"
+           rx="10.31934"
+           ry="2.320194" />
+      </g>
+      <g
+         transform="matrix(0.75,0,0,0.75,17.265467,25.040018)"
+         id="g7832">
+        <g
+           transform="matrix(1.9103677,0,0,1.8413744,-55.112023,-14.925729)"
+           id="g7828">
+          <path
+             style="fill:url(#linearGradient7834);fill-opacity:1;fill-rule:nonzero;stroke:#302b00;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+             d="M 9,35 V 21 l 14,5 v 14 z"
+             id="path7808"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="ccccc" />
+          <path
+             sodipodi:nodetypes="ccccc"
+             inkscape:connector-curvature="0"
+             id="path7810"
+             d="M 9,49 V 35 l 28,10 v 14 z"
+             style="fill:url(#linearGradient7836);fill-opacity:1;fill-rule:nonzero;stroke:#302b00;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" />
+          <path
+             sodipodi:nodetypes="ccccc"
+             inkscape:connector-curvature="0"
+             id="path7812"
+             d="M 37,59 V 45 L 55,28 v 13 z"
+             style="fill:url(#linearGradient7838);fill-opacity:1;fill-rule:nonzero;stroke:#302b00;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" />
+          <path
+             sodipodi:nodetypes="ccccc"
+             inkscape:connector-curvature="0"
+             id="path7814"
+             d="M 9,21 29,5 42,10 23,26 Z"
+             style="fill:#fce94f;fill-opacity:1;fill-rule:nonzero;stroke:#302b00;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" />
+          <path
+             sodipodi:nodetypes="ccccc"
+             inkscape:connector-curvature="0"
+             id="path7816"
+             d="M 11.008035,47.60627 11,38 l 24,8 0.0081,10.184812 z"
+             style="fill:none;stroke:#fce94f;stroke-width:2;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none" />
+          <path
+             sodipodi:nodetypes="ccccc"
+             inkscape:connector-curvature="0"
+             id="path7818"
+             d="M 39.005041,54.16825 39,46 53,32.5 l 0.0021,7.676847 z"
+             style="fill:none;stroke:#edd400;stroke-width:2;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none" />
+          <path
+             style="fill:#fce94f;fill-opacity:1;fill-rule:nonzero;stroke:#302b00;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+             d="M 23,40 42,23 55,28 37,45 Z"
+             id="path7820"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="ccccc" />
+          <path
+             style="fill:url(#linearGradient7840);fill-opacity:1;fill-rule:nonzero;stroke:#302b00;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+             d="M 23,40 V 26 L 42,10 v 13 z"
+             id="path7822"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="ccccc" />
+          <path
+             style="fill:none;stroke:#edd400;stroke-width:2;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"
+             d="M 25,36 V 27 L 40,14 v 8 z"
+             id="path7824"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="ccccc" />
+          <path
+             style="fill:none;stroke:#fce94f;stroke-width:2;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"
+             d="M 11.008,33.60627 11,24 21,27 v 10 z"
+             id="path7826"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="ccccc" />
+        </g>
+        <ellipse
+           ry="2.320194"
+           rx="10.31934"
+           cy="34.94062"
+           cx="22.958872"
+           transform="matrix(2.7768748,0,0,1.9840737,-30.033844,-30.850663)"
+           id="ellipse7830"
+           style="opacity:0.10824741;fill:url(#radialGradient7842);fill-opacity:1;stroke:none" />
+      </g>
+    </g>
   </g>
 </svg>
diff --git a/icons/a2p_EditPart.svg b/icons/a2p_EditPart.svg
index d788ca23..50c2dcc2 100644
--- a/icons/a2p_EditPart.svg
+++ b/icons/a2p_EditPart.svg
@@ -7,17 +7,138 @@
    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 48 48.000001"
-   id="svg2"
+   width="64"
+   height="64"
+   id="svg3559"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="a3_EditPart.svg">
+   inkscape:version="0.92.3 (unknown)"
+   sodipodi:docname="a2p_EditPart.svg"
+   viewBox="0 0 64 64">
   <defs
-     id="defs4" />
+     id="defs3561">
+    <linearGradient
+       id="linearGradient4383-3"
+       inkscape:collect="always">
+      <stop
+         id="stop73188"
+         offset="0"
+         style="stop-color:#3465a4;stop-opacity:1" />
+      <stop
+         id="stop73190"
+         offset="1"
+         style="stop-color:#729fcf;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4383-3"
+       id="linearGradient4389-0"
+       x1="27.243532"
+       y1="54.588112"
+       x2="21.243532"
+       y2="30.588112"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-1.243533,-2.588112)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4393-9"
+       id="linearGradient4399-7"
+       x1="48.714352"
+       y1="45.585785"
+       x2="40.714352"
+       y2="24.585787"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(1.2856487,1.4142136)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4393-9">
+      <stop
+         style="stop-color:#204a87;stop-opacity:1"
+         offset="0"
+         id="stop4395-8" />
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1"
+         offset="1"
+         id="stop4397-1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3057">
+      <stop
+         style="stop-color:#8ae234;stop-opacity:1"
+         offset="0.0000000"
+         id="stop3059" />
+      <stop
+         style="stop-color:#4e9a06;stop-opacity:1"
+         offset="1.0000000"
+         id="stop3061" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient73194"
+       id="linearGradient4389"
+       x1="20.243532"
+       y1="37.588112"
+       x2="17.243532"
+       y2="27.588112"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-1.243533,-2.588112)" />
+    <linearGradient
+       id="linearGradient73194"
+       inkscape:collect="always">
+      <stop
+         id="stop73202"
+         offset="0"
+         style="stop-color:#c4a000;stop-opacity:1" />
+      <stop
+         id="stop73204"
+         offset="1"
+         style="stop-color:#fce94f;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient73194"
+       id="linearGradient69056"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-1.243533,-2.588112)"
+       x1="27.243532"
+       y1="54.588112"
+       x2="22.243532"
+       y2="40.588112" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient73208"
+       id="linearGradient4399"
+       x1="48.714352"
+       y1="45.585785"
+       x2="46.714352"
+       y2="34.585785"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(1.2856487,1.4142136)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient73208">
+      <stop
+         style="stop-color:#c4a000;stop-opacity:1"
+         offset="0"
+         id="stop73210" />
+      <stop
+         style="stop-color:#edd400;stop-opacity:1"
+         offset="1"
+         id="stop73212" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient73208"
+       id="linearGradient69042"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-12.714351,-17.585786)"
+       x1="48.714352"
+       y1="45.585785"
+       x2="46.714352"
+       y2="35.585785" />
+  </defs>
   <sodipodi:namedview
      id="base"
      pagecolor="#ffffff"
@@ -25,20 +146,31 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="7.9195959"
-     inkscape:cx="34.973813"
-     inkscape:cy="24.565115"
+     inkscape:zoom="0.5"
+     inkscape:cx="32"
+     inkscape:cy="-54.167857"
+     inkscape:current-layer="g1848"
+     showgrid="true"
      inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     units="px"
-     inkscape:window-width="1012"
-     inkscape:window-height="898"
-     inkscape:window-x="592"
-     inkscape:window-y="498"
-     inkscape:window-maximized="0" />
+     inkscape:grid-bbox="true"
+     inkscape:window-width="1366"
+     inkscape:window-height="716"
+     inkscape:window-x="0"
+     inkscape:window-y="26"
+     inkscape:window-maximized="1"
+     inkscape:snap-global="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3007"
+       empspacing="4"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       spacingx="0.5"
+       spacingy="0.5" />
+  </sodipodi:namedview>
   <metadata
-     id="metadata7">
+     id="metadata3564">
     <rdf:RDF>
       <cc:Work
          rdf:about="">
@@ -46,54 +178,155 @@
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <dc:title></dc:title>
+        <dc:title>Path-Stock</dc:title>
+        <dc:date>2015-07-04</dc:date>
+        <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
+        <dc:publisher>
+          <cc:Agent>
+            <dc:title>FreeCAD</dc:title>
+          </cc:Agent>
+        </dc:publisher>
+        <dc:identifier>FreeCAD/src/Mod/Path/Gui/Resources/icons/Path-Stock.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
-     inkscape:label="Ebene 1"
-     inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(0,-1004.3622)">
-    <rect
-       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffff3e;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.45677078;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-       id="rect3336"
-       width="42.600983"
-       height="35.277378"
-       x="0.60719252"
-       y="1016.6039" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 29.7995,1006.6528 -17.046324,28.4105 -1.262691,9.3439 9.47018,-5.9346 15.657365,-27.9055 z"
-       id="path3355"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:#ff9955;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 13.131983,1034.8108 7.828682,3.5355"
-       id="path4157"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:#552200;fill-opacity:1;stroke:#f30909;stroke-width:0.12626907;stroke-opacity:1"
-       d="m 12.240906,38.600091 c 0.03795,-0.194614 0.281411,-1.955589 0.541025,-3.913277 0.259614,-1.957688 0.503631,-3.544893 0.542262,-3.527121 0.03863,0.01777 1.504969,0.678361 3.25853,1.467977 1.753562,0.789617 3.188294,1.46808 3.188294,1.507697 0,0.0617 -1.20487,0.82724 -6.728809,4.275321 l -0.870302,0.543248 0.069,-0.353845 z"
-       id="path4159"
-       inkscape:connector-curvature="0"
-       transform="translate(0,1004.3622)" />
-    <path
-       style="fill:#2b1100;fill-opacity:1;stroke:#f30909;stroke-width:0.12626907;stroke-opacity:1"
-       d="m 17.212142,31.697738 c -1.858793,-0.842991 -3.364552,-1.596123 -3.34613,-1.673624 0.01842,-0.0775 2.306089,-3.92713 5.083705,-8.554729 l 5.050211,-8.413817 4.077171,0 c 3.846878,0 4.07005,0.01248 3.951075,0.22097 -0.06935,0.121534 -2.614095,4.648611 -5.654983,10.060171 -3.040888,5.411559 -5.585708,9.851472 -5.655156,9.86647 -0.06945,0.015 -1.6471,-0.662449 -3.505893,-1.505441 z"
-       id="path4165"
-       inkscape:connector-curvature="0"
-       transform="translate(0,1004.3622)" />
-    <path
-       style="fill:#2b1100;fill-opacity:1;stroke:#f30909;stroke-width:0.12626907;stroke-opacity:1"
-       d="m 25.074318,11.341058 c 0,-0.104565 4.671072,-7.906956 4.84706,-8.0963549 0.107328,-0.1155074 0.811618,0.2330196 2.978363,1.4738826 1.560787,0.8938398 2.850881,1.6721797 2.866876,1.7296441 0.016,0.057464 -0.580302,1.1840812 -1.325104,2.503593 l -1.354186,2.3991122 -4.006505,0.03334 c -2.203577,0.01834 -4.006504,-0.0011 -4.006504,-0.04322 z"
-       id="path4167"
-       inkscape:connector-curvature="0"
-       transform="translate(0,1004.3622)" />
-    <path
-       style="fill:#e3dbdb;fill-opacity:1;stroke:#f30909;stroke-width:0.12626907;stroke-opacity:1"
-       d="m 12.368844,38.352068 c 0.03996,-0.197098 0.276078,-1.834195 0.524712,-3.637994 0.248633,-1.803799 0.477026,-3.304599 0.507539,-3.335113 0.03051,-0.03051 1.282732,0.507775 2.782708,1.196195 1.499976,0.68842 2.863904,1.305258 3.030952,1.37075 0.361764,0.141832 0.376706,0.214948 0.08275,0.404936 -0.940764,0.608034 -6.527701,4.106114 -6.736703,4.217968 -0.245127,0.131188 -0.259263,0.115227 -0.191961,-0.216742 z"
-       id="path4169"
-       inkscape:connector-curvature="0"
-       transform="translate(0,1004.3622)" />
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <g
+       id="g1848"
+       transform="translate(-36.418987,-6.165634)">
+      <g
+         transform="translate(36.418987,6.1656481)"
+         id="g7553">
+        <path
+           style="fill:url(#linearGradient4389);fill-opacity:1;fill-rule:nonzero;stroke:#302b00;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+           d="M 9,35 V 21 l 14,5 v 14 z"
+           id="path69052"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc" />
+        <path
+           sodipodi:nodetypes="ccccc"
+           inkscape:connector-curvature="0"
+           id="path4381"
+           d="M 9,49 V 35 l 28,10 v 14 z"
+           style="fill:url(#linearGradient69056);fill-opacity:1;fill-rule:nonzero;stroke:#302b00;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" />
+        <path
+           sodipodi:nodetypes="ccccc"
+           inkscape:connector-curvature="0"
+           id="path4391"
+           d="M 37,59 V 45 L 55,28 v 13 z"
+           style="fill:url(#linearGradient4399);fill-opacity:1;fill-rule:nonzero;stroke:#302b00;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" />
+        <path
+           sodipodi:nodetypes="ccccc"
+           inkscape:connector-curvature="0"
+           id="path4403"
+           d="M 9,21 29,5 42,10 23,26 Z"
+           style="fill:#fce94f;fill-opacity:1;fill-rule:nonzero;stroke:#302b00;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" />
+        <path
+           sodipodi:nodetypes="ccccc"
+           inkscape:connector-curvature="0"
+           id="path4381-7"
+           d="M 11.008035,47.60627 11,38 l 24,8 0.0081,10.184812 z"
+           style="fill:none;stroke:#fce94f;stroke-width:2;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none" />
+        <path
+           sodipodi:nodetypes="ccccc"
+           inkscape:connector-curvature="0"
+           id="path4391-0"
+           d="M 39.005041,54.16825 39,46 53,32.5 l 0.0021,7.676847 z"
+           style="fill:none;stroke:#edd400;stroke-width:2;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none" />
+        <path
+           style="fill:#fce94f;fill-opacity:1;fill-rule:nonzero;stroke:#302b00;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+           d="M 23,40 42,23 55,28 37,45 Z"
+           id="path69038"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc" />
+        <path
+           style="fill:url(#linearGradient69042);fill-opacity:1;fill-rule:nonzero;stroke:#302b00;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+           d="M 23,40 V 26 L 42,10 v 13 z"
+           id="path69040"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc" />
+        <path
+           style="fill:none;stroke:#edd400;stroke-width:2;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"
+           d="M 25,36 V 27 L 40,14 v 8 z"
+           id="path69044"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc" />
+        <path
+           style="fill:none;stroke:#fce94f;stroke-width:2;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"
+           d="M 11.008,33.60627 11,24 21,27 v 10 z"
+           id="path69048"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc" />
+      </g>
+      <g
+         id="g1910"
+         transform="rotate(-10,39.313097,41.766564)">
+        <rect
+           transform="matrix(-0.60022963,-0.79982772,-0.79982775,0.6002296,0,0)"
+           y="-52.776577"
+           x="-81.614006"
+           height="4"
+           width="12"
+           id="rect3933"
+           style="fill:#d3d7cf;fill-opacity:1;stroke:#2e3436;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.89999998;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           style="fill:#ffffff;stroke:#302b00;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+           d="m 59.206199,57.608268 -16.472623,4.706106 9.574027,-14.554163 4.004108,-1.732738 6.107276,8.138161 z"
+           id="path3969"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cccccc" />
+        <path
+           style="fill:#ef2929;stroke:#302b00;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+           d="M 88.000001,36.000001 85.599082,32.800694 57.605114,53.808727 c 3.211852,-0.06298 2.800161,0.399035 1.601085,3.799541 z"
+           id="path3843-5-6"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc" />
+        <path
+           style="fill:#cc0000;stroke:#302b00;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+           d="M 85.599082,32.800694 83.198164,29.601379 55.204189,50.609421 c 3.253789,-0.0068 3.211861,-0.06298 2.400925,3.199306 z"
+           id="path3843-5-6-2"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc" />
+        <path
+           style="fill:#a40000;stroke:#302b00;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+           d="M 83.198162,29.601379 80.797246,26.402073 52.803275,47.410106 c 2.800109,0.399198 3.25378,-0.0068 2.400914,3.199315 z"
+           id="path3843-5-6-9"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc" />
+        <path
+           style="fill:#271903;stroke:#271903;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+           d="m 50.859604,59.814357 c 0.546485,-2.603851 -0.653972,-4.203508 -3.454801,-4.603642 l -4.671227,7.103659 8.126028,-2.500017 v 0"
+           id="path3971"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc" />
+        <rect
+           transform="matrix(-0.60022963,-0.79982772,-0.79982775,0.6002296,0,0)"
+           y="-58.776566"
+           x="-81.614006"
+           height="6"
+           width="12"
+           id="rect3935"
+           style="fill:#cc0000;fill-opacity:1;stroke:#280000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.89999998;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path3937"
+           d="M 90.798684,31.399199 93.198163,29.598514 87.796102,22.40006"
+           style="fill:none;stroke:#ef2929;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      </g>
+    </g>
   </g>
 </svg>
diff --git a/icons/a2p_ImportPart.svg b/icons/a2p_ImportPart.svg
index 48d6e67b..df87ed25 100644
--- a/icons/a2p_ImportPart.svg
+++ b/icons/a2p_ImportPart.svg
@@ -7,17 +7,171 @@
    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 48 48.000001"
-   id="svg2"
+   width="64"
+   height="64"
+   id="svg3559"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="a3_ImportPart.svg">
+   inkscape:version="0.92.3 (unknown)"
+   sodipodi:docname="a2p_ImportPart.svg"
+   viewBox="0 0 64 64">
   <defs
-     id="defs4" />
+     id="defs3561">
+    <linearGradient
+       id="linearGradient4383-3"
+       inkscape:collect="always">
+      <stop
+         id="stop73188"
+         offset="0"
+         style="stop-color:#3465a4;stop-opacity:1" />
+      <stop
+         id="stop73190"
+         offset="1"
+         style="stop-color:#729fcf;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4383-3"
+       id="linearGradient4389-0"
+       x1="27.243532"
+       y1="54.588112"
+       x2="21.243532"
+       y2="30.588112"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-1.243533,-2.588112)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4393-9"
+       id="linearGradient4399-7"
+       x1="48.714352"
+       y1="45.585785"
+       x2="40.714352"
+       y2="24.585787"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(1.2856487,1.4142136)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4393-9">
+      <stop
+         style="stop-color:#204a87;stop-opacity:1"
+         offset="0"
+         id="stop4395-8" />
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1"
+         offset="1"
+         id="stop4397-1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient73194"
+       id="linearGradient4389"
+       x1="20.243532"
+       y1="37.588112"
+       x2="17.243532"
+       y2="27.588112"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-1.243533,-2.588112)" />
+    <linearGradient
+       id="linearGradient73194"
+       inkscape:collect="always">
+      <stop
+         id="stop73202"
+         offset="0"
+         style="stop-color:#c4a000;stop-opacity:1" />
+      <stop
+         id="stop73204"
+         offset="1"
+         style="stop-color:#fce94f;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient73194"
+       id="linearGradient69056"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-1.243533,-2.588112)"
+       x1="27.243532"
+       y1="54.588112"
+       x2="22.243532"
+       y2="40.588112" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient73208"
+       id="linearGradient4399"
+       x1="48.714352"
+       y1="45.585785"
+       x2="46.714352"
+       y2="34.585785"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(1.2856487,1.4142136)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient73208">
+      <stop
+         style="stop-color:#c4a000;stop-opacity:1"
+         offset="0"
+         id="stop73210" />
+      <stop
+         style="stop-color:#edd400;stop-opacity:1"
+         offset="1"
+         id="stop73212" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient73208"
+       id="linearGradient69042"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-12.714351,-17.585786)"
+       x1="48.714352"
+       y1="45.585785"
+       x2="46.714352"
+       y2="35.585785" />
+    <radialGradient
+       r="10.31934"
+       fy="35.127438"
+       fx="23.070683"
+       cy="35.127438"
+       cx="23.070683"
+       gradientTransform="matrix(0.914812,0.01265023,-0.00821502,0.213562,2.253914,27.18889)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3071"
+       xlink:href="#linearGradient2091"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2091">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2093" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop2095" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3057"
+       id="linearGradient3053"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.9455392,0,0,1.9455392,-47.998185,-58.673094)"
+       x1="41.511921"
+       y1="26.271811"
+       x2="42.984806"
+       y2="49.460072" />
+    <linearGradient
+       id="linearGradient3057">
+      <stop
+         style="stop-color:#8ae234;stop-opacity:1"
+         offset="0.0000000"
+         id="stop3059" />
+      <stop
+         style="stop-color:#4e9a06;stop-opacity:1"
+         offset="1.0000000"
+         id="stop3061" />
+    </linearGradient>
+  </defs>
   <sodipodi:namedview
      id="base"
      pagecolor="#ffffff"
@@ -25,55 +179,152 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="7.9195959"
-     inkscape:cx="27.558379"
-     inkscape:cy="23.725598"
-     inkscape:document-units="px"
+     inkscape:zoom="1"
+     inkscape:cx="32"
+     inkscape:cy="32"
      inkscape:current-layer="layer1"
-     showgrid="false"
-     units="px"
-     inkscape:window-width="978"
-     inkscape:window-height="869"
-     inkscape:window-x="1556"
-     inkscape:window-y="533"
-     inkscape:window-maximized="0" />
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     inkscape:window-width="1358"
+     inkscape:window-height="712"
+     inkscape:window-x="0"
+     inkscape:window-y="26"
+     inkscape:window-maximized="0"
+     inkscape:snap-global="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3007"
+       empspacing="4"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       spacingx="0.5"
+       spacingy="0.5" />
+  </sodipodi:namedview>
   <metadata
-     id="metadata7">
+     id="metadata3564">
     <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></dc:title>
+        <dc:title>Path-Stock</dc:title>
+        <dc:date>2015-07-04</dc:date>
+        <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
+        <dc:publisher>
+          <cc:Agent>
+            <dc:title>FreeCAD</dc:title>
+          </cc:Agent>
+        </dc:publisher>
+        <dc:identifier>FreeCAD/src/Mod/Path/Gui/Resources/icons/Path-Stock.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
-     inkscape:label="Ebene 1"
-     inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(0,-1004.3622)">
-    <rect
-       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffff3e;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.44918144;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-       id="rect3336"
-       width="39.07304"
-       height="38.062881"
-       x="1.1084744"
-       y="1013.317" />
-    <rect
-       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f30909;fill-opacity:1;fill-rule:nonzero;stroke:#ef0505;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-       id="rect3337"
-       width="8.3337584"
-       height="38.259529"
-       x="21.970818"
-       y="1008.9257" />
-    <rect
-       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f30909;fill-opacity:1;fill-rule:nonzero;stroke:#f30909;stroke-width:1.01938117;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-       id="rect4139"
-       width="37.608803"
-       height="8.8194532"
-       x="6.8282204"
-       y="1024.9714" />
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <g
+       transform="translate(0,1.3977046e-5)"
+       id="g7553">
+      <path
+         style="fill:url(#linearGradient4389);fill-opacity:1;fill-rule:nonzero;stroke:#302b00;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+         d="M 9,35 V 21 l 14,5 v 14 z"
+         id="path69052"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0"
+         id="path4381"
+         d="M 9,49 V 35 l 28,10 v 14 z"
+         style="fill:url(#linearGradient69056);fill-opacity:1;fill-rule:nonzero;stroke:#302b00;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0"
+         id="path4391"
+         d="M 37,59 V 45 L 55,28 v 13 z"
+         style="fill:url(#linearGradient4399);fill-opacity:1;fill-rule:nonzero;stroke:#302b00;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0"
+         id="path4403"
+         d="M 9,21 29,5 42,10 23,26 Z"
+         style="fill:#fce94f;fill-opacity:1;fill-rule:nonzero;stroke:#302b00;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0"
+         id="path4381-7"
+         d="M 11.008035,47.60627 11,38 l 24,8 0.0081,10.184812 z"
+         style="fill:none;stroke:#fce94f;stroke-width:2;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0"
+         id="path4391-0"
+         d="M 39.005041,54.16825 39,46 53,32.5 l 0.0021,7.676847 z"
+         style="fill:none;stroke:#edd400;stroke-width:2;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none" />
+      <path
+         style="fill:#fce94f;fill-opacity:1;fill-rule:nonzero;stroke:#302b00;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+         d="M 23,40 42,23 55,28 37,45 Z"
+         id="path69038"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         style="fill:url(#linearGradient69042);fill-opacity:1;fill-rule:nonzero;stroke:#302b00;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+         d="M 23,40 V 26 L 42,10 v 13 z"
+         id="path69040"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         style="fill:none;stroke:#edd400;stroke-width:2;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"
+         d="M 25,36 V 27 L 40,14 v 8 z"
+         id="path69044"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         style="fill:none;stroke:#fce94f;stroke-width:2;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"
+         d="M 11.008,33.60627 11,24 21,27 v 10 z"
+         id="path69048"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccc" />
+    </g>
+    <g
+       transform="matrix(0.52345945,0,0,0.5430726,28.848909,8.1057686)"
+       id="g6897">
+      <ellipse
+         ry="2.320194"
+         rx="10.31934"
+         cy="34.94062"
+         cx="22.958872"
+         transform="matrix(2.7768748,0,0,1.9840737,-30.033844,-30.850663)"
+         id="path1361"
+         style="opacity:0.10824741;fill:url(#radialGradient3071);fill-opacity:1;stroke:none" />
+      <path
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:59.90107727px;line-height:125%;font-family:'Bitstream Vera Sans';text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#8ae234;stroke:#172a04;stroke-width:1.87555385;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+         d="M 40.406357,40.315477 V 21.901733 H 59.510033 V 9.0121121 H 40.406357 V -9.4016322 H 27.033783 l 1e-6,18.4137443 H 7.9301075 l -1e-6,12.8896209 H 27.033783 l -1e-6,18.413744 z"
+         id="text1314"
+         sodipodi:nodetypes="ccccccccccccc"
+         inkscape:connector-curvature="0" />
+      <path
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:59.90107727px;line-height:125%;font-family:'Bitstream Vera Sans';text-align:start;writing-mode:lr-tb;text-anchor:start;fill:url(#linearGradient3053);fill-opacity:1;stroke:#8ae234;stroke-width:1.87555385;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 38.495989,38.474103 V 20.060359 H 57.599665 V 10.853487 H 38.495989 V -7.5602578 h -9.551838 l 4e-6,18.4137448 H 9.8404782 l -4e-6,9.206872 H 28.944151 l 1.3e-5,18.413744 h 9.551838 z"
+         id="path7076"
+         sodipodi:nodetypes="cccccccccccccc"
+         inkscape:connector-curvature="0" />
+    </g>
   </g>
 </svg>
diff --git a/icons/a2p_ImportPart_Update.svg b/icons/a2p_ImportPart_Update.svg
new file mode 100644
index 00000000..ef07cc4d
--- /dev/null
+++ b/icons/a2p_ImportPart_Update.svg
@@ -0,0 +1,451 @@
+<?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="64"
+   height="64"
+   id="svg3559"
+   version="1.1"
+   inkscape:version="0.92.3 (unknown)"
+   sodipodi:docname="a2p_ImportPart_Update.svg"
+   viewBox="0 0 64 64">
+  <defs
+     id="defs3561">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient73208">
+      <stop
+         style="stop-color:#c4a000;stop-opacity:1"
+         offset="0"
+         id="stop73210" />
+      <stop
+         style="stop-color:#edd400;stop-opacity:1"
+         offset="1"
+         id="stop73212" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient73194"
+       inkscape:collect="always">
+      <stop
+         id="stop73202"
+         offset="0"
+         style="stop-color:#c4a000;stop-opacity:1" />
+      <stop
+         id="stop73204"
+         offset="1"
+         style="stop-color:#fce94f;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4383-3"
+       inkscape:collect="always">
+      <stop
+         id="stop73188"
+         offset="0"
+         style="stop-color:#3465a4;stop-opacity:1" />
+      <stop
+         id="stop73190"
+         offset="1"
+         style="stop-color:#729fcf;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient73194"
+       id="linearGradient4389"
+       x1="20.243532"
+       y1="37.588112"
+       x2="17.243532"
+       y2="27.588112"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-1.243533,-2.588112)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient73208"
+       id="linearGradient4399"
+       x1="48.714352"
+       y1="45.585785"
+       x2="46.714352"
+       y2="34.585785"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(1.2856487,1.4142136)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4383-3"
+       id="linearGradient4389-0"
+       x1="27.243532"
+       y1="54.588112"
+       x2="21.243532"
+       y2="30.588112"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-1.243533,-2.588112)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4393-9"
+       id="linearGradient4399-7"
+       x1="48.714352"
+       y1="45.585785"
+       x2="40.714352"
+       y2="24.585787"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(1.2856487,1.4142136)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4393-9">
+      <stop
+         style="stop-color:#204a87;stop-opacity:1"
+         offset="0"
+         id="stop4395-8" />
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1"
+         offset="1"
+         id="stop4397-1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient73208"
+       id="linearGradient69042"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-12.714351,-17.585786)"
+       x1="48.714352"
+       y1="45.585785"
+       x2="46.714352"
+       y2="35.585785" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient73194"
+       id="linearGradient69056"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-1.243533,-2.588112)"
+       x1="27.243532"
+       y1="54.588112"
+       x2="22.243532"
+       y2="40.588112" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4272"
+       id="linearGradient1747"
+       gradientUnits="userSpaceOnUse"
+       x1="60.093285"
+       y1="26.518738"
+       x2="60.368435"
+       y2="18.118267" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4272">
+      <stop
+         style="stop-color:#8ae234;stop-opacity:1;"
+         offset="0"
+         id="stop4274" />
+      <stop
+         style="stop-color:#8ae234;stop-opacity:0;"
+         offset="1"
+         id="stop4276" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4262"
+       id="linearGradient1749"
+       gradientUnits="userSpaceOnUse"
+       x1="43.341869"
+       y1="23.586662"
+       x2="49.500511"
+       y2="20.050343" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4262">
+      <stop
+         style="stop-color:#4e9a06;stop-opacity:1;"
+         offset="0"
+         id="stop4264" />
+      <stop
+         id="stop4270"
+         offset="0.43075874"
+         style="stop-color:#4e9a06;stop-opacity:0.49803922;" />
+      <stop
+         style="stop-color:#4e9a06;stop-opacity:0;"
+         offset="1"
+         id="stop4266" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4272"
+       id="linearGradient1896"
+       gradientUnits="userSpaceOnUse"
+       x1="60.093285"
+       y1="26.518738"
+       x2="60.368435"
+       y2="18.118267" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4262"
+       id="linearGradient1898"
+       gradientUnits="userSpaceOnUse"
+       x1="43.341869"
+       y1="23.586662"
+       x2="49.500511"
+       y2="20.050343" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4272"
+       id="linearGradient1900"
+       gradientUnits="userSpaceOnUse"
+       x1="60.093285"
+       y1="26.518738"
+       x2="60.368435"
+       y2="18.118267" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4262"
+       id="linearGradient1902"
+       gradientUnits="userSpaceOnUse"
+       x1="43.341869"
+       y1="23.586662"
+       x2="49.500511"
+       y2="20.050343" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="8.25"
+     inkscape:cx="32"
+     inkscape:cy="32"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     inkscape:window-width="1366"
+     inkscape:window-height="716"
+     inkscape:window-x="0"
+     inkscape:window-y="26"
+     inkscape:window-maximized="1"
+     inkscape:snap-global="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3007"
+       empspacing="4"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       spacingx="0.5"
+       spacingy="0.5" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata3564">
+    <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>
+        <dc:title>Path-Stock</dc:title>
+        <dc:date>2015-07-04</dc:date>
+        <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
+        <dc:publisher>
+          <cc:Agent>
+            <dc:title>FreeCAD</dc:title>
+          </cc:Agent>
+        </dc:publisher>
+        <dc:identifier>FreeCAD/src/Mod/Path/Gui/Resources/icons/Path-Stock.svg</dc:identifier>
+        <dc:rights>
+          <cc:Agent>
+            <dc:title>FreeCAD LGPL2+</dc:title>
+          </cc:Agent>
+        </dc:rights>
+        <cc:license>https://www.gnu.org/copyleft/lesser.html</cc:license>
+        <dc:contributor>
+          <cc:Agent>
+            <dc:title>[agryson] Alexander Gryson</dc:title>
+          </cc:Agent>
+        </dc:contributor>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <g
+       id="g1914">
+      <path
+         style="fill:url(#linearGradient4389);fill-opacity:1.0;fill-rule:nonzero;stroke:#302b00;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+         d="m 9,35 0,-14 14,5 0,14 z"
+         id="path69052"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0"
+         id="path4381"
+         d="M 9,49 9,35 37,45 37,59 Z"
+         style="fill:url(#linearGradient69056);fill-opacity:1.0;fill-rule:nonzero;stroke:#302b00;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0"
+         id="path4391"
+         d="M 37,59 37,45 55,28 55,41 Z"
+         style="fill:url(#linearGradient4399);fill-opacity:1;fill-rule:nonzero;stroke:#302b00;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0"
+         id="path4403"
+         d="M 9,21 29,5 42,10 23,26 Z"
+         style="fill:#fce94f;fill-opacity:1;fill-rule:nonzero;stroke:#302b00;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0"
+         id="path4381-7"
+         d="M 11.008035,47.60627 11,38 l 24,8 0.0081,10.184812 z"
+         style="fill:none;stroke:#fce94f;stroke-width:2;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0"
+         id="path4391-0"
+         d="M 39.005041,54.16825 39,46 53,32.5 l 0.0021,7.676847 z"
+         style="fill:none;stroke:#edd400;stroke-width:2;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none" />
+      <path
+         style="fill:#fce94f;fill-opacity:1;fill-rule:nonzero;stroke:#302b00;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+         d="M 23,40 42,23 55,28 37,45 Z"
+         id="path69038"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         style="fill:url(#linearGradient69042);fill-opacity:1;fill-rule:nonzero;stroke:#302b00;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+         d="M 23,40 23,26 42,10 42,23 Z"
+         id="path69040"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         style="fill:none;stroke:#edd400;stroke-width:2;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"
+         d="m 25,36 0,-9 15,-13 0,8 z"
+         id="path69044"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         style="fill:none;stroke:#fce94f;stroke-width:2;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"
+         d="M 11.008,33.60627 11,24 l 10,3 0,10 z"
+         id="path69048"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccc" />
+    </g>
+    <g
+       style="display:inline"
+       id="g1745"
+       transform="translate(0.734118,16.287239)">
+      <g
+         id="g1708">
+        <path
+           style="color:#000000;display:block;overflow:visible;visibility:visible;fill:url(#linearGradient1896);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient1898);stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
+           d="m 36.693741,33.480869 c 0,0 12.247378,0.84932 8.478954,-13.41925 h 10.534457 c 0,0 -0.685168,16.137073 -19.013411,13.41925 z"
+           id="path1700"
+           inkscape:r_cx="true"
+           inkscape:r_cy="true"
+           sodipodi:nodetypes="cccc"
+           inkscape:connector-curvature="0" />
+        <path
+           inkscape:connector-curvature="0"
+           inkscape:r_cy="true"
+           inkscape:r_cx="true"
+           style="color:#000000;display:block;overflow:visible;visibility:visible;fill:#8ae234;fill-opacity:1;fill-rule:nonzero;stroke:#4e9a06;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
+           d="m 55.477287,19.596314 c 5.030202,23.64849 -20.43164,32.533266 -42.629203,15.168032 l -6.542274,7.122518 0.13116,-23.281319 20.502868,0.02094 c 0,0 -6.824331,7.607846 -6.824331,7.607846 15.61103,11.73228 35.604518,10.854014 35.36178,-6.638013 z"
+           id="path1702"
+           sodipodi:nodetypes="ccccccc" />
+        <g
+           style="fill:#73d216;fill-opacity:1;stroke:#8ae234;stroke-width:0.73280919;stroke-opacity:1"
+           inkscape:r_cy="true"
+           inkscape:r_cx="true"
+           transform="matrix(0.69686517,0.58385766,0.58876622,-0.69105539,-8.35526,29.821354)"
+           id="g1706">
+          <path
+             inkscape:r_cy="true"
+             inkscape:r_cx="true"
+             style="color:#000000;display:block;overflow:visible;visibility:visible;fill:#73d216;fill-opacity:1;stroke:#8ae234;stroke-width:2.20148993;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:21;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
+             d="M 52.368857,42.344789 C 57.336994,33.465615 49.176003,12.601866 19.05552,12.672851 L 18.677956,5.6633463 7.4378077,19.282655 19.129354,29.167094 18.807724,20.554957 c 18.244937,0.381972 33.804002,9.457851 33.561133,21.789832 z"
+             id="path1704"
+             sodipodi:nodetypes="ccccccc"
+             inkscape:connector-curvature="0" />
+        </g>
+      </g>
+      <g
+         id="g1718">
+        <path
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cccc"
+           inkscape:r_cy="true"
+           inkscape:r_cx="true"
+           id="path1710"
+           d="m 36.693741,33.480869 c 0,0 12.247378,0.84932 8.478954,-13.41925 h 10.534457 c 0,0 -0.685168,16.137073 -19.013411,13.41925 z"
+           style="color:#000000;display:block;overflow:visible;visibility:visible;fill:url(#linearGradient1900);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient1902);stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none" />
+        <path
+           sodipodi:nodetypes="ccccccc"
+           id="path1712"
+           d="m 55.477287,19.596314 c 5.030202,23.64849 -20.43164,32.533266 -42.629203,15.168032 l -6.542274,7.122518 0.13116,-23.281319 20.502868,0.02094 c 0,0 -6.824331,7.607846 -6.824331,7.607846 15.61103,11.73228 35.604518,10.854014 35.36178,-6.638013 z"
+           style="color:#000000;display:block;overflow:visible;visibility:visible;fill:#8ae234;fill-opacity:1;fill-rule:nonzero;stroke:#4e9a06;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
+           inkscape:r_cx="true"
+           inkscape:r_cy="true"
+           inkscape:connector-curvature="0" />
+        <g
+           id="g1716"
+           transform="matrix(0.69686517,0.58385766,0.58876622,-0.69105539,-8.35526,29.821354)"
+           inkscape:r_cx="true"
+           inkscape:r_cy="true"
+           style="fill:#73d216;fill-opacity:1;stroke:#8ae234;stroke-width:0.73280919;stroke-opacity:1">
+          <path
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="ccccccc"
+             id="path1714"
+             d="M 52.368857,42.344789 C 57.336994,33.465615 49.176003,12.601866 19.05552,12.672851 L 18.677956,5.6633463 7.4378077,19.282655 19.129354,29.167094 18.807724,20.554957 c 18.244937,0.381972 33.804002,9.457851 33.561133,21.789832 z"
+             style="color:#000000;display:block;overflow:visible;visibility:visible;fill:#73d216;fill-opacity:1;stroke:#8ae234;stroke-width:2.20148993;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:21;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
+             inkscape:r_cx="true"
+             inkscape:r_cy="true" />
+        </g>
+      </g>
+      <g
+         id="g1728"
+         transform="rotate(180,31.265882,15.712761)">
+        <path
+           style="color:#000000;display:block;overflow:visible;visibility:visible;fill:url(#linearGradient1747);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient1749);stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
+           d="m 36.693741,33.480869 c 0,0 12.247378,0.84932 8.478954,-13.41925 h 10.534457 c 0,0 -0.685168,16.137073 -19.013411,13.41925 z"
+           id="path1720"
+           inkscape:r_cx="true"
+           inkscape:r_cy="true"
+           sodipodi:nodetypes="cccc"
+           inkscape:connector-curvature="0" />
+        <path
+           inkscape:connector-curvature="0"
+           inkscape:r_cy="true"
+           inkscape:r_cx="true"
+           style="color:#000000;display:block;overflow:visible;visibility:visible;fill:#8ae234;fill-opacity:1;fill-rule:nonzero;stroke:#4e9a06;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
+           d="m 55.477287,19.596314 c 5.030202,23.64849 -20.43164,32.533266 -42.629203,15.168032 l -6.542274,7.122518 0.13116,-23.281319 20.502868,0.02094 c 0,0 -6.824331,7.607846 -6.824331,7.607846 15.61103,11.73228 35.604518,10.854014 35.36178,-6.638013 z"
+           id="path1722"
+           sodipodi:nodetypes="ccccccc" />
+        <g
+           style="fill:#73d216;fill-opacity:1;stroke:#8ae234;stroke-width:0.73280919;stroke-opacity:1"
+           inkscape:r_cy="true"
+           inkscape:r_cx="true"
+           transform="matrix(0.69686517,0.58385766,0.58876622,-0.69105539,-8.35526,29.821354)"
+           id="g1726">
+          <path
+             inkscape:r_cy="true"
+             inkscape:r_cx="true"
+             style="color:#000000;display:block;overflow:visible;visibility:visible;fill:#73d216;fill-opacity:1;stroke:#8ae234;stroke-width:2.20148993;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:21;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
+             d="M 52.368857,42.344789 C 57.336994,33.465615 49.176003,12.601866 19.05552,12.672851 L 18.677956,5.6633463 7.4378077,19.282655 19.129354,29.167094 18.807724,20.554957 c 18.244937,0.381972 33.804002,9.457851 33.561133,21.789832 z"
+             id="path1724"
+             sodipodi:nodetypes="ccccccc"
+             inkscape:connector-curvature="0" />
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/icons/a2p_Isolate_Element.svg b/icons/a2p_Isolate_Element.svg
new file mode 100644
index 00000000..eb8886d7
--- /dev/null
+++ b/icons/a2p_Isolate_Element.svg
@@ -0,0 +1,217 @@
+<?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="64"
+   height="64"
+   id="svg3559"
+   version="1.1"
+   inkscape:version="0.92.3 (unknown)"
+   sodipodi:docname="a2p_Isolate_Element.svg"
+   viewBox="0 0 64 64">
+  <defs
+     id="defs3561">
+    <linearGradient
+       id="linearGradient4383-3"
+       inkscape:collect="always">
+      <stop
+         id="stop73188"
+         offset="0"
+         style="stop-color:#3465a4;stop-opacity:1" />
+      <stop
+         id="stop73190"
+         offset="1"
+         style="stop-color:#729fcf;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4383-3"
+       id="linearGradient4389-0"
+       x1="27.243532"
+       y1="54.588112"
+       x2="21.243532"
+       y2="30.588112"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-1.243533,-2.588112)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4393-9"
+       id="linearGradient4399-7"
+       x1="48.714352"
+       y1="45.585785"
+       x2="40.714352"
+       y2="24.585787"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(1.2856487,1.4142136)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4393-9">
+      <stop
+         style="stop-color:#204a87;stop-opacity:1"
+         offset="0"
+         id="stop4395-8" />
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1"
+         offset="1"
+         id="stop4397-1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5058">
+      <stop
+         id="stop5060"
+         offset="0"
+         style="stop-color:#888a85;stop-opacity:1;" />
+      <stop
+         id="stop5066"
+         offset="0.5"
+         style="stop-color:#eeeeec;stop-opacity:1;" />
+      <stop
+         id="stop3430"
+         offset="1"
+         style="stop-color:#888a85;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3414">
+      <stop
+         id="stop3416"
+         offset="0"
+         style="stop-color:#eeeeec;stop-opacity:1;" />
+      <stop
+         id="stop3418"
+         offset="0.5"
+         style="stop-color:#ef2929;stop-opacity:1;" />
+      <stop
+         id="stop3420"
+         offset="1"
+         style="stop-color:#a40000;stop-opacity:1;" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="6.257462"
+     inkscape:cx="32.046028"
+     inkscape:cy="31.878788"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     inkscape:window-width="1366"
+     inkscape:window-height="716"
+     inkscape:window-x="0"
+     inkscape:window-y="26"
+     inkscape:window-maximized="1"
+     inkscape:snap-global="false"
+     inkscape:snap-nodes="false"
+     inkscape:snap-others="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3007"
+       empspacing="4"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       spacingx="0.5"
+       spacingy="0.5" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata3564">
+    <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>Path-Stock</dc:title>
+        <dc:date>2015-07-04</dc:date>
+        <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
+        <dc:publisher>
+          <cc:Agent>
+            <dc:title>FreeCAD</dc:title>
+          </cc:Agent>
+        </dc:publisher>
+        <dc:identifier>FreeCAD/src/Mod/Path/Gui/Resources/icons/Path-Stock.svg</dc:identifier>
+        <dc:rights>
+          <cc:Agent>
+            <dc:title>FreeCAD LGPL2+</dc:title>
+          </cc:Agent>
+        </dc:rights>
+        <cc:license>https://www.gnu.org/copyleft/lesser.html</cc:license>
+        <dc:contributor>
+          <cc:Agent>
+            <dc:title>[agryson] Alexander Gryson</dc:title>
+          </cc:Agent>
+        </dc:contributor>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <g
+       id="g1001">
+      <path
+         d="M 34.38968,12.296249 26.133143,9.1276952 c 0,0 0.698213,-1.61097 1.413433,-2.147553 0.715222,-0.536585 1.280251,-0.692294 1.309743,-1.246019 0.02949,-0.553729 -0.32632,-1.886354 -2.147541,-2.536291 -1.821175,-0.649947 -3.878365,-0.701376 -4.252944,0.408176 -0.374579,1.109555 0.564174,1.602571 0.339789,2.33125 -0.224388,0.728681 -0.534601,1.675005 -0.534601,1.675005 L 12.269135,3.5761202 9.138384,11.834795 c 0,0 -0.894049,-0.287095 -1.3983,-0.924099 C 7.23583,10.273693 6.805774,9.2888832 5.868817,9.1106092 4.931859,8.9323332 2.981092,10.367131 2.627968,11.422274 c -0.353124,1.055144 -0.505964,2.879556 0.128818,3.504837 0.634782,0.625281 2.438949,0.200839 3.354451,0.433524 0.915504,0.232684 1.406336,0.424782 1.406336,0.424782 l -3.992574,9.80561 9.78357,3.766191 c 0,0 0.06975,0.780993 -0.709836,1.480805 -0.779588,0.699814 -1.268626,0.822458 -1.590464,1.638618 -0.321835,0.816157 1.103304,2.630067 2.172588,3.111358 1.069283,0.481296 3.868534,0.885952 4.190371,0.0698 0.321838,-0.816158 -0.67684,-2.274741 -0.345171,-3.275473 0.331668,-1.000734 0.481857,-1.381606 0.481857,-1.381606 l 8.180545,3.201619 3.807507,-9.815236 c 0,0 0.09565,-0.402216 -1.090739,-0.426881 -1.186392,-0.02466 -1.9329,0.750905 -2.741124,0.246167 -0.808224,-0.504738 -1.395649,-2.367637 -0.999615,-3.531602 0.396034,-1.163964 2.1331,-3.812936 3.12639,-3.298575 0.993291,0.514358 0.574005,1.417992 1.633458,2.08386 1.059453,0.66587 1.713895,0.922 1.713895,0.922 z"
+         id="path4243"
+         style="fill:#a40000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.89275545;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         inkscape:connector-curvature="0" />
+      <g
+         style="fill:none;stroke:#ef2929"
+         transform="matrix(-0.98480775,0.17364818,0.17364818,0.98480775,71.794653,-25.904592)"
+         id="g6428">
+        <path
+           sodipodi:nodetypes="ccccccccccccccccccccccccccccccc"
+           inkscape:connector-curvature="0"
+           style="opacity:0.70247934;fill:none;stroke:#ef2929;stroke-width:0.89275545;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           id="path10128"
+           d="m 49.46136,21.833061 c -0.501679,0.36803 -1.034472,0.929969 -0.939183,1.601319 1.483535,0.578772 2.681021,1.765111 3.442057,3.12043 0.0071,0.895643 -1.183691,0.993325 -1.72099,1.492406 -1.893568,1.139889 -3.78909,2.276538 -5.686117,3.410693 1.228831,1.917006 2.42088,3.988681 3.672462,5.810015 0.736001,-0.46743 1.110813,-1.264121 1.205023,-2.084526 0.481091,-1.20861 2.199118,-1.565968 3.113974,-0.636179 1.952322,1.228595 3.576857,3.551312 2.911615,5.931087 -0.262404,1.281288 -1.521758,2.377065 -2.868733,2.059507 -0.468221,-0.03758 -1.594172,-0.315659 -0.838535,0.446 L 56,50 63.531919,45.407209 c 0.946864,1.436893 1.89452,3.156361 1.335225,4.900393 -0.184086,0.596948 0.590897,0.145642 0.881688,0.191656 1.523747,-0.274369 3.139728,-1.378065 3.289379,-3.02897 -0.655784,-1.003292 -2.19622,-1.060136 -2.654642,-2.272619 -0.444192,-0.733357 -0.122918,-1.768917 0.73835,-2.017489 2.597812,-1.454879 5.106125,-3.060395 7.66707,-4.577408 -1.875218,-2.98556 -3.743971,-5.975176 -5.628517,-8.954896 1.424228,-1.116495 3.223773,-1.531399 4.946166,-1.84049 0.471379,-0.608012 -0.06404,-1.498842 -0.203299,-2.12921 -0.482034,-1.046671 -1.729027,-1.927079 -2.890641,-1.660661 -0.660847,0.66862 -0.738204,1.753705 -1.51485,2.371416 -0.470379,0.624391 -1.630546,1.278585 -2.141499,0.326193 -0.981867,-1.347317 -1.655276,-2.901713 -2.598473,-4.282337 -0.486781,-0.817109 -0.973566,-1.634218 -1.460347,-2.451329 -3.076159,1.917157 -5.843179,3.608002 -8.915208,5.531732 -0.556904,-1.385653 -2.046303,-2.949452 -1.28052,-4.514133 -0.06234,-0.723316 -1.215454,-0.198748 -1.670631,-0.05692 -0.709575,0.181783 -1.354625,0.495199 -1.96981,0.890924 z" />
+      </g>
+      <path
+         d="m 27.43907,37.683307 c 0,0 10e-7,0.878447 0,1.755081 0,0.876631 1.229309,1.460751 1.229309,2.395825 0,0.935074 -2.1687,1.810798 -3.692584,1.810798 -1.523881,0 -3.16367,-1.345181 -3.22228,-1.871158 -0.05861,-0.525979 0.409264,-1.05297 0.819539,-1.871157 0.410275,-0.81819 0.52618,-2.337082 0.526182,-2.103312 l -8.73089,-0.05652 c 0,0 -0.02032,7.635517 -0.02328,8.827285 0.292402,-0.002 0.957408,-0.04305 1.490072,-0.352873 0.703332,-0.409092 1.464968,-1.168944 2.402741,-0.993618 0.937771,0.175326 2.223871,2.218682 2.16526,3.329083 -0.05861,1.110399 -0.585704,2.866996 -1.406255,3.217648 -0.82055,0.350651 -2.345042,-0.70494 -3.282815,-0.821824 -0.736745,-0.09183 -1.204872,-0.107214 -1.378316,-0.111434 -0.0046,1.857134 -0.0086,2.095298 -0.01863,6.114925 l 0.05122,4.457348 8.675012,0.06036 c 0,0 -0.06053,-0.819705 -0.06053,-1.462567 0,-0.642863 -1.229309,-1.986728 -1.229309,-2.395825 0,-0.409094 0.937272,-1.87035 3.105868,-1.987235 2.1686,-0.116883 3.692585,1.110605 3.692585,1.987235 0,0.876631 -0.412305,1.170155 -1.05702,2.163671 -0.644718,0.993516 -0.17229,1.694719 -0.17229,1.694721 h 10.72386 v -10.63728 c 0,0 -0.759913,0.05955 -1.639079,0.176437 -0.879162,0.116884 -1.116849,1.109694 -2.230451,1.109694 -1.113606,0 -1.876559,-1.867526 -1.876559,-3.737673 0,-1.870145 1.117353,-3.098039 1.820681,-3.273364 0.70333,-0.175325 1.638875,0.698683 2.342207,1.049334 0.703328,0.350653 1.583198,0.236795 1.583201,0.236796 v -8.594324 z"
+         id="path4245"
+         sodipodi:nodetypes="cssssscccsssssccccssssscccsssssccc"
+         style="fill:#888a85;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.89275545;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 28.289898,39.339986 c 0.413677,0.981545 1.673279,1.888034 1.103584,3.087642 -1.102803,1.807998 -3.523888,2.317093 -5.489982,1.95009 -1.343943,-0.351161 -2.898413,-1.273639 -3.068616,-2.76727 0.04733,-1.117762 0.972764,-1.918766 1.219996,-2.976209 -2.265858,0.11724 -4.560011,-0.03751 -6.835705,-0.0046 0.02051,2.257467 -0.07422,4.645009 0.01863,6.825315 1.06902,-0.6213 2.496896,-1.694745 3.753119,-0.849682 1.980755,1.23998 2.789547,3.949311 1.843964,6.068452 -0.355716,1.237846 -1.6194,2.406274 -2.975488,1.959376 -0.929206,-0.173976 -1.72629,-0.786689 -2.663503,-0.868254 -0.02876,2.915575 -0.0277,5.831635 0.0093,8.747545 2.283764,-0.01728 4.702155,0.123414 6.900894,-0.0046 -0.0059,-1.264532 -1.625941,-2.026866 -1.206026,-3.347654 0.538471,-1.485935 2.220204,-2.275597 3.711209,-2.437612 1.82851,-0.177103 3.988641,0.618822 4.717008,2.391182 0.388651,1.310147 -0.713211,2.461296 -1.261905,3.459088 3.014293,0 6.028583,0 9.042871,0 0,-2.932873 0,-5.865747 0,-8.79862 -1.129967,-0.04693 -1.645195,1.319558 -2.789225,1.225771 -1.321721,0.06593 -2.283207,-1.057263 -2.570805,-2.242676 -0.855171,-2.220263 -0.395589,-5.3224 1.90493,-6.458439 1.312408,-0.464632 2.398049,0.741921 3.49236,1.170054 -0.13659,-2.25586 0.0207,-4.531549 -0.0373,-6.797456 -2.939791,-0.02941 -5.879577,-0.05881 -8.819367,-0.08822 0,0.252274 0,0.504546 0,0.75682 z"
+         id="path11113"
+         style="opacity:0.70247934;fill:none;stroke:#babdb6;stroke-width:0.89275545;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 48.661765,32.042461 c -0.06648,0.0011 -0.13246,0.0056 -0.200229,0.0093 -2.168596,0.116885 -3.105868,1.578141 -3.105868,1.987235 0,0.409097 1.229309,1.752962 1.229309,2.395825 10e-7,0.642862 0.06053,1.462567 0.06053,1.462567 l -8.675012,-0.06036 h -0.06053 v 8.594324 c 0,0 -0.817715,-0.003 -1.755491,-0.236796 -0.937772,-0.233769 -1.233258,-0.872896 -2.346863,-0.872898 -1.113604,0 -1.464056,2.044164 -1.522666,3.213005 -0.05861,1.168843 0.762953,3.387521 1.876559,3.329082 0.999033,0.0014 1.322291,-0.368931 2.286328,-1.049334 0.703331,-0.292211 1.578547,0.05572 1.578545,0.05572 V 61.45169 h 8.623791 c 0.01741,-0.152406 0.135284,-1.324035 -0.358548,-1.871158 -0.527497,-0.584421 -1.055098,-1.287847 -0.996486,-2.047595 0.05861,-0.759747 1.288933,-1.869239 3.105868,-1.810797 1.816934,0.05844 3.86953,0.759951 3.86953,1.987235 0,1.227287 -1.172621,1.109795 -1.289843,2.10331 -0.117225,0.993515 -0.05588,1.694722 -0.05588,1.694722 H 61.648672 V 50.814396 c -3e-6,3e-6 -0.701003,-0.527089 -1.345721,-0.176437 -0.64472,0.35065 -1.290756,1.462567 -2.169918,1.462567 -0.879164,-2e-6 -2.697717,-2.164377 -2.463274,-3.742315 0.234443,-1.577941 1.232143,-3.388331 2.169916,-3.213004 0.937776,0.175326 1.289945,0.99281 2.28633,1.109694 0.996387,0.116882 1.639079,0.116076 1.639079,0.116076 L 61.648672,36.221225 v 1.676148 H 50.924811 c 0,-2e-6 -0.472428,-0.701205 0.17229,-1.694721 0.644715,-0.993516 1.05702,-1.28704 1.05702,-2.163671 0,-0.849235 -1.431386,-2.029958 -3.492356,-1.99652 z"
+         id="path5248"
+         style="fill:#888a85;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.89275545;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 48.389892,32.921449 c -0.787067,0.08232 -1.72195,0.329716 -2.0861,1.109694 0.722992,0.990552 1.293544,2.148463 1.233965,3.384799 0.154986,0.880938 -0.751305,1.664214 -1.606268,1.389587 -2.388234,-0.131044 -4.781076,-0.04918 -7.171186,-0.09881 0,2.860132 0,5.720262 0,8.580394 -1.690605,0.187772 -3.374476,-0.317546 -4.83342,-1.114336 -0.641005,0.200813 -0.579093,1.157002 -0.740379,1.699363 -0.128162,1.072258 0.01014,2.536928 1.061676,3.06907 1.112948,-0.142828 1.872881,-1.444692 3.096555,-1.156124 0.851388,-0.04901 1.866083,0.704826 1.53198,1.634361 0,3.036568 0,6.073137 0,9.109705 2.254539,-0.05378 4.634832,0.124354 6.812422,-0.07429 -0.461163,-0.976111 -1.523671,-1.744693 -1.322439,-2.952993 0.198753,-1.850405 2.331088,-2.753603 4.013882,-2.692981 1.57392,0.04427 3.331381,0.440631 4.367773,1.694721 0.731062,1.067086 0.297029,2.628798 -0.824196,3.226935 -0.216445,0.308701 -0.401025,1.068906 0.246793,0.87754 2.846011,-0.05 5.692922,-0.0058 8.539973,-0.01857 -0.0689,-3.015268 0.134035,-6.236493 -0.09313,-9.128278 -0.772235,0.539413 -1.362481,1.55194 -2.439993,1.490426 -1.675422,-0.13747 -2.791871,-1.753314 -3.278157,-3.217648 -0.500427,-1.778656 0.220619,-3.750139 1.513354,-5.000588 0.807119,-0.773422 2.047596,-0.550376 2.8415,0.115222 0.459396,0.265142 1.136011,0.752636 1.614746,0.553381 -0.224208,-1.882541 9.94e-4,-3.804963 -0.120024,-5.701669 0.328485,-1.148886 -0.644061,-0.98387 -1.500429,-0.937923 -2.947549,0 -5.895097,0 -8.842645,0 -1.078725,-1.125243 -0.445356,-2.904678 0.456334,-3.932681 0.749861,-0.525117 0.09672,-1.507318 -0.619311,-1.615788 -0.582098,-0.26009 -1.219642,-0.332572 -1.853277,-0.292514 z"
+         id="path13067"
+         style="opacity:0.7107438;fill:none;stroke:#babdb6;stroke-width:0.89275545;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 37.965078,14.061297 -0.06053,8.705758 c 0,0 -1.113505,0.06006 -1.699613,-0.232153 -0.586108,-0.292213 -1.521352,-0.993618 -2.048849,-0.993618 -0.527499,0 -2.051581,1.575818 -1.992971,3.329082 0.05861,1.753259 1.054084,3.510161 1.816025,3.510161 0.761939,-2e-6 1.290754,-0.704131 2.169917,-0.937899 0.879162,-0.233766 1.755491,-0.171795 1.755491,-0.171795 l -0.05588,10.516557 8.670356,-0.05572 c 10e-7,-5e-6 0.293864,-1.112217 -0.116413,-1.755081 -0.410274,-0.642863 -1.34572,-1.346291 -1.34572,-2.047595 10e-7,-0.701307 1.112595,-1.924956 3.515638,-1.866514 2.403044,0.05844 3.63205,1.110603 3.63205,1.987235 -1e-6,0.876629 -1.231233,1.341645 -1.289844,2.04295 -0.05861,0.701305 -0.05588,1.639005 -0.05588,1.639005 H 61.699128 V 27.150114 c 2e-6,-10e-7 -0.875214,-0.347928 -1.578545,-0.05572 -0.964037,0.680403 -1.28942,1.052683 -2.288453,1.051253 -1.113604,0.05844 -1.933045,-2.162158 -1.874434,-3.331001 0.05861,-1.168841 0.409062,-3.213005 1.522666,-3.213005 1.113605,2e-6 1.409091,0.639129 2.346863,0.872898 0.937776,0.233772 1.755491,0.236796 1.755491,0.236796 v -8.594324 l -10.430502,-0.05572 c 10e-7,-2e-6 -0.352476,0.699288 0.116412,1.634361 0.468887,0.935071 0.880073,1.226678 0.880073,2.103311 -10e-7,0.876631 -1.994187,2.049513 -3.166403,2.107954 -1.172216,0.05844 -3.925407,-0.585936 -3.925407,-1.462567 1e-6,-0.87663 1.464056,-1.868534 1.522667,-2.920492 0.05861,-1.051956 0.06053,-1.462567 0.06053,-1.462567 z"
+         id="path5243"
+         sodipodi:nodetypes="ccssssscccssssscccccssscccssssscc"
+         style="fill:#888a85;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.89275545;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 39.276899,14.922227 c -0.797631,0.0535 -0.380983,1.086723 -0.447421,1.573844 -0.08569,2.264094 0.131592,4.591044 -0.167233,6.816186 -0.654002,0.749755 -1.783458,0.337967 -2.607627,0.190366 -0.67242,-0.189425 -1.226646,-0.980864 -1.92778,-0.896113 -1.463553,1.169495 -1.375642,3.720406 -0.0326,4.903082 0.657899,-0.393279 1.344225,-0.824374 2.132665,-0.947186 0.83855,-0.188875 1.70912,-0.191522 2.561061,-0.08357 -0.01497,3.48541 -0.03673,6.9708 -0.05588,10.456195 2.312064,-0.05392 4.750403,0.06796 6.989369,-0.10679 -0.365232,-1.105858 -1.842559,-1.819618 -1.527324,-3.143359 0.430537,-1.830382 2.571016,-2.484639 4.251361,-2.470114 1.666144,0.01424 3.685499,0.491497 4.474872,2.103311 0.43213,0.990265 -0.08198,2.090391 -0.926639,2.669766 -0.194436,0.205662 -0.586005,1.15263 0.0047,0.923971 2.92132,-0.0818 5.866395,0.01232 8.79608,-0.02322 -0.03131,-2.971013 0.06244,-6.081238 -0.04656,-8.96577 -0.944929,0.262355 -1.616757,1.292234 -2.705412,1.17934 -1.725317,0.0655 -2.640596,-1.72412 -2.877701,-3.18979 -0.304328,-1.701188 0.01305,-3.752548 1.401599,-4.898439 1.232193,-0.710938 2.511883,0.231422 3.626433,0.671865 0.603816,0.355036 0.548333,-0.09359 0.485234,-0.606862 0,-2.007355 0,-4.014709 0,-6.022064 -2.902487,0.01222 -5.805867,-0.109451 -8.707608,-0.0046 0.406444,1.118186 1.529459,2.310326 0.870761,3.547307 -1.325024,2.133742 -4.29254,2.745147 -6.556316,1.82937 -1.107898,-0.235364 -2.466509,-1.210937 -2.020909,-2.497972 0.254228,-1.104668 1.567757,-1.764446 1.466788,-2.971566 -2.09865,0.123253 -4.264979,0.06401 -6.328148,-0.0325 -0.04107,-0.0074 -0.08424,-0.01432 -0.125725,-0.0046 z"
+         id="path14052"
+         style="opacity:0.70247934;fill:none;stroke:#babdb6;stroke-width:0.89275545;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+</svg>
diff --git a/icons/a2p_MovePart.svg b/icons/a2p_MovePart.svg
new file mode 100644
index 00000000..cea36fc2
--- /dev/null
+++ b/icons/a2p_MovePart.svg
@@ -0,0 +1,422 @@
+<?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="64"
+   height="64"
+   id="svg3559"
+   version="1.1"
+   inkscape:version="0.92.3 (unknown)"
+   sodipodi:docname="a2p_MovePart.svg"
+   viewBox="0 0 64 64">
+  <defs
+     id="defs3561">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient73208">
+      <stop
+         style="stop-color:#c4a000;stop-opacity:1"
+         offset="0"
+         id="stop73210" />
+      <stop
+         style="stop-color:#edd400;stop-opacity:1"
+         offset="1"
+         id="stop73212" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient73194"
+       inkscape:collect="always">
+      <stop
+         id="stop73202"
+         offset="0"
+         style="stop-color:#c4a000;stop-opacity:1" />
+      <stop
+         id="stop73204"
+         offset="1"
+         style="stop-color:#fce94f;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4383-3"
+       inkscape:collect="always">
+      <stop
+         id="stop73188"
+         offset="0"
+         style="stop-color:#3465a4;stop-opacity:1" />
+      <stop
+         id="stop73190"
+         offset="1"
+         style="stop-color:#729fcf;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient73194"
+       id="linearGradient4389"
+       x1="20.243532"
+       y1="37.588112"
+       x2="17.243532"
+       y2="27.588112"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-1.243533,-2.588112)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient73208"
+       id="linearGradient4399"
+       x1="48.714352"
+       y1="45.585785"
+       x2="46.714352"
+       y2="34.585785"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(1.2856487,1.4142136)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4383-3"
+       id="linearGradient4389-0"
+       x1="27.243532"
+       y1="54.588112"
+       x2="21.243532"
+       y2="30.588112"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-1.243533,-2.588112)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4393-9"
+       id="linearGradient4399-7"
+       x1="48.714352"
+       y1="45.585785"
+       x2="40.714352"
+       y2="24.585787"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(1.2856487,1.4142136)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4393-9">
+      <stop
+         style="stop-color:#204a87;stop-opacity:1"
+         offset="0"
+         id="stop4395-8" />
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1"
+         offset="1"
+         id="stop4397-1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient73208"
+       id="linearGradient69042"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-12.714351,-17.585786)"
+       x1="48.714352"
+       y1="45.585785"
+       x2="46.714352"
+       y2="35.585785" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient73194"
+       id="linearGradient69056"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-1.243533,-2.588112)"
+       x1="27.243532"
+       y1="54.588112"
+       x2="22.243532"
+       y2="40.588112" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3895-9"
+       id="linearGradient3936"
+       x1="20"
+       y1="12"
+       x2="44"
+       y2="52"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3895-9">
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1;"
+         offset="0"
+         id="stop3897-3" />
+      <stop
+         style="stop-color:#204a87;stop-opacity:1;"
+         offset="1"
+         id="stop3899-6" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3895-9"
+       id="linearGradient3154"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,-0.58000003,0.58823527,0,13.176471,38.379999)"
+       x1="45.482754"
+       y1="11.599999"
+       x2="-23.482759"
+       y2="52.400002" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3895-9"
+       id="linearGradient3158"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.58000003,0,0,0.58823527,25.620001,13.176471)"
+       x1="-9.6896563"
+       y1="-2.0000007"
+       x2="31.689651"
+       y2="66" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3895-9"
+       id="linearGradient3156"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.58000003,0,0,0.58823527,38.379999,13.176471)"
+       x1="31.689651"
+       y1="-2.0000007"
+       x2="-9.6896563"
+       y2="66" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3895-9"
+       id="linearGradient3160"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,0.58000003,0.58823527,0,13.176471,25.620001)"
+       x1="-23.482759"
+       y1="11.599999"
+       x2="45.482754"
+       y2="52.400002" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3895-9"
+       id="linearGradient1814"
+       gradientUnits="userSpaceOnUse"
+       x1="20"
+       y1="12"
+       x2="44"
+       y2="52" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.8336309"
+     inkscape:cx="32"
+     inkscape:cy="36.848485"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     inkscape:window-width="1366"
+     inkscape:window-height="716"
+     inkscape:window-x="0"
+     inkscape:window-y="26"
+     inkscape:window-maximized="1"
+     inkscape:snap-global="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3007"
+       empspacing="4"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       spacingx="0.5"
+       spacingy="0.5" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata3564">
+    <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>
+        <dc:title>Path-Stock</dc:title>
+        <dc:date>2015-07-04</dc:date>
+        <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
+        <dc:publisher>
+          <cc:Agent>
+            <dc:title>FreeCAD</dc:title>
+          </cc:Agent>
+        </dc:publisher>
+        <dc:identifier>FreeCAD/src/Mod/Path/Gui/Resources/icons/Path-Stock.svg</dc:identifier>
+        <dc:rights>
+          <cc:Agent>
+            <dc:title>FreeCAD LGPL2+</dc:title>
+          </cc:Agent>
+        </dc:rights>
+        <cc:license>https://www.gnu.org/copyleft/lesser.html</cc:license>
+        <dc:contributor>
+          <cc:Agent>
+            <dc:title>[agryson] Alexander Gryson</dc:title>
+          </cc:Agent>
+        </dc:contributor>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <g
+       id="g1838">
+      <g
+         id="g926">
+        <path
+           sodipodi:nodetypes="ccccc"
+           inkscape:connector-curvature="0"
+           id="path69052"
+           d="m 9,35 0,-14 14,5 0,14 z"
+           style="fill:url(#linearGradient4389);fill-opacity:1.0;fill-rule:nonzero;stroke:#302b00;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" />
+        <path
+           style="fill:url(#linearGradient69056);fill-opacity:1.0;fill-rule:nonzero;stroke:#302b00;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+           d="M 9,49 9,35 37,45 37,59 Z"
+           id="path4381"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc" />
+        <path
+           style="fill:url(#linearGradient4399);fill-opacity:1;fill-rule:nonzero;stroke:#302b00;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+           d="M 37,59 37,45 55,28 55,41 Z"
+           id="path4391"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc" />
+        <path
+           style="fill:#fce94f;fill-opacity:1;fill-rule:nonzero;stroke:#302b00;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+           d="M 9,21 29,5 42,10 23,26 Z"
+           id="path4403"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc" />
+        <path
+           style="fill:none;stroke:#fce94f;stroke-width:2;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"
+           d="M 11.008035,47.60627 11,38 l 24,8 0.0081,10.184812 z"
+           id="path4381-7"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc" />
+        <path
+           style="fill:none;stroke:#edd400;stroke-width:2;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"
+           d="M 39.005041,54.16825 39,46 53,32.5 l 0.0021,7.676847 z"
+           id="path4391-0"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc" />
+        <path
+           sodipodi:nodetypes="ccccc"
+           inkscape:connector-curvature="0"
+           id="path69038"
+           d="M 23,40 42,23 55,28 37,45 Z"
+           style="fill:#fce94f;fill-opacity:1;fill-rule:nonzero;stroke:#302b00;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" />
+        <path
+           sodipodi:nodetypes="ccccc"
+           inkscape:connector-curvature="0"
+           id="path69040"
+           d="M 23,40 23,26 42,10 42,23 Z"
+           style="fill:url(#linearGradient69042);fill-opacity:1;fill-rule:nonzero;stroke:#302b00;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" />
+        <path
+           sodipodi:nodetypes="ccccc"
+           inkscape:connector-curvature="0"
+           id="path69044"
+           d="m 25,36 0,-9 15,-13 0,8 z"
+           style="fill:none;stroke:#edd400;stroke-width:2;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none" />
+        <path
+           sodipodi:nodetypes="ccccc"
+           inkscape:connector-curvature="0"
+           id="path69048"
+           d="M 11.008,33.60627 11,24 l 10,3 0,10 z"
+           style="fill:none;stroke:#fce94f;stroke-width:2;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none" />
+      </g>
+      <g
+         id="g1705">
+        <rect
+           style="fill:url(#linearGradient1814);fill-opacity:1;stroke:none"
+           id="rect3126"
+           width="12"
+           height="6"
+           x="26"
+           y="29" />
+        <rect
+           style="fill:url(#linearGradient3936);fill-opacity:1;stroke:none"
+           id="rect3126-2"
+           width="6"
+           height="11.999999"
+           x="29"
+           y="26" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3154);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="M 37,28 V 13 h 6 L 32,3 21,13 h 6 v 15"
+           id="path3343"
+           sodipodi:nodetypes="ccccccc"
+           inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
+           inkscape:export-xdpi="4.1683898"
+           inkscape:export-ydpi="4.1683898" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="M 35,29 V 11 h 2.831259 L 32,5.7026937 26.168741,11 H 29 v 18"
+           id="path3343-2"
+           sodipodi:nodetypes="ccccccc"
+           inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
+           inkscape:export-xdpi="4.1683898"
+           inkscape:export-ydpi="4.1683898" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3158);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 37,37 h 14 v 6 L 61,32 51,21 v 6 H 37"
+           id="path3343-3"
+           sodipodi:nodetypes="ccccccc"
+           inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
+           inkscape:export-xdpi="4.1683898"
+           inkscape:export-ydpi="4.1683898" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 35,35 h 18 v 2.831259 L 58.297306,32 53,26.168741 V 29 H 34"
+           id="path3343-2-5"
+           sodipodi:nodetypes="ccccccc"
+           inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
+           inkscape:export-xdpi="4.1683898"
+           inkscape:export-ydpi="4.1683898" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3156);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="M 27,37 H 13 v 6 L 3,32 13,21 v 6 h 14"
+           id="path3343-3-2"
+           sodipodi:nodetypes="ccccccc"
+           inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
+           inkscape:export-xdpi="4.1683898"
+           inkscape:export-ydpi="4.1683898" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="M 29,35 H 11 v 2.831259 L 5.702694,32 11,26.168741 V 29 h 19"
+           id="path3343-2-5-7"
+           sodipodi:nodetypes="ccccccc"
+           inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
+           inkscape:export-xdpi="4.1683898"
+           inkscape:export-ydpi="4.1683898" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3160);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 37,36 v 15 h 6 L 32,61 21,51 h 6 V 36"
+           id="path3343-0"
+           sodipodi:nodetypes="ccccccc"
+           inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
+           inkscape:export-xdpi="4.1683898"
+           inkscape:export-ydpi="4.1683898" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 35,34 v 19 h 2.831259 L 32,58.297306 26.168741,53 H 29 V 34"
+           id="path3343-2-6"
+           sodipodi:nodetypes="ccccccc"
+           inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
+           inkscape:export-xdpi="4.1683898"
+           inkscape:export-ydpi="4.1683898" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/icons/a2p_PlaneCoincidentConstraint.svg b/icons/a2p_PlaneCoincidentConstraint.svg
new file mode 100644
index 00000000..7aa7bdb4
--- /dev/null
+++ b/icons/a2p_PlaneCoincidentConstraint.svg
@@ -0,0 +1,420 @@
+<?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="64"
+   height="64"
+   id="svg3085"
+   version="1.1"
+   inkscape:version="0.92.3 (unknown)"
+   sodipodi:docname="a2p_PlaneCoincidentConstraint.svg">
+  <defs
+     id="defs3087">
+    <linearGradient
+       id="linearGradient3871">
+      <stop
+         style="stop-color:#2200ff;stop-opacity:1;"
+         offset="0"
+         id="stop3873" />
+      <stop
+         style="stop-color:#fffcfc;stop-opacity:1;"
+         offset="1"
+         id="stop3875" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3863">
+      <stop
+         style="stop-color:#ff0000;stop-opacity:1;"
+         offset="0"
+         id="stop3865" />
+      <stop
+         style="stop-color:#ff9ea8;stop-opacity:1;"
+         offset="1"
+         id="stop3867" />
+    </linearGradient>
+    <marker
+       inkscape:stockid="Arrow2Lend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Lend"
+       style="overflow:visible">
+      <path
+         id="path4574"
+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Lstart"
+       style="overflow:visible">
+      <path
+         id="path4571"
+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(1.1,0,0,1.1,1.1,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="TriangleInS"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="TriangleInS"
+       style="overflow:visible">
+      <path
+         id="path4692"
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+         transform="scale(-0.2,-0.2)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <linearGradient
+       id="linearGradient3903">
+      <stop
+         style="stop-color:#44852d;stop-opacity:1;"
+         offset="0"
+         id="stop3905" />
+      <stop
+         style="stop-color:#0026ff;stop-opacity:1;"
+         offset="1"
+         id="stop3907" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3859">
+      <stop
+         style="stop-color:#0d00ff;stop-opacity:1;"
+         offset="0"
+         id="stop3861" />
+      <stop
+         style="stop-color:#7d81f1;stop-opacity:1;"
+         offset="1"
+         id="stop3863" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3851">
+      <stop
+         style="stop-color:#ff0000;stop-opacity:1;"
+         offset="0"
+         id="stop3853" />
+      <stop
+         style="stop-color:#ff7e7e;stop-opacity:1;"
+         offset="1"
+         id="stop3855" />
+    </linearGradient>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="3.6842619 : 5.0066992 : 1"
+       inkscape:vp_y="-27.498543 : -45.297844 : 1"
+       inkscape:vp_z="-46.715775 : -11.759466 : 1"
+       inkscape:persp3d-origin="12 : 10.666667 : 1"
+       id="perspective3096" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="-13.436262 : 14.723626 : 1"
+       inkscape:vp_y="0 : 954.05 : 0"
+       inkscape:vp_z="44.68773 : 14.723626 : 1"
+       inkscape:persp3d-origin="15.625734 : 9.6353598 : 1"
+       id="perspective3094" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="-4 : 10 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="28 : 10 : 1"
+       inkscape:persp3d-origin="12 : 4.666667 : 1"
+       id="perspective3011" />
+    <inkscape:path-effect
+       effect="skeletal"
+       id="path-effect3066"
+       is_visible="true"
+       pattern="M 0,0 0,10 10,5 z"
+       copytype="single_stretched"
+       prop_scale="1"
+       scale_y_rel="false"
+       spacing="0"
+       normal_offset="0"
+       tang_offset="0"
+       prop_units="false"
+       vertical_pattern="false"
+       fuse_tolerance="0" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient7597">
+      <stop
+         style="stop-color:#000003;stop-opacity:1;"
+         offset="0"
+         id="stop7599" />
+      <stop
+         style="stop-color:#000003;stop-opacity:0;"
+         offset="1"
+         id="stop7601" />
+    </linearGradient>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lstart"
+       style="overflow:visible">
+      <path
+         id="path3995"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Send"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Send"
+       style="overflow:visible">
+      <path
+         id="path4010"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+         transform="matrix(-0.2,0,0,-0.2,-1.2,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Sstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Sstart"
+       style="overflow:visible">
+      <path
+         id="path4007"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+         transform="matrix(0.2,0,0,0.2,1.2,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Sstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Sstart"
+       style="overflow:visible">
+      <path
+         id="path4025"
+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(0.3,0,0,0.3,-0.69,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="TriangleOutL"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="TriangleOutL"
+       style="overflow:visible">
+      <path
+         id="path4137"
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+         transform="scale(0.8,0.8)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="DiamondLend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="DiamondLend"
+       style="overflow:visible">
+      <path
+         id="path4092"
+         d="M 0,-7.0710768 -7.0710894,0 0,7.0710589 7.0710462,0 0,-7.0710768 z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+         transform="matrix(0.8,0,0,0.8,-5.6,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="DiamondLstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="DiamondLstart"
+       style="overflow:visible">
+      <path
+         id="path4083"
+         d="M 0,-7.0710768 -7.0710894,0 0,7.0710589 7.0710462,0 0,-7.0710768 z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+         transform="matrix(0.8,0,0,0.8,5.6,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lend"
+       style="overflow:visible">
+      <path
+         id="path3998"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+         transform="matrix(-0.8,0,0,-0.8,-10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <linearGradient
+       id="linearGradient3893">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3895" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3897" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7597"
+       id="linearGradient7603"
+       x1="15.71482"
+       y1="22.299377"
+       x2="34.136208"
+       y2="22.299377"
+       gradientUnits="userSpaceOnUse" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="1.132573 : 16.837097 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="31.983524 : 20.416825 : 1"
+       inkscape:persp3d-origin="15.674165 : -5.599381 : 1"
+       id="perspective3011-3" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3863"
+       id="linearGradient3869"
+       x1="23.340048"
+       y1="16.048664"
+       x2="39.360435"
+       y2="16.048664"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-62,-20)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3871"
+       id="linearGradient3877"
+       x1="-8.5626202"
+       y1="16.186771"
+       x2="8.7007294"
+       y2="16.186771"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(57.861891,-20)" />
+    <linearGradient
+       id="linearGradient3916-0">
+      <stop
+         id="stop3918-6"
+         offset="0"
+         style="stop-color:#8ae234;stop-opacity:1" />
+      <stop
+         id="stop3920-2"
+         offset="1"
+         style="stop-color:#4e9a06;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3916">
+      <stop
+         id="stop3918"
+         offset="0"
+         style="stop-color:#8ae234;stop-opacity:1" />
+      <stop
+         id="stop3920"
+         offset="1"
+         style="stop-color:#4e9a06;stop-opacity:1" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1"
+     inkscape:cx="32"
+     inkscape:cy="32"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1366"
+     inkscape:window-height="716"
+     inkscape:window-x="0"
+     inkscape:window-y="26"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3113"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata3090">
+    <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"
+     transform="translate(0,32)">
+    <rect
+       style="fill:#729fcf;fill-opacity:1;stroke:#000000;stroke-width:2.03497052;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+       id="rect4851"
+       width="43.232109"
+       height="44.757172"
+       x="10.383946"
+       y="-22.378586"
+       transform="matrix(1,0,-0.25881904,0.96592583,0,0)" />
+    <g
+       id="g995"
+       transform="matrix(0.8,0,0,0.8,76.340733,3.5606782)">
+      <rect
+         style="fill:#ef2929;fill-opacity:1;stroke:#000000;stroke-width:2.03497052;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+         id="rect991"
+         width="34.585686"
+         height="35.805737"
+         x="-74.698402"
+         y="-22.510725"
+         transform="matrix(1,0,-0.25881905,0.96592582,0,0)" />
+      <rect
+         transform="matrix(1,0,-0.25881905,0.96592582,0,0)"
+         y="-17.497921"
+         x="-69.856407"
+         height="25.78013"
+         width="24.901693"
+         id="rect993"
+         style="fill:#a40000;fill-opacity:1;stroke:#a40000;stroke-width:1.17214298;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" />
+    </g>
+  </g>
+</svg>
diff --git a/icons/a2p_PlanesParallelConstraint.svg b/icons/a2p_PlanesParallelConstraint.svg
new file mode 100644
index 00000000..e964fbef
--- /dev/null
+++ b/icons/a2p_PlanesParallelConstraint.svg
@@ -0,0 +1,430 @@
+<?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="64"
+   height="64"
+   id="svg3085"
+   version="1.1"
+   inkscape:version="0.92.3 (unknown)"
+   sodipodi:docname="a2p_PlanesParallelConstraint.svg">
+  <defs
+     id="defs3087">
+    <linearGradient
+       id="linearGradient3871">
+      <stop
+         style="stop-color:#2200ff;stop-opacity:1;"
+         offset="0"
+         id="stop3873" />
+      <stop
+         style="stop-color:#fffcfc;stop-opacity:1;"
+         offset="1"
+         id="stop3875" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3863">
+      <stop
+         style="stop-color:#ff0000;stop-opacity:1;"
+         offset="0"
+         id="stop3865" />
+      <stop
+         style="stop-color:#ff9ea8;stop-opacity:1;"
+         offset="1"
+         id="stop3867" />
+    </linearGradient>
+    <marker
+       inkscape:stockid="Arrow2Lend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Lend"
+       style="overflow:visible">
+      <path
+         id="path4574"
+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Lstart"
+       style="overflow:visible">
+      <path
+         id="path4571"
+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(1.1,0,0,1.1,1.1,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="TriangleInS"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="TriangleInS"
+       style="overflow:visible">
+      <path
+         id="path4692"
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+         transform="scale(-0.2,-0.2)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <linearGradient
+       id="linearGradient3903">
+      <stop
+         style="stop-color:#44852d;stop-opacity:1;"
+         offset="0"
+         id="stop3905" />
+      <stop
+         style="stop-color:#0026ff;stop-opacity:1;"
+         offset="1"
+         id="stop3907" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3859">
+      <stop
+         style="stop-color:#0d00ff;stop-opacity:1;"
+         offset="0"
+         id="stop3861" />
+      <stop
+         style="stop-color:#7d81f1;stop-opacity:1;"
+         offset="1"
+         id="stop3863" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3851">
+      <stop
+         style="stop-color:#ff0000;stop-opacity:1;"
+         offset="0"
+         id="stop3853" />
+      <stop
+         style="stop-color:#ff7e7e;stop-opacity:1;"
+         offset="1"
+         id="stop3855" />
+    </linearGradient>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="3.6842619 : 5.0066992 : 1"
+       inkscape:vp_y="-27.498543 : -45.297844 : 1"
+       inkscape:vp_z="-46.715775 : -11.759466 : 1"
+       inkscape:persp3d-origin="12 : 10.666667 : 1"
+       id="perspective3096" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="-13.436262 : 14.723626 : 1"
+       inkscape:vp_y="0 : 954.05 : 0"
+       inkscape:vp_z="44.68773 : 14.723626 : 1"
+       inkscape:persp3d-origin="15.625734 : 9.6353598 : 1"
+       id="perspective3094" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="-4 : 10 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="28 : 10 : 1"
+       inkscape:persp3d-origin="12 : 4.666667 : 1"
+       id="perspective3011" />
+    <inkscape:path-effect
+       effect="skeletal"
+       id="path-effect3066"
+       is_visible="true"
+       pattern="M 0,0 0,10 10,5 z"
+       copytype="single_stretched"
+       prop_scale="1"
+       scale_y_rel="false"
+       spacing="0"
+       normal_offset="0"
+       tang_offset="0"
+       prop_units="false"
+       vertical_pattern="false"
+       fuse_tolerance="0" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient7597">
+      <stop
+         style="stop-color:#000003;stop-opacity:1;"
+         offset="0"
+         id="stop7599" />
+      <stop
+         style="stop-color:#000003;stop-opacity:0;"
+         offset="1"
+         id="stop7601" />
+    </linearGradient>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lstart"
+       style="overflow:visible">
+      <path
+         id="path3995"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Send"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Send"
+       style="overflow:visible">
+      <path
+         id="path4010"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+         transform="matrix(-0.2,0,0,-0.2,-1.2,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Sstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Sstart"
+       style="overflow:visible">
+      <path
+         id="path4007"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+         transform="matrix(0.2,0,0,0.2,1.2,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Sstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Sstart"
+       style="overflow:visible">
+      <path
+         id="path4025"
+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(0.3,0,0,0.3,-0.69,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="TriangleOutL"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="TriangleOutL"
+       style="overflow:visible">
+      <path
+         id="path4137"
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+         transform="scale(0.8,0.8)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="DiamondLend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="DiamondLend"
+       style="overflow:visible">
+      <path
+         id="path4092"
+         d="M 0,-7.0710768 -7.0710894,0 0,7.0710589 7.0710462,0 0,-7.0710768 z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+         transform="matrix(0.8,0,0,0.8,-5.6,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="DiamondLstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="DiamondLstart"
+       style="overflow:visible">
+      <path
+         id="path4083"
+         d="M 0,-7.0710768 -7.0710894,0 0,7.0710589 7.0710462,0 0,-7.0710768 z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+         transform="matrix(0.8,0,0,0.8,5.6,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lend"
+       style="overflow:visible">
+      <path
+         id="path3998"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+         transform="matrix(-0.8,0,0,-0.8,-10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <linearGradient
+       id="linearGradient3893">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3895" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3897" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7597"
+       id="linearGradient7603"
+       x1="15.71482"
+       y1="22.299377"
+       x2="34.136208"
+       y2="22.299377"
+       gradientUnits="userSpaceOnUse" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="1.132573 : 16.837097 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="31.983524 : 20.416825 : 1"
+       inkscape:persp3d-origin="15.674165 : -5.599381 : 1"
+       id="perspective3011-3" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3863"
+       id="linearGradient3869"
+       x1="23.340048"
+       y1="16.048664"
+       x2="39.360435"
+       y2="16.048664"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-62,-20)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3871"
+       id="linearGradient3877"
+       x1="-8.5626202"
+       y1="16.186771"
+       x2="8.7007294"
+       y2="16.186771"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(57.861891,-20)" />
+    <linearGradient
+       id="linearGradient3916-0">
+      <stop
+         id="stop3918-6"
+         offset="0"
+         style="stop-color:#8ae234;stop-opacity:1" />
+      <stop
+         id="stop3920-2"
+         offset="1"
+         style="stop-color:#4e9a06;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3916">
+      <stop
+         id="stop3918"
+         offset="0"
+         style="stop-color:#8ae234;stop-opacity:1" />
+      <stop
+         id="stop3920"
+         offset="1"
+         style="stop-color:#4e9a06;stop-opacity:1" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="8.25"
+     inkscape:cx="32"
+     inkscape:cy="32"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1366"
+     inkscape:window-height="716"
+     inkscape:window-x="0"
+     inkscape:window-y="26"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3113"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata3090">
+    <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"
+     transform="translate(0,32)">
+    <g
+       id="g7315">
+      <rect
+         transform="matrix(1,0,-0.25881905,0.96592583,0,0)"
+         y="-29.826717"
+         x="7.0267754"
+         height="42.966885"
+         width="41.502823"
+         id="rect7306"
+         style="fill:#729fcf;fill-opacity:1;stroke:#000000;stroke-width:2.03497052;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" />
+    </g>
+    <rect
+       transform="matrix(1,0,-0.25881905,0.96592583,0,0)"
+       y="-23.811352"
+       x="12.837169"
+       height="30.936157"
+       width="29.882032"
+       id="rect7308"
+       style="fill:#3465a4;fill-opacity:1;stroke:#3465a4;stroke-width:1.40657163;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" />
+    <g
+       id="g7304">
+      <rect
+         style="fill:#ef2929;fill-opacity:1;stroke:#000000;stroke-width:2.03497044;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+         id="rect991"
+         width="41.502823"
+         height="42.966885"
+         x="15.470407"
+         y="-13.140169"
+         transform="matrix(1,0,-0.25881905,0.96592583,0,0)" />
+      <rect
+         transform="matrix(1,0,-0.25881905,0.96592583,0,0)"
+         y="-7.1248045"
+         x="21.2808"
+         height="30.936157"
+         width="29.882032"
+         id="rect993"
+         style="fill:#a40000;fill-opacity:1;stroke:#a40000;stroke-width:1.40657163;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" />
+    </g>
+  </g>
+</svg>
diff --git a/icons/a2p_pointOnLineConstraint.svg b/icons/a2p_PointIdentity.svg
similarity index 70%
rename from icons/a2p_pointOnLineConstraint.svg
rename to icons/a2p_PointIdentity.svg
index a23cf513..cbcd1cce 100644
--- a/icons/a2p_pointOnLineConstraint.svg
+++ b/icons/a2p_PointIdentity.svg
@@ -14,8 +14,8 @@
    height="64"
    id="svg3085"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="a2p_pointOnPLineConstraint.svg">
+   inkscape:version="0.92.3 (unknown)"
+   sodipodi:docname="a2p_PointIdentity.svg">
   <defs
      id="defs3087">
     <linearGradient
@@ -310,7 +310,7 @@
        x2="39.360435"
        y2="16.048664"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-62,-20)" />
+       gradientTransform="translate(-2,0)" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient3871"
@@ -320,39 +320,28 @@
        x2="8.7007294"
        y2="16.186771"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(57.861891,-20)" />
+       gradientTransform="translate(-2.1381092,0)" />
     <linearGradient
-       gradientTransform="matrix(0.37691196,0,0,1.3588652,115.52852,-109.88868)"
-       inkscape:collect="always"
-       xlink:href="#linearGradient3987-5"
-       id="linearGradient3993-7"
-       x1="19"
-       y1="26"
-       x2="10"
-       y2="-27"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3987-5">
+       id="linearGradient3916">
       <stop
-         style="stop-color:#a40000;stop-opacity:1"
+         id="stop3918"
          offset="0"
-         id="stop3989-3" />
+         style="stop-color:#8ae234;stop-opacity:1" />
       <stop
-         style="stop-color:#ef2929;stop-opacity:1"
+         id="stop3920"
          offset="1"
-         id="stop3991-5" />
+         style="stop-color:#4e9a06;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3916-0"
-       id="linearGradient3246"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.80000007,0,0,0.78431368,-0.799999,-4.098038)"
-       x1="38.241375"
-       y1="23.159998"
+       y2="40.84"
        x2="41.689651"
-       y2="40.84" />
+       y1="23.159998"
+       x1="38.241375"
+       gradientTransform="matrix(0.80000007,0,0,0.78431368,-0.799999,-4.098038)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3938"
+       xlink:href="#linearGradient3916-0"
+       inkscape:collect="always" />
     <linearGradient
        id="linearGradient3916-0">
       <stop
@@ -364,27 +353,6 @@
          offset="1"
          style="stop-color:#4e9a06;stop-opacity:1" />
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3916"
-       id="linearGradient3963"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.80000007,0,0,0.78431368,0.20000082,-30.098038)"
-       x1="42.249996"
-       y1="23.074999"
-       x2="39.749996"
-       y2="40.924999" />
-    <linearGradient
-       id="linearGradient3916">
-      <stop
-         id="stop3918"
-         offset="0"
-         style="stop-color:#8ae234;stop-opacity:1" />
-      <stop
-         id="stop3920"
-         offset="1"
-         style="stop-color:#4e9a06;stop-opacity:1" />
-    </linearGradient>
   </defs>
   <sodipodi:namedview
      id="base"
@@ -393,21 +361,21 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="10.24"
-     inkscape:cx="36.290889"
-     inkscape:cy="36.949236"
+     inkscape:zoom="8.25"
+     inkscape:cx="32"
+     inkscape:cy="32"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:document-units="px"
-     inkscape:window-width="2560"
-     inkscape:window-height="1514"
+     inkscape:window-width="1366"
+     inkscape:window-height="716"
      inkscape:window-x="0"
-     inkscape:window-y="0"
+     inkscape:window-y="26"
      inkscape:window-maximized="1">
     <inkscape:grid
        type="xygrid"
-       id="grid3113"
+       id="grid3130"
        empspacing="2"
        visible="true"
        enabled="true"
@@ -430,69 +398,32 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
      transform="translate(0,32)">
-    <rect
-       style="fill:url(#linearGradient3993-7);fill-opacity:1;stroke:#ef2929;stroke-width:1.43132448;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:6.00000048;stroke-opacity:1"
-       id="rect3115-6-9"
-       width="6.7844162"
-       height="73.378738"
-       x="117.41309"
-       y="-146.57803"
-       transform="matrix(0.41802033,0.90843767,-0.02922842,0.99957276,0,0)" />
+    <ellipse
+       style="opacity:1;fill:#729fcf;fill-opacity:1;stroke:#000000;stroke-width:2.00011616;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:6.00000048;stroke-opacity:1"
+       id="path3132-3-6-3"
+       cx="22.801844"
+       cy="22.801844"
+       rx="23.724241"
+       ry="23.623035"
+       transform="matrix(0.70169765,-0.71247485,0.70169765,0.71247485,0,0)" />
     <g
-       style="display:inline"
-       id="g3959"
-       transform="matrix(-1,0,0,1,64,-7.58223)">
-      <path
-         inkscape:export-ydpi="4.1683898"
-         inkscape:export-xdpi="4.1683898"
-         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
-         sodipodi:nodetypes="cccccccc"
-         id="path3343-0"
-         d="m 35,-13 0,4 -18,0 0,8 18,0 0,4 14,-8 z"
-         style="fill:url(#linearGradient3963);fill-opacity:1;fill-rule:evenodd;stroke:#172a04;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:export-ydpi="4.1683898"
-         inkscape:export-xdpi="4.1683898"
-         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
-         sodipodi:nodetypes="cccccccc"
-         id="path3343-2-9"
-         d="M 37,-9.5822304 37,-7 l -18,0 0,4 18,0 0,2.5822304 L 45,-5 z"
-         style="fill:none;stroke:#8ae234;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-         inkscape:connector-curvature="0" />
-    </g>
-    <g
-       id="g3242"
-       transform="translate(1,-8)">
-      <path
-         inkscape:export-ydpi="4.1683898"
-         inkscape:export-xdpi="4.1683898"
-         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
-         sodipodi:nodetypes="cccccccc"
-         id="path3343-0-6"
-         d="m 34,13 0,4 -18,0 0,8 18,0 0,4 14,-8 z"
-         style="fill:url(#linearGradient3246);fill-opacity:1;fill-rule:evenodd;stroke:#172a04;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:export-ydpi="4.1683898"
-         inkscape:export-xdpi="4.1683898"
-         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
-         sodipodi:nodetypes="cccccccc"
-         id="path3343-2-9-1"
-         d="M 36,16.41777 36,19 l -18,0 0,4 18,0 0,2.58223 L 44,21 z"
-         style="fill:none;stroke:#8ae234;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-         inkscape:connector-curvature="0" />
+       id="g3838">
+      <ellipse
+         transform="matrix(0.71081857,-0.70337541,0.71081857,0.70337541,0,0)"
+         ry="13.760338"
+         rx="14.381022"
+         cy="22.50926"
+         cx="22.50926"
+         id="path3132-3-6-36"
+         style="fill:#ef2929;fill-opacity:1;stroke:#000000;stroke-width:2.00005531;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:6.00000048;stroke-opacity:1" />
+      <circle
+         r="11.957547"
+         inkscape:transform-center-y="-5.4110918"
+         inkscape:transform-center-x="19.325331"
+         cy="0"
+         cx="32"
+         id="path3828"
+         style="fill:#a40000;fill-opacity:1;stroke:#ef2929;stroke-width:2.08490562;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" />
     </g>
-    <path
-       style="fill:#0003ff;fill-opacity:1;stroke:#4e5593;stroke-width:0.46062991;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path3411"
-       sodipodi:type="arc"
-       sodipodi:cx="10.097656"
-       sodipodi:cy="-0.98828125"
-       sodipodi:rx="10"
-       sodipodi:ry="10.5"
-       sodipodi:start="2.3763356"
-       sodipodi:end="2.3742412"
-       d="M 2.8856131,6.2853041 A 10,10.5 0 0 1 3.1666569,-8.5571171 10,10.5 0 0 1 17.302441,-8.2697926 10,10.5 0 0 1 17.0362,6.5729294 10,10.5 0 0 1 2.9001373,6.3011482 l 7.1975187,-7.28942945 z" />
   </g>
 </svg>
diff --git a/icons/a2p_PointOnLineConstraint.svg b/icons/a2p_PointOnLineConstraint.svg
new file mode 100644
index 00000000..4c28d21d
--- /dev/null
+++ b/icons/a2p_PointOnLineConstraint.svg
@@ -0,0 +1,416 @@
+<?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="64"
+   height="64"
+   id="svg3085"
+   version="1.1"
+   inkscape:version="0.92.3 (unknown)"
+   sodipodi:docname="a2p_PointOnLineConstraint.svg">
+  <defs
+     id="defs3087">
+    <linearGradient
+       id="linearGradient3871">
+      <stop
+         style="stop-color:#2200ff;stop-opacity:1;"
+         offset="0"
+         id="stop3873" />
+      <stop
+         style="stop-color:#fffcfc;stop-opacity:1;"
+         offset="1"
+         id="stop3875" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3863">
+      <stop
+         style="stop-color:#ff0000;stop-opacity:1;"
+         offset="0"
+         id="stop3865" />
+      <stop
+         style="stop-color:#ff9ea8;stop-opacity:1;"
+         offset="1"
+         id="stop3867" />
+    </linearGradient>
+    <marker
+       inkscape:stockid="Arrow2Lend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Lend"
+       style="overflow:visible">
+      <path
+         id="path4574"
+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Lstart"
+       style="overflow:visible">
+      <path
+         id="path4571"
+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(1.1,0,0,1.1,1.1,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="TriangleInS"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="TriangleInS"
+       style="overflow:visible">
+      <path
+         id="path4692"
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+         transform="scale(-0.2,-0.2)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <linearGradient
+       id="linearGradient3903">
+      <stop
+         style="stop-color:#44852d;stop-opacity:1;"
+         offset="0"
+         id="stop3905" />
+      <stop
+         style="stop-color:#0026ff;stop-opacity:1;"
+         offset="1"
+         id="stop3907" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3859">
+      <stop
+         style="stop-color:#0d00ff;stop-opacity:1;"
+         offset="0"
+         id="stop3861" />
+      <stop
+         style="stop-color:#7d81f1;stop-opacity:1;"
+         offset="1"
+         id="stop3863" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3851">
+      <stop
+         style="stop-color:#ff0000;stop-opacity:1;"
+         offset="0"
+         id="stop3853" />
+      <stop
+         style="stop-color:#ff7e7e;stop-opacity:1;"
+         offset="1"
+         id="stop3855" />
+    </linearGradient>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="3.6842619 : 5.0066992 : 1"
+       inkscape:vp_y="-27.498543 : -45.297844 : 1"
+       inkscape:vp_z="-46.715775 : -11.759466 : 1"
+       inkscape:persp3d-origin="12 : 10.666667 : 1"
+       id="perspective3096" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="-13.436262 : 14.723626 : 1"
+       inkscape:vp_y="0 : 954.05 : 0"
+       inkscape:vp_z="44.68773 : 14.723626 : 1"
+       inkscape:persp3d-origin="15.625734 : 9.6353598 : 1"
+       id="perspective3094" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="-4 : 10 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="28 : 10 : 1"
+       inkscape:persp3d-origin="12 : 4.666667 : 1"
+       id="perspective3011" />
+    <inkscape:path-effect
+       effect="skeletal"
+       id="path-effect3066"
+       is_visible="true"
+       pattern="M 0,0 0,10 10,5 z"
+       copytype="single_stretched"
+       prop_scale="1"
+       scale_y_rel="false"
+       spacing="0"
+       normal_offset="0"
+       tang_offset="0"
+       prop_units="false"
+       vertical_pattern="false"
+       fuse_tolerance="0" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient7597">
+      <stop
+         style="stop-color:#000003;stop-opacity:1;"
+         offset="0"
+         id="stop7599" />
+      <stop
+         style="stop-color:#000003;stop-opacity:0;"
+         offset="1"
+         id="stop7601" />
+    </linearGradient>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lstart"
+       style="overflow:visible">
+      <path
+         id="path3995"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Send"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Send"
+       style="overflow:visible">
+      <path
+         id="path4010"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+         transform="matrix(-0.2,0,0,-0.2,-1.2,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Sstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Sstart"
+       style="overflow:visible">
+      <path
+         id="path4007"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+         transform="matrix(0.2,0,0,0.2,1.2,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Sstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Sstart"
+       style="overflow:visible">
+      <path
+         id="path4025"
+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(0.3,0,0,0.3,-0.69,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="TriangleOutL"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="TriangleOutL"
+       style="overflow:visible">
+      <path
+         id="path4137"
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+         transform="scale(0.8,0.8)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="DiamondLend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="DiamondLend"
+       style="overflow:visible">
+      <path
+         id="path4092"
+         d="M 0,-7.0710768 -7.0710894,0 0,7.0710589 7.0710462,0 0,-7.0710768 z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+         transform="matrix(0.8,0,0,0.8,-5.6,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="DiamondLstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="DiamondLstart"
+       style="overflow:visible">
+      <path
+         id="path4083"
+         d="M 0,-7.0710768 -7.0710894,0 0,7.0710589 7.0710462,0 0,-7.0710768 z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+         transform="matrix(0.8,0,0,0.8,5.6,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lend"
+       style="overflow:visible">
+      <path
+         id="path3998"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+         transform="matrix(-0.8,0,0,-0.8,-10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <linearGradient
+       id="linearGradient3893">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3895" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3897" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7597"
+       id="linearGradient7603"
+       x1="15.71482"
+       y1="22.299377"
+       x2="34.136208"
+       y2="22.299377"
+       gradientUnits="userSpaceOnUse" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="1.132573 : 16.837097 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="31.983524 : 20.416825 : 1"
+       inkscape:persp3d-origin="15.674165 : -5.599381 : 1"
+       id="perspective3011-3" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3863"
+       id="linearGradient3869"
+       x1="23.340048"
+       y1="16.048664"
+       x2="39.360435"
+       y2="16.048664"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-62,-20)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3871"
+       id="linearGradient3877"
+       x1="-8.5626202"
+       y1="16.186771"
+       x2="8.7007294"
+       y2="16.186771"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(57.861891,-20)" />
+    <linearGradient
+       id="linearGradient3916-0">
+      <stop
+         id="stop3918-6"
+         offset="0"
+         style="stop-color:#8ae234;stop-opacity:1" />
+      <stop
+         id="stop3920-2"
+         offset="1"
+         style="stop-color:#4e9a06;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3916">
+      <stop
+         id="stop3918"
+         offset="0"
+         style="stop-color:#8ae234;stop-opacity:1" />
+      <stop
+         id="stop3920"
+         offset="1"
+         style="stop-color:#4e9a06;stop-opacity:1" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="8.25"
+     inkscape:cx="38.121212"
+     inkscape:cy="29.840525"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1366"
+     inkscape:window-height="716"
+     inkscape:window-x="0"
+     inkscape:window-y="26"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3113"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata3090">
+    <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 />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     transform="translate(0,32)">
+    <rect
+       style="fill:#729fcf;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+       id="rect3874"
+       width="7.6412416"
+       height="69.641243"
+       x="18.806797"
+       y="-57.44804"
+       transform="rotate(45)" />
+    <ellipse
+       style="fill:#ef2929;fill-opacity:1;stroke:#000000;stroke-width:2.00005531;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:6.00000048;stroke-opacity:1"
+       id="path3132-3-6"
+       cx="22.50926"
+       cy="22.50926"
+       rx="14.381022"
+       ry="13.760338"
+       transform="matrix(0.71081857,-0.70337541,0.71081857,0.70337541,0,0)" />
+    <circle
+       style="fill:#a40000;fill-opacity:1;stroke:#ef2929;stroke-width:2.08490562;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+       id="path3828"
+       cx="32"
+       cy="0"
+       inkscape:transform-center-x="19.325331"
+       inkscape:transform-center-y="-5.4110918"
+       r="11.957547" />
+  </g>
+</svg>
diff --git a/icons/a2p_PointOnPlaneConstraint.svg b/icons/a2p_PointOnPlaneConstraint.svg
new file mode 100644
index 00000000..8f6cd77a
--- /dev/null
+++ b/icons/a2p_PointOnPlaneConstraint.svg
@@ -0,0 +1,419 @@
+<?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="64"
+   height="64"
+   id="svg3085"
+   version="1.1"
+   inkscape:version="0.92.3 (unknown)"
+   sodipodi:docname="a2p_PointOnPlaneConstraint.svg">
+  <defs
+     id="defs3087">
+    <linearGradient
+       id="linearGradient3871">
+      <stop
+         style="stop-color:#2200ff;stop-opacity:1;"
+         offset="0"
+         id="stop3873" />
+      <stop
+         style="stop-color:#fffcfc;stop-opacity:1;"
+         offset="1"
+         id="stop3875" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3863">
+      <stop
+         style="stop-color:#ff0000;stop-opacity:1;"
+         offset="0"
+         id="stop3865" />
+      <stop
+         style="stop-color:#ff9ea8;stop-opacity:1;"
+         offset="1"
+         id="stop3867" />
+    </linearGradient>
+    <marker
+       inkscape:stockid="Arrow2Lend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Lend"
+       style="overflow:visible">
+      <path
+         id="path4574"
+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Lstart"
+       style="overflow:visible">
+      <path
+         id="path4571"
+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(1.1,0,0,1.1,1.1,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="TriangleInS"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="TriangleInS"
+       style="overflow:visible">
+      <path
+         id="path4692"
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+         transform="scale(-0.2,-0.2)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <linearGradient
+       id="linearGradient3903">
+      <stop
+         style="stop-color:#44852d;stop-opacity:1;"
+         offset="0"
+         id="stop3905" />
+      <stop
+         style="stop-color:#0026ff;stop-opacity:1;"
+         offset="1"
+         id="stop3907" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3859">
+      <stop
+         style="stop-color:#0d00ff;stop-opacity:1;"
+         offset="0"
+         id="stop3861" />
+      <stop
+         style="stop-color:#7d81f1;stop-opacity:1;"
+         offset="1"
+         id="stop3863" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3851">
+      <stop
+         style="stop-color:#ff0000;stop-opacity:1;"
+         offset="0"
+         id="stop3853" />
+      <stop
+         style="stop-color:#ff7e7e;stop-opacity:1;"
+         offset="1"
+         id="stop3855" />
+    </linearGradient>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="3.6842619 : 5.0066992 : 1"
+       inkscape:vp_y="-27.498543 : -45.297844 : 1"
+       inkscape:vp_z="-46.715775 : -11.759466 : 1"
+       inkscape:persp3d-origin="12 : 10.666667 : 1"
+       id="perspective3096" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="-13.436262 : 14.723626 : 1"
+       inkscape:vp_y="0 : 954.05 : 0"
+       inkscape:vp_z="44.68773 : 14.723626 : 1"
+       inkscape:persp3d-origin="15.625734 : 9.6353598 : 1"
+       id="perspective3094" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="-4 : 10 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="28 : 10 : 1"
+       inkscape:persp3d-origin="12 : 4.666667 : 1"
+       id="perspective3011" />
+    <inkscape:path-effect
+       effect="skeletal"
+       id="path-effect3066"
+       is_visible="true"
+       pattern="M 0,0 0,10 10,5 z"
+       copytype="single_stretched"
+       prop_scale="1"
+       scale_y_rel="false"
+       spacing="0"
+       normal_offset="0"
+       tang_offset="0"
+       prop_units="false"
+       vertical_pattern="false"
+       fuse_tolerance="0" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient7597">
+      <stop
+         style="stop-color:#000003;stop-opacity:1;"
+         offset="0"
+         id="stop7599" />
+      <stop
+         style="stop-color:#000003;stop-opacity:0;"
+         offset="1"
+         id="stop7601" />
+    </linearGradient>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lstart"
+       style="overflow:visible">
+      <path
+         id="path3995"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Send"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Send"
+       style="overflow:visible">
+      <path
+         id="path4010"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+         transform="matrix(-0.2,0,0,-0.2,-1.2,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Sstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Sstart"
+       style="overflow:visible">
+      <path
+         id="path4007"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+         transform="matrix(0.2,0,0,0.2,1.2,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Sstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Sstart"
+       style="overflow:visible">
+      <path
+         id="path4025"
+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(0.3,0,0,0.3,-0.69,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="TriangleOutL"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="TriangleOutL"
+       style="overflow:visible">
+      <path
+         id="path4137"
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+         transform="scale(0.8,0.8)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="DiamondLend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="DiamondLend"
+       style="overflow:visible">
+      <path
+         id="path4092"
+         d="M 0,-7.0710768 -7.0710894,0 0,7.0710589 7.0710462,0 0,-7.0710768 z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+         transform="matrix(0.8,0,0,0.8,-5.6,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="DiamondLstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="DiamondLstart"
+       style="overflow:visible">
+      <path
+         id="path4083"
+         d="M 0,-7.0710768 -7.0710894,0 0,7.0710589 7.0710462,0 0,-7.0710768 z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+         transform="matrix(0.8,0,0,0.8,5.6,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lend"
+       style="overflow:visible">
+      <path
+         id="path3998"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+         transform="matrix(-0.8,0,0,-0.8,-10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <linearGradient
+       id="linearGradient3893">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3895" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3897" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7597"
+       id="linearGradient7603"
+       x1="15.71482"
+       y1="22.299377"
+       x2="34.136208"
+       y2="22.299377"
+       gradientUnits="userSpaceOnUse" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="1.132573 : 16.837097 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="31.983524 : 20.416825 : 1"
+       inkscape:persp3d-origin="15.674165 : -5.599381 : 1"
+       id="perspective3011-3" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3863"
+       id="linearGradient3869"
+       x1="23.340048"
+       y1="16.048664"
+       x2="39.360435"
+       y2="16.048664"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-62,-20)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3871"
+       id="linearGradient3877"
+       x1="-8.5626202"
+       y1="16.186771"
+       x2="8.7007294"
+       y2="16.186771"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(57.861891,-20)" />
+    <linearGradient
+       id="linearGradient3916-0">
+      <stop
+         id="stop3918-6"
+         offset="0"
+         style="stop-color:#8ae234;stop-opacity:1" />
+      <stop
+         id="stop3920-2"
+         offset="1"
+         style="stop-color:#4e9a06;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3916">
+      <stop
+         id="stop3918"
+         offset="0"
+         style="stop-color:#8ae234;stop-opacity:1" />
+      <stop
+         id="stop3920"
+         offset="1"
+         style="stop-color:#4e9a06;stop-opacity:1" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="8.25"
+     inkscape:cx="32"
+     inkscape:cy="32"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1366"
+     inkscape:window-height="716"
+     inkscape:window-x="0"
+     inkscape:window-y="26"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3113"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata3090">
+    <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 />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     transform="translate(0,32)">
+    <rect
+       style="fill:#729fcf;fill-opacity:1;stroke:#000000;stroke-width:2.03497052;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+       id="rect4851"
+       width="43.232109"
+       height="44.757172"
+       x="10.383945"
+       y="-22.378586"
+       transform="matrix(1,0,-0.25881905,0.96592583,0,0)" />
+    <g
+       id="g3838">
+      <ellipse
+         transform="matrix(0.71081857,-0.70337541,0.71081857,0.70337541,0,0)"
+         ry="13.760338"
+         rx="14.381022"
+         cy="22.50926"
+         cx="22.50926"
+         id="path3132-3-6"
+         style="fill:#ef2929;fill-opacity:1;stroke:#000000;stroke-width:2.00005531;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:6.00000048;stroke-opacity:1" />
+      <circle
+         r="11.957547"
+         inkscape:transform-center-y="-5.4110918"
+         inkscape:transform-center-x="19.325331"
+         cy="0"
+         cx="32"
+         id="path3828"
+         style="fill:#a40000;fill-opacity:1;stroke:#ef2929;stroke-width:2.08490562;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" />
+    </g>
+  </g>
+</svg>
diff --git a/icons/a2p_SimpleAssemblyShape.svg b/icons/a2p_SimpleAssemblyShape.svg
new file mode 100644
index 00000000..9314e295
--- /dev/null
+++ b/icons/a2p_SimpleAssemblyShape.svg
@@ -0,0 +1,277 @@
+<?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="64"
+   height="64"
+   id="svg3559"
+   version="1.1"
+   inkscape:version="0.92.3 (unknown)"
+   sodipodi:docname="a2p_SimpleAssemblyShape.svg"
+   viewBox="0 0 64 64">
+  <defs
+     id="defs3561">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient1049">
+      <stop
+         style="stop-color:#888a85;stop-opacity:1;"
+         offset="0"
+         id="stop1045" />
+      <stop
+         style="stop-color:#888a85;stop-opacity:0;"
+         offset="1"
+         id="stop1047" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient1041">
+      <stop
+         style="stop-color:#888a85;stop-opacity:1;"
+         offset="0"
+         id="stop1037" />
+      <stop
+         style="stop-color:#888a85;stop-opacity:0;"
+         offset="1"
+         id="stop1039" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient1033">
+      <stop
+         style="stop-color:#888a85;stop-opacity:1;"
+         offset="0"
+         id="stop1029" />
+      <stop
+         style="stop-color:#888a85;stop-opacity:0;"
+         offset="1"
+         id="stop1031" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient1021">
+      <stop
+         style="stop-color:#888a85;stop-opacity:1;"
+         offset="0"
+         id="stop1017" />
+      <stop
+         style="stop-color:#888a85;stop-opacity:0;"
+         offset="1"
+         id="stop1019" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4383-3"
+       inkscape:collect="always">
+      <stop
+         id="stop73188"
+         offset="0"
+         style="stop-color:#3465a4;stop-opacity:1" />
+      <stop
+         id="stop73190"
+         offset="1"
+         style="stop-color:#729fcf;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4383-3"
+       id="linearGradient4389-0"
+       x1="27.243532"
+       y1="54.588112"
+       x2="21.243532"
+       y2="30.588112"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-1.243533,-2.588112)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4393-9"
+       id="linearGradient4399-7"
+       x1="48.714352"
+       y1="45.585785"
+       x2="40.714352"
+       y2="24.585787"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(1.2856487,1.4142136)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4393-9">
+      <stop
+         style="stop-color:#204a87;stop-opacity:1"
+         offset="0"
+         id="stop4395-8" />
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1"
+         offset="1"
+         id="stop4397-1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5058">
+      <stop
+         id="stop5060"
+         offset="0"
+         style="stop-color:#888a85;stop-opacity:1;" />
+      <stop
+         id="stop5066"
+         offset="0.5"
+         style="stop-color:#eeeeec;stop-opacity:1;" />
+      <stop
+         id="stop3430"
+         offset="1"
+         style="stop-color:#888a85;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3414">
+      <stop
+         id="stop3416"
+         offset="0"
+         style="stop-color:#eeeeec;stop-opacity:1;" />
+      <stop
+         id="stop3418"
+         offset="0.5"
+         style="stop-color:#ef2929;stop-opacity:1;" />
+      <stop
+         id="stop3420"
+         offset="1"
+         style="stop-color:#a40000;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1021"
+       id="linearGradient1027"
+       x1="4.3944435"
+       y1="22.983917"
+       x2="36.276485"
+       y2="22.983917"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1033"
+       id="linearGradient1035"
+       x1="28.602148"
+       y1="23.10643"
+       x2="60.139919"
+       y2="23.10643"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1041"
+       id="linearGradient1043"
+       x1="28.721924"
+       y1="43.833864"
+       x2="60.277199"
+       y2="43.833864"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1049"
+       id="linearGradient1051"
+       x1="10.515475"
+       y1="46.634077"
+       x2="36.244885"
+       y2="46.634077"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1"
+     inkscape:cx="32"
+     inkscape:cy="32"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     inkscape:window-width="1366"
+     inkscape:window-height="716"
+     inkscape:window-x="0"
+     inkscape:window-y="26"
+     inkscape:window-maximized="1"
+     inkscape:snap-global="false"
+     inkscape:snap-nodes="false"
+     inkscape:snap-others="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3007"
+       empspacing="4"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       spacingx="0.5"
+       spacingy="0.5" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata3564">
+    <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>
+        <dc:title>Path-Stock</dc:title>
+        <dc:date>2015-07-04</dc:date>
+        <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
+        <dc:publisher>
+          <cc:Agent>
+            <dc:title>FreeCAD</dc:title>
+          </cc:Agent>
+        </dc:publisher>
+        <dc:identifier>FreeCAD/src/Mod/Path/Gui/Resources/icons/Path-Stock.svg</dc:identifier>
+        <dc:rights>
+          <cc:Agent>
+            <dc:title>FreeCAD LGPL2+</dc:title>
+          </cc:Agent>
+        </dc:rights>
+        <cc:license>https://www.gnu.org/copyleft/lesser.html</cc:license>
+        <dc:contributor>
+          <cc:Agent>
+            <dc:title>[agryson] Alexander Gryson</dc:title>
+          </cc:Agent>
+        </dc:contributor>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <g
+       id="g6512"
+       transform="rotate(-21.5,4.0302919,-61.060914)" />
+    <path
+       d="m 35.269315,11.086138 -8.843306,0.07795 c 0,0 0.05921,-1.7547709 0.528002,-2.5161462 0.468796,-0.7613778 0.937441,-1.113336 0.76194,-1.6393404 -0.175502,-0.526008 -0.994965,-1.6355002 -2.927663,-1.5727332 -1.93266,0.062741 -3.865554,0.7688529 -3.807417,1.9384833 0.05814,1.1696331 1.112262,1.2842897 1.170552,2.0445028 0.05829,0.7602157 0.116489,1.7543857 0.116489,1.7543857 l -10.775879,-0.09326 0.113909,8.83144 c 0,0 -0.937059,0.06055 -1.6396859,-0.347319 C 9.263627,19.156232 8.502561,18.397563 7.565462,18.57509 c -0.9371,0.177525 -2.226273,2.227445 -2.168114,3.338589 0.05816,1.111145 0.584603,2.864626 1.404381,3.21375 0.819779,0.349124 2.3428489,-0.707014 3.279927,-0.826052 0.93708,-0.11904 1.464163,-0.120199 1.464163,-0.120199 l -0.120993,10.586595 9.634634,0.03965 c 0,0 -0.07311,0.458661 -0.541969,1.395498 -0.46886,0.936839 -0.697102,1.896849 -0.697422,2.774173 -3.19e-4,0.87732 3.081365,1.497243 4.252639,1.553151 1.171276,0.05591 3.924055,-0.593517 3.924377,-1.470833 3.21e-4,-0.877322 -1.463439,-1.868396 -1.521618,-2.921052 -0.05818,-1.052657 -0.05803,-1.462071 -0.05803,-1.462071 l 8.78472,-0.01934 -0.05472,-10.527724 c 0,0 -0.05842,-0.409284 -1.171295,0.0026 -1.112878,0.41187 -1.523196,1.407065 -2.460169,1.233663 -0.936973,-0.173402 -2.166279,-1.691384 -2.224396,-2.919504 -0.05812,-1.22812 0.587228,-4.329406 1.699916,-4.214878 1.112689,0.114525 1.05376,1.108951 2.283536,1.340196 1.229775,0.231246 1.932552,0.2297 1.932552,0.2297 z"
+       id="path4243"
+       style="fill:url(#linearGradient1027);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccsscsccccccssccccsccccccccsscccc" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:url(#linearGradient1051);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       sodipodi:nodetypes="cssssscccsssssccccssssscccsssssccc"
+       id="path4245"
+       d="m 24.637436,34.742591 c 0,0 10e-7,0.878447 0,1.755081 0,0.876631 1.229309,1.460751 1.229309,2.395825 0,0.935074 -2.1687,1.810798 -3.692584,1.810798 -1.523881,0 -3.16367,-1.345181 -3.22228,-1.871158 -0.05861,-0.525979 0.409264,-1.05297 0.819539,-1.871157 0.410275,-0.81819 0.52618,-2.337082 0.526182,-2.103312 l -8.73089,-0.05652 c 0,0 -0.02032,7.635517 -0.02328,8.827285 0.292402,-0.002 0.957408,-0.04305 1.490072,-0.352873 0.703332,-0.409092 1.464968,-1.168944 2.402741,-0.993618 0.937771,0.175326 2.223871,2.218682 2.16526,3.329083 -0.05861,1.110399 -0.585704,2.866996 -1.406255,3.217648 -0.82055,0.350651 -2.345042,-0.70494 -3.282815,-0.821824 -0.736745,-0.09183 -1.204872,-0.107214 -1.378316,-0.111434 -0.0046,1.857134 -0.0086,2.095298 -0.01863,6.114925 l 0.05122,4.457348 8.675012,0.06036 c 0,0 -0.06053,-0.819705 -0.06053,-1.462567 0,-0.642863 -1.229309,-1.986728 -1.229309,-2.395825 0,-0.409094 0.937272,-1.87035 3.105868,-1.987235 2.1686,-0.116883 3.692585,1.110605 3.692585,1.987235 0,0.876631 -0.412305,1.170155 -1.05702,2.163671 -0.644718,0.993516 -0.17229,1.694719 -0.17229,1.694721 h 10.72386 v -10.63728 c 0,0 -0.759913,0.05955 -1.639079,0.176437 -0.879162,0.116884 -1.116849,1.109694 -2.230451,1.109694 -1.113606,0 -1.876559,-1.867526 -1.876559,-3.737673 0,-1.870145 1.117353,-3.098039 1.820681,-3.273364 0.70333,-0.175325 1.638875,0.698683 2.342207,1.049334 0.703328,0.350653 1.583198,0.236795 1.583201,0.236796 v -8.594324 z" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:url(#linearGradient1043);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path5248"
+       d="m 46.102555,29.101745 c -0.06648,0.0011 -0.13246,0.0056 -0.200229,0.0093 -2.168596,0.116885 -3.105868,1.578141 -3.105868,1.987235 0,0.409097 1.229309,1.752962 1.229309,2.395825 10e-7,0.642862 0.06053,1.462567 0.06053,1.462567 l -8.675012,-0.06036 h -0.06053 v 8.594324 c 0,0 -0.817715,-0.003 -1.755491,-0.236796 -0.937772,-0.233769 -1.233258,-0.872896 -2.346863,-0.872898 -1.113604,0 -1.464056,2.044164 -1.522666,3.213005 -0.05861,1.168843 0.762953,3.387521 1.876559,3.329082 0.999033,0.0014 1.322291,-0.368931 2.286328,-1.049334 0.703331,-0.292211 1.578547,0.05572 1.578545,0.05572 v 10.581559 h 8.623791 c 0.01741,-0.152406 0.135284,-1.324035 -0.358548,-1.871158 -0.527497,-0.584421 -1.055098,-1.287847 -0.996486,-2.047595 0.05861,-0.759747 1.288933,-1.869239 3.105868,-1.810797 1.816934,0.05844 3.86953,0.759951 3.86953,1.987235 0,1.227287 -1.172621,1.109795 -1.289843,2.10331 -0.117225,0.993515 -0.05588,1.694722 -0.05588,1.694722 H 59.089462 V 47.87368 c -3e-6,3e-6 -0.701003,-0.527089 -1.345721,-0.176437 -0.64472,0.35065 -1.290756,1.462567 -2.169918,1.462567 -0.879164,-2e-6 -2.697717,-2.164377 -2.463274,-3.742315 0.234443,-1.577941 1.232143,-3.388331 2.169916,-3.213004 0.937776,0.175326 1.289945,0.99281 2.28633,1.109694 0.996387,0.116882 1.639079,0.116076 1.639079,0.116076 -0.03617,-0.64002 0.247224,-8.366822 -0.116412,-8.473604 H 48.365601 c 0,-2e-6 -0.472428,-0.701205 0.17229,-1.694721 0.644715,-0.993516 1.05702,-1.28704 1.05702,-2.163671 0,-0.849235 -1.431386,-2.029958 -3.492356,-1.99652 z"
+       sodipodi:nodetypes="ccscccccccscccccsccsccccccsccccccsc" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:url(#linearGradient1035);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       sodipodi:nodetypes="ccssssscccssssscccccssscccssssscc"
+       id="path5243"
+       d="m 35.405869,11.241793 -0.06053,8.705758 c 0,0 -1.113505,0.06006 -1.699613,-0.232153 -0.586108,-0.292213 -1.521352,-0.993618 -2.048849,-0.993618 -0.527499,0 -2.051581,1.575818 -1.992971,3.329082 0.05861,1.753259 1.054084,3.510161 1.816025,3.510161 0.761939,-2e-6 1.290754,-0.704131 2.169917,-0.937899 0.879162,-0.233766 1.755491,-0.171795 1.755491,-0.171795 l -0.05588,10.516557 8.670356,-0.05572 c 10e-7,-5e-6 0.293864,-1.112217 -0.116413,-1.755081 -0.410274,-0.642863 -1.34572,-1.346291 -1.34572,-2.047595 1e-6,-0.701307 1.112595,-1.924956 3.515638,-1.866514 2.403044,0.05844 3.63205,1.110603 3.63205,1.987235 -10e-7,0.876629 -1.231233,1.341645 -1.289844,2.04295 -0.05861,0.701305 -0.05588,1.639005 -0.05588,1.639005 H 59.139919 V 24.33061 c 2e-6,-1e-6 -0.875214,-0.347928 -1.578545,-0.05572 -0.964037,0.680403 -1.28942,1.052683 -2.288453,1.051253 -1.113604,0.05844 -1.933045,-2.162158 -1.874434,-3.331001 0.05861,-1.168841 0.409062,-3.213005 1.522666,-3.213005 1.113605,2e-6 1.409091,0.639129 2.346863,0.872898 0.937776,0.233772 1.755491,0.236796 1.755491,0.236796 v -8.594324 l -10.430502,-0.05572 c 1e-6,-2e-6 -0.352476,0.699288 0.116412,1.634361 0.468887,0.935071 0.880073,1.226678 0.880073,2.103311 -10e-7,0.876631 -1.994187,2.049513 -3.166403,2.107954 -1.172216,0.05844 -3.925407,-0.585936 -3.925407,-1.462567 10e-7,-0.87663 1.464056,-1.868534 1.522667,-2.920492 0.05861,-1.051956 0.06053,-1.462567 0.06053,-1.462567 z" />
+  </g>
+</svg>
diff --git a/icons/a2p_sphericalSurfaceConstraint.svg b/icons/a2p_SphericalSurfaceConstraint.svg
similarity index 73%
rename from icons/a2p_sphericalSurfaceConstraint.svg
rename to icons/a2p_SphericalSurfaceConstraint.svg
index 55db6c3a..67c29aac 100644
--- a/icons/a2p_sphericalSurfaceConstraint.svg
+++ b/icons/a2p_SphericalSurfaceConstraint.svg
@@ -14,8 +14,8 @@
    height="64"
    id="svg3085"
    version="1.1"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="sphericalSurfaceConstraint.svg">
+   inkscape:version="0.92.3 (unknown)"
+   sodipodi:docname="a2p_SphericalSurfaceConstraint.svg">
   <defs
      id="defs3087">
     <linearGradient
@@ -374,7 +374,8 @@
        y1="58.904766"
        x2="15.714287"
        y2="20.142857"
-       gradientUnits="userSpaceOnUse" />
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.90681814,0,0,0.90681809,5.4000009,-35.365906)" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient4040"
@@ -383,17 +384,8 @@
        y1="26"
        x2="43"
        y2="-28"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3916-0"
-       id="linearGradient3246"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.80000007,0,0,0.78431368,-0.799999,-4.098038)"
-       x1="38.241375"
-       y1="23.159998"
-       x2="41.689651"
-       y2="40.84" />
+       gradientTransform="translate(-1,-1)" />
     <linearGradient
        id="linearGradient3916-0">
       <stop
@@ -413,17 +405,17 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="5.6568543"
-     inkscape:cx="-10.088746"
-     inkscape:cy="48.164271"
+     inkscape:zoom="5.8336309"
+     inkscape:cx="32"
+     inkscape:cy="32"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:document-units="px"
-     inkscape:window-width="1600"
-     inkscape:window-height="837"
+     inkscape:window-width="1366"
+     inkscape:window-height="716"
      inkscape:window-x="0"
-     inkscape:window-y="27"
+     inkscape:window-y="26"
      inkscape:window-maximized="1"
      inkscape:snap-bbox="true"
      inkscape:snap-nodes="true">
@@ -441,10 +433,12 @@
        visible="true"
        enabled="true"
        snapvisiblegridlinesonly="true"
-       spacingx="16px"
-       spacingy="16px"
+       spacingx="16"
+       spacingy="16"
        empcolor="#fd0000"
-       empopacity="0.25098039" />
+       empopacity="0.25098039"
+       originx="0"
+       originy="0" />
   </sodipodi:namedview>
   <metadata
      id="metadata3090">
@@ -454,7 +448,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -463,53 +457,41 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
      transform="translate(0,32)">
-    <path
-       transform="matrix(1.0454546,0,0,1.0454546,-11,-40.772728)"
-       style="fill:#729fcf;fill-opacity:1;stroke:#0b1521;stroke-width:1.9130435;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:6.00000036"
-       d="m 44,39 c 0,12.150264 -9.849736,22 -22,22 -3.077181,0 -5.949262,-0.772136 -8.608696,-1.913046 0,-40.173911 0,0 0,-40.173911 C 16.050524,17.772352 18.923129,17 22,17 c 12.150264,0 22,9.849736 22,22 z"
-       id="path3127"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ssccss" />
-    <path
-       transform="matrix(0.95454541,0,0,0.95454536,-9,-37.227271)"
-       style="fill:url(#linearGradient4000);fill-opacity:1;stroke:#729fcf;stroke-width:2.09523821;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:6.00000036"
-       d="m 44,39 c 0,12.150264 -9.849736,22 -22,22 -2.630654,0 -4.99498,-0.593647 -7.333333,-1.440472 0,-41.904766 0,0.752976 0,-41.15179 C 17.015338,17.55241 19.355543,17 22,17 c 12.150264,0 22,9.849736 22,22 z"
-       id="path3127-3"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ssccss" />
-    <path
-       style="fill:url(#linearGradient4046);fill-opacity:1;stroke:#280000;stroke-width:2.00000023999999987;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:6.00000035999999959"
-       d="M 32.999999,-23.000001 C 45.702548,-23.000001 57,-13 57,0 57,13 45.702548,23.000001 32.999999,23.000001 33,29 33,29 33,29 l 28,0 0,-58 -28,0 z"
-       id="path3127-6"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cscc" />
-    <path
-       style="fill:none;fill-opacity:1;stroke:#ef2929;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:6.00000035999999959;stroke-dasharray:none"
-       d="m 35,-25 c 7,0 24,8 24,25 0,16 -15,25 -24,25 10e-7,5.586206 10e-7,2 10e-7,2 L 59,27 l 0,-54 -23.999999,0 z"
-       id="path3127-6-7"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cscccccc" />
     <g
-       id="g3242"
-       transform="translate(7,-21)">
-      <path
-         inkscape:export-ydpi="4.1683898"
-         inkscape:export-xdpi="4.1683898"
-         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
-         sodipodi:nodetypes="cccccccc"
-         id="path3343-0-6"
-         d="m 34,13 0,4 -18,0 0,8 18,0 0,4 14,-8 z"
-         style="fill:url(#linearGradient3246);fill-opacity:1;fill-rule:evenodd;stroke:#172a04;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:export-ydpi="4.1683898"
-         inkscape:export-xdpi="4.1683898"
-         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
-         sodipodi:nodetypes="cccccccc"
-         id="path3343-2-9-1"
-         d="M 36,16.41777 36,19 l -18,0 0,4 18,0 0,2.58223 L 44,21 z"
-         style="fill:none;stroke:#8ae234;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-         inkscape:connector-curvature="0" />
+       id="g6395"
+       transform="translate(-1.3500001)">
+      <g
+         transform="translate(-9.299999)"
+         id="g6359">
+        <path
+           style="fill:#729fcf;fill-opacity:1;stroke:#0b1521;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:6.00000048;stroke-opacity:1"
+           d="M 48.000001,-1.0000001e-7 C 48.000001,12.702549 37.70255,23.000001 25,23.000001 c -3.217053,0 -6.219683,-0.807234 -9.000001,-2.000003 0,-42 0,0 0,-42 2.780094,-1.192541 5.783272,-2 9.000001,-2 12.70255,0 23.000001,10.297452 23.000001,23.00000189999999 z"
+           id="path3127"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ssccss" />
+        <path
+           style="fill:url(#linearGradient4000);fill-opacity:1;stroke:#729fcf;stroke-width:1.89999998;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:6.00000048;stroke-opacity:1"
+           d="m 45.299999,0 c 0,11.018079 -8.931919,19.949998 -19.949999,19.949998 -2.385525,0 -4.529538,-0.53833 -6.649999,-1.306246 0,-38 0,0.682812 0,-37.317188 2.129817,-0.775626 4.251958,-1.276562 6.649999,-1.276562 11.01808,0 19.949999,8.931919 19.949999,19.949998 z"
+           id="path3127-3"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ssccss" />
+      </g>
+      <g
+         transform="translate(0,1)"
+         id="g6365">
+        <path
+           style="fill:url(#linearGradient4046);fill-opacity:1;stroke:#280000;stroke-width:2.00000024;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:6.00000048;stroke-opacity:1"
+           d="M 31.999999,-24.000001 C 44.702548,-24.000001 56,-14 56,-1 56,12 44.702548,22.000001 31.999999,22.000001 32,28 32,28 32,28 H 60 V -30 H 32 Z"
+           id="path3127-6"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cscc" />
+        <path
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ef2929;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:6.00000048;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+           d="m 33,-29.066416 v 4 h 1 c 3.119048,0 9.047036,1.919336 13.998047,5.904297 C 52.949058,-15.177159 57,-9.2330824 57,-1.0664156 57,6.6210843 53.419174,12.581872 48.71875,16.679678 44.018326,20.777484 38.166667,22.933584 34,22.933584 h -1 v 1 1 1 h 10e-7 L 33,27.021475 v 0.0078 l 10e-7,-0.09569 h 2 l -2,-1 c 0,0 1.999999,1.133247 1.999999,1.132831 v -0.002 -0.0078 -0.02734 -0.0078 -0.08789 H 59 V -1.0664156 -29.066416 Z m 2,2 h 22 v 16.705078 C 55.213387,-14.616466 52.458276,-18.140014 49.251953,-20.720713 44.357385,-24.660243 38.877737,-26.653325 35,-26.947275 Z M 57,8.4121 V 24.933584 H 35 V 24.820303 C 39.668994,24.53569 45.310927,22.302644 50.03125,18.18749 52.948359,15.64437 55.375297,12.311432 57,8.4121 Z"
+           id="path3127-6-7"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccsssssccccccccccsccccccccccccsccccccsc" />
+      </g>
     </g>
   </g>
 </svg>
diff --git a/icons/a2p_ToggleTranparency.svg b/icons/a2p_ToggleTranparency.svg
new file mode 100644
index 00000000..87418024
--- /dev/null
+++ b/icons/a2p_ToggleTranparency.svg
@@ -0,0 +1,181 @@
+<?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="64"
+   height="64"
+   id="svg3559"
+   version="1.1"
+   inkscape:version="0.92.3 (unknown)"
+   sodipodi:docname="a2p_ToggleTranparency.svg"
+   viewBox="0 0 64 64">
+  <defs
+     id="defs3561">
+    <linearGradient
+       id="linearGradient4383-3"
+       inkscape:collect="always">
+      <stop
+         id="stop73188"
+         offset="0"
+         style="stop-color:#3465a4;stop-opacity:1" />
+      <stop
+         id="stop73190"
+         offset="1"
+         style="stop-color:#729fcf;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4383-3"
+       id="linearGradient4389-0"
+       x1="27.243532"
+       y1="54.588112"
+       x2="21.243532"
+       y2="30.588112"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-1.243533,-2.588112)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4393-9"
+       id="linearGradient4399-7"
+       x1="48.714352"
+       y1="45.585785"
+       x2="40.714352"
+       y2="24.585787"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(1.2856487,1.4142136)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4393-9">
+      <stop
+         style="stop-color:#204a87;stop-opacity:1"
+         offset="0"
+         id="stop4395-8" />
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1"
+         offset="1"
+         id="stop4397-1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5058">
+      <stop
+         id="stop5060"
+         offset="0"
+         style="stop-color:#888a85;stop-opacity:1;" />
+      <stop
+         id="stop5066"
+         offset="0.5"
+         style="stop-color:#eeeeec;stop-opacity:1;" />
+      <stop
+         id="stop3430"
+         offset="1"
+         style="stop-color:#888a85;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3414">
+      <stop
+         id="stop3416"
+         offset="0"
+         style="stop-color:#eeeeec;stop-opacity:1;" />
+      <stop
+         id="stop3418"
+         offset="0.5"
+         style="stop-color:#ef2929;stop-opacity:1;" />
+      <stop
+         id="stop3420"
+         offset="1"
+         style="stop-color:#a40000;stop-opacity:1;" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1"
+     inkscape:cx="32"
+     inkscape:cy="32"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     inkscape:window-width="1366"
+     inkscape:window-height="716"
+     inkscape:window-x="0"
+     inkscape:window-y="26"
+     inkscape:window-maximized="1"
+     inkscape:snap-global="false"
+     inkscape:snap-nodes="false"
+     inkscape:snap-others="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3007"
+       empspacing="4"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       spacingx="0.5"
+       spacingy="0.5" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata3564">
+    <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>
+        <dc:title>Path-Stock</dc:title>
+        <dc:date>2015-07-04</dc:date>
+        <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
+        <dc:publisher>
+          <cc:Agent>
+            <dc:title>FreeCAD</dc:title>
+          </cc:Agent>
+        </dc:publisher>
+        <dc:identifier>FreeCAD/src/Mod/Path/Gui/Resources/icons/Path-Stock.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
+       inkscape:connector-curvature="0"
+       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4243"
+       d="m 36.264016,21.010008 -6.362129,-6.142755 c 0,0 1.272166,-1.21009 2.140187,-1.42456 0.868026,-0.21447 1.448979,-0.137026 1.692484,-0.635209 0.243505,-0.498188 0.436678,-1.863901 -0.985814,-3.1737797 C 31.3263,8.3238327 29.45274,7.4726868 28.674402,8.3476741 c -0.77834,0.8749923 -0.10685,1.6956159 -0.598115,2.2786939 -0.491269,0.583078 -1.146579,1.332965 -1.146579,1.332965 L 19.309175,4.3399026 13.200384,10.718774 c 0,0 -0.710798,-0.613606 -0.926068,-1.396997 C 12.059045,8.5383851 12.047972,7.4638266 11.255156,6.9336257 10.46234,6.4034226 8.106029,6.9619361 7.3686997,7.7952239 6.631369,8.628513 5.7778251,10.248174 6.1178282,11.071776 c 0.3400031,0.823604 2.1665903,1.137848 2.918397,1.70975 0.7518089,0.571903 1.1285628,0.940514 1.1285628,0.940514 l -7.5065406,7.466088 7.5342726,7.289525 c 0,0 -0.2409534,0.746161 -1.2320041,1.085733 -0.9910535,0.339573 -1.4891361,0.261384 -2.104289,0.886912 -0.6151674,0.625508 -0.012052,2.852085 0.7841737,3.712918 0.7962235,0.860836 3.2148344,2.32708 3.8299834,1.70156 0.615168,-0.625509 0.265778,-2.358373 0.962098,-3.149958 0.696321,-0.791585 0.983389,-1.083498 0.983389,-1.083498 l 6.279261,6.143496 7.339948,-7.547259 c 0,0 0.245209,-0.332867 -0.837263,-0.819101 -1.082445,-0.48626 -2.072645,-0.06403 -2.619403,-0.844444 -0.546757,-0.780412 -0.359592,-2.724746 0.459757,-3.641438 0.819346,-0.916694 3.453361,-2.676358 4.166713,-1.814777 0.713353,0.861579 -0.02568,1.52955 0.689377,2.556447 0.715055,1.026897 1.217393,1.518376 1.217393,1.518376 z" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="M 4.1212121,59.878788 59.636364,4.2424242"
+       id="path6652"
+       inkscape:connector-curvature="0" />
+    <path
+       d="m 26.415823,43.89259 6.362129,6.142755 c 0,0 -1.272166,1.21009 -2.140187,1.42456 -0.868026,0.21447 -1.448979,0.137026 -1.692484,0.635209 -0.243505,0.498188 -0.436678,1.863901 0.985814,3.173779 1.422444,1.309872 3.296004,2.161018 4.074342,1.286031 0.77834,-0.874993 0.10685,-1.695616 0.598115,-2.278694 0.491269,-0.583078 1.146579,-1.332965 1.146579,-1.332965 l 7.620533,7.61943 6.108791,-6.378871 c 0,0 0.710798,0.613606 0.926068,1.396997 0.215271,0.783392 0.226344,1.85795 1.01916,2.388151 0.792816,0.530203 3.149127,-0.02831 3.886457,-0.861598 0.73733,-0.833289 1.590874,-2.45295 1.250871,-3.276552 -0.340003,-0.823604 -2.16659,-1.137848 -2.918397,-1.70975 -0.751809,-0.571903 -1.128563,-0.940514 -1.128563,-0.940514 l 7.506541,-7.466088 -7.534273,-7.289525 c 0,0 0.240954,-0.746161 1.232005,-1.085733 0.991053,-0.339573 1.489136,-0.261384 2.104289,-0.886912 0.615167,-0.625508 0.01205,-2.852085 -0.784174,-3.712918 -0.796224,-0.860836 -3.214835,-2.32708 -3.829984,-1.70156 -0.615168,0.625509 -0.265778,2.358373 -0.962098,3.149958 -0.696321,0.791585 -0.983389,1.083498 -0.983389,1.083498 l -6.279261,-6.143496 -7.339948,7.547259 c 0,0 -0.245209,0.332867 0.837263,0.819101 1.082445,0.48626 2.072645,0.06403 2.619403,0.844444 0.546757,0.780412 0.359592,2.724746 -0.459757,3.641438 -0.819346,0.916694 -3.453361,2.676358 -4.166713,1.814777 -0.713353,-0.861579 0.02568,-1.52955 -0.689377,-2.556447 -0.715055,-1.026897 -1.217393,-1.518376 -1.217393,-1.518376 z"
+       id="path6676"
+       style="fill:#edd400;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/icons/a2p_pointIdentity.svg b/icons/a2p_ViewConnection.svg
similarity index 75%
rename from icons/a2p_pointIdentity.svg
rename to icons/a2p_ViewConnection.svg
index 13c30bf7..9e48f7b0 100644
--- a/icons/a2p_pointIdentity.svg
+++ b/icons/a2p_ViewConnection.svg
@@ -14,10 +14,36 @@
    height="64"
    id="svg3085"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="pointIdentity.svg">
+   inkscape:version="0.92.3 (unknown)"
+   sodipodi:docname="a2p_ViewConnection.svg">
   <defs
      id="defs3087">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient6740">
+      <stop
+         style="stop-color:#cc0000;stop-opacity:1;"
+         offset="0"
+         id="stop6736" />
+      <stop
+         style="stop-color:#cc0000;stop-opacity:0;"
+         offset="1"
+         id="stop6738" />
+    </linearGradient>
+    <inkscape:path-effect
+       effect="skeletal"
+       id="path-effect5459"
+       is_visible="true"
+       pattern="m 3.827803,-2.499021 h 1"
+       copytype="single_stretched"
+       prop_scale="2"
+       scale_y_rel="false"
+       spacing="0"
+       normal_offset="0"
+       tang_offset="0"
+       prop_units="false"
+       vertical_pattern="false"
+       fuse_tolerance="0" />
     <linearGradient
        id="linearGradient3871">
       <stop
@@ -321,16 +347,6 @@
        y2="16.186771"
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-2.1381092,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3916"
-       id="linearGradient3963"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.80000007,0,0,0.78431368,0.20000082,-30.098038)"
-       x1="42.249996"
-       y1="23.074999"
-       x2="39.749996"
-       y2="40.924999" />
     <linearGradient
        id="linearGradient3916">
       <stop
@@ -365,14 +381,14 @@
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3916-0"
-       id="linearGradient3246"
+       xlink:href="#linearGradient6740"
+       id="linearGradient6742"
+       x1="1.7468262"
+       y1="-7.3048444"
+       x2="45.746826"
+       y2="-7.3048444"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.80000007,0,0,0.78431368,-0.799999,-4.098038)"
-       x1="38.241375"
-       y1="23.159998"
-       x2="41.689651"
-       y2="40.84" />
+       gradientTransform="translate(-1.7899794,18.931081)" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -381,18 +397,18 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="7.2407734"
-     inkscape:cx="11.058077"
-     inkscape:cy="30.998086"
+     inkscape:zoom="8.25"
+     inkscape:cx="31.878788"
+     inkscape:cy="32"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:document-units="px"
-     inkscape:window-width="1397"
-     inkscape:window-height="988"
-     inkscape:window-x="1643"
-     inkscape:window-y="824"
-     inkscape:window-maximized="0">
+     inkscape:window-width="1366"
+     inkscape:window-height="716"
+     inkscape:window-x="0"
+     inkscape:window-y="26"
+     inkscape:window-maximized="1">
     <inkscape:grid
        type="xygrid"
        id="grid3130"
@@ -418,64 +434,30 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
      transform="translate(0,32)">
-    <g
-       style="display:inline"
-       id="g3959"
-       transform="matrix(-1,0,0,1,64,-7.5822304)">
-      <path
-         inkscape:export-ydpi="4.1683898"
-         inkscape:export-xdpi="4.1683898"
-         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
-         sodipodi:nodetypes="cccccccc"
-         id="path3343-0"
-         d="m 35,-13 0,4 -18,0 0,8 18,0 0,4 14,-8 z"
-         style="fill:url(#linearGradient3963);fill-opacity:1;fill-rule:evenodd;stroke:#172a04;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:export-ydpi="4.1683898"
-         inkscape:export-xdpi="4.1683898"
-         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
-         sodipodi:nodetypes="cccccccc"
-         id="path3343-2-9"
-         d="M 37,-9.5822304 37,-7 l -18,0 0,4 18,0 0,2.5822304 L 45,-5 z"
-         style="fill:none;stroke:#8ae234;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-         inkscape:connector-curvature="0" />
-    </g>
-    <g
-       id="g3242"
-       transform="translate(1,-8)">
-      <path
-         inkscape:export-ydpi="4.1683898"
-         inkscape:export-xdpi="4.1683898"
-         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
-         sodipodi:nodetypes="cccccccc"
-         id="path3343-0-6"
-         d="m 34,13 0,4 -18,0 0,8 18,0 0,4 14,-8 z"
-         style="fill:url(#linearGradient3246);fill-opacity:1;fill-rule:evenodd;stroke:#172a04;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:export-ydpi="4.1683898"
-         inkscape:export-xdpi="4.1683898"
-         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
-         sodipodi:nodetypes="cccccccc"
-         id="path3343-2-9-1"
-         d="M 36,16.41777 36,19 l -18,0 0,4 18,0 0,2.58223 L 44,21 z"
-         style="fill:none;stroke:#8ae234;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-         inkscape:connector-curvature="0" />
-    </g>
-    <ellipse
-       style="fill:#f70000;stroke:#ef2929;stroke-width:1.0499779;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:6.00000048;stroke-opacity:1;fill-opacity:1"
-       id="path3132-3-6"
-       cx="52.590778"
-       cy="1.2429613"
-       rx="8.8188572"
-       ry="8.4382353" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       inkscape:connector-curvature="0"
+       id="rect3057"
+       d="M 34.436146,9.6296684 41,3 60.69157,22.889032 54.127716,29.518679 Z"
+       style="fill:#ef2929;fill-opacity:1;stroke:#042a2a;stroke-width:1.83933628;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:2.03999996;stroke-opacity:1" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path3865"
+       d="M 58.54962,23.028622 40.61739,5.096403"
+       style="fill:none;stroke:#ef2929;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
     <ellipse
-       style="fill:#0008cd;fill-opacity:1;stroke:#2937ef;stroke-width:1.00664151;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:6.00000048;stroke-opacity:1"
-       id="path3132-3-6-3"
-       cx="9.8131075"
-       cy="1.1841022"
-       rx="8.2880983"
-       ry="8.2527428" />
+       ry="20.999998"
+       rx="21"
+       id="path3055"
+       style="fill:url(#linearGradient6742);fill-opacity:1;stroke:#042a2a;stroke-width:1.99999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.03999996;stroke-opacity:1"
+       cx="21.956846"
+       cy="11.626237"
+       transform="rotate(-45)" />
+    <circle
+       id="path3055-1"
+       style="fill:none;stroke:#ef2929;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.03999996;stroke-opacity:1"
+       cx="23.86804"
+       cy="-7.3048439"
+       r="19" />
   </g>
 </svg>
diff --git a/icons/a2p_angleConstraint.svg b/icons/a2p_angleConstraint.svg
deleted file mode 100644
index 47c07442..00000000
--- a/icons/a2p_angleConstraint.svg
+++ /dev/null
@@ -1,526 +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="64"
-   height="64"
-   id="svg3085"
-   version="1.1"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="planeConstraint.svg">
-  <defs
-     id="defs3087">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3950">
-      <stop
-         style="stop-color:#204a87;stop-opacity:1"
-         offset="0"
-         id="stop3952" />
-      <stop
-         style="stop-color:#729fcf;stop-opacity:1"
-         offset="1"
-         id="stop3954" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3987">
-      <stop
-         style="stop-color:#204a87;stop-opacity:1"
-         offset="0"
-         id="stop3989" />
-      <stop
-         style="stop-color:#729fcf;stop-opacity:1"
-         offset="1"
-         id="stop3991" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3871">
-      <stop
-         style="stop-color:#2200ff;stop-opacity:1;"
-         offset="0"
-         id="stop3873" />
-      <stop
-         style="stop-color:#fffcfc;stop-opacity:1;"
-         offset="1"
-         id="stop3875" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3863">
-      <stop
-         style="stop-color:#ff0000;stop-opacity:1;"
-         offset="0"
-         id="stop3865" />
-      <stop
-         style="stop-color:#ff9ea8;stop-opacity:1;"
-         offset="1"
-         id="stop3867" />
-    </linearGradient>
-    <marker
-       inkscape:stockid="Arrow2Lend"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow2Lend"
-       style="overflow:visible">
-      <path
-         id="path4574"
-         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
-         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
-         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow2Lstart"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow2Lstart"
-       style="overflow:visible">
-      <path
-         id="path4571"
-         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
-         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
-         transform="matrix(1.1,0,0,1.1,1.1,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="TriangleInS"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="TriangleInS"
-       style="overflow:visible">
-      <path
-         id="path4692"
-         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
-         transform="scale(-0.2,-0.2)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <linearGradient
-       id="linearGradient3903">
-      <stop
-         style="stop-color:#44852d;stop-opacity:1;"
-         offset="0"
-         id="stop3905" />
-      <stop
-         style="stop-color:#0026ff;stop-opacity:1;"
-         offset="1"
-         id="stop3907" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3859">
-      <stop
-         style="stop-color:#0d00ff;stop-opacity:1;"
-         offset="0"
-         id="stop3861" />
-      <stop
-         style="stop-color:#7d81f1;stop-opacity:1;"
-         offset="1"
-         id="stop3863" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3851">
-      <stop
-         style="stop-color:#ff0000;stop-opacity:1;"
-         offset="0"
-         id="stop3853" />
-      <stop
-         style="stop-color:#ff7e7e;stop-opacity:1;"
-         offset="1"
-         id="stop3855" />
-    </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="3.6842619 : 5.0066992 : 1"
-       inkscape:vp_y="-27.498543 : -45.297844 : 1"
-       inkscape:vp_z="-46.715775 : -11.759466 : 1"
-       inkscape:persp3d-origin="12 : 10.666667 : 1"
-       id="perspective3096" />
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="-13.436262 : 14.723626 : 1"
-       inkscape:vp_y="0 : 954.05 : 0"
-       inkscape:vp_z="44.68773 : 14.723626 : 1"
-       inkscape:persp3d-origin="15.625734 : 9.6353598 : 1"
-       id="perspective3094" />
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="-4 : 10 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="28 : 10 : 1"
-       inkscape:persp3d-origin="12 : 4.666667 : 1"
-       id="perspective3011" />
-    <inkscape:path-effect
-       effect="skeletal"
-       id="path-effect3066"
-       is_visible="true"
-       pattern="M 0,0 0,10 10,5 z"
-       copytype="single_stretched"
-       prop_scale="1"
-       scale_y_rel="false"
-       spacing="0"
-       normal_offset="0"
-       tang_offset="0"
-       prop_units="false"
-       vertical_pattern="false"
-       fuse_tolerance="0" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient7597">
-      <stop
-         style="stop-color:#000003;stop-opacity:1;"
-         offset="0"
-         id="stop7599" />
-      <stop
-         style="stop-color:#000003;stop-opacity:0;"
-         offset="1"
-         id="stop7601" />
-    </linearGradient>
-    <marker
-       inkscape:stockid="Arrow1Lstart"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Lstart"
-       style="overflow:visible">
-      <path
-         id="path3995"
-         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
-         transform="matrix(0.8,0,0,0.8,10,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Send"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Send"
-       style="overflow:visible">
-      <path
-         id="path4010"
-         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
-         transform="matrix(-0.2,0,0,-0.2,-1.2,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Sstart"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Sstart"
-       style="overflow:visible">
-      <path
-         id="path4007"
-         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
-         transform="matrix(0.2,0,0,0.2,1.2,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow2Sstart"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow2Sstart"
-       style="overflow:visible">
-      <path
-         id="path4025"
-         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
-         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
-         transform="matrix(0.3,0,0,0.3,-0.69,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="TriangleOutL"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="TriangleOutL"
-       style="overflow:visible">
-      <path
-         id="path4137"
-         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
-         transform="scale(0.8,0.8)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="DiamondLend"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="DiamondLend"
-       style="overflow:visible">
-      <path
-         id="path4092"
-         d="M 0,-7.0710768 -7.0710894,0 0,7.0710589 7.0710462,0 0,-7.0710768 z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
-         transform="matrix(0.8,0,0,0.8,-5.6,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="DiamondLstart"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="DiamondLstart"
-       style="overflow:visible">
-      <path
-         id="path4083"
-         d="M 0,-7.0710768 -7.0710894,0 0,7.0710589 7.0710462,0 0,-7.0710768 z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
-         transform="matrix(0.8,0,0,0.8,5.6,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Lend"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Lend"
-       style="overflow:visible">
-      <path
-         id="path3998"
-         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
-         transform="matrix(-0.8,0,0,-0.8,-10,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <linearGradient
-       id="linearGradient3893">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3895" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3897" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7597"
-       id="linearGradient7603"
-       x1="15.71482"
-       y1="22.299377"
-       x2="34.136208"
-       y2="22.299377"
-       gradientUnits="userSpaceOnUse" />
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="1.132573 : 16.837097 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="31.983524 : 20.416825 : 1"
-       inkscape:persp3d-origin="15.674165 : -5.599381 : 1"
-       id="perspective3011-3" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3863"
-       id="linearGradient3869"
-       x1="23.340048"
-       y1="16.048664"
-       x2="39.360435"
-       y2="16.048664"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-62,-20)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3871"
-       id="linearGradient3877"
-       x1="-8.5626202"
-       y1="16.186771"
-       x2="8.7007294"
-       y2="16.186771"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(57.861891,-20)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3987"
-       id="linearGradient3993"
-       x1="19"
-       y1="26"
-       x2="10"
-       y2="-27"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-10.921161,12.614738)" />
-    <linearGradient
-       gradientTransform="translate(36,0)"
-       inkscape:collect="always"
-       xlink:href="#linearGradient3987-5"
-       id="linearGradient3993-7"
-       x1="19"
-       y1="26"
-       x2="10"
-       y2="-27"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3987-5">
-      <stop
-         style="stop-color:#a40000;stop-opacity:1"
-         offset="0"
-         id="stop3989-3" />
-      <stop
-         style="stop-color:#ef2929;stop-opacity:1"
-         offset="1"
-         id="stop3991-5" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3916-0"
-       id="linearGradient3246"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.80000007,0,0,0.78431368,-0.799999,-4.098038)"
-       x1="38.241375"
-       y1="23.159998"
-       x2="41.689651"
-       y2="40.84" />
-    <linearGradient
-       id="linearGradient3916-0">
-      <stop
-         id="stop3918-6"
-         offset="0"
-         style="stop-color:#8ae234;stop-opacity:1" />
-      <stop
-         id="stop3920-2"
-         offset="1"
-         style="stop-color:#4e9a06;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3916"
-       id="linearGradient3963"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.80000007,0,0,0.78431368,0.20000082,-30.098038)"
-       x1="37.249996"
-       y1="25.092342"
-       x2="39.749996"
-       y2="40.924999" />
-    <linearGradient
-       id="linearGradient3916">
-      <stop
-         id="stop3918"
-         offset="0"
-         style="stop-color:#8ae234;stop-opacity:1" />
-      <stop
-         id="stop3920"
-         offset="1"
-         style="stop-color:#4e9a06;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3950"
-       id="linearGradient3956"
-       x1="18"
-       y1="26"
-       x2="5"
-       y2="-13"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="3.6203867"
-     inkscape:cx="-19.140777"
-     inkscape:cy="40.401981"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     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="grid3113"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata3090">
-    <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"
-     transform="translate(0,32)">
-    <rect
-       style="fill:#ef2929;stroke:#280000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:6.00000035999999959"
-       id="rect3115-62"
-       width="22"
-       height="58"
-       x="39"
-       y="-29" />
-    <rect
-       style="fill:url(#linearGradient3993-7);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999975999999990;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:6.00000035999999959"
-       id="rect3115-6-9"
-       width="18"
-       height="54"
-       x="41"
-       y="-27" />
-    <path
-       style="fill:#729fcf;stroke:#0b1521;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
-       d="M 3,11 33,61 7,61 3,53 z"
-       id="path3096"
-       inkscape:connector-curvature="0"
-       transform="translate(0,-32)" />
-    <path
-       style="fill:url(#linearGradient3956);stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
-       d="M 5,-14 29.483374,27 8.2231493,27 5,20.516626 z"
-       id="path3096-3"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
-    <g
-       style="display:inline"
-       id="g3959"
-       transform="translate(-6,-16)">
-      <path
-         inkscape:export-ydpi="4.1683898"
-         inkscape:export-xdpi="4.1683898"
-         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
-         sodipodi:nodetypes="cccccccc"
-         id="path3343-0"
-         d="m 35,-13 0,4 c -10,0 -17,2 -23,7 l 5,7 c 5.533107,-3.2969243 11.304703,-5.93138137 18,-6 l 0,4 14,-8 z"
-         style="fill:url(#linearGradient3963);fill-opacity:1;fill-rule:evenodd;stroke:#172a04;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:export-ydpi="4.1683898"
-         inkscape:export-xdpi="4.1683898"
-         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
-         sodipodi:nodetypes="cccccccc"
-         id="path3343-2-9"
-         d="m 37,-9.5822304 -0.03453,2.4959137 C 24,-7 20,-5 14.742324,-1.6214805 l 2.823897,3.9746169 C 20.224424,0.91368325 26,-3 37,-3 L 37,-0.4177696 45,-5 z"
-         style="fill:none;stroke:#8ae234;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-         inkscape:connector-curvature="0" />
-    </g>
-  </g>
-</svg>
diff --git a/icons/a2p_circularEdgeConstraint.svg b/icons/a2p_circularEdgeConstraint.svg
deleted file mode 100644
index bc036304..00000000
--- a/icons/a2p_circularEdgeConstraint.svg
+++ /dev/null
@@ -1,507 +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="64"
-   height="64"
-   id="svg3085"
-   version="1.1"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="circularEdgeConstraint.svg">
-  <defs
-     id="defs3087">
-    <linearGradient
-       id="linearGradient3871">
-      <stop
-         style="stop-color:#2200ff;stop-opacity:1;"
-         offset="0"
-         id="stop3873" />
-      <stop
-         style="stop-color:#fffcfc;stop-opacity:1;"
-         offset="1"
-         id="stop3875" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3863">
-      <stop
-         style="stop-color:#ff0000;stop-opacity:1;"
-         offset="0"
-         id="stop3865" />
-      <stop
-         style="stop-color:#ff9ea8;stop-opacity:1;"
-         offset="1"
-         id="stop3867" />
-    </linearGradient>
-    <marker
-       inkscape:stockid="Arrow2Lend"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow2Lend"
-       style="overflow:visible">
-      <path
-         id="path4574"
-         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
-         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
-         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow2Lstart"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow2Lstart"
-       style="overflow:visible">
-      <path
-         id="path4571"
-         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
-         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
-         transform="matrix(1.1,0,0,1.1,1.1,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="TriangleInS"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="TriangleInS"
-       style="overflow:visible">
-      <path
-         id="path4692"
-         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
-         transform="scale(-0.2,-0.2)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <linearGradient
-       id="linearGradient3903">
-      <stop
-         style="stop-color:#44852d;stop-opacity:1;"
-         offset="0"
-         id="stop3905" />
-      <stop
-         style="stop-color:#0026ff;stop-opacity:1;"
-         offset="1"
-         id="stop3907" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3859">
-      <stop
-         style="stop-color:#0d00ff;stop-opacity:1;"
-         offset="0"
-         id="stop3861" />
-      <stop
-         style="stop-color:#7d81f1;stop-opacity:1;"
-         offset="1"
-         id="stop3863" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3851">
-      <stop
-         style="stop-color:#ff0000;stop-opacity:1;"
-         offset="0"
-         id="stop3853" />
-      <stop
-         style="stop-color:#ff7e7e;stop-opacity:1;"
-         offset="1"
-         id="stop3855" />
-    </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="3.6842619 : 5.0066992 : 1"
-       inkscape:vp_y="-27.498543 : -45.297844 : 1"
-       inkscape:vp_z="-46.715775 : -11.759466 : 1"
-       inkscape:persp3d-origin="12 : 10.666667 : 1"
-       id="perspective3096" />
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="-13.436262 : 14.723626 : 1"
-       inkscape:vp_y="0 : 954.05 : 0"
-       inkscape:vp_z="44.68773 : 14.723626 : 1"
-       inkscape:persp3d-origin="15.625734 : 9.6353598 : 1"
-       id="perspective3094" />
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="-4 : 10 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="28 : 10 : 1"
-       inkscape:persp3d-origin="12 : 4.666667 : 1"
-       id="perspective3011" />
-    <inkscape:path-effect
-       effect="skeletal"
-       id="path-effect3066"
-       is_visible="true"
-       pattern="M 0,0 0,10 10,5 z"
-       copytype="single_stretched"
-       prop_scale="1"
-       scale_y_rel="false"
-       spacing="0"
-       normal_offset="0"
-       tang_offset="0"
-       prop_units="false"
-       vertical_pattern="false"
-       fuse_tolerance="0" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient7597">
-      <stop
-         style="stop-color:#000003;stop-opacity:1;"
-         offset="0"
-         id="stop7599" />
-      <stop
-         style="stop-color:#000003;stop-opacity:0;"
-         offset="1"
-         id="stop7601" />
-    </linearGradient>
-    <marker
-       inkscape:stockid="Arrow1Lstart"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Lstart"
-       style="overflow:visible">
-      <path
-         id="path3995"
-         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
-         transform="matrix(0.8,0,0,0.8,10,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Send"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Send"
-       style="overflow:visible">
-      <path
-         id="path4010"
-         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
-         transform="matrix(-0.2,0,0,-0.2,-1.2,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Sstart"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Sstart"
-       style="overflow:visible">
-      <path
-         id="path4007"
-         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
-         transform="matrix(0.2,0,0,0.2,1.2,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow2Sstart"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow2Sstart"
-       style="overflow:visible">
-      <path
-         id="path4025"
-         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
-         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
-         transform="matrix(0.3,0,0,0.3,-0.69,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="TriangleOutL"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="TriangleOutL"
-       style="overflow:visible">
-      <path
-         id="path4137"
-         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
-         transform="scale(0.8,0.8)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="DiamondLend"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="DiamondLend"
-       style="overflow:visible">
-      <path
-         id="path4092"
-         d="M 0,-7.0710768 -7.0710894,0 0,7.0710589 7.0710462,0 0,-7.0710768 z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
-         transform="matrix(0.8,0,0,0.8,-5.6,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="DiamondLstart"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="DiamondLstart"
-       style="overflow:visible">
-      <path
-         id="path4083"
-         d="M 0,-7.0710768 -7.0710894,0 0,7.0710589 7.0710462,0 0,-7.0710768 z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
-         transform="matrix(0.8,0,0,0.8,5.6,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Lend"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Lend"
-       style="overflow:visible">
-      <path
-         id="path3998"
-         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
-         transform="matrix(-0.8,0,0,-0.8,-10,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <linearGradient
-       id="linearGradient3893">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3895" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3897" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7597"
-       id="linearGradient7603"
-       x1="15.71482"
-       y1="22.299377"
-       x2="34.136208"
-       y2="22.299377"
-       gradientUnits="userSpaceOnUse" />
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="1.132573 : 16.837097 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="31.983524 : 20.416825 : 1"
-       inkscape:persp3d-origin="15.674165 : -5.599381 : 1"
-       id="perspective3011-3" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3863"
-       id="linearGradient3869"
-       x1="23.340048"
-       y1="16.048664"
-       x2="39.360435"
-       y2="16.048664"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-2,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3871"
-       id="linearGradient3877"
-       x1="-8.5626202"
-       y1="16.186771"
-       x2="8.7007294"
-       y2="16.186771"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-2.1381092,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3916"
-       id="linearGradient3963"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.80000007,0,0,0.78431368,0.20000082,-30.098038)"
-       x1="42.249996"
-       y1="23.074999"
-       x2="39.749996"
-       y2="40.924999" />
-    <linearGradient
-       id="linearGradient3916">
-      <stop
-         id="stop3918"
-         offset="0"
-         style="stop-color:#8ae234;stop-opacity:1" />
-      <stop
-         id="stop3920"
-         offset="1"
-         style="stop-color:#4e9a06;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       y2="40.84"
-       x2="41.689651"
-       y1="23.159998"
-       x1="38.241375"
-       gradientTransform="matrix(0.80000007,0,0,0.78431368,-0.799999,-4.098038)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3938"
-       xlink:href="#linearGradient3916-0"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3916-0">
-      <stop
-         id="stop3918-6"
-         offset="0"
-         style="stop-color:#8ae234;stop-opacity:1" />
-      <stop
-         id="stop3920-2"
-         offset="1"
-         style="stop-color:#4e9a06;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3916-0"
-       id="linearGradient3246"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.80000007,0,0,0.78431368,-0.799999,-4.098038)"
-       x1="38.241375"
-       y1="23.159998"
-       x2="41.689651"
-       y2="40.84" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.2407734"
-     inkscape:cx="-6.8465234"
-     inkscape:cy="38.457094"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     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="grid3130"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata3090">
-    <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 />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     transform="translate(0,32)">
-    <path
-       sodipodi:type="arc"
-       style="fill:none;stroke:#204a87;stroke-width:6.8117547;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:6.00000036"
-       id="path3132"
-       sodipodi:cx="15"
-       sodipodi:cy="32"
-       sodipodi:rx="12"
-       sodipodi:ry="29"
-       d="M 27,32 A 12,29 0 1 1 3,32 12,29 0 1 1 27,32 z"
-       transform="matrix(0.83333333,0,0,0.93103448,2.5,-29.793103)" />
-    <path
-       sodipodi:type="arc"
-       style="fill:none;stroke:#729fcf;stroke-width:2.27058486000000004;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:6.00000035999999959"
-       id="path3132-7"
-       sodipodi:cx="15"
-       sodipodi:cy="32"
-       sodipodi:rx="12"
-       sodipodi:ry="29"
-       d="M 27,32 A 12,29 0 1 1 3,32 12,29 0 1 1 27,32 z"
-       transform="matrix(0.83333333,0,0,0.93103448,2.5,-29.793103)" />
-    <g
-       style="display:inline"
-       id="g3959"
-       transform="matrix(-1,0,0,1,64,-7.5822304)">
-      <path
-         inkscape:export-ydpi="4.1683898"
-         inkscape:export-xdpi="4.1683898"
-         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
-         sodipodi:nodetypes="cccccccc"
-         id="path3343-0"
-         d="m 35,-13 0,4 -18,0 0,8 18,0 0,4 14,-8 z"
-         style="fill:url(#linearGradient3963);fill-opacity:1;fill-rule:evenodd;stroke:#172a04;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:export-ydpi="4.1683898"
-         inkscape:export-xdpi="4.1683898"
-         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
-         sodipodi:nodetypes="cccccccc"
-         id="path3343-2-9"
-         d="M 37,-9.5822304 37,-7 l -18,0 0,4 18,0 0,2.5822304 L 45,-5 z"
-         style="fill:none;stroke:#8ae234;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-         inkscape:connector-curvature="0" />
-    </g>
-    <g
-       id="g3242"
-       transform="translate(1,-8)">
-      <path
-         inkscape:export-ydpi="4.1683898"
-         inkscape:export-xdpi="4.1683898"
-         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
-         sodipodi:nodetypes="cccccccc"
-         id="path3343-0-6"
-         d="m 34,13 0,4 -18,0 0,8 18,0 0,4 14,-8 z"
-         style="fill:url(#linearGradient3246);fill-opacity:1;fill-rule:evenodd;stroke:#172a04;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:export-ydpi="4.1683898"
-         inkscape:export-xdpi="4.1683898"
-         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
-         sodipodi:nodetypes="cccccccc"
-         id="path3343-2-9-1"
-         d="M 36,16.41777 36,19 l -18,0 0,4 18,0 0,2.58223 L 44,21 z"
-         style="fill:none;stroke:#8ae234;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-         inkscape:connector-curvature="0" />
-    </g>
-    <path
-       sodipodi:type="arc"
-       style="fill:none;stroke:#a40000;stroke-width:6.81175469999999983;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:6.00000035999999959"
-       id="path3132-3"
-       sodipodi:cx="15"
-       sodipodi:cy="32"
-       sodipodi:rx="12"
-       sodipodi:ry="29"
-       d="M 27,32 A 12,29 0 1 1 3,32 12,29 0 1 1 27,32 z"
-       transform="matrix(0.83333334,0,0,0.93103448,36.5,-29.793103)" />
-    <path
-       sodipodi:type="arc"
-       style="fill:none;stroke:#ef2929;stroke-width:2.27058484;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:6.00000035999999959"
-       id="path3132-3-6"
-       sodipodi:cx="15"
-       sodipodi:cy="32"
-       sodipodi:rx="12"
-       sodipodi:ry="29"
-       d="M 27,32 A 12,29 0 1 1 3,32 12,29 0 1 1 27,32 z"
-       transform="matrix(0.83333334,0,0,0.93103448,36.5,-29.793103)" />
-  </g>
-</svg>
diff --git a/icons/a2p_deleteConnections.svg b/icons/a2p_deleteConnections.svg
deleted file mode 100644
index ac2eeea9..00000000
--- a/icons/a2p_deleteConnections.svg
+++ /dev/null
@@ -1,84 +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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48"
-   height="48"
-   viewBox="0 0 48 48.000001"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="a3_deleteConnections.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="15.839192"
-     inkscape:cx="22.78957"
-     inkscape:cy="25.167204"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     units="px"
-     inkscape:window-width="1187"
-     inkscape:window-height="1088"
-     inkscape:window-x="592"
-     inkscape:window-y="498"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata7">
-    <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 />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Ebene 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1004.3622)">
-    <rect
-       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffff3e;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.84006935;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-       id="rect3336"
-       width="13.92326"
-       height="35.894081"
-       x="0.2988418"
-       y="1016.2955" />
-    <rect
-       style="fill:#ffff00;fill-rule:evenodd;stroke:#000000;stroke-width:1.01373148px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       id="rect3340"
-       width="15.012287"
-       height="35.846684"
-       x="32.584286"
-       y="1016.1299" />
-    <path
-       style="fill:#00ed00;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 3.8512066,1043.839 5.1770318,-4.6719 1.2626906,2.1466 c 25.885159,0.1263 0,0 25.885159,0.1263 l 0.631345,-2.6517 5.808377,4.7351 -6.439722,5.1139 -0.252538,-2.9042 -25.569487,0.2525 -1.3258246,2.3992 z"
-       id="path3342"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccccc" />
-    <path
-       style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 9.3439115,1006.8422 10.6697365,16.2256 -12.3743693,12.5638 2.5253823,2.1465 13.447656,-10.7329 c 11.553924,10.8896 -2.814903,-2.5509 11.42735,10.7961 l 2.525381,-2.0835 -11.111678,-13.1951 11.427351,-15.3417 -2.967323,-2.5885 -11.743023,14.2053 -10.796006,-14.079 z"
-       id="path4144"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccccccc" />
-  </g>
-</svg>
diff --git a/icons/a2p_glasses.svg b/icons/a2p_glasses.svg
deleted file mode 100644
index 2bc06902..00000000
--- a/icons/a2p_glasses.svg
+++ /dev/null
@@ -1,194 +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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="32"
-   height="32"
-   viewBox="0 0 32 32.000001"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="glasses.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.2"
-     inkscape:cx="21.521967"
-     inkscape:cy="17.412969"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     units="px"
-     inkscape:window-width="1464"
-     inkscape:window-height="1036"
-     inkscape:window-x="807"
-     inkscape:window-y="479"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata7">
-    <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="Ebene 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1020.3622)">
-    <rect
-       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.25649405;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-       id="rect4227"
-       width="50.45779"
-       height="44.297077"
-       x="-10.050324"
-       y="1015.5262" />
-    <g
-       id="g4215"
-       transform="translate(40.089286,-7.6785714)">
-      <path
-         d="m -25.799032,1036.0973 a 8.5267859,3.9732144 0 0 1 0.23964,-5.6164 8.5267859,3.9732144 0 0 1 12.053281,0.1087 8.5267859,3.9732144 0 0 1 -0.227018,5.6165 8.5267859,3.9732144 0 0 1 -12.053518,-0.1028 l 6.13717,-2.7583 z"
-         sodipodi:end="2.3742412"
-         sodipodi:start="2.3763356"
-         sodipodi:ry="3.9732144"
-         sodipodi:rx="8.5267859"
-         sodipodi:cy="1033.345"
-         sodipodi:cx="-19.649477"
-         sodipodi:type="arc"
-         id="path3336-3"
-         style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
-      <path
-         d="m -23.577231,1034.0627 a 0.8035714,0.13392857 0 0 1 0.02258,-0.1893 0.8035714,0.13392857 0 0 1 1.135911,0 0.8035714,0.13392857 0 0 1 -0.0214,0.1893 0.8035714,0.13392857 0 0 1 -1.135933,-0 l 0.578372,-0.093 z"
-         sodipodi:end="2.3742412"
-         sodipodi:start="2.3763356"
-         sodipodi:ry="0.13392857"
-         sodipodi:rx="0.8035714"
-         sodipodi:cy="1033.97"
-         sodipodi:cx="-22.997692"
-         sodipodi:type="arc"
-         id="path3338-6"
-         style="fill:#808080;fill-opacity:1;stroke:none;stroke-opacity:1" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path4159-7"
-         d="m -27.908406,1033.7467 7.678571,15.0893 9.375,-15"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         d="m -23.461506,1054.0419 a 4.4803677,1.7148783 0 0 1 0.125918,-2.4241 4.4803677,1.7148783 0 0 1 6.333351,0.047 4.4803677,1.7148783 0 0 1 -0.119286,2.4241 4.4803677,1.7148783 0 0 1 -6.333476,-0.044 l 3.224753,-1.1905 z"
-         sodipodi:end="2.3742412"
-         sodipodi:start="2.3763356"
-         sodipodi:ry="1.7148783"
-         sodipodi:rx="4.4803677"
-         sodipodi:cy="1052.854"
-         sodipodi:cx="-20.230246"
-         sodipodi:type="arc"
-         id="path4165-5"
-         style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:1.1416223;stroke-opacity:1" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path4161-3"
-         d="m -20.051263,1048.7468 0,4.0178 -0.438845,-0.1176 0,-4.0788"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path4167-5"
-         d="m -22.982748,1042.2384 c -1.511452,-2.9763 -2.736286,-5.4232 -2.721854,-5.4377 0.01443,-0.014 0.435251,0.1108 0.935153,0.2782 1.381529,0.4628 2.682787,0.672 4.534796,0.7293 2.383089,0.074 4.274889,-0.19 6.012574,-0.8378 0.458702,-0.171 0.85156,-0.2933 0.873018,-0.2719 0.04654,0.047 -6.727838,10.9033 -6.821105,10.9316 -0.03547,0.011 -1.30113,-2.4155 -2.812582,-5.3917 z"
-         style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.08928572;stroke-opacity:1" />
-      <path
-         transform="translate(0,1020.3622)"
-         inkscape:connector-curvature="0"
-         id="path4199"
-         d="m -20.861962,33.384047 c 0.245536,-0.09646 0.546875,-0.221162 0.669643,-0.277107 0.122768,-0.05594 0.333706,-0.09234 0.46875,-0.08087 l 0.245536,0.02085 0,-0.810301 0,-0.8103 0.245536,0.0015 c 0.750828,0.0047 2.207739,0.452255 2.635826,0.809638 0.252757,0.211011 0.27035,0.2544 0.158031,0.389736 -0.447129,0.538758 -2.062418,0.941492 -3.753679,0.935891 l -1.116071,-0.0037 0.446428,-0.175389 z"
-         style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.08928572;stroke-opacity:1" />
-      <path
-         transform="translate(0,1020.3622)"
-         inkscape:connector-curvature="0"
-         id="path4201"
-         d="m -23.731684,32.862302 c -0.378581,-0.231536 -0.433679,-0.345997 -0.259303,-0.53868 0.321509,-0.355264 1.993666,-0.897305 2.768118,-0.897305 0.204309,0 0.226979,0.03477 0.226979,0.348165 l 0,0.348165 -1.09375,0.403892 c -0.601563,0.22214 -1.154018,0.427152 -1.227679,0.455583 -0.07366,0.02843 -0.260125,-0.02549 -0.414365,-0.11982 z"
-         style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.08928572;stroke-opacity:1" />
-      <path
-         transform="translate(0,1020.3622)"
-         inkscape:connector-curvature="0"
-         id="path4203"
-         d="m -20.253319,26.946656 c -0.163953,-0.205913 -5.296143,-10.254401 -5.296143,-10.369497 0,-0.01623 0.35135,0.08422 0.780777,0.223222 1.769828,0.572892 3.146646,0.733404 5.764885,0.67208 2.198808,-0.0515 3.024104,-0.181993 4.617,-0.730028 0.827551,-0.284719 1.138379,-0.322001 0.848141,-0.10173 -0.0711,0.05396 -0.925473,1.383828 -1.8986,2.955256 -2.151949,3.475018 -4.373463,7.007629 -4.573981,7.273463 -0.118918,0.157652 -0.16607,0.172696 -0.242079,0.07723 z"
-         style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.08928572;stroke-opacity:1" />
-      <path
-         transform="translate(0,1020.3622)"
-         inkscape:connector-curvature="0"
-         id="path4205"
-         d="m -21.040533,16.371412 c -1.254684,-0.132763 -3.258929,-0.53521 -3.258929,-0.654384 0,-0.03119 1.101721,-0.551417 2.448269,-1.15606 l 2.448269,-1.09935 -0.17716,-0.414972 c -0.09744,-0.228235 -0.207102,-0.44546 -0.243698,-0.482723 -0.05488,-0.05588 -1.772876,0.656516 -2.385404,0.98915 -0.420952,0.228598 -3.470562,1.533958 -3.583666,1.533958 -0.06942,0 -0.305017,-0.123015 -0.523546,-0.273367 -0.30689,-0.211146 -0.478438,-0.434691 -0.753691,-0.982143 -0.196001,-0.389827 -0.396096,-0.708776 -0.444655,-0.708776 -0.185116,0 -0.0818,-0.600276 0.172276,-1.000907 0.628281,-0.990697 2.214478,-1.784232 4.547408,-2.2749571 1.017533,-0.214035 1.319862,-0.2378844 3.04917,-0.2405353 2.07227,-0.00318 2.918262,0.096968 4.420704,0.5233014 0.980074,0.278106 2.277324,0.902324 2.789747,1.342385 2.5455203,2.186059 -1.007346,4.779953 -6.71938,4.905717 -0.785714,0.0173 -1.589285,0.01445 -1.785714,-0.0063 z"
-         style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.08928572;stroke-opacity:1" />
-    </g>
-    <g
-       id="g4207"
-       transform="translate(-0.98214286,1.3392857)">
-      <path
-         d="m 5.2343745,1031.2306 a 8.5267859,3.9732144 0 0 1 0.23964,-5.6164 8.5267859,3.9732144 0 0 1 12.0532805,0.1087 8.5267859,3.9732144 0 0 1 -0.227018,5.6165 8.5267859,3.9732144 0 0 1 -12.053518,-0.1028 l 6.13717,-2.7583 z"
-         sodipodi:end="2.3742412"
-         sodipodi:start="2.3763356"
-         sodipodi:ry="3.9732144"
-         sodipodi:rx="8.5267859"
-         sodipodi:cy="1028.4783"
-         sodipodi:cx="11.383929"
-         sodipodi:type="arc"
-         id="path3336"
-         style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
-      <path
-         d="m 7.456175,1029.196 a 0.8035714,0.13392857 0 0 1 0.022584,-0.1893 0.8035714,0.13392857 0 0 1 1.1359112,0 0.8035714,0.13392857 0 0 1 -0.021394,0.1893 0.8035714,0.13392857 0 0 1 -1.1359336,-0 l 0.578372,-0.093 z"
-         sodipodi:end="2.3742412"
-         sodipodi:start="2.3763356"
-         sodipodi:ry="0.13392857"
-         sodipodi:rx="0.8035714"
-         sodipodi:cy="1029.1033"
-         sodipodi:cx="8.0357141"
-         sodipodi:type="arc"
-         id="path3338"
-         style="fill:#808080;fill-opacity:1;stroke:none;stroke-opacity:1" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path4159"
-         d="m 3.125,1028.88 7.678571,15.0893 9.375,-15"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         d="m 7.5719011,1049.1752 a 4.4803677,1.7148783 0 0 1 0.125918,-2.4241 4.4803677,1.7148783 0 0 1 6.3333509,0.047 4.4803677,1.7148783 0 0 1 -0.119285,2.4241 4.4803677,1.7148783 0 0 1 -6.3334765,-0.044 l 3.2247535,-1.1905 z"
-         sodipodi:end="2.3742412"
-         sodipodi:start="2.3763356"
-         sodipodi:ry="1.7148783"
-         sodipodi:rx="4.4803677"
-         sodipodi:cy="1047.9873"
-         sodipodi:cx="10.803162"
-         sodipodi:type="arc"
-         id="path4165"
-         style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:1.1416223;stroke-opacity:1" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path4161"
-         d="m 10.982143,1043.8801 0,4.0178 -0.438845,-0.1176 0,-4.0788"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         transform="translate(0,1020.3622)"
-         inkscape:connector-curvature="0"
-         id="path4167"
-         d="m 8.0506584,17.00948 c -1.5114519,-2.976259 -2.7362862,-5.423188 -2.721854,-5.43762 0.014432,-0.01443 0.4352508,0.11076 0.9351522,0.278206 1.3815293,0.462752 2.6827875,0.672004 4.5347964,0.72923 2.383089,0.07364 4.274889,-0.189955 6.012574,-0.837753 0.458702,-0.171001 0.85156,-0.293354 0.873018,-0.271896 0.04654,0.04654 -6.727838,10.903282 -6.821105,10.93162 -0.03547,0.01078 -1.3011297,-2.415528 -2.8125816,-5.391787 z"
-         style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.08928572;stroke-opacity:1" />
-    </g>
-  </g>
-</svg>
diff --git a/icons/a2p_importPart_update.svg b/icons/a2p_importPart_update.svg
deleted file mode 100644
index 2b43fee7..00000000
--- a/icons/a2p_importPart_update.svg
+++ /dev/null
@@ -1,725 +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="svg2860"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="importPart.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.1">
-  <defs
-     id="defs2862">
-    <linearGradient
-       id="linearGradient3945">
-      <stop
-         style="stop-color:#8ae234;stop-opacity:1"
-         offset="0"
-         id="stop3947" />
-      <stop
-         style="stop-color:#73d216;stop-opacity:1"
-         offset="1"
-         id="stop3949" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4387">
-      <stop
-         style="stop-color:#71b2f8;stop-opacity:1;"
-         offset="0"
-         id="stop4389" />
-      <stop
-         style="stop-color:#002795;stop-opacity:1;"
-         offset="1"
-         id="stop4391" />
-    </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"
-       gradientTransform="translate(-0.23443224,0.23443198)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4387"
-       id="radialGradient3703"
-       gradientUnits="userSpaceOnUse"
-       cx="131.48187"
-       cy="93.557289"
-       fx="131.48187"
-       fy="93.557289"
-       r="19.467436"
-       gradientTransform="matrix(0.52711064,1.8158874,-1.4534843,0.42191331,203.23405,-187.6583)" />
-    <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="#linearGradient4387"
-       id="radialGradient3705"
-       gradientUnits="userSpaceOnUse"
-       cx="147.05713"
-       cy="83.989143"
-       fx="147.05713"
-       fy="83.989143"
-       r="19.467436"
-       gradientTransform="matrix(1.2966028,0.17711231,-0.14092861,1.0317094,-32.689929,-29.109274)" />
-    <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-3"
-       id="radialGradient3692-5"
-       cx="45.883327"
-       cy="28.869568"
-       fx="45.883327"
-       fy="28.869568"
-       r="19.467436"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-0.23443224,0.23443198)" />
-    <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
-       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:#3465a4;stop-opacity:1"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#729fcf;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:#204a87;stop-opacity:1"
-         offset="0"
-         id="stop3779" />
-      <stop
-         style="stop-color:#3465a4;stop-opacity:1"
-         offset="1"
-         id="stop3781" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8662"
-       id="radialGradient3757"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.536723,0,16.87306)"
-       cx="24.837126"
-       cy="36.421127"
-       fx="24.837126"
-       fy="36.421127"
-       r="15.644737" />
-    <linearGradient
-       id="linearGradient8662"
-       inkscape:collect="always">
-      <stop
-         id="stop8664"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         id="stop8666"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2847"
-       id="linearGradient3759"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-64.247811,5.5825138)"
-       x1="32.647972"
-       y1="30.748846"
-       x2="37.124462"
-       y2="24.842253" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2682"
-       id="linearGradient3761"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-64.247811,5.5825138)"
-       x1="36.713837"
-       y1="31.455952"
-       x2="37.124462"
-       y2="24.842253" />
-    <linearGradient
-       id="linearGradient2682">
-      <stop
-         id="stop2684"
-         offset="0"
-         style="stop-color:#4e9a06;stop-opacity:1" />
-      <stop
-         id="stop2686"
-         offset="1"
-         style="stop-color:#89aedc;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2402"
-       id="linearGradient3767-3"
-       gradientUnits="userSpaceOnUse"
-       x1="18.935766"
-       y1="23.667896"
-       x2="53.588623"
-       y2="26.649363" />
-    <linearGradient
-       id="linearGradient2402">
-      <stop
-         id="stop2404"
-         offset="0"
-         style="stop-color:#729fcf;stop-opacity:1;" />
-      <stop
-         id="stop2406"
-         offset="1"
-         style="stop-color:#528ac5;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2871"
-       id="linearGradient3769"
-       gradientUnits="userSpaceOnUse"
-       x1="46.834816"
-       y1="45.264122"
-       x2="45.380436"
-       y2="50.939667" />
-    <linearGradient
-       id="linearGradient2871"
-       inkscape:collect="always">
-      <stop
-         id="stop2873"
-         offset="0"
-         style="stop-color:#3465a4;stop-opacity:1;" />
-      <stop
-         id="stop2875"
-         offset="1"
-         style="stop-color:#3465a4;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3945"
-       id="linearGradient3763"
-       gradientUnits="userSpaceOnUse"
-       x1="18.935766"
-       y1="23.667896"
-       x2="53.588623"
-       y2="26.649363" />
-    <linearGradient
-       id="linearGradient3149">
-      <stop
-         id="stop3151"
-         offset="0"
-         style="stop-color:#729fcf;stop-opacity:1;" />
-      <stop
-         id="stop3153"
-         offset="1"
-         style="stop-color:#528ac5;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2797"
-       id="linearGradient3771"
-       gradientUnits="userSpaceOnUse"
-       x1="5.9649177"
-       y1="26.048164"
-       x2="52.854095"
-       y2="26.048164" />
-    <linearGradient
-       id="linearGradient2797"
-       inkscape:collect="always">
-      <stop
-         id="stop2799"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop2801"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2847"
-       id="linearGradient3745"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-63.782398,5.3049208)"
-       x1="13.478554"
-       y1="10.612206"
-       x2="15.419417"
-       y2="19.115122" />
-    <linearGradient
-       id="linearGradient2831">
-      <stop
-         id="stop2833"
-         offset="0"
-         style="stop-color:#3465a4;stop-opacity:1;" />
-      <stop
-         style="stop-color:#5b86be;stop-opacity:1;"
-         offset="0.33333334"
-         id="stop2855" />
-      <stop
-         id="stop2835"
-         offset="1"
-         style="stop-color:#83a8d8;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2847"
-       id="linearGradient3747"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,-1,-16.719901,51.429924)"
-       x1="37.128052"
-       y1="29.729605"
-       x2="37.065414"
-       y2="26.194071" />
-    <linearGradient
-       id="linearGradient2847"
-       inkscape:collect="always">
-      <stop
-         id="stop2849"
-         offset="0"
-         style="stop-color:#4e9a06;stop-opacity:1" />
-      <stop
-         id="stop2851"
-         offset="1"
-         style="stop-color:#3465a4;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2380"
-       id="linearGradient3753"
-       gradientUnits="userSpaceOnUse"
-       x1="62.513836"
-       y1="36.061237"
-       x2="15.984863"
-       y2="20.60858" />
-    <linearGradient
-       id="linearGradient2380">
-      <stop
-         id="stop2382"
-         offset="0"
-         style="stop-color:#b9cfe7;stop-opacity:1" />
-      <stop
-         id="stop2384"
-         offset="1"
-         style="stop-color:#729fcf;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3945"
-       id="linearGradient3749"
-       gradientUnits="userSpaceOnUse"
-       x1="62.513836"
-       y1="36.061237"
-       x2="15.984863"
-       y2="20.60858" />
-    <linearGradient
-       id="linearGradient3180">
-      <stop
-         id="stop3182"
-         offset="0"
-         style="stop-color:#b9cfe7;stop-opacity:1" />
-      <stop
-         id="stop3184"
-         offset="1"
-         style="stop-color:#729fcf;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2797"
-       id="linearGradient3755"
-       gradientUnits="userSpaceOnUse"
-       x1="5.9649177"
-       y1="26.048164"
-       x2="52.854095"
-       y2="26.048164" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8662"
-       id="radialGradient3968"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.536723,0,16.87306)"
-       cx="24.837126"
-       cy="36.421127"
-       fx="24.837126"
-       fy="36.421127"
-       r="15.644737" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2847"
-       id="linearGradient3970"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-64.247811,5.5825138)"
-       x1="32.647972"
-       y1="30.748846"
-       x2="37.124462"
-       y2="24.842253" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2682"
-       id="linearGradient3972"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-64.247811,5.5825138)"
-       x1="36.713837"
-       y1="31.455952"
-       x2="37.124462"
-       y2="24.842253" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3945"
-       id="linearGradient3974"
-       gradientUnits="userSpaceOnUse"
-       x1="18.935766"
-       y1="23.667896"
-       x2="53.588623"
-       y2="26.649363" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2402"
-       id="linearGradient3976"
-       gradientUnits="userSpaceOnUse"
-       x1="18.935766"
-       y1="23.667896"
-       x2="53.588623"
-       y2="26.649363" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2871"
-       id="linearGradient3978"
-       gradientUnits="userSpaceOnUse"
-       x1="46.834816"
-       y1="45.264122"
-       x2="45.380436"
-       y2="50.939667" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2797"
-       id="linearGradient3980"
-       gradientUnits="userSpaceOnUse"
-       x1="5.9649177"
-       y1="26.048164"
-       x2="52.854095"
-       y2="26.048164" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2847"
-       id="linearGradient3982"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-63.782398,5.3049208)"
-       x1="13.478554"
-       y1="10.612206"
-       x2="15.419417"
-       y2="19.115122" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2847"
-       id="linearGradient3984"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,-1,-16.719901,51.429924)"
-       x1="37.128052"
-       y1="29.729605"
-       x2="37.065414"
-       y2="26.194071" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3945"
-       id="linearGradient3986"
-       gradientUnits="userSpaceOnUse"
-       x1="62.513836"
-       y1="36.061237"
-       x2="15.984863"
-       y2="20.60858" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2380"
-       id="linearGradient3988"
-       gradientUnits="userSpaceOnUse"
-       x1="62.513836"
-       y1="36.061237"
-       x2="15.984863"
-       y2="20.60858" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2797"
-       id="linearGradient3990"
-       gradientUnits="userSpaceOnUse"
-       x1="5.9649177"
-       y1="26.048164"
-       x2="52.854095"
-       y2="26.048164" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="4.5243786"
-     inkscape:cx="-18.71173"
-     inkscape:cy="69.434909"
-     inkscape:current-layer="g3736"
-     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="grid3001"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <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>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>[Stefan Tröger]</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:title>fem-box</dc:title>
-        <dc:date>2015-11-15</dc:date>
-        <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
-        <dc:publisher>
-          <cc:Agent>
-            <dc:title>FreeCAD</dc:title>
-          </cc:Agent>
-        </dc:publisher>
-        <dc:identifier>FreeCAD/src/Mod/</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:#729fcf;stroke:#0b1521;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:#0b1521;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:#0b1521;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:#729fcf;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:#3465a4;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
-       id="g3951"
-       transform="translate(73.244149,12.280717)">
-      <g
-         style="stroke-width:1.3290714;stroke-miterlimit:4;stroke-dasharray:none"
-         transform="matrix(0.75949461,0,0,0.75949461,-9.998942,-3.916207)"
-         id="g3736">
-        <path
-           transform="matrix(-1.489736,0,0,-3.6064883,-3.039161,158.52239)"
-           d="m 40.481863,36.421127 a 15.644737,8.3968935 0 1 1 -31.2894745,0 15.644737,8.3968935 0 1 1 31.2894745,0 z"
-           sodipodi:ry="8.3968935"
-           sodipodi:rx="15.644737"
-           sodipodi:cy="36.421127"
-           sodipodi:cx="24.837126"
-           id="path8660"
-           style="opacity:0.38333333;color:#000000;fill:url(#radialGradient3968);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.08823323;marker:none;visibility:visible;display:inline;overflow:visible"
-           sodipodi:type="arc"
-           inkscape:r_cx="true"
-           inkscape:r_cy="true" />
-        <path
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccc"
-           inkscape:r_cy="true"
-           inkscape:r_cx="true"
-           id="path2839"
-           d="m -35.872811,39.020014 c 0,0 8.9375,0.625 6.1875,-9.875 l 7.775888,0 c 0,1.502602 -0.588388,11.875 -13.963388,9.875 z"
-           style="color:#000000;fill:url(#linearGradient3970);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3972);stroke-width:0.99803209;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible" />
-        <g
-           style="color:#000000;fill:url(#linearGradient3976);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3978);stroke-width:1.31657326;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible"
-           inkscape:r_cy="true"
-           inkscape:r_cx="true"
-           transform="matrix(0.579051,0.489228,0.489228,-0.579051,-72.168834,36.118504)"
-           id="g2779">
-          <path
-             inkscape:connector-curvature="0"
-             inkscape:r_cy="true"
-             inkscape:r_cx="true"
-             style="color:#000000;fill:url(#linearGradient3974);fill-opacity:1;fill-rule:nonzero;stroke:#4e9a06;stroke-width:1.31657326;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible"
-             d="M 44.306783,50.229694 C 62.821497,35.818859 49.664587,13.411704 22.462411,12.49765 L 22.399432,3.0690297 7.793943,20.424005 22.462411,33.006349 c 0,0 0,-9.66838 0,-9.66838 18.82976,0.998977 32.981627,14.071729 21.844372,26.891725 z"
-             id="path2781"
-             sodipodi:nodetypes="ccccccc" />
-        </g>
-        <path
-           inkscape:connector-curvature="0"
-           style="opacity:0.27222224;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.3290714;marker:none;visibility:visible;display:inline;overflow:visible"
-           d="m -57.185311,43.770014 0.0625,-14.875 12.9375,-0.375 -4.388873,5.178817 3.867225,2.373199 c -3,2.25 -4.549548,2.422128 -5.549548,4.984628 l -2.816858,-2.110272 -4.111946,4.823628 z"
-           id="path2791"
-           inkscape:r_cx="true"
-           inkscape:r_cy="true"
-           sodipodi:nodetypes="cccccccc" />
-        <g
-           id="g2793"
-           transform="matrix(0.508536,0.429651,0.429651,-0.508536,-68.220999,36.123704)"
-           inkscape:r_cx="true"
-           inkscape:r_cy="true"
-           style="opacity:0.5;fill:none;stroke:#ffffff;stroke-width:1.49913347;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none">
-          <path
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccccc"
-             id="path2795"
-             d="M 51.090265,45.943705 C 60.210465,30.723955 46.631614,12.20113 19.485058,11.948579 L 19.513464,3.7032834 6.5341979,19.296639 19.367661,30.26876 c 0,0 0.05562,-9.006878 0.05562,-9.006878 17.527815,-0.223909 35.195185,10.103372 31.666984,24.681823 z"
-             style="color:#000000;fill:none;stroke:url(#linearGradient3980);stroke-width:1.49913347;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible"
-             inkscape:r_cx="true"
-             inkscape:r_cy="true" />
-        </g>
-      </g>
-      <g
-         style="stroke-width:1.21277249;stroke-miterlimit:4;stroke-dasharray:none"
-         transform="matrix(0.83232643,0,0,0.83232643,-7.320549,-7.9287291)"
-         id="g3728">
-        <path
-           inkscape:connector-curvature="0"
-           style="color:#000000;fill:url(#linearGradient3982);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3984);stroke-width:0.91070038;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible"
-           d="m -44.094898,15.992418 c 0,0 -8.9375,-0.625 -6.1875,9.875 l -7.6875,0 c 0,0 0.5,-11.875 13.875,-9.875 z"
-           id="path2865"
-           inkscape:r_cx="true"
-           inkscape:r_cy="true"
-           sodipodi:nodetypes="cccc" />
-        <g
-           id="g1878"
-           transform="matrix(-0.579051,-0.489228,-0.489228,0.579051,-7.331961,18.953884)"
-           inkscape:r_cx="true"
-           inkscape:r_cy="true"
-           style="fill:url(#linearGradient3988);fill-opacity:1;stroke:#3465a4;stroke-width:1.20136797;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none">
-          <path
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccccc"
-             id="path1880"
-             d="M 44.306783,50.229694 C 62.821497,35.818859 49.664587,13.411704 22.462411,12.49765 L 22.113843,3.1515478 7.6245439,20.496754 22.714328,33.219189 c 0,0 -0.251917,-9.88122 -0.251917,-9.88122 18.82976,0.998977 32.981627,14.071729 21.844372,26.891725 z"
-             style="color:#000000;fill:url(#linearGradient3986);fill-opacity:1;fill-rule:nonzero;stroke:#4e9a06;stroke-width:1.20136797;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible"
-             inkscape:r_cx="true"
-             inkscape:r_cy="true" />
-        </g>
-        <g
-           style="opacity:0.5;fill:none;stroke:#ffffff;stroke-width:1.36795342;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-           inkscape:r_cy="true"
-           inkscape:r_cx="true"
-           transform="matrix(-0.508536,-0.429651,-0.429651,0.508536,-11.198811,18.947994)"
-           id="g2805">
-          <path
-             inkscape:connector-curvature="0"
-             inkscape:r_cy="true"
-             inkscape:r_cx="true"
-             style="color:#000000;fill:none;stroke:url(#linearGradient3990);stroke-width:1.36795342;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible"
-             d="M 51.389927,46.505946 C 60.510127,31.286196 47.050763,12.432359 19.628482,12.069755 L 19.342824,4.0507204 6.3413093,19.379475 19.809059,30.764589 c 0,0 -0.181765,-9.453243 -0.181765,-9.453243 18.244937,0.381972 34.783881,10.925246 31.762633,25.1946 z"
-             id="path2807"
-             sodipodi:nodetypes="ccccccc" />
-        </g>
-        <path
-           inkscape:connector-curvature="0"
-           style="opacity:0.27222224;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.21277249;marker:none;visibility:visible;display:inline;overflow:visible"
-           d="m -57.435311,22.082514 c 3.593435,-10.441273 16.443782,-6.144607 20.1875,-4.5 4.175307,0.211475 5.674736,-2.835004 9,-3 -14.049736,-9.7899965 -28.8125,-6.5000002 -29.1875,7.5 z"
-           id="path2811"
-           inkscape:r_cx="true"
-           inkscape:r_cy="true"
-           sodipodi:nodetypes="cccc" />
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/icons/a2p_isolate.svg b/icons/a2p_isolate.svg
deleted file mode 100644
index dde27ad2..00000000
--- a/icons/a2p_isolate.svg
+++ /dev/null
@@ -1,100 +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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="32"
-   height="32"
-   viewBox="0 0 31.999999 31.999998"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="isolate.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="15.839192"
-     inkscape:cx="11.372247"
-     inkscape:cy="17.975978"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     units="px"
-     inkscape:window-width="1447"
-     inkscape:window-height="1468"
-     inkscape:window-x="890"
-     inkscape:window-y="557"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata7">
-    <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="Ebene 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1020.3622)">
-    <rect
-       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-       id="rect3336"
-       width="12.563772"
-       height="13.573925"
-       x="-19.634838"
-       y="1037.7781" />
-    <rect
-       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-       id="rect3336-3"
-       width="12.56377"
-       height="13.573923"
-       x="0.66291273"
-       y="1037.9991" />
-    <rect
-       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-       id="rect3336-6"
-       width="12.56377"
-       height="13.573923"
-       x="5.9662132"
-       y="1033.7059" />
-    <rect
-       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-       id="rect3336-5"
-       width="12.56377"
-       height="13.573923"
-       x="16.572813"
-       y="1024.0464" />
-    <rect
-       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-       id="rect3336-35"
-       width="12.56377"
-       height="13.573923"
-       x="22.254921"
-       y="1018.1116" />
-    <rect
-       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-       id="rect3336-7"
-       width="12.56377"
-       height="13.573923"
-       x="11.08011"
-       y="1029.0972" />
-  </g>
-</svg>
diff --git a/icons/a2p_planeConstraint.svg b/icons/a2p_planeConstraint.svg
deleted file mode 100644
index 9945edc3..00000000
--- a/icons/a2p_planeConstraint.svg
+++ /dev/null
@@ -1,528 +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="64"
-   height="64"
-   id="svg3085"
-   version="1.1"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="planeConstraint.svg">
-  <defs
-     id="defs3087">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3987">
-      <stop
-         style="stop-color:#204a87;stop-opacity:1"
-         offset="0"
-         id="stop3989" />
-      <stop
-         style="stop-color:#729fcf;stop-opacity:1"
-         offset="1"
-         id="stop3991" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3871">
-      <stop
-         style="stop-color:#2200ff;stop-opacity:1;"
-         offset="0"
-         id="stop3873" />
-      <stop
-         style="stop-color:#fffcfc;stop-opacity:1;"
-         offset="1"
-         id="stop3875" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3863">
-      <stop
-         style="stop-color:#ff0000;stop-opacity:1;"
-         offset="0"
-         id="stop3865" />
-      <stop
-         style="stop-color:#ff9ea8;stop-opacity:1;"
-         offset="1"
-         id="stop3867" />
-    </linearGradient>
-    <marker
-       inkscape:stockid="Arrow2Lend"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow2Lend"
-       style="overflow:visible">
-      <path
-         id="path4574"
-         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
-         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
-         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow2Lstart"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow2Lstart"
-       style="overflow:visible">
-      <path
-         id="path4571"
-         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
-         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
-         transform="matrix(1.1,0,0,1.1,1.1,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="TriangleInS"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="TriangleInS"
-       style="overflow:visible">
-      <path
-         id="path4692"
-         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
-         transform="scale(-0.2,-0.2)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <linearGradient
-       id="linearGradient3903">
-      <stop
-         style="stop-color:#44852d;stop-opacity:1;"
-         offset="0"
-         id="stop3905" />
-      <stop
-         style="stop-color:#0026ff;stop-opacity:1;"
-         offset="1"
-         id="stop3907" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3859">
-      <stop
-         style="stop-color:#0d00ff;stop-opacity:1;"
-         offset="0"
-         id="stop3861" />
-      <stop
-         style="stop-color:#7d81f1;stop-opacity:1;"
-         offset="1"
-         id="stop3863" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3851">
-      <stop
-         style="stop-color:#ff0000;stop-opacity:1;"
-         offset="0"
-         id="stop3853" />
-      <stop
-         style="stop-color:#ff7e7e;stop-opacity:1;"
-         offset="1"
-         id="stop3855" />
-    </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="3.6842619 : 5.0066992 : 1"
-       inkscape:vp_y="-27.498543 : -45.297844 : 1"
-       inkscape:vp_z="-46.715775 : -11.759466 : 1"
-       inkscape:persp3d-origin="12 : 10.666667 : 1"
-       id="perspective3096" />
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="-13.436262 : 14.723626 : 1"
-       inkscape:vp_y="0 : 954.05 : 0"
-       inkscape:vp_z="44.68773 : 14.723626 : 1"
-       inkscape:persp3d-origin="15.625734 : 9.6353598 : 1"
-       id="perspective3094" />
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="-4 : 10 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="28 : 10 : 1"
-       inkscape:persp3d-origin="12 : 4.666667 : 1"
-       id="perspective3011" />
-    <inkscape:path-effect
-       effect="skeletal"
-       id="path-effect3066"
-       is_visible="true"
-       pattern="M 0,0 0,10 10,5 z"
-       copytype="single_stretched"
-       prop_scale="1"
-       scale_y_rel="false"
-       spacing="0"
-       normal_offset="0"
-       tang_offset="0"
-       prop_units="false"
-       vertical_pattern="false"
-       fuse_tolerance="0" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient7597">
-      <stop
-         style="stop-color:#000003;stop-opacity:1;"
-         offset="0"
-         id="stop7599" />
-      <stop
-         style="stop-color:#000003;stop-opacity:0;"
-         offset="1"
-         id="stop7601" />
-    </linearGradient>
-    <marker
-       inkscape:stockid="Arrow1Lstart"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Lstart"
-       style="overflow:visible">
-      <path
-         id="path3995"
-         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
-         transform="matrix(0.8,0,0,0.8,10,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Send"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Send"
-       style="overflow:visible">
-      <path
-         id="path4010"
-         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
-         transform="matrix(-0.2,0,0,-0.2,-1.2,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Sstart"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Sstart"
-       style="overflow:visible">
-      <path
-         id="path4007"
-         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
-         transform="matrix(0.2,0,0,0.2,1.2,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow2Sstart"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow2Sstart"
-       style="overflow:visible">
-      <path
-         id="path4025"
-         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
-         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
-         transform="matrix(0.3,0,0,0.3,-0.69,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="TriangleOutL"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="TriangleOutL"
-       style="overflow:visible">
-      <path
-         id="path4137"
-         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
-         transform="scale(0.8,0.8)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="DiamondLend"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="DiamondLend"
-       style="overflow:visible">
-      <path
-         id="path4092"
-         d="M 0,-7.0710768 -7.0710894,0 0,7.0710589 7.0710462,0 0,-7.0710768 z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
-         transform="matrix(0.8,0,0,0.8,-5.6,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="DiamondLstart"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="DiamondLstart"
-       style="overflow:visible">
-      <path
-         id="path4083"
-         d="M 0,-7.0710768 -7.0710894,0 0,7.0710589 7.0710462,0 0,-7.0710768 z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
-         transform="matrix(0.8,0,0,0.8,5.6,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Lend"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Lend"
-       style="overflow:visible">
-      <path
-         id="path3998"
-         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
-         transform="matrix(-0.8,0,0,-0.8,-10,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <linearGradient
-       id="linearGradient3893">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3895" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3897" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7597"
-       id="linearGradient7603"
-       x1="15.71482"
-       y1="22.299377"
-       x2="34.136208"
-       y2="22.299377"
-       gradientUnits="userSpaceOnUse" />
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="1.132573 : 16.837097 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="31.983524 : 20.416825 : 1"
-       inkscape:persp3d-origin="15.674165 : -5.599381 : 1"
-       id="perspective3011-3" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3863"
-       id="linearGradient3869"
-       x1="23.340048"
-       y1="16.048664"
-       x2="39.360435"
-       y2="16.048664"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-62,-20)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3871"
-       id="linearGradient3877"
-       x1="-8.5626202"
-       y1="16.186771"
-       x2="8.7007294"
-       y2="16.186771"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(57.861891,-20)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3987"
-       id="linearGradient3993"
-       x1="19"
-       y1="26"
-       x2="10"
-       y2="-27"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       gradientTransform="translate(36,0)"
-       inkscape:collect="always"
-       xlink:href="#linearGradient3987-5"
-       id="linearGradient3993-7"
-       x1="19"
-       y1="26"
-       x2="10"
-       y2="-27"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3987-5">
-      <stop
-         style="stop-color:#a40000;stop-opacity:1"
-         offset="0"
-         id="stop3989-3" />
-      <stop
-         style="stop-color:#ef2929;stop-opacity:1"
-         offset="1"
-         id="stop3991-5" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3916-0"
-       id="linearGradient3246"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.80000007,0,0,0.78431368,-0.799999,-4.098038)"
-       x1="38.241375"
-       y1="23.159998"
-       x2="41.689651"
-       y2="40.84" />
-    <linearGradient
-       id="linearGradient3916-0">
-      <stop
-         id="stop3918-6"
-         offset="0"
-         style="stop-color:#8ae234;stop-opacity:1" />
-      <stop
-         id="stop3920-2"
-         offset="1"
-         style="stop-color:#4e9a06;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3916"
-       id="linearGradient3963"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.80000007,0,0,0.78431368,0.20000082,-30.098038)"
-       x1="42.249996"
-       y1="23.074999"
-       x2="39.749996"
-       y2="40.924999" />
-    <linearGradient
-       id="linearGradient3916">
-      <stop
-         id="stop3918"
-         offset="0"
-         style="stop-color:#8ae234;stop-opacity:1" />
-      <stop
-         id="stop3920"
-         offset="1"
-         style="stop-color:#4e9a06;stop-opacity:1" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="3.6203867"
-     inkscape:cx="12.410336"
-     inkscape:cy="80.921885"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     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="grid3113"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata3090">
-    <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 />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     transform="translate(0,32)">
-    <rect
-       style="fill:#729fcf;stroke:#0b1521;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:6.00000035999999959"
-       id="rect3115"
-       width="22"
-       height="58"
-       x="3"
-       y="-29" />
-    <rect
-       style="fill:url(#linearGradient3993);stroke:#729fcf;stroke-width:1.99999975999999990;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:6.00000035999999959;fill-opacity:1"
-       id="rect3115-6"
-       width="18"
-       height="54"
-       x="5"
-       y="-27" />
-    <rect
-       style="fill:#ef2929;stroke:#280000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:6.00000035999999959"
-       id="rect3115-62"
-       width="22"
-       height="58"
-       x="39"
-       y="-29" />
-    <rect
-       style="fill:url(#linearGradient3993-7);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999975999999990;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:6.00000035999999959"
-       id="rect3115-6-9"
-       width="18"
-       height="54"
-       x="41"
-       y="-27" />
-    <g
-       style="display:inline"
-       id="g3959"
-       transform="matrix(-1,0,0,1,64,-7.58223)">
-      <path
-         inkscape:export-ydpi="4.1683898"
-         inkscape:export-xdpi="4.1683898"
-         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
-         sodipodi:nodetypes="cccccccc"
-         id="path3343-0"
-         d="m 35,-13 0,4 -18,0 0,8 18,0 0,4 14,-8 z"
-         style="fill:url(#linearGradient3963);fill-opacity:1;fill-rule:evenodd;stroke:#172a04;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:export-ydpi="4.1683898"
-         inkscape:export-xdpi="4.1683898"
-         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
-         sodipodi:nodetypes="cccccccc"
-         id="path3343-2-9"
-         d="M 37,-9.5822304 37,-7 l -18,0 0,4 18,0 0,2.5822304 L 45,-5 z"
-         style="fill:none;stroke:#8ae234;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-         inkscape:connector-curvature="0" />
-    </g>
-    <g
-       id="g3242"
-       transform="translate(1,-8)">
-      <path
-         inkscape:export-ydpi="4.1683898"
-         inkscape:export-xdpi="4.1683898"
-         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
-         sodipodi:nodetypes="cccccccc"
-         id="path3343-0-6"
-         d="m 34,13 0,4 -18,0 0,8 18,0 0,4 14,-8 z"
-         style="fill:url(#linearGradient3246);fill-opacity:1;fill-rule:evenodd;stroke:#172a04;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:export-ydpi="4.1683898"
-         inkscape:export-xdpi="4.1683898"
-         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
-         sodipodi:nodetypes="cccccccc"
-         id="path3343-2-9-1"
-         d="M 36,16.41777 36,19 l -18,0 0,4 18,0 0,2.58223 L 44,21 z"
-         style="fill:none;stroke:#8ae234;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-         inkscape:connector-curvature="0" />
-    </g>
-  </g>
-</svg>
diff --git a/icons/a2p_simpleAssemblyShape.svg b/icons/a2p_simpleAssemblyShape.svg
deleted file mode 100644
index 6ab96b8f..00000000
--- a/icons/a2p_simpleAssemblyShape.svg
+++ /dev/null
@@ -1,162 +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="48px"
-   height="48px"
-   id="svg3049"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="simpleAssemblyShape.svg">
-  <defs
-     id="defs3051">
-    <linearGradient
-       id="linearGradient3796">
-      <stop
-         style="stop-color:#002eff;stop-opacity:1;"
-         offset="0"
-         id="stop3798" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop3800" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3796-9"
-       id="linearGradient3802-4"
-       x1="1.0714288"
-       y1="14"
-       x2="23.785713"
-       y2="14"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1441499,0,0,1.1453872,-1.7322215,-3.8211363)" />
-    <linearGradient
-       id="linearGradient3796-9">
-      <stop
-         style="stop-color:#002eff;stop-opacity:1;"
-         offset="0"
-         id="stop3798-8" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop3800-6" />
-    </linearGradient>
-    <linearGradient
-       y2="14"
-       x2="23.785713"
-       y1="14"
-       x1="1.0714288"
-       gradientTransform="matrix(1.1441499,0,0,1.1453872,-0.93443514,18.964579)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3819"
-       xlink:href="#linearGradient3796-9"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3796-3"
-       id="linearGradient3802-3"
-       x1="1.0714288"
-       y1="14"
-       x2="23.785713"
-       y2="14"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1441499,0,0,1.1453872,-1.7322215,-3.8211363)" />
-    <linearGradient
-       id="linearGradient3796-3">
-      <stop
-         style="stop-color:#002eff;stop-opacity:1;"
-         offset="0"
-         id="stop3798-1" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop3800-1" />
-    </linearGradient>
-    <linearGradient
-       y2="14"
-       x2="23.785713"
-       y1="14"
-       x1="1.0714288"
-       gradientTransform="matrix(1.1441499,0,0,1.1453872,-1.7915791,20.250294)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3853-7"
-       xlink:href="#linearGradient3796-3-7"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3796-3-7">
-      <stop
-         style="stop-color:#002eff;stop-opacity:1;"
-         offset="0"
-         id="stop3798-1-9" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop3800-1-9" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="14"
-     inkscape:cx="22.351691"
-     inkscape:cy="21.17499"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="3840"
-     inkscape:window-height="2083"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata3054">
-    <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 />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <rect
-       style="opacity:0.8;fill:#000eff;fill-opacity:1;stroke:#000eff;stroke-width:3.98188639;stroke-linecap:butt;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-       id="rect2990-5"
-       width="44.435986"
-       height="44.510635"
-       x="2.0041099"
-       y="1.9590726" />
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-weight:bold;font-size:41.08454132px;line-height:125%;font-family:Sans;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffcc00;fill-opacity:1;stroke:#ffcc00;stroke-width:1.05022788"
-       x="0.077699609"
-       y="28.868326"
-       id="text3001"
-       sodipodi:linespacing="125%"
-       transform="matrix(0.8268857,-0.00690922,-0.00678965,1.2094137,0,0)"><tspan
-         sodipodi:role="line"
-         id="tspan3003"
-         x="0.077699609"
-         y="28.868326"
-         style="font-size:26.96173096px;fill:#ffcc00;stroke:#ffcc00;stroke-width:1.05022788">SAS</tspan></text>
-  </g>
-</svg>
diff --git a/icons/a2p_viewConnection.svg b/icons/a2p_viewConnection.svg
deleted file mode 100644
index e638d8fd..00000000
--- a/icons/a2p_viewConnection.svg
+++ /dev/null
@@ -1,90 +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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48"
-   height="48"
-   viewBox="0 0 48 48.000001"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="a3_viewConnection.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.6"
-     inkscape:cx="62.249719"
-     inkscape:cy="69.264671"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     units="px"
-     inkscape:window-width="1187"
-     inkscape:window-height="1088"
-     inkscape:window-x="592"
-     inkscape:window-y="498"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata7">
-    <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 />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Ebene 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1004.3622)">
-    <rect
-       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffff3e;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.84006935;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:optimizeSpeed;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-       id="rect3336"
-       width="13.92326"
-       height="35.894081"
-       x="0.2988418"
-       y="1016.2955" />
-    <rect
-       style="fill:#ffff00;fill-rule:evenodd;stroke:#000000;stroke-width:1.01373148px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       id="rect3340"
-       width="15.012287"
-       height="35.846684"
-       x="32.584286"
-       y="1016.1299" />
-    <path
-       style="fill:#00ed00;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 3.8512066,1043.839 5.1770318,-4.6719 1.2626906,2.1466 c 25.885159,0.1263 0,0 25.885159,0.1263 l 0.631345,-2.6517 5.808377,4.7351 -6.439722,5.1139 -0.252538,-2.9042 -25.569487,0.2525 -1.3258246,2.3992 z"
-       id="path3342"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccccc" />
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:21.63373947px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="6.1417284"
-       y="830.5304"
-       id="text3337"
-       sodipodi:linespacing="125%"
-       transform="scale(0.81276694,1.230365)"><tspan
-         sodipodi:role="line"
-         id="tspan3339"
-         x="6.1417284"
-         y="830.5304">view</tspan></text>
-  </g>
-</svg>