diff --git a/Gui/Resources/icons/constraints/Assembly_ConstraintAlignment.svg b/Gui/Resources/icons/constraints/Assembly_ConstraintAlignment.svg
index 17c9dde..4455031 100644
--- a/Gui/Resources/icons/constraints/Assembly_ConstraintAlignment.svg
+++ b/Gui/Resources/icons/constraints/Assembly_ConstraintAlignment.svg
@@ -10,8 +10,8 @@
    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="68.26667"
-   height="68.26667"
+   width="64"
+   height="64"
    id="svg2980"
    sodipodi:version="0.32"
    inkscape:version="0.91 r13725"
@@ -21,7 +21,7 @@
    inkscape:export-filename="/home/user/Downloads/cad/mystuff/icons/assembly/Assembly_constraints/Assembly_Constraint_Angle_3_32px.png"
    inkscape:export-xdpi="45"
    inkscape:export-ydpi="45"
-   enable-background="new">
+   style="enable-background:new">
   <defs
      id="defs2982">
     <linearGradient
@@ -326,7 +326,7 @@
        x2="21.165751"
        y2="55.146343"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="rotate(179.46257,19.626676,37.92588)" />
+       gradientTransform="matrix(-0.99995601,0.00937979,-0.00937979,-0.99995601,39.608225,75.665998)" />
     <linearGradient
        id="linearGradient3193">
       <stop
@@ -544,7 +544,7 @@
        y1="626.0874"
        x2="2849.4058"
        y2="822.17853"
-       gradientTransform="translate(61.257658)" />
+       gradientTransform="translate(61.257658,0)" />
     <linearGradient
        id="linearGradient3166"
        inkscape:collect="always">
@@ -682,9 +682,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="7.3231123"
-     inkscape:cx="25.704927"
-     inkscape:cy="35.587865"
+     inkscape:zoom="5.1782224"
+     inkscape:cx="-14.083178"
+     inkscape:cy="40.135739"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
@@ -750,14 +750,14 @@
      id="layer1"
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
-     style="opacity:1">
+     style="opacity:1"
+     transform="translate(0,-4.2666702)">
     <g
        id="g3760-8"
-       transform="matrix(0.39800085,0,0,0.49338099,19.957555,-4.8837086)"
-       style="" />
+       transform="matrix(0.39800085,0,0,0.49338099,19.957555,-4.8837086)" />
     <g
        id="g4514"
-       transform="matrix(1.2322914,0,0,1.2322914,-7.4729887,-11.293732)">
+       transform="matrix(1.1090623,0,0,1.1090623,-4.8294842,-8.5741861)">
       <g
          transform="translate(6.5545902,-3.8235109)"
          id="g4374">
@@ -805,7 +805,7 @@
     </g>
     <g
        id="g4533"
-       transform="matrix(1.1504446,0,0,1.1504446,-5.3270529,-6.7545531)">
+       transform="matrix(1.0354001,0,0,1.0354001,-3.5144055,-3.4514259)">
       <g
          transform="translate(28.351694,-21.884705)"
          id="g4374-1">
@@ -854,7 +854,7 @@
     <g
        style="display:inline;opacity:1"
        id="g4324-2"
-       transform="translate(-0.33158644,-0.97834384)">
+       transform="matrix(0.9,0,0,0.9,0.96905984,1.27153)">
       <path
          sodipodi:nodetypes="ccccc"
          inkscape:connector-curvature="0"
@@ -868,17 +868,39 @@
          d="M 44.188405,20.238794 67.012495,19.313906 26.782952,51.954755 1.719896,52.902661 Z"
          style="opacity:0.80500034;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#2f0000;stroke-width:2.00699997;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     </g>
-    <path
-       style="fill:#ef2929;stroke:#280000;stroke-width:2.13333344;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
-       d="m 15.593462,21.700877 -4.619112,7.78356 4.134222,-1.054814 4.219249,16.536885 4.134232,-1.054813 -4.219258,-16.536887 4.134223,-1.054815 z"
-       id="path3948-2-2-0"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccc" />
-    <path
-       style="fill:#ef2929;stroke:#280000;stroke-width:2.13333344;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
-       d="M 40.978295,1.507143 36.273174,9.239014 40.418836,8.2301 44.454489,24.812745 48.600161,23.803831 44.5645,7.221184 48.710162,6.212268 Z"
-       id="path3948-2-2-0-6"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccc" />
+    <g
+       transform="matrix(-0.91320053,-0.26184875,-0.26184875,0.91320053,48.232629,7.2994199)"
+       id="g3146-7-7-3-1">
+      <g
+         id="g3165-0-0-6-8"
+         transform="matrix(-2.0550338,1.2015287,-1.1864744,-2.0811088,4.4962146,96.61577)" />
+      <path
+         style="fill:#ef2929;stroke:#280000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+         d="M 24.732011,29.875651 26.928162,38.071805 23.464061,36.071806 19.464067,43 15.999965,41 19.99996,34.071806 16.535859,32.071807 Z"
+         id="path3948-2-9-9-7-7"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccccccc" />
+    </g>
+    <g
+       style="opacity:1"
+       transform="matrix(-0.91320053,-0.26184875,-0.26184875,0.91320053,70.526699,-9.676433)"
+       id="g3146-7-7-3-1-3">
+      <g
+         id="g3165-0-0-6-8-5"
+         transform="matrix(-2.0550338,1.2015287,-1.1864744,-2.0811088,4.4962146,96.61577)" />
+      <path
+         style="fill:#ef2929;stroke:#280000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+         d="M 24.732011,29.875651 26.928162,38.071805 23.464061,36.071806 19.464067,43 15.999965,41 19.99996,34.071806 16.535859,32.071807 Z"
+         id="path3948-2-9-9-7-7-6"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccccccc" />
+    </g>
+    <rect
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#2828ff;stroke-width:2.06451583;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4296"
+       width="61.935482"
+       height="61.935486"
+       x="1.0322579"
+       y="5.2989264" />
   </g>
 </svg>
diff --git a/Gui/Resources/icons/constraints/Assembly_ConstraintAxial.svg b/Gui/Resources/icons/constraints/Assembly_ConstraintAxial.svg
index fb7b3ee..0f48fb1 100644
--- a/Gui/Resources/icons/constraints/Assembly_ConstraintAxial.svg
+++ b/Gui/Resources/icons/constraints/Assembly_ConstraintAxial.svg
@@ -443,9 +443,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="2.2345679"
-     inkscape:cx="-30.004786"
-     inkscape:cy="103.45792"
+     inkscape:zoom="4.4691358"
+     inkscape:cx="26.889726"
+     inkscape:cy="28.174736"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
@@ -510,108 +510,119 @@
     <g
        id="g3760-8"
        transform="matrix(0.39800085,0,0,0.49338099,18.710208,-4.5784768)" />
-    <path
-       style="fill:#ef2929;stroke:#280000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
-       d="m 45.940604,62.604854 3.000235,-7.937166 -3.6458,1.645641 -6.582566,-14.58319 -3.645801,1.645642 6.582568,14.583192 -3.6458,1.645642 z"
-       id="path3948-2-3"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccc" />
-    <path
-       style="fill:#729fcf;stroke:#0b1521;stroke-width:2.30689406;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.5;stroke-dashoffset:20.39999962;stroke-opacity:1"
-       d="m 26.574899,55.601615 c 0.874412,2.076103 7.70912,1.179035 15.265751,-2.003661 7.55663,-3.182694 12.973637,-7.445794 12.099226,-9.521898 L 48.688736,31.608344 21.32376,43.133903 Z"
-       id="path2994-3-3-6"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="sscccs" />
-    <path
-       style="fill:url(#linearGradient3807-3-6);fill-opacity:1;stroke:#729fcf;stroke-width:2.30689406;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.5;stroke-dashoffset:20.39999962;stroke-opacity:1"
-       d="m 28.732783,53.770696 c 0.794918,1.887363 8.616864,-0.403457 12.348698,-1.975228 3.731587,-1.571668 10.835746,-5.567411 10.040827,-7.454774 L 46.662796,33.752531 24.273269,43.182535 Z"
-       id="path2994-3-6-5-2"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="sscccs" />
-    <path
-       style="fill:none;stroke:#729fcf;stroke-width:2.30689406;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.5;stroke-dashoffset:20.39999962;stroke-opacity:1"
-       d="m 25.289194,45.59463 c 3.138539,0.49744 8.228417,-1.32643 11.960005,-2.898098 3.731587,-1.571667 8.592609,-3.938909 10.429521,-6.531904"
-       id="path2994-3-6-9-6-9"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="csc" />
-    <ellipse
-       ry="3.9429603"
-       rx="14.846552"
-       cy="47.892918"
-       cx="-17.755707"
-       style="fill:#729fcf;stroke:#a40000;stroke-width:2.30689406;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.5;stroke-dasharray:none;stroke-dashoffset:20.39999962;stroke-opacity:1"
-       id="path2994-2-1"
-       transform="matrix(-0.92159365,0.38815608,0.38815608,0.92159365,0,0)" />
-    <ellipse
-       cx="-17.516226"
-       cy="47.711723"
-       rx="12.516439"
-       ry="2.0296438"
-       style="fill:#729fcf;stroke:#ef2929;stroke-width:2.37598658;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.5;stroke-dasharray:none;stroke-dashoffset:20.39999962;stroke-opacity:1"
-       id="path2994-2-3-2"
-       transform="matrix(-0.92372868,0.38304743,0.39325727,0.91942848,0,0)" />
-    <path
-       style="fill:#ef2929;stroke:#280000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
-       d="m 25.213464,16.267325 -3.000235,7.937166 3.6458,-1.645641 6.582566,14.58319 3.645801,-1.645642 -6.582568,-14.583191 3.6458,-1.645643 z"
-       id="path3948-2-6"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccc" />
     <g
