diff --git a/Resources/Icons/ControlGrid3Star66_3Sub.png b/Resources/Icons/ControlGrid3Star66_3Sub.png
index 7a4c3f6..a060b4c 100644
Binary files a/Resources/Icons/ControlGrid3Star66_3Sub.png and b/Resources/Icons/ControlGrid3Star66_3Sub.png differ
diff --git a/Resources/Icons/ControlGrid3Star66_3Sub.svg b/Resources/Icons/ControlGrid3Star66_3Sub.svg
index 9a0fcf8..916395c 100644
--- a/Resources/Icons/ControlGrid3Star66_3Sub.svg
+++ b/Resources/Icons/ControlGrid3Star66_3Sub.svg
@@ -2,114 +2,175 @@
diff --git a/Resources/Icons/ControlGrid44.png b/Resources/Icons/ControlGrid44.png
index 2d77b90..3651091 100644
Binary files a/Resources/Icons/ControlGrid44.png and b/Resources/Icons/ControlGrid44.png differ
diff --git a/Resources/Icons/ControlGrid44.svg b/Resources/Icons/ControlGrid44.svg
index 692a76e..cdbe95a 100644
--- a/Resources/Icons/ControlGrid44.svg
+++ b/Resources/Icons/ControlGrid44.svg
@@ -2,127 +2,198 @@
diff --git a/Resources/Icons/ControlGrid44_2EdgeSegments.png b/Resources/Icons/ControlGrid44_2EdgeSegments.png
index 395365d..02ba1ba 100644
Binary files a/Resources/Icons/ControlGrid44_2EdgeSegments.png and b/Resources/Icons/ControlGrid44_2EdgeSegments.png differ
diff --git a/Resources/Icons/ControlGrid44_2EdgeSegments.svg b/Resources/Icons/ControlGrid44_2EdgeSegments.svg
index 8fef78c..c7a0759 100644
--- a/Resources/Icons/ControlGrid44_2EdgeSegments.svg
+++ b/Resources/Icons/ControlGrid44_2EdgeSegments.svg
@@ -2,96 +2,213 @@
diff --git a/Resources/Icons/ControlGrid44_EdgeSegment.png b/Resources/Icons/ControlGrid44_EdgeSegment.png
index 62f9e1d..07125a6 100644
Binary files a/Resources/Icons/ControlGrid44_EdgeSegment.png and b/Resources/Icons/ControlGrid44_EdgeSegment.png differ
diff --git a/Resources/Icons/ControlGrid44_EdgeSegment.svg b/Resources/Icons/ControlGrid44_EdgeSegment.svg
index a70e3f9..f319f94 100644
--- a/Resources/Icons/ControlGrid44_EdgeSegment.svg
+++ b/Resources/Icons/ControlGrid44_EdgeSegment.svg
@@ -2,96 +2,213 @@
diff --git a/Resources/Icons/ControlGrid44_Rotate.png b/Resources/Icons/ControlGrid44_Rotate.png
index c303322..8193859 100644
Binary files a/Resources/Icons/ControlGrid44_Rotate.png and b/Resources/Icons/ControlGrid44_Rotate.png differ
diff --git a/Resources/Icons/ControlGrid44_Rotate.svg b/Resources/Icons/ControlGrid44_Rotate.svg
index de8e881..4cc2158 100644
--- a/Resources/Icons/ControlGrid44_Rotate.svg
+++ b/Resources/Icons/ControlGrid44_Rotate.svg
@@ -2,124 +2,198 @@
diff --git a/Resources/Icons/ControlGrid5Star66_5Sub.png b/Resources/Icons/ControlGrid5Star66_5Sub.png
index 7a4c3f6..a060b4c 100644
Binary files a/Resources/Icons/ControlGrid5Star66_5Sub.png and b/Resources/Icons/ControlGrid5Star66_5Sub.png differ
diff --git a/Resources/Icons/ControlGrid5Star66_5Sub.svg b/Resources/Icons/ControlGrid5Star66_5Sub.svg
index 9a0fcf8..916395c 100644
--- a/Resources/Icons/ControlGrid5Star66_5Sub.svg
+++ b/Resources/Icons/ControlGrid5Star66_5Sub.svg
@@ -2,114 +2,175 @@
diff --git a/Resources/Icons/ControlGrid64.png b/Resources/Icons/ControlGrid64.png
index 3a0cff3..3b07e56 100644
Binary files a/Resources/Icons/ControlGrid64.png and b/Resources/Icons/ControlGrid64.png differ
diff --git a/Resources/Icons/ControlGrid64.svg b/Resources/Icons/ControlGrid64.svg
index 54dbbc9..67bfa7d 100644
--- a/Resources/Icons/ControlGrid64.svg
+++ b/Resources/Icons/ControlGrid64.svg
@@ -2,157 +2,187 @@
diff --git a/Resources/Icons/ControlGrid64_2Grid44.png b/Resources/Icons/ControlGrid64_2Grid44.png
index 5d87f0c..bbde97f 100644
Binary files a/Resources/Icons/ControlGrid64_2Grid44.png and b/Resources/Icons/ControlGrid64_2Grid44.png differ
diff --git a/Resources/Icons/ControlGrid64_2Grid44.svg b/Resources/Icons/ControlGrid64_2Grid44.svg
index a370526..2a8ca48 100644
--- a/Resources/Icons/ControlGrid64_2Grid44.svg
+++ b/Resources/Icons/ControlGrid64_2Grid44.svg
@@ -2,163 +2,203 @@
diff --git a/Resources/Icons/ControlGrid64_3_1Grid44.png b/Resources/Icons/ControlGrid64_3_1Grid44.png
index 4103bd4..09c5177 100644
Binary files a/Resources/Icons/ControlGrid64_3_1Grid44.png and b/Resources/Icons/ControlGrid64_3_1Grid44.png differ
diff --git a/Resources/Icons/ControlGrid64_3_1Grid44.svg b/Resources/Icons/ControlGrid64_3_1Grid44.svg
index cdde990..c14ee26 100644
--- a/Resources/Icons/ControlGrid64_3_1Grid44.svg
+++ b/Resources/Icons/ControlGrid64_3_1Grid44.svg
@@ -2,171 +2,227 @@
diff --git a/Resources/Icons/ControlGrid66.png b/Resources/Icons/ControlGrid66.png
index 9ce58b9..e9fd398 100644
Binary files a/Resources/Icons/ControlGrid66.png and b/Resources/Icons/ControlGrid66.png differ
diff --git a/Resources/Icons/ControlGrid66.svg b/Resources/Icons/ControlGrid66.svg
index 8896df7..f1e49af 100644
--- a/Resources/Icons/ControlGrid66.svg
+++ b/Resources/Icons/ControlGrid66.svg
@@ -2,168 +2,116 @@
diff --git a/Resources/Icons/ControlGrid66_4Sub.png b/Resources/Icons/ControlGrid66_4Sub.png
index 9a39560..5992ab9 100644
Binary files a/Resources/Icons/ControlGrid66_4Sub.png and b/Resources/Icons/ControlGrid66_4Sub.png differ
diff --git a/Resources/Icons/ControlGrid66_4Sub.svg b/Resources/Icons/ControlGrid66_4Sub.svg
index ea054c7..6c470d6 100644
--- a/Resources/Icons/ControlGrid66_4Sub.svg
+++ b/Resources/Icons/ControlGrid66_4Sub.svg
@@ -2,297 +2,383 @@
diff --git a/Resources/Icons/ControlGridNStar66.png b/Resources/Icons/ControlGridNStar66.png
index b7d8fee..a16390d 100644
Binary files a/Resources/Icons/ControlGridNStar66.png and b/Resources/Icons/ControlGridNStar66.png differ
diff --git a/Resources/Icons/ControlGridNStar66.svg b/Resources/Icons/ControlGridNStar66.svg
index 0f6123f..306ae2b 100644
--- a/Resources/Icons/ControlGridNStar66.svg
+++ b/Resources/Icons/ControlGridNStar66.svg
@@ -2,169 +2,243 @@
diff --git a/Resources/Icons/ControlPoly4.png b/Resources/Icons/ControlPoly4.png
index c5961d9..b005034 100644
Binary files a/Resources/Icons/ControlPoly4.png and b/Resources/Icons/ControlPoly4.png differ
diff --git a/Resources/Icons/ControlPoly4.svg b/Resources/Icons/ControlPoly4.svg
index 0774599..ccd6f7b 100644
--- a/Resources/Icons/ControlPoly4.svg
+++ b/Resources/Icons/ControlPoly4.svg
@@ -2,62 +2,101 @@
diff --git a/Resources/Icons/ControlPoly4_segment.png b/Resources/Icons/ControlPoly4_segment.png
index e7ed6ae..f89f916 100644
Binary files a/Resources/Icons/ControlPoly4_segment.png and b/Resources/Icons/ControlPoly4_segment.png differ
diff --git a/Resources/Icons/ControlPoly4_segment.svg b/Resources/Icons/ControlPoly4_segment.svg
index 28c3d24..ae36b80 100644
--- a/Resources/Icons/ControlPoly4_segment.svg
+++ b/Resources/Icons/ControlPoly4_segment.svg
@@ -2,85 +2,73 @@
diff --git a/Resources/Icons/ControlPoly6.png b/Resources/Icons/ControlPoly6.png
index 348c712..1e755da 100644
Binary files a/Resources/Icons/ControlPoly6.png and b/Resources/Icons/ControlPoly6.png differ
diff --git a/Resources/Icons/ControlPoly6.svg b/Resources/Icons/ControlPoly6.svg
index e073c4d..cd75df2 100644
--- a/Resources/Icons/ControlPoly6.svg
+++ b/Resources/Icons/ControlPoly6.svg
@@ -2,65 +2,53 @@
diff --git a/Resources/Icons/CubicCurve_4.png b/Resources/Icons/CubicCurve_4.png
index 4ae2607..54ccff0 100644
Binary files a/Resources/Icons/CubicCurve_4.png and b/Resources/Icons/CubicCurve_4.png differ
diff --git a/Resources/Icons/CubicCurve_4.svg b/Resources/Icons/CubicCurve_4.svg
index 23d2df6..c1296cb 100644
--- a/Resources/Icons/CubicCurve_4.svg
+++ b/Resources/Icons/CubicCurve_4.svg
@@ -2,68 +2,61 @@
diff --git a/Resources/Icons/CubicCurve_6.png b/Resources/Icons/CubicCurve_6.png
index 1974ef4..7a420a9 100644
Binary files a/Resources/Icons/CubicCurve_6.png and b/Resources/Icons/CubicCurve_6.png differ
diff --git a/Resources/Icons/CubicCurve_6.svg b/Resources/Icons/CubicCurve_6.svg
index 817888b..80515ea 100644
--- a/Resources/Icons/CubicCurve_6.svg
+++ b/Resources/Icons/CubicCurve_6.svg
@@ -2,71 +2,61 @@
diff --git a/Resources/Icons/CubicNStarSurface_NStar66.png b/Resources/Icons/CubicNStarSurface_NStar66.png
index d71879e..38cbd3a 100644
Binary files a/Resources/Icons/CubicNStarSurface_NStar66.png and b/Resources/Icons/CubicNStarSurface_NStar66.png differ
diff --git a/Resources/Icons/CubicNStarSurface_NStar66.svg b/Resources/Icons/CubicNStarSurface_NStar66.svg
index 8111be8..e69559f 100644
--- a/Resources/Icons/CubicNStarSurface_NStar66.svg
+++ b/Resources/Icons/CubicNStarSurface_NStar66.svg
@@ -2,17 +2,11 @@
diff --git a/Resources/Icons/CubicSurface_44.png b/Resources/Icons/CubicSurface_44.png
index 922a2e5..3e1ccb7 100644
Binary files a/Resources/Icons/CubicSurface_44.png and b/Resources/Icons/CubicSurface_44.png differ
diff --git a/Resources/Icons/CubicSurface_44.svg b/Resources/Icons/CubicSurface_44.svg
index 5b1f4d7..e03298d 100644
--- a/Resources/Icons/CubicSurface_44.svg
+++ b/Resources/Icons/CubicSurface_44.svg
@@ -2,100 +2,182 @@
diff --git a/Resources/Icons/CubicSurface_64.png b/Resources/Icons/CubicSurface_64.png
index 73558f5..ee01534 100644
Binary files a/Resources/Icons/CubicSurface_64.png and b/Resources/Icons/CubicSurface_64.png differ
diff --git a/Resources/Icons/CubicSurface_64.svg b/Resources/Icons/CubicSurface_64.svg
index 2579179..1277498 100644
--- a/Resources/Icons/CubicSurface_64.svg
+++ b/Resources/Icons/CubicSurface_64.svg
@@ -2,38 +2,89 @@
diff --git a/Resources/Icons/CubicSurface_66.png b/Resources/Icons/CubicSurface_66.png
index 526bd1c..f738b38 100644
Binary files a/Resources/Icons/CubicSurface_66.png and b/Resources/Icons/CubicSurface_66.png differ
diff --git a/Resources/Icons/CubicSurface_66.svg b/Resources/Icons/CubicSurface_66.svg
index 53cecd3..1f939a6 100644
--- a/Resources/Icons/CubicSurface_66.svg
+++ b/Resources/Icons/CubicSurface_66.svg
@@ -2,39 +2,101 @@
diff --git a/Resources/Icons/Point_onCurve.png b/Resources/Icons/Point_onCurve.png
index adeb6ea..9bba64d 100644
Binary files a/Resources/Icons/Point_onCurve.png and b/Resources/Icons/Point_onCurve.png differ
diff --git a/Resources/Icons/Point_onCurve.svg b/Resources/Icons/Point_onCurve.svg
index 7c0a8f3..2943d5b 100644
--- a/Resources/Icons/Point_onCurve.svg
+++ b/Resources/Icons/Point_onCurve.svg
@@ -2,72 +2,170 @@
diff --git a/Resources/Icons/Silk.png b/Resources/Icons/Silk.png
index 3716c9a..1525936 100644
Binary files a/Resources/Icons/Silk.png and b/Resources/Icons/Silk.png differ
diff --git a/Resources/Icons/Silk.svg b/Resources/Icons/Silk.svg
index 7885882..9bb3c2a 100644
--- a/Resources/Icons/Silk.svg
+++ b/Resources/Icons/Silk.svg
@@ -1,31 +1,54 @@
diff --git a/Resources/Icons/Silk_inkscape_format.png b/Resources/Icons/Silk_inkscape_format.png
deleted file mode 100644
index 3716c9a..0000000
Binary files a/Resources/Icons/Silk_inkscape_format.png and /dev/null differ
diff --git a/Resources/Icons/Silk_inkscape_format.svg b/Resources/Icons/Silk_inkscape_format.svg
deleted file mode 100644
index 46721f9..0000000
--- a/Resources/Icons/Silk_inkscape_format.svg
+++ /dev/null
@@ -1,90 +0,0 @@
-
-
-
-
diff --git a/Resources/Icons/Silk_old.png b/Resources/Icons/Silk_old.png
deleted file mode 100644
index 1497910..0000000
Binary files a/Resources/Icons/Silk_old.png and /dev/null differ
diff --git a/Resources/Icons/Silk_old.svg b/Resources/Icons/Silk_old.svg
deleted file mode 100644
index 3a92a2d..0000000
--- a/Resources/Icons/Silk_old.svg
+++ /dev/null
@@ -1,354 +0,0 @@
-
-
-
-
diff --git a/Resources/Icons/StarTrim_CubicNStar.png b/Resources/Icons/StarTrim_CubicNStar.png
index fa66e7d..8553307 100644
Binary files a/Resources/Icons/StarTrim_CubicNStar.png and b/Resources/Icons/StarTrim_CubicNStar.png differ
diff --git a/Resources/Icons/StarTrim_CubicNStar.svg b/Resources/Icons/StarTrim_CubicNStar.svg
index 7ee2b8c..b038348 100644
--- a/Resources/Icons/StarTrim_CubicNStar.svg
+++ b/Resources/Icons/StarTrim_CubicNStar.svg
@@ -2,17 +2,11 @@
diff --git a/Resources/Icons/SubGrid33_2Grid64.png b/Resources/Icons/SubGrid33_2Grid64.png
index 4924ddc..e946960 100644
Binary files a/Resources/Icons/SubGrid33_2Grid64.png and b/Resources/Icons/SubGrid33_2Grid64.png differ
diff --git a/Resources/Icons/SubGrid33_2Grid64.svg b/Resources/Icons/SubGrid33_2Grid64.svg
index 6a136ab..45a281f 100644
--- a/Resources/Icons/SubGrid33_2Grid64.svg
+++ b/Resources/Icons/SubGrid33_2Grid64.svg
@@ -2,200 +2,338 @@
diff --git a/Resources/Icons/SubGrid63_2Surf64.png b/Resources/Icons/SubGrid63_2Surf64.png
index 717c5b8..ae3cb95 100644
Binary files a/Resources/Icons/SubGrid63_2Surf64.png and b/Resources/Icons/SubGrid63_2Surf64.png differ
diff --git a/Resources/Icons/SubGrid63_2Surf64.svg b/Resources/Icons/SubGrid63_2Surf64.svg
index 965d7b3..d406ffb 100644
--- a/Resources/Icons/SubGrid63_2Surf64.svg
+++ b/Resources/Icons/SubGrid63_2Surf64.svg
@@ -2,263 +2,426 @@
diff --git a/Resources/Icons/WIP.png b/Resources/Icons/WIP.png
index 7a4c3f6..a060b4c 100644
Binary files a/Resources/Icons/WIP.png and b/Resources/Icons/WIP.png differ
diff --git a/Resources/Icons/WIP.svg b/Resources/Icons/WIP.svg
index 3202eb1..916395c 100644
--- a/Resources/Icons/WIP.svg
+++ b/Resources/Icons/WIP.svg
@@ -2,114 +2,175 @@