diff --git a/src/bonsai/bonsai/bim/data/icons/dm_add_from_closed_loop.png b/src/bonsai/bonsai/bim/data/icons/dm_add_from_closed_loop.png
new file mode 100644
index 00000000000..c754479a2ad
Binary files /dev/null and b/src/bonsai/bonsai/bim/data/icons/dm_add_from_closed_loop.png differ
diff --git a/src/bonsai/bonsai/bim/data/icons/dm_add_from_perimeter.png b/src/bonsai/bonsai/bim/data/icons/dm_add_from_perimeter.png
new file mode 100644
index 00000000000..5ab4fa8a942
Binary files /dev/null and b/src/bonsai/bonsai/bim/data/icons/dm_add_from_perimeter.png differ
diff --git a/src/bonsai/bonsai/bim/data/icons/lm_add_from_closed_loop.png b/src/bonsai/bonsai/bim/data/icons/lm_add_from_closed_loop.png
new file mode 100644
index 00000000000..5fabe517344
Binary files /dev/null and b/src/bonsai/bonsai/bim/data/icons/lm_add_from_closed_loop.png differ
diff --git a/src/bonsai/bonsai/bim/data/icons/lm_add_from_perimeter.png b/src/bonsai/bonsai/bim/data/icons/lm_add_from_perimeter.png
new file mode 100644
index 00000000000..eec10ffec81
Binary files /dev/null and b/src/bonsai/bonsai/bim/data/icons/lm_add_from_perimeter.png differ
diff --git a/src/bonsai/scripts/bonsai_icons.svg b/src/bonsai/scripts/bonsai_icons.svg
index 035dfdea5dd..4bdd6b607f4 100644
--- a/src/bonsai/scripts/bonsai_icons.svg
+++ b/src/bonsai/scripts/bonsai_icons.svg
@@ -28,27 +28,15 @@
      inkscape:deskcolor="#d1d1d1"
      inkscape:document-units="px"
      showgrid="true"
-<<<<<<< HEAD
-     inkscape:zoom="22.627417"
-     inkscape:cx="5.7894368"
-     inkscape:cy="9.7448153"
-     inkscape:window-width="2326"
+     inkscape:zoom="29.859609"
+     inkscape:cx="15.673347"
+     inkscape:cy="12.809947"
+     inkscape:window-width="2325"
      inkscape:window-height="1555"
-     inkscape:window-x="1548"
-     inkscape:window-y="26"
+     inkscape:window-x="847"
+     inkscape:window-y="37"
      inkscape:window-maximized="0"
-     inkscape:current-layer="g1418"
-=======
-     inkscape:zoom="16"
-     inkscape:cx="18.4375"
-     inkscape:cy="13.21875"
-     inkscape:window-width="2328"
-     inkscape:window-height="1555"
-     inkscape:window-x="590"
-     inkscape:window-y="25"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="g776"
->>>>>>> origin/Type-Manager-UI
+     inkscape:current-layer="svg5"
      showguides="true"><inkscape:grid
        type="axonomgrid"
        id="grid5114"
@@ -389,97 +377,9 @@
        d="M 6.3376284,4.233333 6.7182939,5.7245206 8.1379048,6.1037675 6.6467171,6.4844329 6.2674703,7.9040438 5.8868048,6.4128561 4.4671939,6.0336093 5.9583816,5.6529438 Z"
        transform="matrix(0.5045571,0,0,0.5045571,4.360629,1.715138)" /></g><g
      inkscape:groupmode="layer"
-<<<<<<< HEAD
      id="g1622"
      inkscape:label="reset_vertex"
      style="display:none;stroke-width:0.529167;stroke-dasharray:none"><g