-       id="g3251"
-       transform="matrix(-1.2474585,0.51524099,0.37631015,0.91109065,41.976133,-1.7768537)">
-      <g
-         id="g3205"
-         transform="translate(-0.57107468,15.488871)">
-        <g
-           id="g3287"
-           transform="translate(1.9999987,-13.990807)">
-          <path
-             sodipodi:nodetypes="sscccs"
-             inkscape:connector-curvature="0"
-             id="path2994-3-3"
-             d="m 25.571076,21.363994 c 0,2.28532 -4.924867,4.13794 -11,4.13794 -6.0751345,0 -11.0000025,-1.85262 -11.0000025,-4.13794 l -10e-7,-13.7241288 22.0000025,0 z"
-             style="fill:#729fcf;stroke:#0b1521;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.5;stroke-dashoffset:20.39999962;stroke-opacity:1" />
-          <path
-             sodipodi:nodetypes="sscccs"
-             inkscape:connector-curvature="0"
-             id="path2994-3-6-5"
-             d="m 23.571075,20.501934 c 0,2.07756 -5.999802,3.01587 -9,3.01587 -3,0 -9.0000015,-0.93831 -9.0000015,-3.01587 l -1e-6,-11.6551698 18.0000025,0 z"
-             style="fill:url(#linearGradient3297);fill-opacity:1;stroke:#729fcf;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.5;stroke-dashoffset:20.39999962;stroke-opacity:1" />
-          <path
-             sodipodi:nodetypes="csc"
-             inkscape:connector-curvature="0"
-             id="path2994-3-6-9-6"
-             d="m 23.571075,11.501935 c -2,1.700934 -6,1.999999 -9,1.999999 -3,0 -7.0000015,-0.299065 -9.0000015,-1.999999"
-             style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.5;stroke-dashoffset:20.39999962;stroke-opacity:1" />
-          <ellipse
-             transform="matrix(0.52380955,0,0,0.57142854,32.904409,-6.7837776)"
-             id="path2994-2"
-             style="fill:#729fcf;stroke:#0b1521;stroke-width:3.65563059;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.5;stroke-dasharray:none;stroke-dashoffset:20.39999962;stroke-opacity:1"
-             cx="-35"
-             cy="25"
-             rx="21"
-             ry="7" />
-          <path
-             sodipodi:nodetypes="csc"
-             inkscape:connector-curvature="0"
-             id="path2994-3-6-9-6-3"
-             d="m 25.571075,21.511129 c 0,3 -8,4 -11,4 -3,0 -11.0000003,-1 -11.0000003,-4"
-             style="fill:none;stroke:#a40000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.5;stroke-dashoffset:20.39999962;stroke-opacity:1" />
-        </g>
-      </g>
-    </g>
-    <g
-       id="g3146-7"
-       transform="matrix(-0.99628895,-0.08607158,-0.08607158,0.99628895,46.565353,-25.355225)">
-      <g
-         transform="matrix(-2.0550338,1.2015287,-1.1864744,-2.0811088,4.4962146,96.61577)"
-         id="g3165-0" />
+       id="g4233"
+       transform="matrix(0.9,0,0,0.9,1.2579079,3.0041289)">
       <path
          sodipodi:nodetypes="cccccccc"
          inkscape:connector-curvature="0"
-         id="path3948-2-9"
-         d="M 24.732011,29.875651 26.928162,38.071805 23.464061,36.071806 19.464067,43 15.999965,41 19.99996,34.071806 16.535859,32.071807 Z"
+         id="path3948-2-3"
+         d="m 45.940604,62.604854 3.000235,-7.937166 -3.6458,1.645641 -6.582566,-14.58319 -3.645801,1.645642 6.582568,14.583192 -3.6458,1.645642 z"
          style="fill:#ef2929;stroke:#280000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="sscccs"
+         inkscape:connector-curvature="0"
+         id="path2994-3-3-6"
+         d="m 26.574899,55.601615 c 0.874412,2.076103 7.70912,1.179035 15.265751,-2.003661 7.55663,-3.182694 12.973637,-7.445794 12.099226,-9.521898 L 48.688736,31.608344 21.32376,43.133903 Z"
+         style="fill:#729fcf;stroke:#0b1521;stroke-width:2.30689406;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.5;stroke-dashoffset:20.39999962;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="sscccs"
+         inkscape:connector-curvature="0"
+         id="path2994-3-6-5-2"
+         d="m 28.732783,53.770696 c 0.794918,1.887363 8.616864,-0.403457 12.348698,-1.975228 3.731587,-1.571668 10.835746,-5.567411 10.040827,-7.454774 L 46.662796,33.752531 24.273269,43.182535 Z"
+         style="fill:url(#linearGradient3807-3-6);fill-opacity:1;stroke:#729fcf;stroke-width:2.30689406;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.5;stroke-dashoffset:20.39999962;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="csc"
+         inkscape:connector-curvature="0"
+         id="path2994-3-6-9-6-9"
+         d="m 25.289194,45.59463 c 3.138539,0.49744 8.228417,-1.32643 11.960005,-2.898098 3.731587,-1.571667 8.592609,-3.938909 10.429521,-6.531904"
+         style="fill:none;stroke:#729fcf;stroke-width:2.30689406;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.5;stroke-dashoffset:20.39999962;stroke-opacity:1" />
+      <ellipse
+         transform="matrix(-0.92159365,0.38815608,0.38815608,0.92159365,0,0)"
+         id="path2994-2-1"
+         style="fill:#729fcf;stroke:#a40000;stroke-width:2.30689406;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.5;stroke-dasharray:none;stroke-dashoffset:20.39999962;stroke-opacity:1"
+         cx="-17.755707"
+         cy="47.892918"
+         rx="14.846552"
+         ry="3.9429603" />
+      <ellipse
+         transform="matrix(-0.92372868,0.38304743,0.39325727,0.91942848,0,0)"
+         id="path2994-2-3-2"
+         style="fill:#729fcf;stroke:#ef2929;stroke-width:2.37598658;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.5;stroke-dasharray:none;stroke-dashoffset:20.39999962;stroke-opacity:1"
+         ry="2.0296438"
+         rx="12.516439"
+         cy="47.711723"
+         cx="-17.516226" />
+      <path
+         sodipodi:nodetypes="cccccccc"
+         inkscape:connector-curvature="0"
+         id="path3948-2-6"
+         d="m 25.213464,16.267325 -3.000235,7.937166 3.6458,-1.645641 6.582566,14.58319 3.645801,-1.645642 -6.582568,-14.583191 3.6458,-1.645643 z"
+         style="fill:#ef2929;stroke:#280000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
+      <g
+         transform="matrix(-1.2474585,0.51524099,0.37631015,0.91109065,41.976133,-1.7768537)"
+         id="g3251">
+        <g
+           transform="translate(-0.57107468,15.488871)"
+           id="g3205">
+          <g
+             transform="translate(1.9999987,-13.990807)"
+             id="g3287">
+            <path
+               style="fill:#729fcf;stroke:#0b1521;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.5;stroke-dashoffset:20.39999962;stroke-opacity:1"
+               d="m 25.571076,21.363994 c 0,2.28532 -4.924867,4.13794 -11,4.13794 -6.0751345,0 -11.0000025,-1.85262 -11.0000025,-4.13794 l -10e-7,-13.7241288 22.0000025,0 z"
+               id="path2994-3-3"
+               inkscape:connector-curvature="0"
+               sodipodi:nodetypes="sscccs" />
+            <path
+               style="fill:url(#linearGradient3297);fill-opacity:1;stroke:#729fcf;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.5;stroke-dashoffset:20.39999962;stroke-opacity:1"
+               d="m 23.571075,20.501934 c 0,2.07756 -5.999802,3.01587 -9,3.01587 -3,0 -9.0000015,-0.93831 -9.0000015,-3.01587 l -1e-6,-11.6551698 18.0000025,0 z"
+               id="path2994-3-6-5"
+               inkscape:connector-curvature="0"
+               sodipodi:nodetypes="sscccs" />
+            <path
+               style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.5;stroke-dashoffset:20.39999962;stroke-opacity:1"
+               d="m 23.571075,11.501935 c -2,1.700934 -6,1.999999 -9,1.999999 -3,0 -7.0000015,-0.299065 -9.0000015,-1.999999"
+               id="path2994-3-6-9-6"
+               inkscape:connector-curvature="0"
+               sodipodi:nodetypes="csc" />
+            <ellipse
+               ry="7"
+               rx="21"
+               cy="25"
+               cx="-35"
+               style="fill:#729fcf;stroke:#0b1521;stroke-width:3.65563059;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.5;stroke-dasharray:none;stroke-dashoffset:20.39999962;stroke-opacity:1"
+               id="path2994-2"
+               transform="matrix(0.52380955,0,0,0.57142854,32.904409,-6.7837776)" />
+            <path
+               style="fill:none;stroke:#a40000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.5;stroke-dashoffset:20.39999962;stroke-opacity:1"
+               d="m 25.571075,21.511129 c 0,3 -8,4 -11,4 -3,0 -11.0000003,-1 -11.0000003,-4"
+               id="path2994-3-6-9-6-3"
+               inkscape:connector-curvature="0"
+               sodipodi:nodetypes="csc" />
+          </g>
+        </g>
+      </g>
+      <g
+         transform="matrix(-0.99628895,-0.08607158,-0.08607158,0.99628895,46.565353,-25.355225)"
+         id="g3146-7">
+        <g
+           id="g3165-0"
+           transform="matrix(-2.0550338,1.2015287,-1.1864744,-2.0811088,4.4962146,96.61577)" />
+        <path
+           style="fill:#ef2929;stroke:#280000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+           d="M 24.732011,29.875651 26.928162,38.071805 23.464061,36.071806 19.464067,43 15.999965,41 19.99996,34.071806 16.535859,32.071807 Z"
+           id="path3948-2-9"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cccccccc" />
+      </g>
     </g>
+    <rect
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#28f028;stroke-width:2.06451583;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4296"
+       width="61.935482"
+       height="61.935486"
+       x="1.0322579"
+       y="1.0322562" />
   </g>
 </svg>
diff --git a/Gui/Resources/icons/constraints/Assembly_ConstraintCoincidence.svg b/Gui/Resources/icons/constraints/Assembly_ConstraintCoincidence.svg
index dfcf1a1..38ca766 100644
--- a/Gui/Resources/icons/constraints/Assembly_ConstraintCoincidence.svg
+++ b/Gui/Resources/icons/constraints/Assembly_ConstraintCoincidence.svg
@@ -401,9 +401,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="8.9382721"
-     inkscape:cx="21.190216"
-     inkscape:cy="34.711861"
+     inkscape:zoom="4.4691361"
+     inkscape:cx="30.407781"
+     inkscape:cy="31.334001"
      inkscape:current-layer="g3205-5"
      showgrid="true"
      inkscape:document-units="px"
@@ -473,9 +473,9 @@
        id="g3205-5">
       <g
          id="g4225"
-         transform="matrix(1.4342688,0,0,0.993244,-3.8677451,0.20247615)">
+         transform="matrix(1.243263,0,0,0.92004581,-2.7805354,2.0939455)">
         <path
-           style="fill:#729fcf;stroke:#0b1521;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.5;stroke-dashoffset:20.39999962;stroke-opacity:1"
+           style="fill:#729fcf;stroke:#0b1521;stroke-width:2.16279244;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.5;stroke-dasharray:none;stroke-dashoffset:20.39999962;stroke-opacity:1"
            d="m 19.000001,54.84619 c 0,2.28532 -4.768859,5.095375 -10.8439924,5.095375 C 2.0808756,59.941565 -3,57.13151 -3,54.84619 l -1e-6,-23.724131 22.000001,0 z"
            id="path2994-3-3-6-3"
            inkscape:connector-curvature="0"
@@ -501,7 +501,7 @@
            rx="21"
            ry="7" />
         <path
-           style="fill:#729fcf;stroke:#0b1521;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.5;stroke-dashoffset:20.39999962;stroke-opacity:1"
+           style="fill:#729fcf;stroke:#0b1521;stroke-width:2.16279244;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.5;stroke-dasharray:none;stroke-dashoffset:20.39999962;stroke-opacity:1"
            d="m 19.000001,28.86206 c 0,2.28532 -4.924867,4.13794 -11,4.13794 C 1.924868,33 -3,31.14738 -3,28.86206 l -1e-6,-23.7241305 22.000001,0 z"
            id="path2994-3-3-6"
            inkscape:connector-curvature="0"
@@ -519,7 +519,7 @@
            inkscape:connector-curvature="0"
            sodipodi:nodetypes="csc" />
         <ellipse
-           style="fill:#204a87;stroke:#0b1521;stroke-width:3.65563059;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.5;stroke-dasharray:none;stroke-dashoffset:20.39999962;stroke-opacity:1"
+           style="fill:#204a87;stroke:#0b1521;stroke-width:3.95318508;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.5;stroke-dasharray:none;stroke-dashoffset:20.39999962;stroke-opacity:1"
            id="path2994-2-1"
            transform="matrix(0.52380955,0,0,0.57142854,26.333335,-9.2857133)"
            cx="-35"
@@ -559,6 +559,14 @@
            rx="21"
            ry="7" />
       </g>
+      <rect
+         style="opacity:1;fill:none;fill-opacity:1;stroke:#2828ff;stroke-width:2.06451583;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect4296"
+         width="61.935482"
+         height="61.935486"
+         x="-60.967743"
+         y="-38.967743"
+         transform="matrix(0,-1,-1,0,0,0)" />
     </g>
   </g>
 </svg>
diff --git a/Gui/Resources/icons/constraints/Assembly_ConstraintMultiParallel.svg b/Gui/Resources/icons/constraints/Assembly_ConstraintMultiParallel.svg
index 82d1491..9733d55 100644
--- a/Gui/Resources/icons/constraints/Assembly_ConstraintMultiParallel.svg
+++ b/Gui/Resources/icons/constraints/Assembly_ConstraintMultiParallel.svg
@@ -10,8 +10,8 @@
    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="68.26667"
-   height="68.26667"
+   width="64"
+   height="64"
    id="svg2980"
    sodipodi:version="0.32"
    inkscape:version="0.91 r13725"
@@ -345,7 +345,7 @@
        x2="21.165751"
        y2="55.146343"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="rotate(179.46257,19.626676,37.92588)" />
+       gradientTransform="matrix(-0.99995601,0.00937979,-0.00937979,-0.99995601,39.608225,75.665998)" />
     <linearGradient
        id="linearGradient3193">
       <stop
@@ -493,9 +493,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="4.4691359"
-     inkscape:cx="60.2876"
-     inkscape:cy="59.035447"
+     inkscape:zoom="5.6568542"
+     inkscape:cx="31.728495"
+     inkscape:cy="11.2064"
      inkscape:current-layer="g3287"
      showgrid="true"
      inkscape:document-units="px"
@@ -560,7 +560,8 @@
   <g
      id="layer1"
      inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     inkscape:groupmode="layer"
+     transform="translate(0,-4.2666702)">
     <g
        id="g3760-8"
        transform="matrix(0.39800085,0,0,0.49338099,19.957555,-4.8837086)" />
@@ -572,75 +573,9 @@
         <g
            id="g3287"
            transform="translate(2.1333319,-14.923527)">
-          <g
-             id="g4269"
-             transform="matrix(0.96921912,0.24619969,-0.24619969,0.96921912,12.595447,-5.5660756)">
-            <path
-               sodipodi:nodetypes="cccccccc"
-               inkscape:connector-curvature="0"
-               id="path3948-2-1-0-8"
-               d="m 31.512276,35.479866 4.318399,-7.142001 -3.901088,0.940147 -4.088616,-15.284724 -3.901091,0.94015 4.088609,15.284721 -3.901088,0.940149 z"
-               style="fill:#ef2929;stroke:#280000;stroke-width:1.99171829;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
-            <g
-               transform="matrix(1.1960056,0,0,1.1960056,0.20498716,14.286319)"
-               id="g6084">
-              <g
-                 id="g4374-7-3-1"
-                 transform="translate(2.8207584,-58.52331)">
-                <path
-                   sodipodi:nodetypes="ccccc"
-                   inkscape:connector-curvature="0"
-                   style="fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#0b1521;stroke-width:1.51200366px;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-                   d="M 6.9706404,52.685246 19.987289,51.841938 27.021708,46.315264 14.596131,47.008379 Z"
-                   id="path22256-8-1-9-3-7-9" />
-                <path
-                   sodipodi:nodetypes="ccccc"
-                   inkscape:connector-curvature="0"
-                   style="fill:url(#linearGradient6035);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:1.36805511px;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-                   d="M 27.206541,46.272255 30.459393,58.794171 23.4571,65.314401 20.094403,51.998224 Z"
-                   id="path22258-0-2-2-6-5-4" />
-                <path
-                   inkscape:connector-curvature="0"
-                   style="fill:url(#linearGradient6037);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:1.36805511px;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-                   d="M 6.6999587,52.827069 20.094403,51.998224 23.4571,65.314401 10.051218,66.097952 Z"
-                   id="path22260-6-7-0-1-9-7" />
-                <path
-                   inkscape:connector-curvature="0"
-                   style="fill:none;stroke:#729fcf;stroke-width:1.33466935px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-                   d="M 8.5324364,54.247658 11.134264,64.550814 21.577434,63.931405 18.975607,53.628248 Z"
-                   id="path22262-3-0-2-2-2-8" />
-                <path
-                   sodipodi:nodetypes="ccccc"
-                   inkscape:connector-curvature="0"
-                   style="fill:none;stroke:#3465a4;stroke-width:1.33466935px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-                   d="m 21.756131,52.742657 2.450838,9.894492 4.794109,-4.22292 -2.615142,-9.776118 z"
-                   id="path22264-5-9-3-9-2-4" />
-              </g>
-              <g
-                 id="g6079"
-                 transform="translate(-1.7900552,-4.195442)">
-                <g
-                   transform="translate(-26.571133,-0.61533142)"
-                   id="g6068">
-                  <path
-                     sodipodi:nodetypes="ccc"
-                     inkscape:connector-curvature="0"
-                     style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ef2929;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-                     d="M 41.542254,12.248045 54.558902,11.404737 61.817078,4.9270959"
-                     id="path22256-8-1-7-3-8-5" />
-                </g>
-                <path
-                   id="path22256-8-1-7-5-1-9-0"
-                   d="M 15.004974,11.689854 28.021623,10.846546 35.111981,4.5367229"
-                   style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#a40000;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-                   inkscape:connector-curvature="0"
-                   sodipodi:nodetypes="ccc" />
-              </g>
-            </g>
-          </g>
           <g
              id="g4255"