-       id="g1635"
-       transform="matrix(-1,0,0,1,8.4666676,0)"
-       style="display:inline"><path
-         id="path1612"
-         style="color:#000000;fill:#00d27b;stroke-linejoin:round;stroke-miterlimit:0;-inkscape-stroke:none;paint-order:stroke fill markers"
-         d="m 4.2322998,0.79271647 c -1.8962705,0 -3.43958333,1.54331273 -3.43958333,3.43958333 0,1.8962705 1.54331283,3.4416504 3.43958333,3.4416504 0.5526674,0 1.0754694,-0.131382 1.5389242,-0.3643189 L 5.5185262,6.8032023 c -0.386732,0.1933362 -0.8233795,0.3023071 -1.2862264,0.3023071 -1.5901009,0 -2.8726929,-1.2831086 -2.8726929,-2.8732096 0,-1.5901011 1.282592,-2.8726929 2.8726929,-2.8726929 1.2342128,0 2.2829816,0.7728658 2.6907918,1.8624187 l 0.5963461,-0.00879 C 7.0835409,1.8128107 5.7739374,0.79271647 4.2322998,0.79271647 Z"
-         inkscape:label="circle-path" /><path
-         style="display:inline;fill:#000000;fill-opacity:0;stroke:#00d27b;stroke-width:0.440014;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
-         d="M 5.5116727,3.2431535 H 7.4529091 V 1.3019173"
-         id="path1614"
-         inkscape:label="Arrow_head 1" /><path
-         sodipodi:type="star"
-         style="fill:#ffffff;fill-opacity:1;stroke:#00d27b;stroke-width:0;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:0;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
-         id="path1616"
-         inkscape:flatsided="false"
-         sodipodi:sides="4"
-         sodipodi:cx="6.3025494"
-         sodipodi:cy="6.0686884"
-         sodipodi:r1="1.8356906"
-         sodipodi:r2="0.5397175"
-         sodipodi:arg1="-1.5516857"
-         sodipodi:arg2="-0.69148437"
-         inkscape:rounded="0"
-         inkscape:randomized="0"
-         d="M 6.3376284,4.233333 6.7182939,5.7245206 8.1379048,6.1037675 6.6467171,6.4844329 6.2674703,7.9040438 5.8868048,6.4128561 4.4671939,6.0336093 5.9583816,5.6529438 Z"
-         transform="matrix(0.72079571,0,0,0.72079571,0.11602734,-0.22857096)" /><path
-         sodipodi:type="star"
-         style="display:inline;fill:#ffffff;fill-opacity:1;stroke:#00d27b;stroke-width:0;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:0;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
-         id="path1618"
-         inkscape:flatsided="false"
-         sodipodi:sides="4"
-         sodipodi:cx="6.3025494"
-         sodipodi:cy="6.0686884"
-         sodipodi:r1="1.8356906"
-         sodipodi:r2="0.5397175"
-         sodipodi:arg1="-1.5516857"
-         sodipodi:arg2="-0.69148437"
-         inkscape:rounded="0"
-         inkscape:randomized="0"
-         d="M 6.3376284,4.233333 6.7182939,5.7245206 8.1379048,6.1037675 6.6467171,6.4844329 6.2674703,7.9040438 5.8868048,6.4128561 4.4671939,6.0336093 5.9583816,5.6529438 Z"
-         transform="matrix(1.009114,0,0,1.009114,-0.07417958,-0.06494846)" /><path
-         sodipodi:type="star"
-         style="display:inline;fill:#ffffff;fill-opacity:1;stroke:#00d27b;stroke-width:0;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:0;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
-         id="path1620"
-         inkscape:flatsided="false"
-         sodipodi:sides="4"
-         sodipodi:cx="6.3025494"
-         sodipodi:cy="6.0686884"
-         sodipodi:r1="1.8356906"
-         sodipodi:r2="0.5397175"
-         sodipodi:arg1="-1.5516857"
-         sodipodi:arg2="-0.69148437"
-         inkscape:rounded="0"
-         inkscape:randomized="0"
-         d="M 6.3376284,4.233333 6.7182939,5.7245206 8.1379048,6.1037675 6.6467171,6.4844329 6.2674703,7.9040438 5.8868048,6.4128561 4.4671939,6.0336093 5.9583816,5.6529438 Z"
-         transform="matrix(0.5045571,0,0,0.5045571,4.360629,1.715138)" /></g></g><g
-     id="g1418"
-     style="display:inline;stroke-width:0.529167;stroke-dasharray:none"
-     inkscape:label="quick_default"><path
-       style="display:inline;fill:#00d27b;fill-opacity:1;stroke-width:0.00695213;stroke-dasharray:none"
-       d="m 3.1326475,7.5887335 c 0,0 -0.069864,0.00256 -0.1265286,0.00933 -0.560101,0.06697 -0.9165797,0.030086 -1.1771341,-0.1309849 -0.1138471,-0.070378 -0.2057477,-0.1759621 -0.242721,-0.2788592 -0.031476,-0.0876 -0.0215,-0.2342448 0.021198,-0.311592 0.064856,-0.1174853 0.1545523,-0.1684811 0.2784956,-0.158335 0.093797,0.00768 0.1346531,0.025966 0.2339471,0.1047173 0.1398999,0.1109559 0.304856,0.087742 0.5574005,-0.066363 L 2.729776,6.7246287 C 2.7978,6.7592855 2.9809136,7.1288222 3.0244711,7.2148062"
-       id="path802-5"
-       sodipodi:nodetypes="cssssssscc"
-       inkscape:label="bunny_foot" /><path
-       style="display:inline;fill:#00d27b;fill-opacity:1;stroke-width:0.00713863;stroke-dasharray:none"
-       d="M 3.7657511,8.4297643 C 3.7116054,8.3959799 3.639953,8.3029436 3.589315,8.2006726 3.5464833,8.1141681 3.4602565,7.8699963 3.4153265,7.7079833 3.3958372,7.6377066 3.3753828,7.5728002 3.3698721,7.5637468 3.2679031,7.2569724 3.2730501,7.2367467 3.1028764,6.8739253 3.0169558,6.6867578 2.7884579,6.4409936 2.5900779,6.3223776 2.4200094,6.2206896 2.3137607,6.1876326 1.8602584,6.0953103 1.5756979,6.0373807 1.4332524,5.9716553 1.2516025,5.8144726 0.93792911,5.5430492 0.7593636,5.1255002 0.76524033,4.6771873 0.76748974,4.5055897 0.77015247,4.5112023 0.68846883,4.5153623 0.54997359,4.5224153 0.33770319,4.3887108 0.21937446,4.2198895 0.1143564,4.0700591 0.03002154,3.8507646 0.00776001,3.6696325 -0.00861391,3.5364051 -0.00140295,3.3045273 0.05196783,3.1481707 0.14188169,2.8847565 0.26067076,2.703958 0.34762411,2.6198678 c 0.0711318,-0.06879 0.0967494,-0.065239 0.0899667,0.012474 -0.00655,0.07505 0.012716,0.1827354 0.0471834,0.2637288 0.0418864,0.098427 0.11275735,0.2025886 0.2852565,0.3177419 0.0880593,0.058784 0.22622419,0.1326589 0.29440109,0.192594 0.068177,0.059935 0.1239679,0.071372 0.130826,0.067544 0.00686,-0.00384 0.027776,-0.049421 0.061543,-0.094523 C 1.55795,2.9772085 2.15965,2.9273539 2.6267516,2.8632421 2.791317,2.8406547 3.0415716,2.7349997 3.2237854,2.7870334 3.3575648,2.8252375 3.5345228,2.8835809 3.6069491,2.9133653 3.9145964,3.0329116 4.2267658,3.2125964 4.479627,3.3568455 4.484587,3.357269 4.555444,3.4001685 4.7305781,3.5087817 5.01765,3.6868112 5.103893,3.7161976 5.2436272,3.6835946 5.3754304,3.6528421 5.4708476,3.5359694 5.5130021,3.3781286 5.5448038,3.2590523 5.5392362,3.1286196 5.5365303,2.9793086 5.4785269,2.6472479 5.3088316,2.5166735 5.07167,2.3961151 4.9541465,2.328503 4.7375337,2.2622903 4.4897213,2.2182289 4.2863103,2.1820623 4.0981682,2.1762008 3.7961541,2.1966216 3.5646443,2.2122753 3.506174,2.2196346 3.2859759,2.2608351 3.1133192,2.2931402 2.8448975,2.2702109 2.721206,2.212591 2.4829053,2.101582 2.3487557,1.9026618 2.3885386,1.7193041 2.4204172,1.5723777 2.5228336,1.4741011 2.7439033,1.378304 3.1867553,1.186401 3.5604645,1.1167971 3.9609397,1.1516292 4.3297707,1.1837089 4.6272127,1.2955835 4.9684375,1.5305733 5.2364469,1.7151418 5.189201,1.7182135 5.6678629,2.2571296 5.8330708,2.443134 5.8951557,2.5021109 5.9189606,2.4956568 5.9626702,2.4838066 5.6649892,1.962614 5.4488878,1.7435707 5.0593348,1.3487143 4.6887702,1.1216057 4.2333333,0.99859124 4.1051245,0.96396184 3.7656766,0.93214564 3.6448068,0.94342924 3.4627266,0.96042684 3.2428812,1.0052086 3.1391322,1.0464333 2.9699007,1.1136778 2.8992086,1.1127668 2.8180196,1.0422956 2.7240054,0.96069194 2.7012471,0.81064604 2.7571721,0.64112717 2.7949861,0.52650653 2.8216586,0.47697936 2.9150986,0.34787795 3.0556285,0.15371456 3.2224465,0.04237523 3.422237,0.0093985 3.6601499,-0.02987062 4.009938,0.05570989 4.3343183,0.23255101 4.5384688,0.34848089 4.727556,0.4851588 4.9131776,0.62871187 5.2522677,0.91670634 5.523033,1.2412844 5.7564746,1.5622699 c 0.066829,0.1202577 0.1275513,0.2439746 0.1922175,0.3513884 0.082995,0.1462937 0.1509345,0.2888166 0.178044,0.3771976 0.031013,0.1011069 0.078317,0.1729888 0.2795959,0.1140254 0.3764411,-0.1102756 0.7517631,-0.040598 1.128726,0.2095465 0.5657988,0.4551401 0.7771865,1.1447578 0.9022632,1.6092677 0.028384,0.1517442 0.032543,0.2027182 0.027519,0.3373 C 8.4600602,4.6892652 8.4540532,4.7249137 8.4236872,4.805601 8.3572223,4.9821958 8.290569,4.9960493 8.1007332,5.0967543 7.9906727,5.1551397 7.9203023,5.1831283 7.8123753,5.2114453 7.6870229,5.244333 7.5433397,5.2711637 7.4177535,5.2851324 7.1027263,5.3201755 6.9676036,5.3085125 6.4555353,5.2750765 l -0.1394664,-0.0091 -0.052426,0.1110198 C 6.0697447,5.7876011 5.9344168,6.1698777 5.5869353,6.4802442 5.4150887,6.6337356 5.0497171,6.8540484 4.8614477,6.9626238 c -0.140777,0.081186 -0.4386288,0.2175095 -0.469479,0.2148745 -0.007,-5.974e-4 -0.00633,-0.108525 0.00155,-0.2515324 C 4.4070787,6.6798391 4.4069717,6.5969785 4.3927505,6.3268666 4.3856643,6.1922762 4.3834037,6.1681684 4.3599139,5.9766935 4.306379,5.5403093 4.1951436,5.1300007 3.9853712,4.7843274 3.7264962,4.3577401 3.3900226,4.0547693 3.1386667,3.9533335 2.9781826,3.8885695 2.9619568,3.9153845 3.1056725,4.0078603 c 0.1781218,0.1146153 0.3473652,0.2765498 0.5093798,0.4873834 0.083373,0.108496 0.169393,0.2274972 0.1911547,0.2644472 0.1008292,0.1712026 0.2362262,0.5011871 0.2851684,0.6950025 0.010464,0.041437 0.023353,0.08847 0.028642,0.1045183 0.034777,0.105512 0.08606,0.4880242 0.09999,0.7458123 0.016127,0.2984462 -0.021809,0.8867829 -0.072283,1.1210017 -0.012377,0.057429 -0.025105,0.1314728 -0.028289,0.164543 l -0.00579,0.060127 0.083533,-0.088932 C 4.7417662,7.070445 5.2738212,6.9504144 5.881894,7.0425639 6.1280017,7.0972466 6.2560011,7.1458368 6.3891339,7.2351183 6.5976164,7.3749314 6.6949964,7.584535 6.6375578,7.7698332 6.3559804,8.2685828 5.9835352,7.9710533 5.6291813,7.9141047 5.378907,7.8927284 5.3012281,7.9000649 5.0617526,7.9676921 4.8746942,8.020518 4.735271,8.0820208 4.4123378,8.254164 4.06417,8.4397592 3.9756942,8.4743748 3.8724984,8.4653732 3.8407352,8.4626034 3.792699,8.4465785 3.7657511,8.4297643 Z"
-       id="path802"
-       sodipodi:nodetypes="sssccsssssssssssssccsscccssccssssssssssssssssssccccssccscsscccssssssssssssscssscccsccssss"
-       inkscape:label="bunny_body" /></g><g
-=======
-     id="g776"
-     inkscape:label="quick_default"
-     style="display:inline;stroke-width:0.529167;stroke-dasharray:none"><path
-       style="display:inline;fill:#00d27b;fill-opacity:1;stroke-width:0.00713863"
-       d="M 3.7657511,8.4297643 C 3.7116054,8.3959799 3.639953,8.3029436 3.589315,8.2006726 3.5464833,8.1141681 3.4602565,7.8699963 3.4153265,7.7079833 3.3958372,7.6377066 3.3753828,7.5728002 3.3698721,7.5637468 3.2679031,7.2569724 3.2730501,7.2367467 3.1028764,6.8739253 3.0169558,6.6867578 2.7884579,6.4409936 2.5900779,6.3223776 2.4200094,6.2206896 2.3137607,6.1876326 1.8602584,6.0953103 1.5756979,6.0373807 1.4332524,5.9716553 1.2516025,5.8144726 0.93792911,5.5430492 0.7593636,5.1255002 0.76524033,4.6771873 0.76748974,4.5055897 0.77015247,4.5112023 0.68846883,4.5153623 0.54997359,4.5224153 0.33770319,4.3887108 0.21937446,4.2198895 0.1143564,4.0700591 0.03002154,3.8507646 0.00776001,3.6696325 -0.00861391,3.5364051 -0.00140295,3.3045273 0.05196783,3.1481707 0.14188169,2.8847565 0.26067076,2.703958 0.34762411,2.6198678 c 0.0711318,-0.06879 0.0967494,-0.065239 0.0899667,0.012474 -0.00655,0.07505 0.012716,0.1827354 0.0471834,0.2637288 0.0418864,0.098427 0.11275735,0.2025886 0.2852565,0.3177419 0.0880593,0.058784 0.22622419,0.1326589 0.29440109,0.192594 0.068177,0.059935 0.1239679,0.071372 0.130826,0.067544 0.00686,-0.00384 0.027776,-0.049421 0.061543,-0.094523 C 1.55795,2.9772085 2.15965,2.9273539 2.6267516,2.8632421 2.791317,2.8406547 3.0415716,2.7349997 3.2237854,2.7870334 3.3575648,2.8252375 3.5345228,2.8835809 3.6069491,2.9133653 3.9145964,3.0329116 4.2267658,3.2125964 4.479627,3.3568455 4.484587,3.357269 4.555444,3.4001685 4.7305781,3.5087817 5.01765,3.6868112 5.103893,3.7161976 5.2436272,3.6835946 5.3754304,3.6528421 5.4708476,3.5359694 5.5130021,3.3781286 5.5448038,3.2590523 5.5392362,3.1286196 5.5365303,2.9793086 5.4785269,2.6472479 5.3088316,2.5166735 5.07167,2.3961151 4.9541465,2.328503 4.7375337,2.2622903 4.4897213,2.2182289 4.2863103,2.1820623 4.0981682,2.1762008 3.7961541,2.1966216 3.5646443,2.2122753 3.506174,2.2196346 3.2859759,2.2608351 3.1133192,2.2931402 2.8448975,2.2702109 2.721206,2.212591 2.4829053,2.101582 2.3487557,1.9026618 2.3885386,1.7193041 2.4204172,1.5723777 2.5228336,1.4741011 2.7439033,1.378304 3.1867553,1.186401 3.5604645,1.1167971 3.9609397,1.1516292 4.3297707,1.1837089 4.6272127,1.2955835 4.9684375,1.5305733 5.2364469,1.7151418 5.189201,1.7182135 5.6678629,2.2571296 5.8330708,2.443134 5.8951557,2.5021109 5.9189606,2.4956568 5.9626702,2.4838066 5.6649892,1.962614 5.4488878,1.7435707 5.0593348,1.3487143 4.6887702,1.1216057 4.2333333,0.99859124 4.1051245,0.96396184 3.7656766,0.93214564 3.6448068,0.94342924 3.4627266,0.96042684 3.2428812,1.0052086 3.1391322,1.0464333 2.9699007,1.1136778 2.8992086,1.1127668 2.8180196,1.0422956 2.7240054,0.96069194 2.7012471,0.81064604 2.7571721,0.64112717 2.7949861,0.52650653 2.8216586,0.47697936 2.9150986,0.34787795 3.0556285,0.15371456 3.2224465,0.04237523 3.422237,0.0093985 3.6601499,-0.02987062 4.009938,0.05570989 4.3343183,0.23255101 4.5384688,0.34848089 4.727556,0.4851588 4.9131776,0.62871187 5.2522677,0.91670634 5.523033,1.2412844 5.7564746,1.5622699 c 0.066829,0.1202577 0.1275513,0.2439746 0.1922175,0.3513884 0.082995,0.1462937 0.1509345,0.2888166 0.178044,0.3771976 0.031013,0.1011069 0.078317,0.1729888 0.2795959,0.1140254 0.3764411,-0.1102756 0.7517631,-0.040598 1.128726,0.2095465 0.5657988,0.4551401 0.7771865,1.1447578 0.9022632,1.6092677 0.028384,0.1517442 0.032543,0.2027182 0.027519,0.3373 C 8.4600602,4.6892652 8.4540532,4.7249137 8.4236872,4.805601 8.3572223,4.9821958 8.290569,4.9960493 8.1007332,5.0967543 7.9906727,5.1551397 7.9203023,5.1831283 7.8123753,5.2114453 7.6870229,5.244333 7.5433397,5.2711637 7.4177535,5.2851324 7.1027263,5.3201755 6.9676036,5.3085125 6.4555353,5.2750765 l -0.1394664,-0.0091 -0.052426,0.1110198 C 6.0697447,5.7876011 5.9344168,6.1698777 5.5869353,6.4802442 5.4150887,6.6337356 5.0497171,6.8540484 4.8614477,6.9626238 c -0.140777,0.081186 -0.4386288,0.2175095 -0.469479,0.2148745 -0.007,-5.974e-4 -0.00633,-0.108525 0.00155,-0.2515324 C 4.4070787,6.6798391 4.4069717,6.5969785 4.3927505,6.3268666 4.3856643,6.1922762 4.3834037,6.1681684 4.3599139,5.9766935 4.306379,5.5403093 4.1951436,5.1300007 3.9853712,4.7843274 3.7264962,4.3577401 3.3900226,4.0547693 3.1386667,3.9533335 2.9781826,3.8885695 2.9619568,3.9153845 3.1056725,4.0078603 c 0.1781218,0.1146153 0.3473652,0.2765498 0.5093798,0.4873834 0.083373,0.108496 0.169393,0.2274972 0.1911547,0.2644472 0.1008292,0.1712026 0.2362262,0.5011871 0.2851684,0.6950025 0.010464,0.041437 0.023353,0.08847 0.028642,0.1045183 0.034777,0.105512 0.08606,0.4880242 0.09999,0.7458123 0.016127,0.2984462 -0.021809,0.8867829 -0.072283,1.1210017 -0.012377,0.057429 -0.025105,0.1314728 -0.028289,0.164543 l -0.00579,0.060127 0.083533,-0.088932 C 4.7417662,7.070445 5.2738212,6.9504144 5.881894,7.0425639 6.1280017,7.0972466 6.2560011,7.1458368 6.3891339,7.2351183 6.5976164,7.3749314 6.6949964,7.584535 6.6375578,7.7698332 6.3559804,8.2685828 5.9835352,7.9710533 5.6291813,7.9141047 5.378907,7.8927284 5.3012281,7.9000649 5.0617526,7.9676921 4.8746942,8.020518 4.735271,8.0820208 4.4123378,8.254164 4.06417,8.4397592 3.9756942,8.4743748 3.8724984,8.4653732 3.8407352,8.4626034 3.792699,8.4465785 3.7657511,8.4297643 Z"
-       id="path802"
-       sodipodi:nodetypes="sssccsssssssssssssccsscccssccssssssssssssssssssccccssccscsscccssssssssssssscssscccsccssss" /><path
-       style="display:inline;fill:#00d27b;fill-opacity:1;stroke-width:0.00695213;stroke-dasharray:none"
-       d="m 3.1326475,7.5887335 c 0,0 -0.069864,0.00256 -0.1265286,0.00933 -0.560101,0.06697 -0.9165797,0.030086 -1.1771341,-0.1309849 -0.1138471,-0.070378 -0.2057477,-0.1759621 -0.242721,-0.2788592 -0.031476,-0.0876 -0.0215,-0.2342448 0.021198,-0.311592 0.064856,-0.1174853 0.1545523,-0.1684811 0.2784956,-0.158335 0.093797,0.00768 0.1346531,0.025966 0.2339471,0.1047173 0.1398999,0.1109559 0.304856,0.087742 0.5574005,-0.066363 L 2.729776,6.7246287 C 2.7978,6.7592855 2.9809136,7.1288222 3.0244711,7.2148062"
-       id="path802-5"
-       sodipodi:nodetypes="cssssssscc" /></g><g
-<<<<<<< HEAD
->>>>>>> origin/Type-Manager-UI
-=======
-     id="g1622"
-     inkscape:label="reset_vertex"
-     style="display:inline;stroke-width:0.529167;stroke-dasharray:none"><g
        id="g1635"
        transform="matrix(-1,0,0,1,8.4666676,0)"><path
          id="path1612"