-             transform="matrix(0.96988703,0.24355523,-0.24355523,0.96988703,14.50148,-11.581109)">
+             transform="matrix(0.87532305,0.2198086,-0.2198086,0.87532305,13.012362,-7.6072794)">
             <g
                id="g4514-9-1"
                style="opacity:1"
@@ -706,7 +641,7 @@
           </g>
           <g
              id="g4255-6"
-             transform="matrix(0.96988703,0.24355523,-0.24355523,0.96988703,-22.626881,-16.935989)">
+             transform="matrix(0.87532305,0.2198086,-0.2198086,0.87532305,-17.324832,-7.5362679)">
             <g
                id="g4514-9-1-2"
                style="opacity:1"
@@ -770,6 +705,79 @@
                  style="fill:#ef2929;stroke:#280000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
             </g>
           </g>
+          <rect
+             style="opacity:1;fill:none;fill-opacity:1;stroke:#28f028;stroke-width:2.06451583;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             id="rect4296"
+             width="61.935482"
+             height="61.935486"
+             x="-0.49192765"
+             y="3.7009914" />
+          <g
+             id="g4269"
+             transform="matrix(0.87472025,0.22219522,-0.22219522,0.87472025,11.525529,2.3426319)">
+            <path
+               sodipodi:nodetypes="cccccccc"
+               inkscape:connector-curvature="0"
+               id="path3948-2-1-0-8"
+               d="m 31.512276,35.479866 4.318399,-7.142001 -3.901088,0.940147 -4.088616,-15.284724 -3.901091,0.94015 4.088609,15.284721 -3.901088,0.940149 z"
+               style="fill:#ef2929;stroke:#280000;stroke-width:1.99171829;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
+            <g
+               transform="matrix(1.1960056,0,0,1.1960056,0.20498716,14.286319)"
+               id="g6084">
+              <g
+                 id="g4374-7-3-1"
+                 transform="translate(2.8207584,-58.52331)">
+                <path
+                   sodipodi:nodetypes="ccccc"
+                   inkscape:connector-curvature="0"
+                   style="fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#0b1521;stroke-width:1.51200366px;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+                   d="M 6.9706404,52.685246 19.987289,51.841938 27.021708,46.315264 14.596131,47.008379 Z"
+                   id="path22256-8-1-9-3-7-9" />
+                <path
+                   sodipodi:nodetypes="ccccc"
+                   inkscape:connector-curvature="0"
+                   style="fill:url(#linearGradient6035);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:1.36805511px;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+                   d="M 27.206541,46.272255 30.459393,58.794171 23.4571,65.314401 20.094403,51.998224 Z"
+                   id="path22258-0-2-2-6-5-4" />
+                <path
+                   inkscape:connector-curvature="0"
+                   style="fill:url(#linearGradient6037);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:1.36805511px;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+                   d="M 6.6999587,52.827069 20.094403,51.998224 23.4571,65.314401 10.051218,66.097952 Z"
+                   id="path22260-6-7-0-1-9-7" />
+                <path
+                   inkscape:connector-curvature="0"
+                   style="fill:none;stroke:#729fcf;stroke-width:1.33466935px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+                   d="M 8.5324364,54.247658 11.134264,64.550814 21.577434,63.931405 18.975607,53.628248 Z"
+                   id="path22262-3-0-2-2-2-8" />
+                <path
+                   sodipodi:nodetypes="ccccc"
+                   inkscape:connector-curvature="0"
+                   style="fill:none;stroke:#3465a4;stroke-width:1.33466935px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+                   d="m 21.756131,52.742657 2.450838,9.894492 4.794109,-4.22292 -2.615142,-9.776118 z"
+                   id="path22264-5-9-3-9-2-4" />
+              </g>
+              <g
+                 id="g6079"
+                 transform="translate(-1.7900552,-4.195442)">
+                <g
+                   transform="translate(-26.571133,-0.61533142)"
+                   id="g6068">
+                  <path
+                     sodipodi:nodetypes="ccc"
+                     inkscape:connector-curvature="0"
+                     style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ef2929;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+                     d="M 41.542254,12.248045 54.558902,11.404737 61.817078,4.9270959"
+                     id="path22256-8-1-7-3-8-5" />
+                </g>
+                <path
+                   id="path22256-8-1-7-5-1-9-0"
+                   d="M 15.004974,11.689854 28.021623,10.846546 35.111981,4.5367229"
+                   style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#a40000;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+                   inkscape:connector-curvature="0"
+                   sodipodi:nodetypes="ccc" />
+              </g>
+            </g>
+          </g>
         </g>
       </g>
     </g>
diff --git a/Gui/Resources/icons/constraints/Assembly_ConstraintOrientation.svg b/Gui/Resources/icons/constraints/Assembly_ConstraintOrientation.svg
index 979f638..41f874a 100644
--- a/Gui/Resources/icons/constraints/Assembly_ConstraintOrientation.svg
+++ b/Gui/Resources/icons/constraints/Assembly_ConstraintOrientation.svg
@@ -10,8 +10,8 @@
    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="68.26667"
-   height="68.26667"
+   width="64"
+   height="64"
    id="svg2980"
    sodipodi:version="0.32"
    inkscape:version="0.91 r13725"
@@ -325,7 +325,7 @@
        x2="21.165751"
        y2="55.146343"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="rotate(179.46257,19.626676,37.92588)" />
+       gradientTransform="matrix(-0.99995601,0.00937979,-0.00937979,-0.99995601,39.608225,75.665998)" />
     <linearGradient
        id="linearGradient3193">
       <stop
@@ -540,7 +540,7 @@
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient3777"
-       id="linearGradient4496"
+       id="linearGradient4332"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.80780369,-0.2039924,0.2067134,0.81857872,-10.277943,101.69836)"
        x1="57.044537"
@@ -550,7 +550,7 @@
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient3767"
-       id="linearGradient4498"
+       id="linearGradient4334"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.80780369,-0.2039924,0.2067134,0.81857872,-10.277943,101.69836)"
        x1="43.76701"
@@ -560,7 +560,7 @@
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient3777"
-       id="linearGradient4496-9"
+       id="linearGradient4332-3"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.80780369,-0.2039924,0.2067134,0.81857872,-10.277943,101.69836)"
        x1="57.044537"
@@ -570,7 +570,7 @@
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient3767"
-       id="linearGradient4498-6"
+       id="linearGradient4334-2"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.80780369,-0.2039924,0.2067134,0.81857872,-10.277943,101.69836)"
        x1="43.76701"
@@ -585,9 +585,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="4.4525632"
-     inkscape:cx="33.052032"
-     inkscape:cy="16.380954"
+     inkscape:zoom="6.2968753"
+     inkscape:cx="9.0286501"
+     inkscape:cy="45.362354"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
@@ -652,134 +652,148 @@
   <g
      id="layer1"
      inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     inkscape:groupmode="layer"
+     transform="translate(0,-4.2666702)">
     <g
        id="g3760-8"
        transform="matrix(0.39800085,0,0,0.49338099,19.957555,-4.8837086)" />
+    <rect
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#28f028;stroke-width:2.06451583;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4296"
+       width="61.935482"
+       height="61.935486"
+       x="1.0322579"
+       y="5.2989264" />
     <g
-       id="g4410"
-       transform="translate(-1.7967179,4.3794999)">
+       id="g4255"
+       transform="matrix(0.94993112,0.01143908,-0.01143908,0.94993112,-28.851634,-19.361357)">
       <g
-         id="g4514-9"
+         id="g4514-9-1"
          style="opacity:1"
-         transform="matrix(1.2224006,-0.01290286,0.01290286,1.2224006,21.542387,-16.333334)">
+         transform="matrix(1.2224006,-0.01290286,0.01290286,1.2224006,19.642824,-10.260791)">
         <g
-           id="g4374-7"
+           id="g4374-7-8"
            transform="translate(6.5545902,-3.8235109)">
           <path
              sodipodi:nodetypes="ccccc"
              inkscape:connector-curvature="0"
              style="fill:#3465a4;fill-opacity:1;fill-rule:nonzero;stroke:#0b1521;stroke-width:1.51200366px;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
              d="M 6.9706404,52.685246 19.987289,51.841938 27.021708,46.315264 14.596131,47.008379 Z"
-             id="path22256-8-1-9-3" />
+             id="path22256-8-1-9-3-7" />
           <path
              sodipodi:nodetypes="ccccc"
              inkscape:connector-curvature="0"
-             style="fill:url(#linearGradient4496);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:1.36805511px;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             style="fill:url(#linearGradient4332);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:1.36805511px;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
              d="M 27.206541,46.272255 30.459393,58.794171 23.4571,65.314401 20.094403,51.998224 Z"
-             id="path22258-0-2-2-6" />
+             id="path22258-0-2-2-6-92" />
           <path
              inkscape:connector-curvature="0"
-             style="fill:url(#linearGradient4498);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:1.36805511px;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             style="fill:url(#linearGradient4334);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:1.36805511px;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
              d="M 6.6999587,52.827069 20.094403,51.998224 23.4571,65.314401 10.051218,66.097952 Z"
-             id="path22260-6-7-0-1" />
+             id="path22260-6-7-0-1-0" />
           <path
              inkscape:connector-curvature="0"
              style="fill:none;stroke:#729fcf;stroke-width:1.33466935px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
              d="M 8.5324364,54.247658 11.134264,64.550814 21.577434,63.931405 18.975607,53.628248 Z"
-             id="path22262-3-0-2-2" />
+             id="path22262-3-0-2-2-23" />
           <path
              sodipodi:nodetypes="ccccc"
              inkscape:connector-curvature="0"
              style="fill:none;stroke:#3465a4;stroke-width:1.33466935px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
              d="m 21.756131,52.742657 2.450838,9.894492 4.794109,-4.22292 -2.615142,-9.776118 z"
-             id="path22264-5-9-3-9" />
+             id="path22264-5-9-3-9-75" />
         </g>
         <path
            sodipodi:nodetypes="ccccc"
            inkscape:connector-curvature="0"
            style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ef2929;stroke-width:3;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
            d="M 13.516178,49.006572 26.532827,48.163264 33.567246,42.63659 21.141669,43.329705 Z"
-           id="path22256-8-1-7-3" />
+           id="path22256-8-1-7-3-9" />
         <path
            sodipodi:nodetypes="ccccc"
            inkscape:connector-curvature="0"
            style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#a40000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
            d="m 13.484495,48.919066 13.016649,-0.843308 7.034419,-5.526674 -12.425577,0.693115 z"
-           id="path22256-8-1-7-5-1" />
+           id="path22256-8-1-7-5-1-2" />
       </g>
       <g
-         transform="matrix(0.9999443,-0.01055476,0.01055476,0.9999443,43.612087,-57.974537)"
-         id="g4416-9">
+         id="g3146-7-7-3"
+         transform="matrix(-0.96451294,-0.26403557,-0.26403557,0.96451294,77.225742,7.7494967)">
+        <g
+           transform="matrix(-2.0550338,1.2015287,-1.1864744,-2.0811088,4.4962146,96.61577)"
+           id="g3165-0-0-6" />
         <path
-           style="opacity:1;fill:#ef2929;stroke:#280000;stroke-width:2.13333344;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
-           d="M 0.63482382,73.8972 -4.0199782,81.659469 0.11904373,80.623649 4.2623189,97.179733 8.4013508,96.143912 4.2580667,79.587828 8.3970885,78.552006 Z"
-           id="path3948-2-2-0-7-4"
+           sodipodi:nodetypes="cccccccc"
            inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccc" />
+           id="path3948-2-9-9-7"
+           d="M 24.732011,29.875651 26.928162,38.071805 23.464061,36.071806 19.464067,43 15.999965,41 19.99996,34.071806 16.535859,32.071807 Z"
+           style="fill:#ef2929;stroke:#280000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
       </g>
     </g>
     <g
-       id="g4410-9"
-       transform="translate(-33.800217,-11.286845)">
+       id="g4255-2"
+       transform="matrix(0.94993112,0.01143908,-0.01143908,0.94993112,-3.0345959,-0.48426843)">
       <g
-         id="g4514-9-3"
+         id="g4514-9-1-7"
          style="opacity:1"
-         transform="matrix(1.2224006,-0.01290286,0.01290286,1.2224006,21.542387,-16.333334)">
+         transform="matrix(1.2224006,-0.01290286,0.01290286,1.2224006,19.642824,-10.260791)">
         <g
-           id="g4374-7-1"
+           id="g4374-7-8-0"
            transform="translate(6.5545902,-3.8235109)">
           <path
              sodipodi:nodetypes="ccccc"
              inkscape:connector-curvature="0"
              style="fill:#3465a4;fill-opacity:1;fill-rule:nonzero;stroke:#0b1521;stroke-width:1.51200366px;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
              d="M 6.9706404,52.685246 19.987289,51.841938 27.021708,46.315264 14.596131,47.008379 Z"
-             id="path22256-8-1-9-3-9" />
+             id="path22256-8-1-9-3-7-9" />
           <path
              sodipodi:nodetypes="ccccc"
              inkscape:connector-curvature="0"
-             style="fill:url(#linearGradient4496-9);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:1.36805511px;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             style="fill:url(#linearGradient4332-3);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:1.36805511px;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
              d="M 27.206541,46.272255 30.459393,58.794171 23.4571,65.314401 20.094403,51.998224 Z"
-             id="path22258-0-2-2-6-4" />
+             id="path22258-0-2-2-6-92-3" />
           <path
              inkscape:connector-curvature="0"
-             style="fill:url(#linearGradient4498-6);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:1.36805511px;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             style="fill:url(#linearGradient4334-2);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:1.36805511px;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
              d="M 6.6999587,52.827069 20.094403,51.998224 23.4571,65.314401 10.051218,66.097952 Z"
-             id="path22260-6-7-0-1-7" />
+             id="path22260-6-7-0-1-0-6" />
           <path
              inkscape:connector-curvature="0"
              style="fill:none;stroke:#729fcf;stroke-width:1.33466935px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
              d="M 8.5324364,54.247658 11.134264,64.550814 21.577434,63.931405 18.975607,53.628248 Z"
-             id="path22262-3-0-2-2-8" />
+             id="path22262-3-0-2-2-23-0" />
           <path
              sodipodi:nodetypes="ccccc"
              inkscape:connector-curvature="0"
              style="fill:none;stroke:#3465a4;stroke-width:1.33466935px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
              d="m 21.756131,52.742657 2.450838,9.894492 4.794109,-4.22292 -2.615142,-9.776118 z"
-             id="path22264-5-9-3-9-4" />
+             id="path22264-5-9-3-9-75-6" />
         </g>
         <path
            sodipodi:nodetypes="ccccc"
            inkscape:connector-curvature="0"
            style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ef2929;stroke-width:3;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
            d="M 13.516178,49.006572 26.532827,48.163264 33.567246,42.63659 21.141669,43.329705 Z"
-           id="path22256-8-1-7-3-5" />
+           id="path22256-8-1-7-3-9-2" />
         <path
            sodipodi:nodetypes="ccccc"
            inkscape:connector-curvature="0"
            style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#a40000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
            d="m 13.484495,48.919066 13.016649,-0.843308 7.034419,-5.526674 -12.425577,0.693115 z"
-           id="path22256-8-1-7-5-1-0" />
+           id="path22256-8-1-7-5-1-2-6" />
       </g>
       <g
-         transform="matrix(0.9999443,-0.01055476,0.01055476,0.9999443,43.612087,-57.974537)"
-         id="g4416-9-3">
+         id="g3146-7-7-3-1"
+         transform="matrix(-0.96451294,-0.26403557,-0.26403557,0.96451294,77.225742,7.7494967)">
+        <g
+           transform="matrix(-2.0550338,1.2015287,-1.1864744,-2.0811088,4.4962146,96.61577)"
+           id="g3165-0-0-6-8" />
         <path
-           style="opacity:1;fill:#ef2929;stroke:#280000;stroke-width:2.13333344;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
-           d="M 0.63482382,73.8972 -4.0199782,81.659469 0.11904373,80.623649 4.2623189,97.179733 8.4013508,96.143912 4.2580667,79.587828 8.3970885,78.552006 Z"
-           id="path3948-2-2-0-7-4-6"
+           sodipodi:nodetypes="cccccccc"
            inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccc" />
+           id="path3948-2-9-9-7-7"
+           d="M 24.732011,29.875651 26.928162,38.071805 23.464061,36.071806 19.464067,43 15.999965,41 19.99996,34.071806 16.535859,32.071807 Z"
+           style="fill:#ef2929;stroke:#280000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
       </g>
     </g>
   </g>
diff --git a/Gui/Resources/icons/constraints/Assembly_ConstraintPointInPlane.svg b/Gui/Resources/icons/constraints/Assembly_ConstraintPointInPlane.svg
index e1ae112..110392e 100644
--- a/Gui/Resources/icons/constraints/Assembly_ConstraintPointInPlane.svg
+++ b/Gui/Resources/icons/constraints/Assembly_ConstraintPointInPlane.svg
@@ -10,8 +10,8 @@
    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="68.26667"
-   height="68.26667"
+   width="64"
+   height="64"
    id="svg2980"
    sodipodi:version="0.32"
    inkscape:version="0.91 r13725"
@@ -345,7 +345,7 @@
        x2="21.165751"
        y2="55.146343"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="rotate(179.46257,19.626676,37.92588)" />
+       gradientTransform="matrix(-0.99995601,0.00937979,-0.00937979,-0.99995601,39.608225,75.665998)" />
     <linearGradient
        id="linearGradient3193">
       <stop
@@ -401,17 +401,6 @@
        y1="35"
        x2="85"
        y2="35" />
-    <radialGradient
-       r="22"
-       fy="91.956673"
-       fx="225.93762"
-       cy="91.956673"
-       cx="225.93762"
-       gradientTransform="matrix(-0.93969836,-1.9200202,-0.63542048,0.16481082,226.45157,453.50979)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient3127"
-       xlink:href="#linearGradient3021"
-       inkscape:collect="always" />
     <linearGradient
        inkscape:collect="always"
        id="linearGradient3021">
@@ -456,7 +445,8 @@
        y1="59.751236"
        x2="22.802336"
        y2="43.771011"
-       gradientUnits="userSpaceOnUse" />
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9,0,0,0.9,-0.05239719,4.2312208)" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient3777"
@@ -465,7 +455,19 @@
        y1="55.613235"
        x2="41.964294"
        y2="41.21521"
-       gradientUnits="userSpaceOnUse" />
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9,0,0,0.9,-0.05239719,4.2312208)" />
+    <radialGradient
+       r="22"
+       fy="91.956673"
+       fx="225.93762"
+       cy="91.956673"
+       cx="225.93762"
+       gradientTransform="matrix(-0.88096721,-1.8000189,-0.5957067,0.15451014,212.29835,425.16543)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3127-3"
+       xlink:href="#linearGradient3021"
+       inkscape:collect="always" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -474,9 +476,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="3.1601563"
-     inkscape:cx="-33.874218"
-     inkscape:cy="22.576892"
+     inkscape:zoom="6.3203126"
+     inkscape:cx="-8.2963328"
+     inkscape:cy="10.362885"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
@@ -541,93 +543,102 @@
   <g
      id="layer1"
      inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     inkscape:groupmode="layer"
+     transform="translate(0,-4.2666702)">
     <g
        id="g3760-8"
        transform="matrix(0.39800085,0,0,0.49338099,19.957555,-4.8837086)" />
     <g
-       id="g4898">
+       id="g4253"
+       transform="translate(2.8479604,-0.31644004)">
       <path
          inkscape:connector-curvature="0"
-         style="fill:#ef5050;fill-opacity:1;fill-rule:nonzero;stroke:#0b1521;stroke-width:2.69742155px;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="m 12.001128,37.257417 23.766354,5.007871 20.938601,-5.670781 -21.10182,-5.047384 z"
-         id="path22256-9" />
+         style="fill:url(#linearGradient4270);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:2.22611189px;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 50.241183,37.944118 -2e-4,17.058009 -17.783715,8.867255 -0.221396,-18.151559 z"
+         id="path22258-6"
+         sodipodi:nodetypes="ccccc" />
       <path
          inkscape:connector-curvature="0"
-         style="fill:url(#linearGradient4270);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:2.47345757px;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 56.687937,36.417984 57.024233,59.137018 36.12185,66.264623 35.751546,41.248158 Z"
-         id="path22258-6" />
+         style="fill:url(#linearGradient4262);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:2.22611189px;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 10.764949,41.648312 21.359045,3.957632 0.333274,18.263438 -21.360179,-3.810457 z"
+         id="path22260-7"
+         sodipodi:nodetypes="ccccc" />
       <path
          inkscape:connector-curvature="0"
-         style="fill:url(#linearGradient4262);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:2.47345757px;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="m 12.019273,37.099408 23.732273,4.14875 0.370304,25.016465 -23.733532,-4.233841 z"
-         id="path22260-7" />
+         style="fill:none;stroke:#729fcf;stroke-width:2.17178631px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 13.116649,44.494669 0.257863,13.504697 16.642916,2.953946 -0.257864,-13.616577 z"
+         id="path22262-6"
+         sodipodi:nodetypes="ccccc" />
       <path
          inkscape:connector-curvature="0"
-         style="fill:none;stroke:#729fcf;stroke-width:2.41309595px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="m 14.632273,40.386336 0.286515,19.356047 18.492129,3.282163 -0.286516,-19.356049 z"
-         id="path22262-6" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:none;stroke:#3465a4;stroke-width:2.41309595px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 38.34574,43.264823 38.626261,62.21593 54.334941,57.358956 54.080793,40.189574 Z"
-         id="path22264-7" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         style="fill:none;stroke:#cc0000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 11.779379,37.379484 35.614101,41.202089 56.796756,36.546045 35.448108,31.344561 Z"
-         id="path22268-1" />
+         style="fill:none;stroke:#3465a4;stroke-width:2.17178631px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 34.458769,47.420942 34.711238,60.225558 47.97884,53.639201 48.05295,41.319354 Z"
+         id="path22264-7"
+         sodipodi:nodetypes="ccccc" />
     </g>
+    <path
+       id="path22268-1"
+       d="M 12.711943,41.555462 34.896768,45.091366 53.419002,37.635664 31.185819,33.76682 Z"
+       style="fill:#ef5050;fill-opacity:1;stroke:#cc0000;stroke-width:2.89620996;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
+    <rect
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#28f028;stroke-width:2.06451583;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4296"
+       width="61.935482"
+       height="61.935486"
+       x="1.0322579"
+       y="5.2989264" />
     <g
-       id="g4227"
-       transform="matrix(0.90036698,0.22666166,-0.22242701,0.8835457,11.834702,-9.5090261)">
+       id="g4492"
+       transform="matrix(0.87056371,0.22829548,-0.22829548,0.87056371,12.135481,-1.1570948)">
       <g
-         transform="matrix(0.87976752,-0.47540416,0.47540416,0.87976752,50.465465,-22.942804)"
-         id="g4432">
+         transform="matrix(0.87976752,-0.47540416,0.47540416,0.87976752,47.31137,-21.508877)"
+         id="g4432-5">
         <path
-           style="fill:url(#radialGradient3127);fill-opacity:1;stroke:#0b1521;stroke-width:2.13333344;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M -42.526316,45.186029 -56.204471,19.382357 c -0.04019,-3.943857 27.39039,-3.785658 27.430576,0.158199 z"
-           id="path3039"
+           style="fill:url(#radialGradient3127-3);fill-opacity:1;stroke:#0b1521;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="M -39.868421,42.361902 -52.691692,18.17096 c -0.03768,-3.697366 25.678491,-3.549055 25.716165,0.148311 z"
+           id="path3039-3"
            inkscape:connector-curvature="0"
            sodipodi:nodetypes="cccc" />
         <path
-           style="fill:none;stroke:#729fcf;stroke-width:2.13333344;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M -42.372427,40.573052 -53.645215,19.642771 c 2.003477,-2.256672 20.108939,-1.695945 22.491069,0.41306 z"
-           id="path3817"
+           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 -39.72415,38.037236 -50.292389,18.415098 c 1.87826,-2.11563 18.85213,-1.589949 21.085377,0.387244 z"
+           id="path3817-5"
            inkscape:connector-curvature="0"
            sodipodi:nodetypes="cccc" />
         <path
-           style="fill:none;stroke:#729fcf;stroke-width:2.46068692;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.5;stroke-dashoffset:20.39999962;stroke-opacity:1"
-           d="m -32.771287,22.133487 c -2.879328,1.788465 -5.594891,2.162603 -9.913888,2.162613 -4.318998,1.1e-5 -6.378217,-0.612771 -9.257556,-2.401221"
-           id="path2994-3-6-9-6-9-5"
+           style="fill:none;stroke:#729fcf;stroke-width:2.30689406;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.5;stroke-dashoffset:20.39999962;stroke-opacity:1"
+           d="m -30.723082,20.750144 c -2.69937,1.676686 -5.24521,2.02744 -9.29427,2.02745 -4.04906,10e-6 -5.979578,-0.574473 -8.678958,-2.251145"
+           id="path2994-3-6-9-6-9-5-6"
            inkscape:connector-curvature="0"
            sodipodi:nodetypes="csc" />
         <ellipse
-           ry="4.1820979"
-           rx="14.022541"
-           cy="18.375084"
-           cx="-42.536068"
-           style="fill:#729fcf;stroke:#0b1521;stroke-width:2.00178051;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.5;stroke-dasharray:none;stroke-dashoffset:20.39999962;stroke-opacity:1"
-           id="path2994-2-1"
-           transform="matrix(1,-2.8925305e-6,2.8925305e-6,1,0,0)" />
+           ry="3.9207168"
+           rx="13.146132"
+           cy="17.226641"
+           cx="-39.877563"
+           style="fill:#729fcf;stroke:#0b1521;stroke-width:1.87666917;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.5;stroke-dasharray:none;stroke-dashoffset:20.39999962;stroke-opacity:1"
+           id="path2994-2-1-2"
+           transform="matrix(1,-2.8925305e-6,2.2876546e-6,1,0,0)" />
       </g>
       <g
-         id="g4174"
-         transform="matrix(0.49485597,0,0,0.49368903,-0.16653181,21.833668)">
+         id="g4174-9"
+         transform="matrix(0.49485597,0,0,0.49368903,-0.15612357,20.469064)">
         <circle
-           id="path3025"
-           style="fill:#3b2929;fill-opacity:1;stroke:#120000;stroke-width:5.61094427;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4.5;stroke-dasharray:none;stroke-opacity:1"
-           cx="70.400002"
-           cy="32"
-           r="12.8" />
-        <ellipse
-           id="path3025-3"
-           style="fill:#cc0000;stroke:#ef5050;stroke-width:2.80547214;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4.5;stroke-dasharray:none;stroke-opacity:1"
-           cx="70.339195"
-           cy="31.969469"
-           rx="9.8075676"
-           ry="9.8307495" />
+           transform="translate(35,-1)"
+           id="path3025-1"
+           style="fill:#3b2929;fill-opacity:1;stroke:#120000;stroke-width:5.26026011;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4.5;stroke-dasharray:none;stroke-opacity:1"
+           cx="31"
+           cy="31"
+           r="12" />
+        <circle
+           transform="matrix(0.76621621,0,0,0.76802732,42.190296,6.1625307)"
+           id="path3025-3-2"
+           style="fill:#cc0000;stroke:#ef5050;stroke-width:3.4285717;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4.5;stroke-dasharray:none;stroke-opacity:1"
+           cx="31"
+           cy="31"
+           r="12" />
       </g>
     </g>
   </g>
diff --git a/Gui/Resources/icons/constraints/Assembly_ConstraintPointOnCircle.svg b/Gui/Resources/icons/constraints/Assembly_ConstraintPointOnCircle.svg
index 723eb1e..b274bd2 100644
--- a/Gui/Resources/icons/constraints/Assembly_ConstraintPointOnCircle.svg
+++ b/Gui/Resources/icons/constraints/Assembly_ConstraintPointOnCircle.svg
@@ -377,7 +377,7 @@
        y2="35"
        gradientUnits="userSpaceOnUse"
        spreadMethod="reflect"
-       gradientTransform="matrix(0.99650198,0,0,0.91410629,-60.274722,17.23538)" />
+       gradientTransform="matrix(0.99650198,0,0,0.91410629,-60.116502,15.33674)" />
     <linearGradient
        inkscape:collect="always"
        id="linearGradient3801-6-7">
@@ -456,7 +456,7 @@
        x2="0.18112336"
        y2="55.323574"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.81027014,0,0,0.60950883,42.192562,10.158959)" />
+       gradientTransform="matrix(0.81027014,0,0,0.60950883,42.350782,8.2603187)" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -466,8 +466,8 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="6.3203125"
-     inkscape:cx="23.029256"
-     inkscape:cy="30.268721"
+     inkscape:cx="5.9782458"
+     inkscape:cy="30.643974"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
@@ -534,39 +534,39 @@
        transform="matrix(0.39800085,0,0,0.49338099,18.710208,-4.5784768)" />
     <path
        style="fill:#729fcf;stroke:#0b1521;stroke-width:1.80540073;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.5;stroke-dasharray:none;stroke-dashoffset:20.39999962;stroke-opacity:1"
-       d="m 54.435773,50.961768 c 0.04064,3.707846 -9.669539,7.273447 -21.873542,7.273447 -12.204003,0 -22.321059,-3.565379 -22.321059,-7.273447 l -0.07911,-14.9901 44.115491,0.55377 z"
+       d="m 54.593993,49.063128 c 0.04064,3.707846 -9.669539,7.273447 -21.873542,7.273447 -12.204003,0 -22.321059,-3.565379 -22.321059,-7.273447 l -0.07911,-14.9901 44.115491,0.55377 z"
        id="path2994-3-3-6"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="sscccs" />
     <path
        style="fill:url(#linearGradient3807-3-6);fill-opacity:1;stroke:#729fcf;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.5;stroke-dasharray:none;stroke-dashoffset:20.39999962;stroke-opacity:1"
-       d="m 51.967641,50.021335 c 0.02641,3.67152 -13.202905,5.39815 -19.725894,5.39815 -6.522558,0 -19.409454,-1.72653 -19.409454,-5.39815 l -0.14617,-8.934567 39.210582,-0.928718 z"
+       d="m 52.125861,48.122695 c 0.02641,3.67152 -13.202905,5.39815 -19.725894,5.39815 -6.522558,0 -19.409454,-1.72653 -19.409454,-5.39815 l -0.14617,-8.934567 39.210582,-0.928718 z"
        id="path2994-3-6-5-2"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="sscccs" />
     <path
        style="fill:none;stroke:#729fcf;stroke-width:5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.5;stroke-dasharray:none;stroke-dashoffset:20.39999962;stroke-opacity:1"
-       d="m 50.720946,40.47219 c -5.362561,3.550967 -12.290402,4.036217 -18.316938,4.036217 -6.026537,0 -14.694797,0.291988 -18.712488,-4.115327"
+       d="m 50.879166,38.57355 c -5.362561,3.550967 -12.290402,4.036217 -18.316938,4.036217 -6.026537,0 -14.694797,0.291988 -18.712488,-4.115327"
        id="path2994-3-6-9-6-9"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="csc" />
     <ellipse
        ry="8.002346"
        rx="21.890471"
-       cy="35.716652"
-       cx="32.258514"
+       cy="33.818012"
+       cx="32.416733"
        style="fill:#ef5050;fill-opacity:1;stroke:#cc0000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.5;stroke-dasharray:none;stroke-dashoffset:20.39999962;stroke-opacity:1"
        id="path2994-2" />
     <ellipse
        ry="4.8775001"
        rx="17.737194"
-       cy="35.585625"
-       cx="32.678787"
+       cy="33.686985"
+       cx="32.837006"
        style="fill:url(#linearGradient4490);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.5;stroke-dasharray:none;stroke-dashoffset:20.39999962;stroke-opacity:1"
        id="path2994-2-6" />
     <g
        id="g4492"
-       transform="matrix(0.96729301,0.25366164,-0.25366164,0.96729301,10.00097,-1.5729762)">
+       transform="matrix(0.96729301,0.25366164,-0.25366164,0.96729301,10.15919,-3.4716165)">
       <g
          transform="matrix(0.87976752,-0.47540416,0.47540416,0.87976752,47.31137,-21.508877)"
          id="g4432">
@@ -616,5 +616,12 @@
            r="12" />
       </g>
     </g>
+    <rect
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#28f028;stroke-width:2.06451583;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4296"
+       width="61.935482"
+       height="61.935486"
+       x="1.0322579"
+       y="1.0322562" />
   </g>
 </svg>
diff --git a/Gui/Resources/icons/constraints/Assembly_ConstraintPointPlaneDistance.svg b/Gui/Resources/icons/constraints/Assembly_ConstraintPointPlaneDistance.svg
index ee5a132..671596d 100644
--- a/Gui/Resources/icons/constraints/Assembly_ConstraintPointPlaneDistance.svg
+++ b/Gui/Resources/icons/constraints/Assembly_ConstraintPointPlaneDistance.svg
@@ -10,8 +10,8 @@
    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="68.26667"
-   height="68.26667"
+   width="64"
+   height="64"
    id="svg2980"
    sodipodi:version="0.32"
    inkscape:version="0.91 r13725"
@@ -345,7 +345,7 @@
        x2="21.165751"
        y2="55.146343"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="rotate(179.46257,19.626676,37.92588)" />
+       gradientTransform="matrix(-0.99995601,0.00937979,-0.00937979,-0.99995601,39.608225,75.665998)" />
     <linearGradient
        id="linearGradient3193">
       <stop
@@ -475,9 +475,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="1.5800781"
-     inkscape:cx="-168.69974"
-     inkscape:cy="-61.937357"
+     inkscape:zoom="4.4691358"
+     inkscape:cx="-24.861153"
+     inkscape:cy="-5.173004"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
@@ -542,13 +542,62 @@
   <g
      id="layer1"
      inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     inkscape:groupmode="layer"
+     transform="translate(0,-4.2666702)">
     <g
        id="g3760-8"
        transform="matrix(0.39800085,0,0,0.49338099,19.957555,-4.8837086)" />
+    <g
+       id="g4242"
+       transform="matrix(0.88512951,-0.18212897,0.13904021,0.6757222,1.5657805,40.371757)">
+      <g
+         transform="matrix(0.97634224,0.21623093,-0.21623093,0.97634224,4.6115742,5.372201)"
+         style="opacity:0.8"
+         id="g3809">
+        <path
+           style="opacity:1;fill:url(#linearGradient3789);fill-opacity:1;fill-rule:evenodd;stroke:#280000;stroke-width:2.27971435;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="M 27.000001,3 61,9 61,9 39,31 3,25 Z"
+           id="path4225-1-7"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cccccc" />
+        <path
+           style="fill:none;stroke:#ef2929;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="M 27.610169,5.1440678 56.868167,10.287637 38.322034,28.855932 7.3728814,23.711864 Z"
+           id="path4225-1-7-1"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc" />
+      </g>
+      <g
+         transform="matrix(0.97650191,0.21550873,-0.21550873,0.97650191,4.6183399,5.2009574)"
+         style="opacity:0.8;fill:none"
+         id="g3809-1">
+        <path
+           style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#280000;stroke-width:2.27971435;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="M 27.000001,3 61,9 61,9 39,31 3,25 Z"
+           id="path4225-1-7-15"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cccccc" />
+      </g>
+    </g>
+    <g
+       id="g4282"
+       transform="matrix(-0.17009639,-0.88378007,0.88378007,-0.17009639,-110.67876,-26.329443)">
+      <path
+         sodipodi:nodetypes="ccccccccccc"
+         inkscape:connector-curvature="0"
+         id="path3948-2-3-6"
+         d="m -104.89764,148.21724 -0.0597,6.36504 -11.24614,-9.51561 11.19671,-9.43124 0.16877,6.23124 11.268048,0.11934 -0.05967,-6.28067 10.49589,9.66991 -10.674895,9.23175 -0.126577,-6.18605 z"
+         style="fill:url(#linearGradient3935);fill-opacity:1;stroke:#280000;stroke-width:2.13333344;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cccccc"
+         inkscape:connector-curvature="0"
+         id="path3159"
+         d="m -112.64969,145.06667 5.6212,-4.85599 0.11934,3.72965 15.174218,0.0596 0.06564,-3.71217 5.143219,5.08142"
+         style="fill:none;stroke:#ef2929;stroke-width:2.13333344;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+    </g>
     <g
        id="g4252"
-       transform="translate(-1.2657602,-2.8479605)">
+       transform="matrix(0.9,0,0,0.9,3.0021733,5.263701)">
       <g
          id="g4197"
          transform="matrix(-0.18158995,0.73934328,-0.73759979,-0.18116175,71.521849,-35.535044)">
@@ -590,53 +639,12 @@
            cy="31.969469" />
       </g>
     </g>
-    <g
-       id="g4242"
-       transform="matrix(0.98347723,-0.20236552,0.15448912,0.75080244,0.59404895,40.387511)">
-      <g
-         transform="matrix(0.97634224,0.21623093,-0.21623093,0.97634224,4.6115742,5.372201)"
-         style="opacity:0.8"
-         id="g3809">
-        <path
-           style="opacity:1;fill:url(#linearGradient3789);fill-opacity:1;fill-rule:evenodd;stroke:#280000;stroke-width:2.27971435;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 27.000001,3 61,9 61,9 39,31 3,25 Z"
-           id="path4225-1-7"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccc" />
-        <path
-           style="fill:none;stroke:#ef2929;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 27.610169,5.1440678 56.868167,10.287637 38.322034,28.855932 7.3728814,23.711864 Z"
-           id="path4225-1-7-1"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-      </g>
-      <g
-         transform="matrix(0.97650191,0.21550873,-0.21550873,0.97650191,4.6183399,5.2009574)"
-         style="opacity:0.8;fill:none"
-         id="g3809-1">
-        <path
-           style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#280000;stroke-width:2.27971435;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 27.000001,3 61,9 61,9 39,31 3,25 Z"
-           id="path4225-1-7-15"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccc" />
-      </g>
-    </g>
-    <g
-       id="g4282"
-       transform="matrix(-0.18899599,-0.98197786,0.98197786,-0.18899599,-128.2989,-35.51499)">
-      <path
-         sodipodi:nodetypes="ccccccccccc"
-         inkscape:connector-curvature="0"
-         id="path3948-2-3-6"
-         d="m -104.89764,148.21724 -0.0597,6.36504 -11.24614,-9.51561 11.19671,-9.43124 0.16877,6.23124 11.268048,0.11934 -0.05967,-6.28067 10.49589,9.66991 -10.674895,9.23175 -0.126577,-6.18605 z"
-         style="fill:url(#linearGradient3935);fill-opacity:1;stroke:#280000;stroke-width:2.13333344;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="cccccc"
-         inkscape:connector-curvature="0"
-         id="path3159"
-         d="m -112.64969,145.06667 5.6212,-4.85599 0.11934,3.72965 15.174218,0.0596 0.06564,-3.71217 5.143219,5.08142"
-         style="fill:none;stroke:#ef2929;stroke-width:2.13333344;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
-    </g>
+    <rect
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#28f028;stroke-width:2.06451583;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4296"
+       width="61.935482"
+       height="61.935486"
+       x="1.0322579"
+       y="5.2989264" />
   </g>
 </svg>
diff --git a/Gui/Resources/icons/constraints/Assembly_ConstraintPointsDistance.svg b/Gui/Resources/icons/constraints/Assembly_ConstraintPointsDistance.svg
index 4326b3b..e345aa9 100644
--- a/Gui/Resources/icons/constraints/Assembly_ConstraintPointsDistance.svg
+++ b/Gui/Resources/icons/constraints/Assembly_ConstraintPointsDistance.svg
@@ -466,7 +466,7 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="4.4691359"
-     inkscape:cx="-7.6935068"
+     inkscape:cx="21.730526"
      inkscape:cy="4.8745713"
      inkscape:current-layer="layer1"
      showgrid="true"
@@ -530,7 +530,7 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <g
-       transform="matrix(-0.19553641,0.73577775,-0.73404267,-0.19507532,69.220799,-32.656281)"
+       transform="matrix(-0.18575959,0.69898886,-0.69734054,-0.18532155,67.280051,-29.290941)"
        id="g4197-5">
       <g
          transform="matrix(-0.99997493,-0.00709763,0.0070642,-0.99997493,115.52837,115.54154)"
@@ -551,7 +551,7 @@
     </g>
     <g
        id="g4282"
-       transform="matrix(0.22256958,0.93939241,-0.91180739,0.23567624,177.13935,88.425596)">
+       transform="matrix(0.2114411,0.89242279,-0.86621702,0.22389243,169.80267,85.736842)">
       <path
          sodipodi:nodetypes="ccccccccccc"
          inkscape:connector-curvature="0"
@@ -569,7 +569,7 @@
        id="g3760-8"
        transform="matrix(0.39800085,0,0,0.49338099,18.710208,-4.5784768)" />
     <g
-       transform="matrix(0.4081762,-0.27977602,0.27911627,0.40721366,-8.3459103,18.789093)"
+       transform="matrix(0.38776739,-0.26578722,0.26516046,0.38685298,-6.4083221,19.582164)"
        id="g4174">
       <circle
          r="12"
@@ -587,7 +587,7 @@
          transform="matrix(0.76621621,0,0,0.76802732,42.190296,6.1625307)" />
     </g>
     <g
-       transform="matrix(0.18158995,-0.73934328,0.73759979,0.18116175,-3.6846143,98.456349)"
+       transform="matrix(0.17251045,-0.70237612,0.7007198,0.17210366,-1.9800909,95.266057)"
        id="g4197">
       <g
          transform="matrix(-0.99997493,-0.00709763,0.0070642,-0.99997493,115.52837,115.54154)"
@@ -607,7 +607,7 @@
       </g>
     </g>
     <g
-       transform="matrix(0.4081762,-0.27977602,0.27911627,0.40721366,2.3938556,58.789613)"
+       transform="matrix(0.38776739,-0.26578722,0.26516046,0.38685298,3.7944555,57.582658)"
        id="g4174-7">
       <circle
          r="12"
@@ -645,5 +645,12 @@
        height="17.562422"
        x="-62.022247"
        y="-19.698391" />
+    <rect
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#2828ff;stroke-width:2.06451583;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4296"
+       width="61.935482"
+       height="61.935486"
+       x="1.0322579"
+       y="1.0322562" />
   </g>
 </svg>