@@ -535,7 +435,6 @@
          inkscape:randomized="0"
          d="M 6.3376284,4.233333 6.7182939,5.7245206 8.1379048,6.1037675 6.6467171,6.4844329 6.2674703,7.9040438 5.8868048,6.4128561 4.4671939,6.0336093 5.9583816,5.6529438 Z"
          transform="matrix(0.5045571,0,0,0.5045571,4.360629,1.715138)" /></g></g><g
->>>>>>> origin/Type-Manager-UI
      inkscape:groupmode="layer"
      id="layer2"
      inkscape:label="refresh"
@@ -1773,6 +1672,57 @@
        d="M 8.4666674,7.4083326 H 5.8208347 V 1.0583338 h 2.6458321 z"
        sodipodi:nodetypes="ccccc" /></g><g
      inkscape:groupmode="layer"
+     id="g1480"
+     inkscape:label="add_obstruction"
+     style="display:inline"><path
+       id="path627-6"
+       style="display:inline;fill:#00d27b;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linejoin:round;stroke-miterlimit:0;paint-order:stroke fill markers"
+       d="M 2.1166667,0.53020019 V 7.9385335 H 6.35 V 0.53020019 Z M 5.1454223,1.5931844 5.6694213,1.8376139 4.8963419,3.4959106 A 0.99218696,0.99218684 0 0 1 5.2255208,4.2333333 0.99218696,0.99218684 0 0 1 4.2333333,5.2255208 0.99218696,0.99218684 0 0 1 4.0943237,5.2157023 L 3.3212443,6.8734822 2.7972453,6.6290527 3.5703247,4.970756 A 0.99218696,0.99218684 0 0 1 3.2411458,4.2333333 0.99218696,0.99218684 0 0 1 4.2333333,3.2411458 a 0.99218696,0.99218684 0 0 1 0.1390096,0.00982 z" /><path
+       id="path22760-5"
+       style="display:inline;fill:#ffffff;stroke:#ffffff;stroke-width:0;stroke-linejoin:round;stroke-miterlimit:0;paint-order:stroke fill markers"
+       d="M 8.4666675,7.4083328 H 6.3412859 V 1.0583338 H 8.466667 Z"
+       sodipodi:nodetypes="ccccc" /><path
+       id="path22760-5-7"
+       style="display:inline;fill:#ffffff;stroke:#ffffff;stroke-width:0;stroke-linejoin:round;stroke-miterlimit:0;paint-order:stroke fill markers"
+       d="M 2.1166663,7.4083329 H -5.5278633e-7 V 1.0583339 H 2.1166658 Z"
+       sodipodi:nodetypes="ccccc" /></g><g
+     inkscape:groupmode="layer"
+     id="g7644"
+     inkscape:label="add_from_closed_loop"
+     style="display:none"><path
+       id="path7640"
+       style="display:inline;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:0;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+       inkscape:label="white-boarder"
+       d="M 0.52916666,0.52916666 V 7.9374999 H 5.7980957 V 6.9205078 H 4.7247762 1.5461588 v -5.374349 h 5.3702148 v 3.181718 0.00207 1.0681519 H 7.9374999 V 0.52916666 Z M 6.9163736,6.9205078 V 7.9374999 H 7.9374999 V 6.9205078 Z" /><path
+       id="path23072-7"
+       style="color:#000000;display:inline;fill:#ffffff;stroke-width:0.563779;stroke-miterlimit:0;stroke-dasharray:none;-inkscape-stroke:none;paint-order:stroke fill markers"
+       d="m 6.0771581,5.0059166 0.00193,1.070418 -1.0731715,-2e-7 v 0.5659811 l 1.0731715,1e-7 -0.00193,1.0709689 h 0.5659812 l -0.00193,-1.0709689 1.0731752,-1e-7 V 6.0763344 l -1.0731752,2e-7 0.00193,-1.070418 z"
+       sodipodi:nodetypes="ccccccccccccc"
+       inkscape:label="plus" /><path
+       id="path7642"
+       style="display:inline;fill:#00d27b;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:0;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+       inkscape:label="green-center"
+       d="m -1.824178,1.8236613 h -4.8183106 v 0.9058878 1.9983277 h 0.027905 0.8164876 v 0.00207 1.0681519 h 1.0702189 c 0,0 -9.6e-4,0.5727532 0,0.8164876 v 0.028422 H -1.824178 V 5.2591105 2.7295491 Z"
+       transform="rotate(-90)" /></g><g
+     inkscape:groupmode="layer"
+     id="g10603"
+     inkscape:label="add_from_perimeter"
+     style="display:none"><path
+       id="path10597"
+       style="display:inline;fill:#00d27b;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:0;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+       inkscape:label="green-boarder"
+       d="M 0.52916666,0.52916666 V 7.9374999 H 5.7980957 V 6.9205078 H 4.7247762 1.5461588 v -5.374349 h 5.3702148 v 3.181718 0.00207 1.0681519 H 7.9374999 V 0.52916666 Z M 6.9163736,6.9205078 V 7.9374999 H 7.9374999 V 6.9205078 Z" /><path
+       id="path10599"
+       style="color:#000000;display:inline;fill:#ffffff;stroke-width:0.563779;stroke-miterlimit:0;stroke-dasharray:none;-inkscape-stroke:none;paint-order:stroke fill markers"
+       d="m 6.0771581,5.0059166 0.00193,1.070418 -1.0731715,-2e-7 v 0.5659811 l 1.0731715,1e-7 -0.00193,1.0709689 h 0.5659812 l -0.00193,-1.0709689 1.0731752,-1e-7 V 6.0763344 l -1.0731752,2e-7 0.00193,-1.070418 z"
+       sodipodi:nodetypes="ccccccccccccc"
+       inkscape:label="plus" /><path
+       id="path10601"
+       style="display:inline;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:0;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+       inkscape:label="white-center"
+       d="m -1.824178,1.8236613 h -4.8183106 v 0.9058878 1.9983277 h 0.027905 0.8164876 v 0.00207 1.0681519 h 1.0702189 c 0,0 -9.6e-4,0.5727532 0,0.8164876 v 0.028422 H -1.824178 V 5.2591105 2.7295491 Z"
+       transform="rotate(-90)" /></g><g
+     inkscape:groupmode="layer"
      id="g16110"
      inkscape:label="add"
      style="display:none"><path
@@ -2054,7 +2004,7 @@
      inkscape:label="ifc"
      style="display:none"><path
        id="path8952-4"
-       style="fill:#ffffff;fill-opacity:1"
+       style="display:none;fill:#ffffff;fill-opacity:1"
        sodipodi:type="inkscape:offset"
        inkscape:radius="-0.33450544"
        inkscape:original="M 148.37109 1251.9766 C 147.60971 1251.9997 146.85647 1252.3141 146.29297 1252.9121 L 139.05664 1260.6016 C 137.93064 1261.7986 137.98855 1263.6806 139.18555 1264.8066 L 145.61914 1270.8633 C 146.21714 1271.4268 146.989 1271.6929 147.75 1271.6699 C 148.511 1271.6469 149.26317 1271.3348 149.82617 1270.7363 L 150.30273 1270.2285 L 142.19141 1262.5938 L 148.49023 1255.9004 L 150.66406 1257.9473 L 153.16406 1255.293 L 150.5 1252.7852 C 149.902 1252.2222 149.13248 1251.9535 148.37109 1251.9766 z M 157.90625 1252.1191 C 157.14548 1252.1421 156.39308 1252.4562 155.83008 1253.0547 L 149.77344 1259.4883 C 148.64644 1260.6843 148.70144 1262.5693 149.89844 1263.6953 L 150.40625 1264.1699 L 158.04102 1256.0586 L 164.73633 1262.3594 L 162.6875 1264.5332 L 165.34375 1267.0332 L 167.84961 1264.3691 C 168.97561 1263.1721 168.91866 1261.2881 167.72266 1260.1621 L 160.0332 1252.9258 C 159.4352 1252.3628 158.66702 1252.0962 157.90625 1252.1191 z M 156.44727 1258.3828 L 150.71875 1264.4668 L 153.375 1266.9668 L 157.0625 1263.0469 C 158.1885 1261.8499 158.13155 1259.9678 156.93555 1258.8418 L 156.44727 1258.3828 z M 147.05078 1262.7656 C 146.28976 1262.7887 145.53761 1263.1032 144.97461 1263.7012 L 144.51367 1264.1895 L 150.59961 1269.916 L 153.09766 1267.2598 L 149.17969 1263.5723 C 148.58119 1263.0093 147.8118 1262.7425 147.05078 1262.7656 z M 159.01758 1262.834 C 158.25656 1262.8571 157.50441 1263.1696 156.94141 1263.7676 L 156.46484 1264.2754 L 164.57617 1271.9102 L 158.27539 1278.6035 L 156.10156 1276.5566 L 153.60156 1279.2109 L 156.26562 1281.7188 C 156.86362 1282.2817 157.63535 1282.5503 158.39648 1282.5273 C 159.1576 1282.5042 159.91016 1282.1898 160.47266 1281.5918 L 167.70898 1273.9023 C 168.83498 1272.7063 168.77708 1270.8223 167.58008 1269.6953 L 161.14648 1263.6406 C 160.54798 1263.0777 159.77859 1262.8108 159.01758 1262.834 z M 156.16797 1264.5879 L 153.66992 1267.2441 L 157.58789 1270.9316 C 158.14899 1271.4598 158.86029 1271.7282 159.57422 1271.7402 C 160.38335 1271.7542 161.19478 1271.4386 161.79297 1270.8027 L 162.25391 1270.3145 L 156.16797 1264.5879 z M 141.42383 1267.4707 L 138.91602 1270.1348 C 137.79002 1271.3308 137.84893 1273.2148 139.04492 1274.3418 L 146.73242 1281.5781 C 147.33092 1282.141 148.10033 1282.4078 148.86133 1282.3848 C 149.62233 1282.3616 150.37595 1282.0477 150.93945 1281.4492 L 156.99414 1275.0156 C 158.12014 1273.8186 158.06419 1271.9346 156.86719 1270.8086 L 156.35938 1270.334 L 148.72461 1278.4453 L 142.03125 1272.1445 L 144.07812 1269.9707 L 141.42383 1267.4707 z M 153.39258 1267.5391 L 149.70508 1271.4551 C 148.57808 1272.6521 148.63504 1274.5361 149.83203 1275.6621 L 150.32031 1276.123 L 156.04883 1270.0371 L 153.39258 1267.5391 z "