diff --git a/.gitignore b/.gitignore
index 664680c5bf..1b63c7698a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,10 @@
 .idea/
+.vs/
 .vscode/
 __pycache__
 AssetProcessorTemp/**
 [Bb]uild/**
+[Oo]ut/**
 [Cc]ache/
 /install/
 Editor/EditorEventLog.xml
@@ -14,6 +16,8 @@ UserSettings.xml
 FrameCapture/**
 .DS_Store
 user*.cfg
+client*.cfg
+server*.cfg
 .mayaSwatches/
 _savebackup/
 #Output folder for test results when running Automated Tests
diff --git a/Assets/Editor/Icons/Components/AnimGraphNetSync.svg b/Assets/Editor/Icons/Components/AnimGraphNetSync.svg
new file mode 100644
index 0000000000..7bf70e69dc
--- /dev/null
+++ b/Assets/Editor/Icons/Components/AnimGraphNetSync.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Networking / AnimGraphNetSync</title>
+    <defs>
+        <path d="M15.049674,6.47369367 C15.4432627,6.6892261 15.7604258,7.03456112 15.9372202,7.4597408 L18.2809307,10.7388937 L20.5360597,13.1099302 L19.1977985,14.5962199 L16.7162512,11.9890965 L16.6986951,12 L16.5958385,11.8625904 L16.3813051,11.6372009 L16.4079396,11.6115701 L15.3771738,10.2345359 L13.8743689,13.609891 L16.5991717,16 L16.6094599,16 L16.6094599,22 L14.6094599,22 L14.6094599,16.9335637 L11.6612465,14.4145916 L11.3980432,14.2974059 L10.0226048,17.3866912 L9.249451,19.1359308 L3.60945994,15.6954658 L4.66929847,13.9993696 L8.35173206,16.2223461 L9.57095227,13.4839327 L9.55505528,13.4768549 L11.6580994,8.75334034 L10.0814102,9.12452852 L8.49311047,12.0950967 L6.74387106,11.1254774 L8.75357795,7.42096143 L8.74387106,7.3871095 L13.8051816,6.24191249 L13.8065756,6.24907236 L13.8467182,6.24373869 C14.2785593,6.19071527 14.6951248,6.27953958 15.049674,6.47369367 Z M13.5987889,17.6350711 C13.572509,17.9597225 13.6285826,18.2952382 13.6964241,18.6560991 C13.1795955,18.7733829 12.6442829,18.8412727 12.0958161,18.8565495 L11.6150583,18.8565495 C11.275482,18.8469001 10.9409546,18.8170831 10.6126317,18.7682539 C10.670507,18.4605621 10.7266734,18.1354685 10.7972551,17.8226088 C11.1428332,17.8726889 11.4972759,17.8983461 11.8577112,17.8983461 C12.4404519,17.8983461 13.0075283,17.8312796 13.5516431,17.704444 L13.5516431,17.704444 Z M11.647504,16.2486556 C11.7899433,16.1769877 11.9536953,16.1729445 12.1289629,16.2145006 L12.1295992,17.8915701 L11.6488414,17.8915701 Z M18.076658,14.5384251 C18.3408687,14.8129591 18.5792009,15.0601343 18.7602727,15.2490003 C18.4630094,15.6715982 18.1302432,16.0674992 17.7642931,16.4299561 C17.760008,16.1031617 17.6330796,15.7725209 17.3827022,15.4371459 C17.6213444,15.172391 17.84157,14.889567 18.0408193,14.59153 Z M15.7132934,12 C15.7720323,12.0788945 15.8816793,12.2068494 16.0267203,12.3685635 C15.9587005,12.9569594 15.8529563,13.5224281 15.7151024,14.0660205 C15.5766074,13.9827778 15.431612,13.8997912 15.2796434,13.8165372 C15.4086802,13.2916983 15.5049326,12.7449573 15.5663281,12.177658 Z M11.8577112,2.07231992 C12.3964417,2.07231992 12.9233182,2.12307294 13.4338202,2.22005843 C13.3482946,2.46634834 13.3291871,2.80942794 13.3257056,3.18009412 C12.9372153,3.10094608 12.5375985,3.05338777 12.1295992,3.03871626 L12.1295992,3.03871626 L12.1285895,5.46156689 C11.9512681,5.48541444 11.7949663,5.52203287 11.647511,5.56512663 L11.6488414,3.03671385 C11.1516919,3.05043211 10.6667409,3.11297065 10.1986107,3.21970705 L10.1986107,3.21970705 L10.2319111,3.24530673 C10.1658846,3.3311949 10.0462903,3.50418212 9.89087978,3.75915386 C9.62977538,4.1875304 9.36819157,4.68780657 9.12380485,5.25485042 C9.01341424,5.51098675 8.90999389,5.77227871 8.81409497,6.03857038 C8.92044292,6.05347287 9.02990059,6.06739803 9.14251161,6.08031397 C8.59089467,6.2854912 8.24016554,6.82439202 7.90471412,7.41951697 C7.98348273,7.07932431 8.07527683,6.74650702 8.17795828,6.42043512 C7.70466339,6.32943083 7.29881452,6.21619073 6.95569933,6.08380127 C6.60329126,5.9478262 6.34968167,5.80643758 6.17669795,5.67370956 C5.25272496,6.7678951 4.63912903,8.13267068 4.47171053,9.63223592 L4.47171053,9.63223592 L6.46106208,9.63135388 C6.39057266,9.78245667 6.33155,9.94284808 6.28399409,10.1125281 L4.43369564,10.1129937 C4.42822282,10.2300057 4.42545584,10.3477251 4.42545584,10.4660908 C4.42545584,11.3842275 4.59193882,12.26348 4.89636373,13.0753073 C4.4091113,12.7914229 4.00443311,12.6090845 3.7852425,12.7756598 C3.57626503,12.0427631 3.46394029,11.2675444 3.46394029,10.4660908 C3.46394029,5.83033915 7.22195951,2.07231992 11.8577112,2.07231992 Z M20.251482,10.4660908 C20.251482,10.7723701 20.2350779,11.0748181 20.2031002,11.3726039 C19.9170941,11.0443975 19.6050883,10.7000998 19.2884819,10.3539205 L19.2878989,10.2890346 L19.2878989,10.2890346 L19.2817267,10.1129937 L19.0676605,10.1128629 C18.9200071,9.95185943 18.7724397,9.79115444 18.6271237,9.6321612 L19.2437118,9.63223592 C19.0902448,8.25763436 18.5618648,6.99629356 17.7631727,5.95281444 C18.0066226,5.74364905 18.2476986,5.51417296 18.4443564,5.26451895 C19.5763742,6.69409029 20.251482,8.5012506 20.251482,10.4660908 Z M15.7438711,2 C16.8484406,2 17.7438711,2.8954305 17.7438711,4 C17.7438711,5.1045695 16.8484406,6 15.7438711,6 C14.6393016,6 13.7438711,5.1045695 13.7438711,4 C13.7438711,2.8954305 14.6393016,2 15.7438711,2 Z M9.54775478,3.39980534 C8.37597945,3.78261085 7.33234419,4.44876384 6.49779749,5.31731583 C6.62432768,5.40795739 6.82688388,5.51879497 7.12876186,5.63527324 C7.46055004,5.76329221 7.85977995,5.87292013 8.33153044,5.96044351 C8.43917765,5.65550174 8.55635657,5.35680658 8.68230527,5.06457125 C8.93591679,4.47612336 9.20790254,3.95595361 9.48036769,3.50893822 C9.50354598,3.47091116 9.52602488,3.43452899 9.54775478,3.39980534 Z" id="path-1"></path>
+    </defs>
+    <g id="icon-/-Networking-/-AnimGraphNetSync" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <mask id="mask-2" fill="white">
+            <use xlink:href="#path-1"></use>
+        </mask>
+        <use id="Combined-Shape" fill="#D179BD" fill-rule="nonzero" xlink:href="#path-1"></use>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/Animation.svg b/Assets/Editor/Icons/Components/Animation.svg
new file mode 100644
index 0000000000..4890bb0900
--- /dev/null
+++ b/Assets/Editor/Icons/Components/Animation.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Animation / Animation</title>
+    <g id="icon-/-Animation-/-Animation" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M14.305803,6.47369367 C14.6993916,6.6892261 15.0165548,7.03456112 15.1933492,7.4597408 L17.5370596,10.7388937 L19.7921887,13.1099302 L18.4539274,14.5962199 L15.9723802,11.9890965 L15.954824,12 L15.8519674,11.8625904 L15.6374341,11.6372009 L15.6640685,11.6115701 L14.6333027,10.2345359 L13.1304978,13.609891 L15.8553007,16 L15.8655889,16 L15.8655889,22 L13.8655889,22 L13.8655889,16.9335637 L10.9173755,14.4145916 L10.6541721,14.2974059 L9.2787337,17.3866912 L8.50557994,19.1359308 L2.86558888,15.6954658 L3.92542741,13.9993696 L7.607861,16.2223461 L8.82708121,13.4839327 L8.81118422,13.4768549 L10.9142284,8.75334034 L9.33753914,9.12452852 L7.74923941,12.0950967 L6,11.1254774 L8.00970689,7.42096143 L8,7.3871095 L13.0613105,6.24191249 L13.0627046,6.24907236 L13.1028472,6.24373869 L13.1028472,6.24373869 C13.5346882,6.19071527 13.9512538,6.27953958 14.305803,6.47369367 Z M15,2 C16.1045695,2 17,2.8954305 17,4 C17,5.1045695 16.1045695,6 15,6 C13.8954305,6 13,5.1045695 13,4 C13,2.8954305 13.8954305,2 15,2 Z" id="Combined-Shape" fill="#5AA9D2"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/AreaLight.svg b/Assets/Editor/Icons/Components/AreaLight.svg
index 932f02dd2e..a52c5d38c3 100644
--- a/Assets/Editor/Icons/Components/AreaLight.svg
+++ b/Assets/Editor/Icons/Components/AreaLight.svg
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
-    <title>icon / Rendering / Area Light</title>
-    <desc>Created with Sketch.</desc>
+    <title>icon / Rendering / AreaLight</title>
     <defs>
-        <path d="M11.9641749,17.7856148 C13.3257638,17.7856148 14.6875407,17.7783003 16.0491297,17.7914288 C16.3488653,17.7943359 16.4603031,17.7128449 16.4576722,17.3984152 C16.4447995,15.7896941 16.4434841,14.180598 16.4586118,12.571877 C16.4617125,12.2379419 16.3492412,12.1518559 16.0274247,12.1531687 C13.3355358,12.1641405 10.6434589,12.1639529 7.95147605,12.1537314 C7.63416972,12.1525123 7.51427548,12.2310963 7.51775203,12.5700952 C7.53391333,14.1631557 7.53560462,15.7566851 7.51681242,17.3497456 C7.51267814,17.7094689 7.62994148,17.7972429 7.97318104,17.7926479 C9.30329307,17.7749243 10.633781,17.7854272 11.9641749,17.7856148 M11.9938304,10.9161937 C13.8017279,10.9162933 15.6096253,10.9251565 17.417318,10.9086252 C17.7666558,10.9054384 17.8832382,10.9838127 17.8807817,11.3429203 C17.8645073,13.7157593 17.8639955,16.0886978 17.8811911,18.4615367 C17.8838524,18.8295075 17.7500743,18.8904542 17.4115861,18.8894584 C13.795996,18.8789022 10.1802011,18.8790018 6.564611,18.8894584 C6.2227451,18.8905538 6.09193533,18.8201464 6.09439186,18.4560595 C6.11066631,16.0832205 6.11107573,13.7101824 6.09418715,11.3373435 C6.09152591,10.9653893 6.2368701,10.9075297 6.57044524,10.9099198 C8.37813795,10.9229656 10.1860354,10.9160941 11.9938304,10.9161937 Z M12.6103012,5.59363927 C12.6107353,6.06229258 12.6058152,6.53103384 12.6126166,6.99959921 C12.616379,7.26703676 12.4777474,7.48628103 11.9890637,7.48496187 C11.5000906,7.48364271 11.3647873,7.25463667 11.3642084,6.99502612 C11.3621825,6.0577195 11.3617484,5.12032493 11.3656555,4.18301831 C11.3668132,3.91030412 11.4851855,3.6605433 12.0304506,3.67725265 C12.5253568,3.69246695 12.615366,3.92956384 12.611893,4.18767934 C12.6052364,4.6562447 12.6098671,5.12498596 12.6103012,5.59363927 Z M5.08741081,7.58517593 C5.41910572,7.91625689 5.74707679,8.25118606 6.08321182,8.57770253 C6.27497917,8.76414899 6.33198093,9.01720546 5.98549659,9.36182422 C5.6388076,9.70664764 5.38120199,9.64038979 5.19722031,9.45722672 C4.53301189,8.7958834 3.86986686,8.13335232 3.20985377,7.46781367 C3.01783431,7.27415702 2.9249286,7.01384759 3.32230453,6.64010226 C3.68301419,6.30090887 3.91431317,6.40491553 4.09437258,6.58988655 C4.42099138,6.92591925 4.7557159,7.25409497 5.08741081,7.58517593 Z M18.7759482,9.46148123 C18.5895017,9.65324859 18.3364452,9.71025034 17.9918265,9.363766 C17.6470031,9.01707701 17.7132609,8.7594714 17.896424,8.57548973 C18.5577673,7.91128131 19.2202984,7.24813627 19.885837,6.58812318 C20.0794937,6.39610373 20.3398031,6.30319801 20.7135484,6.70057394 C21.0527418,7.06128361 20.9487352,7.29258258 20.7637641,7.472642 C20.4277314,7.79926079 20.0995557,8.13398532 19.7684748,8.46568023 C19.4373938,8.79737514 19.1024646,9.12534621 18.7759482,9.46148123 Z M2.86280349,15.5200582 C2.44056637,15.5205133 2.01832926,15.5120184 1.5962559,15.5236989 C1.34882511,15.5305251 1.1478183,15.4252492 1.15330403,14.8840033 C1.15821662,14.3997946 1.33637988,14.2714611 1.5732486,14.2740399 C2.45849733,14.283445 3.34374605,14.2832933 4.2289129,14.274495 C4.46463535,14.2720679 4.64705619,14.3991879 4.65303318,14.880211 C4.65966517,15.415389 4.46078715,15.5305251 4.21106382,15.5232438 C3.76172559,15.5100464 3.3122236,15.5194514 2.86280349,15.5200582 Z M20.7701815,15.5520997 C20.3074407,15.5513369 19.8445362,15.5508792 19.3817953,15.5514894 C19.1635584,15.551642 19.006693,15.4184465 19.0050564,14.9494396 C19.0034198,14.498894 19.1435922,14.3084839 19.3658388,14.3072634 C20.2914023,14.3023811 21.2169658,14.3060428 22.1425293,14.3060428 C22.374268,14.3060428 22.5118219,14.5294084 22.5047846,14.9512705 C22.4975837,15.3784726 22.3426821,15.5574398 22.1177352,15.5546935 C21.6685779,15.5487431 21.2193388,15.5528626 20.7701815,15.5520997 Z" id="path-1"></path>
+        <path d="M11.9641749,17.7856148 C13.3257638,17.7856148 14.6875407,17.7783003 16.0491297,17.7914288 C16.3488653,17.7943359 16.4603031,17.7128449 16.4576722,17.3984152 C16.4447995,15.7896941 16.4434841,14.180598 16.4586739,12.571877 C16.4617125,12.2379419 16.3492412,12.1518559 16.0274247,12.153154 C13.3355358,12.1641405 10.6434589,12.1639529 7.95147605,12.1537314 C7.63416972,12.1525123 7.51427548,12.2310963 7.51775203,12.5700952 C7.53391333,14.1631557 7.53560462,15.7566851 7.51681242,17.3497456 C7.51267814,17.7094689 7.62994148,17.7972429 7.97318104,17.7926479 C9.30329307,17.7749243 10.633781,17.7854272 11.9641749,17.7856148 M17.417318,10.9086252 C17.7666558,10.9054384 17.8832382,10.9838127 17.8807817,11.3429203 C17.8645073,13.7157593 17.8639955,16.0886978 17.88123,18.4615367 C17.8838524,18.8295075 17.7500743,18.8904542 17.4115861,18.8894708 C13.795996,18.8789022 10.1802011,18.8790018 6.564611,18.8894708 C6.2227451,18.8905538 6.09193533,18.8201464 6.09439186,18.4560595 C6.11066631,16.0832205 6.11107573,13.7101824 6.09415129,11.3373435 C6.09152591,10.9653893 6.2368701,10.9075297 6.57044524,10.9099198 C8.37813795,10.9229656 10.1860354,10.9160941 11.9938304,10.9161937 C13.8017279,10.9162933 15.6096253,10.9251565 17.417318,10.9086252 Z M22.1425293,14.3060428 C22.374268,14.3060428 22.5118219,14.5294084 22.5047846,14.9512705 C22.4975837,15.3784726 22.3426821,15.5574398 22.1177352,15.5546935 C21.6685779,15.5487431 21.2193388,15.5528626 20.7701815,15.5520997 C20.3074407,15.5513369 19.8445362,15.5508792 19.3817953,15.5514894 C19.1635584,15.551642 19.006693,15.4184465 19.0050422,14.9494396 C19.0034198,14.498894 19.1435922,14.3084839 19.3658388,14.3072634 C20.2914023,14.3023811 21.2169658,14.3060428 22.1425293,14.3060428 Z M1.5732486,14.2740399 C2.45849733,14.283445 3.34374605,14.2832933 4.2289129,14.274495 C4.46463535,14.2720679 4.64705619,14.3991879 4.65303318,14.880211 C4.65966517,15.415389 4.46078715,15.5305251 4.21106382,15.5232438 C3.76172559,15.5100464 3.3122236,15.5194514 2.86280349,15.5200582 C2.44056637,15.5205133 2.01832926,15.5120184 1.5962559,15.5236989 C1.34882511,15.5305251 1.1478183,15.4252492 1.15330403,14.8840033 C1.15821662,14.3997946 1.33637988,14.2714611 1.5732486,14.2740399 Z M20.7135484,6.70057394 C21.0527418,7.06128361 20.9487352,7.29258258 20.7637641,7.472642 C20.4277314,7.79926079 20.0995557,8.13398532 19.7684748,8.46568023 C19.4373938,8.79737514 19.1024646,9.12534621 18.7759482,9.46148123 C18.5895017,9.65324859 18.3364452,9.71025034 17.9918223,9.36377019 C17.6470031,9.01707701 17.7132609,8.7594714 17.896424,8.57548973 C18.5577673,7.91128131 19.2202984,7.24813627 19.885837,6.58812318 C20.0794937,6.39610373 20.3398031,6.30319801 20.7135484,6.70057394 Z M4.09437258,6.58988655 C4.42099138,6.92591925 4.7557159,7.25409497 5.08741081,7.58517593 C5.41910572,7.91625689 5.74707679,8.25118606 6.08321182,8.57770253 C6.27497917,8.76414899 6.33198093,9.01720546 5.98550077,9.36182841 C5.6388076,9.70664764 5.38120199,9.64038979 5.19722031,9.45722672 C4.53301189,8.7958834 3.86986686,8.13335232 3.20985377,7.46781367 C3.01783431,7.27415702 2.9249286,7.01384759 3.32230453,6.64010226 C3.68301419,6.30090887 3.91431317,6.40491553 4.09437258,6.58988655 Z M12.0304506,3.67725265 C12.5253568,3.69246695 12.615366,3.92956384 12.611893,4.18767934 C12.6052364,4.6562447 12.6098671,5.12498596 12.6103012,5.59363927 C12.6107353,6.06229258 12.6058152,6.53103384 12.6126166,6.99959921 C12.616379,7.26703676 12.4777474,7.48628103 11.9890637,7.48496779 C11.5000906,7.48364271 11.3647873,7.25463667 11.3642084,6.99502612 C11.3621825,6.0577195 11.3617484,5.12032493 11.3656555,4.18301831 C11.3668132,3.91030412 11.4851855,3.6605433 12.0304506,3.67725265 Z" id="path-1"></path>
     </defs>
-    <g id="icon-/-Rendering-/-Area-Light" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+    <g id="icon-/-Rendering-/-AreaLight" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <mask id="mask-2" fill="white">
             <use xlink:href="#path-1"></use>
         </mask>
diff --git a/Assets/Editor/Icons/Components/Attachment.svg b/Assets/Editor/Icons/Components/Attachment.svg
index 8dcaaae336..8d1b3c0dd5 100644
--- a/Assets/Editor/Icons/Components/Attachment.svg
+++ b/Assets/Editor/Icons/Components/Attachment.svg
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
     <title>icon / Animation / Attachment</title>
-    <desc>Created with Sketch.</desc>
     <defs>
         <path d="M5.12085575,9.92719073 C3.52225029,9.92719073 2.22632452,8.63126496 2.22632452,7.0326595 C2.22632452,5.43405404 3.52225029,4.13812826 5.12085575,4.13812826 C6.71946121,4.13812826 8.01538699,5.43405404 8.01538699,7.0326595 C8.01538699,8.63126496 6.71946121,9.92719073 5.12085575,9.92719073 Z M19.1800075,20.6783068 C17.581402,20.6783068 16.2854762,19.382381 16.2854762,17.7837755 C16.2854762,16.1851701 17.581402,14.8892443 19.1800075,14.8892443 C20.7786129,14.8892443 22.0745387,16.1851701 22.0745387,17.7837755 C22.0745387,19.382381 20.7786129,20.6783068 19.1800075,20.6783068 Z M7.83518264,9.6379601 L8.42681801,8.86555959 L9.97161904,10.0488303 L9.37998367,10.8212308 L7.83518264,9.6379601 Z M10.1523842,11.4128662 L10.7440196,10.6404657 L12.2888206,11.8237364 L11.6971852,12.5961369 L10.1523842,11.4128662 Z M12.4695857,13.1877723 L13.0612211,12.4153718 L14.6060221,13.5986425 L14.0143868,14.371043 L12.4695857,13.1877723 Z M14.7867873,14.9626784 L15.3784226,14.1902779 L16.9232237,15.3735486 L16.3315883,16.1459491 L14.7867873,14.9626784 Z" id="path-1"></path>
     </defs>
diff --git a/Assets/Editor/Icons/Components/AudioAnimationEventsProxy.svg b/Assets/Editor/Icons/Components/AudioAnimationEventsProxy.svg
index 89075c6026..e2a3d75cce 100644
--- a/Assets/Editor/Icons/Components/AudioAnimationEventsProxy.svg
+++ b/Assets/Editor/Icons/Components/AudioAnimationEventsProxy.svg
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 58 (84663) - https://sketch.com -->
-    <title>icon / Audio / Audio Animation Events Proxy</title>
-    <desc>Created with Sketch.</desc>
-    <g id="icon-/-Audio-/-Audio-Animation-Events-Proxy" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <path d="M12,2.9629324 L7.1028973,4.31152442 L7.1028973,13.6712754 L12,16.1201934 L12,6.45443512 L16.8971027,4.31152442 L12,2.9629324 Z M18.1520313,3.68396613 L18.1520313,14.2988336 L12,17.37531 L5.84796867,14.2988336 L5.84796867,3.68396613 L12,2.09479475 L18.1520313,3.68396613 Z M12.4082377,6.84868858 L12.4082377,16.713906 L11.7807734,16.713906 L11.7807734,6.84333874 L6.49900254,4.80708901 L6.7953934,4.26394696 L12.0997358,6.31207657 L17.0541547,4.26817209 L17.3660694,4.80286388 L12.4082377,6.84868858 Z M15.2193583,9.04081364 C15.9258956,8.83320244 16.3715544,8.18503342 16.2751635,7.3648751 C16.1787726,6.54471679 15.6858976,6.07643165 15.0252764,6.21423905 C14.3646553,6.35204645 13.8983017,7.05393555 13.8983017,7.82030812 C13.8983017,8.58668069 14.5128209,9.24842484 15.2193583,9.04081364 Z M15.4020263,14.2751389 C16.5178205,13.9472703 17.221624,12.923654 17.0693993,11.6284247 C16.9171747,10.3331955 16.1388053,9.59365951 15.095524,9.81129087 C14.0522426,10.0289222 13.315757,11.1373757 13.315757,12.3476641 C13.315757,13.5579526 14.2862322,14.6030074 15.4020263,14.2751389 Z" id="Combined-Shape" fill="#DF9557" fill-rule="nonzero"></path>
-        <path d="M10.6,18.8501837 L10.6,20.8501837 L13.4,20.8501837 L13.4,18.8501837 L10.6,18.8501837 Z M14.5560317,18.8501837 L14.5560317,20.8501837 L17.3560317,20.8501837 L16.4479179,19.8501837 L17.3560317,18.8501837 L14.5560317,18.8501837 Z M3.79702045,17.37531 L6.27189419,19.8501837 L3.79702045,22.3250574 L1.32214672,19.8501837 L3.79702045,17.37531 Z M20.2029795,17.37531 L22.6778533,19.8501837 L20.2029795,22.3250574 L17.7281058,19.8501837 L20.2029795,17.37531 Z M9.44396834,18.8501837 L9.44396834,20.8501837 L6.64396834,20.8501837 L7.55208208,19.8501837 L6.64396834,18.8501837 L9.44396834,18.8501837 Z" id="Combined-Shape" fill="#DF9557" fill-rule="nonzero"></path>
+    <title>icon / Audio / AudioAnimationEventsProxy</title>
+    <g id="icon-/-Audio-/-AudioAnimationEventsProxy" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M10.6,18.8501837 L10.6,20.8501837 L13.4,20.8501837 L13.4,18.8501837 L10.6,18.8501837 Z M14.5560317,18.8501837 L14.5560317,20.8501837 L17.3560317,20.8501837 L16.4479179,19.8501837 L17.3560317,18.8501837 L14.5560317,18.8501837 Z M3.79702045,17.37531 L6.27189419,19.8501837 L3.79702045,22.3250574 L1.32214672,19.8501837 L3.79702045,17.37531 Z M20.2029795,17.37531 L22.6778533,19.8501837 L20.2029795,22.3250574 L17.7281058,19.8501837 L20.2029795,17.37531 Z M9.44396834,18.8501837 L9.44396834,20.8501837 L6.64396834,20.8501837 L7.55208208,19.8501837 L6.64396834,18.8501837 L9.44396834,18.8501837 Z M12,2.9629324 L7.1028973,4.31152442 L7.1028973,13.6712754 L12,16.1201934 L12,6.45443512 L16.8971027,4.31152442 L12,2.9629324 Z M18.1520313,3.68396613 L18.1520313,14.2988336 L12,17.37531 L5.84796867,14.2988336 L5.84796867,3.68396613 L12,2.09479475 L18.1520313,3.68396613 Z M12.4082377,6.84868858 L12.4082377,16.713906 L11.7807734,16.713906 L11.7807734,6.84333874 L6.49900254,4.80708901 L6.7953934,4.26394696 L12.0997358,6.31207657 L17.0541547,4.26817209 L17.3660694,4.80286388 L12.4082377,6.84868858 Z M15.2193583,9.04081364 C15.9258956,8.83320244 16.3715544,8.18503342 16.2751635,7.3648751 C16.1787726,6.54471679 15.6858976,6.07643165 15.0252764,6.21423905 C14.3646553,6.35204645 13.8983017,7.05393555 13.8983017,7.82030812 C13.8983017,8.58668069 14.5128209,9.24842484 15.2193583,9.04081364 Z M15.4020263,14.2751389 C16.5178205,13.9472703 17.221624,12.923654 17.0693993,11.6284247 C16.9171747,10.3331955 16.1388053,9.59365951 15.095524,9.81129087 C14.0522426,10.0289222 13.315757,11.1373757 13.315757,12.3476641 C13.315757,13.5579526 14.2862322,14.6030074 15.4020263,14.2751389 Z" id="Combined-Shape" fill="#DF9557" fill-rule="nonzero"></path>
     </g>
 </svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/AudioArea.png b/Assets/Editor/Icons/Components/AudioArea.png
deleted file mode 100644
index 4b38a64f6a..0000000000
--- a/Assets/Editor/Icons/Components/AudioArea.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:89e9b8e8428924e7941ec96ca67edcdd159bf97f22a9b25eac84d1175ff89113
-size 697
diff --git a/Assets/Editor/Icons/Components/AudioArea.svg b/Assets/Editor/Icons/Components/AudioArea.svg
new file mode 100644
index 0000000000..6778424c09
--- /dev/null
+++ b/Assets/Editor/Icons/Components/AudioArea.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Audio / AudioArea</title>
+    <defs>
+        <path d="M18.9078388,17.9629694 L18.9078388,8.99092059 C17.8346161,8.83010669 16.9438759,8.15066675 16.5405659,7.23313164 L7.85873857,7.23313164 C7.47841885,8.22637695 6.56309448,8.97046804 5.4491689,9.14162489 L5.4491689,17.9629694 L9.41580881,17.9629694 C9.65102383,16.5448715 10.9276829,15.4611937 12.4673165,15.4611937 C14.0069501,15.4611937 15.2836092,16.5448715 15.5188242,17.9629694 L18.9078388,17.9629694 L18.9078388,17.9629694 Z M19.8898019,8.99092059 L19.8898019,18.9080846 L15.5188242,18.9080846 C15.2836092,20.3261825 14.0069501,21.4098602 12.4673165,21.4098602 C10.9276829,21.4098602 9.65102383,20.3261825 9.41580881,18.9080846 L4.46720586,18.9080846 L4.46720586,9.14162489 C2.99381974,8.91523623 1.86789192,7.68648331 1.86789192,6.20462388 C1.86789192,4.56194498 3.25146433,3.23029062 4.95818738,3.23029062 C6.66491043,3.23029062 8.04848283,4.56194498 8.04848283,6.20462388 C8.04848283,6.2325127 8.04808403,6.26031187 8.04729162,6.2880164 L16.3131002,6.2880164 C16.3100632,6.23531621 16.3085249,6.18223611 16.3085249,6.1288125 C16.3085249,4.5246936 17.6954207,3.23029062 19.3988203,3.23029062 C21.10222,3.23029062 22.4891158,4.5246936 22.4891158,6.1288125 C22.4891158,7.57562658 21.3608896,8.77048979 19.8898019,8.99092059 Z M19.4031303,4.17540985 C19.4041263,4.51495692 19.4081035,5.1090237 19.4150621,6.14839461 C19.4083638,7.14889366 19.4071904,7.73677396 19.4069849,8.08220482 C20.5709249,8.0781242 21.5071528,7.20183194 21.5071528,6.1288125 C21.5071528,5.05460882 20.5688572,4.1775668 19.4031303,4.17540985 L19.4031303,4.17540985 Z M4.95818738,8.23384189 C6.12258722,8.23384189 7.06651979,7.32533004 7.06651979,6.20462388 C7.06651979,5.08391771 6.12258722,4.17540586 4.95818738,4.17540586 C3.79378754,4.17540586 2.84985497,5.08391771 2.84985497,6.20462388 C2.84985497,7.32533004 3.79378754,8.23384189 4.95818738,8.23384189 Z" id="path-1"></path>
+    </defs>
+    <g id="icon-/-Audio-/-AudioArea" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <mask id="mask-2" fill="white">
+            <use xlink:href="#path-1"></use>
+        </mask>
+        <use id="Shape" fill="#DF9557" fill-rule="nonzero" xlink:href="#path-1"></use>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/AudioAreaEnvironment.svg b/Assets/Editor/Icons/Components/AudioAreaEnvironment.svg
index 17bd1f96ae..527dcc9d45 100644
--- a/Assets/Editor/Icons/Components/AudioAreaEnvironment.svg
+++ b/Assets/Editor/Icons/Components/AudioAreaEnvironment.svg
@@ -1,15 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
-    <title>icon / Audio / Audio Area  Environment</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <path d="M20.1493763,19.7230415 L20.1493763,3.83676722 L3.78023646,3.83676722 L3.78023646,19.7230415 L20.1493763,19.7230415 Z M20.1493763,20.7370591 L3.78023646,20.7370591 L3.78023646,22.668521 L2.76621895,22.668521 L2.76621895,20.7370591 L1.3176225,20.7370591 L1.3176225,19.7230415 L2.76621895,19.7230415 L2.76621895,3.83676722 L1.3176225,3.83676722 L1.3176225,2.82274971 L2.76621895,2.82274971 L2.76621895,1.37415326 L3.78023646,1.37415326 L3.78023646,2.82274971 L20.1493763,2.82274971 L20.1493763,1.37415326 L21.1633938,1.37415326 L21.1633938,2.82274971 L22.6103656,2.82274971 L22.6103656,3.83676722 L21.1633938,3.83676722 L21.1633938,19.7230415 L22.6103656,19.7230415 L22.6103656,20.7370591 L21.1633938,20.7370591 L21.1633938,22.668521 L20.1493763,22.668521 L20.1493763,20.7370591 Z M18.7249231,10.5727407 L19.2319318,10.5727407 L19.2319318,12.9870681 L18.7249231,12.9870681 L18.7249231,10.5727407 Z M5.68755511,11.0556062 L6.19456386,11.0556062 L6.19456386,12.5042026 L5.68755511,12.5042026 L5.68755511,11.0556062 Z M17.2763267,11.0556062 L17.7833354,11.0556062 L17.7833354,12.5042026 L17.2763267,12.5042026 L17.2763267,11.0556062 Z M7.13615155,10.5727407 L7.6431603,10.5727407 L7.6431603,12.9870681 L7.13615155,12.9870681 L7.13615155,10.5727407 Z M15.8277302,10.5727407 L16.334739,10.5727407 L16.334739,12.9870681 L15.8277302,12.9870681 L15.8277302,10.5727407 Z M8.58474799,9.12414423 L9.09175675,9.12414423 L9.09175675,14.4356645 L8.58474799,14.4356645 L8.58474799,9.12414423 Z M14.3791338,9.12414423 L14.8861425,9.12414423 L14.8861425,14.4356645 L14.3791338,14.4356645 L14.3791338,9.12414423 Z M10.0333444,6.22695135 L10.5403532,6.22695135 L10.5403532,17.3328574 L10.0333444,17.3328574 L10.0333444,6.22695135 Z M12.9305373,6.70981683 L13.4375461,6.70981683 L13.4375461,17.8157229 L12.9305373,17.8157229 L12.9305373,6.70981683 Z M11.4819409,4.29548942 L11.9889496,4.29548942 L11.9889496,19.2643193 L11.4819409,19.2643193 L11.4819409,4.29548942 Z M4.52867795,10.5727407 L5.03568671,10.5727407 L5.03568671,12.9870681 L4.52867795,12.9870681 L4.52867795,10.5727407 Z" id="path-1"></path>
-    </defs>
-    <g id="icon-/-Audio-/-Audio-Area--Environment" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <mask id="mask-2" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <use id="Combined-Shape" fill="#DF9557" xlink:href="#path-1"></use>
+    <title>icon / Audio / AudioAreaEnvironment</title>
+    <g id="icon-/-Audio-/-AudioAreaEnvironment" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M20.1493763,19.7230415 L20.1493763,3.83676722 L3.78023646,3.83676722 L3.78023646,19.7230415 L20.1493763,19.7230415 Z M3.78023646,1.37415326 L3.78023646,2.82274971 L20.1493763,2.82274971 L20.1493763,1.37415326 L21.1633938,1.37415326 L21.1633938,2.82274971 L22.6103656,2.82274971 L22.6103656,3.83676722 L21.1633938,3.83676722 L21.1633938,19.7230415 L22.6103656,19.7230415 L22.6103656,20.7370591 L21.1633938,20.7370591 L21.1633938,22.668521 L20.1493763,22.668521 L20.1493763,20.7370591 L3.78023646,20.7370591 L3.78023646,22.668521 L2.76621895,22.668521 L2.76621895,20.7370591 L1.3176225,20.7370591 L1.3176225,19.7230415 L2.76621895,19.7230415 L2.76621895,3.83676722 L1.3176225,3.83676722 L1.3176225,2.82274971 L2.76621895,2.82274971 L2.76621895,1.37415326 L3.78023646,1.37415326 Z M12.1338093,4.29548942 L11.6268005,4.29548942 L11.6268005,19.2643193 L12.1338093,19.2643193 L12.1338093,4.29548942 Z M13.5534338,6.70981683 L13.046425,6.70981683 L13.046425,17.8157229 L13.5534338,17.8157229 L13.5534338,6.70981683 Z M10.7141848,6.22695135 L10.207176,6.22695135 L10.207176,17.3328574 L10.7141848,17.3328574 L10.7141848,6.22695135 Z M9.29456025,9.12414423 L8.78755149,9.12414423 L8.78755149,14.4356645 L9.29456025,14.4356645 L9.29456025,9.12414423 Z M14.9730583,9.12414423 L14.4660496,9.12414423 L14.4660496,14.4356645 L14.9730583,14.4356645 L14.9730583,9.12414423 Z M19.2319318,10.5727407 L18.7249231,10.5727407 L18.7249231,12.9870681 L19.2319318,12.9870681 L19.2319318,10.5727407 Z M7.87493574,10.5727407 L7.36792698,10.5727407 L7.36792698,12.9870681 L7.87493574,12.9870681 L7.87493574,10.5727407 Z M16.3926828,10.5727407 L15.8856741,10.5727407 L15.8856741,12.9870681 L16.3926828,12.9870681 L16.3926828,10.5727407 Z M5.03568671,10.5727407 L4.52867795,10.5727407 L4.52867795,12.9870681 L5.03568671,12.9870681 L5.03568671,10.5727407 Z M6.45531122,11.0556062 L5.94830247,11.0556062 L5.94830247,12.5042026 L6.45531122,12.5042026 L6.45531122,11.0556062 Z M17.8123073,11.0556062 L17.3052986,11.0556062 L17.3052986,12.5042026 L17.8123073,12.5042026 L17.8123073,11.0556062 Z" id="Combined-Shape" fill="#DF9557"></path>
     </g>
 </svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/AudioListener.svg b/Assets/Editor/Icons/Components/AudioListener.svg
index 266ab04c56..edb7c62047 100644
--- a/Assets/Editor/Icons/Components/AudioListener.svg
+++ b/Assets/Editor/Icons/Components/AudioListener.svg
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
-    <title>icon / Audio / Audio Listener</title>
-    <desc>Created with Sketch.</desc>
+    <title>icon / Audio / AudioListener</title>
     <defs>
-        <path d="M4.10041385,9.80566392 L4.41978753,10.2090112 C4.35375385,10.2612972 4.24266874,10.3778241 4.12904125,10.5554631 C3.63821291,11.3227976 3.6622782,12.341479 4.58996878,13.6569395 L4.16952511,13.9534453 C3.12147055,12.4673093 3.0920482,11.221864 3.69564225,10.2782378 C3.84283396,10.0481263 3.99256806,9.8910571 4.10041385,9.80566392 Z M2.24380753,8.48742944 L2.66465763,8.78335808 C2.57598915,8.90945651 2.43551499,9.166404 2.29283365,9.54353432 C1.80543457,10.8318105 1.72721767,12.4049741 2.32442068,14.2172793 L1.83578798,14.3782969 C1.2000228,12.4489687 1.28421881,10.7555482 1.81164157,9.36148285 C1.97045646,8.94170889 2.13147853,8.64717631 2.24380753,8.48742944 Z M6.57665767,18.642551 C6.85348308,19.0948391 7.9276686,19.592857 8.56161817,19.592857 C8.61064636,19.592857 8.65295957,19.5933546 8.74501071,19.5947526 C9.19493421,19.6014458 9.42606213,19.5858936 9.68205745,19.5112326 C10.1635461,19.3708064 10.5172696,19.0323263 10.7606959,18.3442911 C11.1599395,17.215844 11.9013761,16.6404893 13.6967589,15.708131 C13.8090485,15.6498641 13.8090485,15.6498641 13.9207646,15.5918453 C14.6479144,15.2137449 15.0397195,14.987665 15.4155975,14.7090914 C16.8670422,13.6333853 17.2570973,12.7228619 17.2570971,10.2362182 C17.2570969,7.02015982 15.4756113,4.5767267 12.1311429,4.5767267 C10.4193504,4.5767267 9.22451797,5.09663107 8.42742551,5.95709796 C8.15227965,6.25411984 7.94501337,6.57202117 7.79665689,6.88829732 C7.71037976,7.0722286 7.66423119,7.20859248 7.6487538,7.27296505 L6.64830699,7.03242312 C6.76015877,6.56721627 7.06842971,5.91002389 7.67257585,5.2578439 C8.66475288,4.18678185 10.1333181,3.54776886 12.1311429,3.54776886 C16.1267536,3.54776886 18.2860547,6.50940259 18.286055,10.2362181 C18.2860552,13.0285324 17.7626343,14.2503778 16.0282681,15.5357648 C15.5959808,15.856145 15.1686717,16.1027113 14.3954598,16.5047629 C14.2827528,16.5632965 14.2827528,16.5632965 14.1709746,16.6212979 C12.606314,17.4338401 12.0107647,17.8959863 11.7307317,18.687489 C11.3776754,19.6853892 10.771679,20.2652707 9.97015048,20.4990365 C9.58628265,20.6109916 9.27778303,20.63175 8.72970525,20.6235966 C8.63937677,20.6222365 8.60351686,20.6218148 8.56161817,20.6218148 C7.5945769,20.6218148 6.18039374,19.966166 5.69903562,19.1797044 C5.1823534,18.335529 5.18842083,17.6160844 5.50317901,16.7902536 C5.46926822,16.8792507 5.62813758,16.4752195 5.64369041,16.421539 L6.63200291,16.7078826 C6.60246216,16.8098423 6.42184741,17.2704868 6.45733135,17.1760656 C6.25329791,17.7182142 6.25289236,18.1135707 6.57665767,18.642551 Z M10.4301379,8.00166743 L10.8769786,7.74667335 C10.9402408,7.85753129 11.0658777,8.03357607 11.2409257,8.20868131 C11.5197934,8.48764016 11.8208237,8.64968484 12.1290397,8.64968484 C13.0881459,8.64968484 14.256743,9.1831326 14.6677462,9.81981431 C14.8862434,10.1582865 15.0129769,10.6916344 14.9701013,11.1355779 C14.9141899,11.714498 14.5806875,12.1061168 14.0020178,12.1061168 C12.884071,12.1061168 11.4428305,12.584971 11.2154326,13.1318 C10.8310859,14.0560472 9.87477382,15.3242971 9.28379878,15.5698746 C8.85022885,15.7500429 8.09982192,15.513894 7.6607661,15.0168781 C7.09405059,14.3753501 7.05501759,13.4209938 7.67451611,12.2547403 C8.11149397,11.432096 8.67473189,10.9174382 9.34191828,10.6680151 C9.96046411,10.436776 10.5552082,10.4448122 11.3161388,10.5950442 C11.3800712,10.6076665 11.6050222,10.6544867 11.6521947,10.6636178 C11.7467483,10.6819204 11.8067325,10.6901833 11.8406735,10.6901833 L11.8406735,11.2046622 C11.7646592,11.2046622 11.6794902,11.1929301 11.5544229,11.168721 C11.5028069,11.1587298 11.2765912,11.1116463 11.2164878,11.09978 C10.5408848,10.9663944 10.0314049,10.9595103 9.52207506,11.1499198 C8.97624446,11.3539749 8.5085359,11.7813428 8.12887242,12.4960884 C7.60351937,13.4851058 7.63310494,14.2084726 8.0463446,14.6762643 C8.34914461,15.0190371 8.87239501,15.1837011 9.08637594,15.0947822 C9.52173002,14.9138724 10.4034119,13.7445962 10.740391,12.9342548 C11.0751433,12.1292683 12.6932867,11.5916379 14.0020178,11.5916379 C14.2831999,11.5916379 14.425298,11.4247777 14.4580052,11.0861202 C14.4898279,10.7566199 14.3906266,10.339139 14.2355058,10.0988426 C13.9275472,9.62178654 12.9250561,9.16416376 12.1290397,9.16416376 C11.6618919,9.16416376 11.2434672,8.93892572 10.8770747,8.57241338 C10.6649666,8.3602359 10.5142136,8.14899796 10.4301379,8.00166743 Z M19.723529,9.80566392 C19.8313748,9.8910571 19.9811089,10.0481263 20.1283006,10.2782378 C20.7318947,11.221864 20.7024723,12.4673093 19.6544177,13.9534453 L19.2339741,13.6569395 C20.1616646,12.341479 20.1857299,11.3227976 19.6949016,10.5554631 C19.5812741,10.3778241 19.470189,10.2612972 19.4041553,10.2090112 L19.723529,9.80566392 Z M21.5832463,8.48742944 C21.6955753,8.64717631 21.8565974,8.94170889 22.0154123,9.36148285 C22.542835,10.7555482 22.6270311,12.4489687 21.9912659,14.3782969 L21.5026332,14.2172793 C22.0998362,12.4049741 22.0216193,10.8318105 21.5342202,9.54353432 C21.3915389,9.166404 21.2510647,8.90945651 21.1623962,8.78335808 L21.5832463,8.48742944 Z" id="path-1"></path>
+        <path d="M4.10041385,9.80566392 L4.41978753,10.2090112 C4.35375385,10.2612972 4.24266874,10.3778241 4.12904125,10.5554631 C3.63821291,11.3227976 3.6622782,12.341479 4.58996878,13.6569395 L4.16952511,13.9534453 C3.12147055,12.4673093 3.0920482,11.221864 3.69564225,10.2782378 C3.84283396,10.0481263 3.99256806,9.8910571 4.10041385,9.80566392 Z M2.24380753,8.48742944 L2.66465763,8.78335808 C2.57598915,8.90945651 2.43551499,9.166404 2.29283365,9.54353432 C1.80543457,10.8318105 1.72721767,12.4049741 2.32442068,14.2172793 L1.83578798,14.3782969 C1.2000228,12.4489687 1.28421881,10.7555482 1.81164157,9.36148285 C1.97045646,8.94170889 2.13147853,8.64717631 2.24380753,8.48742944 Z M6.57665767,18.642551 C6.85348308,19.0948391 7.9276686,19.592857 8.56161817,19.592857 C8.61064636,19.592857 8.65295957,19.5933546 8.74501071,19.5947526 C9.19493421,19.6014458 9.42606213,19.5858936 9.68205745,19.5112326 C10.1635461,19.3708064 10.5172696,19.0323263 10.7606959,18.3442911 C11.1599395,17.215844 11.9013761,16.6404893 13.6967589,15.708131 C13.8090485,15.6498641 13.8090485,15.6498641 13.9207646,15.5918453 C14.6479144,15.2137449 15.0397195,14.987665 15.4155975,14.7090914 C16.8670422,13.6333853 17.2570973,12.7228619 17.2570971,10.2362182 C17.2570969,7.02015982 15.4756113,4.5767267 12.1311429,4.5767267 C10.4193504,4.5767267 9.22451797,5.09663107 8.42742551,5.95709796 C8.15227965,6.25411984 7.94501337,6.57202117 7.79665689,6.88829732 C7.71037976,7.0722286 7.66423119,7.20859248 7.6487538,7.27296505 L6.64830699,7.03242312 C6.76015877,6.56721627 7.06842971,5.91002389 7.67257585,5.2578439 C8.66475288,4.18678185 10.1333181,3.54776886 12.1311429,3.54776886 C16.1267536,3.54776886 18.286055,6.50940259 18.286055,10.2362181 C18.286055,13.0285324 17.7626343,14.2503778 16.0282681,15.5357648 C15.5959808,15.856145 15.1686717,16.1027113 14.3954598,16.5047629 C14.2827528,16.5632965 14.2827528,16.5632965 14.1709746,16.6212979 C12.606314,17.4338401 12.0107647,17.8959863 11.7307317,18.687489 C11.3776754,19.6853892 10.771679,20.2652707 9.97015048,20.4990365 C9.58628265,20.6109916 9.27778303,20.63175 8.72970525,20.6235966 C8.63937677,20.6222365 8.60351686,20.6218148 8.56161817,20.6218148 C7.5945769,20.6218148 6.18039374,19.966166 5.69903562,19.1797044 C5.1823534,18.335529 5.18842083,17.6160844 5.50317901,16.7902536 C5.46926822,16.8792507 5.62813758,16.4752195 5.64369041,16.421539 L6.63200291,16.7078826 C6.60246216,16.8098423 6.42184741,17.2704868 6.45733135,17.1760656 C6.25329791,17.7182142 6.25289236,18.1135707 6.57665767,18.642551 Z M10.4301379,8.00166743 L10.8769786,7.74667335 C10.9402408,7.85753129 11.0658777,8.03357607 11.2409257,8.20868131 C11.5197934,8.48764016 11.8208237,8.64968484 12.1290397,8.64968484 C13.0881459,8.64968484 14.256743,9.1831326 14.6677462,9.81981431 C14.8862434,10.1582865 15.0129769,10.6916344 14.9701013,11.1355779 C14.9141899,11.714498 14.5806875,12.1061168 14.0020178,12.1061168 C12.884071,12.1061168 11.4428305,12.584971 11.2154326,13.1318 C10.8310859,14.0560472 9.87477382,15.3242971 9.28379878,15.5698746 C8.85022885,15.7500429 8.09982192,15.513894 7.6607661,15.0168781 C7.09405059,14.3753501 7.05501759,13.4209938 7.67451611,12.2547403 C8.11149397,11.432096 8.67473189,10.9174382 9.34191828,10.6680151 C9.96046411,10.436776 10.5552082,10.4448122 11.3161388,10.5950442 C11.3800712,10.6076665 11.6050222,10.6544867 11.6521947,10.6636178 C11.7467483,10.6819204 11.8067325,10.6901833 11.8406735,10.6901833 L11.8406735,11.2046622 C11.7646592,11.2046622 11.6794902,11.1929301 11.5544229,11.168721 C11.5028069,11.1587298 11.2765912,11.1116463 11.2164878,11.09978 C10.5408848,10.9663944 10.0314049,10.9595103 9.52207506,11.1499198 C8.97624446,11.3539749 8.5085359,11.7813428 8.12887242,12.4960884 C7.60351937,13.4851058 7.63310494,14.2084726 8.0463446,14.6762643 C8.34914461,15.0190371 8.87239501,15.1837011 9.08637594,15.0947822 C9.52173002,14.9138724 10.4034119,13.7445962 10.740391,12.9342548 C11.0751433,12.1292683 12.6932867,11.5916379 14.0020178,11.5916379 C14.2831999,11.5916379 14.425298,11.4247777 14.4580052,11.0861202 C14.4898279,10.7566199 14.3906266,10.339139 14.2355058,10.0988426 C13.9275472,9.62178654 12.9250561,9.16416376 12.1290397,9.16416376 C11.6618919,9.16416376 11.2434672,8.93892572 10.8770747,8.57241338 C10.6649666,8.3602359 10.5142136,8.14899796 10.4301379,8.00166743 Z M19.723529,9.80566392 C19.8313748,9.8910571 19.9811089,10.0481263 20.1283006,10.2782378 C20.7318947,11.221864 20.7024723,12.4673093 19.6544177,13.9534453 L19.2339741,13.6569395 C20.1616646,12.341479 20.1857299,11.3227976 19.6949016,10.5554631 C19.5812741,10.3778241 19.470189,10.2612972 19.4041553,10.2090112 L19.723529,9.80566392 Z M21.5832463,8.48742944 C21.6955753,8.64717631 21.8565974,8.94170889 22.0154123,9.36148285 C22.542835,10.7555482 22.6270311,12.4489687 21.9912659,14.3782969 L21.5026332,14.2172793 C22.0998362,12.4049741 22.0216193,10.8318105 21.5342202,9.54353432 C21.3915389,9.166404 21.2510647,8.90945651 21.1623962,8.78335808 L21.5832463,8.48742944 Z" id="path-1"></path>
     </defs>
-    <g id="icon-/-Audio-/-Audio-Listener" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+    <g id="icon-/-Audio-/-AudioListener" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <mask id="mask-2" fill="white">
             <use xlink:href="#path-1"></use>
         </mask>
diff --git a/Assets/Editor/Icons/Components/AudioMultiPosition.png b/Assets/Editor/Icons/Components/AudioMultiPosition.png
deleted file mode 100644
index 1c8104c837..0000000000
--- a/Assets/Editor/Icons/Components/AudioMultiPosition.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c78de41c9b2018c0a5d91f8093adfdf13527259bd4b06691bdef05efeac80b0a
-size 428
diff --git a/Assets/Editor/Icons/Components/AudioMultiPosition.svg b/Assets/Editor/Icons/Components/AudioMultiPosition.svg
new file mode 100644
index 0000000000..273e5a060c
--- /dev/null
+++ b/Assets/Editor/Icons/Components/AudioMultiPosition.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Audio / AudioMultiPosition</title>
+    <defs>
+        <path d="M18.8634151,13.8021518 C21.0935523,13.8021518 22.9014357,15.6100352 22.9014357,17.8401724 L22.9014357,22.9950937 L17.9194412,22.9950937 C15.5671121,22.9950937 13.6601727,21.0881542 13.6601727,18.7358252 L13.6601727,18.2891057 C13.6601727,16.0589685 16.050667,13.8021518 18.2808042,13.8021518 L18.8634151,13.8021518 Z M12.9712395,1.04989456 C13.2857356,1.05234146 13.5428007,1.05606524 13.7424349,1.0610659 C14.445831,2.3405871 14.8435686,3.79404612 14.8435686,5.33807451 C14.8435686,5.81843088 14.8050729,6.29002133 14.7308539,6.75033555 C15.4163722,6.54643488 16.1279706,6.39562305 16.8590453,6.30240747 C16.8676223,6.15091877 16.8711488,5.99729491 16.8711488,5.84292062 C16.8711488,4.14299317 16.4435338,2.53405947 15.6820367,1.10435279 L17.0629971,1.08901478 C17.7388397,2.54545721 18.1136166,4.15271135 18.1136166,5.84292062 C18.1136166,5.96321114 18.1117183,6.08308149 18.1079484,6.20250721 C18.2731481,6.19481383 18.4403758,6.1917938 18.6083494,6.1917938 C19.9413536,6.1917938 21.2273749,6.38198525 22.436718,6.73503124 L22.8865693,6.87500389 L22.8776557,8.18747427 C21.5572524,7.70152738 20.116946,7.43426166 18.6083494,7.43426166 C18.4037933,7.43426166 18.2004927,7.43917551 17.9985763,7.44888209 C17.9015978,8.12973246 17.7426226,8.79225348 17.5277609,9.43153348 C18.0089826,9.36289595 18.5020805,9.3279473 19.003591,9.3279473 C20.3877705,9.3279473 21.7078654,9.59417624 22.9076829,10.0757573 L22.8691091,12.8044696 C21.7439646,12.1758306 20.4218626,11.812883 19.003591,11.812883 C17.946632,11.812883 16.9430846,12.0144602 16.0346649,12.3773602 C15.0316952,13.8132317 13.7075828,15.0333533 12.1585133,15.9514907 C11.7654265,16.783616 11.5487839,17.7007528 11.5487839,18.6619255 C11.5487839,20.2805315 12.1631445,21.7742592 13.1926851,22.9509074 L10.9361773,22.9501054 C10.6216813,22.9476585 10.3646161,22.9439348 10.164982,22.9389341 C9.46158582,21.6594129 9.06384821,20.2059539 9.06384821,18.6619255 C9.06384821,18.181702 9.10232269,17.7102397 9.17650138,17.2500466 C8.49104462,17.4535651 7.77944622,17.6043769 7.04837152,17.6975925 C7.03979458,17.8490812 7.0362681,18.0027051 7.0362681,18.1570794 C7.0362681,19.8570068 7.4638831,21.4659405 8.22538017,22.8956472 L6.84441979,22.9109852 C6.16857714,21.4545428 5.79380024,19.8472887 5.79380024,18.1570794 C5.79380024,18.0371249 5.79568791,17.9175882 5.79943689,17.7984936 C5.6342687,17.8051862 5.46704108,17.8082062 5.29906742,17.8082062 C3.96606326,17.8082062 2.68004191,17.6180147 1.47069888,17.2649688 L1.02084754,17.1249961 L1.02976113,15.8125257 C2.35016445,16.2984726 3.79047084,16.5657383 5.29906742,16.5657383 C5.50362356,16.5657383 5.70692415,16.5608245 5.9088405,16.5511179 C6.00576825,15.8706216 6.16462894,15.2084357 6.37932071,14.569464 C5.89843422,14.637104 5.40533631,14.6720527 4.90382581,14.6720527 C3.51964631,14.6720527 2.19955149,14.4058238 0.999733965,13.9242427 L1.03830772,11.1955304 C2.16345222,11.8241694 3.48555421,12.187117 4.90382581,12.187117 C5.96078483,12.187117 6.96433229,11.9855398 7.87275199,11.6226398 C8.87512523,10.1873075 10.1995274,8.96681061 11.7489988,8.04845281 C12.1420738,7.21603057 12.3586329,6.29906203 12.3586329,5.33807451 C12.3586329,3.71946854 11.7442723,2.22574081 10.7147317,1.0490926 L12.9712395,1.04989456 Z M19.5695488,15.0688395 L14.9515749,19.6868134 C14.5092787,20.1291095 14.6528476,20.56431 15.2721805,20.6514684 L17.9364826,21.0281297 L19.1072665,22.1989136 C19.3583815,22.4467753 19.7625639,22.4451898 20.0117271,22.1953662 L22.0954859,20.1116073 C22.3443071,19.8627862 22.348091,19.4557314 22.0992699,19.2069102 L20.9036511,18.0157854 L20.5332577,15.3901546 C20.4462176,14.7707035 20.0118449,14.6265433 19.5695488,15.0688395 Z M16.7202487,7.57798318 L16.5257194,7.60736371 C15.7822444,7.73252367 15.0637103,7.92348455 14.377329,8.1734575 C13.3909314,11.0851001 10.9275848,13.3672535 7.82577081,14.2619377 C7.5340867,14.9503564 7.31860301,15.6737763 7.18699222,16.4230179 C8.00042053,16.3001509 8.78460966,16.0980906 9.53079366,15.8262854 C10.5164855,12.9148999 12.9798321,10.6327465 16.081646,9.73806235 C16.3732009,9.04995044 16.5886219,8.32686802 16.7202487,7.57798318 Z M5.98797568,1.00490631 C8.3403047,1.00490631 10.2472442,2.91184576 10.2472442,5.26417479 L10.2472442,5.71089432 C10.2472442,7.94103147 7.85674983,10.1978482 5.62661267,10.1978482 L5.04400171,10.1978482 C2.81386455,10.1978482 1.00598118,8.38996479 1.00598118,6.15982764 L1.00598118,1.00490631 L5.98797568,1.00490631 Z M3.89568979,1.80463384 L1.81193093,3.8883927 C1.56310978,4.13721385 1.55932583,4.54426863 1.80814698,4.79308977 L2.98851005,5.97345284 L3.00376571,5.98421459 L3.37415917,8.60984537 C3.46119927,9.2292965 3.89557193,9.37345666 4.33786808,8.93116051 L8.95584197,4.31318663 C9.39813812,3.87089048 9.25456926,3.43568999 8.63523639,3.34853163 L5.97093427,2.97187034 L4.80015034,1.80108641 C4.54903537,1.55322471 4.14485294,1.55481015 3.89568979,1.80463384 Z" id="path-1"></path>
+    </defs>
+    <g id="icon-/-Audio-/-AudioMultiPosition" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <mask id="mask-2" fill="white">
+            <use xlink:href="#path-1"></use>
+        </mask>
+        <use id="Combined-Shape" fill="#DF9557" xlink:href="#path-1"></use>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/AudioPreload.svg b/Assets/Editor/Icons/Components/AudioPreload.svg
index 8c7f075706..60334d7bdd 100644
--- a/Assets/Editor/Icons/Components/AudioPreload.svg
+++ b/Assets/Editor/Icons/Components/AudioPreload.svg
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
-    <title>icon / Audio / Audio Preload</title>
-    <desc>Created with Sketch.</desc>
+    <title>icon / Audio / AudioPreload</title>
     <defs>
-        <path d="M9.0106483,15.2225254 C8.53250584,15.2225254 8.14503774,14.8277851 8.14503774,14.3496427 L8.14503774,10.3454269 C8.14440231,9.86599254 8.53122376,9.47612446 9.0106483,9.47299867 L11.2604631,9.47299867 L14.182268,7.27499779 C14.8610758,6.76367625 15.4171664,7.04388045 15.4171664,7.89381049 L15.4171664,16.7678527 C15.4171664,17.6177827 14.861303,17.8966234 14.1824953,17.3850746 L11.3038686,15.2182075 C11.2954602,15.2184348 11.2872791,15.2225254 11.2788707,15.2225254 L9.0106483,15.2225254 Z M15.1203509,2.44554921 C15.8194168,2.76269043 16.0102655,3.3521478 15.8458379,3.93342403 C15.6814104,4.51470025 15.2739896,4.7831104 14.4015524,4.57173247 C13.4924121,4.35146193 12.4123873,4.32887171 11.3969511,4.43552297 C10.4357829,4.53647446 9.29595995,4.90595862 8.687256,5.2668505 C8.08081453,5.626401 7.08466298,6.25121503 6.33632986,7.06861033 C5.54000424,7.93842728 5.002093,9.00936755 4.75092877,9.62913208 C4.53666356,10.1578458 4.32387306,11.1379754 4.23866853,12.1851804 C4.11475926,13.7080853 4.54591296,15.3613499 5.12230145,16.4199184 C6.18420273,18.3701573 7.62520062,19.5781877 9.24866143,20.3135376 C10.8721222,21.0488875 13.1546375,21.1395238 15.056469,20.5580685 C16.9583006,19.9766132 20.509327,17.6882596 21.086191,15.9118111 C20.7124226,17.9875464 18.2337271,19.7442125 17.4384631,20.2590651 C16.6431992,20.7739178 14.5243561,21.7166729 12.2275096,21.6609282 C9.93066313,21.6051835 8.19063526,20.8818689 6.97901323,20.066626 C6.06573505,19.4521244 5.26556161,18.7906438 4.40852985,17.6063692 C3.70153067,16.6294145 3.21956312,15.5383183 2.91572218,14.5124207 C2.66032748,13.6500985 2.52827982,12.596485 2.54038603,11.7671425 C2.56144009,10.3248222 2.87670333,9.04664527 3.38683483,7.9074765 C4.1902949,6.11327908 5.21084046,4.73061521 7.34274871,3.4155105 C8.16857176,2.90608718 9.359817,2.35377926 11.0239763,2.12784041 C12.8175167,1.88433579 14.6671076,2.23992891 15.1203509,2.44554921 Z" id="path-1"></path>
+        <path d="M15.1203509,2.44554921 C15.8194168,2.76269043 16.0102655,3.3521478 15.8458379,3.93342403 C15.6814104,4.51470025 15.2739896,4.7831104 14.4015524,4.57173247 C13.4924121,4.35146193 12.4123873,4.32887171 11.3969511,4.43552297 C10.4357829,4.53647446 9.29595995,4.90595862 8.687256,5.2668505 C8.08081453,5.626401 7.08466298,6.25121503 6.33632986,7.06861033 C5.54000424,7.93842728 5.002093,9.00936755 4.75092877,9.62913208 C4.53666356,10.1578458 4.32387306,11.1379754 4.23866853,12.1851804 C4.11475926,13.7080853 4.54591296,15.3613499 5.12230145,16.4199184 C6.18420273,18.3701573 7.62520062,19.5781877 9.24866143,20.3135376 C10.8721222,21.0488875 13.1546375,21.1395238 15.056469,20.5580685 C16.9583006,19.9766132 20.509327,17.6882596 21.086191,15.9118111 C20.7124226,17.9875464 18.2337271,19.7442125 17.4384631,20.2590651 C16.6431992,20.7739178 14.5243561,21.7166729 12.2275096,21.6609282 C9.93066313,21.6051835 8.19063526,20.8818689 6.97901323,20.066626 C6.06573505,19.4521244 5.26556161,18.7906438 4.40852985,17.6063692 C3.70153067,16.6294145 3.21956312,15.5383183 2.91572218,14.5124207 C2.66032748,13.6500985 2.52827982,12.596485 2.54038603,11.7671425 C2.56144009,10.3248222 2.87670333,9.04664527 3.38683483,7.9074765 C4.1902949,6.11327908 5.21084046,4.73061521 7.34274871,3.4155105 C8.16857176,2.90608718 9.359817,2.35377926 11.0239763,2.12784041 C12.8175167,1.88433579 14.6671076,2.23992891 15.1203509,2.44554921 Z M14.182268,7.27499779 C14.8610758,6.76367625 15.4171664,7.04388045 15.4171664,7.89381049 L15.4171664,7.89381049 L15.4171664,16.7678527 C15.4171664,17.6177827 14.861303,17.8966234 14.1824953,17.3850746 L14.1824953,17.3850746 L11.3038686,15.2182075 C11.2954602,15.2184348 11.2872791,15.2225254 11.2788707,15.2225254 L11.2788707,15.2225254 L9.0106483,15.2225254 C8.53250584,15.2225254 8.14503696,14.8277851 8.14503696,14.3496427 L8.14503696,14.3496427 L8.14503696,10.3454269 C8.14440231,9.86599254 8.53122376,9.47612446 9.0106483,9.47299867 L9.0106483,9.47299867 L11.2604631,9.47299867 Z" id="path-1"></path>
     </defs>
-    <g id="icon-/-Audio-/-Audio-Preload" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+    <g id="icon-/-Audio-/-AudioPreload" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <mask id="mask-2" fill="white">
             <use xlink:href="#path-1"></use>
         </mask>
diff --git a/Assets/Editor/Icons/Components/AudioProxy.svg b/Assets/Editor/Icons/Components/AudioProxy.svg
index 1ba4b72d2f..66a4653e0c 100644
--- a/Assets/Editor/Icons/Components/AudioProxy.svg
+++ b/Assets/Editor/Icons/Components/AudioProxy.svg
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
-    <title>icon / Audio / Audio Proxy</title>
-    <desc>Created with Sketch.</desc>
+    <title>icon / Audio / AudioProxy</title>
     <defs>
-        <path d="M15.8412399,10.4134728 L18.7921077,8.7097885 L17.8120763,8.4282703 C17.2879728,8.27771934 16.9811062,7.7350368 17.1222397,7.20831926 L17.1268376,7.19115986 C17.2672401,6.66717063 17.805836,6.35621214 18.3298252,6.49661463 C18.3354936,6.49813348 18.3411483,6.4997031 18.3467886,6.5013233 L21.5072342,7.40917478 C21.5854786,7.43165083 21.6588813,7.46286673 21.7266743,7.50146459 C22.1617777,7.69563794 22.4070985,8.1789301 22.2884446,8.65578009 L21.4944442,11.846732 C21.4930272,11.8524267 21.4915592,11.8581087 21.4900403,11.8637771 C21.3496378,12.3877663 20.8110419,12.6987248 20.2870527,12.5583223 L20.2698933,12.5537245 C19.7431758,12.4125909 19.4266322,11.8754954 19.558303,11.346333 L19.7819006,10.4477324 L17.0855856,12.0044506 C17.5222737,12.8226887 17.7698096,13.7571258 17.7698096,14.749378 C17.7698096,17.9737471 15.155942,20.5876146 11.9315729,20.5876146 C8.70720387,20.5876146 6.09333629,17.9737471 6.09333629,14.749378 C6.09333629,13.7060531 6.3670101,12.7266481 6.84648663,11.8790342 L4.36739915,10.4477324 L4.59099674,11.346333 C4.72266753,11.8754954 4.40612397,12.4125909 3.87940643,12.5537245 L3.86224702,12.5583223 C3.3382578,12.6987248 2.7996619,12.3877663 2.65925941,11.8637771 C2.65774055,11.8581087 2.65627253,11.8524267 2.65485552,11.846732 L1.86085517,8.65578009 C1.74220122,8.1789301 1.98752209,7.69563794 2.42262547,7.50146459 C2.49041846,7.46286673 2.56382109,7.43165083 2.64206552,7.40917478 L5.80251111,6.5013233 C5.80815141,6.4997031 5.81380611,6.49813348 5.81947453,6.49661463 C6.34346376,6.35621214 6.88205966,6.66717063 7.02246215,7.19115986 L7.02706,7.20831926 C7.16819354,7.7350368 6.86132692,8.27771934 6.33722344,8.4282703 L5.35719204,8.7097885 L8.13533171,10.3137482 C8.95327431,9.61305289 9.96729247,9.13467462 11.0837445,8.97225504 L11.0837445,5.36391383 L10.4173324,6.00685533 C10.0248997,6.38546677 9.40148951,6.37987979 9.0159055,5.99429579 L9.00334395,5.98173423 C8.61975721,5.5981475 8.61975721,4.97623052 9.00334395,4.59264378 C9.00749352,4.58849421 9.0116802,4.5843819 9.01590348,4.58030736 L11.3823487,2.29720693 C11.735986,1.95602459 12.2771897,1.92683262 12.6629004,2.20655653 C12.7302237,2.24596805 12.7939587,2.29392864 12.8525458,2.35045228 L15.218991,4.63355271 C15.2232143,4.63762725 15.227401,4.64173955 15.2315506,4.64588913 C15.6151373,5.02947587 15.6151373,5.65139285 15.2315506,6.03497958 L15.218989,6.04754114 C14.833405,6.43312514 14.2099948,6.43871212 13.8175621,6.06010067 L13.0837445,5.35212769 L13.0837445,9.02480771 C14.1313744,9.23450178 15.0777343,9.72458491 15.8412399,10.4134728 Z M9.45741293,16.9137705 L11.2637457,16.9137705 C11.2704419,16.9137705 11.276957,16.9106905 11.2836532,16.9105194 L13.5760905,18.5420833 C14.1166692,18.927259 14.5593393,18.7173032 14.5593393,18.07734 L14.5593393,11.3955424 C14.5593393,10.7555791 14.1164882,10.5445966 13.5759095,10.9296012 L11.2490866,12.5846077 L9.45741293,12.5846077 C9.07561604,12.5869613 8.767565,12.8805163 8.76807103,13.2415111 L8.76807103,16.2565249 C8.76807103,16.616547 9.07663705,16.9137705 9.45741293,16.9137705 Z" id="path-1"></path>
+        <path d="M12.6629004,2.20655653 C12.7302237,2.24596805 12.7939587,2.29392864 12.8525458,2.35045228 L15.218991,4.63355271 C15.2232143,4.63762725 15.227401,4.64173955 15.2315506,4.64588913 C15.6151373,5.02947587 15.6151373,5.65139285 15.2315506,6.03497958 L15.218989,6.04754114 C14.833405,6.43312514 14.2099948,6.43871212 13.8175621,6.06010067 L13.0837445,5.35212769 L13.0837445,9.02480771 C14.1313744,9.23450178 15.0777343,9.72458491 15.8412399,10.4134728 L18.7921077,8.7097885 L17.8120763,8.4282703 C17.2879728,8.27771934 16.9811062,7.7350368 17.1222397,7.20831926 L17.1268376,7.19115986 C17.2672401,6.66717063 17.805836,6.35621214 18.3298252,6.49661463 C18.3354936,6.49813348 18.3411483,6.4997031 18.3467886,6.5013233 L21.5072342,7.40917478 C21.5854786,7.43165083 21.6588813,7.46286673 21.7266743,7.50146459 C22.1617777,7.69563794 22.4070985,8.1789301 22.2884446,8.65578009 L21.4944442,11.846732 C21.4930272,11.8524267 21.4915592,11.8581087 21.4900403,11.8637771 C21.3496378,12.3877663 20.8110419,12.6987248 20.2870527,12.5583223 L20.2698933,12.5537245 C19.7431758,12.4125909 19.4266322,11.8754954 19.558303,11.346333 L19.7819006,10.4477324 L17.0855856,12.0044506 C17.5222737,12.8226887 17.7698096,13.7571258 17.7698096,14.749378 C17.7698096,17.9737471 15.155942,20.5876146 11.9315729,20.5876146 C8.70720387,20.5876146 6.09333629,17.9737471 6.09333629,14.749378 C6.09333629,13.7060531 6.3670101,12.7266481 6.84648663,11.8790342 L4.36739915,10.4477324 L4.59099674,11.346333 C4.72266753,11.8754954 4.40612397,12.4125909 3.87940643,12.5537245 L3.86224702,12.5583223 C3.3382578,12.6987248 2.7996619,12.3877663 2.65925941,11.8637771 C2.65774055,11.8581087 2.65627253,11.8524267 2.65485552,11.846732 L1.86085517,8.65578009 C1.74220122,8.1789301 1.98752209,7.69563794 2.42262547,7.50146459 C2.49041846,7.46286673 2.56382109,7.43165083 2.64206552,7.40917478 L5.80251111,6.5013233 C5.80815141,6.4997031 5.81380611,6.49813348 5.81947453,6.49661463 C6.34346376,6.35621214 6.88205966,6.66717063 7.02246215,7.19115986 L7.02706,7.20831926 C7.16819354,7.7350368 6.86132692,8.27771934 6.33722344,8.4282703 L5.35719204,8.7097885 L8.13533171,10.3137482 C8.95327431,9.61305289 9.96729247,9.13467462 11.0837445,8.97225504 L11.0837445,5.36391383 L10.4173324,6.00685533 C10.0248997,6.38546677 9.40148951,6.37987979 9.0159055,5.99429579 L9.00334395,5.98173423 C8.61975721,5.5981475 8.61975721,4.97623052 9.00334395,4.59264378 L9.01590348,4.58030736 L9.01590348,4.58030736 L11.3823487,2.29720693 C11.735986,1.95602459 12.2771897,1.92683262 12.6629004,2.20655653 Z M13.5759095,10.9296012 L11.2490866,12.5846077 L9.45741293,12.5846077 C9.07561604,12.5869613 8.767565,12.8805163 8.76807041,13.2415111 L8.76807041,16.2565249 C8.76807041,16.616547 9.07663705,16.9137705 9.45741293,16.9137705 L11.2637457,16.9137705 C11.2704419,16.9137705 11.276957,16.9106905 11.2836532,16.9105194 L13.5760905,18.5420833 C14.1166692,18.927259 14.5593393,18.7173032 14.5593393,18.07734 L14.5593393,11.3955424 C14.5593393,10.7555791 14.1164882,10.5445966 13.5759095,10.9296012 Z" id="path-1"></path>
     </defs>
-    <g id="icon-/-Audio-/-Audio-Proxy" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+    <g id="icon-/-Audio-/-AudioProxy" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <mask id="mask-2" fill="white">
             <use xlink:href="#path-1"></use>
         </mask>
diff --git a/Assets/Editor/Icons/Components/AudioRtpc.svg b/Assets/Editor/Icons/Components/AudioRtpc.svg
index 3deaf7c1b2..546ef7561d 100644
--- a/Assets/Editor/Icons/Components/AudioRtpc.svg
+++ b/Assets/Editor/Icons/Components/AudioRtpc.svg
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
-    <title>icon / Audio / Audio Rtpc</title>
-    <desc>Created with Sketch.</desc>
+    <title>icon / Audio / AudioRtpc</title>
     <defs>
         <path d="M17.5213734,17.4167143 C16.9197823,17.4797543 16.308297,17.4783416 15.720839,17.3842135 C14.5130191,17.1906854 13.5734582,16.6243468 13.0630755,15.5972458 L13.9111365,15.1758309 C14.2687337,15.8954643 14.9398727,16.3000064 15.8706642,16.4491465 C16.3827674,16.5312005 16.9321986,16.5295115 17.4747027,16.4691154 C17.6491354,15.4006091 18.5764981,14.5851243 19.6943274,14.5851243 C20.9364771,14.5851243 21.9434385,15.5920856 21.9434385,16.8342353 C21.9434385,18.0763851 20.9364771,19.0833464 19.6943274,19.0833464 C18.6536199,19.0833464 17.7780042,18.3765046 17.5213734,17.4167143 L17.5213734,17.4167143 Z M18.4649687,17.2644794 C18.6426459,17.7721997 19.1259604,18.1363523 19.6943274,18.1363523 C20.4134667,18.1363523 20.9964443,17.5533747 20.9964443,16.8342353 C20.9964443,16.115096 20.4134667,15.5321184 19.6943274,15.5321184 C19.0520957,15.5321184 18.5184596,15.9970717 18.4116665,16.6087309 L18.5772671,17.2370912 C18.5459621,17.2453414 18.5083963,17.2545662 18.4649687,17.2644794 L18.4649687,17.2644794 Z M6.41269282,7.75955074 C6.48530035,7.74554426 6.56620141,7.73105601 6.65462238,7.71664096 C7.41334843,7.59294773 8.20368929,7.5617412 8.95475585,7.68208411 C10.1625758,7.87561231 11.1021367,8.44195087 11.6125194,9.46905189 L10.7644584,9.89046678 C10.4068612,9.17083331 9.73572217,8.76629123 8.80493068,8.61715112 C8.16829992,8.51514419 7.47397986,8.54255934 6.80699687,8.65129593 C6.70920885,8.66723807 6.62294762,8.68306303 6.54988526,8.69766867 C6.47287876,9.8700561 5.49754262,10.7971477 4.30567263,10.7971477 C3.06352288,10.7971477 2.05656155,9.79018638 2.05656155,8.54803663 C2.05656155,7.30588688 3.06352288,6.29892555 4.30567263,6.29892555 C5.27039587,6.29892555 6.09325469,6.90631937 6.41269282,7.75955074 L6.41269282,7.75955074 Z M6.52399202,16.4612087 C6.64215608,16.4441001 6.77431579,16.4229376 6.91828166,16.3971941 C7.58783099,16.2774677 8.25666476,16.0998341 8.87630612,15.8546154 C10.5778142,15.1812557 11.5572814,14.1562214 11.5572814,12.6911362 C11.5572814,9.97039983 12.8250527,8.42109955 14.890389,7.87698913 C15.7865707,7.64089109 16.7255021,7.6190278 17.6008433,7.72430547 C17.9295241,6.8896413 18.7429412,6.29892555 19.6943274,6.29892555 C20.9364771,6.29892555 21.9434385,7.30588688 21.9434385,8.54803663 C21.9434385,9.79018638 20.9364771,10.7971477 19.6943274,10.7971477 C18.4896709,10.7971477 17.5062192,9.85005756 17.4479474,8.65985241 C16.692317,8.57312646 15.8820418,8.59504544 15.1316418,8.79273744 C13.4716819,9.23005193 12.5042755,10.4122864 12.5042755,12.6911362 C12.5042755,14.6201354 11.2485651,15.9342643 9.224777,16.7351641 C8.54056471,17.0059362 7.81241243,17.199324 7.0849757,17.3294017 C6.86820908,17.3681631 6.66439824,17.3988727 6.47707086,17.4225015 C6.21847349,18.3793446 5.34428727,19.0833464 4.30567263,19.0833464 C3.06352288,19.0833464 2.05656155,18.0763851 2.05656155,16.8342353 C2.05656155,15.5920856 3.06352288,14.5851243 4.30567263,14.5851243 C5.42074309,14.5851243 6.34628588,15.3965887 6.52399202,16.4612087 L6.52399202,16.4612087 Z M4.30567263,9.85015357 C5.02481196,9.85015357 5.60778957,9.26717596 5.60778957,8.54803663 C5.60778957,7.8288973 5.02481196,7.24591969 4.30567263,7.24591969 C3.5865333,7.24591969 3.00355569,7.8288973 3.00355569,8.54803663 C3.00355569,9.26717596 3.5865333,9.85015357 4.30567263,9.85015357 Z M4.30567263,18.1363523 C5.02481196,18.1363523 5.60778957,17.5533747 5.60778957,16.8342353 C5.60778957,16.115096 5.02481196,15.5321184 4.30567263,15.5321184 C3.5865333,15.5321184 3.00355569,16.115096 3.00355569,16.8342353 C3.00355569,17.5533747 3.5865333,18.1363523 4.30567263,18.1363523 Z M19.6943274,9.85015357 C20.4134667,9.85015357 20.9964443,9.26717596 20.9964443,8.54803663 C20.9964443,7.8288973 20.4134667,7.24591969 19.6943274,7.24591969 C18.975188,7.24591969 18.3922104,7.8288973 18.3922104,8.54803663 C18.3922104,9.26717596 18.975188,9.85015357 19.6943274,9.85015357 Z" id="path-1"></path>
     </defs>
-    <g id="icon-/-Audio-/-Audio-Rtpc" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+    <g id="icon-/-Audio-/-AudioRtpc" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <mask id="mask-2" fill="white">
             <use xlink:href="#path-1"></use>
         </mask>
diff --git a/Assets/Editor/Icons/Components/AudioSwitch.svg b/Assets/Editor/Icons/Components/AudioSwitch.svg
index d6e80efbc7..33637543a5 100644
--- a/Assets/Editor/Icons/Components/AudioSwitch.svg
+++ b/Assets/Editor/Icons/Components/AudioSwitch.svg
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
-    <title>icon / Audio / Audio Switch</title>
-    <desc>Created with Sketch.</desc>
+    <title>icon / Audio / AudioSwitch</title>
     <defs>
         <path d="M12.0172841,3.17763841 C12.0084453,4.01699637 12.0222844,6.23179768 12.0588015,12.0759608 C12.0243002,17.5975209 12.0302856,19.8793481 12.0292472,20.8223307 C16.8882615,20.8065621 20.8223782,16.8627121 20.8223782,12 C20.8223782,7.13329775 16.8818025,3.18696625 12.0172841,3.17763841 L12.0172841,3.17763841 Z M12,21.9986952 C6.4778731,21.9986952 2.00130475,17.5221269 2.00130475,12 C2.00130475,6.4778731 6.4778731,2.00130475 12,2.00130475 C17.5221269,2.00130475 21.9986952,6.4778731 21.9986952,12 C21.9986952,17.5221269 17.5221269,21.9986952 12,21.9986952 Z" id="path-1"></path>
     </defs>
-    <g id="icon-/-Audio-/-Audio-Switch" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+    <g id="icon-/-Audio-/-AudioSwitch" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <mask id="mask-2" fill="white">
             <use xlink:href="#path-1"></use>
         </mask>
diff --git a/Assets/Editor/Icons/Components/AudioTrigger.svg b/Assets/Editor/Icons/Components/AudioTrigger.svg
index 98a593ab61..a1aaef22a9 100644
--- a/Assets/Editor/Icons/Components/AudioTrigger.svg
+++ b/Assets/Editor/Icons/Components/AudioTrigger.svg
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
-    <title>icon / Audio / Audio Trigger</title>
-    <desc>Created with Sketch.</desc>
-    <g id="icon-/-Audio-/-Audio-Trigger" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <path d="M21.935398,11.8450373 C21.6650107,11.8912719 21.38135,12.0145654 21.1029374,12.2242836 L20.7491343,12.4904408 L19.6223863,2.99245521 L3.52626836,2.99245521 L1.83946785,17.0427884 L14.876728,17.0427884 L14.8767278,18.5250305 L1.9499277,18.48765 L2.70628013,20.0494329 L14.9011203,20.0494329 C14.9684446,20.4316845 15.1710412,20.7685564 15.4577514,21.0072269 L2.15867295,21.0072269 C1.88666786,21.0072269 1.64108984,20.9266265 1.51893361,20.6223196 C1.39677739,20.3180128 0.868937176,18.7750726 0.789326883,18.5664813 C0.709716591,18.3578899 0.642346124,17.9863238 0.676031358,17.7102078 C0.709716591,17.4340917 2.37499083,2.82313798 2.47348189,2.54740049 C2.57197294,2.27166301 2.82155936,1.98900188 3.28727912,1.98900188 L19.7506558,1.98900188 C20.2878552,1.98900188 20.8060413,2.23433146 20.8060413,2.79139563 C20.8060413,3.11184775 21.4042135,7.8038927 21.935398,11.8450373 Z M11.5589119,12.572228 C8.55888206,12.572228 6.90801002,10.7304621 6.90801002,8.31014104 L6.90801002,7.12201477 C6.90801002,4.96355875 8.80569069,3.37099816 11.6912052,3.37099816 C14.5767197,3.37099816 16.2157462,4.96355875 16.2157462,7.12201477 L16.2157462,8.88089522 C16.2157462,10.5260021 14.6530785,12.572228 11.5589119,12.572228 Z M8.2105759,5.62062888 C8.12476007,5.64229708 8.06058283,5.73394207 8.01804417,5.89556384 C7.93792591,6.19996594 7.90644937,6.55794173 7.89270344,6.81937171 C7.85444388,7.54701928 8.5778855,9.8546201 11.6187129,9.76258641 C14.6595402,9.67055273 15.2323647,7.34316617 15.2323647,6.97716126 C15.2323647,6.61115634 15.2443677,5.97183782 15.0124524,5.47035497 C15.0755044,5.87553282 15.2049024,6.14040559 15.0755044,6.6142278 C14.9461065,7.08805001 14.0861119,8.89757799 11.5618781,8.89757799 C9.03764427,8.89757799 8.29842716,7.11392019 8.12776671,6.6142278 C8.01399308,6.28109954 8.04159614,5.9498999 8.2105759,5.62062888 Z M6.69627737,6.15955814 C6.1549366,7.07416029 5.95333067,8.13885984 6.09145957,9.35365679 C6.29865294,11.1758522 8.29995097,13.3172976 11.6716268,13.3172976 C15.0433027,13.3172976 17.239707,11.0500209 17.239707,8.96429485 C17.239707,7.87934003 17.080924,7.01242691 16.7633579,6.36355548 L16.496181,5.90732527 C16.7588103,6.12328418 16.9543036,6.2994488 17.0826612,6.43581913 C17.525792,6.90661273 17.8905798,7.41118062 18.0133077,7.64492603 C18.2773857,8.14788451 18.680364,8.89887112 18.625427,10.2536773 C18.5704899,11.6084835 16.6086107,15.3546527 11.6716268,15.3546527 C6.73464296,15.3546527 4.80327155,12.403868 4.80327155,10.1219695 C4.80327155,8.60070381 5.43427349,7.27990002 6.69627737,6.15955814 Z M21.9554951,13.501167 C21.9669662,13.6418778 21.9554951,21.9176214 21.9562181,22.1518785 L19.1544961,20.0429916 L18.9469777,19.8867902 L16.4757199,19.8977378 C16.4242384,19.8977378 16.3767276,19.8496775 16.3767276,19.791673 L16.3767276,15.8950515 C16.3766507,15.8365552 16.4230543,15.7897881 16.4805667,15.7894132 L18.9135751,15.789429 L21.9554951,13.501167 Z" id="Combined-Shape" fill="#DF9557"></path>
+    <title>icon / Audio / AudioTrigger</title>
+    <g id="icon-/-Audio-/-AudioTrigger" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M21.9554951,13.501167 C21.9573625,13.5240734 21.9586219,13.7625648 21.9594249,14.1468542 L21.960005,14.5103232 C21.9600842,14.5763097 21.960155,14.6448648 21.9602178,14.715785 L21.9601473,17.349457 C21.9600945,17.447333 21.9600381,17.5455394 21.9599787,17.6438729 L21.9593709,18.5268103 C21.9592966,18.6240748 21.9592206,18.7208559 21.9591432,18.8169502 L21.9581771,19.9240934 C21.9580959,20.0114378 21.9580151,20.0972816 21.9579351,20.1814212 L21.9572502,20.8871735 C21.9571794,20.9592574 21.9571106,21.0290267 21.9570445,21.096278 L21.9562181,22.1518785 L19.1544961,20.0429916 L18.9469777,19.8867902 L16.4757199,19.8977378 C16.4242384,19.8977378 16.3767275,19.8496775 16.3767275,19.791673 L16.3767275,19.791673 L16.3767275,15.8950515 C16.3766507,15.8365552 16.4230543,15.7897881 16.4805667,15.7894132 L16.4805667,15.7894132 L18.9135751,15.789429 Z M19.7506558,1.98900188 C20.2878552,1.98900188 20.8060413,2.23433146 20.8060413,2.79139563 C20.8060413,3.11184775 21.4042135,7.8038927 21.935398,11.8450373 C21.6650107,11.8912719 21.38135,12.0145654 21.1029374,12.2242836 L20.7491343,12.4904408 L19.6223863,2.99245521 L3.52626836,2.99245521 L1.83946785,17.0427884 L14.876728,17.0427884 L14.8767278,18.5250305 L1.9499277,18.48765 L2.70628013,20.0494329 L14.9011203,20.0494329 C14.9684446,20.4316845 15.1710412,20.7685564 15.4577514,21.0072269 L2.15867295,21.0072269 C1.88666786,21.0072269 1.64108984,20.9266265 1.51893361,20.6223196 C1.39677739,20.3180128 0.868937176,18.7750726 0.789326883,18.5664813 C0.709716591,18.3578899 0.642346124,17.9863238 0.676031358,17.7102078 C0.692312554,17.5767517 1.08975107,14.0945182 1.50721219,10.5007016 L1.59375069,9.75662304 C2.01225591,6.16281252 2.42587788,2.68067361 2.47348189,2.54740049 C2.57197294,2.27166301 2.82155936,1.98900188 3.28727912,1.98900188 L19.7506558,1.98900188 Z M16.496181,5.90732527 C16.7588103,6.12328418 16.9543036,6.2994488 17.0826612,6.43581913 C17.525792,6.90661273 17.8905798,7.41118062 18.0133077,7.64492603 C18.2773857,8.14788451 18.680364,8.89887112 18.625427,10.2536773 C18.5704899,11.6084835 16.6086107,15.3546527 11.6716268,15.3546527 C6.73464296,15.3546527 4.80327155,12.403868 4.80327155,10.1219695 C4.80327155,8.60070381 5.43427349,7.27990002 6.69627737,6.15955814 C6.1549366,7.07416029 5.95333067,8.13885984 6.09145957,9.35365679 C6.29865294,11.1758522 8.29995097,13.3172976 11.6716268,13.3172976 C15.0433027,13.3172976 17.239707,11.0500209 17.239707,8.96429485 C17.239707,7.87934003 17.080924,7.01242691 16.7633579,6.36355548 L16.496181,5.90732527 Z M11.6912052,3.37099816 C14.5767197,3.37099816 16.2157462,4.96355875 16.2157462,7.12201477 L16.2157462,8.88089522 C16.2157462,10.5260021 14.6530785,12.572228 11.5589119,12.572228 C8.55888206,12.572228 6.90801002,10.7304621 6.90801002,8.31014104 L6.90801002,7.12201477 C6.90801002,4.96355875 8.80569069,3.37099816 11.6912052,3.37099816 Z M15.0124524,5.47035497 C15.0755044,5.87553282 15.2049024,6.14040559 15.0755044,6.6142278 C14.9461065,7.08805001 14.0861119,8.89757799 11.5618781,8.89757799 C9.03764427,8.89757799 8.29842716,7.11392019 8.12776671,6.6142278 C8.01399308,6.28109954 8.04159614,5.9498999 8.2105759,5.62062888 C8.12476007,5.64229708 8.06058283,5.73394207 8.01804417,5.89556384 C7.93792591,6.19996594 7.90644937,6.55794173 7.89270344,6.81937171 C7.85444388,7.54701928 8.5778855,9.8546201 11.6187129,9.76258641 C14.6595402,9.67055273 15.2323647,7.34316617 15.2323647,6.97716126 C15.2323647,6.61115634 15.2443677,5.97183782 15.0124524,5.47035497 Z" id="Combined-Shape" fill="#DF9557"></path>
     </g>
 </svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/BehaviorTree.svg b/Assets/Editor/Icons/Components/BehaviorTree.svg
index 17cb672ee8..6fa1e2b334 100644
--- a/Assets/Editor/Icons/Components/BehaviorTree.svg
+++ b/Assets/Editor/Icons/Components/BehaviorTree.svg
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
-    <title>icon / AI / Behavior Tree</title>
-    <desc>Created with Sketch.</desc>
+    <title>icon / AI / BehaviorTree</title>
     <defs>
         <path d="M9.93791406,5.0548197 L9.93791406,8.05128515 L13.9379141,8.05128515 L13.9379141,5.0548197 L9.93791406,5.0548197 Z M15.4379141,4.05305242 L15.4379141,9.05305242 L8.43791406,9.05305242 L8.43791406,4.05305242 L15.4379141,4.05305242 Z M12.966227,10.6897839 L20.0369237,10.6897839 L20.0369237,15.0655662 L22.0633154,15.0655662 L22.0633154,20.0655662 L16.0633154,20.0655662 L16.0633154,15.0655662 L18.0897071,15.0655662 L18.0897071,12.6212458 L12.966227,12.6212458 L12.966227,15.0655662 L14.966227,15.0655662 L14.966227,20.0655662 L8.96622696,20.0655662 L8.96622696,15.0655662 L10.966227,15.0655662 L10.966227,12.6212458 L5.82978223,12.6212458 L5.81583068,15.0655662 L7.86913852,15.0655662 L7.86913852,20.0655662 L1.86913852,20.0655662 L1.86913852,15.0655662 L3.89590888,15.0655662 L3.90986044,12.6212458 L3.8955302,12.6212458 L3.8955302,10.6897839 L10.966227,10.6897839 L10.966227,8.12198221 L12.966227,8.12198221 L12.966227,10.6897839 Z M3.1548528,19.0655662 L6.58342423,19.0655662 L6.58342423,16.0655662 L3.1548528,16.0655662 L3.1548528,19.0655662 Z M10.2519413,19.0655662 L13.6805127,19.0655662 L13.6805127,16.0655662 L10.2519413,16.0655662 L10.2519413,19.0655662 Z M17.3490297,16.0655662 L17.3490297,19.0655662 L20.7776011,19.0655662 L20.7776011,16.0655662 L17.3490297,16.0655662 Z" id="path-1"></path>
     </defs>
-    <g id="icon-/-AI-/-Behavior-Tree" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+    <g id="icon-/-AI-/-BehaviorTree" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <mask id="mask-2" fill="white">
             <use xlink:href="#path-1"></use>
         </mask>
diff --git a/Assets/Editor/Icons/Components/Box.svg b/Assets/Editor/Icons/Components/Box.svg
new file mode 100644
index 0000000000..e47637dad9
--- /dev/null
+++ b/Assets/Editor/Icons/Components/Box.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Shapes / Box</title>
+    <defs>
+        <path d="M14.9104468,4.3572224 L12.3128297,5.76093751 L16.0323823,7.5841228 L18.8324648,6.03460766 L14.9104468,4.3572224 L14.9104468,4.3572224 Z M14.3295329,4.10877467 L11.8900329,3.06543897 L9.21101211,4.24054281 L11.7671344,5.49345813 L14.3295329,4.10877467 L14.3295329,4.10877467 Z M8.38222655,7.88497915 L11.8905679,9.87612824 L15.5034882,7.87680326 L11.7772657,6.05034863 L8.38222655,7.88497915 Z M7.87464586,7.59690319 L11.2315704,5.78286925 L8.61677453,4.50119435 L5.12147016,6.0343462 L7.87464586,7.59690319 L7.87464586,7.59690319 Z M13.4248204,16.5292285 L13.4248204,20.2714109 L16.7212531,18.3032444 L16.7212531,14.7683696 L13.4248204,16.5292285 L13.4248204,16.5292285 Z M13.4248204,15.9681994 L16.7212531,14.2073405 L16.7212531,10.6116223 L13.4248204,12.5573954 L13.4248204,15.9681994 L13.4248204,15.9681994 Z M20.0150235,13.0089329 L17.1953634,14.5151136 L17.1953634,18.0201723 L20.0150235,16.3366674 L20.0150235,13.0089329 L20.0150235,13.0089329 Z M20.0150235,12.4479038 L20.0150235,8.66742073 L17.1953634,10.331771 L17.1953634,13.9540845 L20.0150235,12.4479038 L20.0150235,12.4479038 Z M10.5822419,16.6160095 L7.71315676,15.0944695 L7.71315676,18.6332262 L10.5822419,20.3155143 L10.5822419,16.6160095 L10.5822419,16.6160095 Z M10.5822419,16.0558018 L10.5822419,12.5941648 L7.71315676,10.8873807 L7.71315676,14.5342618 L10.5822419,16.0558018 L10.5822419,16.0558018 Z M3.88624372,13.064972 L3.88624372,16.3893156 L7.23904643,18.3552316 L7.23904643,14.8430382 L3.88624372,13.064972 L3.88624372,13.064972 Z M3.88624372,12.5047643 L7.23904643,14.2828305 L7.23904643,10.6053382 L3.88624372,8.61079627 L3.88624372,12.5047643 Z M20.9632442,6.96066648 L20.9632442,16.9207316 L12.4765998,21.9877635 L12.4765998,11.9700465 L20.9632442,6.96066648 Z M2.93802306,6.89751494 L11.5304626,12.0090536 L11.5304626,22.0167477 L2.93802306,16.9785706 L2.93802306,6.89751494 Z M11.8854851,1.98325228 L21.0857681,5.91806831 L11.88495,11.0096352 L2.91423186,5.91832977 L11.8854851,1.98325228 Z" id="path-1"></path>
+    </defs>
+    <g id="icon-/-Shapes-/-Box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <mask id="mask-2" fill="white">
+            <use xlink:href="#path-1"></use>
+        </mask>
+        <use id="Shape" fill="#5A69A1" fill-rule="nonzero" xlink:href="#path-1"></use>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/Box_Shape.svg b/Assets/Editor/Icons/Components/Box_Shape.svg
index 064be90afc..32dd48ebe2 100644
--- a/Assets/Editor/Icons/Components/Box_Shape.svg
+++ b/Assets/Editor/Icons/Components/Box_Shape.svg
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
-    <title>icon / Shapes / Box Shape</title>
-    <desc>Created with Sketch.</desc>
+    <title>icon / Shapes / Box_Shape</title>
     <defs>
         <path d="M14.9104468,4.3572224 L12.3128297,5.76093751 L16.0323823,7.5841228 L18.8324648,6.03460766 L14.9104468,4.3572224 L14.9104468,4.3572224 Z M14.3295329,4.10877467 L11.8900329,3.06543897 L9.21101211,4.24054281 L11.7671344,5.49345813 L14.3295329,4.10877467 L14.3295329,4.10877467 Z M8.38222655,7.88497915 L11.8905679,9.87612824 L15.5034882,7.87680326 L11.7772657,6.05034863 L8.38222655,7.88497915 Z M7.87464586,7.59690319 L11.2315704,5.78286925 L8.61677453,4.50119435 L5.12147016,6.0343462 L7.87464586,7.59690319 L7.87464586,7.59690319 Z M13.4248204,16.5292285 L13.4248204,20.2714109 L16.7212531,18.3032444 L16.7212531,14.7683696 L13.4248204,16.5292285 L13.4248204,16.5292285 Z M13.4248204,15.9681994 L16.7212531,14.2073405 L16.7212531,10.6116223 L13.4248204,12.5573954 L13.4248204,15.9681994 L13.4248204,15.9681994 Z M20.0150235,13.0089329 L17.1953634,14.5151136 L17.1953634,18.0201723 L20.0150235,16.3366674 L20.0150235,13.0089329 L20.0150235,13.0089329 Z M20.0150235,12.4479038 L20.0150235,8.66742073 L17.1953634,10.331771 L17.1953634,13.9540845 L20.0150235,12.4479038 L20.0150235,12.4479038 Z M10.5822419,16.6160095 L7.71315676,15.0944695 L7.71315676,18.6332262 L10.5822419,20.3155143 L10.5822419,16.6160095 L10.5822419,16.6160095 Z M10.5822419,16.0558018 L10.5822419,12.5941648 L7.71315676,10.8873807 L7.71315676,14.5342618 L10.5822419,16.0558018 L10.5822419,16.0558018 Z M3.88624372,13.064972 L3.88624372,16.3893156 L7.23904643,18.3552316 L7.23904643,14.8430382 L3.88624372,13.064972 L3.88624372,13.064972 Z M3.88624372,12.5047643 L7.23904643,14.2828305 L7.23904643,10.6053382 L3.88624372,8.61079627 L3.88624372,12.5047643 Z M20.9632442,6.96066648 L20.9632442,16.9207316 L12.4765998,21.9877635 L12.4765998,11.9700465 L20.9632442,6.96066648 Z M2.93802306,6.89751494 L11.5304626,12.0090536 L11.5304626,22.0167477 L2.93802306,16.9785706 L2.93802306,6.89751494 Z M11.8854851,1.98325228 L21.0857681,5.91806831 L11.88495,11.0096352 L2.91423186,5.91832977 L11.8854851,1.98325228 Z" id="path-1"></path>
     </defs>
-    <g id="icon-/-Shapes-/-Box-Shape" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+    <g id="icon-/-Shapes-/-Box_Shape" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <mask id="mask-2" fill="white">
             <use xlink:href="#path-1"></use>
         </mask>
diff --git a/Assets/Editor/Icons/Components/Capsule.svg b/Assets/Editor/Icons/Components/Capsule.svg
new file mode 100644
index 0000000000..afe28de580
--- /dev/null
+++ b/Assets/Editor/Icons/Components/Capsule.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Shapes / Capsule</title>
+    <defs>
+        <path d="M18.1690143,16.0244823 L15.444714,12.4017835 C14.6352822,13.340816 13.5726735,14.2676139 12.5054186,14.9651968 L15.1717325,18.6135269 C16.2528883,17.9230289 17.3550742,16.9692392 18.1690143,16.0244823 L18.1690143,16.0244823 Z M18.4345733,16.4498033 C17.606154,17.3930032 16.5291353,18.3174468 15.4560945,19.0026208 L15.9423005,19.6678987 C15.9504964,19.6694829 16.0321813,19.7350696 16.1528185,19.8157378 C16.6958785,20.1788736 17.3435072,20.3982029 18.0675896,20.3597291 C18.236709,20.2647428 18.401477,20.1573496 18.5606762,20.0373844 C18.739299,19.9027825 18.9046566,19.7570803 19.0564932,19.6019933 C19.1299377,19.3579096 19.1607501,19.0906484 19.1521512,18.8016514 C19.1354309,18.2396999 18.9708189,17.6286159 18.7059937,17.0133187 C18.6193531,16.812017 18.5272468,16.6228174 18.4345733,16.4498033 L18.4345733,16.4498033 Z M12.8684437,19.6136635 C13.4210801,19.531436 14.0779047,19.2583597 14.7592348,18.8645972 L12.0952656,15.2217172 C11.4172255,15.6263957 10.7502294,15.9267663 10.1585281,16.0667348 L12.5432626,19.2313844 C12.6452424,19.3667161 12.7538958,19.4941778 12.8684437,19.6136635 L12.8684437,19.6136635 Z M13.307268,20.011006 C14.3763105,20.8493735 15.7929587,21.1192485 17.0993837,20.7585311 C16.6570396,20.6540414 16.2499702,20.4663695 15.884742,20.2221471 C15.7420988,20.1267638 15.6410187,20.0456042 15.5847239,19.9934231 L15.0439743,19.2539679 C14.4379725,19.60591 13.8436838,19.8716894 13.307268,20.011006 L13.307268,20.011006 Z M19.3983818,13.9696798 L16.7159827,10.410016 C16.5335823,10.9093392 16.1980662,11.4601589 15.7614039,12.0171031 L18.48509,15.6392312 C18.9514493,15.0401441 19.2828048,14.459919 19.3983818,13.9696798 L19.3983818,13.9696798 Z M19.7385812,14.4768728 C19.5412601,14.9695772 19.2020644,15.5082288 18.7689713,16.050941 C18.7858037,16.0804186 18.8039665,16.1127657 18.8232947,16.1478532 C18.9362894,16.3529776 19.049119,16.5807323 19.1544811,16.8255315 C19.4410098,17.4912548 19.6204138,18.1572507 19.6391678,18.7875543 C19.6398687,18.8111084 19.640341,18.8345643 19.6405836,18.8579208 C20.4591901,17.5405472 20.525762,15.852631 19.7385812,14.4768728 L19.7385812,14.4768728 Z M15.1497228,12.0095124 L12.2863454,8.20187271 C11.495596,9.12387204 10.4590141,10.0356948 9.41171764,10.7320709 L12.2210337,14.5760716 C13.2851065,13.8798338 14.359326,12.9380319 15.1497228,12.0095124 L15.1497228,12.0095124 Z M9.83902839,15.6427443 C10.4155977,15.5500304 11.1023333,15.2539619 11.8106608,14.8325307 L9.00263316,10.9926561 C8.30487191,11.4174064 7.61596278,11.7344135 7.00567848,11.882762 L9.83902839,15.6427443 L9.83902839,15.6427443 Z M16.3532727,9.92868356 L13.5481721,6.20618931 C13.3704406,6.70542196 13.0376533,7.25728564 12.6023111,7.81594421 L15.4638792,11.6214362 C15.9327625,11.0099586 16.2580225,10.4203527 16.3532727,9.92868356 L16.3532727,9.92868356 Z M11.9912431,7.80945381 L10.7793547,6.19791826 C10.7263694,6.1339984 10.623575,6.01863287 10.4779403,5.86908504 C10.2341547,5.61874906 9.96122598,5.36829936 9.66645468,5.13502716 C8.73691817,4.39942285 7.81036713,4.00210355 6.97345173,4.1057669 C6.91876921,4.11254007 6.86452356,4.12146231 6.8107185,4.13257103 C6.37458953,5.01619718 6.48097788,6.05346894 6.98587544,7.16970735 C7.14596669,7.52364054 7.33501472,7.85686599 7.53536759,8.1586617 C7.65499084,8.33885268 7.75089455,8.46739928 7.80529075,8.53398921 L9.12729664,10.3428962 C10.1722859,9.64694568 11.2196602,8.720818 11.9912431,7.80945381 L11.9912431,7.80945381 Z M6.68738466,11.4603718 C7.28169525,11.3592411 7.99039934,11.0456358 8.71809464,10.6035601 L7.42509648,8.83543266 C7.36907914,8.76740792 7.26382606,8.62632969 7.13490883,8.43213899 C6.92102759,8.10996522 6.71938412,7.75453841 6.54778961,7.37517358 C6.06640077,6.31090874 5.91063233,5.2847275 6.19740261,4.36689142 C6.14869598,4.39484428 6.1004164,4.42498621 6.05256723,4.4573512 C4.55823339,5.9522198 4.33999323,8.3452782 5.63263875,10.0606767 L6.68738466,11.4603718 L6.68738466,11.4603718 Z M13.181837,5.7200463 L12.5338993,4.86020389 C11.2918943,3.21200751 9.06001813,2.73116198 7.24573027,3.60857538 C8.13991747,3.60867877 9.06216243,4.0406856 9.9713639,4.76019743 C10.2837311,5.00739446 10.5717956,5.27173324 10.8293283,5.53618573 C10.9844845,5.69551098 11.095747,5.82038008 11.1636166,5.90267831 L12.304587,7.42001216 C12.7735626,6.80417763 13.0954767,6.2115492 13.181837,5.7200463 L13.181837,5.7200463 Z M4.85440635,10.6471169 C3.11735775,8.34197557 3.6072803,5.04298443 5.93806432,3.28661269 C8.27360069,1.5266598 11.5796688,1.97470779 13.3121317,4.27376372 L20.2227556,13.4444714 C21.9598042,15.7496127 21.4698817,19.0486038 19.1390976,20.8049756 C16.8035613,22.5649285 13.4974931,22.1168805 11.7650302,19.8178246 L4.85440635,10.6471169 Z" id="path-1"></path>
+    </defs>
+    <g id="icon-/-Shapes-/-Capsule" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <mask id="mask-2" fill="white">
+            <use xlink:href="#path-1"></use>
+        </mask>
+        <use id="Shape" fill="#5A69A1" fill-rule="nonzero" xlink:href="#path-1"></use>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/Capsule_Shape.svg b/Assets/Editor/Icons/Components/Capsule_Shape.svg
index 22a5241166..89a8866ae2 100644
--- a/Assets/Editor/Icons/Components/Capsule_Shape.svg
+++ b/Assets/Editor/Icons/Components/Capsule_Shape.svg
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
-    <title>icon / Shapes / Capsule Shape</title>
-    <desc>Created with Sketch.</desc>
+    <title>icon / Shapes / Capsule_Shape</title>
     <defs>
         <path d="M18.1690143,16.0244823 L15.444714,12.4017835 C14.6352822,13.340816 13.5726735,14.2676139 12.5054186,14.9651968 L15.1717325,18.6135269 C16.2528883,17.9230289 17.3550742,16.9692392 18.1690143,16.0244823 L18.1690143,16.0244823 Z M18.4345733,16.4498033 C17.606154,17.3930032 16.5291353,18.3174468 15.4560945,19.0026208 L15.9423005,19.6678987 C15.9504964,19.6694829 16.0321813,19.7350696 16.1528185,19.8157378 C16.6958785,20.1788736 17.3435072,20.3982029 18.0675896,20.3597291 C18.236709,20.2647428 18.401477,20.1573496 18.5606762,20.0373844 C18.739299,19.9027825 18.9046566,19.7570803 19.0564932,19.6019933 C19.1299377,19.3579096 19.1607501,19.0906484 19.1521512,18.8016514 C19.1354309,18.2396999 18.9708189,17.6286159 18.7059937,17.0133187 C18.6193531,16.812017 18.5272468,16.6228174 18.4345733,16.4498033 L18.4345733,16.4498033 Z M12.8684437,19.6136635 C13.4210801,19.531436 14.0779047,19.2583597 14.7592348,18.8645972 L12.0952656,15.2217172 C11.4172255,15.6263957 10.7502294,15.9267663 10.1585281,16.0667348 L12.5432626,19.2313844 C12.6452424,19.3667161 12.7538958,19.4941778 12.8684437,19.6136635 L12.8684437,19.6136635 Z M13.307268,20.011006 C14.3763105,20.8493735 15.7929587,21.1192485 17.0993837,20.7585311 C16.6570396,20.6540414 16.2499702,20.4663695 15.884742,20.2221471 C15.7420988,20.1267638 15.6410187,20.0456042 15.5847239,19.9934231 L15.0439743,19.2539679 C14.4379725,19.60591 13.8436838,19.8716894 13.307268,20.011006 L13.307268,20.011006 Z M19.3983818,13.9696798 L16.7159827,10.410016 C16.5335823,10.9093392 16.1980662,11.4601589 15.7614039,12.0171031 L18.48509,15.6392312 C18.9514493,15.0401441 19.2828048,14.459919 19.3983818,13.9696798 L19.3983818,13.9696798 Z M19.7385812,14.4768728 C19.5412601,14.9695772 19.2020644,15.5082288 18.7689713,16.050941 C18.7858037,16.0804186 18.8039665,16.1127657 18.8232947,16.1478532 C18.9362894,16.3529776 19.049119,16.5807323 19.1544811,16.8255315 C19.4410098,17.4912548 19.6204138,18.1572507 19.6391678,18.7875543 C19.6398687,18.8111084 19.640341,18.8345643 19.6405836,18.8579208 C20.4591901,17.5405472 20.525762,15.852631 19.7385812,14.4768728 L19.7385812,14.4768728 Z M15.1497228,12.0095124 L12.2863454,8.20187271 C11.495596,9.12387204 10.4590141,10.0356948 9.41171764,10.7320709 L12.2210337,14.5760716 C13.2851065,13.8798338 14.359326,12.9380319 15.1497228,12.0095124 L15.1497228,12.0095124 Z M9.83902839,15.6427443 C10.4155977,15.5500304 11.1023333,15.2539619 11.8106608,14.8325307 L9.00263316,10.9926561 C8.30487191,11.4174064 7.61596278,11.7344135 7.00567848,11.882762 L9.83902839,15.6427443 L9.83902839,15.6427443 Z M16.3532727,9.92868356 L13.5481721,6.20618931 C13.3704406,6.70542196 13.0376533,7.25728564 12.6023111,7.81594421 L15.4638792,11.6214362 C15.9327625,11.0099586 16.2580225,10.4203527 16.3532727,9.92868356 L16.3532727,9.92868356 Z M11.9912431,7.80945381 L10.7793547,6.19791826 C10.7263694,6.1339984 10.623575,6.01863287 10.4779403,5.86908504 C10.2341547,5.61874906 9.96122598,5.36829936 9.66645468,5.13502716 C8.73691817,4.39942285 7.81036713,4.00210355 6.97345173,4.1057669 C6.91876921,4.11254007 6.86452356,4.12146231 6.8107185,4.13257103 C6.37458953,5.01619718 6.48097788,6.05346894 6.98587544,7.16970735 C7.14596669,7.52364054 7.33501472,7.85686599 7.53536759,8.1586617 C7.65499084,8.33885268 7.75089455,8.46739928 7.80529075,8.53398921 L9.12729664,10.3428962 C10.1722859,9.64694568 11.2196602,8.720818 11.9912431,7.80945381 L11.9912431,7.80945381 Z M6.68738466,11.4603718 C7.28169525,11.3592411 7.99039934,11.0456358 8.71809464,10.6035601 L7.42509648,8.83543266 C7.36907914,8.76740792 7.26382606,8.62632969 7.13490883,8.43213899 C6.92102759,8.10996522 6.71938412,7.75453841 6.54778961,7.37517358 C6.06640077,6.31090874 5.91063233,5.2847275 6.19740261,4.36689142 C6.14869598,4.39484428 6.1004164,4.42498621 6.05256723,4.4573512 C4.55823339,5.9522198 4.33999323,8.3452782 5.63263875,10.0606767 L6.68738466,11.4603718 L6.68738466,11.4603718 Z M13.181837,5.7200463 L12.5338993,4.86020389 C11.2918943,3.21200751 9.06001813,2.73116198 7.24573027,3.60857538 C8.13991747,3.60867877 9.06216243,4.0406856 9.9713639,4.76019743 C10.2837311,5.00739446 10.5717956,5.27173324 10.8293283,5.53618573 C10.9844845,5.69551098 11.095747,5.82038008 11.1636166,5.90267831 L12.304587,7.42001216 C12.7735626,6.80417763 13.0954767,6.2115492 13.181837,5.7200463 L13.181837,5.7200463 Z M4.85440635,10.6471169 C3.11735775,8.34197557 3.6072803,5.04298443 5.93806432,3.28661269 C8.27360069,1.5266598 11.5796688,1.97470779 13.3121317,4.27376372 L20.2227556,13.4444714 C21.9598042,15.7496127 21.4698817,19.0486038 19.1390976,20.8049756 C16.8035613,22.5649285 13.4974931,22.1168805 11.7650302,19.8178246 L4.85440635,10.6471169 Z" id="path-1"></path>
     </defs>
-    <g id="icon-/-Shapes-/-Capsule-Shape" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+    <g id="icon-/-Shapes-/-Capsule_Shape" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <mask id="mask-2" fill="white">
             <use xlink:href="#path-1"></use>
         </mask>
diff --git a/Assets/Editor/Icons/Components/CharacterPhysics.svg b/Assets/Editor/Icons/Components/CharacterPhysics.svg
index 47a2420068..0a0ea9ae7a 100644
--- a/Assets/Editor/Icons/Components/CharacterPhysics.svg
+++ b/Assets/Editor/Icons/Components/CharacterPhysics.svg
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
-    <title>icon / Physics / Cry / Character Physics</title>
-    <desc>Created with Sketch.</desc>
+    <title>icon / Physics / Cry / CharacterPhysics</title>
     <defs>
-        <path d="M14.5074945,9.09051724 C14.5619343,9.2996159 14.5909091,9.51886959 14.5909091,9.74472291 L14.5909091,12.6420882 L14.5909091,20.409636 C14.5909091,20.9427918 14.1596541,21.375 13.6193182,21.375 C13.0827233,21.375 12.6477273,20.9330841 12.6477273,20.409636 L12.6477273,16.121721 C12.4410014,16.1745162 12.2240162,16.2025862 12,16.2025862 C11.7763401,16.2025862 11.5592993,16.1741281 11.3522727,16.120651 L11.3522727,20.409636 C11.3522727,20.9427918 10.9210177,21.375 10.3806818,21.375 C9.84408698,21.375 9.40909091,20.9330841 9.40909091,20.409636 L9.40909091,12.6420882 L9.40909091,9.74472291 C9.40909091,9.51874001 9.4377086,9.29950678 9.49157145,9.09051724 L5.85446021,9.09051724 C5.31351927,9.09051724 4.875,8.66004489 4.875,8.12068966 C4.875,7.58506867 5.3171002,7.15086207 5.85446021,7.15086207 L18.1455398,7.15086207 C18.6864807,7.15086207 19.125,7.58133442 19.125,8.12068966 C19.125,8.65631064 18.6828998,9.09051724 18.1455398,9.09051724 L14.5074945,9.09051724 Z M12,6.50431034 C10.9268103,6.50431034 10.0568182,5.63589714 10.0568182,4.56465517 C10.0568182,3.4934132 10.9268103,2.625 12,2.625 C13.0731897,2.625 13.9431818,3.4934132 13.9431818,4.56465517 C13.9431818,5.63589714 13.0731897,6.50431034 12,6.50431034 Z" id="path-1"></path>
+        <path d="M14.5909091,20.409636 C14.5909091,20.9047092 14.2190616,21.3127409 13.7333174,21.3685053 L13.6193182,21.375 C13.0827233,21.375 12.6477273,20.9330841 12.6477273,20.409636 L12.6473457,16.1218184 C12.4918792,16.1614973 12.3306121,16.187193 12.1649174,16.1974831 L12,16.2025862 C11.7762378,16.2025862 11.5591008,16.1741021 11.3519887,16.1205776 L11.3522727,20.409636 C11.3522727,20.9047092 10.9804253,21.3127409 10.4946811,21.3685053 L10.3806818,21.375 C9.84408698,21.375 9.40909091,20.9330841 9.40909091,20.409636 L9.40909091,9.74472291 C9.40909091,9.51853084 9.4377616,9.29910096 9.49172108,9.08993696 L5.85446021,9.09051724 C5.31351927,9.09051724 4.875,8.66004489 4.875,8.12068966 C4.875,7.58506867 5.3171002,7.15086207 5.85446021,7.15086207 L18.1455398,7.15086207 C18.6478421,7.15086207 19.0618318,7.52203466 19.1184105,8.00689731 L19.125,8.12068966 C19.125,8.65631064 18.6828998,9.09051724 18.1455398,9.09051724 L14.5073892,9.09011263 C14.5618969,9.29933306 14.5909091,9.51872391 14.5909091,9.74472291 L14.5909091,20.409636 Z M12,2.625 C13.0731897,2.625 13.9431818,3.4934132 13.9431818,4.56465517 C13.9431818,5.63589714 13.0731897,6.50431034 12,6.50431034 C10.9268103,6.50431034 10.0568182,5.63589714 10.0568182,4.56465517 C10.0568182,3.4934132 10.9268103,2.625 12,2.625 Z" id="path-1"></path>
     </defs>
-    <g id="icon-/-Physics-/-Cry-/-Character-Physics" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+    <g id="icon-/-Physics-/-Cry-/-CharacterPhysics" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <mask id="mask-2" fill="white">
             <use xlink:href="#path-1"></use>
         </mask>
diff --git a/Assets/Editor/Icons/Components/Comment.svg b/Assets/Editor/Icons/Components/Comment.svg
index cdb7ac2ad6..02d54b8859 100644
--- a/Assets/Editor/Icons/Components/Comment.svg
+++ b/Assets/Editor/Icons/Components/Comment.svg
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
-    <title>icon / Other / Comments</title>
-    <desc>Created with Sketch.</desc>
+    <title>icon / Other / Comment</title>
     <defs>
         <path d="M7.02749543,18.2117232 C7.8834099,18.0387856 8.54248262,17.8471758 8.88341584,17.6633902 L9.13660094,17.5269066 L9.41318015,17.6058648 C10.2365316,17.8409162 11.1075671,17.9625414 12,17.9625414 C16.3237915,17.9625414 19.7799758,15.1162719 19.7799758,11.6803149 C19.7799758,8.24435789 16.3237915,5.39808842 12,5.39808842 C7.67620852,5.39808842 4.22002417,8.24435789 4.22002417,11.6803149 C4.22002417,13.43386 5.11977547,15.0821543 6.6930318,16.269688 L7.21492385,16.6636253 L6.12154393,18.3763334 C6.43148919,18.3255971 6.73578148,18.270664 7.02749543,18.2117232 Z M3.94487569,20.0540483 L5.67352379,17.3462342 C3.80549981,15.9362024 2.63427705,13.910191 2.63427705,11.6589 C2.63427705,7.3991563 6.82745404,3.94595171 12,3.94595171 C17.172546,3.94595171 21.3657229,7.3991563 21.3657229,11.6589 C21.3657229,15.9186438 17.172546,19.3718483 12,19.3718483 C10.9251584,19.3718483 9.89260571,19.2227398 8.93117829,18.9482703 C7.61917454,19.6555273 3.94487569,20.0540483 3.94487569,20.0540483 Z" id="path-1"></path>
     </defs>
-    <g id="icon-/-Other-/-Comments" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+    <g id="icon-/-Other-/-Comment" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <mask id="mask-2" fill="white">
             <use xlink:href="#path-1"></use>
         </mask>
diff --git a/Assets/Editor/Icons/Components/ComponentPlaceholder.svg b/Assets/Editor/Icons/Components/ComponentPlaceholder.svg
new file mode 100644
index 0000000000..7f357afba4
--- /dev/null
+++ b/Assets/Editor/Icons/Components/ComponentPlaceholder.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Other / ComponentPlaceholder</title>
+    <defs>
+        <path d="M6.88567588,11.4392131 L2.6789578,13.8679629 L2.6789578,18.7254625 L6.88567588,21.1542124 L11.092394,18.7254625 L11.092394,13.8679629 L6.88567588,11.4392131 Z M12.1907173,13.2338456 L12.1907173,19.3595798 L6.88567588,22.422447 L1.58063441,19.3595798 L1.58063441,13.2338456 L6.88567588,10.1709785 L12.1907173,13.2338456 Z M16.8621133,11.2561592 L12.5761306,13.7306725 L12.5761306,18.6796991 L16.8621133,21.1542124 L21.1480961,18.6796991 L21.1480961,13.7306725 L16.8621133,11.2561592 Z M22.2464194,13.0965552 L22.2464194,19.3138164 L16.8621133,22.422447 L11.4778072,19.3138164 L11.4778072,13.0965552 L16.8621133,9.98792459 L22.2464194,13.0965552 Z M11.7828422,3.01873379 L7.61534548,5.42483916 L7.61534548,10.2370499 L11.7828422,12.6431553 L15.950339,10.2370499 L15.950339,5.42483916 L11.7828422,3.01873379 Z M17.0486624,4.79072186 L17.0486624,10.8711672 L11.7828422,13.9113899 L6.51702209,10.8711672 L6.51702209,4.79072186 L11.7828422,1.75049918 L17.0486624,4.79072186 Z M11.2343588,13.8152765 L11.507349,14.2917792 L6.98034199,16.8853189 L2.14795994,14.2955445 L2.40736355,13.8115111 L6.97146167,16.2575066 L11.2343588,13.8152765 Z M6.69245108,16.5547281 L7.24161277,16.5547281 L7.24161277,21.4693642 L6.69245108,21.4693642 L6.69245108,16.5547281 Z M21.2855492,13.6863631 L21.5585394,14.1628658 L16.9582832,16.7983703 L12.0475971,14.1666312 L12.3070007,13.6825978 L16.9494029,16.1705579 L21.2855492,13.6863631 Z M16.6702444,16.4675015 L17.2194061,16.4675015 L17.2194061,21.4640481 L16.6702444,21.4640481 L16.6702444,16.4675015 Z M16.0945363,5.36800761 L16.3675265,5.84451037 L11.8767643,8.41728531 L7.08312819,5.84827569 L7.34253179,5.36424229 L11.8678839,7.78947295 L16.0945363,5.36800761 Z M11.5889465,8.08683212 L12.1381082,8.08683212 L12.1381082,12.9609376 L11.5889465,12.9609376 L11.5889465,8.08683212 Z" id="path-1"></path>
+    </defs>
+    <g id="icon-/-Other-/-ComponentPlaceholder" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <mask id="mask-2" fill="white">
+            <use xlink:href="#path-1"></use>
+        </mask>
+        <use id="Combined-Shape" fill="#FFFFFF" fill-rule="nonzero" xlink:href="#path-1"></use>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/Component_Placeholder.svg b/Assets/Editor/Icons/Components/Component_Placeholder.svg
index 40273bc241..b7bb861223 100644
--- a/Assets/Editor/Icons/Components/Component_Placeholder.svg
+++ b/Assets/Editor/Icons/Components/Component_Placeholder.svg
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
-    <title>icon / Other / Default </title>
-    <desc>Created with Sketch.</desc>
+    <title>icon / Other / Component_Placeholder </title>
     <defs>
         <path d="M6.88567588,11.4392131 L2.6789578,13.8679629 L2.6789578,18.7254625 L6.88567588,21.1542124 L11.092394,18.7254625 L11.092394,13.8679629 L6.88567588,11.4392131 Z M12.1907173,13.2338456 L12.1907173,19.3595798 L6.88567588,22.422447 L1.58063441,19.3595798 L1.58063441,13.2338456 L6.88567588,10.1709785 L12.1907173,13.2338456 Z M16.8621133,11.2561592 L12.5761306,13.7306725 L12.5761306,18.6796991 L16.8621133,21.1542124 L21.1480961,18.6796991 L21.1480961,13.7306725 L16.8621133,11.2561592 Z M22.2464194,13.0965552 L22.2464194,19.3138164 L16.8621133,22.422447 L11.4778072,19.3138164 L11.4778072,13.0965552 L16.8621133,9.98792459 L22.2464194,13.0965552 Z M11.7828422,3.01873379 L7.61534548,5.42483916 L7.61534548,10.2370499 L11.7828422,12.6431553 L15.950339,10.2370499 L15.950339,5.42483916 L11.7828422,3.01873379 Z M17.0486624,4.79072186 L17.0486624,10.8711672 L11.7828422,13.9113899 L6.51702209,10.8711672 L6.51702209,4.79072186 L11.7828422,1.75049918 L17.0486624,4.79072186 Z M11.2343588,13.8152765 L11.507349,14.2917792 L6.98034199,16.8853189 L2.14795994,14.2955445 L2.40736355,13.8115111 L6.97146167,16.2575066 L11.2343588,13.8152765 Z M6.69245108,16.5547281 L7.24161277,16.5547281 L7.24161277,21.4693642 L6.69245108,21.4693642 L6.69245108,16.5547281 Z M21.2855492,13.6863631 L21.5585394,14.1628658 L16.9582832,16.7983703 L12.0475971,14.1666312 L12.3070007,13.6825978 L16.9494029,16.1705579 L21.2855492,13.6863631 Z M16.6702444,16.4675015 L17.2194061,16.4675015 L17.2194061,21.4640481 L16.6702444,21.4640481 L16.6702444,16.4675015 Z M16.0945363,5.36800761 L16.3675265,5.84451037 L11.8767643,8.41728531 L7.08312819,5.84827569 L7.34253179,5.36424229 L11.8678839,7.78947295 L16.0945363,5.36800761 Z M11.5889465,8.08683212 L12.1381082,8.08683212 L12.1381082,12.9609376 L11.5889465,12.9609376 L11.5889465,8.08683212 Z" id="path-1"></path>
     </defs>
-    <g id="icon-/-Other-/-Default-" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+    <g id="icon-/-Other-/-Component_Placeholder-" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <mask id="mask-2" fill="white">
             <use xlink:href="#path-1"></use>
         </mask>
diff --git a/Assets/Editor/Icons/Components/Compound_Shape.svg b/Assets/Editor/Icons/Components/Compound_Shape.svg
index 976a52473a..320ca68868 100644
--- a/Assets/Editor/Icons/Components/Compound_Shape.svg
+++ b/Assets/Editor/Icons/Components/Compound_Shape.svg
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
-    <title>icon / Shapes / Compound Shape</title>
-    <desc>Created with Sketch.</desc>
+    <title>icon / Shapes / CompoundShape</title>
     <defs>
         <path d="M10.4370799,14.5703981 C10.8949783,13.60622 11.1341132,12.5187237 11.1341132,11.4107285 L11.3022587,11.4437822 C12.3108028,11.5867879 13.2303131,11.4877485 14.0520545,11.2068482 C13.3525652,9.86352915 13.0799875,8.19218852 13.2708888,6.49835529 C12.3065662,6.31182193 11.287252,6.26722591 10.2699746,6.39292235 C10.0043739,6.997927 9.85742934,7.66375171 9.85742934,8.36251642 C9.85742934,8.82096255 9.92045585,9.27068986 10.0434769,9.70351974 L10.3058563,10.6266594 L9.36979307,10.4354298 C9.0218634,10.3643508 8.66503627,10.3281859 8.30305193,10.3281859 C8.04232229,10.3281859 7.78615888,10.3469733 7.53590302,10.3832261 C7.11789063,11.2083584 6.83888064,12.0822188 6.69194783,12.9566996 C8.09969725,13.2327954 9.400157,13.7951165 10.4370799,14.5703981 L10.4370799,14.5703981 Z M10.9232713,14.9668966 C11.8471551,15.7894655 12.4957489,16.8034633 12.7238287,17.9407937 C13.1940279,17.1837205 13.4644359,16.2964336 13.4644359,15.3485303 C13.4644359,14.8900842 13.4014094,14.4403569 13.2783883,14.007527 L13.016009,13.0843873 L13.9520722,13.2756169 C14.3000019,13.3466959 14.656829,13.3828609 15.0188133,13.3828609 C15.3251643,13.3828609 15.6252112,13.3569236 15.9167784,13.3071935 C15.2762912,12.8933024 14.7447682,12.3378555 14.327342,11.6837376 C13.519573,11.9762733 12.6259988,12.1075788 11.6565476,12.0298022 C11.5944827,13.065899 11.3448739,14.0672359 10.9232713,14.9668966 Z M17.3632814,8.4760959 C16.4453567,7.62223145 15.202923,6.97365894 13.81776,6.62076135 C13.650692,8.208232 13.9159204,9.764365 14.5717517,10.9995273 C15.7336023,10.4673853 16.673772,9.55968715 17.3632814,8.4760959 L17.3632814,8.4760959 Z M17.7570161,8.8774549 C17.0240417,9.98410273 16.0424011,10.9068423 14.8491255,11.46719 C15.3179091,12.1766997 15.9342666,12.7487066 16.6883092,13.1145166 C17.583414,12.8171071 18.3672468,12.2871959 18.9642625,11.5992371 C18.8983375,10.5887929 18.4575257,9.6624411 17.7570161,8.8774549 L17.7570161,8.8774549 Z M18.6620548,4.80646463 C17.7291186,3.90193421 16.4419903,3.34217199 15.0188133,3.34217199 C14.9506814,3.34217199 14.8828612,3.34345488 14.8153768,3.34599706 C14.3523948,4.21742569 14.0472757,5.14736992 13.8916765,6.0778721 C15.3433623,6.43671771 16.6564905,7.1025468 17.6495088,7.99022868 C18.1902138,6.99705485 18.5342746,5.89070272 18.6620548,4.80646463 L18.6620548,4.80646463 Z M19.1463005,5.34796023 C18.9651694,6.4018396 18.5959194,7.44715106 18.0584996,8.38774375 C18.7586487,9.12921696 19.2477966,9.99839279 19.4395901,10.9547798 C19.9097893,10.1977066 20.1801973,9.31041968 20.1801973,8.36251642 C20.1801973,7.23211703 19.7956451,6.18792129 19.1463005,5.34796023 L19.1463005,5.34796023 Z M4.50851928,18.7516012 C5.45099407,19.7455777 6.80127766,20.3688748 8.30305193,20.3688748 C8.51955448,20.3688748 8.73290854,20.3559205 8.94234612,20.3307689 C8.15984011,19.8833349 7.52711252,19.2334063 7.05250307,18.4506637 C6.28773631,18.6934906 5.43736424,18.8040339 4.50851928,18.7516012 L4.50851928,18.7516012 Z M3.9192969,17.9994899 C4.95069928,18.1282707 5.88472399,18.0505216 6.71263514,17.8103347 C6.11867175,16.5239819 5.89403559,14.9736272 6.06789212,13.4029553 C5.25056692,13.2876925 4.40168326,13.2742215 3.55421314,13.3789362 C3.28861248,13.9839409 3.14166792,14.6497656 3.14166792,15.3485303 C3.14166792,16.3210411 3.42629774,17.2297474 3.9192969,17.9994899 L3.9192969,17.9994899 Z M10.6608547,15.4745497 C9.96507307,16.6998747 8.92464754,17.6915884 7.58486349,18.2548164 C8.1272957,19.114971 8.87985921,19.7843906 9.82582886,20.1468902 C10.782016,19.8601781 11.6190818,19.3105493 12.2485011,18.585251 C12.1713355,17.402521 11.5805444,16.3350044 10.6608547,15.4745497 L10.6608547,15.4745497 Z M10.1770888,15.064031 C9.20638719,14.3156142 7.96749042,13.7670754 6.61790358,13.4967282 C6.46018097,14.9796905 6.67972355,16.4358311 7.24255032,17.6290932 C8.52500448,17.120976 9.51608249,16.2008535 10.1770888,15.064031 L10.1770888,15.064031 Z M14.1612071,3.41111666 C12.6304247,3.66001011 11.329394,4.56396956 10.5704935,5.81512659 C11.511794,5.73454261 12.450767,5.78877767 13.3473121,5.95902856 C13.4951745,5.09358934 13.7648509,4.23073338 14.1612071,3.41111666 L14.1612071,3.41111666 Z M6.85184083,10.5292666 C5.58055716,10.8907807 4.51343301,11.7151769 3.85473205,12.8011405 C4.62644692,12.7350746 5.39659736,12.7596254 6.14308636,12.8644316 C6.27647887,12.0738129 6.5114939,11.2850936 6.85184083,10.5292666 L6.85184083,10.5292666 Z M8.69662356,8.36251642 C8.69662356,4.94159182 11.5309239,2.17545288 15.0188133,2.17545288 C18.5067027,2.17545288 21.3410031,4.94159182 21.3410031,8.36251642 C21.3410031,11.783441 18.5067027,14.54958 15.0188133,14.54958 C14.8688158,14.54958 14.7194521,14.5444585 14.5709166,14.534272 C14.6069933,14.8026078 14.6252417,15.0744502 14.6252417,15.3485303 C14.6252417,18.7694549 11.7909413,21.5355939 8.30305193,21.5355939 C4.81516252,21.5355939 1.98086215,18.7694549 1.98086215,15.3485303 C1.98086215,11.9276057 4.81516252,9.16146678 8.30305193,9.16146678 C8.45304947,9.16146678 8.60241317,9.16658828 8.75094864,9.17677477 C8.714872,8.9084389 8.69662356,8.63659649 8.69662356,8.36251642 Z" id="path-1"></path>
     </defs>
-    <g id="icon-/-Shapes-/-Compound-Shape" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+    <g id="icon-/-Shapes-/-CompoundShape" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <mask id="mask-2" fill="white">
             <use xlink:href="#path-1"></use>
         </mask>
diff --git a/Assets/Editor/Icons/Components/Cylinder_Shape.svg b/Assets/Editor/Icons/Components/Cylinder_Shape.svg
index d29a8a70ae..b3d5ef7e37 100644
--- a/Assets/Editor/Icons/Components/Cylinder_Shape.svg
+++ b/Assets/Editor/Icons/Components/Cylinder_Shape.svg
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
-    <title>icon / Shapes / Cylinder Shape</title>
-    <desc>Created with Sketch.</desc>
+    <title>icon / Shapes / Cylinder_Shape</title>
     <defs>
-        <path d="M6.94135645,8.59461015 L6.94135645,16.2038484 C8.27485309,15.887526 9.80613296,15.7079343 11.388955,15.7079343 C12.6883574,15.7079343 13.898866,15.7717747 14.982688,15.8986426 L14.982688,8.89007913 C13.9909107,9.03398928 12.9221516,9.1104703 11.7744186,9.1104703 C9.99662879,9.1104703 8.38673736,8.92711649 6.94135645,8.59461015 Z M5.91654398,8.32621584 C5.26824749,8.13490426 4.65684093,7.91185184 4.08196184,7.66071773 C3.78965989,7.53302655 3.51974504,7.40446577 3.27191021,7.27712046 L3.51570196,17.6390874 C4.11209886,17.188651 4.93772723,16.7969292 5.91654398,16.4862089 L5.91654398,8.32621584 Z M6.94135645,21.2409256 C7.03093368,21.2721342 7.12187353,21.3024143 7.21418781,21.3317466 C8.44106491,21.6001243 9.8816028,21.7673841 11.388955,21.7673841 C12.6311741,21.7673841 13.8689941,21.5916078 14.982688,21.309714 L14.982688,16.9433723 C13.9183806,16.8092583 12.7020605,16.7327468 11.388955,16.7327468 C9.77910587,16.7327468 8.23157654,16.9419777 6.94135645,17.2678646 L6.94135645,21.2409256 Z M5.91654398,20.8159967 L5.91654398,17.5689951 C4.70474153,17.9811657 3.85217206,18.4975436 3.59946004,19.0038879 C3.63434596,19.0511046 3.67542586,19.1043104 3.72303415,19.1628088 C4.01965636,19.527282 4.42066207,19.8994586 4.94157226,20.253123 C5.24114385,20.4565128 5.56578667,20.644703 5.91654398,20.8159967 Z M16.0075005,8.71221744 L16.0075005,16.0438875 C17.6230574,16.31647 18.8731049,16.7539792 19.5966475,17.3529517 L19.900698,7.35772914 C19.7155573,7.4556365 19.5178978,7.55381291 19.3074817,7.65136136 C18.3357309,8.10186298 17.237236,8.46229151 16.0075005,8.71221744 Z M16.0075005,21.0095431 C17.9142764,20.3705816 19.2561806,19.4397774 19.2561806,18.6692189 C19.2561806,18.0369295 18.0049752,17.4556774 16.0075005,17.0983467 L16.0075005,21.0095431 Z M5.78502794,7.08947816 L9.78108666,5.41896308 L11.1855462,5.94259773 L7.47433524,7.49403485 C8.52212313,7.68187578 9.71227942,7.79332738 10.9717037,7.79332738 C12.405912,7.79332738 13.8579936,7.65257385 15.1637195,7.42580845 L11.1855462,5.94259773 L7.47433524,7.49403485 C6.85678976,7.38332512 6.28869865,7.24608009 5.78502794,7.08947816 L9.78108666,5.41896308 L5.49369672,3.82046493 C4.19307671,4.26216736 3.39330488,4.8365532 3.39330488,5.40166751 C3.39330488,6.01017511 4.31466044,6.63230963 5.78502794,7.08947816 Z M14.7758863,3.33093368 C13.5748438,3.14483101 12.2671066,3.03216885 10.9717037,3.03216885 C9.61021281,3.03216885 8.33150002,3.16000041 7.22612892,3.37265608 L11.1640107,4.84084459 L14.7758863,3.33093368 C15.3551816,3.42069604 15.9096555,3.52754355 16.425952,3.64707523 L16.4632524,3.73630187 L12.5684702,5.36447924 L17.01425,7.02203102 C18.7533607,6.55442936 19.9342727,5.94511956 19.9342727,5.40166751 C19.9342727,4.80103157 18.4831835,4.1233603 16.425952,3.64707523 L16.4632524,3.73630187 L12.5684702,5.36447924 L11.1640107,4.84084459 L14.7758863,3.33093368 Z M20.9589772,5.38573957 C20.9776556,5.36733636 20.9868292,5.35754848 20.9868292,5.35754848 L20.565056,19.2227347 C20.565056,19.2227347 19.2016575,22.9792395 11.7744186,22.9792395 C9.87776793,22.9792395 8.34681484,22.7342746 7.11846941,22.3694553 C4.40069088,21.7945451 2.48091577,20.6791175 2.48091577,19.309197 C2.48091577,19.1886847 2.49579405,19.0697984 2.52476212,18.9527693 L2.36971096,5.46356124 C2.36889969,5.44299644 2.3684924,5.42236493 2.3684924,5.40166751 C2.3684924,5.3930628 2.36856275,5.38446982 2.36870321,5.37588861 L2.3684924,5.35754848 C2.42512324,3.36143194 6.28084027,2.00735637 10.9717037,2.00735637 C15.9848303,2.00735637 20.9323489,3.42228713 20.9589772,5.38573957 Z" id="path-1"></path>
+        <path d="M20.9868292,5.35754848 L20.565056,19.2227347 L20.5638581,19.2259355 L20.553863,19.2508839 C20.4107275,19.5950398 18.8240013,22.9792395 11.7744186,22.9792395 C9.87704932,22.9792395 8.34565478,22.734089 7.11707334,22.3690406 C4.40054385,21.7944597 2.48091577,20.679065 2.48091577,19.309197 C2.48091577,19.190405 2.4953723,19.0731931 2.52353014,18.9577824 L2.3684924,5.35754848 C2.45004589,5.35754848 2.66272237,5.52805531 3.03985592,5.78381556 L3.22571636,5.90760182 C4.44536357,6.70445158 7.03875276,8.08565782 11.7744186,8.08565782 C18.4299489,8.08565782 20.9868292,5.35754848 20.9868292,5.35754848 Z M11.388955,16.7327468 C7.59729509,16.7327468 4.15134701,17.8934316 3.59878434,19.0052446 C3.63454664,19.0513645 3.67554212,19.1044532 3.72303415,19.1628088 C4.01965636,19.527282 4.42066207,19.8994586 4.94157226,20.253123 C5.58098064,20.68724 6.33460611,21.0521123 7.21259297,21.3312397 C8.43944842,21.5999366 9.88075706,21.7673841 11.388955,21.7673841 C15.3448746,21.7673841 19.2561806,19.9847641 19.2561806,18.6692189 C19.2561806,17.6323607 15.8915641,16.7327468 11.388955,16.7327468 Z M3.27191021,7.27712046 L3.51548242,17.6392532 C5.05184999,16.4787454 8.10979255,15.7079343 11.388955,15.7079343 C15.2216264,15.7079343 18.2809268,16.2633417 19.5970598,17.3532931 L19.900698,7.35772914 C19.7155573,7.4556365 19.5178978,7.55381291 19.3074817,7.65136136 C17.3325493,8.56693589 14.8341095,9.1104703 11.7744186,9.1104703 C8.72055866,9.1104703 6.1621305,8.56943281 4.08196184,7.66071773 C3.78965989,7.53302655 3.51974504,7.40446577 3.27191021,7.27712046 Z M10.9717037,2.00735637 C15.9983759,2.00735637 20.9590851,3.42994384 20.9590851,5.40166751 C20.9590851,6.68469771 18.8559935,7.74326951 16.0079822,8.32708473 L16.0075005,21.7326934 L14.982688,21.7326934 L14.9828717,8.51164385 C13.7161719,8.70971499 12.3451503,8.81813985 10.9717037,8.81813985 C9.52024888,8.81813985 8.14668788,8.68592984 6.94074968,8.44383282 L6.94135645,21.7295047 L5.91654398,21.7295047 L5.91657296,8.20063214 C5.89049889,8.19339099 5.86453414,8.1860917 5.83867991,8.17873456 L5.81278229,8.18863157 L5.80493363,8.16908073 C3.7245079,7.570781 2.3684924,6.5959324 2.3684924,5.40166751 C2.3684924,3.3814089 6.24636431,2.00735637 10.9717037,2.00735637 Z M11.1844924,5.94235637 L7.47520026,7.4941899 C8.52277815,7.68193711 9.71262598,7.79332738 10.9717037,7.79332738 C12.4059675,7.79332738 13.8581059,7.65256297 15.163871,7.42578214 L11.1844924,5.94235637 Z M3.39330488,5.40166751 C3.39330488,6.01010842 4.31445848,6.63217326 5.7845445,7.08932783 L9.7804924,5.41835637 L5.49419244,3.82029659 C4.19327993,4.26202142 3.39330488,4.83648141 3.39330488,5.40166751 Z M16.4258431,3.64705002 L16.4632524,3.73630187 L12.5674924,5.36335637 L17.0138437,7.02214027 C18.7531767,6.55452427 19.9342727,5.94516188 19.9342727,5.40166751 C19.9342727,4.80102097 18.4831322,4.12333639 16.4258431,3.64705002 Z M10.9717037,3.03216885 C9.61058506,3.03216885 8.33219927,3.15993052 7.22703563,3.37248167 L11.1634924,4.84035637 L14.7765088,3.33103015 C13.5752957,3.14486995 12.2673304,3.03216885 10.9717037,3.03216885 Z" id="path-1"></path>
     </defs>
-    <g id="icon-/-Shapes-/-Cylinder-Shape" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+    <g id="icon-/-Shapes-/-Cylinder_Shape" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <mask id="mask-2" fill="white">
             <use xlink:href="#path-1"></use>
         </mask>
diff --git a/Assets/Editor/Icons/Components/DebugDrawLine.svg b/Assets/Editor/Icons/Components/DebugDrawLine.svg
index 70a5747817..d64de1b706 100644
--- a/Assets/Editor/Icons/Components/DebugDrawLine.svg
+++ b/Assets/Editor/Icons/Components/DebugDrawLine.svg
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
-    <title>icon / Other / DebugDraw line</title>
-    <desc>Created with Sketch.</desc>
-    <g id="icon-/-Other-/-DebugDraw-line" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <path d="M13.4818106,7.20368188 C13.4818106,7.20368188 13.6414157,7.04407673 13.960626,6.72486643 C14.1623869,6.5231056 14.7098138,6.60915772 14.9095711,6.69302722 C15.5395966,6.95754789 16.0136881,7.15841165 16.3318454,7.29561849 C16.9603951,7.5666834 16.2569348,8.65924984 15.8721624,8.49079439 C15.6156475,8.37849076 15.18661,8.19461755 14.5850499,7.93917474 L14.3092401,8.21498457 C14.5390816,8.72063592 14.9337671,9.41779404 15.0257037,9.96941369 C15.1277339,11.0237257 13.8529763,13.5390725 13.7103852,13.8803049 C13.2868384,14.1007827 10.9151417,15.2183045 9.87725359,15.1178638 C9.27966564,15.0718955 8.51723373,14.7424838 8.05755068,14.4666739 L7.78174086,14.7424838 C8.01275917,15.2482504 8.19663239,15.6772879 8.33336051,16.0295963 C8.53845269,16.5580588 7.33585669,16.9701884 7.1381846,16.4892793 C7.03543661,16.2393075 6.83581761,15.7650669 6.53932761,15.0665575 C6.41215755,14.7669539 6.48624631,14.1992462 6.59697605,14.0885164 C6.69681426,13.9886782 6.84657157,13.8389209 7.04624799,13.6392445 C6.77043817,13.3634346 6.54059664,13.0416565 6.35672343,12.7658467 C6.17285021,12.4900369 6.0809136,12.214227 5.94300869,11.9843855 C5.57475902,12.3526352 5.29857176,12.6288224 5.11444693,12.8129473 C5.03821051,12.8891837 4.6820417,12.9633964 4.58373545,12.9250126 C3.87063868,12.6465831 3.28178153,12.3943318 2.817164,12.1682587 C2.25342212,11.8052375 2.71624773,10.8541607 3.27684705,10.9730828 C3.54552872,11.07386 3.989889,11.2424104 4.60992787,11.4787342 L5.39138904,10.697273 C5.20751582,10.3295266 5.11557921,9.96178013 5.02364261,9.5940337 C4.83976939,9.50209709 4.65589617,9.41016048 4.51799126,9.27225557 C4.10427652,8.85854083 3.85022958,7.96803064 3.75829297,7.41641099 C3.25264163,7.27850608 3.00097536,7.39559963 2.63322892,7.76334606 C2.3574191,8.03915589 1.95732254,8.29725379 1.68151272,8.02144396 C1.40570289,7.74563414 1.46225844,7.50464864 1.73806826,7.22883882 C2.38162452,6.58528256 2.95506892,6.3302841 3.8284667,6.46818901 C4.01233991,5.91656936 4.28814974,5.36494971 4.74783278,4.90526667 C5.20751582,4.44558362 5.71316717,4.2157421 6.26478682,4.03186889 C6.12688191,3.15847111 6.26525817,2.60377059 6.90881443,1.96021433 C7.18462425,1.68440451 7.42561637,1.5818885 7.7014262,1.85769832 C7.97723602,2.13350815 7.85624661,2.45195904 7.58043678,2.72776887 C7.21269035,3.0955153 7.212219,3.32843769 7.30415561,3.78812073 C7.90174356,3.83408904 8.70110694,4.26171041 9.11482168,4.67542515 C9.25272659,4.81333006 9.3446632,4.99720328 9.48256811,5.13510819 C9.85031455,5.2270448 10.1720927,5.36494971 10.5858074,5.50285462 L11.3672686,4.72139345 C11.1224548,4.12514021 10.9385816,3.69610271 10.8156489,3.43428093 C10.63125,3.04154827 11.7982569,2.45288212 12.0108248,2.97459789 C12.1206202,3.24407388 12.3201099,3.71867438 12.609294,4.3983994 C12.6933575,4.59599005 12.6665147,5.26087948 12.5576608,5.36973343 C12.395281,5.53211324 12.1517112,5.77568295 11.8269516,6.10044258 C12.1487298,6.23834749 12.3785713,6.3762524 12.6084128,6.51415731 C12.8842226,6.69803053 13.2060008,6.92787205 13.4818106,7.20368188 Z M5.66719887,5.82463275 C4.88573769,6.60609392 4.79380109,7.70933322 5.43735734,8.35288948 C5.57526226,8.49079439 5.63451781,8.49565536 5.83939814,8.42877072 C6.56024928,8.08096189 7.04204901,7.78568332 7.28479734,7.54293499 C7.53237759,7.29535474 7.84371206,6.84012102 8.21880074,6.17723384 C8.3336518,5.91787976 8.33336051,5.73269614 8.1954556,5.59479123 C7.55189934,4.95123497 6.44866004,5.04317158 5.66719887,5.82463275 Z M7.9587228,12.7724462 C8.84051933,13.6620319 10.5086101,14.3077427 12.8593,13.0351232 C14.124171,10.3024798 13.3536895,8.98403166 12.6428004,8.1675116 C12.1688743,7.6231649 11.1028494,7.07233305 9.44472557,6.51501606 C9.07830433,7.22030328 8.64303228,7.82324702 8.13890941,8.32384728 C7.63478655,8.82444754 7.03529678,9.25598406 6.34044012,9.61845684 C6.83143088,11.1280592 7.37085844,12.179389 7.9587228,12.7724462 Z M11.3484071,19.9956154 L11.3484071,23.3830038 L7.10355942,23.3830038 L7.10355942,19.1381562 L10.4909478,19.1381562 L18.0169198,10.6836349 L18.0169198,7.2962465 L22.2617674,7.2962465 L22.2617674,11.5410941 L18.874379,11.5410941 L11.3484071,19.9956154 Z" id="Combined-Shape" fill="#FFFFFF" fill-rule="nonzero"></path>
+    <title>icon / Other / DebugDrawLine</title>
+    <g id="icon-/-Other-/-DebugDrawLine" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M22.2617674,7.2962465 L22.2617674,11.5410941 L18.874379,11.5410941 L11.3484071,19.9956154 L11.3484071,23.3830038 L7.10355942,23.3830038 L7.10355942,19.1381562 L10.4909478,19.1381562 L18.0169198,10.6836349 L18.0169198,7.2962465 L22.2617674,7.2962465 Z M6.90881443,1.96021433 C7.18462425,1.68440451 7.42561637,1.5818885 7.7014262,1.85769832 C7.97723602,2.13350815 7.85624661,2.45195904 7.58043678,2.72776887 C7.21269035,3.0955153 7.212219,3.32843769 7.30415561,3.78812073 C7.90174356,3.83408904 8.70110694,4.26171041 9.11482168,4.67542515 C9.25272659,4.81333006 9.3446632,4.99720328 9.48256811,5.13510819 C9.85031455,5.2270448 10.1720927,5.36494971 10.5858074,5.50285462 L10.5858074,5.50285462 L11.3672686,4.72139345 C11.1224548,4.12514021 10.9385816,3.69610271 10.8156489,3.43428093 C10.63125,3.04154827 11.7982569,2.45288212 12.0108248,2.97459789 C12.1206202,3.24407388 12.3201099,3.71867438 12.609294,4.3983994 C12.6933575,4.59599005 12.6665147,5.26087948 12.5576608,5.36973343 C12.395281,5.53211324 12.1517112,5.77568295 11.8269516,6.10044258 C12.1487298,6.23834749 12.3785713,6.3762524 12.6084128,6.51415731 C12.8842226,6.69803053 13.2060008,6.92787205 13.4818106,7.20368188 C13.4818106,7.20368188 13.5133375,7.17215493 13.5763914,7.10910105 L13.7714644,6.91402809 C13.8266365,6.85885594 13.8896904,6.79580205 13.960626,6.72486643 C14.1623869,6.5231056 14.7098138,6.60915772 14.9095711,6.69302722 C15.5395966,6.95754789 16.0136881,7.15841165 16.3318454,7.29561849 C16.9603951,7.5666834 16.2569348,8.65924984 15.8721624,8.49079439 C15.6156475,8.37849076 15.18661,8.19461755 14.5850499,7.93917474 L14.5850499,7.93917474 L14.3092401,8.21498457 C14.5390816,8.72063592 14.9337671,9.41779404 15.0257037,9.96941369 C15.1277339,11.0237257 13.8529763,13.5390725 13.7103852,13.8803049 L13.7103852,13.8803049 L13.5578602,13.956779 C12.8844549,14.2859248 10.8248905,15.2095706 9.87725359,15.1178638 C9.27966564,15.0718955 8.51723373,14.7424838 8.05755068,14.4666739 L8.05755068,14.4666739 L7.78174086,14.7424838 C8.01275917,15.2482504 8.19663239,15.6772879 8.33336051,16.0295963 C8.53845269,16.5580588 7.33585669,16.9701884 7.1381846,16.4892793 C7.03543661,16.2393075 6.83581761,15.7650669 6.53932761,15.0665575 C6.41215755,14.7669539 6.48624631,14.1992462 6.59697605,14.0885164 C6.63691133,14.0485811 6.68483367,14.0006588 6.74074307,13.9447494 L6.93243243,13.75306 L6.93243243,13.75306 L7.04624799,13.6392445 C6.77043817,13.3634346 6.54059664,13.0416565 6.35672343,12.7658467 C6.17285021,12.4900369 6.0809136,12.214227 5.94300869,11.9843855 L5.94300869,11.9843855 L5.19899404,12.7284002 L5.19899404,12.7284002 L5.11444693,12.8129473 C5.03821051,12.8891837 4.6820417,12.9633964 4.58373545,12.9250126 C3.87063868,12.6465831 3.28178153,12.3943318 2.817164,12.1682587 C2.25342212,11.8052375 2.71624773,10.8541607 3.27684705,10.9730828 C3.54552872,11.07386 3.989889,11.2424104 4.60992787,11.4787342 L4.60992787,11.4787342 L5.39138904,10.697273 C5.20751582,10.3295266 5.11557921,9.96178013 5.02364261,9.5940337 C4.83976939,9.50209709 4.65589617,9.41016048 4.51799126,9.27225557 C4.10427652,8.85854083 3.85022958,7.96803064 3.75829297,7.41641099 C3.25264163,7.27850608 3.00097536,7.39559963 2.63322892,7.76334606 C2.3574191,8.03915589 1.95732254,8.29725379 1.68151272,8.02144396 C1.40570289,7.74563414 1.46225844,7.50464864 1.73806826,7.22883882 C2.38162452,6.58528256 2.95506892,6.3302841 3.8284667,6.46818901 C4.01233991,5.91656936 4.28814974,5.36494971 4.74783278,4.90526667 C5.20751582,4.44558362 5.71316717,4.2157421 6.26478682,4.03186889 C6.12688191,3.15847111 6.26525817,2.60377059 6.90881443,1.96021433 Z M9.44472557,6.51501606 C9.07830433,7.22030328 8.64303228,7.82324702 8.13890941,8.32384728 C7.63478655,8.82444754 7.03529678,9.25598406 6.34044012,9.61845684 C6.83143088,11.1280592 7.37085109,12.1793963 7.95870075,12.7724682 C8.84051933,13.6620319 10.5086101,14.3077427 12.8593,13.0351232 C14.124171,10.3024798 13.3536895,8.98403166 12.6428004,8.1675116 C12.1688743,7.6231649 11.1028494,7.07233305 9.44472557,6.51501606 Z M8.1954556,5.59479123 C7.55189934,4.95123497 6.44866004,5.04317158 5.66719887,5.82463275 C4.88573769,6.60609392 4.79380109,7.70933322 5.43735734,8.35288948 C5.57526226,8.49079439 5.63451781,8.49565536 5.83939814,8.42877072 C6.56024928,8.08096189 7.04204901,7.78568332 7.28479734,7.54293499 C7.53237759,7.29535474 7.84371206,6.84012102 8.21880074,6.17723384 C8.3336518,5.91787976 8.33336051,5.73269614 8.1954556,5.59479123 Z" id="Combined-Shape" fill="#FFFFFF" fill-rule="nonzero"></path>
     </g>
 </svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/DebugDrawObb.svg b/Assets/Editor/Icons/Components/DebugDrawObb.svg
index 3d7a9ed03a..ca948e47d1 100644
--- a/Assets/Editor/Icons/Components/DebugDrawObb.svg
+++ b/Assets/Editor/Icons/Components/DebugDrawObb.svg
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
-    <title>icon / Other / DebugDraw Obb</title>
-    <desc>Created with Sketch.</desc>
-    <g id="icon-/-Other-/-DebugDraw-Obb" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <path d="M15.6118847,10.3098789 C14.9532881,10.6649372 13.475052,11.5159179 11.1771766,12.862821 L11.199459,15.525243 C10.3109975,15.4755262 8.72395751,14.741067 8.26427446,14.4652571 L7.98846464,14.741067 C8.21948295,15.2468336 8.40335617,15.6758711 8.54008429,16.0281795 C8.74517647,16.556642 7.54258047,16.9687717 7.34490838,16.4878625 C7.24216039,16.2378907 7.04254139,15.7636501 6.74605139,15.0651407 C6.61888134,14.7655371 6.69297009,14.1978294 6.80369983,14.0870996 L7.25297177,13.6378277 C6.97716195,13.3620178 6.74732043,13.0402397 6.56344721,12.7644299 C6.37957399,12.4886201 6.28763738,12.2128102 6.14973247,11.9829687 L5.32117071,12.8115305 C5.2449343,12.8877669 4.88876548,12.9619796 4.79045923,12.9235958 C4.07736246,12.6451663 3.48850531,12.392915 3.02388779,12.1668419 C2.4601459,11.8038207 2.92297151,10.8527439 3.48357083,10.971666 C3.7522525,11.0724432 4.19661278,11.2409936 4.81665165,11.4773174 L5.59811282,10.6958562 C5.4142396,10.3281098 5.322303,9.96036333 5.23036639,9.5926169 C5.04649317,9.50068029 4.86261995,9.40874368 4.72471504,9.27083877 C4.3110003,8.85712403 4.05695336,7.96661384 3.96501675,7.41499419 C3.45936541,7.27708928 3.20769914,7.39418283 2.8399527,7.76192926 C2.56414288,8.03773909 2.16404633,8.29583699 1.8882365,8.02002716 C1.61242668,7.74421734 1.66898222,7.50323185 1.94479204,7.22742202 C2.5883483,6.58386576 3.1617927,6.3288673 4.03519048,6.46677221 C4.21906369,5.91515256 4.49487352,5.36353291 4.95455656,4.90384987 C5.4142396,4.44416683 5.91989095,4.21432531 6.4715106,4.03045209 C6.33360569,3.15705431 6.47198195,2.60235379 7.11553821,1.95879753 C7.39134803,1.68298771 7.63234015,1.5804717 7.90814998,1.85628152 C8.1839598,2.13209135 8.06297039,2.45054224 7.78716056,2.72635207 C7.41941413,3.0940985 7.41894278,3.32702089 7.51087939,3.78670393 C8.10846734,3.83267224 8.90783072,4.26029361 9.32154546,4.67400835 C9.45945037,4.81191326 9.55138698,4.99578648 9.68929189,5.13369139 C10.0570383,5.225628 10.3788165,5.36353291 10.7925312,5.50143782 L11.5739924,4.71997665 C11.3291786,4.12372342 11.1453053,3.69468591 11.0223727,3.43286413 C10.8379738,3.04013147 12.0049807,2.45146532 12.2175486,2.97318109 C12.3273439,3.24265708 12.5268337,3.71725758 12.8160178,4.3969826 C12.9000813,4.59457325 12.8732385,5.25946268 12.7643846,5.36831663 L12.0336754,6.09902578 C12.3554535,6.23693069 12.5852951,6.3748356 12.8151366,6.51274052 C13.0909464,6.69661373 13.4127245,6.92645525 13.6885344,7.20226508 L14.1673498,6.72344963 C14.3691106,6.5216888 14.9165375,6.60774092 15.1162948,6.69161043 C15.7463204,6.95613109 16.2204118,7.15699485 16.5385692,7.29420169 C17.1671188,7.5652666 16.4636586,8.65783304 16.0788862,8.4893776 C15.8223712,8.37707396 15.3933337,8.19320075 14.7917737,7.93775795 L14.5159638,8.21356777 C14.7458054,8.71921912 15.2688907,9.30833115 15.6118847,10.3098789 Z M5.87392265,5.82321595 C5.09246147,6.60467712 5.00052487,7.70791642 5.64408112,8.35147268 C5.78198604,8.4893776 5.84124159,8.49423856 6.04612192,8.42735392 C6.76697306,8.0795451 7.24877279,7.78426652 7.49152112,7.54151819 C7.73910137,7.29393794 8.05043584,6.83870422 8.42552452,6.17581704 C8.54037558,5.91646296 8.54008429,5.73127934 8.40217938,5.59337443 C7.75862312,4.94981817 6.65538382,5.04175478 5.87392265,5.82321595 Z M8.16544658,12.7710294 C8.71734135,13.3277992 9.25045944,13.9116383 10.2169736,13.9801598 C10.2116928,13.1428319 10.2307145,14.1581582 10.2256032,12.0830666 C11.1314526,11.6743846 13.3736007,10.2971277 14.1940558,9.88793053 C13.5517309,8.86203962 13.2508544,8.27986424 12.6368654,7.79171276 C11.8303152,7.15046557 10.4768917,6.57661485 9.65144935,6.51359926 C9.28502811,7.21888648 8.84975606,7.82183022 8.34563319,8.32243048 C7.84151033,8.82303074 7.24202056,9.25456726 6.5471639,9.61704004 C7.03815466,11.1266424 7.57758222,12.1779722 8.16544658,12.7710294 Z M17.3297596,11.5758879 L13.2330398,13.9411302 L13.2330398,18.6716147 L17.3297596,21.0368569 L21.4264793,18.6716147 L21.4264793,13.9411302 L17.3297596,11.5758879 Z M22.4763023,13.3350146 L22.4763023,19.2777302 L17.3297596,22.2490881 L12.1832168,19.2777302 L12.1832168,13.3350146 L17.3297596,10.3636567 L22.4763023,13.3350146 Z M17.6712748,16.7303705 L21.8187981,14.3542385 L21.5578627,13.8987774 L17.4131945,16.2732737 L12.9757943,13.8951783 L12.7278456,14.3578375 L17.1463633,16.7258134 L17.1463633,21.3330108 L17.6712748,21.3330108 L17.6712748,16.7303705 Z" id="Combined-Shape" fill="#FFFFFF"></path>
+    <title>icon / Other / DebugDrawObb</title>
+    <g id="icon-/-Other-/-DebugDrawObb" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M17.3297596,10.3636567 L22.4763023,13.3350146 L22.4763023,19.2777302 L17.3297596,22.2490881 L12.1832168,19.2777302 L12.1832168,13.3350146 L17.3297596,10.3636567 Z M17.6704975,20.8396941 L17.3297596,21.0368569 L17.1454975,20.9306941 L17.1463633,21.3330108 L17.6712748,21.3330108 L17.6704975,20.8396941 Z M13.2324975,14.6286941 L13.2330398,18.6716147 L17.1454975,20.9306941 L17.1463633,16.7258134 L13.2324975,14.6286941 Z M21.4254975,14.5786941 L17.6712748,16.7303705 L17.6704975,20.8396941 L21.4264793,18.6716147 L21.4254975,14.5786941 Z M7.90814998,1.85628152 C8.1839598,2.13209135 8.06297039,2.45054224 7.78716056,2.72635207 C7.41941413,3.0940985 7.41894278,3.32702089 7.51087939,3.78670393 C8.10846734,3.83267224 8.90783072,4.26029361 9.32154546,4.67400835 C9.45945037,4.81191326 9.55138698,4.99578648 9.68929189,5.13369139 C10.0570383,5.225628 10.3788165,5.36353291 10.7925312,5.50143782 L11.5739924,4.71997665 C11.3291786,4.12372342 11.1453053,3.69468591 11.0223727,3.43286413 C10.8379738,3.04013147 12.0049807,2.45146532 12.2175486,2.97318109 C12.3273439,3.24265708 12.5268337,3.71725758 12.8160178,4.3969826 C12.9000813,4.59457325 12.8732385,5.25946268 12.7643846,5.36831663 L12.0336754,6.09902578 C12.3554535,6.23693069 12.5852951,6.3748356 12.8151366,6.51274052 C13.0909464,6.69661373 13.4127245,6.92645525 13.6885344,7.20226508 L14.1673498,6.72344963 C14.3691106,6.5216888 14.9165375,6.60774092 15.1162948,6.69161043 C15.7463204,6.95613109 16.2204118,7.15699485 16.5385692,7.29420169 C17.1671188,7.5652666 16.4636586,8.65783304 16.0788862,8.4893776 C15.8223712,8.37707396 15.3933337,8.19320075 14.7917737,7.93775795 L14.5159638,8.21356777 C14.7458054,8.71921912 15.2688907,9.30833115 15.6118847,10.3098789 C14.9532881,10.6649372 13.475052,11.5159179 11.1771766,12.862821 L11.199459,15.525243 C10.3109975,15.4755262 8.72395751,14.741067 8.26427446,14.4652571 L7.98846464,14.741067 C8.21948295,15.2468336 8.40335617,15.6758711 8.54008429,16.0281795 C8.74517647,16.556642 7.54258047,16.9687717 7.34490838,16.4878625 C7.24216039,16.2378907 7.04254139,15.7636501 6.74605139,15.0651407 C6.61888134,14.7655371 6.69297009,14.1978294 6.80369983,14.0870996 L7.25297177,13.6378277 C6.97716195,13.3620178 6.74732043,13.0402397 6.56344721,12.7644299 C6.37957399,12.4886201 6.28763738,12.2128102 6.14973247,11.9829687 L5.32117071,12.8115305 C5.2449343,12.8877669 4.88876548,12.9619796 4.79045923,12.9235958 C4.07736246,12.6451663 3.48850531,12.392915 3.02388779,12.1668419 C2.4601459,11.8038207 2.92297151,10.8527439 3.48357083,10.971666 C3.7522525,11.0724432 4.19661278,11.2409936 4.81665165,11.4773174 L5.59811282,10.6958562 C5.4142396,10.3281098 5.322303,9.96036333 5.23036639,9.5926169 C5.04649317,9.50068029 4.86261995,9.40874368 4.72471504,9.27083877 C4.3110003,8.85712403 4.05695336,7.96661384 3.96501675,7.41499419 C3.45936541,7.27708928 3.20769914,7.39418283 2.8399527,7.76192926 C2.56414288,8.03773909 2.16404633,8.29583699 1.8882365,8.02002716 C1.61242668,7.74421734 1.66898222,7.50323185 1.94479204,7.22742202 C2.5883483,6.58386576 3.1617927,6.3288673 4.03519048,6.46677221 C4.21906369,5.91515256 4.49487352,5.36353291 4.95455656,4.90384987 C5.4142396,4.44416683 5.91989095,4.21432531 6.4715106,4.03045209 C6.33360569,3.15705431 6.47198195,2.60235379 7.11553821,1.95879753 C7.39134803,1.68298771 7.63234015,1.5804717 7.90814998,1.85628152 Z M17.3297596,11.5758879 L13.2330398,13.9411302 L13.2324975,14.0326941 L17.4131945,16.2732737 L21.4254975,13.9746941 L21.4264793,13.9411302 L17.3297596,11.5758879 Z M12.9757943,13.8951783 L12.7278456,14.3578375 L13.2324975,14.6286941 L13.2324975,14.0326941 L12.9757943,13.8951783 Z M21.5578627,13.8987774 L21.4254975,13.9746941 L21.4254975,14.5786941 L21.8187981,14.3542385 L21.5578627,13.8987774 Z M9.65144935,6.51359926 C9.28502811,7.21888648 8.84975606,7.82183022 8.34563319,8.32243048 C7.84151033,8.82303074 7.24202056,9.25456726 6.5471639,9.61704004 C7.03815466,11.1266424 7.57758222,12.1779722 8.16544658,12.7710294 C8.71734135,13.3277992 9.25045944,13.9116383 10.2169736,13.9801598 C10.2165964,13.9203507 10.2163432,13.8699938 10.2161963,13.8272879 L10.21645,13.648452 C10.2168658,13.6098362 10.2175657,13.5874126 10.2184086,13.5667702 L10.2197625,13.5353408 C10.2219011,13.4847962 10.224406,13.4067896 10.2256685,13.1371674 L10.2256032,12.0830666 L10.2256032,12.0830666 C11.1314526,11.6743846 13.3736007,10.2971277 14.1940558,9.88793053 C13.5517309,8.86203962 13.2508544,8.27986424 12.6368654,7.79171276 C11.8303152,7.15046557 10.4768917,6.57661485 9.65144935,6.51359926 Z M5.87392265,5.82321595 C5.09246147,6.60467712 5.00052487,7.70791642 5.64408112,8.35147268 C5.78198604,8.4893776 5.84124159,8.49423856 6.04612192,8.42735392 C6.76697306,8.0795451 7.24877279,7.78426652 7.49152112,7.54151819 C7.73910137,7.29393794 8.05043584,6.83870422 8.42552452,6.17581704 C8.54037558,5.91646296 8.54008429,5.73127934 8.40217938,5.59337443 C7.75862312,4.94981817 6.65538382,5.04175478 5.87392265,5.82321595 Z" id="Combined-Shape" fill="#FFFFFF"></path>
     </g>
 </svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/DebugDrawRay.svg b/Assets/Editor/Icons/Components/DebugDrawRay.svg
index 0dbada9cfd..f11e32826c 100644
--- a/Assets/Editor/Icons/Components/DebugDrawRay.svg
+++ b/Assets/Editor/Icons/Components/DebugDrawRay.svg
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
-    <title>icon / Other / DebugDraw Ray</title>
-    <desc>Created with Sketch.</desc>
-    <g id="icon-/-Other-/-DebugDraw-Ray" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <path d="M13.4818106,7.20368188 C13.4818106,7.20368188 13.6414157,7.04407673 13.960626,6.72486643 C14.1623869,6.5231056 14.7098138,6.60915772 14.9095711,6.69302722 C15.5395966,6.95754789 16.0136881,7.15841165 16.3318454,7.29561849 C16.9603951,7.5666834 16.2569348,8.65924984 15.8721624,8.49079439 C15.6156475,8.37849076 15.18661,8.19461755 14.5850499,7.93917474 L14.3092401,8.21498457 C14.5390816,8.72063592 14.9337671,9.41779404 15.0257037,9.96941369 C15.1277339,11.0237257 13.8529763,13.5390725 13.7103852,13.8803049 C13.2868384,14.1007827 10.9151417,15.2183045 9.87725359,15.1178638 C9.27966564,15.0718955 8.51723373,14.7424838 8.05755068,14.4666739 L7.78174086,14.7424838 C8.01275917,15.2482504 8.19663239,15.6772879 8.33336051,16.0295963 C8.53845269,16.5580588 7.33585669,16.9701884 7.1381846,16.4892793 C7.03543661,16.2393075 6.83581761,15.7650669 6.53932761,15.0665575 C6.41215755,14.7669539 6.48624631,14.1992462 6.59697605,14.0885164 C6.69681426,13.9886782 6.84657157,13.8389209 7.04624799,13.6392445 C6.77043817,13.3634346 6.54059664,13.0416565 6.35672343,12.7658467 C6.17285021,12.4900369 6.0809136,12.214227 5.94300869,11.9843855 C5.57475902,12.3526352 5.29857176,12.6288224 5.11444693,12.8129473 C5.03821051,12.8891837 4.6820417,12.9633964 4.58373545,12.9250126 C3.87063868,12.6465831 3.28178153,12.3943318 2.817164,12.1682587 C2.25342212,11.8052375 2.71624773,10.8541607 3.27684705,10.9730828 C3.54552872,11.07386 3.989889,11.2424104 4.60992787,11.4787342 L5.39138904,10.697273 C5.20751582,10.3295266 5.11557921,9.96178013 5.02364261,9.5940337 C4.83976939,9.50209709 4.65589617,9.41016048 4.51799126,9.27225557 C4.10427652,8.85854083 3.85022958,7.96803064 3.75829297,7.41641099 C3.25264163,7.27850608 3.00097536,7.39559963 2.63322892,7.76334606 C2.3574191,8.03915589 1.95732254,8.29725379 1.68151272,8.02144396 C1.40570289,7.74563414 1.46225844,7.50464864 1.73806826,7.22883882 C2.38162452,6.58528256 2.95506892,6.3302841 3.8284667,6.46818901 C4.01233991,5.91656936 4.28814974,5.36494971 4.74783278,4.90526667 C5.20751582,4.44558362 5.71316717,4.2157421 6.26478682,4.03186889 C6.12688191,3.15847111 6.26525817,2.60377059 6.90881443,1.96021433 C7.18462425,1.68440451 7.42561637,1.5818885 7.7014262,1.85769832 C7.97723602,2.13350815 7.85624661,2.45195904 7.58043678,2.72776887 C7.21269035,3.0955153 7.212219,3.32843769 7.30415561,3.78812073 C7.90174356,3.83408904 8.70110694,4.26171041 9.11482168,4.67542515 C9.25272659,4.81333006 9.3446632,4.99720328 9.48256811,5.13510819 C9.85031455,5.2270448 10.1720927,5.36494971 10.5858074,5.50285462 L11.3672686,4.72139345 C11.1224548,4.12514021 10.9385816,3.69610271 10.8156489,3.43428093 C10.63125,3.04154827 11.7982569,2.45288212 12.0108248,2.97459789 C12.1206202,3.24407388 12.3201099,3.71867438 12.609294,4.3983994 C12.6933575,4.59599005 12.6665147,5.26087948 12.5576608,5.36973343 C12.395281,5.53211324 12.1517112,5.77568295 11.8269516,6.10044258 C12.1487298,6.23834749 12.3785713,6.3762524 12.6084128,6.51415731 C12.8842226,6.69803053 13.2060008,6.92787205 13.4818106,7.20368188 Z M5.66719887,5.82463275 C4.88573769,6.60609392 4.79380109,7.70933322 5.43735734,8.35288948 C5.57526226,8.49079439 5.63451781,8.49565536 5.83939814,8.42877072 C6.56024928,8.08096189 7.04204901,7.78568332 7.28479734,7.54293499 C7.53237759,7.29535474 7.84371206,6.84012102 8.21880074,6.17723384 C8.3336518,5.91787976 8.33336051,5.73269614 8.1954556,5.59479123 C7.55189934,4.95123497 6.44866004,5.04317158 5.66719887,5.82463275 Z M7.9587228,12.7724462 C8.84051933,13.6620319 10.5086101,14.3077427 12.8593,13.0351232 C14.124171,10.3024798 13.3536895,8.98403166 12.6428004,8.1675116 C12.1688743,7.6231649 11.1028494,7.07233305 9.44472557,6.51501606 C9.07830433,7.22030328 8.64303228,7.82324702 8.13890941,8.32384728 C7.63478655,8.82444754 7.03529678,9.25598406 6.34044012,9.61845684 C6.83143088,11.1280592 7.37085844,12.179389 7.9587228,12.7724462 Z M18.8940864,16.9555382 L15.6939392,16.1613601 L16.417813,18.9461912 L14.6306333,16.4031474 L13.9227092,19.6485431 L13.2867925,17.2532406 L12.4846785,17.2782312 L10.183711,22.8521931 L11.2419254,15.9116172 C12.5787955,15.3092488 13.6114019,14.8414695 14.3397446,14.5082793 C14.7236284,13.5878139 15.7055083,11.7505573 15.9141516,10.7581591 C16.7653232,10.6110184 19.1244848,10.4205025 22.9916363,10.1866113 L16.9465831,12.1757763 L17.0280468,12.7618314 L20.0496435,13.1998383 L16.9919648,13.6646278 L18.0013335,14.6501898 L16.5368468,14.4169581 L18.8940864,16.9555382 Z M21.2915215,21.4498724 C20.7192727,21.2242363 19.01537,19.9037931 18.7660873,19.7090321 C18.5168046,19.5142711 18.4351415,19.4390633 18.6299025,19.1897806 C18.8246635,18.9404979 19.0104457,19.0838951 19.2597284,19.2786561 C19.5090111,19.4734171 20.8694357,20.9992314 21.2915215,21.4498724 Z M15.8597371,21.4835621 C15.5203979,20.9705034 15.1211001,20.2032159 15.02861,19.9006944 C14.9361199,19.5981729 14.9123628,19.4897262 15.2148843,19.3972361 C15.5174059,19.304746 15.5873406,19.5287704 15.6798307,19.8312919 C15.7723208,20.1338135 15.7724617,20.8723201 15.8597371,21.4835621 Z M22.436391,15.8906742 C21.9397559,15.9858451 19.6269258,15.3423918 19.3834761,15.3032784 C19.1400263,15.2641651 19.0570693,15.2418259 19.1344753,14.937095 C19.2118814,14.6323642 19.3928243,14.660051 19.636274,14.6991643 C19.8797238,14.7382777 21.9902194,15.7234952 22.436391,15.8906742 Z" id="Combined-Shape" fill="#FFFFFF" fill-rule="nonzero"></path>
+    <title>icon / Other / DebugDrawRay</title>
+    <g id="icon-/-Other-/-DebugDrawRay" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M22.9916363,10.1866113 L16.9465831,12.1757763 L17.0280468,12.7618314 L20.0496435,13.1998383 L16.9919648,13.6646278 L18.0013335,14.6501898 L16.5368468,14.4169581 L18.8940864,16.9555382 L15.6939392,16.1613601 L16.417813,18.9461912 L14.6306333,16.4031474 L13.9227092,19.6485431 L13.2867925,17.2532406 L12.4846785,17.2782312 L10.183711,22.8521931 L11.2419254,15.9116172 C12.5787955,15.3092488 13.6114019,14.8414695 14.3397446,14.5082793 C14.7236284,13.5878139 15.7055083,11.7505573 15.9141516,10.7581591 C16.7653232,10.6110184 19.1244848,10.4205025 22.9916363,10.1866113 Z M15.6798307,19.8312919 C15.7723208,20.1338135 15.7724617,20.8723201 15.8597371,21.4835621 C15.5203979,20.9705034 15.1211001,20.2032159 15.02861,19.9006944 C14.9361199,19.5981729 14.9123628,19.4897262 15.2148843,19.3972361 C15.5174059,19.304746 15.5873406,19.5287704 15.6798307,19.8312919 Z M19.2597284,19.2786561 C19.5090111,19.4734171 20.8694357,20.9992314 21.2915215,21.4498724 C20.7192727,21.2242363 19.01537,19.9037931 18.7660873,19.7090321 C18.5168046,19.5142711 18.4351415,19.4390633 18.6299025,19.1897806 C18.8246635,18.9404979 19.0104457,19.0838951 19.2597284,19.2786561 Z M6.90881443,1.96021433 C7.18462425,1.68440451 7.42561637,1.5818885 7.7014262,1.85769832 C7.97723602,2.13350815 7.85624661,2.45195904 7.58043678,2.72776887 C7.21269035,3.0955153 7.212219,3.32843769 7.30415561,3.78812073 C7.90174356,3.83408904 8.70110694,4.26171041 9.11482168,4.67542515 C9.25272659,4.81333006 9.3446632,4.99720328 9.48256811,5.13510819 C9.85031455,5.2270448 10.1720927,5.36494971 10.5858074,5.50285462 L10.5858074,5.50285462 L11.3672686,4.72139345 C11.1224548,4.12514021 10.9385816,3.69610271 10.8156489,3.43428093 C10.63125,3.04154827 11.7982569,2.45288212 12.0108248,2.97459789 C12.1206202,3.24407388 12.3201099,3.71867438 12.609294,4.3983994 C12.6933575,4.59599005 12.6665147,5.26087948 12.5576608,5.36973343 C12.395281,5.53211324 12.1517112,5.77568295 11.8269516,6.10044258 C12.1487298,6.23834749 12.3785713,6.3762524 12.6084128,6.51415731 C12.8842226,6.69803053 13.2060008,6.92787205 13.4818106,7.20368188 C13.4818106,7.20368188 13.5133375,7.17215493 13.5763914,7.10910105 L13.7714644,6.91402809 C13.8266365,6.85885594 13.8896904,6.79580205 13.960626,6.72486643 C14.1623869,6.5231056 14.7098138,6.60915772 14.9095711,6.69302722 C15.5395966,6.95754789 16.0136881,7.15841165 16.3318454,7.29561849 C16.9603951,7.5666834 16.2569348,8.65924984 15.8721624,8.49079439 C15.6156475,8.37849076 15.18661,8.19461755 14.5850499,7.93917474 L14.5850499,7.93917474 L14.3092401,8.21498457 C14.5390816,8.72063592 14.9337671,9.41779404 15.0257037,9.96941369 C15.1277339,11.0237257 13.8529763,13.5390725 13.7103852,13.8803049 L13.7103852,13.8803049 L13.5578602,13.956779 C12.8844549,14.2859248 10.8248905,15.2095706 9.87725359,15.1178638 C9.27966564,15.0718955 8.51723373,14.7424838 8.05755068,14.4666739 L8.05755068,14.4666739 L7.78174086,14.7424838 C8.01275917,15.2482504 8.19663239,15.6772879 8.33336051,16.0295963 C8.53845269,16.5580588 7.33585669,16.9701884 7.1381846,16.4892793 C7.03543661,16.2393075 6.83581761,15.7650669 6.53932761,15.0665575 C6.41215755,14.7669539 6.48624631,14.1992462 6.59697605,14.0885164 C6.63691133,14.0485811 6.68483367,14.0006588 6.74074307,13.9447494 L6.93243243,13.75306 L6.93243243,13.75306 L7.04624799,13.6392445 C6.77043817,13.3634346 6.54059664,13.0416565 6.35672343,12.7658467 C6.17285021,12.4900369 6.0809136,12.214227 5.94300869,11.9843855 L5.94300869,11.9843855 L5.19899404,12.7284002 L5.19899404,12.7284002 L5.11444693,12.8129473 C5.03821051,12.8891837 4.6820417,12.9633964 4.58373545,12.9250126 C3.87063868,12.6465831 3.28178153,12.3943318 2.817164,12.1682587 C2.25342212,11.8052375 2.71624773,10.8541607 3.27684705,10.9730828 C3.54552872,11.07386 3.989889,11.2424104 4.60992787,11.4787342 L4.60992787,11.4787342 L5.39138904,10.697273 C5.20751582,10.3295266 5.11557921,9.96178013 5.02364261,9.5940337 C4.83976939,9.50209709 4.65589617,9.41016048 4.51799126,9.27225557 C4.10427652,8.85854083 3.85022958,7.96803064 3.75829297,7.41641099 C3.25264163,7.27850608 3.00097536,7.39559963 2.63322892,7.76334606 C2.3574191,8.03915589 1.95732254,8.29725379 1.68151272,8.02144396 C1.40570289,7.74563414 1.46225844,7.50464864 1.73806826,7.22883882 C2.38162452,6.58528256 2.95506892,6.3302841 3.8284667,6.46818901 C4.01233991,5.91656936 4.28814974,5.36494971 4.74783278,4.90526667 C5.20751582,4.44558362 5.71316717,4.2157421 6.26478682,4.03186889 C6.12688191,3.15847111 6.26525817,2.60377059 6.90881443,1.96021433 Z M19.636274,14.6991643 C19.7515923,14.7176917 20.2858323,14.9485029 20.8636668,15.2040981 L21.2512294,15.3761091 C21.7656073,15.6048657 22.2485293,15.8202831 22.436391,15.8906742 C21.9397559,15.9858451 19.6269258,15.3423918 19.3834761,15.3032784 C19.1400263,15.2641651 19.0570693,15.2418259 19.1344753,14.937095 C19.2118814,14.6323642 19.3928243,14.660051 19.636274,14.6991643 Z M9.44472557,6.51501606 C9.07830433,7.22030328 8.64303228,7.82324702 8.13890941,8.32384728 C7.63478655,8.82444754 7.03529678,9.25598406 6.34044012,9.61845684 C6.83143088,11.1280592 7.37085109,12.1793963 7.95870075,12.7724682 C8.84051933,13.6620319 10.5086101,14.3077427 12.8593,13.0351232 C14.124171,10.3024798 13.3536895,8.98403166 12.6428004,8.1675116 C12.1688743,7.6231649 11.1028494,7.07233305 9.44472557,6.51501606 Z M8.1954556,5.59479123 C7.55189934,4.95123497 6.44866004,5.04317158 5.66719887,5.82463275 C4.88573769,6.60609392 4.79380109,7.70933322 5.43735734,8.35288948 C5.57526226,8.49079439 5.63451781,8.49565536 5.83939814,8.42877072 C6.56024928,8.08096189 7.04204901,7.78568332 7.28479734,7.54293499 C7.53237759,7.29535474 7.84371206,6.84012102 8.21880074,6.17723384 C8.3336518,5.91787976 8.33336051,5.73269614 8.1954556,5.59479123 Z" id="Combined-Shape" fill="#FFFFFF" fill-rule="nonzero"></path>
     </g>
 </svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/DebugDrawSphere.svg b/Assets/Editor/Icons/Components/DebugDrawSphere.svg
index 4d44ccca25..bcddf84010 100644
--- a/Assets/Editor/Icons/Components/DebugDrawSphere.svg
+++ b/Assets/Editor/Icons/Components/DebugDrawSphere.svg
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
-    <title>icon / Other / DebugDraw Sphere</title>
-    <desc>Created with Sketch.</desc>
+    <title>icon / Other / DebugDrawSphere</title>
     <defs>
-        <path d="M11.4165175,11.7461524 C10.1704594,12.9579969 9.87484232,14.4327057 9.64257686,15.4047648 C9.23458794,15.2728341 8.50469264,14.9692167 8.21854266,14.7975267 L7.94273283,15.0733365 C8.17375115,15.5791032 8.35762436,16.0081407 8.49435249,16.360449 C8.69944467,16.8889116 7.49684866,17.3010412 7.29917658,16.8201321 C7.19642859,16.5701603 6.99680959,16.0959197 6.70031958,15.3974103 C6.57314953,15.0978066 6.56153632,14.606021 6.75796802,14.4193692 L7.20723997,13.9700972 C6.93143014,13.6942874 6.70158862,13.3725093 6.5177154,13.0966994 C6.33384219,12.8208896 6.24190558,12.5450798 6.10400067,12.3152383 L5.2754389,13.1438 C5.19920249,13.2200364 4.84303368,13.2942491 4.74472743,13.2558653 C4.03163065,12.9774358 3.44277351,12.7251845 2.97815598,12.4991115 C2.4144141,12.1360902 2.87723971,11.1850135 3.43783902,11.3039356 C3.7065207,11.4047127 4.15088097,11.5732632 4.77091984,11.8095869 L5.55238102,11.0281257 C5.3685078,10.6603793 5.27657119,10.2926329 5.18463458,9.92488644 C5.00076137,9.83294983 4.81688815,9.74101323 4.67898324,9.60310831 C4.2652685,9.18939358 4.01122156,8.29888339 3.91928495,7.74726374 C3.4136336,7.60935882 3.16196733,7.72645237 2.7942209,8.09419881 C2.51841108,8.37000863 2.11831452,8.62810654 1.8425047,8.35229671 C1.56669487,8.07648689 1.62325041,7.83550139 1.89906024,7.55969157 C2.5426165,6.91613531 3.11606089,6.66113684 3.98945867,6.79904176 C4.17333189,6.24742211 4.44914172,5.69580246 4.90882476,5.23611941 C5.3685078,4.77643637 5.87415915,4.54659485 6.4257788,4.36272163 C6.28787388,3.48932385 6.42625014,2.93462334 7.0698064,2.29106708 C7.34561623,2.01525725 7.58660835,1.91274124 7.86241817,2.18855107 C8.138228,2.46436089 8.01723858,2.78281179 7.74142876,3.05862161 C7.37368232,3.42636805 7.37321098,3.65929044 7.46514759,4.11897348 C8.06273554,4.16494178 8.86209892,4.59256316 9.27581366,5.00627789 C9.41371857,5.14418281 9.50565518,5.32805602 9.64356009,5.46596094 C10.0113065,5.55789754 10.3330847,5.69580246 10.7467994,5.83370737 L11.5282606,5.0522462 C11.2834468,4.45599296 11.0995735,4.02695545 10.9766409,3.76513368 C10.792242,3.37240102 11.9592489,2.78373486 12.1718168,3.30545064 C12.2816121,3.57492663 12.4811019,4.04952713 12.770286,4.72925214 C12.8543495,4.9268428 12.8275067,5.59173223 12.7186528,5.70058618 L11.9879436,6.43129532 C12.3097217,6.56920024 12.5395633,6.70710515 12.7694048,6.84501006 C13.0452146,7.02888328 13.3669927,7.2587248 13.6428026,7.53453462 L14.121618,7.05571918 C14.3233788,6.85395834 14.8708057,6.94001046 15.070563,7.02387997 C15.7005886,7.28840064 16.17468,7.48926439 16.4928374,7.62647123 C17.121387,7.89753615 16.4179268,8.99010259 16.0331544,8.82164714 C15.7766394,8.70934351 15.3476019,8.52547029 14.7460419,8.27002749 L14.470232,8.54583732 C14.7000736,9.05148866 15.094759,9.74864679 15.1866956,10.3002664 C14.4972712,10.3150821 12.6625756,10.5343079 11.4165175,11.7461524 Z M5.82819084,6.1554855 C5.04672967,6.93694667 4.95479306,8.04018597 5.59834932,8.68374223 C5.73625423,8.82164714 5.79550978,8.82650811 6.00039011,8.75962347 C6.72124125,8.41181464 7.20304099,8.11653606 7.44578931,7.87378774 C7.69336957,7.62620749 8.00470403,7.17097377 8.37979272,6.50808658 C8.49464378,6.2487325 8.49435249,6.06354889 8.35644757,5.92564398 C7.71289131,5.28208772 6.60965201,5.37402433 5.82819084,6.1554855 Z M8.96210738,13.6505172 C9.06340773,12.937299 9.60093028,12.0460988 10.5562918,10.9967604 C11.5116533,9.94742197 12.6843627,9.53337579 13.4411672,9.47850047 C13.2696729,9.07877696 12.663937,8.36438098 11.9923894,7.89415327 C11.2384407,7.36622711 10.6153961,7.07596431 9.60571755,6.8458688 C9.23929631,7.55115603 8.80402425,8.15409977 8.29990139,8.65470003 C7.79577852,9.15530028 7.19628876,9.58683681 6.5014321,9.94930959 C6.74963201,10.7124262 6.84931129,11.3303269 7.31440502,12.1024639 C7.77949875,12.8746008 8.57334944,13.4740576 8.96210738,13.6505172 Z M12.8261493,19.5943595 C13.6387114,20.5078181 14.8195399,21.0864339 16.1357174,21.0972895 C15.4745728,20.7176572 14.9356523,20.1676579 14.5255793,19.5039959 C13.9699963,19.585577 13.3998919,19.617444 12.8261493,19.5943595 Z M12.4360996,19.0874898 C13.055891,19.1424947 13.6739581,19.1283219 14.275031,19.0527367 C13.6747098,17.8454556 13.4504037,16.3459587 13.6345836,14.832234 C13.111346,14.7961485 12.5779663,14.8099362 12.0454131,14.8791854 C11.8197134,15.4140591 11.694935,16.0019335 11.694935,16.6189515 C11.694935,17.5312041 11.9676908,18.3797512 12.4360996,19.0874898 Z M18.8873546,17.5258673 C17.8868739,18.4422524 16.5312824,19.1068494 15.0420793,19.4130621 C15.5298432,20.1355177 16.1919547,20.6872399 17.0146882,20.9705298 L16.9970067,21.0218804 C18.0259569,20.8306189 18.9312959,20.2875637 19.5835256,19.5222128 C19.5451866,18.8001104 19.295793,18.1258296 18.8873546,17.5258673 Z M18.5939354,17.1394078 C17.5921359,15.9489743 15.9372232,15.1134022 14.1135216,14.8794371 C13.9311377,16.3652384 14.1668526,17.8309415 14.7782293,18.974484 C16.2673447,18.6981439 17.6209592,18.0448976 18.5939354,17.1394078 Z M20.088664,14.4429187 C19.3237085,13.0695106 17.8570644,12.1404581 16.1734284,12.1404581 C15.7161715,12.1404581 15.2749201,12.2089855 14.8593838,12.3363306 C14.5376264,13.0015515 14.3147153,13.701348 14.1861728,14.4038485 C16.1031176,14.6520509 17.8513066,15.5283007 18.9349403,16.7943866 C19.5522363,16.1137331 19.965431,15.3153559 20.088664,14.4429187 Z M20.4168894,15.1833862 C20.1936518,15.920101 19.7839818,16.5936029 19.2360855,17.1806928 C19.6148949,17.7167121 19.8796629,18.3112783 19.9987091,18.9491703 C20.4131312,18.2703093 20.6519218,17.4725167 20.6519218,16.6189515 C20.6519218,16.1168452 20.5692923,15.634038 20.4168894,15.1833862 Z M14.2205269,12.5875456 C13.4176449,12.9771996 12.7486864,13.5996364 12.3013812,14.3671265 C12.7724178,14.3241161 13.2429221,14.321219 13.7061597,14.3551995 C13.8128243,13.7579596 13.9836152,13.1630494 14.2205269,12.5875456 Z M16.1734284,22.059269 C13.168824,22.059269 10.7331109,19.6235559 10.7331109,16.6189515 C10.7331109,13.6143472 13.168824,11.1786341 16.1734284,11.1786341 C19.1780328,11.1786341 21.6137459,13.6143472 21.6137459,16.6189515 C21.6137459,19.6235559 19.1780328,22.059269 16.1734284,22.059269 Z" id="path-1"></path>
+        <path d="M16.1734284,11.1786341 C19.1780328,11.1786341 21.6137459,13.6143472 21.6137459,16.6189515 C21.6137459,19.6235559 19.1780328,22.059269 16.1734284,22.059269 C13.168824,22.059269 10.7331109,19.6235559 10.7331109,16.6189515 C10.7331109,13.6143472 13.168824,11.1786341 16.1734284,11.1786341 Z M14.5255793,19.5039959 C13.9699963,19.585577 13.3998919,19.617444 12.8261493,19.5943595 C13.6387114,20.5078181 14.8195399,21.0864339 16.1357174,21.0972895 C15.4745728,20.7176572 14.9356523,20.1676579 14.5255793,19.5039959 Z M18.8873546,17.5258673 C17.8868739,18.4422524 16.5312824,19.1068494 15.0420793,19.4130621 C15.5298432,20.1355177 16.1919547,20.6872399 17.0146882,20.9705298 L16.9970067,21.0218804 C18.0259569,20.8306189 18.9312959,20.2875637 19.5835256,19.5222128 C19.5451866,18.8001104 19.295793,18.1258296 18.8873546,17.5258673 Z M12.0454131,14.8791854 C11.8197134,15.4140591 11.694935,16.0019335 11.694935,16.6189515 C11.694935,17.5312041 11.9676908,18.3797512 12.4360996,19.0874898 C13.055891,19.1424947 13.6739581,19.1283219 14.275031,19.0527367 C13.6747098,17.8454556 13.4504037,16.3459587 13.6345836,14.832234 C13.111346,14.7961485 12.5779663,14.8099362 12.0454131,14.8791854 Z M14.1135216,14.8794371 C13.9311377,16.3652384 14.1668526,17.8309415 14.7782293,18.974484 C16.2673447,18.6981439 17.6209592,18.0448976 18.5939354,17.1394078 C17.5921359,15.9489743 15.9372232,15.1134022 14.1135216,14.8794371 Z M20.4168894,15.1833862 C20.1936518,15.920101 19.7839818,16.5936029 19.2360855,17.1806928 C19.6148949,17.7167121 19.8796629,18.3112783 19.9987091,18.9491703 C20.4131312,18.2703093 20.6519218,17.4725167 20.6519218,16.6189515 C20.6519218,16.1168452 20.5692923,15.634038 20.4168894,15.1833862 Z M7.86241817,2.18855107 C8.138228,2.46436089 8.01723858,2.78281179 7.74142876,3.05862161 C7.37368232,3.42636805 7.37321098,3.65929044 7.46514759,4.11897348 C8.06273554,4.16494178 8.86209892,4.59256316 9.27581366,5.00627789 C9.41371857,5.14418281 9.50565518,5.32805602 9.64356009,5.46596094 C10.0113065,5.55789754 10.3330847,5.69580246 10.7467994,5.83370737 L11.5282606,5.0522462 C11.2834468,4.45599296 11.0995735,4.02695545 10.9766409,3.76513368 C10.792242,3.37240102 11.9592489,2.78373486 12.1718168,3.30545064 C12.2816121,3.57492663 12.4811019,4.04952713 12.770286,4.72925214 C12.8543495,4.9268428 12.8275067,5.59173223 12.7186528,5.70058618 L11.9879436,6.43129532 C12.3097217,6.56920024 12.5395633,6.70710515 12.7694048,6.84501006 C13.0452146,7.02888328 13.3669927,7.2587248 13.6428026,7.53453462 L14.121618,7.05571918 C14.3233788,6.85395834 14.8708057,6.94001046 15.070563,7.02387997 C15.7005886,7.28840064 16.17468,7.48926439 16.4928374,7.62647123 C17.121387,7.89753615 16.4179268,8.99010259 16.0331544,8.82164714 C15.7766394,8.70934351 15.3476019,8.52547029 14.7460419,8.27002749 L14.470232,8.54583732 C14.7000736,9.05148866 15.094759,9.74864679 15.1866956,10.3002664 C14.4972712,10.3150821 12.6625756,10.5343079 11.4165175,11.7461524 C10.1704594,12.9579969 9.87484232,14.4327057 9.64257686,15.4047648 C9.23458794,15.2728341 8.50469264,14.9692167 8.21854266,14.7975267 L7.94273283,15.0733365 C8.17375115,15.5791032 8.35762436,16.0081407 8.49435249,16.360449 C8.69944467,16.8889116 7.49684866,17.3010412 7.29917658,16.8201321 C7.19642859,16.5701603 6.99680959,16.0959197 6.70031958,15.3974103 C6.57314953,15.0978066 6.56153632,14.606021 6.75796802,14.4193692 L7.20723997,13.9700972 C6.93143014,13.6942874 6.70158862,13.3725093 6.5177154,13.0966994 C6.33384219,12.8208896 6.24190558,12.5450798 6.10400067,12.3152383 L5.2754389,13.1438 C5.19920249,13.2200364 4.84303368,13.2942491 4.74472743,13.2558653 C4.03163065,12.9774358 3.44277351,12.7251845 2.97815598,12.4991115 C2.4144141,12.1360902 2.87723971,11.1850135 3.43783902,11.3039356 C3.7065207,11.4047127 4.15088097,11.5732632 4.77091984,11.8095869 L5.55238102,11.0281257 C5.3685078,10.6603793 5.27657119,10.2926329 5.18463458,9.92488644 C5.00076137,9.83294983 4.81688815,9.74101323 4.67898324,9.60310831 C4.2652685,9.18939358 4.01122156,8.29888339 3.91928495,7.74726374 C3.4136336,7.60935882 3.16196733,7.72645237 2.7942209,8.09419881 C2.51841108,8.37000863 2.11831452,8.62810654 1.8425047,8.35229671 C1.56669487,8.07648689 1.62325041,7.83550139 1.89906024,7.55969157 C2.5426165,6.91613531 3.11606089,6.66113684 3.98945867,6.79904176 C4.17333189,6.24742211 4.44914172,5.69580246 4.90882476,5.23611941 C5.3685078,4.77643637 5.87415915,4.54659485 6.4257788,4.36272163 C6.28787388,3.48932385 6.42625014,2.93462334 7.0698064,2.29106708 C7.34561623,2.01525725 7.58660835,1.91274124 7.86241817,2.18855107 Z M16.1734284,12.1404581 C15.7161715,12.1404581 15.2749201,12.2089855 14.8593838,12.3363306 C14.5376264,13.0015515 14.3147153,13.701348 14.1861728,14.4038485 C16.1031176,14.6520509 17.8513066,15.5283007 18.9349403,16.7943866 C19.5522363,16.1137331 19.965431,15.3153559 20.088664,14.4429187 C19.3237085,13.0695106 17.8570644,12.1404581 16.1734284,12.1404581 Z M14.2205269,12.5875456 C13.4176449,12.9771996 12.7486864,13.5996364 12.3013812,14.3671265 C12.7724178,14.3241161 13.2429221,14.321219 13.7061597,14.3551995 C13.8128243,13.7579596 13.9836152,13.1630494 14.2205269,12.5875456 Z M9.60571755,6.8458688 C9.23929631,7.55115603 8.80402425,8.15409977 8.29990139,8.65470003 C7.79577852,9.15530028 7.19628876,9.58683681 6.5014321,9.94930959 C6.74963201,10.7124262 6.84931129,11.3303269 7.31440502,12.1024639 C7.77949875,12.8746008 8.57334944,13.4740576 8.96210738,13.6505172 C9.06340773,12.937299 9.60093028,12.0460988 10.5562918,10.9967604 C11.5116533,9.94742197 12.6843627,9.53337579 13.4411672,9.47850047 C13.2696729,9.07877696 12.663937,8.36438098 11.9923894,7.89415327 C11.2384407,7.36622711 10.6153961,7.07596431 9.60571755,6.8458688 Z M5.82819084,6.1554855 C5.04672967,6.93694667 4.95479306,8.04018597 5.59834932,8.68374223 C5.73625423,8.82164714 5.79550978,8.82650811 6.00039011,8.75962347 C6.72124125,8.41181464 7.20304099,8.11653606 7.44578931,7.87378774 C7.69336957,7.62620749 8.00470403,7.17097377 8.37979272,6.50808658 C8.49464378,6.2487325 8.49435249,6.06354889 8.35644757,5.92564398 C7.71289131,5.28208772 6.60965201,5.37402433 5.82819084,6.1554855 Z" id="path-1"></path>
     </defs>
-    <g id="icon-/-Other-/-DebugDraw-Sphere" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+    <g id="icon-/-Other-/-DebugDrawSphere" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <mask id="mask-2" fill="white">
             <use xlink:href="#path-1"></use>
         </mask>
diff --git a/Assets/Editor/Icons/Components/DebugDrawText.svg b/Assets/Editor/Icons/Components/DebugDrawText.svg
index 3da927e3cc..7fd1603e45 100644
--- a/Assets/Editor/Icons/Components/DebugDrawText.svg
+++ b/Assets/Editor/Icons/Components/DebugDrawText.svg
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
-    <title>icon / Other / DebugDraw Text</title>
-    <desc>Created with Sketch.</desc>
+    <title>icon / Other / DebugDrawText</title>
     <defs>
-        <path d="M12.0943678,10.9985441 L21.5896061,10.9985441 L21.5815985,14.3439139 L20.2243869,14.3439139 L20.2270335,12.358462 L17.5311662,12.358462 L17.5152611,20.483175 L18.8857266,20.4884681 L18.8804199,21.8456796 L14.7928808,21.8323789 L14.7981875,20.4751674 L16.1580497,20.4804687 L16.1739588,12.3584115 L13.4489327,12.3584115 L13.443626,14.3465143 L12.0864145,14.3465143 L12.0943678,11.0038508 L12.0943678,10.9985441 Z M15.0284144,10.0023573 L11.0449088,10.0106767 L10.9989588,14.9599573 C10.5681023,15.0777565 10.1697215,15.1461671 9.87725359,15.1178638 C9.27966564,15.0718955 8.51723373,14.7424838 8.05755068,14.4666739 L7.78174086,14.7424838 C8.01275917,15.2482504 8.19663239,15.6772879 8.33336051,16.0295963 C8.53845269,16.5580588 7.33585669,16.9701884 7.1381846,16.4892793 C7.03543661,16.2393075 6.83581761,15.7650669 6.53932761,15.0665575 C6.41215755,14.7669539 6.48624631,14.1992462 6.59697605,14.0885164 L7.04624799,13.6392445 C6.77043817,13.3634346 6.54059664,13.0416565 6.35672343,12.7658467 C6.17285021,12.4900369 6.0809136,12.214227 5.94300869,11.9843855 L5.11444693,12.8129473 C5.03821051,12.8891837 4.6820417,12.9633964 4.58373545,12.9250126 C3.87063868,12.6465831 3.28178153,12.3943318 2.817164,12.1682587 C2.25342212,11.8052375 2.71624773,10.8541607 3.27684705,10.9730828 C3.54552872,11.07386 3.989889,11.2424104 4.60992787,11.4787342 L5.39138904,10.697273 C5.20751582,10.3295266 5.11557921,9.96178013 5.02364261,9.5940337 C4.83976939,9.50209709 4.65589617,9.41016048 4.51799126,9.27225557 C4.10427652,8.85854083 3.85022958,7.96803064 3.75829297,7.41641099 C3.25264163,7.27850608 3.00097536,7.39559963 2.63322892,7.76334606 C2.3574191,8.03915589 1.95732254,8.29725379 1.68151272,8.02144396 C1.40570289,7.74563414 1.46225844,7.50464864 1.73806826,7.22883882 C2.38162452,6.58528256 2.95506892,6.3302841 3.8284667,6.46818901 C4.01233991,5.91656936 4.28814974,5.36494971 4.74783278,4.90526667 C5.20751582,4.44558362 5.71316717,4.2157421 6.26478682,4.03186889 C6.12688191,3.15847111 6.26525817,2.60377059 6.90881443,1.96021433 C7.18462425,1.68440451 7.42561637,1.5818885 7.7014262,1.85769832 C7.97723602,2.13350815 7.85624661,2.45195904 7.58043678,2.72776887 C7.21269035,3.0955153 7.212219,3.32843769 7.30415561,3.78812073 C7.90174356,3.83408904 8.70110694,4.26171041 9.11482168,4.67542515 C9.25272659,4.81333006 9.3446632,4.99720328 9.48256811,5.13510819 C9.85031455,5.2270448 10.1720927,5.36494971 10.5858074,5.50285462 L11.3672686,4.72139345 C11.1224548,4.12514021 10.9385816,3.69610271 10.8156489,3.43428093 C10.63125,3.04154827 11.7982569,2.45288212 12.0108248,2.97459789 C12.1206202,3.24407388 12.3201099,3.71867438 12.609294,4.3983994 C12.6933575,4.59599005 12.6665147,5.26087948 12.5576608,5.36973343 L11.8269516,6.10044258 C12.1487298,6.23834749 12.3785713,6.3762524 12.6084128,6.51415731 C12.8842226,6.69803053 13.2060008,6.92787205 13.4818106,7.20368188 L13.960626,6.72486643 C14.1623869,6.5231056 14.7098138,6.60915772 14.9095711,6.69302722 C15.5395966,6.95754789 16.0136881,7.15841165 16.3318454,7.29561849 C16.9603951,7.5666834 16.2569348,8.65924984 15.8721624,8.49079439 C15.6156475,8.37849076 15.18661,8.19461755 14.5850499,7.93917474 L14.3092401,8.21498457 C14.5390816,8.72063592 14.9337671,9.41779404 15.0257037,9.96941369 C15.0267516,9.98024208 15.0276543,9.99122459 15.0284144,10.0023573 Z M5.66719887,5.82463275 C4.88573769,6.60609392 4.79380109,7.70933322 5.43735734,8.35288948 C5.57526226,8.49079439 5.63451781,8.49565536 5.83939814,8.42877072 C6.56024928,8.08096189 7.04204901,7.78568332 7.28479734,7.54293499 C7.53237759,7.29535474 7.84371206,6.84012102 8.21880074,6.17723384 C8.3336518,5.91787976 8.33336051,5.73269614 8.1954556,5.59479123 C7.55189934,4.95123497 6.44866004,5.04317158 5.66719887,5.82463275 Z M7.9587228,12.7724462 C8.51061757,13.329216 9.37051957,13.7904552 10.513006,13.7456408 C10.4869884,13.0805595 10.471424,11.7104731 10.4663127,9.63538152 C11.5248573,9.61221042 12.515653,9.60710523 13.4386998,9.62006596 C13.2818081,8.9858806 12.9565021,8.52782619 12.6428004,8.1675116 C12.1688743,7.6231649 11.1028494,7.07233305 9.44472557,6.51501606 C9.07830433,7.22030328 8.64303228,7.82324702 8.13890941,8.32384728 C7.63478655,8.82444754 7.03529678,9.25598406 6.34044012,9.61845684 C6.83143088,11.1280592 7.37085844,12.179389 7.9587228,12.7724462 Z" id="path-1"></path>
+        <path d="M21.5896061,10.9985441 L21.5815985,14.3439139 L20.2243869,14.3439139 L20.2270335,12.358462 L17.5311662,12.358462 L17.5152611,20.483175 L18.8857266,20.4884681 L18.8804199,21.8456796 L14.7928808,21.8323789 L14.7981875,20.4751674 L16.1580497,20.4804687 L16.1739588,12.3584115 L13.4489327,12.3584115 L13.443626,14.3465143 L12.0864145,14.3465143 L12.0943678,11.0038508 L12.0943678,10.9985441 L21.5896061,10.9985441 Z M7.7014262,1.85769832 C7.97723602,2.13350815 7.85624661,2.45195904 7.58043678,2.72776887 C7.21269035,3.0955153 7.212219,3.32843769 7.30415561,3.78812073 C7.90174356,3.83408904 8.70110694,4.26171041 9.11482168,4.67542515 C9.25272659,4.81333006 9.3446632,4.99720328 9.48256811,5.13510819 C9.85031455,5.2270448 10.1720927,5.36494971 10.5858074,5.50285462 L11.3672686,4.72139345 C11.1224548,4.12514021 10.9385816,3.69610271 10.8156489,3.43428093 C10.63125,3.04154827 11.7982569,2.45288212 12.0108248,2.97459789 C12.1206202,3.24407388 12.3201099,3.71867438 12.609294,4.3983994 C12.6933575,4.59599005 12.6665147,5.26087948 12.5576608,5.36973343 L11.8269516,6.10044258 C12.1487298,6.23834749 12.3785713,6.3762524 12.6084128,6.51415731 C12.8842226,6.69803053 13.2060008,6.92787205 13.4818106,7.20368188 L13.960626,6.72486643 C14.1623869,6.5231056 14.7098138,6.60915772 14.9095711,6.69302722 C15.5395966,6.95754789 16.0136881,7.15841165 16.3318454,7.29561849 C16.9603951,7.5666834 16.2569348,8.65924984 15.8721624,8.49079439 C15.6156475,8.37849076 15.18661,8.19461755 14.5850499,7.93917474 L14.3092401,8.21498457 C14.5390816,8.72063592 14.9337671,9.41779404 15.0257037,9.96941369 C15.0267516,9.98024208 15.0276543,9.99122459 15.0284144,10.0023573 L11.0449088,10.0106767 L10.9989588,14.9599573 C10.5681023,15.0777565 10.1697215,15.1461671 9.87725359,15.1178638 C9.27966564,15.0718955 8.51723373,14.7424838 8.05755068,14.4666739 L7.78174086,14.7424838 C8.01275917,15.2482504 8.19663239,15.6772879 8.33336051,16.0295963 C8.53845269,16.5580588 7.33585669,16.9701884 7.1381846,16.4892793 C7.03543661,16.2393075 6.83581761,15.7650669 6.53932761,15.0665575 C6.41215755,14.7669539 6.48624631,14.1992462 6.59697605,14.0885164 L7.04624799,13.6392445 C6.77043817,13.3634346 6.54059664,13.0416565 6.35672343,12.7658467 C6.17285021,12.4900369 6.0809136,12.214227 5.94300869,11.9843855 L5.11444693,12.8129473 C5.03821051,12.8891837 4.6820417,12.9633964 4.58373545,12.9250126 C3.87063868,12.6465831 3.28178153,12.3943318 2.817164,12.1682587 C2.25342212,11.8052375 2.71624773,10.8541607 3.27684705,10.9730828 C3.54552872,11.07386 3.989889,11.2424104 4.60992787,11.4787342 L5.39138904,10.697273 C5.20751582,10.3295266 5.11557921,9.96178013 5.02364261,9.5940337 C4.83976939,9.50209709 4.65589617,9.41016048 4.51799126,9.27225557 C4.10427652,8.85854083 3.85022958,7.96803064 3.75829297,7.41641099 C3.25264163,7.27850608 3.00097536,7.39559963 2.63322892,7.76334606 C2.3574191,8.03915589 1.95732254,8.29725379 1.68151272,8.02144396 C1.40570289,7.74563414 1.46225844,7.50464864 1.73806826,7.22883882 C2.38162452,6.58528256 2.95506892,6.3302841 3.8284667,6.46818901 C4.01233991,5.91656936 4.28814974,5.36494971 4.74783278,4.90526667 C5.20751582,4.44558362 5.71316717,4.2157421 6.26478682,4.03186889 C6.12688191,3.15847111 6.26525817,2.60377059 6.90881443,1.96021433 C7.18462425,1.68440451 7.42561637,1.5818885 7.7014262,1.85769832 Z M9.44472557,6.51501606 C9.07830433,7.22030328 8.64303228,7.82324702 8.13890941,8.32384728 C7.63478655,8.82444754 7.03529678,9.25598406 6.34044012,9.61845684 C6.83143088,11.1280592 7.37085844,12.179389 7.9587228,12.7724462 C8.51061757,13.329216 9.37051957,13.7904552 10.513006,13.7456408 C10.4869884,13.0805595 10.471424,11.7104731 10.4663127,9.63538152 C11.5248573,9.61221042 12.515653,9.60710523 13.4386998,9.62006596 C13.2818081,8.9858806 12.9565021,8.52782619 12.6428004,8.1675116 C12.1688743,7.6231649 11.1028494,7.07233305 9.44472557,6.51501606 Z M5.66719887,5.82463275 C4.88573769,6.60609392 4.79380109,7.70933322 5.43735734,8.35288948 C5.57526226,8.49079439 5.63451781,8.49565536 5.83939814,8.42877072 C6.56024928,8.08096189 7.04204901,7.78568332 7.28479734,7.54293499 C7.53237759,7.29535474 7.84371206,6.84012102 8.21880074,6.17723384 C8.3336518,5.91787976 8.33336051,5.73269614 8.1954556,5.59479123 C7.55189934,4.95123497 6.44866004,5.04317158 5.66719887,5.82463275 Z" id="path-1"></path>
     </defs>
-    <g id="icon-/-Other-/-DebugDraw-Text" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+    <g id="icon-/-Other-/-DebugDrawText" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <mask id="mask-2" fill="white">
             <use xlink:href="#path-1"></use>
         </mask>
diff --git a/Assets/Editor/Icons/Components/Decal.svg b/Assets/Editor/Icons/Components/Decal.svg
index 0c21701a55..3bfb7228fe 100644
--- a/Assets/Editor/Icons/Components/Decal.svg
+++ b/Assets/Editor/Icons/Components/Decal.svg
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
     <title>icon / Rendering / Decal</title>
-    <desc>Created with Sketch.</desc>
     <defs>
         <path d="M10.3601087,17.8244045 L11.9375,14.8823836 L13.5148913,17.8244045 L13.4099418,14.487844 L16.2470132,16.2470132 L14.487844,13.4099418 L17.8244045,13.5148913 L14.8823836,11.9375 L17.8244045,10.3601087 L14.487844,10.4650582 L16.2470132,7.62798682 L13.4099418,9.38715598 L13.5148913,6.05059552 L11.9375,8.99261638 L10.3601087,6.05059552 L10.4650582,9.38715598 L7.62798682,7.62798682 L9.38715598,10.4650582 L6.05059552,10.3601087 L8.99261638,11.9375 L6.05059552,13.5148913 L9.38715598,13.4099418 L7.62798682,16.2470132 L10.4650582,14.487844 L10.3601087,17.8244045 Z M11.9375,17.114281 L9.16461986,22.2860296 L9.34910951,16.4207238 L4.36185057,19.5131494 L7.45427616,14.5258905 L1.58897043,14.7103801 L6.76071902,11.9375 L1.58897043,9.16461986 L7.45427616,9.34910951 L4.36185057,4.36185057 L9.34910951,7.45427616 L9.16461986,1.58897043 L11.9375,6.76071902 L14.7103801,1.58897043 L14.5258905,7.45427616 L19.5131494,4.36185057 L16.4207238,9.34910951 L22.2860296,9.16461986 L17.114281,11.9375 L22.2860296,14.7103801 L16.4207238,14.5258905 L19.5131494,19.5131494 L14.5258905,16.4207238 L14.7103801,22.2860296 L11.9375,17.114281 Z" id="path-1"></path>
     </defs>
diff --git a/Assets/Editor/Icons/Components/Disk_Shape.svg b/Assets/Editor/Icons/Components/Disk_Shape.svg
index fb9d199844..9c1e478b85 100644
--- a/Assets/Editor/Icons/Components/Disk_Shape.svg
+++ b/Assets/Editor/Icons/Components/Disk_Shape.svg
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>icon / Shapes / Disk Shape</title>
+    <title>icon / Shapes / Disk_shape</title>
     <defs>
-        <path class="cls-1" d="M16.769,4.552c2.715,1.766,2.78,6.479.146,10.526s-6.969,5.9-9.683,4.13-2.78-6.479-.146-10.526S14.054,2.786,16.769,4.552Zm-0.9,1.533c2.2,1.434,2.256,5.258.119,8.543s-5.656,4.785-7.859,3.352-2.256-5.258-.119-8.543S13.669,4.652,15.872,6.085Zm-5.165,4.2,1.71,1.112-0.553.85-1.709-1.112Z" id="path-1" transform="translate(0 0.125)"/>
+        <path d="M11.2949674,2.86381314 C14.965583,2.86381314 17.9412049,7.01769439 17.9412049,12.1417666 C17.9412049,17.2658388 14.965583,21.4197201 11.2949674,21.4197201 C7.62435182,21.4197201 4.64872995,17.2658388 4.64872995,12.1417666 C4.64872995,7.01769439 7.62435182,2.86381314 11.2949674,2.86381314 Z M11.229071,4.5041143 C8.37024708,4.5041143 6.05271243,7.92360771 6.05271243,12.1417666 C6.05271243,16.3599255 8.37024708,19.7794189 11.229071,19.7794189 C14.0878948,19.7794189 16.4054295,16.3599255 16.4054295,12.1417666 C16.4054295,7.92360771 14.0878948,4.5041143 11.229071,4.5041143 Z M8.43336452,11.5810482 L11.0006639,11.591655 C11.1656209,11.7447723 11.2412282,11.9410219 11.2274857,12.1804038 C11.2137433,12.4197856 11.138136,12.5938127 11.0006639,12.7024851 L8.43336452,12.6918782 L8.43336452,11.5810482 Z" id="path-1"></path>
     </defs>
-    <g id="icon-/-Shapes-/-Disk-Shape" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+    <g id="icon-/-Shapes-/-Disk_shape" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <mask id="mask-2" fill="white">
             <use xlink:href="#path-1"></use>
         </mask>
-        <use id="Combined-Shape" fill="#5A69A1" fill-rule="evenodd" xlink:href="#path-1"></use>
+        <use id="Combined-Shape" fill="#5A69A1" fill-rule="nonzero" transform="translate(11.294967, 12.141767) rotate(28.000000) translate(-11.294967, -12.141767) " xlink:href="#path-1"></use>
     </g>
-</svg>
+</svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/EnvironmentProbe.svg b/Assets/Editor/Icons/Components/EnvironmentProbe.svg
index 26c599ab42..ac2e5c0fee 100644
--- a/Assets/Editor/Icons/Components/EnvironmentProbe.svg
+++ b/Assets/Editor/Icons/Components/EnvironmentProbe.svg
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
-    <title>icon / Rendering / Environment Probe</title>
-    <desc>Created with Sketch.</desc>
+    <title>icon / Rendering / EnvironmentProbe</title>
     <defs>
-        <path d="M11.8974849,16.4036263 C9.46546454,16.4036263 7.49392249,14.4320843 7.49392249,12.0000639 C7.49392249,9.56804354 9.46546454,7.59650149 11.8974849,7.59650149 C14.3295053,7.59650149 16.3010473,9.56804354 16.3010473,12.0000639 C16.3010473,14.4320843 14.3295053,16.4036263 11.8974849,16.4036263 Z M11.8974849,15.4250569 C13.7890563,15.4250569 15.3224779,13.8916353 15.3224779,12.0000639 C15.3224779,10.1084925 13.7890563,8.57507092 11.8974849,8.57507092 C10.0059135,8.57507092 8.47249192,10.1084925 8.47249192,12.0000639 C8.47249192,13.8916353 10.0059135,15.4250569 11.8974849,15.4250569 Z M11.9429909,13.9571744 C10.862093,13.9571744 9.98585207,13.0809335 9.98585207,12.0000355 C9.98585207,10.9191376 10.862093,10.0428967 11.9429909,10.0428967 C13.0238889,10.0428967 13.9001298,10.9191376 13.9001298,12.0000355 C13.9001298,13.0809335 13.0238889,13.9571744 11.9429909,13.9571744 Z M11.9429909,21.765741 L11.9429909,20.8779496 C12.8026863,20.8779496 13.6455771,20.7558717 14.4537214,20.5180654 L14.7043395,21.3697485 C13.8150213,21.6314413 12.8877441,21.765741 11.9429909,21.765741 Z M17.2405469,20.2053186 L16.7583378,19.4599006 C17.4716446,18.9984642 18.1160775,18.436515 18.670864,17.7927808 L19.343367,18.3723611 C18.7334295,19.0800885 18.0249346,19.6979001 17.2405469,20.2053186 Z M20.8452452,16.0204419 L20.0363454,15.6545803 C20.3850496,14.8836144 20.6219907,14.0647112 20.738106,13.2179682 L21.6176659,13.3385837 C21.4898859,14.2703883 21.229054,15.1718618 20.8452452,16.0204419 Z M21.5952528,10.507212 L20.7177328,10.641868 C20.5881869,9.79764977 20.338154,8.98263344 19.9770394,8.21711618 L20.7799773,7.83834929 C21.1774359,8.68091117 21.4526819,9.57811335 21.5952528,10.507212 Z M19.2283235,5.4965952 L18.5662221,6.08803009 C18.0000858,5.45424999 17.3458403,4.90385519 16.6244496,4.45524311 L17.0932806,3.70133925 C17.886601,4.1946823 18.6059071,4.79981046 19.2283235,5.4965952 Z M14.5386751,2.58316907 L14.3032304,3.43917103 C13.5509812,3.23226367 12.7700716,3.12495108 11.9759444,3.12217929 C11.8849543,3.12212591 11.8218372,3.12269124 11.7560794,3.12404805 L11.737765,2.23644557 C11.8101443,2.23495213 11.8794763,2.23433113 11.9777531,2.23439065 C12.8518663,2.23743957 13.7108985,2.35548777 14.5386751,2.58316907 Z M8.9822993,2.69131867 L9.25117773,3.5374144 C8.44018228,3.79513841 7.67240414,4.16861156 6.96951726,4.64487108 L6.47152202,3.90990555 C7.2447667,3.38597325 8.08966373,2.97498687 8.9822993,2.69131867 Z M4.41709312,5.77630839 L5.10094889,6.34244872 C4.55907419,6.99699341 4.11317846,7.72583049 3.77847363,8.50711492 L2.9624149,8.15751268 C3.33070231,7.29783812 3.82118533,6.49612107 4.41709312,5.77630839 Z M2.23904308,10.8959898 L3.1212618,10.995306 C3.08455294,11.3213881 3.06573361,11.6507804 3.06509454,11.9816784 C3.06507785,12.5194604 3.1096535,13.0353621 3.19869359,13.5434779 L2.32422705,13.6967157 C2.22629139,13.1378366 2.17728485,12.5706535 2.17730395,11.9808084 C2.17800679,11.6164394 2.19868775,11.2544632 2.23904308,10.8959898 Z M3.1952623,16.3458892 L3.99005267,15.9503114 C4.36859938,16.710883 4.85508854,17.4134975 5.43304627,18.036484 L4.78220258,18.6402854 C4.14671211,17.9552837 3.61169769,17.1825863 3.1952623,16.3458892 Z M6.95016905,20.3946075 L7.40468432,19.6319874 C8.13338373,20.0662862 8.92119595,20.3942662 9.74681506,20.6043301 L9.52790705,21.4647096 C8.61910894,21.2334823 7.75198645,20.872484 6.95016905,20.3946075 Z" id="path-1"></path>
+        <path d="M14.4537214,20.5180654 L14.7043395,21.3697485 C13.8150213,21.6314413 12.8877441,21.765741 11.9429909,21.765741 L11.9429909,20.8779496 C12.8026863,20.8779496 13.6455771,20.7558717 14.4537214,20.5180654 Z M7.40468432,19.6319874 C8.13338373,20.0662862 8.92119595,20.3942662 9.74681506,20.6043301 L9.52790705,21.4647096 C8.61910894,21.2334823 7.75198645,20.872484 6.95016905,20.3946075 L7.40468432,19.6319874 Z M18.670864,17.7927808 L19.343367,18.3723611 C18.7334295,19.0800885 18.0249346,19.6979001 17.2405469,20.2053186 L16.7583378,19.4599006 C17.4716446,18.9984642 18.1160775,18.436515 18.670864,17.7927808 Z M3.99005267,15.9503114 C4.36859938,16.710883 4.85508854,17.4134975 5.43304627,18.036484 L4.78220258,18.6402854 C4.14671211,17.9552837 3.61169769,17.1825863 3.1952623,16.3458892 L3.99005267,15.9503114 Z M11.8974849,7.59650149 C14.3295053,7.59650149 16.3010473,9.56804354 16.3010473,12.0000639 C16.3010473,14.4320843 14.3295053,16.4036263 11.8974849,16.4036263 C9.46546454,16.4036263 7.49392249,14.4320843 7.49392249,12.0000639 C7.49392249,9.56804354 9.46546454,7.59650149 11.8974849,7.59650149 Z M20.738106,13.2179682 L21.6176659,13.3385837 C21.4898859,14.2703883 21.229054,15.1718618 20.8452452,16.0204419 L20.0363454,15.6545803 C20.3850496,14.8836144 20.6219907,14.0647112 20.738106,13.2179682 Z M11.8974849,8.57507092 C10.0059135,8.57507092 8.47249192,10.1084925 8.47249192,12.0000639 C8.47249192,13.8916353 10.0059135,15.4250569 11.8974849,15.4250569 C13.7890563,15.4250569 15.3224779,13.8916353 15.3224779,12.0000639 C15.3224779,10.1084925 13.7890563,8.57507092 11.8974849,8.57507092 Z M11.9429909,10.0428967 C13.0238889,10.0428967 13.9001298,10.9191376 13.9001298,12.0000355 C13.9001298,13.0809335 13.0238889,13.9571744 11.9429909,13.9571744 C10.862093,13.9571744 9.98585207,13.0809335 9.98585207,12.0000355 C9.98585207,10.9191376 10.862093,10.0428967 11.9429909,10.0428967 Z M2.23904308,10.8959898 L3.1212618,10.995306 C3.08455294,11.3213881 3.06573361,11.6507804 3.06509454,11.9816784 C3.06507785,12.5194604 3.1096535,13.0353621 3.19869359,13.5434779 L2.32422705,13.6967157 C2.22629139,13.1378366 2.17728485,12.5706535 2.17730395,11.9808084 C2.17800679,11.6164394 2.19868775,11.2544632 2.23904308,10.8959898 Z M20.7799773,7.83834929 C21.1774359,8.68091117 21.4526819,9.57811335 21.5952528,10.507212 L20.7177328,10.641868 C20.5881869,9.79764977 20.338154,8.98263344 19.9770394,8.21711618 L20.7799773,7.83834929 Z M4.41709312,5.77630839 L5.10094889,6.34244872 C4.55907419,6.99699341 4.11317846,7.72583049 3.77847363,8.50711492 L2.9624149,8.15751268 C3.33070231,7.29783812 3.82118533,6.49612107 4.41709312,5.77630839 Z M17.0932806,3.70133925 C17.886601,4.1946823 18.6059071,4.79981046 19.2283235,5.4965952 L18.5662221,6.08803009 C18.0000858,5.45424999 17.3458403,4.90385519 16.6244496,4.45524311 L17.0932806,3.70133925 Z M8.9822993,2.69131867 L9.25117773,3.5374144 C8.44018228,3.79513841 7.67240414,4.16861156 6.96951726,4.64487108 L6.47152202,3.90990555 C7.2447667,3.38597325 8.08966373,2.97498687 8.9822993,2.69131867 Z M11.9777531,2.23438676 C12.8518663,2.23743957 13.7108985,2.35548777 14.5386751,2.58316907 L14.3032304,3.43917103 C13.5509812,3.23226367 12.7700716,3.12495108 11.9759444,3.12217929 C11.8849543,3.12212591 11.8218372,3.12269124 11.7560794,3.12404805 L11.737765,2.23644557 L11.8103134,2.23523569 L11.9777531,2.23438676 Z" id="path-1"></path>
     </defs>
-    <g id="icon-/-Rendering-/-Environment-Probe" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+    <g id="icon-/-Rendering-/-EnvironmentProbe" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <path d="M11.9429909,15.4250285 C13.8345623,15.4250285 15.3679839,13.8916069 15.3679839,12.0000355 C15.3679839,10.1084641 13.8345623,8.57504255 11.9429909,8.57504255 C10.0514195,8.57504255 8.51799793,10.1084641 8.51799793,12.0000355 C8.51799793,13.8916069 10.0514195,15.4250285 11.9429909,15.4250285 Z" id="Path" fill-opacity="0.25" fill="#FFFFFF" fill-rule="nonzero"></path>
         <mask id="mask-2" fill="white">
             <use xlink:href="#path-1"></use>
diff --git a/Assets/Editor/Icons/Components/FogVolume.svg b/Assets/Editor/Icons/Components/FogVolume.svg
index 73194491bf..b31ce5c997 100644
--- a/Assets/Editor/Icons/Components/FogVolume.svg
+++ b/Assets/Editor/Icons/Components/FogVolume.svg
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
-    <title>icon / Environmental / Fog Volume</title>
-    <desc>Created with Sketch.</desc>
+    <title>icon / Environmental / FogVolume</title>
     <defs>
-        <path d="M3.375,12.27 C3.48477691,10.3828508 4.93117226,8.86321338 6.76061606,8.68509376 C7.6521371,6.66004803 9.64445163,5.25 11.9591906,5.25 C14.1747379,5.25 16.0949018,6.54178988 17.0371512,8.42821107 C18.9538811,8.68993253 20.4575939,10.2848877 20.625,12.27 L3.375,12.27 Z M3.375,13.35 L20.625,13.35 L20.625,14.43 L3.375,14.43 L3.375,13.35 Z M3.375,15.51 L20.625,15.51 L20.625,16.59 L3.375,16.59 L3.375,15.51 Z M3.375,17.67 L20.625,17.67 L20.625,18.75 L3.375,18.75 L3.375,17.67 Z" id="path-1"></path>
+        <path d="M20.625,17.67 L20.625,18.75 L3.375,18.75 L3.375,17.67 L20.625,17.67 Z M20.625,15.51 L20.625,16.59 L3.375,16.59 L3.375,15.51 L20.625,15.51 Z M20.625,13.35 L20.625,14.43 L3.375,14.43 L3.375,13.35 L20.625,13.35 Z M11.9591906,5.25 C14.1747379,5.25 16.0949018,6.54178988 17.0371512,8.42821107 C18.9538811,8.68993253 20.4575939,10.2848877 20.625,12.27 L3.375,12.27 C3.48477691,10.3828508 4.93117226,8.86321338 6.76061606,8.68509376 C7.6521371,6.66004803 9.64445163,5.25 11.9591906,5.25 Z" id="path-1"></path>
     </defs>
-    <g id="icon-/-Environmental-/-Fog-Volume" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+    <g id="icon-/-Environmental-/-FogVolume" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <mask id="mask-2" fill="white">
             <use xlink:href="#path-1"></use>
         </mask>
diff --git a/Assets/Editor/Icons/Components/ForceVolume.svg b/Assets/Editor/Icons/Components/ForceVolume.svg
index 185e2dd012..b5a24544d7 100644
--- a/Assets/Editor/Icons/Components/ForceVolume.svg
+++ b/Assets/Editor/Icons/Components/ForceVolume.svg
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
-    <title>icon / Physics / Cry / Force Volume</title>
-    <desc>Created with Sketch.</desc>
+    <title>icon / Physics / PhysX / ForceVolume</title>
     <defs>
-        <path d="M13.3485825,7.05130618 L17.2034482,7.05130618 L20.7189166,11.4557258 L20.7189166,13.0484138 L17.2034482,18.0513062 L13.3485825,18.0513062 L16.8377333,13.0484138 L16.8377333,11.4557258 L13.3485825,7.05130618 Z M9.74066553,7.05130618 L12.268073,7.05130618 L15.7835414,11.4557258 L15.7835414,13.0484138 L12.268073,18.0513062 L9.74066553,18.0513062 L13.2298164,13.0484138 L13.2298164,11.4557258 L9.74066553,7.05130618 Z M6.97688416,7.05130618 L8.66015604,7.05130618 L12.1756245,11.4557258 L12.1756245,13.0484138 L8.66015604,18.0513062 L6.97688416,18.0513062 L10.466035,13.0484138 L10.466035,11.4557258 L6.97688416,7.05130618 Z M12.5,21.5 C17.4705627,21.5 21.5,17.4705627 21.5,12.5 C21.5,7.52943725 17.4705627,3.5 12.5,3.5 C7.52943725,3.5 3.5,7.52943725 3.5,12.5 C3.5,17.4705627 7.52943725,21.5 12.5,21.5 Z M12.5,23 C6.70101013,23 2,18.2989899 2,12.5 C2,6.70101013 6.70101013,2 12.5,2 C18.2989899,2 23,6.70101013 23,12.5 C23,18.2989899 18.2989899,23 12.5,23 Z" id="path-1"></path>
+        <path d="M12.8485825,6.55130618 L16.7034482,6.55130618 L20.2189166,10.9557258 L20.2189166,12.5484138 L16.7034482,17.5513062 L12.8485825,17.5513062 L16.3377333,12.5484138 L16.3377333,10.9557258 L12.8485825,6.55130618 Z M9.24066553,6.55130618 L11.768073,6.55130618 L15.2835414,10.9557258 L15.2835414,12.5484138 L11.768073,17.5513062 L9.24066553,17.5513062 L12.7298164,12.5484138 L12.7298164,10.9557258 L9.24066553,6.55130618 Z M6.47688416,6.55130618 L8.16015604,6.55130618 L11.6756245,10.9557258 L11.6756245,12.5484138 L8.16015604,17.5513062 L6.47688416,17.5513062 L9.966035,12.5484138 L9.966035,10.9557258 L6.47688416,6.55130618 Z M12,21 C16.9705627,21 21,16.9705627 21,12 C21,7.02943725 16.9705627,3 12,3 C7.02943725,3 3,7.02943725 3,12 C3,16.9705627 7.02943725,21 12,21 Z M12,22.5 C6.20101013,22.5 1.5,17.7989899 1.5,12 C1.5,6.20101013 6.20101013,1.5 12,1.5 C17.7989899,1.5 22.5,6.20101013 22.5,12 C22.5,17.7989899 17.7989899,22.5 12,22.5 Z" id="path-1"></path>
     </defs>
-    <g id="icon-/-Physics-/-Cry-/-Force-Volume" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+    <g id="icon-/-Physics-/-PhysX-/-ForceVolume" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <mask id="mask-2" fill="white">
             <use xlink:href="#path-1"></use>
         </mask>
diff --git a/Assets/Editor/Icons/Components/GeometryCache.svg b/Assets/Editor/Icons/Components/GeometryCache.svg
index 0060c6f69f..f6006b601e 100644
--- a/Assets/Editor/Icons/Components/GeometryCache.svg
+++ b/Assets/Editor/Icons/Components/GeometryCache.svg
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
-    <title>icon / Rendering / Geometry Cache</title>
-    <desc>Created with Sketch.</desc>
+    <title>icon / Rendering / GeometryCache</title>
     <defs>
-        <path d="M2.46527664,7.41402559 L21.5445757,7.41402559 L21.5397656,20.5769086 C21.5397656,21.1037689 21.1126609,21.5308735 20.5858006,21.5308735 L3.4144315,21.5308735 C2.88757121,21.5308735 2.46046655,21.1037689 2.46046655,20.5769086 L2.46527664,7.41402559 Z M16.2940009,13.9564802 L9.08770901,9.83859909 L9.08770901,18.0743612 L16.2940009,13.9564802 Z M16.1244201,2.08785302 L11.6223105,5.90371283 L7.26925124,5.90371283 L11.7713608,2.08785302 L16.1244201,2.08785302 Z M18.9387161,2.08785302 L20.5858006,2.08785302 C21.1126609,2.08785302 21.5397656,2.51495768 21.5397656,3.04181797 L21.5397656,5.90371283 L14.4366065,5.90371283 L18.9387161,2.08785302 Z M8.95706478,2.08785302 L4.45495525,5.90371283 L2.46046655,5.90371283 L2.46046655,3.04181797 C2.46046655,2.51495768 2.88757121,2.08785302 3.4144315,2.08785302 L8.95706478,2.08785302 Z" id="path-1"></path>
+        <path d="M21.5445757,7.41402559 L21.5397656,20.5769086 C21.5397656,21.1037689 21.1126609,21.5308735 20.5858006,21.5308735 L3.4144315,21.5308735 C2.88757121,21.5308735 2.46046655,21.1037689 2.46046655,20.5769086 L2.46527664,7.41402559 L21.5445757,7.41402559 Z M9.08770901,9.83859909 L9.08770901,18.0743612 L16.2940009,13.9564802 L9.08770901,9.83859909 Z M16.1244201,2.08785302 L11.6223105,5.90371283 L7.26925124,5.90371283 L11.7713608,2.08785302 L16.1244201,2.08785302 Z M20.5858006,2.08785302 C21.1126609,2.08785302 21.5397656,2.51495768 21.5397656,3.04181797 L21.5397656,5.90371283 L14.4366065,5.90371283 L18.9387161,2.08785302 L20.5858006,2.08785302 Z M8.95706478,2.08785302 L4.45495525,5.90371283 L2.46046655,5.90371283 L2.46046655,3.04181797 C2.46046655,2.51495768 2.88757121,2.08785302 3.4144315,2.08785302 L8.95706478,2.08785302 Z" id="path-1"></path>
     </defs>
-    <g id="icon-/-Rendering-/-Geometry-Cache" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+    <g id="icon-/-Rendering-/-GeometryCache" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <mask id="mask-2" fill="white">
             <use xlink:href="#path-1"></use>
         </mask>
diff --git a/Assets/Editor/Icons/Components/LensFlare.svg b/Assets/Editor/Icons/Components/LensFlare.svg
index 210cc8e496..2a7bfb848d 100644
--- a/Assets/Editor/Icons/Components/LensFlare.svg
+++ b/Assets/Editor/Icons/Components/LensFlare.svg
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
-    <title>icon / Rendering / Lens Flare</title>
-    <desc>Created with Sketch.</desc>
+    <title>icon / Rendering / LensFlare</title>
     <defs>
         <path d="M9.26428558,10.7436477 L8.30532815,9.76520557 C7.84734726,10.3869697 7.57567341,11.1607113 7.57567341,12 C7.57567341,12.7967625 7.82051368,13.534452 8.23715744,14.139122 L9.2384369,13.2137815 C9.02844732,12.8595652 8.90759222,12.444183 8.90759222,12 C8.90759222,11.5378969 9.03839562,11.1069653 9.26428558,10.7436477 L9.26428558,10.7436477 Z M9.97803449,10.0153964 C10.2033246,9.86957396 10.4551415,9.76258785 10.7244394,9.70366769 L10.7244394,8.31545885 C10.0889507,8.40220943 9.50507883,8.65708229 9.01725375,9.03509392 L9.97803449,10.0153964 L9.97803449,10.0153964 Z M13.15445,13.2563523 L14.1134075,14.2347944 C14.5713883,13.6130303 14.8430622,12.8392887 14.8430622,12 C14.8430622,11.0638025 14.5050284,10.2091627 13.9474442,9.55604035 L12.95693,10.471432 C13.3024047,10.8822334 13.5111434,11.4162447 13.5111434,12 C13.5111434,12.4621031 13.38034,12.8930347 13.15445,13.2563523 L13.15445,13.2563523 Z M12.4407011,13.9846036 C12.0910666,14.2109098 11.6775428,14.3436792 11.2339411,14.3484134 L11.2339411,15.717295 C12.0473787,15.711779 12.7979393,15.4325863 13.4014818,14.9649061 L12.4407011,13.9846036 L12.4407011,13.9846036 Z M14.1190144,15.6970179 C13.3284332,16.342997 12.3260146,16.7315708 11.2339411,16.7373171 L11.2339411,19.7703432 L10.7244394,19.7703432 L10.7244394,16.711975 C9.57596844,16.5909343 8.55218686,16.044729 7.80671104,15.2310485 L5.91035949,16.9835771 L5.56473929,16.6088588 L7.48254065,14.8365072 C6.90096158,14.045481 6.55667011,13.0633649 6.55667011,12 C6.55667011,10.8758703 6.94143414,9.84254045 7.58454627,9.0297784 L1.28175431,2.59892242 L2.0091584,1.88460374 L8.29972123,8.30298213 C8.97781578,7.74891517 9.81175433,7.38421553 10.7244394,7.28802497 L10.7244394,4.22965681 L11.2339411,4.22965681 L11.2339411,7.26267823 C12.4314891,7.26898417 13.5212278,7.73563241 14.3420437,8.49724206 L15.8135774,7.13731231 C15.5266771,6.80601057 15.3525638,6.37064377 15.3525638,5.89378436 C15.3525638,4.85613212 16.1769959,4.01494877 17.1939843,4.01494877 C18.2109727,4.01494877 19.0354048,4.85613212 19.0354048,5.89378436 C19.0354048,6.9314366 18.2109727,7.77261994 17.1939843,7.77261994 C16.8275156,7.77261994 16.4860503,7.66339234 16.1991546,7.47510399 L14.6965583,8.86374052 C15.4220251,9.69950674 15.8620655,10.7978311 15.8620655,12 C15.8620655,13.1241297 15.4773015,14.1574595 14.8341893,14.9702216 L21.1369813,21.4010776 L20.4095772,22.1153963 L14.1190144,15.6970179 L14.1190144,15.6970179 Z M9.54615434,13.6235279 L8.55540417,14.5391377 C9.11462491,15.1505064 9.87322794,15.5683423 10.7244394,15.6845411 L10.7244394,14.2963323 C10.2662088,14.1960752 9.85859191,13.95665 9.54615434,13.6235279 L9.54615434,13.6235279 Z M12.587482,10.1187344 L13.5903969,9.19188244 C12.9581264,8.63041339 12.1345735,8.28881229 11.2339411,8.28270495 L11.2339411,9.65158659 C11.7413383,9.65700163 12.2093844,9.82992607 12.587482,10.1187344 L12.587482,10.1187344 Z M3.84368595,19.9850512 C3.08094462,19.9850512 2.46262061,19.3541637 2.46262061,18.5759245 C2.46262061,17.7976854 3.08094462,17.1667979 3.84368595,17.1667979 C4.60642728,17.1667979 5.2247513,17.7976854 5.2247513,18.5759245 C5.2247513,19.3541637 4.60642728,19.9850512 3.84368595,19.9850512 Z M20.8768252,12.4697089 C21.8938137,12.4697089 22.7182457,13.3108922 22.7182457,14.3485445 C22.7182457,15.3861967 21.8938137,16.2273801 20.8768252,16.2273801 C19.8598368,16.2273801 19.0354048,15.3861967 19.0354048,14.3485445 C19.0354048,13.3108922 19.8598368,12.4697089 20.8768252,12.4697089 Z" id="path-1"></path>
     </defs>
-    <g id="icon-/-Rendering-/-Lens-Flare" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+    <g id="icon-/-Rendering-/-LensFlare" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <ellipse id="Oval-242" fill-opacity="0.25" fill="#B29EDF" cx="11.2093678" cy="12" rx="5.9846165" ry="6.10621564"></ellipse>
         <mask id="mask-2" fill="white">
             <use xlink:href="#path-1"></use>
diff --git a/Assets/Editor/Icons/Components/Light.svg b/Assets/Editor/Icons/Components/Light.svg
new file mode 100644
index 0000000000..52400d2396
--- /dev/null
+++ b/Assets/Editor/Icons/Components/Light.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Rendering / Light</title>
+    <defs>
+        <path d="M11.0039744,20.4705948 C11.5393978,21.1503288 13.4649954,21.1240649 13.8493579,20.4705948 L11.0039744,20.4705948 Z M12.4098795,18.9471874 C12.8523277,18.9471874 13.2948542,18.9522206 13.7372241,18.9438844 C13.8589659,18.941525 14.0228008,19.0217422 14.031329,18.6233302 C14.0400136,18.2162672 13.8775088,18.2727339 13.7527939,18.2719474 C12.8678975,18.2672288 11.9829228,18.2675433 11.0980264,18.2713183 C10.9715903,18.2719474 10.8095548,18.2255473 10.8223862,18.6296217 C10.8348264,19.0218995 10.9994438,18.9401094 11.1214984,18.9424688 C11.5508805,18.9506478 11.9804191,18.9456145 12.4098795,18.9471874 L12.4098795,18.9471874 Z M12.3797874,20.0090599 C12.8486026,20.0090599 13.3174177,20.0104378 13.7861546,20.0079576 C13.9060968,20.0074065 14.0347237,20.0052019 14.033173,19.7053785 C14.0316723,19.4032128 13.9001506,19.4123067 13.7822426,19.4120312 C12.8838106,19.4096888 11.9852222,19.4089999 11.086712,19.4112044 C10.9719336,19.41148 10.8321184,19.3802025 10.8209301,19.6778212 C10.8080204,20.0246298 10.9597281,20.0071309 11.090624,20.0080954 C11.5203973,20.0109889 11.9500923,20.0091977 12.3797874,20.0090599 L12.3797874,20.0090599 Z M13.2607657,13.4947637 C12.8423777,14.33615 12.9912741,15.5980916 12.9993731,16.7900821 C13.0002814,16.9251159 13.0659817,16.9582688 13.1924623,16.9452498 C13.596201,16.9036951 14.1723547,16.6033321 14.2230681,16.1863474 C14.3123841,15.4519879 14.5085766,14.7623622 14.9058059,14.1261747 C15.1081294,13.8022149 15.4106261,13.4539499 15.7053802,13.1295359 C16.2802575,12.5331621 16.3863751,11.6125545 16.282181,11.1194792 C16.1343075,10.4197004 15.8025237,9.83930799 15.3809974,9.26465773 C14.5181894,8.08848671 13.3847841,7.39764992 11.9494452,7.51746964 C10.1519223,7.66756599 8.93608888,8.752453 8.22519383,10.380654 C7.93143491,11.0536276 7.82338977,11.8171831 8.09064542,12.4952166 C8.27274784,12.7688913 8.44538055,13.0085133 8.64543332,13.2286243 C9.38138228,14.0383725 9.92726975,14.9343334 10.0408828,16.0513893 C10.097273,16.606057 10.243509,16.7726541 10.7758477,16.9037519 C11.0066313,16.9606719 10.9940011,16.9911189 11.2299317,17.0267696 C11.4405056,17.0586358 11.5379963,17.0083766 11.5475335,16.75428 C11.5882555,15.6633377 11.4969715,14.6108467 11.0690872,13.5781111 C10.865931,13.0877813 10.6415761,12.4372614 10.5233511,12.1323409 C10.4051261,11.8274204 10.3156207,11.6908656 10.6150333,11.5694299 C10.9144459,11.4479943 11.0056578,11.7906463 11.0802895,12.0394533 C11.0986069,12.2095322 11.1946594,12.2732645 11.3625433,12.2645599 C11.5379206,12.2554013 12.013591,12.2747973 12.1886866,12.2747973 C12.6309555,12.2747973 12.5785397,12.2645599 13.0031142,12.2645599 C13.1924623,12.2747973 13.2726196,12.0804781 13.3015338,12.0270399 C13.4098484,11.8264572 13.3755601,11.4516327 13.7381227,11.5354232 C14.1248308,11.624815 13.9705714,11.9055741 13.8822394,12.1594244 C13.7618604,12.4690754 13.6791537,12.6533774 13.2607657,13.4947637 Z M13.059965,12.9584771 C13.1175824,12.7896262 13.1342274,12.6776725 12.8985565,12.6807935 C12.4208926,12.6871154 11.9430688,12.6852748 11.465405,12.6815937 C11.2670253,12.6800733 11.2473679,12.7651457 11.3079976,12.9322292 C11.465405,13.3660132 11.770323,14.3349715 11.9334121,14.7679018 C11.9334121,15.4766571 11.9554987,15.6348818 11.9334121,16.3511774 C11.9260499,16.5900493 11.9317316,16.7591709 11.9334121,16.9983629 C11.9343724,17.1280819 11.9744652,17.3020965 12.1866091,17.3078583 C12.415398,17.3141002 12.4692272,17.1912714 12.4683469,17.0392256 C12.4637856,16.2821977 12.4609847,15.5250098 12.4576237,14.7679018 C12.6576839,14.1645202 12.8543832,13.5599381 13.059965,12.9584771 Z M17.0110834,10.4301747 C17.1345606,10.9103993 17.1209393,11.2191923 17.0895699,11.7117406 C16.9279743,13.2144364 16.112733,13.7535753 15.5561654,14.6554468 C15.1950967,15.240503 14.9633469,15.8726933 14.8982874,16.562661 C14.8592356,16.977906 14.6707695,17.3160081 14.3141021,17.5263114 C14.0276159,17.6951623 13.8810512,17.659675 13.5698375,17.7839524 C13.7525325,17.7839524 13.9012002,17.815694 14.0804475,17.868768 C14.3564163,17.9504805 14.6827562,18.109812 14.5827261,18.6695005 C14.4963,19.1523659 14.4265891,18.9822162 14.5827261,19.4085753 C14.6799129,19.673961 14.5116974,20.4812898 14.0804475,20.9316398 C13.6491977,21.3819899 13.2534311,21.4608118 12.9315742,21.4766565 C12.3888508,21.5035446 11.8342986,21.5614912 11.3081402,21.3752751 C10.5694378,21.1139964 10.101697,20.2008415 10.2788703,19.4271686 C10.3137608,19.2748828 10.274549,19.1440434 10.2396585,19 C10.101857,18.4315889 10.4387848,17.9814882 10.9349341,17.8158383 C10.5318528,17.7075657 10.1458966,17.6426662 9.83916424,17.38971 C9.63086153,17.2178983 9.4278404,17.0252803 9.40751428,16.7446358 C9.3265299,15.6241385 8.8586658,14.593961 8.16377984,13.8166343 C7.76979732,13.37591 7.49372655,13 7.25810683,12.2575729 C6.6568058,10.4026945 7.85144581,8.63443412 9.21073504,7.62597051 C12.1994748,5.40874298 16.1994791,7.27202395 17.0110834,10.4301747 Z M21.2967102,11.0432284 C21.5148559,11.0458692 21.654818,11.2283241 21.6396935,11.4563128 C21.6252891,11.6753387 21.5081338,11.832586 21.2600592,11.8329061 C20.3166551,11.8337864 19.3732511,11.8365873 18.4298471,11.8313057 C18.0502928,11.829145 18.0241516,11.7207879 18.0339946,11.4371825 C18.0438376,11.1535771 18.1457663,11.0432284 18.3706075,11.0432284 C19.36705,11.0432284 20.3012105,11.0310647 21.2967102,11.0432284 Z M2.81444431,11.0548988 C3.85907881,11.0568194 4.56656903,11.0568194 5.69165542,11.1146174 C5.89611697,11.1146174 6.0342204,11.2710548 6.00509137,11.5007759 C5.97596234,11.730497 5.75573959,11.8351247 5.5327827,11.8344341 C4.62666687,11.8316273 3.7206154,11.834194 2.81444431,11.834194 C2.62377423,11.834194 2.54911919,11.8220304 2.47218127,11.747768 C2.39524335,11.6735056 2.36086775,11.3551863 2.46689968,11.1441627 C2.53994244,11.0398749 2.74050205,11.0548188 2.81444431,11.0548988 Z M20.4365886,4.47417829 C20.5631867,4.54291898 20.627366,4.65543286 20.6171229,4.84276926 C20.5991975,4.88030056 20.5814322,4.96624643 20.5296566,5.01866221 C19.8412093,5.7158321 19.1502813,6.4106813 18.4542317,7.1002489 C18.2899423,7.26293788 18.092923,7.28454439 17.9255926,7.10585059 C17.757382,6.9261965 17.8048362,6.7388601 17.9664049,6.57657124 C18.6327655,5.90692964 19.3012868,5.23936866 19.9689278,4.57092742 C20.1037684,4.4360068 20.2574946,4.37686899 20.4365886,4.47417829 Z M4.75616242,4.5290507 C5.51255014,5.21325669 6.22180367,5.94587725 6.92177441,6.68714042 C6.96282677,6.73067353 6.96866853,6.80741663 6.98083219,6.8408667 C6.98043207,7.02028072 6.91065106,7.13047389 6.78189229,7.19233251 C6.59991751,7.27971882 6.45155284,7.21097813 6.31751249,7.07597748 C5.85897444,6.61391838 5.3971554,6.15506023 4.93685682,5.6946016 C4.7208718,5.47853655 4.49976523,5.2671129 4.29194266,5.04336554 C4.14517848,4.88523793 4.14229761,4.70582392 4.2910624,4.54313494 C4.43670625,4.38372695 4.62108175,4.40685391 4.75616242,4.5290507 Z M12.381869,1.32250507 C12.6513101,1.34379148 12.8546513,1.513764 12.8546513,1.78536442 C12.8546513,2.6733431 12.7846302,4.59108912 12.7508601,4.67367398 C12.6693955,4.87293397 12.5000646,4.93871378 12.2980037,4.91478657 C12.0927419,4.89037922 12.0012744,4.75041709 12.0005542,4.55755902 C11.9971932,3.58814717 11.9995139,2.61881534 11.9988737,1.64940349 C11.9987136,1.40653037 12.1484387,1.33346837 12.381869,1.32250507 Z" id="path-1"></path>
+    </defs>
+    <g id="icon-/-Rendering-/-Light" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <mask id="mask-2" fill="white">
+            <use xlink:href="#path-1"></use>
+        </mask>
+        <use id="Combined-Shape" fill="#B29EDF" xlink:href="#path-1"></use>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/Lightning.svg b/Assets/Editor/Icons/Components/Lightning.svg
index c40b1cebb3..00e2a314d6 100644
--- a/Assets/Editor/Icons/Components/Lightning.svg
+++ b/Assets/Editor/Icons/Components/Lightning.svg
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
     <title>icon / Environmental / Lighting</title>
-    <desc>Created with Sketch.</desc>
     <defs>
-        <polygon id="path-1" points="10.2528012 1.91197338 19.5426318 1.91197338 13.5102743 9.10078113 19.5426318 9.10078113 5.54756227 22.1433323 10.2528012 13.2086713 4.94432651 13.2086713"></polygon>
+        <polygon id="path-1" points="10.009322 1.88432053 19.2991527 1.88432053 13.2667951 9.07312828 19.2991527 9.07312828 5.30408309 22.1156795 10.009322 13.1810184 4.70084734 13.1810184"></polygon>
     </defs>
     <g id="icon-/-Environmental-/-Lighting" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <mask id="mask-2" fill="white">
diff --git a/Assets/Editor/Icons/Components/LightningArc.svg b/Assets/Editor/Icons/Components/LightningArc.svg
index e51ebb5d86..8c4eb32aee 100644
--- a/Assets/Editor/Icons/Components/LightningArc.svg
+++ b/Assets/Editor/Icons/Components/LightningArc.svg
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
-    <title>icon / Rendering / Lightning Arc</title>
-    <desc>Created with Sketch.</desc>
+    <title>icon / Rendering / LightningArc</title>
     <defs>
-        <path d="M17.8127844,9.1874715 L16.6074913,7.66249848 L13.0826936,13.8269244 L12.6030974,7.26575016 L9.54892707,11.3043124 L8.3757757,7.33500382 L6.66643673,9.2476326 C7.66178202,9.99238548 8.04402771,11.3525045 7.51399097,12.5320274 C6.89908167,13.9004223 5.2900732,14.5080257 3.92461317,13.8859575 C2.56614057,13.2670725 1.96282769,11.6653252 2.57451504,10.3041002 C3.1346144,9.05767722 4.51949305,8.44246388 5.79383349,8.81280335 L8.85168322,1.48688629 L11.0541566,6.19651406 L13.5655787,2.87657703 L15.1365246,5.83942422 L17.9409586,2.56814845 L19.080613,8.88701771 C20.1015537,8.89887815 21.072183,9.49136859 21.5186786,10.4849824 C22.130366,11.8462073 21.5270531,13.4479546 20.1685805,14.0668396 C18.8031205,14.6889079 17.194112,14.0813044 16.5792027,12.7129095 C15.9852924,11.391245 16.5367871,9.84283525 17.8127844,9.1874715 Z M18.5749842,10.1518297 C18.5274378,10.1680084 18.4802298,10.1867084 18.433518,10.2079891 C17.6675714,10.5569346 17.3249569,11.4665486 17.6707178,12.2359914 C18.0138378,12.9995571 18.9047191,13.3359771 19.6643634,12.9899028 C20.43031,12.6409574 20.7729245,11.7313433 20.4271635,10.9619005 C20.2112401,10.481393 19.7783971,10.1700401 19.2978459,10.0914764 L19.5256719,11.3546684 L18.5749842,10.1518297 Z M5.86730221,10.1418073 L4.6886014,11.4606897 L5.33147257,9.92051564 C4.65903534,9.7847159 3.96063154,10.125424 3.66603015,10.7810183 C3.32026918,11.5504612 3.66288369,12.4600752 4.42883032,12.8090207 C5.18847455,13.1550949 6.07935587,12.818675 6.42247585,12.0551093 C6.73521726,11.3591469 6.48478254,10.5485071 5.86730221,10.1418073 Z M7.56603425,14.077307 L9.71078964,19.4944066 C9.57307966,19.7710133 9.43728362,19.9414133 9.30340151,20.0056067 C9.1695194,20.0698001 8.94936379,20.0700708 8.64293467,20.0064187 L5.55014813,15.0067325 C6.08092469,14.9791574 6.46896496,14.9088211 6.71426896,14.7957236 C6.95957296,14.682626 7.24349473,14.4431538 7.56603425,14.077307 Z M16.5271594,14.2581892 C16.849699,14.624036 17.1336207,14.8635082 17.3789247,14.9766057 C17.6242287,15.0897033 18.012269,15.1600396 18.5430455,15.1876146 L15.450259,20.1873009 C15.1438299,20.250953 14.9236743,20.2506823 14.7897922,20.1864889 C14.6559101,20.1222955 14.520114,19.9518954 14.382404,19.6752888 L16.5271594,14.2581892 Z" id="path-1"></path>
+        <path d="M16.4805626,15.3973272 C16.8031021,15.763174 17.0870239,16.0026461 17.3323279,16.1157437 C17.5776319,16.2288412 17.9656722,16.2991775 18.4964487,16.3267526 L15.4036622,21.3264389 C15.0972331,21.3900909 14.8770774,21.3898202 14.7431953,21.3256268 C14.6093132,21.2614334 14.4735172,21.0910334 14.3358072,20.8144268 L16.4805626,15.3973272 Z M7.51943741,15.216445 L9.6641928,20.6335446 C9.52648282,20.9101512 9.39068678,21.0805512 9.25680467,21.1447447 C9.12292256,21.2089381 8.90276695,21.2092087 8.59633783,21.1455567 L8.59633783,21.1455567 L5.50355129,16.1458704 C6.03432785,16.1182954 6.42236812,16.0479591 6.66767212,15.9348615 C6.91297612,15.821764 7.19689789,15.5822918 7.51943741,15.216445 L7.51943741,15.216445 Z M8.80508638,2.62602425 L11.0075597,7.33565202 L13.5189819,4.01571498 L15.0899278,6.97856217 L17.8943618,3.70728641 L19.0344185,10.0261604 C20.0552118,10.0381718 21.0256448,10.6306371 21.4720818,11.6241204 C22.0837692,12.9853453 21.4804563,14.5870926 20.1219837,15.2059776 C18.7565236,15.8280458 17.1475152,15.2204424 16.5326059,13.8520475 C15.9387556,12.5305164 16.4900789,10.9822858 17.7658011,10.326808 L16.5608945,8.80163643 L13.0360968,14.9660623 L12.5565006,8.40488812 L9.50233023,12.4434503 L8.32917886,8.47414178 L6.61972154,10.386682 C7.61515488,11.1314156 7.99745187,12.4915957 7.46739413,13.6711653 C6.85248483,15.0395602 5.24347636,15.6471637 3.87801633,15.0250954 C2.51954373,14.4062104 1.91623085,12.8044631 2.5279182,11.4432382 C3.0879353,10.1969982 4.47248948,9.58178254 5.74667522,9.95177821 L8.80508638,2.62602425 Z M19.2517843,11.2307019 L19.479075,12.4938063 L18.5291701,11.2907015 C18.4813591,11.3069412 18.4338893,11.3257296 18.3869212,11.3471271 C17.6209745,11.6960725 17.27836,12.6056866 17.624121,13.3751294 C17.967241,14.1386951 18.8581223,14.475115 19.6177665,14.1290408 C20.3837131,13.7800953 20.7263277,12.8704813 20.3805667,12.1010385 C20.1647234,11.6207094 19.7321216,11.3094092 19.2517843,11.2307019 Z M5.28360798,11.0593981 C4.61156088,10.9242822 3.91384957,11.264974 3.61943331,11.9201563 C3.27367234,12.6895991 3.61628685,13.5992131 4.38223349,13.9481586 C5.14187771,14.2942329 6.03275903,13.9578129 6.37587901,13.1942472 C6.68863098,12.4982613 6.4381688,11.6875903 5.82064286,11.2809041 L4.64200456,12.5998277 Z" id="path-1"></path>
     </defs>
-    <g id="icon-/-Rendering-/-Lightning-Arc" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+    <g id="icon-/-Rendering-/-LightningArc" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <mask id="mask-2" fill="white">
             <use xlink:href="#path-1"></use>
         </mask>
diff --git a/Assets/Editor/Icons/Components/LookAt.png b/Assets/Editor/Icons/Components/LookAt.png
deleted file mode 100644
index c1429e7f9b..0000000000
--- a/Assets/Editor/Icons/Components/LookAt.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:20589e6a15762728cd89fd9aed32d1d6c37a741d13e13e5222fdd1a5a7f3f2b8
-size 808
diff --git a/Assets/Editor/Icons/Components/LookAt.svg b/Assets/Editor/Icons/Components/LookAt.svg
new file mode 100644
index 0000000000..fa239fa70c
--- /dev/null
+++ b/Assets/Editor/Icons/Components/LookAt.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Gameplay / LookAt</title>
+    <defs>
+        <path d="M14.2559026,1.88023205 L13.5099928,4.87817679 L11.7612182,6.17233976 C12.9270679,7.45423212 13.5099928,9.39678553 13.5099928,12 C13.5099928,14.6032145 12.6987801,16.7035556 11.0763549,18.3010235 L12.5635715,19.7320409 L12.5635715,22.119768 C10.3199503,20.7494942 8.48824877,19.4765794 7.06846702,18.3010235 C5.64868527,17.1254676 3.59849,15.184236 0.917881228,12.4773286 L0.917881228,11.0627198 L8.38092366,4.87817679 L14.2559026,1.88023205 Z M14.7911976,14.2690899 L21.4147725,17.806502 L21.2804047,18.3614758 L21.2804047,18.3614758 L21.1349228,18.9262701 L14.7096043,15.0462071 C14.7437593,14.884978 14.7709571,14.6259389 14.7911976,14.2690899 Z M10.7928135,6.83802235 C9.39839605,7.21963409 8.24864656,7.72828887 7.34356504,8.36398667 C6.43848353,8.99968447 5.13842613,10.2116889 3.44339286,12 C4.76069149,13.7430881 5.78817532,14.9100279 6.52584433,15.5008192 C7.20204094,16.042378 8.15329421,16.5151387 9.37960415,16.9191013 L9.72087191,17.0275671 L10.7928135,15.5008192 C8.97633095,14.8213606 8.06808967,13.6544208 8.06808967,12 C8.06808967,10.4092107 9.04677789,9.36673997 11.0041543,8.87258771 L11.2437372,8.81592137 L10.7928135,6.83802235 Z M20.0532593,9.50362742 L23.16934,12.1431311 L20.0532593,14.7826347 L20.0528122,12.8258067 L15.0330202,12.7807274 L15.0330202,11.158635 L20.0528122,11.158635 L20.0532593,9.50362742 Z M20.8714732,5.07372992 C21.0284802,5.56712123 21.1711523,6.04841163 21.2994894,6.51760113 L14.7870726,9.83956091 C14.7712654,9.58161554 14.7515774,9.37795191 14.7280086,9.22857002 L14.7096043,9.12671142 L20.8714732,5.07372992 Z" id="path-1"></path>
+    </defs>
+    <g id="icon-/-Gameplay-/-LookAt" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <mask id="mask-2" fill="white">
+            <use xlink:href="#path-1"></use>
+        </mask>
+        <use id="Combined-Shape" fill="#65C98C" xlink:href="#path-1"></use>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/Mannequin.svg b/Assets/Editor/Icons/Components/Mannequin.svg
index 3b9d65dd04..2c3c0a5ff7 100644
--- a/Assets/Editor/Icons/Components/Mannequin.svg
+++ b/Assets/Editor/Icons/Components/Mannequin.svg
@@ -1,15 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
     <title>icon / Animation / Mannequin</title>
-    <desc>Created with Sketch.</desc>
     <defs>
-        <path d="M8.31158497,15.3182822 L15.1786727,15.3182822 L15.1786727,7.32593279 L8.31158497,7.32593279 L8.31158497,15.3182822 Z M5.24461506,9.78505659 L7.61539672,9.78505659 L7.61539672,8.35295389 L5.24461506,8.35295389 L5.24461506,9.78505659 Z M15.8775987,9.78768358 L18.2473537,9.78768358 L18.2473537,8.36004676 L15.8775987,8.36004676 L15.8775987,9.78768358 Z M5.24347433,12.0470249 L7.60307682,12.0470249 L7.60307682,10.5965333 L5.24347433,10.5965333 L5.24347433,12.0470249 Z M15.8752032,10.6008678 L15.8752032,12.0597658 L18.2350338,12.0597658 L18.2350338,10.6008678 L15.8752032,10.6007365 Z M5.25271425,14.3033452 L7.60684123,14.3033452 L7.60684123,12.8436591 L5.25271425,12.8436591 L5.25271425,14.3033452 Z M5.24769503,15.1136398 L5.24769503,16.5446917 L7.61437006,16.5446917 L7.61437006,15.1136398 L5.24769503,15.1135084 Z M15.8948238,7.53451567 L18.2506619,7.53451567 L18.2506619,6.11213282 L15.8948238,6.11213282 L15.8948238,7.53451567 Z M5.26674524,7.49327195 L7.62281147,7.49327195 L7.62281147,6.09912923 L5.26674524,6.09912923 L5.26674524,7.49327195 Z M15.8831883,12.8846401 L15.8831883,14.3050527 L18.2419923,14.3050527 L18.2419923,12.8846401 L15.8831883,12.8845088 Z M15.8925423,16.5390436 L18.2545403,16.5390436 L18.2545403,15.1597434 L15.8925423,15.1597434 L15.8925423,16.5390436 Z M8.25865504,16.0827358 L8.25865504,19.1811372 L7.65155789,19.1811372 L7.65155789,17.3846712 L5.22419597,17.3846712 L5.22419597,19.1703665 L4.31799874,19.2131366 L4.31799874,3.51596179 C4.5057631,3.50532248 4.96741738,3.45322656 5.19852952,3.44009162 L5.19852952,5.2487731 L7.63091066,5.2487731 L7.63091066,3.47568731 L8.2248894,3.47568731 L8.2248894,6.53652279 L15.2288649,6.53652279 L15.2288649,3.47897105 C15.4475431,3.46544206 15.6210483,3.45467141 15.8559248,3.44022297 L15.8559248,5.27556838 L18.255567,5.27556838 L18.255567,3.47240358 L19.1835085,3.42535862 L19.1835085,19.1187243 C18.9990523,19.1308085 18.5313958,19.1884927 18.3009681,19.2035979 L18.3009681,17.3932089 L15.8694995,17.3932089 L15.8694995,19.1635364 L15.2661668,19.1635364 L15.2661668,16.0827358 L8.25865504,16.0827358 Z" id="path-1"></path>
+        <path d="M19.4327549,4.10611099 L19.4327549,19.7994767 C19.2482987,19.8115609 18.7806422,19.8692451 18.5502145,19.8843503 L18.5502145,19.8843503 L18.5502145,18.0739613 L16.1187459,18.0739613 L16.1187459,19.8442887 L15.5154132,19.8442887 L15.5154132,16.7634881 L8.5079014,16.7634881 L8.5079014,19.8618895 L7.90080425,19.8618895 L7.90080425,18.0654236 L5.47344233,18.0654236 L5.47344233,19.8511189 L4.5672451,19.893889 L4.5672451,4.19671416 C4.75500945,4.18607485 5.21666373,4.13397893 5.44777588,4.12084399 L5.44777588,4.12084399 L5.44777588,5.92952547 L7.88015702,5.92952547 L7.88015702,4.15643968 L8.47413575,4.15643968 L8.47413575,7.21727516 L15.4781113,7.21727516 L15.4781113,4.15972342 C15.6967894,4.14619443 15.8702946,4.13542378 16.1051712,4.12097534 L16.1051712,4.12097534 L16.1051712,5.95632075 L18.5048134,5.95632075 L18.5048134,4.15315595 L19.4327549,4.10611099 Z M7.86361641,15.7942608 L5.49694139,15.7942608 L5.49694139,17.2253127 L7.86361641,17.225444 L7.86361641,15.7942608 Z M18.5037867,15.8404958 L16.1417887,15.8404958 L16.1417887,17.219796 L18.5037867,17.219796 L18.5037867,15.8404958 Z M15.4279191,8.00668516 L8.56083132,8.00668516 L8.56083132,15.9990345 L15.4279191,15.9990345 L15.4279191,8.00668516 Z M18.4912387,13.5652612 L16.1324347,13.5652612 L16.1324347,14.9856738 L18.4912387,14.9858051 L18.4912387,13.5652612 Z M7.85608759,13.5244115 L5.50196061,13.5244115 L5.50196061,14.9840976 L7.85608759,14.9840976 L7.85608759,13.5244115 Z M18.4842802,11.2814888 L16.1244496,11.2814888 L16.1244496,12.7403868 L18.4842802,12.7405182 L18.4842802,11.2814888 Z M7.85232318,11.2772857 L5.49272068,11.2772857 L5.49272068,12.7277773 L7.85232318,12.7277773 L7.85232318,11.2772857 Z M18.4966001,9.04079913 L16.1268451,9.04079913 L16.1268451,10.4684359 L18.4966001,10.4684359 L18.4966001,9.04079913 Z M7.86464307,9.03370626 L5.49386142,9.03370626 L5.49386142,10.465809 L7.86464307,10.465809 L7.86464307,9.03370626 Z M18.4999082,6.79288519 L16.1440701,6.79288519 L16.1440701,8.21526804 L18.4999082,8.21526804 L18.4999082,6.79288519 Z M7.87205782,6.7798816 L5.5159916,6.7798816 L5.5159916,8.17402432 L7.87205782,8.17402432 L7.87205782,6.7798816 Z" id="path-1"></path>
     </defs>
     <g id="icon-/-Animation-/-Mannequin" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <mask id="mask-2" fill="white">
             <use xlink:href="#path-1"></use>
         </mask>
-        <use id="Page-1" fill="#5AA9D2" transform="translate(11.750754, 11.319248) rotate(45.000000) translate(-11.750754, -11.319248) " xlink:href="#path-1"></use>
+        <use id="Page-1" fill="#5AA9D2" transform="translate(12.000000, 12.000000) rotate(45.000000) translate(-12.000000, -12.000000) " xlink:href="#path-1"></use>
     </g>
 </svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/MannequinScopeContext.svg b/Assets/Editor/Icons/Components/MannequinScopeContext.svg
deleted file mode 100644
index 2dacab999e..0000000000
--- a/Assets/Editor/Icons/Components/MannequinScopeContext.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
-    <title>icon / Animation / Mannequin Scope Context</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <path d="M6.75900667,1.51990129 C8.44719499,1.52206521 11.5890363,3.42448133 14.4560601,6.2913387 L15.7800445,4.79806939 C15.6989809,4.50477538 15.7417598,4.03453953 16.0129153,3.70728866 C17.0131444,2.49998933 18.7426136,3.98826499 17.7457136,5.16210684 C17.4677335,5.4893577 17.0126451,5.65664515 16.5638819,5.54994738 L15.1974514,7.03273003 C18.184323,10.3055716 19.7095517,13.6098731 18.682024,14.648054 C18.0573177,15.2730932 16.1082941,15.6011763 13.8736335,15.2730932 L18.3855673,20.1555562 L18.3855673,21.6807849 L7.87891704,21.6807849 L7.87891704,19.9438252 L10.1981369,14.0656274 C6.50333153,12.035873 3.67858731,4.07382295 5.85582092,1.82168451 C6.06805126,1.61727757 6.37366295,1.5202342 6.75351365,1.51990129 L6.75900667,1.51990129 Z M13.7355269,7.02476925 C10.7323733,4.02161567 7.37336859,2.20385616 6.36590007,3.21147994 C5.40749304,4.16988696 7.06735527,7.41990061 10.0705089,10.4230542 C13.0834437,13.4362995 16.3238313,15.0960065 17.3316104,14.1278182 C18.2207724,13.2386562 16.9462603,10.4628002 14.4369821,7.72622445 L11.9864852,10.6315664 C11.959315,10.6602891 11.9181717,10.6733308 11.8689549,10.6733308 C11.5790884,10.6731756 11.0108445,10.2184252 11.3739927,9.82143071 L13.7355269,7.02476925 Z M13.4689748,15.8814868 C13.2500404,15.8449021 13.0764423,15.7718761 12.8939491,15.6622655 L11.9354295,19.9438252 L17.2119501,19.9438252 L13.4689748,15.8814868 Z" id="path-1"></path>
-    </defs>
-    <g id="icon-/-Animation-/-Mannequin-Scope-Context" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <mask id="mask-2" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <use id="Shape" fill="#5AA9D2" xlink:href="#path-1"></use>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/Mesh.svg b/Assets/Editor/Icons/Components/Mesh.svg
new file mode 100644
index 0000000000..ce46b8b220
--- /dev/null
+++ b/Assets/Editor/Icons/Components/Mesh.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Rendering / StaticMesh</title>
+    <defs>
+        <path d="M11.6374916,1.77902411 C14.0067933,1.77902411 16.0886658,2.79972705 17.8619233,4.48605498 C18.4756091,5.06965634 19.008426,5.69361462 19.4594847,6.31819039 C19.7321984,6.69581389 19.9190809,6.99335974 20.0183078,7.1713447 L20.2728714,7.62795986 L19.8437441,7.92653956 C19.7976997,7.95857651 19.6998319,8.03703817 19.5672353,8.16206989 C19.3379991,8.37822758 19.1070197,8.64170092 18.8907832,8.95249242 C18.2696785,9.84519122 17.8970598,10.9333346 17.8970598,12.2334762 C17.8970598,12.975499 18.017844,13.6171163 18.2355029,14.1689019 L18.2403389,14.1707023 L18.2399254,14.1800676 C18.3996134,14.5815904 18.6107385,14.935374 18.864027,15.2455198 C19.2168449,15.6775371 19.561386,15.9291033 19.7650812,16.0274849 L20.3164873,16.2938055 L20.0183078,16.8286553 C19.9190809,17.0066403 19.7321984,17.3041861 19.4594847,17.6818096 C19.008426,18.3063854 18.4756091,18.9303437 17.8619233,19.513945 C16.0886658,21.200273 14.0067933,22.2209759 11.6374916,22.2209759 C9.26818991,22.2209759 7.18631733,21.200273 5.41305989,19.513945 C4.79937413,18.9303437 4.26655723,18.3063854 3.81549852,17.6818096 C3.54278482,17.3041861 3.3559023,17.0066403 3.25667543,16.8286553 L2.93144984,16.2452925 L3.55568048,16.0077637 C3.74542684,15.9355625 4.0761493,15.7221825 4.41852755,15.3200416 C5.01460546,14.6199173 5.37792336,13.616206 5.37792336,12.2277275 C5.37792336,10.8271229 5.00616719,9.72293824 4.39037167,8.87184037 C4.0298524,8.37356265 3.67831059,8.07378427 3.46832347,7.95029628 L2.9818878,7.66423605 L3.25667543,7.1713447 C3.3559023,6.99335974 3.54278482,6.69581389 3.81549852,6.31819039 C4.26655723,5.69361462 4.79937413,5.06965634 5.41305989,4.48605498 C7.18631733,2.79972705 9.26818991,1.77902411 11.6374916,1.77902411 Z M11.6509858,20.3270374 L10.3857845,20.9512591 C10.7931996,21.0269292 11.2104944,21.0660634 11.6374916,21.0660634 C12.0711606,21.0660634 12.4948217,21.0256968 12.908289,20.9476853 L11.6509858,20.3270374 Z M9.54162148,17.0476359 L7.80298584,17.9030374 L7.80298584,19.8670374 L9.54162148,20.7229446 L11.2799858,19.8660374 L11.2799858,17.9040374 L9.54162148,17.0476359 Z M13.7614942,17.0476359 L12.0229858,17.9030374 L12.0229858,19.8670374 L13.7614942,20.7229446 L15.4989858,19.8670374 L15.4989858,17.9030374 L13.7614942,17.0476359 Z M5.32174877,17.0476359 L4.90144984,17.2050241 L5.00772268,17.3472845 C5.3609877,17.8020547 5.76210238,18.2521148 6.20893517,18.6770427 C6.48520318,18.9397674 6.76884555,19.183796 7.05975864,19.4076097 L7.05998584,17.9040374 L5.32174877,17.0476359 Z M17.9813669,17.0476359 L16.2419858,17.9040374 L16.2421956,19.3867855 C16.5236755,19.1686835 16.7983244,18.9316419 17.066048,18.6770427 C17.5716746,18.1962032 18.0187605,17.6831828 18.4042171,17.1675718 L17.9813669,17.0476359 Z M7.31915519,13.5924518 L6.30643851,14.0926136 C6.11617634,14.809726 5.8117234,15.4190034 5.41500254,15.925364 L5.41517314,16.3301924 L7.31915519,17.2677605 L9.05698584,16.4120374 L9.05698584,14.4470374 L7.31915519,13.5924518 Z M11.5390279,13.5924518 L9.79998584,14.4480374 L9.79998584,16.4110374 L11.5390279,17.2677605 L13.2769858,16.4120374 L13.2769858,14.4470374 L11.5390279,13.5924518 Z M15.7589006,13.5924518 L14.0199858,14.4470374 L14.0199858,16.4120374 L15.7589006,17.2677605 L17.6628826,16.3301924 L17.6626161,15.5589125 C17.3981168,15.1584486 17.1839552,14.7117929 17.0289896,14.2180202 L15.7589006,13.5924518 Z M9.54162148,10.1372677 L7.80298584,10.9920374 L7.80298584,12.9560374 L9.54162148,13.8125764 L11.2799858,12.9550374 L11.2799858,10.9930374 L9.54162148,10.1372677 Z M13.7614942,10.1372677 L12.0229858,10.9920374 L12.0229858,12.9560374 L13.7614942,13.8125764 L15.4989858,12.9560374 L15.4989858,10.9920374 L13.7614942,10.1372677 Z M16.929326,10.5689312 L16.2419858,10.9760374 L16.2419858,12.9720374 L16.8216119,13.3163363 C16.7693535,12.9740217 16.7421473,12.6131433 16.7421473,12.2334762 C16.7421473,11.6449304 16.807295,11.0900084 16.929326,10.5689312 Z M6.53283589,12.2277275 C6.53283589,12.6017536 6.50952462,12.9559407 6.46454417,13.2906571 L7.05998584,12.9640374 L7.05998584,10.9840374 L6.3733863,10.6098538 C6.47759228,11.1117231 6.53283589,11.6508264 6.53283589,12.2277275 Z M7.31915519,6.6820836 L5.41517314,7.61965171 L5.41444984,8.32302411 L5.47308237,8.40767149 C5.74552371,8.82100882 5.97225389,9.27744802 6.14514378,9.77771901 L7.31915519,10.3573923 L9.05698584,9.50103744 L9.05698584,7.53703744 L7.31915519,6.6820836 Z M11.5390279,6.6820836 L9.79998584,7.53803744 L9.79998584,9.50003744 L11.5390279,10.3573923 L13.2769858,9.50103744 L13.2769858,7.53703744 L11.5390279,6.6820836 Z M15.7589006,6.6820836 L14.0199858,7.53703744 L14.0199858,9.50103744 L15.7589006,10.3573923 L17.2211405,9.63575541 C17.3464224,9.31934178 17.4942934,9.0177639 17.6623696,8.73108554 L17.6628826,7.61965171 L15.7589006,6.6820836 Z M18.672869,7.20613073 L18.2399858,7.41803744 L18.2405347,7.89539028 C18.4198491,7.67328235 18.5952696,7.48547202 18.7579794,7.3311885 C18.7313256,7.29141009 18.7029522,7.24968413 18.672869,7.20613073 Z M6.20893517,5.3229573 C5.74936372,5.75999941 5.33815428,6.22362699 4.97762595,6.69162137 L5.32174877,6.90220825 L7.05998584,6.04503744 L7.05975864,4.5923903 C6.76884555,4.81620404 6.48520318,5.06023264 6.20893517,5.3229573 Z M9.31062813,3.33967853 L7.80298584,4.08203744 L7.80298584,6.04603744 L9.54162148,6.90220825 L11.2799858,6.04503744 L11.2799858,4.08303744 L9.58590325,3.24748744 C9.4935959,3.27632025 9.40183677,3.30706174 9.31062813,3.33967853 Z M13.7071325,3.25315279 L12.0229858,4.08203744 L12.0229858,6.04603744 L13.7614942,6.90220825 L15.4989858,6.04603744 L15.4996369,4.09263093 C15.4716509,4.07502419 15.4436034,4.05760087 15.4154945,4.04036219 L14.088653,3.38541509 C13.9625435,3.33770229 13.835368,3.29358497 13.7071325,3.25315279 Z M16.2431937,4.61398797 L16.2419858,6.04503744 L17.9813669,6.90220825 L18.3314498,6.73902411 L18.2672605,6.65271553 C17.9139955,6.19794525 17.5128808,5.74788524 17.066048,5.3229573 C16.7986408,5.06865909 16.5243247,4.83187689 16.2431937,4.61398797 Z M11.6374916,2.93393664 C11.2363934,2.93393664 10.8438564,2.96846745 10.4600274,3.03537564 L11.6509858,3.62203744 L12.8358702,3.03905496 C12.4453891,2.96973373 12.0458779,2.93393664 11.6374916,2.93393664 Z" id="path-1"></path>
+    </defs>
+    <g id="icon-/-Rendering-/-StaticMesh" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <mask id="mask-2" fill="white">
+            <use xlink:href="#path-1"></use>
+        </mask>
+        <use id="Combined-Shape" fill="#B29EDF" fill-rule="nonzero" xlink:href="#path-1"></use>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/MeshCollider.svg b/Assets/Editor/Icons/Components/MeshCollider.svg
new file mode 100644
index 0000000000..fa6709677c
--- /dev/null
+++ b/Assets/Editor/Icons/Components/MeshCollider.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Physics / Cry / MeshCollider</title>
+    <defs>
+        <path d="M21.4017278,2.55458948 C21.6565254,2.7943201 21.8126781,3.09535399 21.873713,3.44308416 C21.8903519,3.53789527 21.8960303,3.63278305 21.8933807,3.72897434 C21.8943391,4.16867858 21.7295219,4.54247893 21.4299066,4.85739135 C21.3224821,4.97029823 21.1966168,5.06610613 21.054496,5.13419531 C20.9948029,5.16279582 20.9715698,5.1972238 20.9715698,5.265543 C20.9732951,9.75421433 20.9732567,14.2428473 20.9719149,18.7315187 C20.9718765,18.7970775 20.9911608,18.8324639 21.0508922,18.8653583 C21.5132545,19.1198876 21.7904801,19.5097135 21.873368,20.0310404 C21.9576743,20.5611468 21.8055088,21.0257327 21.437766,21.4093094 C21.1897159,21.6680559 20.8803625,21.8258572 20.517412,21.8756589 C19.9918678,21.9477736 19.5412371,21.794803 19.1555135,21.4409386 C19.0379677,21.3331308 18.939016,21.2055019 18.8707352,21.0598923 C18.8386458,20.9914197 18.798007,20.9704869 18.7236303,20.970717 L17.3961982,20.9726003 L17.3961982,20.9726003 L16.068766,20.9724422 C12.4810494,20.9724422 8.89329444,20.9728256 5.3055778,20.9703719 C5.21429384,20.9702952 5.16736752,20.9962504 5.12021117,21.077298 C4.85786083,21.5279287 4.46999024,21.8000937 3.94858667,21.8748921 C3.41928537,21.9508407 2.95949177,21.79718 2.58304606,21.4285936 C2.09031968,20.9460653 1.9729272,20.2171738 2.25287491,19.6098536 C2.31594174,19.4730235 2.3915836,19.3441678 2.49463748,19.2327945 C2.55099507,19.1718746 2.5712378,19.1033254 2.57116112,19.0169488 L2.56913877,14.2727322 L2.56913877,14.2727322 L2.56901417,9.52851559 C2.56901417,8.01100117 2.56843909,6.49348675 2.57050937,4.97597232 C2.57062438,4.88702701 2.54509094,4.82204326 2.48570461,4.75399242 C2.25394839,4.48845999 2.13141855,4.1747744 2.11017902,3.82321037 C2.08594909,3.42245805 2.19080488,3.05755223 2.43766647,2.74014781 C2.74905175,2.33977887 3.16042383,2.12523664 3.66978912,2.10890444 C4.1004838,2.09510258 4.47819468,2.22993908 4.79697929,2.52265351 C4.83175231,2.55462782 4.87062755,2.57191848 4.91839732,2.56850635 C4.93748989,2.5671645 4.95673581,2.56831466 4.97590506,2.56831466 C9.65941264,2.56831466 14.3429202,2.56804629 19.0264661,2.57007823 C19.1169066,2.57011657 19.181507,2.53998251 19.2481777,2.48304984 C19.5214161,2.24979842 19.839894,2.12680852 20.1992024,2.10855939 C20.6642484,2.08490454 21.066726,2.23948536 21.4017278,2.55458948 Z M5.43746184,3.74137553 C5.44620512,3.86913295 5.44390624,3.9976441 5.4215958,4.12551457 C5.36193799,4.46755773 5.20791305,4.7633218 4.95872956,4.99939037 C4.62784162,5.31279174 4.22859027,5.46263348 3.76798522,5.44032304 C3.64079781,5.43418955 3.63179544,5.41922681 3.63153215,5.52189728 L3.6315599,18.4139944 L3.6315599,18.4139944 C3.6315599,18.4328376 3.63359497,18.4519447 3.63122072,18.4704865 C3.62292968,18.5357596 3.64833041,18.5582962 3.71552554,18.5557335 C3.86570645,18.5498544 4.0172064,18.5432592 4.16493769,18.5786846 C4.82241729,18.7364028 5.24333841,19.1380661 5.40260178,19.7988998 C5.42510065,19.8922494 5.46124206,19.9118466 5.55063456,19.9118466 L11.9991666,19.9099668 L11.9991666,19.9099668 L18.4947973,19.9101505 C18.5493674,19.9173487 18.5655727,19.8942845 18.578273,19.8396767 C18.7337301,19.1693836 19.142403,18.7436386 19.8157864,18.5859958 C19.9029177,18.5656074 19.9119248,18.5286745 19.9118871,18.4540929 L19.9105728,15.2274785 L19.9105728,15.2274785 L19.9105304,7.71440503 C19.9105304,6.98897657 19.9086084,6.2635858 19.9130258,5.53819502 C19.9135453,5.45128983 19.888333,5.42031148 19.8059879,5.40489768 C19.4741201,5.34294099 19.1930161,5.17896679 18.9690449,4.93227062 C18.6745999,4.60790245 18.5341044,4.22097461 18.553023,3.77842142 C18.5590576,3.63662576 18.576172,3.63012542 18.4673,3.63071589 L5.58142448,3.63084087 L5.58142448,3.63084087 C5.57200284,3.63084087 5.56235508,3.63212222 5.55315956,3.63061475 C5.4650484,3.61610543 5.43101744,3.64670691 5.43746184,3.74137553 Z M9.35789975,4.46855086 L9.35789975,6.97840081 C9.85924947,7.18134202 10.2595793,7.58167183 10.4625205,8.08302155 L12.7358213,8.08302155 C12.9387625,7.58167183 13.3390923,7.18134202 13.8404421,6.97840081 L13.8404421,4.46855086 L15.3404421,4.46855086 L15.3404421,6.97840081 C15.8417918,7.18134202 16.2421216,7.58167183 16.4450628,8.08302155 L19.160537,8.08302155 L19.160537,9.58302155 L16.4450628,9.58302155 C16.2421216,10.0843713 15.8417918,10.4847011 15.3404421,10.6876423 L15.3404421,12.741147 C15.8417918,12.9440882 16.2421216,13.344418 16.4450628,13.8457678 L19.2763345,13.8457678 L19.2763345,15.3457678 L16.4450628,15.3457678 C16.2421216,15.8471175 15.8417918,16.2474473 15.3404421,16.4503885 L15.3246535,19.0602275 L13.8246535,19.0602275 L13.8404421,16.4503885 C13.3390923,16.2474473 12.9387625,15.8471175 12.7358213,15.3457678 L10.4625205,15.3457678 C10.2595793,15.8471175 9.85924947,16.2474473 9.35789975,16.4503885 L9.3421112,19.0602275 L7.8421112,19.0602275 L7.85789975,16.4503885 C7.35655002,16.2474473 6.95622022,15.8471175 6.75327901,15.3457678 L4.4013749,15.3457678 L4.4013749,13.8457678 L6.75327901,13.8457678 C6.95622022,13.344418 7.35655002,12.9440882 7.85789975,12.741147 L7.85789975,10.6876423 C7.35655002,10.4847011 6.95622022,10.0843713 6.75327901,9.58302155 L4.28557734,9.58302155 L4.28557734,8.08302155 L6.75327901,8.08302155 C6.95622022,7.58167183 7.35655002,7.18134202 7.85789975,6.97840081 L7.85789975,4.46855086 L9.35789975,4.46855086 Z M12.7358213,9.58302155 L10.4625205,9.58302155 C10.2595793,10.0843713 9.85924947,10.4847011 9.35789975,10.6876423 L9.35789975,12.741147 C9.85924947,12.9440882 10.2595793,13.344418 10.4625205,13.8457678 L12.7358213,13.8457678 C12.9387625,13.344418 13.3390923,12.9440882 13.8404421,12.741147 L13.8404421,10.6876423 C13.3390923,10.4847011 12.9387625,10.0843713 12.7358213,9.58302155 Z" id="path-1"></path>
+    </defs>
+    <g id="icon-/-Physics-/-Cry-/-MeshCollider" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <mask id="mask-2" fill="white">
+            <use xlink:href="#path-1"></use>
+        </mask>
+        <use id="Combined-Shape" fill="#DD7F6D" xlink:href="#path-1"></use>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/MotionParameterSmoothing.svg b/Assets/Editor/Icons/Components/MotionParameterSmoothing.svg
deleted file mode 100644
index d93d57d23a..0000000000
--- a/Assets/Editor/Icons/Components/MotionParameterSmoothing.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
-    <title>icon / Animation / Motion Parameter Smoothing</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <path d="M9.73144295,9.98858946 C9.718234,10.028336 9.13719021,11.4044505 9.0487402,11.6801562 C8.90630529,12.124137 8.77651671,12.4628826 8.58963604,12.8764199 C8.6064295,12.9532405 8.61246975,13.0334356 8.6063168,13.1154725 C8.56967363,13.604034 8.11453892,13.9717958 7.59042801,13.9376264 C7.06631709,13.903457 6.67050915,13.4802182 6.70715233,12.9916567 C6.72540815,12.7482528 6.84753718,12.5348323 7.03031875,12.3861598 C7.06088312,11.9927404 7.17705762,11.5228239 7.35290074,11.0167286 C7.46376758,10.6976421 7.58190599,10.4072531 7.70789749,10.157899 C7.74133315,10.0576846 8.58963604,8.21140132 8.93594182,7.49431045 C9.38504859,6.63766033 9.89282219,6.78038294 10.4875183,6.55927169 C10.4763282,6.52523245 10.4952442,6.34770097 10.4875183,6.31228923 C9.55412593,5.86933793 9.0487402,5.32189513 9.0487402,4.07765422 C9.0487402,2.47622853 9.88382134,1.59563779 11.3290516,1.59563779 C12.774282,1.59563779 13.8371767,2.47622853 13.8371767,4.07765422 C13.8371767,5.35918237 13.1619726,5.93706838 12.1785492,6.35024088 C12.1766966,6.35744657 12.1805491,6.66312706 12.1785492,6.67027496 C13.2707293,7.03259668 13.2162089,7.70331377 13.3665182,8.80509401 C13.6448978,9.35086655 13.7413384,9.61560342 13.8371767,9.81461311 C13.8806257,9.82412564 15.1237141,10.0803278 15.1673971,10.0942428 C15.6469031,10.2469873 16.0631891,10.3309713 16.3935717,10.4773174 C16.4745958,10.4563398 16.5599807,10.4451278 16.6481869,10.4451278 C17.1734883,10.4451278 17.5987303,10.8427764 17.5987303,11.3326141 C17.5987303,11.8224519 17.1734883,12.2201004 16.6481869,12.2201004 C16.3864789,12.2201004 16.1496065,12.1214006 15.9777814,11.9617738 C15.5547031,11.9607907 15.2649152,11.9348547 14.7111431,11.8066136 C14.3619969,11.7257592 13.8219371,11.5868065 13.5463474,11.487021 C13.4367888,11.4629145 12.8294302,11.1801472 12.819149,11.1753899 C12.818257,11.7572801 12.6711267,12.0998861 12.5152763,12.724997 C12.7065885,12.9728886 12.7592437,13.2679845 12.819149,13.6028055 C12.8790544,13.9376264 13.4471856,15.1041445 13.6959428,15.5232895 C13.9295848,15.916966 14.2104815,16.5197875 14.3671433,16.6421718 C14.6257913,16.7999051 14.8090692,17.0563462 14.8558231,17.354086 C15.0470763,17.8054384 15.1811891,18.402387 15.2624568,19.077482 C15.3294924,19.6343497 15.3624051,20.5707953 15.3892643,20.5653762 C16.4403784,20.3533022 17.2740779,20.3734708 17.4844439,20.8896734 C17.7415253,21.5205077 16.9867087,21.8783283 15.8587175,22.105913 C15.3296153,22.2126653 14.4116148,22.2231309 14.3721958,22.2231309 C13.8887942,22.2231309 13.4975187,21.8572449 13.4975187,21.4065881 C13.4975187,21.3492124 13.503861,21.2932108 13.5159283,21.2391635 C13.2801856,20.7727066 13.1192327,20.1055689 13.0267365,19.3371985 C12.9901295,19.0331025 12.9677732,18.741897 12.9614377,18.4695337 C12.7603854,18.3819239 12.4978032,17.8078181 12.3291221,17.5545128 C12.1087272,17.22355 11.9685701,17.1188681 11.8098797,16.5862588 C11.649158,16.0468322 11.5380786,15.5330744 11.4942671,15.0959177 C11.4184348,15.1105258 11.340738,15.1204348 11.2615674,15.1253004 C11.1940117,15.5015036 11.0976692,15.9158121 10.9784443,16.3510807 C10.806841,16.9775737 10.611648,17.5278624 10.4281292,17.9052319 C10.325985,18.1152708 10.2271132,18.2745936 10.1201124,18.3864435 C9.98310338,18.5296615 9.79730531,18.6209796 9.61143836,18.6151295 C9.42472497,18.8972898 9.19616986,19.1945606 8.93594182,19.498524 C8.5609983,19.9364826 8.18504823,20.3123707 7.82812398,20.5931793 C7.85103449,20.606664 7.87404324,20.6203475 7.8971456,20.6342227 C8.80123865,21.1772183 9.37545675,21.741102 9.13270478,22.2447976 C8.8360455,22.8603477 8.03092794,22.6157467 7.06071076,22.0330372 C6.60561493,21.759708 5.94855313,21.1619099 5.92067971,21.1359227 C5.57886319,20.8172367 5.57968835,20.300565 5.92147968,19.9819026 C5.96499507,19.9413318 6.01195299,19.9059139 6.06147693,19.8756521 C6.24855626,19.3904023 6.64072227,18.8125553 7.15807225,18.2082566 C7.48683106,17.8242448 7.81636372,17.4879538 8.13316609,17.2216356 C8.39166115,16.9587461 8.49345166,16.8558938 8.77651671,16.5862588 C8.84477422,16.2109821 8.88051338,15.765231 8.99937047,15.331305 C9.09745729,14.9732076 9.02578919,14.9734027 9.13270478,14.6831608 C8.78604581,13.9133589 9.38971329,12.6650792 9.73144295,12.3861598 C9.73144295,12.0998861 9.73144295,11.3326141 9.73144295,11.0159084 C9.73144295,10.5385265 9.73144295,10.157899 9.73144295,9.98858946 Z" id="path-1"></path>
-    </defs>
-    <g id="icon-/-Animation-/-Motion-Parameter-Smoothing" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <mask id="mask-2" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <use id="Path" fill="#5AA9D2" fill-rule="nonzero" xlink:href="#path-1"></use>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/Navigation.svg b/Assets/Editor/Icons/Components/Navigation.svg
index 9b18153695..d47ab2b854 100644
--- a/Assets/Editor/Icons/Components/Navigation.svg
+++ b/Assets/Editor/Icons/Components/Navigation.svg
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
     <title>icon / AI / Navigation </title>
-    <desc>Created with Sketch.</desc>
     <defs>
-        <path d="M11.9996038,21.3203679 C6.85209459,21.3203679 2.67921387,17.1474872 2.67921387,11.999978 C2.67921387,6.85246872 6.85209459,2.679588 11.9996038,2.679588 C17.1471131,2.679588 21.3199938,6.85246872 21.3199938,11.999978 C21.3199938,17.1474872 17.1471131,21.3203679 11.9996038,21.3203679 Z M11.9996038,20.284769 C16.5751676,20.284769 20.2843949,16.5755417 20.2843949,11.999978 C20.2843949,7.42441419 16.5751676,3.71518688 11.9996038,3.71518688 C7.42404006,3.71518688 3.71481276,7.42441419 3.71481276,11.999978 C3.71481276,16.5755417 7.42404006,20.284769 11.9996038,20.284769 Z M16.1789855,7.98940493 L11.8219983,17.7926263 L11.2773748,12.8910156 L6.37576417,12.3463922 L16.1789855,7.98940493 Z" id="path-1"></path>
+        <path d="M11.9996038,2.679588 C17.1471131,2.679588 21.3199938,6.85246872 21.3199938,11.999978 C21.3199938,17.1474872 17.1471131,21.3203679 11.9996038,21.3203679 C6.85209459,21.3203679 2.67921387,17.1474872 2.67921387,11.999978 C2.67921387,6.85246872 6.85209459,2.679588 11.9996038,2.679588 Z M11.9996038,3.71518688 C7.42404006,3.71518688 3.71481276,7.42441419 3.71481276,11.999978 C3.71481276,16.5755417 7.42404006,20.284769 11.9996038,20.284769 C16.5751676,20.284769 20.2843949,16.5755417 20.2843949,11.999978 C20.2843949,7.42441419 16.5751676,3.71518688 11.9996038,3.71518688 Z M16.1789855,7.98940493 L11.8219983,17.7926263 L11.2773748,12.8910156 L6.37576417,12.3463922 L16.1789855,7.98940493 Z" id="path-1"></path>
     </defs>
     <g id="icon-/-AI-/-Navigation-" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <mask id="mask-2" fill="white">
diff --git a/Assets/Editor/Icons/Components/NavigationArea.svg b/Assets/Editor/Icons/Components/NavigationArea.svg
index b8751f7079..adf8b35315 100644
--- a/Assets/Editor/Icons/Components/NavigationArea.svg
+++ b/Assets/Editor/Icons/Components/NavigationArea.svg
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
-    <title>icon / AI / Navigation Area</title>
-    <desc>Created with Sketch.</desc>
+    <title>icon / AI / NavigationArea</title>
     <defs>
-        <path d="M20.7255907,11.98644 C20.6698294,11.98644 20.614135,11.986373 20.5584406,11.98644 C20.048288,11.987511 20.048288,11.987511 20.0328248,12.4954546 C20.0150856,13.0828563 20.0150856,13.0828563 20.7250552,13.1908312 C21.3362208,13.2838783 21.3406389,13.2802635 21.3679505,12.6685624 C21.3984754,11.9846326 21.3984754,11.9846326 20.7255907,11.98644 M3.30502783,12.0733955 C3.39379077,12.0733955 3.48429416,12.0618818 3.57084806,12.0754707 C3.87141034,12.1224628 3.98480733,12.0283446 4.00154242,11.6971906 C4.03936374,10.9485964 4.06312757,10.9498013 3.28769028,10.8601012 C2.7409213,10.7968426 2.7409213,10.7968426 2.67264212,11.3264079 C2.57564552,12.0780813 2.57564552,12.0780813 3.30502783,12.0733955 M6.78960899,18.158811 C6.74837372,18.0035093 6.61703671,17.944334 6.51937071,17.8609263 C6.3354855,17.7038842 6.20066759,17.3809639 5.9888013,17.4008452 C5.78891735,17.4196554 5.61179312,17.6844715 5.425565,17.84225 C4.98248666,18.2175847 4.98275442,18.2178524 5.40869602,18.6417858 C5.93785968,19.1684057 5.93819438,19.1687404 6.41614865,18.6199632 C6.51127092,18.5107835 6.60364864,18.3991939 6.69562471,18.2873365 C6.73029982,18.2450971 6.76035605,18.1991091 6.78960899,18.158811 M5.8705846,6.81074413 C5.76361389,6.6294696 5.60021243,6.52925986 5.45702697,6.40957047 C4.84927532,5.90182773 4.84860592,5.90256408 4.39126928,6.55302369 C4.07952796,6.99630285 4.0757793,7.00239442 4.54603543,7.28635549 C4.76319,7.41749168 4.97097292,7.67963018 5.20104698,7.64448649 C5.43808285,7.60833868 5.50140844,7.25911075 5.67833185,7.07576107 C5.75323813,6.9980433 5.80699125,6.89990871 5.8705846,6.81074413 M17.1426072,19.8334583 C17.1656347,19.8221454 17.1983685,19.8119035 17.2242075,19.7925578 C17.4991986,19.5871847 17.7714451,19.3781299 18.0480427,19.1748989 C18.1619752,19.0912235 18.1309818,19.0231451 18.0524608,18.9350516 C17.8385863,18.6953381 17.6282596,18.4521437 17.4226188,18.2053346 C17.3358641,18.1013092 17.2678527,18.0899294 17.1467575,18.1695884 C16.3353063,18.7037726 16.3332312,18.7006264 16.8646038,19.5152238 C16.9130687,19.5893937 16.962136,19.663229 17.0100653,19.7378005 C17.0402554,19.7848596 17.0711149,19.8301113 17.1426072,19.8334583 M4.16086051,9.78470412 C4.26046779,9.81134639 4.30029731,9.75371073 4.32955026,9.67224429 C4.42293208,9.41198012 4.51464039,9.15091266 4.61585424,8.89359386 C4.66525623,8.76801372 4.61170393,8.70857067 4.50694225,8.66231487 C4.22338282,8.53700249 3.9394887,8.41235951 3.65787055,8.28276295 C3.52519472,8.22178027 3.42572133,8.2264661 3.3696253,8.38223635 C3.26466279,8.67369473 3.1547467,8.96341267 3.05092218,9.25533964 C3.01524296,9.35561632 3.00613907,9.45803509 3.13961817,9.49659275 C3.47967527,9.59479428 3.82080342,9.68938103 4.16086051,9.78470412 M6.66088266,5.97378864 C6.74569611,5.93034433 6.77742585,5.91956693 6.80266237,5.90022117 C7.03213397,5.72450268 7.25778997,5.54356285 7.49034083,5.37206162 C7.59952058,5.29153235 7.58445899,5.21722853 7.51885743,5.11996417 C7.33845312,4.85260431 7.15764717,4.58517752 6.98889049,4.31045423 C6.91137353,4.18427162 6.84423234,4.1688084 6.72849243,4.26044977 C6.48442783,4.45370663 6.23440553,4.63966699 5.98458406,4.82549346 C5.86897803,4.91151184 5.82031238,4.9862173 5.94529006,5.11621551 C6.16873703,5.34856554 6.37705547,5.5957094 6.58818541,5.83970707 C6.62373075,5.88080846 6.64160383,5.93723919 6.66088266,5.97378864 M15.8602974,20.3721945 C15.7177144,20.0788617 15.6079991,19.6742072 15.3560356,19.4003541 C15.2012694,19.232066 14.9078028,19.5431379 14.6602573,19.5836369 C14.5844808,19.5960878 14.5134571,19.6349132 14.4388186,19.6568027 C14.3145772,19.6933521 14.2977752,19.7643089 14.3359982,19.8834628 C14.4346013,20.1903175 14.5244353,20.5001845 14.6094496,20.8111225 C14.6407777,20.9257244 14.6845567,21.0008315 14.8148896,20.952032 C15.1375422,20.8312046 15.458856,20.7068963 15.7805714,20.583726 C15.8488506,20.5575524 15.8973154,20.5177898 15.8602974,20.3721945 M9.17295407,3.06964746 C9.04462937,3.11463139 8.88638232,3.16764816 8.72987573,3.22535077 C8.05250609,3.47530612 8.05263997,3.47577471 8.34121992,4.11304706 C8.35956158,4.15354599 8.37924205,4.19350939 8.39798536,4.23394138 C8.61761672,4.70774535 8.61714814,4.70660736 9.09316114,4.52084782 C9.22777823,4.46829963 9.36326555,4.4138771 9.50303705,4.37960363 C9.66704096,4.33930553 9.68558345,4.24384856 9.64300937,4.10534892 C9.55163576,3.80766508 9.46608596,3.50810691 9.36975876,3.21202963 C9.34606187,3.13906463 9.3409744,3.01897359 9.17295407,3.06964746 M15.9313211,3.47296321 C15.8841951,3.50810691 15.8357972,3.52544446 15.8209365,3.55804443 C15.6606143,3.91155654 15.4187587,4.25877626 15.3821423,4.62594421 C15.3607883,4.839484 15.8024609,4.87643509 16.008972,5.035954 C16.0439149,5.06293097 16.0880286,5.07805949 16.1226367,5.10537117 C16.2614711,5.21461786 16.3563925,5.17907252 16.442344,5.03146899 C16.5653134,4.82013823 16.6815219,4.5995697 16.8378277,4.41434569 C17.0605383,4.15046673 16.9921922,4.00902172 16.7020726,3.87996068 C16.4394655,3.76314973 16.19192,3.61226613 15.9313211,3.47296321 M19.9081818,14.2796163 C19.7957889,14.251903 19.7212843,14.2724537 19.6788441,14.3999082 C19.5915538,14.6621136 19.4898714,14.9195663 19.3906658,15.1776884 C19.3566601,15.2660497 19.3723241,15.3235515 19.4630953,15.3631802 C19.8163396,15.5178124 20.1836415,15.8456864 20.5185441,15.7737924 C20.7997607,15.7133453 20.8053167,15.1981722 20.9344447,14.885092 C20.9470964,14.8545003 20.9563342,14.8223689 20.9657728,14.7906392 C21.0029916,14.6651929 20.9795625,14.5818521 20.8336994,14.5437631 C20.5233639,14.4626313 20.2165092,14.3684462 19.9081818,14.2796163 M18.8275634,16.3603909 C18.6792235,16.4082533 18.63598,16.5459496 18.5669645,16.6513138 C18.4336862,16.8544109 18.1441691,17.0198205 18.1686693,17.2402552 C18.194776,17.476287 18.5059818,17.5957755 18.6922099,17.7654024 C19.1101187,18.1460254 19.1156078,18.1400008 19.4631622,17.6914333 C19.9430578,17.0719671 19.9431916,17.0716993 19.2778043,16.6435487 C19.1289289,16.5478909 18.9781792,16.4550446 18.8275634,16.3603909 M4.64510718,15.4515415 C4.31770181,15.6084497 3.96559544,15.774261 3.6168361,15.9468333 C3.53905138,15.985324 3.56234663,16.0600964 3.59641928,16.1209452 C3.76497514,16.4215075 3.93513757,16.7211995 4.10536694,17.0208916 C4.15249297,17.1038307 4.21842924,17.1250508 4.29889157,17.0684862 C4.61538565,16.8462442 5.0722537,16.7262201 5.21570693,16.3893761 C5.31203412,16.1632515 4.94834707,15.8659693 4.82979567,15.5804017 C4.81714394,15.5498769 4.79391563,15.523971 4.77898793,15.4941825 C4.7555588,15.4476589 4.71987958,15.4326643 4.64510718,15.4515415 M8.71119937,19.4892509 C8.74714635,19.3153398 8.64318795,19.2951239 8.56948659,19.2546919 C8.36511763,19.1425667 8.1515109,19.0454363 7.95564337,18.9203247 C7.79163945,18.815563 7.70983831,18.8567313 7.62100844,19.0149784 C7.47983119,19.2666073 7.32124944,19.5087975 7.16173053,19.7495151 C7.07597991,19.8788439 7.04264361,19.9711547 7.2200356,20.0569053 C7.49964554,20.1920579 7.7676748,20.3509744 8.04507571,20.4910136 C8.10304607,20.5201996 8.1946205,20.6086948 8.24609765,20.5030629 C8.41592538,20.1539688 8.57095928,19.7977122 8.71119937,19.4892509 M2.77111141,13.5845744 C2.80638899,13.7476412 2.83825261,13.9115112 2.87734579,14.0735739 C3.07528847,14.8936604 2.98893539,14.7319324 3.67688161,14.535931 C4.29922627,14.3586729 4.29621395,14.3482302 4.17217344,13.7221369 C4.14834266,13.6021128 4.11989301,13.4826912 4.10349261,13.3615961 C4.08762775,13.2447851 4.03139783,13.2188122 3.92007599,13.2380911 C3.59146569,13.2951912 3.26158353,13.3461328 2.93129973,13.3927903 C2.81207892,13.4096592 2.74098824,13.4499573 2.77111141,13.5845744 M20.1947536,10.8061473 C20.3373366,10.7823165 20.479384,10.7542685 20.6227034,10.7353913 C21.3062985,10.6453565 21.3063654,10.6462267 21.1708111,9.98592688 C21.0337842,9.31839747 21.0339181,9.31866524 20.3975829,9.51165433 C20.2592171,9.55362595 20.1221902,9.60724519 19.9804774,9.62933551 C19.7459184,9.66581801 19.732865,9.7997657 19.7824009,9.98914002 C19.8330078,10.1823969 19.8763851,10.3784652 19.9081818,10.5756046 C19.9357613,10.7472398 20.0005595,10.8489891 20.1947536,10.8061473 M13.1097175,3.8620876 C13.0564329,3.99375932 13.1366944,4.05139498 13.2649522,4.07582822 C13.4175762,4.1048134 13.5717399,4.12710454 13.7232929,4.16084249 C14.2143006,4.27029 14.2139659,4.27182963 14.3528671,3.77064705 C14.3558125,3.75986965 14.3587579,3.74915919 14.3617702,3.73851567 C14.5814685,2.96314532 14.5838114,2.95049359 13.7941828,2.80382723 C13.2294738,2.69893167 13.2663579,2.58332564 13.2003547,3.21899143 C13.1785991,3.42878256 13.1419158,3.63703407 13.1097175,3.8620876 M10.9618017,20.1982164 C11.0145507,20.0326729 10.9607306,19.9631218 10.8215616,19.9374167 C10.5598247,19.8890858 10.2988242,19.8362029 10.0389617,19.7784334 C9.91820125,19.7516572 9.86069947,19.7934949 9.8135065,19.9063564 C9.35436248,21.0045802 9.39117968,21.0733949 10.5604941,21.2579495 C10.5823836,21.2614304 10.6040723,21.2672542 10.6252924,21.2738813 C10.787422,21.3244882 10.8433842,21.2521926 10.8577763,21.0958868 C10.8862929,20.7863546 10.9285992,20.4780941 10.9618017,20.1982164 M18.1444368,4.91733566 C18.0459006,4.91666625 18.0098867,4.97791669 17.9673126,5.02671623 C17.8798885,5.12699291 17.7971502,5.23128601 17.7093244,5.33122799 C17.2399385,5.86527829 17.2396038,5.86501053 17.72211,6.35842802 C18.0472394,6.69092086 18.0472394,6.69092086 18.4046341,6.38861813 C19.0998099,5.80068083 19.1002784,5.80014531 18.4322805,5.16775959 C18.336288,5.07678763 18.2326643,4.99378156 18.1444368,4.91733566 M12.0086822,20.6726229 C12.0086822,21.3835966 12.0086822,21.3835966 12.4905859,21.3681333 C13.3944149,21.3391482 13.3944149,21.3391482 13.2344274,20.4444901 C13.1439909,19.939358 13.1430538,19.9329987 12.6205841,20.0128585 C12.4263901,20.0425801 12.1724853,19.9402952 12.0509885,20.0905763 C11.9250067,20.2464804 12.0291659,20.4968374 12.0086822,20.6726229 M20.4858103,7.98106269 C20.3180577,7.64549059 20.1463557,7.28414645 19.9045001,6.96383677 C19.8494751,6.8909387 19.7826017,6.96430535 19.7315931,6.99710613 C19.4606854,7.17121804 19.1964718,7.35624124 18.9209452,7.52252113 C18.7813076,7.60679906 18.7754168,7.68270944 18.8578874,7.81284153 C19.0174063,8.06453733 19.1066378,8.4534609 19.3274741,8.54918564 C19.5783666,8.65803069 19.8828114,8.35934274 20.1669733,8.2455441 C20.249243,8.21267638 20.3266261,8.16775939 20.4070215,8.13020584 C20.4609754,8.10503626 20.5021438,8.07350734 20.4858103,7.98106269 M11.9775549,3.32850588 C11.9736054,2.5971823 11.9736054,2.5971823 11.3481815,2.64618265 C10.6416928,2.70160928 10.6417597,2.70154234 10.7259038,3.39404051 C10.731259,3.43822116 10.7316607,3.48300427 10.7373506,3.52705103 C10.8086421,4.07837195 10.808776,4.07837195 11.3675942,4.00031948 C11.3785724,3.99877985 11.3892829,3.99536589 11.4003281,3.9938932 C11.980768,3.91697871 11.980768,3.91697871 11.9775549,3.32850588 M11.6454637,17.8755193 C11.6702986,17.8785986 11.6950665,17.8817448 11.7198345,17.884891 C13.179871,14.5990558 14.6399744,11.3132206 16.1000109,8.02738542 C16.0789916,8.00890988 16.0579054,7.99043434 16.0368192,7.97189185 C12.7533938,9.43125894 9.4699685,10.8905591 6.18661011,12.3499262 C6.52044175,12.4640595 6.83800689,12.5023494 7.15597366,12.5372254 C8.4060182,12.6743862 9.6559958,12.8122164 10.9065759,12.9447583 C11.0601371,12.9610918 11.1114134,13.034927 11.1265419,13.1795182 C11.2373283,14.2421297 11.3526665,15.3042726 11.4695444,16.3662817 C11.5249041,16.8696733 11.5866901,17.3724624 11.6454637,17.8755193" id="path-1"></path>
+        <path d="M20.7255907,11.98644 C20.6698294,11.98644 20.614135,11.986373 20.5584406,11.98644 C20.048288,11.987511 20.048288,11.987511 20.0328248,12.4954546 C20.0150856,13.0828563 20.0150856,13.0828563 20.7250552,13.1908312 C21.3362208,13.2838783 21.3406389,13.2802635 21.3679505,12.6685624 C21.3984754,11.9846326 21.3984754,11.9846326 20.7255907,11.98644 M3.30502783,12.0733955 C3.39379077,12.0733955 3.48429416,12.0618818 3.57084806,12.0754707 C3.87141034,12.1224628 3.98480733,12.0283446 4.00154242,11.6971906 C4.03936374,10.9485964 4.06312757,10.9498013 3.28769028,10.8601012 C2.7409213,10.7968426 2.7409213,10.7968426 2.67264212,11.3264079 C2.57564552,12.0780813 2.57564552,12.0780813 3.30502783,12.0733955 M6.78960899,18.158811 C6.74837372,18.0035093 6.61703671,17.944334 6.51937071,17.8609263 C6.3354855,17.7038842 6.20066759,17.3809639 5.9888013,17.4008452 C5.78891735,17.4196554 5.61179312,17.6844715 5.425565,17.84225 C4.98248666,18.2175847 4.98275442,18.2178524 5.40869602,18.6417858 C5.93785968,19.1684057 5.93819438,19.1687404 6.41614865,18.6199632 C6.51127092,18.5107835 6.60364864,18.3991939 6.69562471,18.2873365 C6.73029982,18.2450971 6.76035605,18.1991091 6.78960899,18.158811 M5.8705846,6.81074413 C5.76361389,6.6294696 5.60021243,6.52925986 5.45702697,6.40957047 C4.84927532,5.90182773 4.84860592,5.90256408 4.39126928,6.55302369 C4.07952796,6.99630285 4.0757793,7.00239442 4.54603543,7.28635549 C4.76319,7.41749168 4.97097292,7.67963018 5.20104698,7.64448649 C5.43808285,7.60833868 5.50140844,7.25911075 5.67833185,7.07576107 C5.75323813,6.9980433 5.80699125,6.89990871 5.8705846,6.81074413 M17.1426072,19.8334583 C17.1656347,19.8221454 17.1983685,19.8119035 17.2242075,19.7925578 C17.4991986,19.5871847 17.7714451,19.3781299 18.0480427,19.1748989 C18.1619752,19.0912235 18.1309818,19.0231451 18.0524608,18.9350516 C17.8385863,18.6953381 17.6282596,18.4521437 17.4226188,18.2053346 C17.3358641,18.1013092 17.2678527,18.0899294 17.1467575,18.1695884 C16.3353063,18.7037726 16.3332312,18.7006264 16.8646038,19.5152238 C16.9130687,19.5893937 16.962136,19.663229 17.0100653,19.7378005 C17.0402554,19.7848596 17.0711149,19.8301113 17.1426072,19.8334583 M4.16086051,9.78470412 C4.26046779,9.81134639 4.30029731,9.75371073 4.32955026,9.67224429 C4.42293208,9.41198012 4.51464039,9.15091266 4.61585424,8.89359386 C4.66525623,8.76801372 4.61170393,8.70857067 4.50694225,8.66231487 C4.22338282,8.53700249 3.9394887,8.41235951 3.65787055,8.28276295 C3.52519472,8.22178027 3.42572133,8.2264661 3.3696253,8.38223635 C3.26466279,8.67369473 3.1547467,8.96341267 3.05092218,9.25533964 C3.01524296,9.35561632 3.00613907,9.45803509 3.13961817,9.49659275 C3.47967527,9.59479428 3.82080342,9.68938103 4.16086051,9.78470412 M6.66088266,5.97378864 C6.74569611,5.93034433 6.77742585,5.91956693 6.80266237,5.90022117 C7.03213397,5.72450268 7.25778997,5.54356285 7.49034083,5.37206162 C7.59952058,5.29153235 7.58445899,5.21722853 7.51885743,5.11996417 C7.33845312,4.85260431 7.15764717,4.58517752 6.98889049,4.31045423 C6.91137353,4.18427162 6.84423234,4.1688084 6.72849243,4.26044977 C6.48442783,4.45370663 6.23440553,4.63966699 5.98458406,4.82549346 C5.86897803,4.91151184 5.82031238,4.9862173 5.94529006,5.11621551 C6.16873703,5.34856554 6.37705547,5.5957094 6.58818541,5.83970707 C6.62373075,5.88080846 6.64160383,5.93723919 6.66088266,5.97378864 M15.8602974,20.3721945 C15.7177144,20.0788617 15.6079991,19.6742072 15.3560356,19.4003541 C15.2012694,19.232066 14.9078028,19.5431379 14.6602573,19.5836369 C14.5844808,19.5960878 14.5134571,19.6349132 14.4388186,19.6568027 C14.3145772,19.6933521 14.2977752,19.7643089 14.3359982,19.8834628 C14.4346013,20.1903175 14.5244353,20.5001845 14.6094496,20.8111225 C14.6407777,20.9257244 14.6845567,21.0008315 14.8148896,20.952032 C15.1375422,20.8312046 15.458856,20.7068963 15.7805714,20.583726 C15.8488506,20.5575524 15.8973154,20.5177898 15.8602974,20.3721945 M9.17295407,3.06964746 C9.04462937,3.11463139 8.88638232,3.16764816 8.72987573,3.22535077 C8.05250609,3.47530612 8.05263997,3.47577471 8.34121992,4.11304706 C8.35956158,4.15354599 8.37924205,4.19350939 8.39798536,4.23394138 C8.61761672,4.70774535 8.61714814,4.70660736 9.09316114,4.52084782 C9.22777823,4.46829963 9.36326555,4.4138771 9.50303705,4.37960363 C9.66704096,4.33930553 9.68558345,4.24384856 9.64300937,4.10534892 C9.55163576,3.80766508 9.46608596,3.50810691 9.36975876,3.21202963 C9.34606187,3.13906463 9.3409744,3.01897359 9.17295407,3.06964746 M15.9313211,3.47296321 C15.8841951,3.50810691 15.8357972,3.52544446 15.8209365,3.55804443 C15.6606143,3.91155654 15.4187587,4.25877626 15.3821423,4.62594421 C15.3607883,4.839484 15.8024609,4.87643509 16.008972,5.035954 C16.0439149,5.06293097 16.0880286,5.07805949 16.1226367,5.10537117 C16.2614711,5.21461786 16.3563925,5.17907252 16.442344,5.03146899 C16.5653134,4.82013823 16.6815219,4.5995697 16.8378277,4.41434569 C17.0605383,4.15046673 16.9921922,4.00902172 16.7020726,3.87996068 C16.4394655,3.76314973 16.19192,3.61226613 15.9313211,3.47296321 M19.9081818,14.2796163 C19.7957889,14.251903 19.7212843,14.2724537 19.6788441,14.3999082 C19.5915538,14.6621136 19.4898714,14.9195663 19.3906658,15.1776884 C19.3566601,15.2660497 19.3723241,15.3235515 19.4630953,15.3631802 C19.8163396,15.5178124 20.1836415,15.8456864 20.5185441,15.7737924 C20.7997607,15.7133453 20.8053167,15.1981722 20.9344447,14.885092 C20.9470964,14.8545003 20.9563342,14.8223689 20.9657728,14.7906392 C21.0029916,14.6651929 20.9795625,14.5818521 20.8336994,14.5437631 C20.5233639,14.4626313 20.2165092,14.3684462 19.9081818,14.2796163 M18.8275634,16.3603909 C18.6792235,16.4082533 18.63598,16.5459496 18.5669645,16.6513138 C18.4336862,16.8544109 18.1441691,17.0198205 18.1686693,17.2402552 C18.194776,17.476287 18.5059818,17.5957755 18.6922099,17.7654024 C19.1101187,18.1460254 19.1156078,18.1400008 19.4631622,17.6914333 C19.9430578,17.0719671 19.9431916,17.0716993 19.2778043,16.6435487 C19.1289289,16.5478909 18.9781792,16.4550446 18.8275634,16.3603909 M4.64510718,15.4515415 C4.31770181,15.6084497 3.96559544,15.774261 3.6168361,15.9468333 C3.53905138,15.985324 3.56234663,16.0600964 3.59641928,16.1209452 C3.76497514,16.4215075 3.93513757,16.7211995 4.10536694,17.0208916 C4.15249297,17.1038307 4.21842924,17.1250508 4.29889157,17.0684862 C4.61538565,16.8462442 5.0722537,16.7262201 5.21570693,16.3893761 C5.31203412,16.1632515 4.94834707,15.8659693 4.82979567,15.5804017 C4.81714394,15.5498769 4.79391563,15.523971 4.77898793,15.4941825 C4.7555588,15.4476589 4.71987958,15.4326643 4.64510718,15.4515415 M8.71119937,19.4892509 C8.74714635,19.3153398 8.64318795,19.2951239 8.56948659,19.2546919 C8.36511763,19.1425667 8.1515109,19.0454363 7.95564337,18.9203247 C7.79163945,18.815563 7.70983831,18.8567313 7.62100844,19.0149784 C7.47983119,19.2666073 7.32124944,19.5087975 7.16173053,19.7495151 C7.07597991,19.8788439 7.04264361,19.9711547 7.2200356,20.0569053 C7.49964554,20.1920579 7.7676748,20.3509744 8.04507571,20.4910136 C8.10304607,20.5201996 8.1946205,20.6086948 8.24609765,20.5030629 C8.41592538,20.1539688 8.57095928,19.7977122 8.71119937,19.4892509 M2.77111141,13.5845744 C2.80638899,13.7476412 2.83825261,13.9115112 2.87734579,14.0735739 C3.07528847,14.8936604 2.98893539,14.7319324 3.67688161,14.535931 C4.29922627,14.3586729 4.29621395,14.3482302 4.17217344,13.7221369 C4.14834266,13.6021128 4.11989301,13.4826912 4.10349261,13.3615961 C4.08762775,13.2447851 4.03139783,13.2188122 3.92007599,13.2380911 C3.59146569,13.2951912 3.26158353,13.3461328 2.93129973,13.3927903 C2.81207892,13.4096592 2.74098824,13.4499573 2.77111141,13.5845744 M20.1947536,10.8061473 C20.3373366,10.7823165 20.479384,10.7542685 20.6227034,10.7353913 C21.3062985,10.6453565 21.3063654,10.6462267 21.1708111,9.98592688 C21.0337842,9.31839747 21.0339181,9.31866524 20.3975829,9.51165433 C20.2592171,9.55362595 20.1221902,9.60724519 19.9804774,9.62933551 C19.7459184,9.66581801 19.732865,9.7997657 19.7824009,9.98914002 C19.8330078,10.1823969 19.8763851,10.3784652 19.9081818,10.5756046 C19.9357613,10.7472398 20.0005595,10.8489891 20.1947536,10.8061473 M13.1097175,3.8620876 C13.0564329,3.99375932 13.1366944,4.05139498 13.2649522,4.07582822 C13.4175762,4.1048134 13.5717399,4.12710454 13.7232929,4.16084249 C14.2143006,4.27029 14.2139659,4.27182963 14.3528671,3.77064705 C14.3558125,3.75986965 14.3587579,3.74915919 14.3617702,3.73851567 C14.5814685,2.96314532 14.5838114,2.95049359 13.7941828,2.80382723 C13.2294738,2.69893167 13.2663579,2.58332564 13.2003547,3.21899143 C13.1785991,3.42878256 13.1419158,3.63703407 13.1097175,3.8620876 M10.9618017,20.1982164 C11.0145507,20.0326729 10.9607306,19.9631218 10.8215616,19.9374167 C10.5598247,19.8890858 10.2988242,19.8362029 10.0389617,19.7784334 C9.91820125,19.7516572 9.86069947,19.7934949 9.8135065,19.9063564 C9.35436248,21.0045802 9.39117968,21.0733949 10.5604941,21.2579495 C10.5823836,21.2614304 10.6040723,21.2672542 10.6252924,21.2738813 C10.787422,21.3244882 10.8433842,21.2521926 10.8577763,21.0958868 C10.8862929,20.7863546 10.9285992,20.4780941 10.9618017,20.1982164 M18.1444368,4.91733022 C18.0459006,4.91666625 18.0098867,4.97791669 17.9673126,5.02671623 C17.8798885,5.12699291 17.7971502,5.23128601 17.7093244,5.33122799 C17.2399385,5.86527829 17.2396038,5.86501053 17.72211,6.35842802 C18.0472394,6.69092086 18.0472394,6.69092086 18.4046341,6.38861813 C19.0998099,5.80068083 19.1002784,5.80014531 18.4322805,5.16775959 C18.336288,5.07678763 18.2326643,4.99378156 18.1444368,4.91733022 M12.0086822,20.6726229 C12.0086822,21.3835966 12.0086822,21.3835966 12.4905859,21.3681333 C13.3944149,21.3391482 13.3944149,21.3391482 13.2344274,20.4444901 C13.1439909,19.939358 13.1430538,19.9329987 12.6205841,20.0128585 C12.4263901,20.0425801 12.1724853,19.9402952 12.0509885,20.0905763 C11.9250067,20.2464804 12.0291659,20.4968374 12.0086822,20.6726229 M20.4858103,7.98106269 C20.3180577,7.64549059 20.1463557,7.28414645 19.9045001,6.96383677 C19.8494751,6.8909387 19.7826017,6.96430535 19.7315931,6.99710613 C19.4606854,7.17121804 19.1964718,7.35624124 18.9209452,7.52252113 C18.7813076,7.60679906 18.7754168,7.68270944 18.8578874,7.81284153 C19.0174063,8.06453733 19.1066378,8.4534609 19.3274741,8.54918564 C19.5783666,8.65803069 19.8828114,8.35934274 20.1669733,8.2455441 C20.249243,8.21267638 20.3266261,8.16775939 20.4070215,8.13020584 C20.4609754,8.10503626 20.5021438,8.07350734 20.4858103,7.98106269 M11.9775549,3.32850588 C11.9736054,2.5971823 11.9736054,2.5971823 11.3481815,2.64618265 C10.6416928,2.70160928 10.6417597,2.70154234 10.7259038,3.39404051 C10.731259,3.43822116 10.7316607,3.48300427 10.7373506,3.52705103 C10.8086421,4.07837195 10.808776,4.07837195 11.3675942,4.00031948 C11.3785724,3.99877985 11.3892829,3.99536589 11.4003281,3.9938932 C11.980768,3.91697871 11.980768,3.91697871 11.9775549,3.32850588 M11.6454637,17.8755193 C11.6702986,17.8785986 11.6950665,17.8817448 11.7198345,17.884891 C13.179871,14.5990558 14.6399744,11.3132206 16.1000109,8.02738542 C16.0789916,8.00890988 16.0579054,7.99043434 16.0368192,7.97189185 C12.7533938,9.43125894 9.4699685,10.8905591 6.18661011,12.3499262 C6.52044175,12.4640595 6.83800689,12.5023494 7.15597366,12.5372254 C8.4060182,12.6743862 9.6559958,12.8122164 10.9065759,12.9447583 C11.0601371,12.9610918 11.1114134,13.034927 11.1265419,13.1795182 C11.2373283,14.2421297 11.3526665,15.3042726 11.4695444,16.3662817 C11.5249041,16.8696733 11.5866901,17.3724624 11.6454637,17.8755193" id="path-1"></path>
     </defs>
-    <g id="icon-/-AI-/-Navigation-Area" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+    <g id="icon-/-AI-/-NavigationArea" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <mask id="mask-2" fill="white">
             <use xlink:href="#path-1"></use>
         </mask>
diff --git a/Assets/Editor/Icons/Components/NavigationSeed.svg b/Assets/Editor/Icons/Components/NavigationSeed.svg
index d19ea7a2b4..8d3be86ee0 100644
--- a/Assets/Editor/Icons/Components/NavigationSeed.svg
+++ b/Assets/Editor/Icons/Components/NavigationSeed.svg
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
-    <title>icon / AI / Navigation Seed</title>
-    <desc>Created with Sketch.</desc>
+    <title>icon / AI / NavigationSeed</title>
     <defs>
-        <path d="M10.7023018,10.1422309 C10.7355391,9.74111543 11.0481867,9.40581382 11.4752324,9.27707174 L11.4752324,7.56457273 C11.0232181,7.40104945 10.6993703,6.95982218 10.6993703,6.44117647 C10.6993703,5.78330787 11.2204182,5.25 11.8631634,5.25 C12.5059086,5.25 13.0269565,5.78330787 13.0269565,6.44117647 C13.0269565,6.95982218 12.7031087,7.40104945 12.2510944,7.56457273 L12.2510944,9.27707174 C12.6551141,9.39887213 12.9567396,9.70555747 13.0162375,10.0779434 C15.6659543,10.4313887 17.6821289,12.2240497 17.6821289,14.3823529 C17.6821289,16.7945378 15.1637306,18.75 12.0571289,18.75 C8.95052719,18.75 6.43212891,16.7945378 6.43212891,14.3823529 C6.43212891,12.3328523 8.25015189,10.6130581 10.7023018,10.1422309 Z M9.53557718,13.9852941 C10.1783224,13.9852941 10.6993703,13.4519862 10.6993703,12.7941176 C10.6993703,12.136249 10.1783224,11.6029412 9.53557718,11.6029412 C8.892832,11.6029412 8.37178408,12.136249 8.37178408,12.7941176 C8.37178408,13.4519862 8.892832,13.9852941 9.53557718,13.9852941 Z M14.1907496,13.9852941 C14.8334948,13.9852941 15.3545427,13.4519862 15.3545427,12.7941176 C15.3545427,12.136249 14.8334948,11.6029412 14.1907496,11.6029412 C13.5480044,11.6029412 13.0269565,12.136249 13.0269565,12.7941176 C13.0269565,13.4519862 13.5480044,13.9852941 14.1907496,13.9852941 Z M20.7255907,11.98644 C21.3984754,11.9846326 21.3984754,11.9846326 21.3679505,12.6685624 C21.3406389,13.2802635 21.3362208,13.2838783 20.7250552,13.1908312 C20.0150856,13.0828563 20.0150856,13.0828563 20.0328248,12.4954546 C20.048288,11.987511 20.048288,11.987511 20.5584406,11.98644 C20.614135,11.986373 20.6698294,11.98644 20.7255907,11.98644 Z M3.30502783,12.0733955 C2.57564552,12.0780813 2.57564552,12.0780813 2.67264212,11.3264079 C2.7409213,10.7968426 2.7409213,10.7968426 3.28769028,10.8601012 C4.06312757,10.9498013 4.03936374,10.9485964 4.00154242,11.6971906 C3.98480733,12.0283446 3.87141034,12.1224628 3.57084806,12.0754707 C3.48429416,12.0618818 3.39379077,12.0733955 3.30502783,12.0733955 Z M6.78960899,18.158811 C6.76035605,18.1991091 6.73029982,18.2450971 6.69562471,18.2873365 C6.60364864,18.3991939 6.51127092,18.5107835 6.41614865,18.6199632 C5.93819438,19.1687404 5.93785968,19.1684057 5.40869602,18.6417858 C4.98275442,18.2178524 4.98248666,18.2175847 5.425565,17.84225 C5.61179312,17.6844715 5.78891735,17.4196554 5.9888013,17.4008452 C6.20066759,17.3809639 6.3354855,17.7038842 6.51937071,17.8609263 C6.61703671,17.944334 6.74837372,18.0035093 6.78960899,18.158811 Z M5.8705846,6.81074413 C5.80699125,6.89990871 5.75323813,6.9980433 5.67833185,7.07576107 C5.50140844,7.25911075 5.43808285,7.60833868 5.20104698,7.64448649 C4.97097292,7.67963018 4.76319,7.41749168 4.54603543,7.28635549 C4.0757793,7.00239442 4.07952796,6.99630285 4.39126928,6.55302369 C4.84860592,5.90256408 4.84927532,5.90182773 5.45702697,6.40957047 C5.60021243,6.52925986 5.76361389,6.6294696 5.8705846,6.81074413 Z M17.1426072,19.8334583 C17.0711149,19.8301113 17.0402554,19.7848596 17.0100653,19.7378005 C16.962136,19.663229 16.9130687,19.5893937 16.8646038,19.5152238 C16.3332312,18.7006264 16.3353063,18.7037726 17.1467575,18.1695884 C17.2678527,18.0899294 17.3358641,18.1013092 17.4226188,18.2053346 C17.6282596,18.4521437 17.8385863,18.6953381 18.0524608,18.9350516 C18.1309818,19.0231451 18.1619752,19.0912235 18.0480427,19.1748989 C17.7714451,19.3781299 17.4991986,19.5871847 17.2242075,19.7925578 C17.1983685,19.8119035 17.1656347,19.8221454 17.1426072,19.8334583 Z M4.16086051,9.78470412 C3.82080342,9.68938103 3.47967527,9.59479428 3.13961817,9.49659275 C3.00613907,9.45803509 3.01524296,9.35561632 3.05092218,9.25533964 C3.1547467,8.96341267 3.26466279,8.67369473 3.3696253,8.38223635 C3.42572133,8.2264661 3.52519472,8.22178027 3.65787055,8.28276295 C3.9394887,8.41235951 4.22338282,8.53700249 4.50694225,8.66231487 C4.61170393,8.70857067 4.66525623,8.76801372 4.61585424,8.89359386 C4.51464039,9.15091266 4.42293208,9.41198012 4.32955026,9.67224429 C4.30029731,9.75371073 4.26046779,9.81134639 4.16086051,9.78470412 Z M6.66088266,5.97378864 C6.64160383,5.93723919 6.62373075,5.88080846 6.58818541,5.83970707 C6.37705547,5.5957094 6.16873703,5.34856554 5.94529006,5.11621551 C5.82031238,4.9862173 5.86897803,4.91151184 5.98458406,4.82549346 C6.23440553,4.63966699 6.48442783,4.45370663 6.72849243,4.26044977 C6.84423234,4.1688084 6.91137353,4.18427162 6.98889049,4.31045423 C7.15764717,4.58517752 7.33845312,4.85260431 7.51885743,5.11996417 C7.58445899,5.21722853 7.59952058,5.29153235 7.49034083,5.37206162 C7.25778997,5.54356285 7.03213397,5.72450268 6.80266237,5.90022117 C6.77742585,5.91956693 6.74569611,5.93034433 6.66088266,5.97378864 Z M15.8602974,20.3721945 C15.8973154,20.5177898 15.8488506,20.5575524 15.7805714,20.583726 C15.458856,20.7068963 15.1375422,20.8312046 14.8148896,20.952032 C14.6845567,21.0008315 14.6407777,20.9257244 14.6094496,20.8111225 C14.5244353,20.5001845 14.4346013,20.1903175 14.3359982,19.8834628 C14.2977752,19.7643089 14.3145772,19.6933521 14.4388186,19.6568027 C14.5134571,19.6349132 14.5844808,19.5960878 14.6602573,19.5836369 C14.9078028,19.5431379 15.2012694,19.232066 15.3560356,19.4003541 C15.6079991,19.6742072 15.7177144,20.0788617 15.8602974,20.3721945 Z M9.17295407,3.06964746 C9.3409744,3.01897359 9.34606187,3.13906463 9.36975876,3.21202963 C9.46608596,3.50810691 9.55163576,3.80766508 9.64300937,4.10534892 C9.68558345,4.24384856 9.66704096,4.33930553 9.50303705,4.37960363 C9.36326555,4.4138771 9.22777823,4.46829963 9.09316114,4.52084782 C8.61714814,4.70660736 8.61761672,4.70774535 8.39798536,4.23394138 C8.37924205,4.19350939 8.35956158,4.15354599 8.34121992,4.11304706 C8.05263997,3.47577471 8.05250609,3.47530612 8.72987573,3.22535077 C8.88638232,3.16764816 9.04462937,3.11463139 9.17295407,3.06964746 Z M15.9313211,3.47296321 C16.19192,3.61226613 16.4394655,3.76314973 16.7020726,3.87996068 C16.9921922,4.00902172 17.0605383,4.15046673 16.8378277,4.41434569 C16.6815219,4.5995697 16.5653134,4.82013823 16.442344,5.03146899 C16.3563925,5.17907252 16.2614711,5.21461786 16.1226367,5.10537117 C16.0880286,5.07805949 16.0439149,5.06293097 16.008972,5.035954 C15.8024609,4.87643509 15.3607883,4.839484 15.3821423,4.62594421 C15.4187587,4.25877626 15.6606143,3.91155654 15.8209365,3.55804443 C15.8357972,3.52544446 15.8841951,3.50810691 15.9313211,3.47296321 Z M19.9081818,14.2796163 C20.2165092,14.3684462 20.5233639,14.4626313 20.8336994,14.5437631 C20.9795625,14.5818521 21.0029916,14.6651929 20.9657728,14.7906392 C20.9563342,14.8223689 20.9470964,14.8545003 20.9344447,14.885092 C20.8053167,15.1981722 20.7997607,15.7133453 20.5185441,15.7737924 C20.1836415,15.8456864 19.8163396,15.5178124 19.4630953,15.3631802 C19.3723241,15.3235515 19.3566601,15.2660497 19.3906658,15.1776884 C19.4898714,14.9195663 19.5915538,14.6621136 19.6788441,14.3999082 C19.7212843,14.2724537 19.7957889,14.251903 19.9081818,14.2796163 Z M18.8275634,16.3603909 C18.9781792,16.4550446 19.1289289,16.5478909 19.2778043,16.6435487 C19.9431916,17.0716993 19.9430578,17.0719671 19.4631622,17.6914333 C19.1156078,18.1400008 19.1101187,18.1460254 18.6922099,17.7654024 C18.5059818,17.5957755 18.194776,17.476287 18.1686693,17.2402552 C18.1441691,17.0198205 18.4336862,16.8544109 18.5669645,16.6513138 C18.63598,16.5459496 18.6792235,16.4082533 18.8275634,16.3603909 Z M4.64510718,15.4515415 C4.71987958,15.4326643 4.7555588,15.4476589 4.77898793,15.4941825 C4.79391563,15.523971 4.81714394,15.5498769 4.82979567,15.5804017 C4.94834707,15.8659693 5.31203412,16.1632515 5.21570693,16.3893761 C5.0722537,16.7262201 4.61538565,16.8462442 4.29889157,17.0684862 C4.21842924,17.1250508 4.15249297,17.1038307 4.10536694,17.0208916 C3.93513757,16.7211995 3.76497514,16.4215075 3.59641928,16.1209452 C3.56234663,16.0600964 3.53905138,15.985324 3.6168361,15.9468333 C3.96559544,15.774261 4.31770181,15.6084497 4.64510718,15.4515415 Z M8.71119937,19.4892509 C8.57095928,19.7977122 8.41592538,20.1539688 8.24609765,20.5030629 C8.1946205,20.6086948 8.10304607,20.5201996 8.04507571,20.4910136 C7.7676748,20.3509744 7.49964554,20.1920579 7.2200356,20.0569053 C7.04264361,19.9711547 7.07597991,19.8788439 7.16173053,19.7495151 C7.32124944,19.5087975 7.47983119,19.2666073 7.62100844,19.0149784 C7.70983831,18.8567313 7.79163945,18.815563 7.95564337,18.9203247 C8.1515109,19.0454363 8.36511763,19.1425667 8.56948659,19.2546919 C8.64318795,19.2951239 8.74714635,19.3153398 8.71119937,19.4892509 Z M2.77111141,13.5845744 C2.74098824,13.4499573 2.81207892,13.4096592 2.93129973,13.3927903 C3.26158353,13.3461328 3.59146569,13.2951912 3.92007599,13.2380911 C4.03139783,13.2188122 4.08762775,13.2447851 4.10349261,13.3615961 C4.11989301,13.4826912 4.14834266,13.6021128 4.17217344,13.7221369 C4.29621395,14.3482302 4.29922627,14.3586729 3.67688161,14.535931 C2.98893539,14.7319324 3.07528847,14.8936604 2.87734579,14.0735739 C2.83825261,13.9115112 2.80638899,13.7476412 2.77111141,13.5845744 Z M20.1947536,10.8061473 C20.0005595,10.8489891 19.9357613,10.7472398 19.9081818,10.5756046 C19.8763851,10.3784652 19.8330078,10.1823969 19.7824009,9.98914002 C19.732865,9.7997657 19.7459184,9.66581801 19.9804774,9.62933551 C20.1221902,9.60724519 20.2592171,9.55362595 20.3975829,9.51165433 C21.0339181,9.31866524 21.0337842,9.31839747 21.1708111,9.98592688 C21.3063654,10.6462267 21.3062985,10.6453565 20.6227034,10.7353913 C20.479384,10.7542685 20.3373366,10.7823165 20.1947536,10.8061473 Z M13.1097175,3.8620876 C13.1419158,3.63703407 13.1785991,3.42878256 13.2003547,3.21899143 C13.2663579,2.58332564 13.2294738,2.69893167 13.7941828,2.80382723 C14.5838114,2.95049359 14.5814685,2.96314532 14.3617702,3.73851567 C14.3587579,3.74915919 14.3558125,3.75986965 14.3528671,3.77064705 C14.2139659,4.27182963 14.2143006,4.27029 13.7232929,4.16084249 C13.5717399,4.12710454 13.4175762,4.1048134 13.2649522,4.07582822 C13.1366944,4.05139498 13.0564329,3.99375932 13.1097175,3.8620876 Z M10.9618017,20.1982164 C10.9285992,20.4780941 10.8862929,20.7863546 10.8577763,21.0958868 C10.8433842,21.2521926 10.787422,21.3244882 10.6252924,21.2738813 C10.6040723,21.2672542 10.5823836,21.2614304 10.5604941,21.2579495 C9.39117968,21.0733949 9.35436248,21.0045802 9.8135065,19.9063564 C9.86069947,19.7934949 9.91820125,19.7516572 10.0389617,19.7784334 C10.2988242,19.8362029 10.5598247,19.8890858 10.8215616,19.9374167 C10.9607306,19.9631218 11.0145507,20.0326729 10.9618017,20.1982164 Z M18.1444368,4.91733566 C18.2326643,4.99378156 18.336288,5.07678763 18.4322805,5.16775959 C19.1002784,5.80014531 19.0998099,5.80068083 18.4046341,6.38861813 C18.0472394,6.69092086 18.0472394,6.69092086 17.72211,6.35842802 C17.2396038,5.86501053 17.2399385,5.86527829 17.7093244,5.33122799 C17.7971502,5.23128601 17.8798885,5.12699291 17.9673126,5.02671623 C18.0098867,4.97791669 18.0459006,4.91666625 18.1444368,4.91733566 Z M12.0086822,20.6726229 C12.0291659,20.4968374 11.9250067,20.2464804 12.0509885,20.0905763 C12.1724853,19.9402952 12.4263901,20.0425801 12.6205841,20.0128585 C13.1430538,19.9329987 13.1439909,19.939358 13.2344274,20.4444901 C13.3944149,21.3391482 13.3944149,21.3391482 12.4905859,21.3681333 C12.0086822,21.3835966 12.0086822,21.3835966 12.0086822,20.6726229 Z M20.4858103,7.98106269 C20.5021438,8.07350734 20.4609754,8.10503626 20.4070215,8.13020584 C20.3266261,8.16775939 20.249243,8.21267638 20.1669733,8.2455441 C19.8828114,8.35934274 19.5783666,8.65803069 19.3274741,8.54918564 C19.1066378,8.4534609 19.0174063,8.06453733 18.8578874,7.81284153 C18.7754168,7.68270944 18.7813076,7.60679906 18.9209452,7.52252113 C19.1964718,7.35624124 19.4606854,7.17121804 19.7315931,6.99710613 C19.7826017,6.96430535 19.8494751,6.8909387 19.9045001,6.96383677 C20.1463557,7.28414645 20.3180577,7.64549059 20.4858103,7.98106269 Z M11.9775549,3.32850588 C11.980768,3.91697871 11.980768,3.91697871 11.4003281,3.9938932 C11.3892829,3.99536589 11.3785724,3.99877985 11.3675942,4.00031948 C10.808776,4.07837195 10.8086421,4.07837195 10.7373506,3.52705103 C10.7316607,3.48300427 10.731259,3.43822116 10.7259038,3.39404051 C10.6417597,2.70154234 10.6416928,2.70160928 11.3481815,2.64618265 C11.9736054,2.5971823 11.9736054,2.5971823 11.9775549,3.32850588 Z" id="path-1"></path>
+        <path d="M12.617855,20.0128806 C13.1403246,19.9330207 13.1412618,19.9393801 13.2316983,20.4445121 C13.3916857,21.3391702 13.3916857,21.3391702 12.4878568,21.3681554 C12.0059531,21.3836186 12.0059531,21.3836186 12.0059531,20.6726449 C12.0264368,20.4968595 11.9222776,20.2465025 12.0482594,20.0905984 C12.1697562,19.9403172 12.423661,20.0426021 12.617855,20.0128806 Z M9.97094375,19.7706427 L10.0362326,19.7784554 C10.2960951,19.8362249 10.5570956,19.8891078 10.8188325,19.9374388 C10.9580015,19.9631439 11.0118216,20.0326949 10.9590726,20.1982385 C10.9258701,20.4781162 10.8835638,20.7863766 10.8550472,21.0959089 C10.840655,21.2522147 10.7846929,21.3245103 10.6225633,21.2739033 C10.6013432,21.2672763 10.5796545,21.2614524 10.557765,21.2579715 C9.38845057,21.0734169 9.35163337,21.0046022 9.81077739,19.9063785 C9.85797036,19.793517 9.91547214,19.7516792 10.0362326,19.7784554 Z M14.6575282,19.5836589 C14.9050737,19.54316 15.1985403,19.2320881 15.3533065,19.4003762 C15.60527,19.6742292 15.7149853,20.0788838 15.8575683,20.3722165 C15.8945863,20.5178118 15.8461215,20.5575744 15.7778423,20.5837481 C15.4561269,20.7069184 15.1348131,20.8312267 14.8121605,20.952054 C14.6818276,21.0008536 14.6380486,20.9257465 14.6067205,20.8111445 C14.5217062,20.5002065 14.4318722,20.1903395 14.333269,19.8834848 C14.2950461,19.764331 14.3118481,19.6933742 14.4360895,19.6568247 C14.510728,19.6349352 14.5817517,19.5961098 14.6575282,19.5836589 Z M7.61827933,19.0150004 C7.7071092,18.8567534 7.78891034,18.8155851 7.95291426,18.9203467 C8.14878179,19.0454583 8.36238852,19.1425888 8.56675748,19.2547139 C8.64045884,19.2951459 8.74441724,19.3153619 8.70847026,19.489273 C8.56823017,19.7977342 8.41319627,20.1539909 8.24336854,20.5030849 C8.19189139,20.6087169 8.10031696,20.5202217 8.0423466,20.4910357 C7.76494569,20.3509964 7.49691643,20.19208 7.21730649,20.0569274 C7.0399145,19.9711767 7.0732508,19.878866 7.15900142,19.7495372 C7.31852033,19.5088196 7.47710208,19.2666293 7.61827933,19.0150004 Z M17.1440284,18.1696105 C17.2651235,18.0899514 17.333135,18.1013313 17.4198897,18.2053566 C17.6255305,18.4521658 17.8358572,18.6953601 18.0497317,18.9350736 C18.1282527,19.0231672 18.1592461,19.0912455 18.0453136,19.174921 C17.768716,19.378152 17.4964695,19.5872067 17.2214784,19.7925798 C17.1956394,19.8119256 17.1629056,19.8221675 17.1398781,19.8334804 C17.0683858,19.8301334 17.0375263,19.7848817 17.0073362,19.7378226 L17.0073362,19.7378226 L16.8618747,19.5152458 C16.330502,18.7006484 16.3325772,18.7037946 17.1440284,18.1696105 Z M5.98607219,17.4008672 C6.19793848,17.3809859 6.33275639,17.7039063 6.5166416,17.8609484 C6.6143076,17.9443561 6.74564461,18.0035314 6.78687988,18.1588331 C6.75762694,18.1991312 6.72757071,18.2451192 6.6928956,18.2873586 C6.60091953,18.3992159 6.50854181,18.5108055 6.41341954,18.6199853 C5.93546527,19.1687625 5.93513057,19.1684278 5.40596691,18.6418078 C4.98002531,18.2178745 4.97975755,18.2176067 5.42283589,17.842272 C5.60906401,17.6844936 5.78618824,17.4196774 5.98607219,17.4008672 Z M11.8604343,5.25002205 C12.5031795,5.25002205 13.0242274,5.78332992 13.0242274,6.44119852 C13.0242274,6.95996172 12.7002328,7.40127141 12.2480581,7.56470587 L12.2486615,9.27718312 C12.6521108,9.39891687 12.9533954,9.70503052 13.0133213,10.0767996 C15.6622808,10.4305712 17.6793998,12.2235664 17.6793998,14.382375 C17.6793998,16.7945599 15.1610015,18.750022 12.0543998,18.750022 C8.94779808,18.750022 6.4293998,16.7945599 6.4293998,14.382375 C6.4293998,12.3324076 8.24825082,10.612297 10.7012479,10.1419316 C10.7330362,9.74097939 11.0454727,9.40594273 11.472207,9.27718312 L11.4724218,7.56456533 C11.0204501,7.40101852 10.6966412,6.95981309 10.6966412,6.44119852 C10.6966412,5.78332992 11.2176891,5.25002205 11.8604343,5.25002205 Z M18.8248343,16.360413 C18.9754501,16.4550667 19.1261998,16.547913 19.2750752,16.6435707 C19.9404625,17.0717214 19.9403286,17.0719891 19.4604331,17.6914554 C19.1128787,18.1400228 19.1073896,18.1460474 18.6894808,17.7654245 C18.5032527,17.5957976 18.1920469,17.476309 18.1659402,17.2402772 C18.14144,17.0198426 18.4309571,16.8544329 18.5642354,16.6513358 C18.6332509,16.5459717 18.6764944,16.4082753 18.8248343,16.360413 Z M4.64237807,15.4515635 C4.71715047,15.4326863 4.75282968,15.447681 4.77625882,15.4942045 C4.79118652,15.523993 4.81441483,15.5498989 4.82706656,15.5804237 C4.94561796,15.8659914 5.30930501,16.1632736 5.21297781,16.3893981 C5.06952459,16.7262421 4.61265654,16.8462662 4.29616245,17.0685082 C4.21570013,17.1250729 4.14976386,17.1038528 4.10263783,17.0209136 C3.93240846,16.7212216 3.76224603,16.4215295 3.59369017,16.1209673 C3.55961752,16.0601185 3.53632227,15.9853461 3.61410699,15.9468553 C3.96286633,15.7742831 4.3149727,15.6084717 4.64237807,15.4515635 Z M19.8523867,14.2700752 L19.9054527,14.2796384 C20.2137801,14.3684683 20.5206347,14.4626534 20.8309703,14.5437851 C20.9768334,14.5818742 21.0002625,14.6652149 20.9630437,14.7906612 C20.9536051,14.8223909 20.9443673,14.8545223 20.9317156,14.8851141 C20.8025876,15.1981942 20.7970315,15.7133673 20.515815,15.7738145 C20.1809123,15.8457084 19.8136105,15.5178345 19.4603662,15.3632022 C19.369595,15.3235735 19.353931,15.2660717 19.3879367,15.1777104 C19.4871423,14.9195884 19.5888247,14.6621357 19.676115,14.3999302 C19.7185552,14.2724758 19.7930598,14.2519251 19.9054527,14.2796384 Z M3.91734688,13.2381131 C4.02866872,13.2188343 4.08489863,13.2448071 4.1007635,13.3616181 C4.11716389,13.4827132 4.14561355,13.6021349 4.16944433,13.722159 C4.29348484,14.3482523 4.29649716,14.358695 3.6741525,14.5359531 C2.98620628,14.7319545 3.07255936,14.8936824 2.87461668,14.0735959 C2.8355235,13.9115333 2.80365988,13.7476632 2.7683823,13.5845965 C2.73825913,13.4499794 2.80934981,13.4096813 2.92857062,13.3928123 C3.25885442,13.3461549 3.58873658,13.2952132 3.91734688,13.2381131 Z M9.53284807,11.6029632 C8.89010289,11.6029632 8.36905497,12.1362711 8.36905497,12.7941397 C8.36905497,13.4520083 8.89010289,13.9853162 9.53284807,13.9853162 C10.1755933,13.9853162 10.6966412,13.4520083 10.6966412,12.7941397 C10.6966412,12.1362711 10.1755933,11.6029632 9.53284807,11.6029632 Z M14.1880205,11.6029632 C13.5452753,11.6029632 13.0242274,12.1362711 13.0242274,12.7941397 C13.0242274,13.4520083 13.5452753,13.9853162 14.1880205,13.9853162 C14.8307657,13.9853162 15.3518136,13.4520083 15.3518136,12.7941397 C15.3518136,12.1362711 14.8307657,11.6029632 14.1880205,11.6029632 Z M20.9334564,11.9870099 C21.3953238,11.9941208 21.3921551,12.0651169 21.3652214,12.6685844 C21.3379098,13.2802855 21.3334917,13.2839003 20.7223261,13.1908532 C20.0123565,13.0828784 20.0123565,13.0828784 20.0300957,12.4954766 C20.0455589,11.987533 20.0455589,11.987533 20.5557115,11.986462 Z M2.66991301,11.3264299 C2.73819219,10.7968646 2.73819219,10.7968646 3.28496117,10.8601233 C4.06039846,10.9498234 4.03663463,10.9486184 3.99881331,11.6972126 C3.98207822,12.0283667 3.86868123,12.1224848 3.56811895,12.0754927 C3.48156505,12.0619038 3.39106166,12.0734175 3.30229872,12.0734175 L3.30229872,12.0734175 L3.08531798,12.0737813 C2.5741139,12.0688235 2.58369381,11.9945841 2.66991301,11.3264299 Z M20.3948538,9.51167638 C21.031189,9.31868728 21.0310551,9.31841952 21.168082,9.98594893 C21.3036363,10.6462488 21.3035694,10.6453786 20.6199743,10.7354134 C20.4766549,10.7542905 20.3346074,10.7823386 20.1920244,10.8061693 C19.9978304,10.8490112 19.9330321,10.7472618 19.9054527,10.5756267 C19.873656,10.3784873 19.8302787,10.1824189 19.7796717,9.98916207 C19.7301359,9.79978775 19.7431892,9.66584006 19.9777483,9.62935756 C20.1194611,9.60726723 20.256488,9.55364799 20.3948538,9.51167638 Z M3.36689618,8.38225839 C3.42299222,8.22648814 3.52246561,8.22180232 3.65514143,8.282785 C3.93675959,8.41238156 4.22065371,8.53702454 4.50421314,8.66233692 C4.60897482,8.70859272 4.66252712,8.76803577 4.61312512,8.89361591 C4.51191128,9.15093471 4.42020297,9.41200216 4.32682115,9.67226634 C4.2975682,9.75373277 4.25773868,9.81136843 4.1581314,9.78472616 C3.8180743,9.68940307 3.47694616,9.59481632 3.13688906,9.4966148 C3.00340995,9.45805714 3.01251385,9.35563837 3.04819307,9.25536169 C3.15201758,8.96343472 3.26193368,8.67371678 3.36689618,8.38225839 Z M19.728864,6.99712818 C19.7798726,6.96432739 19.846746,6.89096074 19.901771,6.96385881 C20.1436266,7.2841685 20.3153286,7.64551264 20.4830812,7.98108473 C20.4994146,8.07352939 20.4582463,8.1050583 20.4042924,8.13022789 C20.323897,8.16778143 20.2465139,8.21269843 20.1642442,8.24556615 C19.8800823,8.35936478 19.5756375,8.65805273 19.324745,8.54920769 C19.1039087,8.45348295 19.0146772,8.06455938 18.8551582,7.81286357 C18.7726877,7.68273149 18.7785785,7.6068211 18.9182161,7.52254317 C19.1937427,7.35626328 19.4579563,7.17124009 19.728864,6.99712818 Z M4.38854017,6.55304574 C4.8458768,5.90258612 4.84654621,5.90184978 5.45429786,6.40959252 C5.59748332,6.5292819 5.76088477,6.62949164 5.86785549,6.81076618 C5.80426214,6.89993075 5.75050902,6.99806534 5.67560274,7.07578312 C5.49867933,7.2591328 5.43535374,7.60836073 5.19831787,7.64450853 C4.96824381,7.67965223 4.76046089,7.41751372 4.54330631,7.28637753 C4.07305019,7.00241647 4.07679885,6.99632489 4.38854017,6.55304574 Z M18.1417077,4.91735226 C18.2299351,4.99380361 18.3335588,5.07680967 18.4295513,5.16778164 C19.0975493,5.80016735 19.0970808,5.80070288 18.401905,6.38864018 C18.0445103,6.69094291 18.0445103,6.69094291 17.7193809,6.35845007 C17.2368747,5.86503257 17.2372094,5.86530034 17.7065953,5.33125003 C17.7944211,5.23130806 17.8771594,5.12701495 17.9645835,5.02673827 C18.0071576,4.97793874 18.0431715,4.9166883 18.1417077,4.91735226 Z M6.72576332,4.26047181 C6.84150323,4.16883044 6.90864442,4.18429367 6.98616138,4.31047627 C7.15491806,4.58519957 7.33572401,4.85262636 7.51612832,5.11998621 C7.58172988,5.21725058 7.59679147,5.29155439 7.48761172,5.37208366 C7.25506086,5.5435849 7.02940486,5.72452473 6.79993326,5.90024321 C6.77469674,5.91958898 6.742967,5.93036638 6.65815355,5.97381068 C6.63887472,5.93726124 6.62100164,5.8808305 6.5854563,5.83972911 C6.37432636,5.59573145 6.16600792,5.34858759 5.94256095,5.11623755 C5.81758327,4.98623935 5.86624892,4.91153389 5.98185495,4.82551551 C6.23167642,4.63968903 6.48169872,4.45372867 6.72576332,4.26047181 Z M15.928592,3.47298526 C16.1891909,3.61228817 16.4367364,3.76317178 16.6993435,3.87998273 C16.9894631,4.00904377 17.0578092,4.15048878 16.8350986,4.41436773 C16.6787928,4.59959175 16.5625843,4.82016028 16.4396149,5.03149104 C16.3536634,5.17909456 16.258742,5.2146399 16.1199076,5.10539321 C16.0852995,5.07808154 16.0411857,5.06295302 16.0062429,5.03597604 C15.7997318,4.87645713 15.3580592,4.83950605 15.3794132,4.62596626 C15.4160296,4.2587983 15.6578852,3.91157859 15.8182074,3.55806647 C15.8330681,3.52546651 15.881466,3.50812895 15.928592,3.47298526 Z M9.17022495,3.0696695 C9.33824529,3.01899564 9.34333276,3.13908667 9.36702965,3.21205168 C9.46335685,3.50812895 9.54890665,3.80768713 9.64028026,4.10537097 C9.68285434,4.2438706 9.66431185,4.33932757 9.50030794,4.37962568 C9.36053644,4.41389915 9.22504912,4.46832167 9.09043203,4.52086987 C8.61441903,4.70662941 8.61488761,4.70776739 8.39525625,4.23396343 C8.37651294,4.19353144 8.35683247,4.15356804 8.33849081,4.11306911 C8.04991086,3.47579675 8.04977698,3.47532817 8.72714662,3.22537281 C8.88365321,3.16767021 9.04190026,3.11465343 9.17022495,3.0696695 Z M13.1976256,3.21901348 C13.2636288,2.58334769 13.2267447,2.69895371 13.7914537,2.80384928 C14.5810823,2.95051564 14.5787394,2.96316737 14.3590411,3.73853772 C14.3560288,3.74918124 14.3530834,3.7598917 14.350138,3.7706691 C14.2112367,4.27185168 14.2115714,4.27031205 13.7205638,4.16086454 C13.5690108,4.12712659 13.4148471,4.10483544 13.2622231,4.07585026 C13.1339653,4.05141703 13.0537038,3.99378136 13.1069883,3.86210965 C13.1391867,3.63705611 13.17587,3.42880461 13.1976256,3.21901348 Z M11.3454524,2.6462047 C11.9708763,2.59720435 11.9708763,2.59720435 11.9748258,3.32852793 C11.9780389,3.91700076 11.9780389,3.91700076 11.397599,3.99391525 C11.3865538,3.99538793 11.3758433,3.99880189 11.3648651,4.00034152 C10.8060469,4.078394 10.805913,4.078394 10.7346215,3.52707308 C10.7289316,3.48302631 10.7285299,3.4382432 10.7231747,3.39406256 C10.6390306,2.70156439 10.6389637,2.70163133 11.3454524,2.6462047 Z" id="path-1"></path>
     </defs>
-    <g id="icon-/-AI-/-Navigation-Seed" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+    <g id="icon-/-AI-/-NavigationSeed" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <mask id="mask-2" fill="white">
             <use xlink:href="#path-1"></use>
         </mask>
diff --git a/Assets/Editor/Icons/Components/NetBinding.svg b/Assets/Editor/Icons/Components/NetBinding.svg
index 3c02056618..bcc00406f2 100644
--- a/Assets/Editor/Icons/Components/NetBinding.svg
+++ b/Assets/Editor/Icons/Components/NetBinding.svg
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
-    <title>icon / Networking / Network Binding</title>
-    <desc>Created with Sketch.</desc>
+    <title>icon / Networking / NetBinding</title>
     <defs>
         <path d="M17.9913911,20.0308183 C18.0485186,19.3796214 18.5952547,18.8688655 19.2612841,18.8688655 C19.9653484,18.8688655 20.5361053,19.4396224 20.5361053,20.1436866 C20.5361053,20.8477509 19.9653484,21.4185077 19.2612841,21.4185077 C18.6776176,21.4185077 18.1855645,21.0262639 18.0343463,20.4909976 L14.293761,20.4909976 C14.1923219,20.8916915 13.8265073,21.1884181 13.3928707,21.1884181 L10.549227,21.1884181 C10.1132424,21.1884181 9.74741753,20.8974042 9.64742772,20.4909976 L5.90974106,20.4909976 C5.75852285,21.0262639 5.26646977,21.4185077 4.68280323,21.4185077 C3.97873897,21.4185077 3.40798211,20.8477509 3.40798211,20.1436866 C3.40798211,19.4396224 3.97873897,18.8688655 4.68280323,18.8688655 C5.3488327,18.8688655 5.89556872,19.3796214 5.95269631,20.0308183 L9.62040308,20.0308183 L9.62040308,20.0215062 C9.62040308,19.5119953 10.0376113,19.0989552 10.549227,19.0989552 L11.6566964,19.0989552 L11.6566964,18.1379919 C7.32679164,18.0150756 3.85448035,14.4664398 3.85448035,10.1068023 C3.85448035,5.66948021 7.45164063,2.07231992 11.8889627,2.07231992 C16.3262848,2.07231992 19.9234451,5.66948021 19.9234451,10.1068023 C19.9234451,14.4679008 16.4488062,18.0174539 12.1168758,18.1381143 L12.1168758,19.0989552 L13.3928707,19.0989552 C13.905846,19.0989552 14.3216946,19.5018246 14.3216946,20.0215062 L14.3216946,20.0308183 L17.9913911,20.0308183 L17.9913911,20.0308183 Z M12.1492128,9.76881923 L12.1492128,14.4005414 C13.1633002,14.4258364 14.0291726,14.5113631 14.7592548,14.6462557 C15.2367895,13.3622462 15.5141239,11.9204545 15.5141239,10.3325316 C15.5141239,10.1430412 15.5101738,9.95512478 15.5024043,9.76881923 L12.1492128,9.76881923 Z M12.1492128,9.3086399 L15.4752678,9.3086399 C15.3917423,8.21435379 15.1764016,7.17837735 14.8569189,6.20854001 C14.1067426,6.35411446 13.2088997,6.44631713 12.1492128,6.47274949 L12.1492128,9.3086399 Z M11.6890335,9.76881923 L8.21302901,9.76881923 C8.20525953,9.95512478 8.20130943,10.1430412 8.20130943,10.3325316 C8.20130943,11.8800096 8.46469614,13.2887057 8.92008049,14.5478365 C9.64081901,14.4472818 10.4974007,14.3926721 11.5030548,14.3926721 C11.5655559,14.3926721 11.6275479,14.392883 11.6890335,14.3933027 L11.6890335,9.76881923 Z M11.6890335,9.3086399 L11.6890335,6.47998826 C11.6275479,6.48040791 11.5655559,6.4806188 11.5030548,6.4806188 C10.4527931,6.4806188 9.5651219,6.42105703 8.82497224,6.31180319 C8.52394814,7.25181044 8.32073369,8.25309831 8.24016545,9.3086399 L11.6890335,9.3086399 Z M18.9951993,9.76881923 L15.9629787,9.76881923 C15.9704878,9.95518165 15.9743032,10.1430971 15.9743032,10.3325316 C15.9743032,11.9504238 15.6959433,13.4239443 15.2148663,14.7407906 C15.4935881,14.8054191 15.7494006,14.8781394 15.9831911,14.9581756 C16.3121108,15.0707785 16.5670764,15.1857279 16.7579571,15.2937055 C18.1399095,13.9959444 19.0030864,12.1521762 19.0030864,10.1068023 C19.0030864,9.99350316 19.0004379,9.88082263 18.9951993,9.76881923 L18.9951993,9.76881923 Z M18.9588116,9.3086399 C18.7872214,7.77170891 18.1259823,6.38270027 17.1346698,5.30118956 C16.9812364,5.46927728 16.6214464,5.69661402 15.9831911,5.91511531 C15.7759566,5.98606028 15.5514188,6.05125699 15.3089597,6.11016504 C15.6349054,7.11143983 15.8535692,8.18022736 15.9367638,9.3086399 L18.9588116,9.3086399 L18.9588116,9.3086399 Z M4.78272611,9.76881923 C4.77748756,9.88082263 4.77483901,9.99350316 4.77483901,10.1068023 C4.77483901,12.0613636 5.56306898,13.8318238 6.83899432,15.1176485 C6.94410595,15.0652435 7.06300539,15.0128132 7.1967775,14.9611978 C7.54701784,14.8260592 7.96554745,14.7117657 8.45783665,14.6219003 C8.00304553,13.3354392 7.7411301,11.9019067 7.7411301,10.3325316 C7.7411301,10.1430971 7.7449455,9.95518165 7.75245457,9.76881923 L4.78272611,9.76881923 L4.78272611,9.76881923 Z M4.81911381,9.3086399 L7.77866949,9.3086399 C7.85843501,8.22673729 8.06273261,7.19964584 8.36671865,6.2343176 C7.91368276,6.14720868 7.52520592,6.03881572 7.1967775,5.91209309 C6.85945397,5.78193832 6.61669993,5.64660173 6.45112063,5.51955502 C5.56669756,6.56690484 4.97936609,7.87326232 4.81911381,9.3086399 L4.81911381,9.3086399 Z M12.1492128,14.8608511 L12.1492128,17.21444 L11.6890335,17.21444 L11.6890335,14.8534916 C11.6275758,14.8530656 11.5655838,14.8528515 11.5030548,14.8528515 C10.5651648,14.8528515 9.76457677,14.9010236 9.08989775,14.9890377 C9.147583,15.1302334 9.20771246,15.2694204 9.2701764,15.406582 C9.50340571,15.9187192 9.75295137,16.3649241 10.0019255,16.742422 C10.074029,16.8517463 10.1379699,16.9434543 10.191782,17.0172238 C10.7356538,17.1503408 11.3040652,17.220926 11.8889627,17.220926 C12.4467597,17.220926 12.9895629,17.1567302 13.5103873,17.0353237 C13.5668445,16.9586434 13.6353849,16.8608729 13.7135078,16.742422 C13.9624819,16.3649241 14.2120276,15.9187192 14.4452569,15.406582 C14.4938807,15.2998113 14.5410899,15.1918133 14.5868328,15.0825959 C13.9036999,14.962121 13.0948036,14.8848527 12.1492128,14.8608511 Z M16.3881493,15.6178069 C16.24383,15.5473631 16.060856,15.471162 15.8341446,15.3935492 C15.5972531,15.3124514 15.3352021,15.2390629 15.0469176,15.1743722 C14.9883442,15.3173204 14.9273545,15.4583032 14.8640532,15.5973035 C14.6523,16.0622823 14.4271316,16.4761423 14.1998404,16.8371931 C15.0040901,16.5611159 15.7432385,16.1449417 16.3881493,15.6178069 L16.3881493,15.6178069 Z M7.19975823,15.4568922 C7.86715246,16.0423147 8.64501902,16.5048526 9.49802299,16.8091712 C9.27670379,16.454775 9.05767565,16.0502981 8.85138011,15.5973035 C8.77122589,15.4212967 8.69477781,15.2421111 8.62224885,15.0597816 C8.12305828,15.1465511 7.70515594,15.2582886 7.36243223,15.390527 C7.30443809,15.4129038 7.25027352,15.4350631 7.19975823,15.4568922 L7.19975823,15.4568922 Z M12.1492128,6.0124398 C13.1492464,5.98705633 13.9963918,5.90209587 14.7035792,5.76945808 C14.6221163,5.54884583 14.5352589,5.33186867 14.4433543,5.11862481 C14.2094283,4.5758528 13.9590414,4.09699055 13.7091133,3.68695031 C13.560355,3.44289243 13.4458799,3.27730979 13.3826796,3.19509799 L13.4286706,3.15974237 C13.0145745,3.06837644 12.5869335,3.01309074 12.1492128,2.99735045 L12.1492128,6.0124398 Z M11.6890335,6.01979937 L11.6890335,2.99543376 C11.2131641,3.00856482 10.748971,3.06842645 10.3008787,3.17059408 L10.3327537,3.19509799 C10.2695534,3.27730979 10.1550783,3.44289243 10.0063199,3.68695031 C9.75639191,4.09699055 9.50600498,4.5758528 9.27207903,5.11862481 C9.1664136,5.36379742 9.06742008,5.613905 8.97562604,5.86879828 C9.67365441,5.96661268 10.5116451,6.02043947 11.5030548,6.02043947 C11.5655838,6.02043947 11.6275758,6.0202253 11.6890335,6.01979937 L11.6890335,6.01979937 Z M17.108395,5.27267939 C16.2771391,4.37559332 15.2174625,3.6931922 14.021821,3.31793189 C14.0474495,3.35860853 14.074225,3.40178814 14.1020538,3.44744495 C14.3628563,3.87532621 14.6231999,4.37323052 14.8659558,4.93649038 C14.969827,5.1774998 15.0674667,5.42309932 15.1584084,5.67315842 C15.4031477,5.61494845 15.6281577,5.55025958 15.8341446,5.47974171 C16.4042934,5.28455612 16.6978224,5.0982983 16.7955746,4.99008904 L17.108395,5.27267939 L17.108395,5.27267939 Z M6.75847578,5.17841643 C6.87958994,5.26517815 7.07347589,5.37127143 7.36243223,5.48276393 C7.68001849,5.60530316 8.06215969,5.71023854 8.51371728,5.79401556 C8.61675674,5.50212657 8.72891992,5.21621681 8.84947749,4.93649038 C9.09223337,4.37323052 9.35257699,3.87532621 9.6133795,3.44744495 C9.63556565,3.4110456 9.65708237,3.37622074 9.67788214,3.34298342 C8.55626369,3.70940324 7.55730038,4.3470421 6.75847578,5.17841643 L6.75847578,5.17841643 Z" id="path-1"></path>
     </defs>
-    <g id="icon-/-Networking-/-Network-Binding" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+    <g id="icon-/-Networking-/-NetBinding" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <mask id="mask-2" fill="white">
             <use xlink:href="#path-1"></use>
         </mask>
diff --git a/Assets/Editor/Icons/Components/Particle.svg b/Assets/Editor/Icons/Components/Particle.svg
index bfc3a328a9..fb20abb814 100644
--- a/Assets/Editor/Icons/Components/Particle.svg
+++ b/Assets/Editor/Icons/Components/Particle.svg
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
     <title>icon / Rendering / Particle</title>
-    <desc>Created with Sketch.</desc>
     <defs>
-        <path d="M13.8902989,18.59721 L12.4177497,14.3053849 L13.2016915,13.5285961 L14.6981867,17.9771173 C15.2864355,17.7806508 15.9607539,17.9479196 16.3857501,18.4510774 C16.941611,19.1089322 16.8617901,20.0933885 16.2065089,20.6527044 C15.5479689,21.2147652 14.5588447,21.1337307 14.000092,20.4724776 C13.5410629,19.9288095 13.5157757,19.1625471 13.8902989,18.59721 L13.8902989,18.59721 Z M6.53736753,17.083256 L10.8086268,13.4875806 L10.8086268,14.3053849 L7.31380216,17.8506485 C7.36110857,18.0125251 7.37219245,18.1874703 7.33940813,18.3644981 C7.22654505,18.9737601 6.63645226,19.3771157 6.02145296,19.2652738 C5.40645367,19.153432 4.99941505,18.5686785 5.11227813,17.9594165 C5.22531539,17.3499819 5.815234,16.9466263 6.4302333,17.0584682 C6.46669746,17.0650994 6.50243054,17.0733932 6.53736753,17.083256 L6.53736753,17.083256 Z M16.0664804,15.5788445 L13.9856334,13.9169905 L13.9856334,13.1402016 L16.614924,15.0011301 C17.0692194,14.7806075 17.6332169,14.8834669 17.9755021,15.2830737 C18.3803575,15.7553532 18.3221726,16.4634272 17.84537,16.8645885 C17.3687415,17.2655773 16.6541473,17.2079233 16.2492919,16.7356438 C15.964899,16.4036245 15.9091011,15.9552389 16.0664804,15.5788445 L16.0664804,15.5788445 Z M9.38198525,5.28244372 L11.2418369,9.64465182 L10.849866,9.98345908 L8.74052524,5.55677218 C8.38525208,5.58952301 8.01999805,5.45578684 7.77146745,5.16586631 C7.36661447,4.69341708 7.42497323,3.98552 7.90159877,3.58436106 C8.3782243,3.18320212 9.0928142,3.24102838 9.49766718,3.713305 C9.89839204,4.180766 9.84530337,4.87923601 9.38198525,5.28244372 L9.38198525,5.28244372 Z M4.82908598,11.9750183 L8.4980405,11.9750183 L8.4980405,12.7599563 L4.89132089,12.7599563 C4.83193654,12.9654947 4.71271628,13.1564789 4.53592702,13.3052141 C4.05912438,13.7063807 3.34453014,13.6487259 2.9398489,13.1762677 C2.53499346,12.703982 2.59317837,11.9958988 3.06998101,11.5949048 C3.54660945,11.1937382 4.26120369,11.251393 4.66605913,11.7236786 C4.73299934,11.8018301 4.78727461,11.8864288 4.82908598,11.9750183 L4.82908598,11.9750183 Z M19.7920296,11.6389459 L19.4892585,11.6389459 L13.9856334,12.7518073 L13.9856334,11.9750183 L19.1403163,10.793675 C18.9545708,10.2109291 19.1215403,9.54788631 19.6153487,9.12624161 C20.2738945,8.56393386 21.2630655,8.64496643 21.821757,9.30636818 C22.3775589,9.96414951 22.2976663,10.9485922 21.6425627,11.5079608 C21.1079287,11.9644649 20.3553002,11.9968522 19.7920296,11.6389459 L19.7920296,11.6389459 Z M13.9628513,4.20562284 C13.4677131,4.62220036 12.7256389,4.56233078 12.3053956,4.07172292 C11.8849713,3.58129432 11.9455747,2.84600991 12.440532,2.42943239 C12.9354892,2.01285487 13.6775634,2.0729037 14.0979876,2.5633323 C14.5184119,3.05394016 14.4578085,3.78922457 13.9628513,4.20562284 Z M17.5678607,4.60360659 C17.1025492,4.51898649 16.65543,4.82458795 16.5697168,5.28728834 C16.4838977,5.75069149 16.7929842,6.1947043 17.2588154,6.2794189 C17.7241479,6.36404283 18.171242,6.05841811 18.2569593,5.59556455 C18.3427717,5.13219745 18.0337285,4.68832785 17.5678607,4.60360659 Z M17.1590804,6.81041225 C16.3949363,6.67144737 15.8899179,5.94597215 16.0298318,5.19046971 C16.1698493,4.43462135 16.9029469,3.93355658 17.6675957,4.07261323 C18.4317557,4.21158101 18.9367552,4.93689671 18.7968468,5.69236991 C18.6568422,6.44836244 17.9237698,6.94947629 17.1590804,6.81041225 Z M3.80090493,3.89866328 C3.43852055,3.46980132 2.80194459,3.41760125 2.3761571,3.78116537 C1.94683705,4.14774581 1.89410634,4.79754459 2.25927999,5.22970749 C2.62166437,5.65856944 3.25824033,5.71076951 3.68402783,5.34720539 C4.11334788,4.98062495 4.16607858,4.33082618 3.80090493,3.89866328 Z M4.22287796,3.55343371 C4.77869713,4.21121508 4.69880924,5.19567105 4.04369943,5.75504497 C3.38522,6.31729609 2.39605379,6.23618316 1.83730696,5.57493705 C1.2814878,4.91715568 1.36137569,3.93269971 2.0164855,3.37332579 C2.67496492,2.81107467 3.66413113,2.89218761 4.22287796,3.55343371 Z M15.9637585,18.796285 C15.6015349,18.3674288 14.9649912,18.3152274 14.5391714,18.6788191 C14.1097803,19.0453263 14.0570605,19.6949413 14.4221336,20.1273292 C14.7844557,20.5561175 15.4210515,20.608271 15.8469189,20.2447951 C16.2763162,19.8782827 16.328995,19.2285223 15.9637585,18.796285 Z M21.3997682,9.6515791 C21.037419,9.22260205 20.4008824,9.17045345 19.9750203,9.53408119 C19.5456876,9.90067251 19.4929668,10.5502992 19.8581432,10.9826233 C20.2205276,11.4114853 20.8571036,11.4636853 21.2828911,11.1001212 C21.7122111,10.7335408 21.7649418,10.083742 21.3997682,9.6515791 Z M12.1792489,10.133741 L12.5567024,4.80715519 L13.2031708,4.80715519 L12.5567024,10.133741 L12.1792489,10.133741 Z M3.79438927,6.53749633 L4.57833113,5.76070744 L9.28198229,10.4214406 L8.89001136,11.1982295 L3.79438927,6.53749633 Z M13.985613,10.4214407 L13.985613,10.9570467 L13.2016916,10.4214407 L16.337459,6.51655461 L17.121401,7.31428515 L13.985613,10.4214407 Z" id="path-1"></path>
+        <path d="M14.0607748,19.0077454 L12.5882256,14.7159203 L13.3721675,13.9391315 L14.8686626,18.3876527 C15.4569114,18.1911862 16.1312298,18.358455 16.556226,18.8616128 C17.1120869,19.5194676 17.032266,20.5039239 16.3769848,21.0632398 C15.7184448,21.6253006 14.7293206,21.5442661 14.1705679,20.883013 C13.7115388,20.3393449 13.6862516,19.5730825 14.0607748,19.0077454 L14.0607748,19.0077454 Z M6.70784344,17.4937914 L10.9791027,13.898116 L10.9791027,14.7159203 L7.48427807,18.2611839 C7.53158448,18.4230605 7.54266836,18.5980057 7.50988404,18.7750335 C7.39702096,19.3842955 6.80692818,19.7876511 6.19192888,19.6758092 C5.57692958,19.5639674 5.16989096,18.9792139 5.28275405,18.3699519 C5.3957913,17.7605173 5.98570991,17.3571617 6.60070921,17.4690036 C6.63717337,17.4756348 6.67290646,17.4839286 6.70784344,17.4937914 L6.70784344,17.4937914 Z M16.2369563,15.9893799 L14.1561094,14.3275259 L14.1561094,13.550737 L16.7853999,15.4116656 C17.2396953,15.1911429 17.8036928,15.2940023 18.145978,15.6936091 C18.5508334,16.1658886 18.4926485,16.8739626 18.0158459,17.2751239 C17.5392175,17.6761127 16.8246232,17.6184587 16.4197678,17.1461792 C16.1353749,16.8141599 16.079577,16.3657744 16.2369563,15.9893799 L16.2369563,15.9893799 Z M9.55246117,5.69297913 L11.4123128,10.0551872 L11.0203419,10.3939945 L8.91100116,5.96730759 C8.555728,6.00005841 8.19047397,5.86632225 7.94194336,5.57640172 C7.53709038,5.10395248 7.59544914,4.3960554 8.07207468,3.99489646 C8.54870022,3.59373752 9.26329012,3.65156379 9.6681431,4.12384041 C10.068868,4.59130141 10.0157793,5.28977142 9.55246117,5.69297913 L9.55246117,5.69297913 Z M4.99956189,12.3855538 L8.66851642,12.3855538 L8.66851642,13.1704917 L5.06179681,13.1704917 C5.00241245,13.3760301 4.8831922,13.5670143 4.70640294,13.7157495 C4.2296003,14.1169161 3.51500605,14.0592613 3.11032482,13.5868031 C2.70546938,13.1145174 2.76365428,12.4064342 3.24045692,12.0054402 C3.71708536,11.6042736 4.4316796,11.6619284 4.83653504,12.134214 C4.90347526,12.2123656 4.95775052,12.2969643 4.99956189,12.3855538 L4.99956189,12.3855538 Z M19.9625055,12.0494813 L19.6597344,12.0494813 L14.1561094,13.1623427 L14.1561094,12.3855537 L19.3107922,11.2042104 C19.1250468,10.6214645 19.2920162,9.95842172 19.7858247,9.53677702 C20.4443704,8.97446927 21.4335414,9.05550183 21.9922329,9.71690359 C22.5480348,10.3746849 22.4681422,11.3591276 21.8130386,11.9184962 C21.2784046,12.3750003 20.5257761,12.4073876 19.9625055,12.0494813 L19.9625055,12.0494813 Z M14.1333272,4.61615825 C13.638189,5.03273576 12.8961148,4.97286619 12.4758715,4.48225833 C12.0554473,3.99182972 12.1160506,3.25654531 12.6110079,2.8399678 C13.1059652,2.42339028 13.8480393,2.4834391 14.2684635,2.97386771 C14.6888878,3.46447557 14.6282845,4.19975998 14.1333272,4.61615825 Z M17.7383366,5.01414199 C17.2730252,4.92952189 16.8259059,5.23512336 16.7401927,5.69782375 C16.6543736,6.1612269 16.9634601,6.6052397 17.4292913,6.68995431 C17.8946238,6.77457824 18.3417179,6.46895352 18.4274352,6.00609996 C18.5132476,5.54273285 18.2042044,5.09886325 17.7383366,5.01414199 Z M17.3295563,7.22094766 C16.5654122,7.08198278 16.0603938,6.35650756 16.2003077,5.60100512 C16.3403252,4.84515676 17.0734229,4.34409199 17.8380716,4.48314864 C18.6022317,4.62211641 19.1072311,5.34743212 18.9673227,6.10290532 C18.8273181,6.85889785 18.0942457,7.3600117 17.3295563,7.22094766 Z M3.97138085,4.30919868 C3.60899647,3.88033673 2.97242051,3.82813666 2.54663301,4.19170078 C2.11731296,4.55828122 2.06458226,5.20807999 2.4297559,5.64024289 C2.79214028,6.06910485 3.42871624,6.12130492 3.85450374,5.7577408 C4.28382379,5.39116036 4.33655449,4.74136158 3.97138085,4.30919868 Z M4.39335388,3.96396912 C4.94917304,4.62175049 4.86928515,5.60620646 4.21417534,6.16558038 C3.55569591,6.7278315 2.56652971,6.64671856 2.00778288,5.98547246 C1.45196371,5.32769109 1.5318516,4.34323512 2.18696141,3.7838612 C2.84544084,3.22161008 3.83460704,3.30272301 4.39335388,3.96396912 Z M16.1342345,19.2068204 C15.7720108,18.7779642 15.1354671,18.7257628 14.7096473,19.0893545 C14.2802562,19.4558617 14.2275364,20.1054767 14.5926095,20.5378646 C14.9549316,20.9666529 15.5915275,21.0188064 16.0173948,20.6553305 C16.4467921,20.2888181 16.4994709,19.6390577 16.1342345,19.2068204 Z M21.5702441,10.0621145 C21.2078949,9.63313746 20.5713583,9.58098886 20.1454963,9.9446166 C19.7161635,10.3112079 19.6634428,10.9608346 20.0286192,11.3931587 C20.3910035,11.8220207 21.0275795,11.8742207 21.453367,11.5106566 C21.882687,11.1440762 21.9354177,10.4942774 21.5702441,10.0621145 Z M12.3497248,10.5442764 L12.7271783,5.2176906 L13.3736468,5.2176906 L12.7271783,10.5442764 L12.3497248,10.5442764 Z M3.96486518,6.94803173 L4.74880704,6.17124285 L9.4524582,10.831976 L9.06048727,11.6087649 L3.96486518,6.94803173 Z M14.1560889,10.8319761 L14.1560889,11.3675821 L13.3721675,10.8319761 L16.5079349,6.92709002 L17.2918769,7.72482056 L14.1560889,10.8319761 Z" id="path-1"></path>
     </defs>
     <g id="icon-/-Rendering-/-Particle" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <mask id="mask-2" fill="white">
diff --git a/Assets/Editor/Icons/Components/PhysXCollider.svg b/Assets/Editor/Icons/Components/PhysXCollider.svg
index a35cc400a2..e7503fdf59 100644
--- a/Assets/Editor/Icons/Components/PhysXCollider.svg
+++ b/Assets/Editor/Icons/Components/PhysXCollider.svg
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
-    <title>icon / Physics  / PhysX /  Collider</title>
-    <desc>Created with Sketch.</desc>
+    <title>icon / Physics  / PhysX /  PrimitiveCollider</title>
     <defs>
-        <path d="M12.043679,5.12543204 C12.6455376,4.46828516 14.6137828,3.53572943 15.244248,3.33110407 C17.009147,2.75828401 18.7315616,2.38790865 20.0493963,2.16811396 C21.2646599,1.96542655 22.135872,1.89079171 22.3790759,1.90353749 C18.8152035,3.62798862 19.9408429,7.00209884 19.5932228,8.65045446 C19.3047236,10.0184689 19.0411048,10.4176579 19.0411048,10.4176579 C19.0411048,10.4176579 19.0421558,10.3901126 19.0428316,10.3391328 C18.3466128,12.0890837 16.5938037,13.2831335 14.6086839,13.1790978 C14.1703378,13.1561251 13.7498731,13.0713888 13.3552808,12.9337641 C13.7029408,13.6163616 13.881436,14.3966813 13.838464,15.2166358 C13.7692038,16.5381994 13.1385421,17.6972294 12.1896873,18.4747399 L12.1963718,18.4733283 C11.6414797,19.13201 9.60351024,20.09961 8.95986008,20.3085147 C5.56742949,21.4095705 2.28865841,21.5392397 1.78172358,21.5126723 C5.16300325,20.2460801 4.26326515,16.6375199 4.61088524,14.9891643 C4.89938446,13.6211499 5.16300325,13.2219608 5.16300325,13.2219608 C5.16300325,13.2219608 5.16289937,13.2246833 5.16273593,13.2300006 C5.87988102,11.5235982 7.60945094,10.3672474 9.56430092,10.4696968 C10.002647,10.4926695 10.4231118,10.5774058 10.8177041,10.7150305 C10.4700441,10.032433 10.2915489,9.25211326 10.3345209,8.43215881 C10.40524,7.08275773 11.0612604,5.90280964 12.043679,5.12543204 Z M9.17002893,17.9928546 C10.8338457,18.0800515 12.2533227,16.8019486 12.3405197,15.1381319 C12.4277166,13.4743151 11.1496137,12.054838 9.48579698,11.9676411 C7.82198023,11.8804441 6.40250316,13.158547 6.31530622,14.8223638 C6.22810928,16.4861805 7.50621217,17.9056576 9.17002893,17.9928546 Z M14.6871879,11.6811535 C16.3510046,11.7683504 17.7704817,10.4902476 17.8576786,8.8264308 C17.9448756,7.16261404 16.6667727,5.74313698 15.0029559,5.65594004 C13.3391392,5.5687431 11.9196621,6.84684599 11.8324652,8.51066274 C11.7452682,10.1744795 13.0233711,11.5939566 14.6871879,11.6811535 Z M9.44892816,9.41633625 C8.80658814,9.27851364 7.00329275,9.5141702 5.82367767,10.3697694 C4.61432252,11.2469398 3.19925517,12.75 2.71692188,13.1227631 C2.90564063,12.4636449 3.52626507,11.0682109 4.57879521,8.93646111 L1.646611,8.26788751 L4.57879521,6.41357644 L2.01674464,2.25 L6.20121245,4.5 L7.98683911,1.52934685 L8.55331654,4.5 C11.1035114,3.22719138 12.5893628,2.59078707 13.0108706,2.59078707 C12.3777116,3.34078707 11.035099,4.78582089 10.1767691,5.90383133 C9.31843918,7.02184178 9.34810954,8.59808265 9.44892816,9.41633625 Z M14.7587637,14.2497659 C15.4011037,14.3875886 17.2043991,14.151932 18.3840142,13.2963327 C19.5933693,12.4191624 21.0084367,10.9161022 21.4907699,10.5433391 C21.3020512,11.2024573 20.6814268,12.5978913 19.6288966,14.7296411 L22.5610808,15.3982147 L19.6288966,17.2525258 L22.1909472,21.4161022 L18.0064794,19.1661022 L16.2208527,22.1367553 L15.6543753,19.1661022 C13.1041804,20.4389108 11.618329,21.0753151 11.1968212,21.0753151 C11.8299803,20.3253151 13.1725928,18.8802813 14.0309227,17.7622709 C14.8892526,16.6442604 14.8595823,15.0680195 14.7587637,14.2497659 Z" id="path-1"></path>
+        <path d="M21.4907699,10.5433391 C21.3020512,11.2024573 20.6814268,12.5978913 19.6288966,14.7296411 L19.6288966,14.7296411 L22.5610808,15.3982147 L19.6288966,17.2525258 L22.1909472,21.4161022 L18.0064794,19.1661022 L16.2208527,22.1367553 L15.6543753,19.1661022 C13.1041804,20.4389108 11.618329,21.0753151 11.1968212,21.0753151 C11.8299803,20.3253151 13.1725928,18.8802813 14.0309227,17.7622709 C14.8892526,16.6442604 14.8595823,15.0680195 14.7587637,14.2497659 C15.4011037,14.3875886 17.2043991,14.151932 18.3840142,13.2963327 C19.5933693,12.4191624 21.0084367,10.9161022 21.4907699,10.5433391 Z M22.3790759,1.90353749 C19.8097725,3.14674644 19.6777979,5.24734988 19.6739828,6.94059186 L19.6739465,7.57297641 C19.6715755,7.97737876 19.6578963,8.34378364 19.5932228,8.65045446 C19.3047236,10.0184689 19.0411048,10.4176579 19.0411048,10.4176579 C19.0411048,10.4176579 19.0421558,10.3901126 19.0428316,10.3391328 C18.3466128,12.0890837 16.5938037,13.2831335 14.6086839,13.1790978 C14.1703378,13.1561251 13.7498731,13.0713888 13.3552808,12.9337641 C13.7029408,13.6163616 13.881436,14.3966813 13.838464,15.2166358 C13.7692038,16.5381994 13.1385421,17.6972294 12.1896873,18.4747399 L12.1963718,18.4733283 C11.6414797,19.13201 9.60351024,20.09961 8.95986008,20.3085147 C5.56742949,21.4095705 2.28865841,21.5392397 1.78172358,21.5126723 C5.16300325,20.2460801 4.26326515,16.6375199 4.61088524,14.9891643 C4.89938446,13.6211499 5.16300325,13.2219608 5.16300325,13.2219608 L5.16273593,13.2300006 C5.87988102,11.5235982 7.60945094,10.3672474 9.56430092,10.4696968 C10.002647,10.4926695 10.4231118,10.5774058 10.8177041,10.7150305 C10.4700441,10.032433 10.2915489,9.25211326 10.3345209,8.43215881 C10.40524,7.08275773 11.0612604,5.90280964 12.043679,5.12543204 C12.6455376,4.46828516 14.6137828,3.53572943 15.244248,3.33110407 C17.009147,2.75828401 18.7315616,2.38790865 20.0493963,2.16811396 C21.2646599,1.96542655 22.135872,1.89079171 22.3790759,1.90353749 Z M6.31530622,14.8223638 C6.22810928,16.4861805 7.50621217,17.9056576 9.17002893,17.9928546 C10.8338457,18.0800515 12.2533227,16.8019486 12.3405197,15.1381319 C12.4277166,13.4743151 11.1496137,12.054838 9.48579698,11.9676411 C7.82198023,11.8804441 6.40250316,13.158547 6.31530622,14.8223638 Z M7.98683911,1.52934685 L8.55331654,4.5 C11.1035114,3.22719138 12.5893628,2.59078707 13.0108706,2.59078707 C12.3777116,3.34078707 11.035099,4.78582089 10.1767691,5.90383133 C9.31843918,7.02184178 9.34810954,8.59808265 9.44892816,9.41633625 C8.80658814,9.27851364 7.00329275,9.5141702 5.82367767,10.3697694 C4.61432252,11.2469398 3.19925517,12.75 2.71692188,13.1227631 C2.90564063,12.4636449 3.52626507,11.0682109 4.57879521,8.93646111 L4.57879521,8.93646111 L1.646611,8.26788751 L4.57879521,6.41357644 L2.01674464,2.25 L6.20121245,4.5 L7.98683911,1.52934685 Z M11.8324652,8.51066274 C11.7452682,10.1744795 13.0233711,11.5939566 14.6871879,11.6811535 C16.3510046,11.7683504 17.7704817,10.4902476 17.8576786,8.8264308 C17.9448756,7.16261404 16.6667727,5.74313698 15.0029559,5.65594004 C13.3391392,5.5687431 11.9196621,6.84684599 11.8324652,8.51066274 Z" id="path-1"></path>
     </defs>
-    <g id="icon-/-Physics--/-PhysX-/--Collider" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+    <g id="icon-/-Physics--/-PhysX-/--PrimitiveCollider" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <mask id="mask-2" fill="white">
             <use xlink:href="#path-1"></use>
         </mask>
diff --git a/Assets/Editor/Icons/Components/PhysXRagdoll.svg b/Assets/Editor/Icons/Components/PhysXRagdoll.svg
index 82fabed936..b7eb823ced 100644
--- a/Assets/Editor/Icons/Components/PhysXRagdoll.svg
+++ b/Assets/Editor/Icons/Components/PhysXRagdoll.svg
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
     <title>icon / Physics  / PhysX / ragdoll</title>
-    <desc>Created with Sketch.</desc>
     <defs>
         <path d="M11.8480332,6.39683902 L9.34536997,7.30773395 L9.34536997,15.1456379 L10.4834726,15.8790622 L14.3629618,17.9906933 L16.7337828,17.5833364 L17.7664808,15.8790622 L17.7664808,8.58434379 L11.8480332,6.39683902 Z M18.8912,8.8798081 L18.8912,14.2867823 L20.4881928,15.1884775 L18.08798,19.4236113 L14.3173821,19.9400493 L13.0576372,22.6306649 L5.65749546,22.6306649 L9.33128484,17.2716353 L7.7728097,16.2555343 L4.57245497,18.3184106 L3.54439439,16.6574545 L4.57245497,16.040176 L4.57245497,9.04493294 L4.237333,9.16690736 L3.51180719,7.17354158 L8.74690658,5.26812123 L3.51180719,3.36270088 L4.237333,1.3693351 L11.8480332,4.13940344 L19.6921966,1.3693351 L20.4821716,3.36270088 L14.9491599,5.26812123 L20.4881928,7.17354158 L19.8243289,9.16690736 L18.8912,8.8798081 Z M8.20737156,7.70511516 L5.76528005,8.64195487 L5.76528005,15.4875756 L8.20737156,13.9411036 L8.20737156,7.70511516 Z M13.0576372,16.241668 C11.886078,16.241668 10.9363416,15.2919316 10.9363416,14.1203724 C10.9363416,12.9488133 11.886078,11.9990769 13.0576372,11.9990769 C14.2291964,11.9990769 15.1789328,12.9488133 15.1789328,14.1203724 C15.1789328,15.2919316 14.2291964,16.241668 13.0576372,16.241668 Z" id="path-1"></path>
     </defs>
diff --git a/Assets/Editor/Icons/Components/PhysicsConstraint.svg b/Assets/Editor/Icons/Components/PhysicsConstraint.svg
index 8b5394b2ac..b6c769bda0 100644
--- a/Assets/Editor/Icons/Components/PhysicsConstraint.svg
+++ b/Assets/Editor/Icons/Components/PhysicsConstraint.svg
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
-    <title>icon / Physics / Cry / Constraint</title>
-    <desc>Created with Sketch.</desc>
+    <title>icon / Physics / PhysX / PhysicsConstraint</title>
     <defs>
-        <path d="M8.64922765,13.850432 C8.82859372,14.2018836 8.97089521,14.5546589 9.17673598,14.8650747 C9.38059114,15.1708575 9.64930931,15.432957 10.015322,15.8625089 C8.32954569,15.8115451 6.78143782,15.8916311 5.27039453,15.687114 C3.34303664,15.4263383 2.00076953,13.6737134 2.08350296,11.8343839 C2.16756012,9.96593216 3.60844547,8.35428502 5.55367378,8.22786834 C7.4439671,8.10476101 9.35477831,8.10807034 11.2450716,8.23382515 C13.075135,8.35627062 14.527934,9.91364463 14.6808253,11.639133 C14.747674,12.3929999 14.4491718,12.8635877 13.8501817,12.951616 C13.2458968,13.0396444 12.8567188,12.6901784 12.7051511,11.9230741 C12.5105621,10.9395391 11.9909962,10.2981896 11.0226842,10.2485495 C9.25682193,10.1572118 7.48103168,10.1499313 5.71384569,10.2280317 C4.74685741,10.271053 4.10616976,11.0719126 4.08829934,11.938297 C4.06910518,12.8364511 4.70714537,13.6015698 5.7178169,13.7187204 C6.6702441,13.8292522 7.63657052,13.8107199 8.64922765,13.850432 Z M14.2608705,8.27678034 C15.5614399,8.24434884 16.9070164,8.1192559 18.2400173,8.20000373 C20.3765253,8.328406 21.9358849,10.0148442 21.9200001,12.0136837 C21.905439,13.9807537 20.3619642,15.6380697 18.2519309,15.7558821 C16.459594,15.8564859 14.6520341,15.8545003 12.8596972,15.745954 C10.9376342,15.6294654 9.4636555,14.0892999 9.31076413,12.2777688 C9.256491,11.6317862 9.48086405,11.1770833 10.1294941,11.0275013 C10.6900958,10.8984371 11.1361944,11.2823202 11.2824671,11.9594106 C11.5419192,13.1600381 12.1270099,13.7398339 13.3468316,13.7841791 C14.8903064,13.8410996 16.4384142,13.8338191 17.9825509,13.7815316 C19.1090492,13.7431433 19.8933621,12.9667728 19.9105707,12.0176549 C19.9284411,11.0414005 19.224876,10.315332 18.0513851,10.2021526 C17.2975181,10.1286854 16.5323994,10.1829585 15.7738994,10.1432464 C15.5852672,10.1333184 15.3317719,10.0280815 15.2331537,9.88180881 C14.8697885,9.34768181 14.5587108,8.77847584 14.2608705,8.27678034 Z" id="path-1"></path>
+        <path d="M8.64922765,13.850432 C8.82859372,14.2018836 8.97089521,14.5546589 9.17673598,14.8650747 C9.38059114,15.1708575 9.64930931,15.432957 10.015322,15.8625089 C8.32954569,15.8115451 6.78143782,15.8916311 5.27039453,15.687114 C3.34303664,15.4263383 2.00076953,13.6737134 2.08350296,11.8343839 C2.16756012,9.96593216 3.60844547,8.35428502 5.55367378,8.22786834 C7.4439671,8.10476101 9.35477831,8.10807034 11.2450716,8.23382515 C13.075135,8.35627062 14.527934,9.91364463 14.6808253,11.639133 C14.747674,12.3929999 14.4491718,12.8635877 13.8501817,12.951616 C13.2458968,13.0396444 12.8567188,12.6901784 12.7051511,11.9230741 C12.5105621,10.9395391 11.9909962,10.2981896 11.0226842,10.2485495 C9.25682193,10.1572118 7.48103168,10.1499313 5.71384569,10.2280317 C4.74685741,10.271053 4.10616976,11.0719126 4.08829934,11.938297 C4.06910518,12.8364511 4.70714537,13.6015698 5.7178169,13.7187204 C6.6702441,13.8292522 7.63657052,13.8107199 8.64922765,13.850432 Z M14.2608705,8.27678034 C15.5614399,8.24434884 16.9070164,8.1192559 18.2400173,8.20000373 C20.3765253,8.328406 21.9358849,10.0148442 21.9201204,12.0136837 C21.905439,13.9807537 20.3619642,15.6380697 18.2519309,15.7558821 C16.459594,15.8564859 14.6520341,15.8545003 12.8596972,15.745954 C10.9376342,15.6294654 9.4636555,14.0892999 9.31076413,12.2777688 C9.256491,11.6317862 9.48086405,11.1770833 10.1294941,11.0275013 C10.6900958,10.8984371 11.1361944,11.2823202 11.2824671,11.9594106 C11.5419192,13.1600381 12.1270099,13.7398339 13.3468316,13.7841791 C14.8903064,13.8410996 16.4384142,13.8338191 17.9825509,13.7815316 C19.1090492,13.7431433 19.8933621,12.9667728 19.9105707,12.0176549 C19.9284411,11.0414005 19.224876,10.315332 18.0513851,10.2021526 C17.2975181,10.1286854 16.5323994,10.1829585 15.7738994,10.1432464 C15.5852672,10.1333184 15.3317719,10.0280815 15.2331537,9.88180881 C14.8697885,9.34768181 14.5587108,8.77847584 14.2608705,8.27678034 Z" id="path-1"></path>
     </defs>
-    <g id="icon-/-Physics-/-Cry-/-Constraint" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+    <g id="icon-/-Physics-/-PhysX-/-PhysicsConstraint" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <mask id="mask-2" fill="white">
             <use xlink:href="#path-1"></use>
         </mask>
diff --git a/Assets/Editor/Icons/Components/PointLight.svg b/Assets/Editor/Icons/Components/PointLight.svg
index dc2321f89e..534c31f2b7 100644
--- a/Assets/Editor/Icons/Components/PointLight.svg
+++ b/Assets/Editor/Icons/Components/PointLight.svg
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
-    <title>icon / Rendering / Point Light</title>
-    <desc>Created with Sketch.</desc>
+    <title>icon / Rendering / PointLight</title>
     <defs>
-        <path d="M11.0039744,20.4705948 C11.5393978,21.1503288 13.4649954,21.1240649 13.8493579,20.4705948 L11.0039744,20.4705948 Z M12.4098795,18.9471874 C12.8523277,18.9471874 13.2948542,18.9522206 13.7372241,18.9438844 C13.8589659,18.941525 14.0228008,19.0217422 14.031329,18.6233302 C14.0400136,18.2162672 13.8775088,18.2727339 13.7527939,18.2719474 C12.8678975,18.2672288 11.9829228,18.2675433 11.0980264,18.2713183 C10.9715903,18.2719474 10.8095548,18.2255473 10.8223862,18.6296217 C10.8348264,19.0218995 10.9994438,18.9401094 11.1214984,18.9424688 C11.5508805,18.9506478 11.9804191,18.9456145 12.4098795,18.9471874 L12.4098795,18.9471874 Z M12.3797874,20.0090599 C12.8486026,20.0090599 13.3174177,20.0104378 13.7861546,20.0079576 C13.9060968,20.0074065 14.0347237,20.0052019 14.0331589,19.7053785 C14.0316723,19.4032128 13.9001506,19.4123067 13.7822426,19.4120312 C12.8838106,19.4096888 11.9852222,19.4089999 11.086712,19.4112044 C10.9719336,19.41148 10.8321184,19.3802025 10.8209301,19.6778212 C10.8080204,20.0246298 10.9597281,20.0071309 11.090624,20.0080954 C11.5203973,20.0109889 11.9500923,20.0091977 12.3797874,20.0090599 L12.3797874,20.0090599 Z M13.2607657,13.4947637 C12.8423777,14.33615 12.9912741,15.5980916 12.9993731,16.7900821 C13.0002814,16.9251159 13.0659817,16.9582688 13.1924623,16.9452498 C13.596201,16.9036951 14.1723547,16.6033321 14.2230681,16.1863474 C14.3123841,15.4519879 14.5085766,14.7623622 14.9058059,14.1261747 C15.1081294,13.8022149 15.4106261,13.4539499 15.7053802,13.1295359 C16.2802575,12.5331621 16.3863751,11.6125545 16.282181,11.1194792 C16.1343075,10.4197004 15.8025237,9.83930799 15.3809974,9.26465773 C14.5181894,8.08848671 13.3847841,7.39764992 11.9494452,7.51746964 C10.1519223,7.66756599 8.93608888,8.752453 8.22519383,10.380654 C7.93143491,11.0536276 7.82338977,11.8171831 8.09064542,12.4952166 C8.27274784,12.7688913 8.44538055,13.0085133 8.64543332,13.2286243 C9.38138228,14.0383725 9.92726975,14.9343334 10.0408828,16.0513893 C10.097273,16.606057 10.243509,16.7726541 10.7758477,16.9037519 C11.0066313,16.9606719 10.9940011,16.9911189 11.2299317,17.0267696 C11.4405056,17.0586358 11.5379963,17.0083766 11.5475335,16.75428 C11.5882555,15.6633377 11.4969715,14.6108467 11.0690872,13.5781111 C10.865931,13.0877813 10.6415761,12.4372614 10.5233511,12.1323409 C10.4051261,11.8274204 10.3156207,11.6908656 10.6150333,11.5694299 C10.9144459,11.4479943 11.0056578,11.7906463 11.0802895,12.0394533 C11.0986069,12.2095322 11.1946594,12.2732645 11.3625433,12.2645599 C11.5379206,12.2554013 12.013591,12.2747973 12.1886866,12.2747973 C12.6309555,12.2747973 12.5785397,12.2645599 13.0031142,12.2645599 C13.1924623,12.2747973 13.2726196,12.0804781 13.3015338,12.0270399 C13.4098484,11.8264572 13.3755601,11.4516327 13.7381227,11.5354232 C14.1248308,11.624815 13.9705714,11.9055741 13.8822394,12.1594244 C13.7618604,12.4690754 13.6791537,12.6533774 13.2607657,13.4947637 Z M13.059965,12.9584771 C13.1175824,12.7896262 13.1342274,12.6776725 12.8985565,12.6807935 C12.4208926,12.6871154 11.9430688,12.6852748 11.465405,12.6815937 C11.2670253,12.6800733 11.2473679,12.7651457 11.3079976,12.9322292 C11.465405,13.3660132 11.770323,14.3349715 11.9334121,14.7679018 C11.9334121,15.4766571 11.9554987,15.6348818 11.9334121,16.3511774 C11.9260499,16.5900493 11.9317316,16.7591709 11.9334121,16.9983629 C11.9343724,17.1280819 11.9744652,17.3020965 12.1866091,17.3078583 C12.415398,17.3141002 12.4692272,17.1912714 12.4683469,17.0392256 C12.4637856,16.2821977 12.4609847,15.5250098 12.4576237,14.7679018 C12.6576839,14.1645202 12.8543832,13.5599381 13.059965,12.9584771 Z M15.5561654,14.6554468 C15.1950967,15.240503 14.9633469,15.8726933 14.8982874,16.562661 C14.8592356,16.977906 14.6707695,17.3160081 14.3141021,17.5263114 C14.0276159,17.6951623 13.8810512,17.659675 13.5698375,17.7839524 C13.7525325,17.7839524 13.9012002,17.815694 14.0804475,17.868768 C14.3564163,17.9504805 14.6827562,18.109812 14.5827261,18.6695005 C14.4963,19.1523659 14.4265891,18.9822162 14.5827261,19.4085753 C14.6799129,19.673961 14.5116974,20.4812898 14.0804475,20.9316398 C13.6491977,21.3819899 13.2534311,21.4608118 12.9315742,21.4766565 C12.3888508,21.5035446 11.8342986,21.5614912 11.3081402,21.3752751 C10.5694378,21.1139964 10.101697,20.2008415 10.2788703,19.4271686 C10.3137608,19.2748828 10.274549,19.1440434 10.2396585,19 C10.101857,18.4315889 10.4387848,17.9814882 10.9349341,17.8158383 C10.5318528,17.7075657 10.1458966,17.6426662 9.83916424,17.38971 C9.63086153,17.2178983 9.4278404,17.0252803 9.40751428,16.7446358 C9.3265299,15.6241385 8.8586658,14.593961 8.16377984,13.8166343 C7.76979732,13.37591 7.49372655,13 7.25810683,12.2575729 C6.6568058,10.4026945 7.85144581,8.63443412 9.21073504,7.62597051 C12.1994748,5.40874298 16.1994791,7.27202395 17.0110834,10.4301747 C17.1345606,10.9103993 17.1209393,11.2191923 17.0895699,11.7117406 C16.9279743,13.2144364 16.112733,13.7535753 15.5561654,14.6554468 Z M12.8546513,1.78536442 C12.8546513,2.6733431 12.7846302,4.59108912 12.7508601,4.67367398 C12.6693955,4.87293397 12.5000646,4.93871378 12.2980037,4.91478657 C12.0927419,4.89037922 12.0012744,4.75041709 12.0005542,4.55755902 C11.9971932,3.58814717 11.9995139,2.61881534 11.9988737,1.64940349 C11.9987136,1.40653037 12.1484387,1.33346837 12.381869,1.32250507 C12.6513101,1.34379148 12.8546513,1.513764 12.8546513,1.78536442 Z M18.3706075,11.0432284 C19.36705,11.0432284 20.3012105,11.0310647 21.2967102,11.0432284 C21.5148559,11.0458692 21.654818,11.2283241 21.6396935,11.4563128 C21.6252891,11.6753387 21.5081338,11.832586 21.2600592,11.8329061 C20.3166551,11.8337864 19.3732511,11.8365873 18.4298471,11.8313057 C18.0502928,11.829145 18.0241516,11.7207879 18.0339946,11.4371825 C18.0438376,11.1535771 18.1457663,11.0432284 18.3706075,11.0432284 Z M6.00509137,11.5007759 C5.97596234,11.730497 5.75573959,11.8351247 5.5327827,11.8344341 C4.62666687,11.8316273 3.7206154,11.834194 2.81444431,11.834194 C2.62377423,11.834194 2.54911919,11.8220304 2.47218127,11.747768 C2.39524335,11.6735056 2.36086775,11.3551863 2.46689968,11.1441627 C2.53994244,11.0398749 2.74050205,11.0548188 2.81444431,11.0548988 C3.85907881,11.0568194 4.56656903,11.0568194 5.69165542,11.1146174 C5.89611697,11.1146174 6.0342204,11.2710548 6.00509137,11.5007759 Z M20.5296566,5.01866221 C19.8412093,5.7158321 19.1502813,6.4106813 18.4542317,7.1002489 C18.2899423,7.26293788 18.092923,7.28454439 17.9255926,7.10585059 C17.757382,6.9261965 17.8048362,6.7388601 17.9664049,6.57657124 C18.6327655,5.90692964 19.3012868,5.23936866 19.9689278,4.57092742 C20.1037684,4.4360068 20.2574946,4.37686899 20.4365886,4.47417829 C20.5631867,4.54291898 20.627366,4.65543286 20.6171229,4.84276926 C20.5991975,4.88030056 20.5814322,4.96624643 20.5296566,5.01866221 Z M6.78189229,7.19233251 C6.59991751,7.27971882 6.45155284,7.21097813 6.31751249,7.07597748 C5.85897444,6.61391838 5.3971554,6.15506023 4.93685682,5.6946016 C4.7208718,5.47853655 4.49976523,5.2671129 4.29194266,5.04336554 C4.14517848,4.88523793 4.14229761,4.70582392 4.2910624,4.54313494 C4.43670625,4.38372695 4.62108175,4.40685391 4.75616242,4.5290507 C5.51255014,5.21325669 6.22180367,5.94587725 6.92177441,6.68714042 C6.96282677,6.73067353 6.96866853,6.80741663 6.98083219,6.8408667 C6.98043207,7.02028072 6.91065106,7.13047389 6.78189229,7.19233251 Z" id="path-1"></path>
+        <path d="M11.0039744,20.4705948 C11.5393978,21.1503288 13.4649954,21.1240649 13.8493579,20.4705948 L11.0039744,20.4705948 Z M12.4098795,18.9471874 C12.8523277,18.9471874 13.2948542,18.9522206 13.7372241,18.9438844 C13.8589659,18.941525 14.0228008,19.0217422 14.031329,18.6233302 C14.0400136,18.2162672 13.8775088,18.2727339 13.7527939,18.2719474 C12.8678975,18.2672288 11.9829228,18.2675433 11.0980264,18.2713183 C10.9715903,18.2719474 10.8095548,18.2255473 10.8223862,18.6296217 C10.8348264,19.0218995 10.9994438,18.9401094 11.1214984,18.9424688 C11.5508805,18.9506478 11.9804191,18.9456145 12.4098795,18.9471874 L12.4098795,18.9471874 Z M12.3797874,20.0090599 C12.8486026,20.0090599 13.3174177,20.0104378 13.7861546,20.0079576 C13.9060968,20.0074065 14.0347237,20.0052019 14.033173,19.7053785 C14.0316723,19.4032128 13.9001506,19.4123067 13.7822426,19.4120312 C12.8838106,19.4096888 11.9852222,19.4089999 11.086712,19.4112044 C10.9719336,19.41148 10.8321184,19.3802025 10.8209301,19.6778212 C10.8080204,20.0246298 10.9597281,20.0071309 11.090624,20.0080954 C11.5203973,20.0109889 11.9500923,20.0091977 12.3797874,20.0090599 L12.3797874,20.0090599 Z M13.2607657,13.4947637 C12.8423777,14.33615 12.9912741,15.5980916 12.9993731,16.7900821 C13.0002814,16.9251159 13.0659817,16.9582688 13.1924623,16.9452498 C13.596201,16.9036951 14.1723547,16.6033321 14.2230681,16.1863474 C14.3123841,15.4519879 14.5085766,14.7623622 14.9058059,14.1261747 C15.1081294,13.8022149 15.4106261,13.4539499 15.7053802,13.1295359 C16.2802575,12.5331621 16.3863751,11.6125545 16.282181,11.1194792 C16.1343075,10.4197004 15.8025237,9.83930799 15.3809974,9.26465773 C14.5181894,8.08848671 13.3847841,7.39764992 11.9494452,7.51746964 C10.1519223,7.66756599 8.93608888,8.752453 8.22519383,10.380654 C7.93143491,11.0536276 7.82338977,11.8171831 8.09064542,12.4952166 C8.27274784,12.7688913 8.44538055,13.0085133 8.64543332,13.2286243 C9.38138228,14.0383725 9.92726975,14.9343334 10.0408828,16.0513893 C10.097273,16.606057 10.243509,16.7726541 10.7758477,16.9037519 C11.0066313,16.9606719 10.9940011,16.9911189 11.2299317,17.0267696 C11.4405056,17.0586358 11.5379963,17.0083766 11.5475335,16.75428 C11.5882555,15.6633377 11.4969715,14.6108467 11.0690872,13.5781111 C10.865931,13.0877813 10.6415761,12.4372614 10.5233511,12.1323409 C10.4051261,11.8274204 10.3156207,11.6908656 10.6150333,11.5694299 C10.9144459,11.4479943 11.0056578,11.7906463 11.0802895,12.0394533 C11.0986069,12.2095322 11.1946594,12.2732645 11.3625433,12.2645599 C11.5379206,12.2554013 12.013591,12.2747973 12.1886866,12.2747973 C12.6309555,12.2747973 12.5785397,12.2645599 13.0031142,12.2645599 C13.1924623,12.2747973 13.2726196,12.0804781 13.3015338,12.0270399 C13.4098484,11.8264572 13.3755601,11.4516327 13.7381227,11.5354232 C14.1248308,11.624815 13.9705714,11.9055741 13.8822394,12.1594244 C13.7618604,12.4690754 13.6791537,12.6533774 13.2607657,13.4947637 Z M13.059965,12.9584771 C13.1175824,12.7896262 13.1342274,12.6776725 12.8985565,12.6807935 C12.4208926,12.6871154 11.9430688,12.6852748 11.465405,12.6815937 C11.2670253,12.6800733 11.2473679,12.7651457 11.3079976,12.9322292 C11.465405,13.3660132 11.770323,14.3349715 11.9334121,14.7679018 C11.9334121,15.4766571 11.9554987,15.6348818 11.9334121,16.3511774 C11.9260499,16.5900493 11.9317316,16.7591709 11.9334121,16.9983629 C11.9343724,17.1280819 11.9744652,17.3020965 12.1866091,17.3078583 C12.415398,17.3141002 12.4692272,17.1912714 12.4683469,17.0392256 C12.4637856,16.2821977 12.4609847,15.5250098 12.4576237,14.7679018 C12.6576839,14.1645202 12.8543832,13.5599381 13.059965,12.9584771 Z M17.0110834,10.4301747 C17.1345606,10.9103993 17.1209393,11.2191923 17.0895699,11.7117406 C16.9279743,13.2144364 16.112733,13.7535753 15.5561654,14.6554468 C15.1950967,15.240503 14.9633469,15.8726933 14.8982874,16.562661 C14.8592356,16.977906 14.6707695,17.3160081 14.3141021,17.5263114 C14.0276159,17.6951623 13.8810512,17.659675 13.5698375,17.7839524 C13.7525325,17.7839524 13.9012002,17.815694 14.0804475,17.868768 C14.3564163,17.9504805 14.6827562,18.109812 14.5827261,18.6695005 C14.4963,19.1523659 14.4265891,18.9822162 14.5827261,19.4085753 C14.6799129,19.673961 14.5116974,20.4812898 14.0804475,20.9316398 C13.6491977,21.3819899 13.2534311,21.4608118 12.9315742,21.4766565 C12.3888508,21.5035446 11.8342986,21.5614912 11.3081402,21.3752751 C10.5694378,21.1139964 10.101697,20.2008415 10.2788703,19.4271686 C10.3137608,19.2748828 10.274549,19.1440434 10.2396585,19 C10.101857,18.4315889 10.4387848,17.9814882 10.9349341,17.8158383 C10.5318528,17.7075657 10.1458966,17.6426662 9.83916424,17.38971 C9.63086153,17.2178983 9.4278404,17.0252803 9.40751428,16.7446358 C9.3265299,15.6241385 8.8586658,14.593961 8.16377984,13.8166343 C7.76979732,13.37591 7.49372655,13 7.25810683,12.2575729 C6.6568058,10.4026945 7.85144581,8.63443412 9.21073504,7.62597051 C12.1994748,5.40874298 16.1994791,7.27202395 17.0110834,10.4301747 Z M21.2967102,11.0432284 C21.5148559,11.0458692 21.654818,11.2283241 21.6396935,11.4563128 C21.6252891,11.6753387 21.5081338,11.832586 21.2600592,11.8329061 C20.3166551,11.8337864 19.3732511,11.8365873 18.4298471,11.8313057 C18.0502928,11.829145 18.0241516,11.7207879 18.0339946,11.4371825 C18.0438376,11.1535771 18.1457663,11.0432284 18.3706075,11.0432284 C19.36705,11.0432284 20.3012105,11.0310647 21.2967102,11.0432284 Z M2.81444431,11.0548988 C3.85907881,11.0568194 4.56656903,11.0568194 5.69165542,11.1146174 C5.89611697,11.1146174 6.0342204,11.2710548 6.00509137,11.5007759 C5.97596234,11.730497 5.75573959,11.8351247 5.5327827,11.8344341 C4.62666687,11.8316273 3.7206154,11.834194 2.81444431,11.834194 C2.62377423,11.834194 2.54911919,11.8220304 2.47218127,11.747768 C2.39524335,11.6735056 2.36086775,11.3551863 2.46689968,11.1441627 C2.53994244,11.0398749 2.74050205,11.0548188 2.81444431,11.0548988 Z M20.4365886,4.47417829 C20.5631867,4.54291898 20.627366,4.65543286 20.6171229,4.84276926 C20.5991975,4.88030056 20.5814322,4.96624643 20.5296566,5.01866221 C19.8412093,5.7158321 19.1502813,6.4106813 18.4542317,7.1002489 C18.2899423,7.26293788 18.092923,7.28454439 17.9255926,7.10585059 C17.757382,6.9261965 17.8048362,6.7388601 17.9664049,6.57657124 C18.6327655,5.90692964 19.3012868,5.23936866 19.9689278,4.57092742 C20.1037684,4.4360068 20.2574946,4.37686899 20.4365886,4.47417829 Z M4.75616242,4.5290507 C5.51255014,5.21325669 6.22180367,5.94587725 6.92177441,6.68714042 C6.96282677,6.73067353 6.96866853,6.80741663 6.98083219,6.8408667 C6.98043207,7.02028072 6.91065106,7.13047389 6.78189229,7.19233251 C6.59991751,7.27971882 6.45155284,7.21097813 6.31751249,7.07597748 C5.85897444,6.61391838 5.3971554,6.15506023 4.93685682,5.6946016 C4.7208718,5.47853655 4.49976523,5.2671129 4.29194266,5.04336554 C4.14517848,4.88523793 4.14229761,4.70582392 4.2910624,4.54313494 C4.43670625,4.38372695 4.62108175,4.40685391 4.75616242,4.5290507 Z M12.381869,1.32250507 C12.6513101,1.34379148 12.8546513,1.513764 12.8546513,1.78536442 C12.8546513,2.6733431 12.7846302,4.59108912 12.7508601,4.67367398 C12.6693955,4.87293397 12.5000646,4.93871378 12.2980037,4.91478657 C12.0927419,4.89037922 12.0012744,4.75041709 12.0005542,4.55755902 C11.9971932,3.58814717 11.9995139,2.61881534 11.9988737,1.64940349 C11.9987136,1.40653037 12.1484387,1.33346837 12.381869,1.32250507 Z" id="path-1"></path>
     </defs>
-    <g id="icon-/-Rendering-/-Point-Light" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+    <g id="icon-/-Rendering-/-PointLight" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <mask id="mask-2" fill="white">
             <use xlink:href="#path-1"></use>
         </mask>
diff --git a/Assets/Editor/Icons/Components/PolygonPrism.svg b/Assets/Editor/Icons/Components/PolygonPrism.svg
index 54702e5678..295fa022c5 100644
--- a/Assets/Editor/Icons/Components/PolygonPrism.svg
+++ b/Assets/Editor/Icons/Components/PolygonPrism.svg
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
-    <title>icon / Shapes / Polygon Prism Shape</title>
-    <desc>Created with Sketch.</desc>
+    <title>icon / Shapes / PolygonPrism</title>
     <defs>
         <path d="M19.9017239,5.27764074 L15.8749409,3.39494038 L12.934303,5.60108461 L16.511702,8.1367453 L19.9017239,5.27764074 Z M14.9503518,8.36249704 L12.0210661,6.28621909 L9.25353102,8.36249704 L14.9503518,8.36249704 Z M9.52998834,3.18810609 L12.0053289,4.94262769 L14.343985,3.18810609 L9.52998834,3.18810609 L9.52998834,3.18810609 Z M3.95625753,5.62776217 L7.63852378,8.2187203 L11.092092,5.62776217 L7.9824946,3.4236793 L3.95625753,5.62776217 Z M8.21789762,14.4595831 L15.8351155,14.4595831 L15.9290657,14.5125239 L15.9290657,9.7479088 L8.21789762,9.7479088 L8.21789762,14.4595831 Z M7.20742071,14.5124396 L7.20742071,9.88310602 L2.96107346,6.3077052 L2.86163064,16.9500775 L7.20742071,14.5124396 Z M8.21789762,20.4321632 L15.9290657,20.4321632 L15.9290657,16.1915223 L15.4889456,15.9890137 L8.37165088,15.9890137 L8.21789762,16.0689342 L8.21789762,20.4321632 L8.21789762,20.4321632 Z M7.20742071,19.9359513 L7.20742071,16.2905422 L4.60896521,17.7480662 L7.20742071,19.9359513 Z M16.9395426,14.6242043 L20.986906,16.6338121 L20.986906,6.19452546 L16.9395426,9.84259567 L16.9395426,14.6242043 Z M16.9395426,19.8373467 L19.428755,17.5937078 L16.9395426,16.3577573 L16.9395426,19.8373467 L16.9395426,19.8373467 Z M21.9973829,17.3534034 L21.4660563,17.8323119 L16.849041,21.993835 L7.25618921,21.993835 L1.90393561,17.5019559 L1.95843809,5.46349178 L1.95915632,5.38662663 L2.02910093,5.34739335 L7.98580078,2.00616503 L15.8351155,2.00616503 L21.7321276,4.93416544 L21.9973829,5.0658707 L21.9973829,5.28373728 L21.9973829,17.1355368 L21.9973829,17.3534034 Z" id="path-1"></path>
     </defs>
-    <g id="icon-/-Shapes-/-Polygon-Prism-Shape" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+    <g id="icon-/-Shapes-/-PolygonPrism" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <mask id="mask-2" fill="white">
             <use xlink:href="#path-1"></use>
         </mask>
diff --git a/Assets/Editor/Icons/Components/PolygonPrism_Shape.svg b/Assets/Editor/Icons/Components/PolygonPrism_Shape.svg
new file mode 100644
index 0000000000..419e00f121
--- /dev/null
+++ b/Assets/Editor/Icons/Components/PolygonPrism_Shape.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Shapes / PolygonPrismShape</title>
+    <defs>
+        <path d="M19.9017239,5.27764074 L15.8749409,3.39494038 L12.934303,5.60108461 L16.511702,8.1367453 L19.9017239,5.27764074 Z M14.9503518,8.36249704 L12.0210661,6.28621909 L9.25353102,8.36249704 L14.9503518,8.36249704 Z M9.52998834,3.18810609 L12.0053289,4.94262769 L14.343985,3.18810609 L9.52998834,3.18810609 L9.52998834,3.18810609 Z M3.95625753,5.62776217 L7.63852378,8.2187203 L11.092092,5.62776217 L7.9824946,3.4236793 L3.95625753,5.62776217 Z M8.21789762,14.4595831 L15.8351155,14.4595831 L15.9290657,14.5125239 L15.9290657,9.7479088 L8.21789762,9.7479088 L8.21789762,14.4595831 Z M7.20742071,14.5124396 L7.20742071,9.88310602 L2.96107346,6.3077052 L2.86163064,16.9500775 L7.20742071,14.5124396 Z M8.21789762,20.4321632 L15.9290657,20.4321632 L15.9290657,16.1915223 L15.4889456,15.9890137 L8.37165088,15.9890137 L8.21789762,16.0689342 L8.21789762,20.4321632 L8.21789762,20.4321632 Z M7.20742071,19.9359513 L7.20742071,16.2905422 L4.60896521,17.7480662 L7.20742071,19.9359513 Z M16.9395426,14.6242043 L20.986906,16.6338121 L20.986906,6.19452546 L16.9395426,9.84259567 L16.9395426,14.6242043 Z M16.9395426,19.8373467 L19.428755,17.5937078 L16.9395426,16.3577573 L16.9395426,19.8373467 L16.9395426,19.8373467 Z M21.9973829,17.3534034 L21.4660563,17.8323119 L16.849041,21.993835 L7.25618921,21.993835 L1.90393561,17.5019559 L1.95843809,5.46349178 L1.95915632,5.38662663 L2.02910093,5.34739335 L7.98580078,2.00616503 L15.8351155,2.00616503 L21.7321276,4.93416544 L21.9973829,5.0658707 L21.9973829,5.28373728 L21.9973829,17.1355368 L21.9973829,17.3534034 Z" id="path-1"></path>
+    </defs>
+    <g id="icon-/-Shapes-/-PolygonPrismShape" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <mask id="mask-2" fill="white">
+            <use xlink:href="#path-1"></use>
+        </mask>
+        <use id="Shape" fill="#5A69A1" fill-rule="nonzero" xlink:href="#path-1"></use>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/ProjectorLight.svg b/Assets/Editor/Icons/Components/ProjectorLight.svg
index 8510ddd97c..cd9eb3d811 100644
--- a/Assets/Editor/Icons/Components/ProjectorLight.svg
+++ b/Assets/Editor/Icons/Components/ProjectorLight.svg
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
-    <title>icon / Rendering / Projector Light</title>
-    <desc>Created with Sketch.</desc>
+    <title>icon / Rendering / ProjectorLight</title>
     <defs>
         <path d="M3.80820088,6.90293957 C3.81434755,6.90293957 3.81303329,6.90426001 3.81303329,6.90553645 L3.81303329,17.4000226 L12.2176097,17.4026195 C12.211463,17.4026195 12.2127772,17.4012991 12.2127772,17.4000226 L12.2127772,15.3026835 L14.3127132,15.3026835 L14.3127132,9.00287556 L12.2127772,9.00287556 L12.2127772,6.90553645 L3.80820088,6.90293957 Z M14.3138088,7.95290756 C14.8930851,7.95290756 15.3626812,8.42251297 15.3626812,8.9997573 L15.3626812,15.3058018 C15.3626812,15.8839609 14.8911088,16.3526515 14.3138088,16.3526515 L13.1449081,16.3584014 L13.1449081,17.4000226 C13.169096,17.9861548 12.6063151,18.3560013 12.27958,18.3560013 L3.8701712,18.3560013 C3.12672687,18.3560013 2.49454948,17.9243807 2.49454948,16.8907887 C2.49454948,16.2017273 2.50592504,13.0099047 2.52867615,7.31532082 C2.52867615,6.15648121 2.59569996,5.82170689 3.7515268,5.82170689 L12.27958,5.82170689 C12.9793604,5.82170689 13.2699595,6.39028754 13.2699595,7.05094252 L13.2699595,7.95290756 L14.3138088,7.95290756 Z M17.2150389,6.16909157 C17.3892152,6.34326788 17.4662487,6.68113548 17.3866313,6.76075288 L16.1898732,7.95751098 C16.1102558,8.03712838 15.8067783,7.92863112 15.6323916,7.75424445 C15.4580049,7.57985778 15.3430392,7.26991176 15.4226566,7.19029436 L16.6194147,5.99353626 C16.6990321,5.91391886 17.0406523,5.9947049 17.2150389,6.16909157 Z M19.1623344,4.22179611 C19.3365107,4.39597242 19.4135442,4.73384002 19.3339268,4.81345742 L18.1371687,6.01021552 C18.0575513,6.08983292 17.7540737,5.98133566 17.5796871,5.80694899 C17.4053004,5.63256232 17.2903347,5.3226163 17.3699521,5.2429989 L18.5667102,4.0462408 C18.6463276,3.9666234 18.9879477,4.04740944 19.1623344,4.22179611 Z M21.1096298,2.27450065 C21.2838062,2.44867695 21.3608397,2.78654455 21.2812223,2.86616196 L20.0844642,4.06292006 C20.0048468,4.14253746 19.7013692,4.03404019 19.5269825,3.85965353 C19.3525959,3.68526686 19.2376301,3.37532084 19.3172475,3.29570344 L20.5140056,2.09894534 C20.593623,2.01932794 20.9352432,2.10011398 21.1096298,2.27450065 Z M17.4045557,17.8342159 C17.2303793,18.0083923 16.8925117,18.0854258 16.8128943,18.0058084 L15.6161362,16.8090503 C15.5365188,16.7294329 15.6450161,16.4259553 15.8194028,16.2515686 C15.9937894,16.077182 16.3037355,15.9622162 16.3833529,16.0418337 L17.580111,17.2385917 C17.6597284,17.3182092 17.5789423,17.6598293 17.4045557,17.8342159 Z M19.3518511,19.7815114 C19.1776748,19.9556877 18.8398072,20.0327212 18.7601898,19.9531038 L17.5634317,18.7563457 C17.4838143,18.6767283 17.5923116,18.3732508 17.7666982,18.1988641 C17.9410849,18.0244774 18.2510309,17.9095117 18.3306483,17.9891291 L19.5274064,19.1858872 C19.6070238,19.2655046 19.5262378,19.6071247 19.3518511,19.7815114 Z M21.2991466,21.7288069 C21.1249703,21.9029832 20.7871027,21.9800167 20.7074853,21.9003993 L19.5107272,20.7036412 C19.4311098,20.6240238 19.539607,20.3205462 19.7139937,20.1461595 C19.8883804,19.9717729 20.1983264,19.8568072 20.2779438,19.9364246 L21.4747019,21.1331827 C21.5543193,21.2128001 21.4735332,21.5544202 21.2991466,21.7288069 Z" id="path-1"></path>
     </defs>
-    <g id="icon-/-Rendering-/-Projector-Light" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+    <g id="icon-/-Rendering-/-ProjectorLight" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <mask id="mask-2" fill="white">
             <use xlink:href="#path-1"></use>
         </mask>
diff --git a/Assets/Editor/Icons/Components/RandomTimedSpawner.svg b/Assets/Editor/Icons/Components/RandomTimedSpawner.svg
index dbe29ba02e..d707b8bc17 100644
--- a/Assets/Editor/Icons/Components/RandomTimedSpawner.svg
+++ b/Assets/Editor/Icons/Components/RandomTimedSpawner.svg
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
-    <title>icon / Gameplay / Random timed spawner</title>
-    <desc>Created with Sketch.</desc>
+    <title>icon / Gameplay / RandomTimedSpawner</title>
     <defs>
-        <path d="M15.732635,16.526469 L15.732635,17.9658482 L18.0341518,15.9867018 L15.732635,14.127035 L15.732635,15.3869604 L13.564561,15.3869604 L11.6450591,13.3920313 L13.564561,11.3971021 L15.732635,11.3971021 L15.732635,12.6570275 L18.0341518,10.7973608 L15.732635,8.81821428 L15.732635,10.2575935 L13.0488627,10.2575935 L10.8389978,12.5542956 L8.77491792,10.4091071 L5.50021567,10.4091071 C5.17385404,10.4091071 4.90928568,10.6641948 4.90928568,10.9788614 C4.90928568,11.293528 5.17385404,11.5486157 5.50021567,11.5486157 L8.25921963,11.5486157 L10.0329365,13.3920313 L8.25921963,15.2354468 L5.50021567,15.2354468 C5.17385404,15.2354468 4.90928568,15.4905345 4.90928568,15.8052011 C4.90928568,16.1198677 5.17385404,16.3749554 5.50021567,16.3749554 L8.77491792,16.3749554 L10.8389978,14.2297669 L13.0488627,16.526469 L15.732635,16.526469 Z M11.4717187,22.7385268 C6.96876116,22.7385268 3.31839282,19.0809165 3.31839282,14.5690256 C3.31839282,10.0571346 6.96876116,1.26147319 11.4717187,1.26147319 C15.9746763,1.26147319 19.6250446,10.0571346 19.6250446,14.5690256 C19.6250446,19.0809165 15.9746763,22.7385268 11.4717187,22.7385268 Z" id="path-1"></path>
+        <path d="M11.4717187,1.26147319 C15.9746763,1.26147319 19.6250446,10.0571346 19.6250446,14.5690256 C19.6250446,19.0809165 15.9746763,22.7385268 11.4717187,22.7385268 C6.96876116,22.7385268 3.31839282,19.0809165 3.31839282,14.5690256 C3.31839282,10.0571346 6.96876116,1.26147319 11.4717187,1.26147319 Z M15.732635,8.81821428 L15.7323928,10.2574732 L13.0488627,10.2575935 L10.8383928,12.5534732 L8.77491792,10.4091071 L5.50021567,10.4091071 C5.17385404,10.4091071 4.90928568,10.6641948 4.90928568,10.9788614 C4.90928568,11.293528 5.17385404,11.5486157 5.50021567,11.5486157 L5.50021567,11.5486157 L8.25921963,11.5486157 L10.0323928,13.3914732 L8.25921963,15.2354468 L5.50021567,15.2354468 C5.17385404,15.2354468 4.90928568,15.4905345 4.90928568,15.8052011 C4.90928568,16.1198677 5.17385404,16.3749554 5.50021567,16.3749554 L8.77491792,16.3749554 L10.8383928,14.2294732 L13.0488627,16.526469 L15.7323928,16.5254732 L15.732635,17.9658482 L18.0341518,15.9867018 L15.732635,14.127035 L15.7323928,15.3864732 L13.564561,15.3869604 L11.6443928,13.3914732 L13.564561,11.3971021 L15.7323928,11.3964732 L15.732635,12.6570275 L18.0341518,10.7973608 L15.732635,8.81821428 Z" id="path-1"></path>
     </defs>
-    <g id="icon-/-Gameplay-/-Random-timed-spawner" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+    <g id="icon-/-Gameplay-/-RandomTimedSpawner" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <mask id="mask-2" fill="white">
             <use xlink:href="#path-1"></use>
         </mask>
diff --git a/Assets/Editor/Icons/Components/RigidPhysics.svg b/Assets/Editor/Icons/Components/RigidPhysics.svg
index 879e8658c3..5d0abc85df 100644
--- a/Assets/Editor/Icons/Components/RigidPhysics.svg
+++ b/Assets/Editor/Icons/Components/RigidPhysics.svg
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
-    <title>icon / Physics / Cry / Rigid Body Physics </title>
-    <desc>Created with Sketch.</desc>
+    <title>icon / Physics / PhysX / RigidPhysics</title>
     <defs>
         <path d="M12.1875,21 C7.32049064,21 3.375,17.0545094 3.375,12.1875 C3.375,7.32049064 7.32049064,3.375 12.1875,3.375 C17.0545094,3.375 21,7.32049064 21,12.1875 C21,17.0545094 17.0545094,21 12.1875,21 Z M11.375,11.375 L11.375,4.03978956 C7.50197046,4.4212683 4.4212683,7.50197046 4.03978956,11.375 L11.375,11.375 Z M12.625,20.3635108 C16.7985591,20.1437686 20.1437686,16.7985591 20.3635108,12.625 L12.625,12.625 L12.625,20.3635108 Z" id="path-1"></path>
     </defs>
-    <g id="icon-/-Physics-/-Cry-/-Rigid-Body-Physics-" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+    <g id="icon-/-Physics-/-PhysX-/-RigidPhysics" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <mask id="mask-2" fill="white">
             <use xlink:href="#path-1"></use>
         </mask>
diff --git a/Assets/Editor/Icons/Components/SimpleLODDistance.svg b/Assets/Editor/Icons/Components/SimpleLODDistance.svg
index 52d760ac02..951e58250e 100644
--- a/Assets/Editor/Icons/Components/SimpleLODDistance.svg
+++ b/Assets/Editor/Icons/Components/SimpleLODDistance.svg
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
-    <title>icon / Animation / Simple LOD Distance</title>
-    <desc>Created with Sketch.</desc>
+    <title>icon / Animation / SimpleLODDistance</title>
     <defs>
         <path d="M9.65613074,9.14003989 L9.69357906,9.10058594 L9.70614106,9.11587953 L12.6844813,2.69553277 L15.5012533,9.48599975 L17.7301967,6.42458544 L21.4153176,11.6958371 L21.4971533,11.8911908 L23.0203335,20.1084517 L1.74190235,20.1084517 L3.29787764,12.6661124 L3.3499047,12.526177 L6.68990442,6.4958984 L9.65613074,9.14003989 Z M2.76516829,18.6424246 L4.66700321,15.1304007 L3.72000332,14.5942809 L2.76516829,18.6424246 Z M3.66540341,19.1084517 L8.44101431,19.1084517 L7.10155675,17.6720694 L3.66540341,19.1084517 Z M9.12468027,19.1084517 L9.16319006,19.1084517 L12.1789615,17.3692315 L10.5272435,16.2400624 L10.0842651,16.4252364 L7.59346891,17.4664401 L9.12468027,19.1084517 Z M10.1640251,19.1084517 L14.7230459,19.1084517 L12.6369246,17.6823102 L10.1640251,19.1084517 Z M15.6090065,19.1084517 L15.7204922,19.1084517 L18.2576751,17.6376261 L15.5246665,16.2551354 L15.1116158,16.2551354 L13.1174865,17.4051662 L15.6090065,19.1084517 Z M16.7174432,19.1084517 L21.2677357,19.1084517 L18.7986435,17.901963 L16.7174432,19.1084517 L16.7174432,19.1084517 Z M21.7593047,18.792151 L21.3230336,16.4385534 L19.319542,17.5999938 L21.7593047,18.792151 L21.7593047,18.792151 Z M20.9534894,15.4737454 L18.8896286,15.2431297 L16.3404756,16.1443131 L18.7785737,17.3356569 L21.1268329,15.974352 L20.9534894,15.4737454 L20.9534894,15.4737454 Z M12.6486957,14.0965621 L11.0973608,15.6197946 L14.4307823,15.6774679 L12.6486957,14.0965621 Z M9.49502638,16.1655987 L5.53645171,15.2776294 L7.2298524,17.0765119 L9.49502638,16.1655987 Z M4.16639829,13.3984048 L5.05116924,13.9916313 L8.96736287,9.8656964 L6.95846449,8.07493232 L4.26126433,12.9446538 L4.16639829,13.3984048 Z M6.03479188,14.4079065 L9.95571405,15.3645391 L11.9309805,13.400001 L9.63945513,10.6101867 L6.03479188,14.4079065 L6.03479188,14.4079065 Z M16.2533124,10.1520165 L19.1120782,14.2617627 L20.9577649,14.4679996 L20.5336522,12.179994 L17.713667,8.14624529 L16.2533124,10.1520165 L16.2533124,10.1520165 Z M15.3045292,11.4551534 L15.2605297,11.5155859 L15.2556338,11.5037832 L13.3554671,13.3936294 L15.5929419,15.3479333 L18.0461975,14.4806518 L15.6811113,11.0806166 L15.3045292,11.4551534 L15.3045292,11.4551534 Z M14.8414617,10.5053275 L12.6333311,5.18212826 L10.4102232,9.97443621 L12.6387321,12.6960934 L14.8414617,10.5053275 L14.8414617,10.5053275 Z M3.29785273,18.7201681 L6.73794023,17.2821412 L5.06429406,15.487388 L3.29785273,18.7201681 Z M12.6595234,17.0920875 L14.0307231,16.3013053 L11.3392906,16.1895326 L12.6595234,17.0920875 Z" id="path-1"></path>
     </defs>
-    <g id="icon-/-Animation-/-Simple-LOD-Distance" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+    <g id="icon-/-Animation-/-SimpleLODDistance" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <mask id="mask-2" fill="white">
             <use xlink:href="#path-1"></use>
         </mask>
diff --git a/Assets/Editor/Icons/Components/SimpleState.svg b/Assets/Editor/Icons/Components/SimpleState.svg
index 1d43710fb1..ddd88500ed 100644
--- a/Assets/Editor/Icons/Components/SimpleState.svg
+++ b/Assets/Editor/Icons/Components/SimpleState.svg
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
-    <title>icon / Gameplay / Simple State</title>
-    <desc>Created with Sketch.</desc>
+    <title>icon / Gameplay / SimpleState</title>
     <defs>
         <path d="M2.39750293,6.23957535 C2.39750293,6.9288074 2.95867953,7.48957535 3.64750293,7.48957535 C4.33632633,7.48957535 4.89750293,6.9288074 4.89750293,6.23957535 C4.89750293,5.5503433 4.33632633,4.98957535 3.64750293,4.98957535 C2.95867953,4.98957535 2.39750293,5.5503433 2.39750293,6.23957535 Z M5.64750293,6.23957535 C5.64750293,7.34226888 4.75069712,8.23957535 3.64750293,8.23957535 C2.54430874,8.23957535 1.64750293,7.34226888 1.64750293,6.23957535 C1.64750293,5.13688182 2.54430874,4.23957535 3.64750293,4.23957535 C4.75069712,4.23957535 5.64750293,5.13688182 5.64750293,6.23957535 Z M21.8747157,6.23957535 C21.8747157,7.34226888 20.9779099,8.23957535 19.8747157,8.23957535 C18.7715215,8.23957535 17.8747157,7.34226888 17.8747157,6.23957535 C17.8747157,5.13688182 18.7715215,4.23957535 19.8747157,4.23957535 C20.9779099,4.23957535 21.8747157,5.13688182 21.8747157,6.23957535 Z M18.6247157,6.23957535 C18.6247157,6.9288074 19.1858923,7.48957535 19.8747157,7.48957535 C20.5635391,7.48957535 21.1247157,6.9288074 21.1247157,6.23957535 C21.1247157,5.5503433 20.5635391,4.98957535 19.8747157,4.98957535 C19.1858923,4.98957535 18.6247157,5.5503433 18.6247157,6.23957535 Z M17.2405032,6.64341836 L11.8632089,15.7085814 L6.44979209,6.64341836 L17.2405032,6.64341836 Z M14.0504317,18.7526036 C14.0504317,19.8552971 13.1536259,20.7526036 12.0504317,20.7526036 C10.9472375,20.7526036 10.0504317,19.8552971 10.0504317,18.7526036 C10.0504317,17.64991 10.9472375,16.7526036 12.0504317,16.7526036 C13.1536259,16.7526036 14.0504317,17.64991 14.0504317,18.7526036 Z M10.8004317,18.7526036 C10.8004317,19.4418356 11.3616083,20.0026036 12.0504317,20.0026036 C12.7392551,20.0026036 13.3004317,19.4418356 13.3004317,18.7526036 C13.3004317,18.0633715 12.7392551,17.5026036 12.0504317,17.5026036 C11.3616083,17.5026036 10.8004317,18.0633715 10.8004317,18.7526036 Z" id="path-1"></path>
     </defs>
-    <g id="icon-/-Gameplay-/-Simple-State" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+    <g id="icon-/-Gameplay-/-SimpleState" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <mask id="mask-2" fill="white">
             <use xlink:href="#path-1"></use>
         </mask>
diff --git a/Assets/Editor/Icons/Components/Spawner.svg b/Assets/Editor/Icons/Components/Spawner.svg
index 946aa67ac5..da84e73a85 100644
--- a/Assets/Editor/Icons/Components/Spawner.svg
+++ b/Assets/Editor/Icons/Components/Spawner.svg
@@ -1,15 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
     <title>icon / Gameplay / Spawner </title>
-    <desc>Created with Sketch.</desc>
     <defs>
-        <path d="M4.19541476,13.2796468 L7.55119067,11.5242011 L9.49816821,13.8080357 L12.4002668,9.88745301 L14.494186,11.5242011 L12.4002668,8.74553571 L9.49816821,11.1587876 L7.91854492,8.87495301 L4.93454779,9.98563882 C6.19646079,6.04339663 8.80245295,1.875 11.8125,1.875 C16.058189,1.875 19.5,10.1681368 19.5,14.4222488 C19.5,18.6763608 16.058189,22.125 11.8125,22.125 C7.56681099,22.125 4.125,18.6763608 4.125,14.4222488 C4.125,14.0671349 4.14898305,13.6838765 4.19541476,13.2796468 Z" id="path-1"></path>
+        <path d="M18.4882988,9.38492584 C19.1320276,11.2084531 19.5,13.031262 19.5,14.4222488 C19.5,18.6763608 16.058189,22.125 11.8125,22.125 C7.56681099,22.125 4.125,18.6763608 4.125,14.4222488 C4.125,13.1547199 4.43055184,11.5286207 4.9718788,9.87015258 L8.99000427,13.574806 L12,10.5132013 L14.9996797,13.574806 Z M11.8125,1.875 C14.3034043,1.875 16.5176094,4.72954269 17.9224059,7.94824717 L14.9996797,11.038324 L12,8 L8.99000427,11.038324 L5.69035715,7.97634103 C7.09451301,4.74617164 9.31435097,1.875 11.8125,1.875 Z" id="path-1"></path>
     </defs>
     <g id="icon-/-Gameplay-/-Spawner-" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <mask id="mask-2" fill="white">
             <use xlink:href="#path-1"></use>
         </mask>
-        <use id="Icon" fill="#65C98C" xlink:href="#path-1"></use>
+        <use id="Combined-Shape" fill="#65C98C" xlink:href="#path-1"></use>
     </g>
 </svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/Sphere_Shape.svg b/Assets/Editor/Icons/Components/Sphere_Shape.svg
index 8cf4b0d6db..53a491bb79 100644
--- a/Assets/Editor/Icons/Components/Sphere_Shape.svg
+++ b/Assets/Editor/Icons/Components/Sphere_Shape.svg
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
-    <title>icon / Shapes / Sphere Shape</title>
-    <desc>Created with Sketch.</desc>
+    <title>icon / Shapes / SphereShape</title>
     <defs>
-        <path d="M5.70310303,17.0463984 C7.13450492,18.6555386 9.21464164,19.6748229 11.5332078,19.693946 C10.3685416,19.0251893 9.4191841,18.0563156 8.69680325,16.8872148 C7.71809333,17.0309273 6.71380277,17.0870639 5.70310303,17.0463984 Z M5.01599515,16.1535014 C6.10781403,16.2503975 7.19659525,16.2254308 8.25543967,16.0922807 C7.19791948,13.9655454 6.8027839,11.3240456 7.12723346,8.65748219 C6.20550292,8.5939142 5.26590612,8.61820253 4.32776542,8.74019121 C3.93017493,9.68241979 3.7103664,10.718014 3.7103664,11.8049472 C3.7103664,13.411963 4.19085059,14.9067557 5.01599515,16.1535014 Z M16.3804664,13.4025617 C14.6180288,15.0168573 12.2300314,16.1876052 9.60666489,16.7270266 C10.4659052,17.9996977 11.6322748,18.9716065 13.0815945,19.4706473 L13.050447,19.5611061 C14.8630361,19.2241816 16.4578729,18.2675405 17.6068347,16.9193055 C17.5392977,15.6472582 17.0999682,14.4594504 16.3804664,13.4025617 Z M15.8635819,12.7217782 C14.0988211,10.6247216 11.1835422,9.15278544 7.97092624,8.74063457 C7.64964048,11.3580085 8.06487369,13.9399776 9.14186926,15.9544314 C11.7650811,15.4676334 14.1495959,14.3168807 15.8635819,12.7217782 Z M18.4966819,7.97166795 C17.1491434,5.55228488 14.5655166,3.9156746 11.599639,3.9156746 C10.7941396,3.9156746 10.0168352,4.03639184 9.28483029,4.26072179 C8.71802534,5.43256868 8.32534716,6.66532385 8.09890788,7.90284212 C11.4757802,8.3400733 14.5553738,9.88366682 16.4642928,12.1139921 C17.5517159,10.9149591 18.2795958,9.50854526 18.4966819,7.97166795 Z M19.0748808,9.27606867 C18.6816274,10.5738586 17.9599567,11.7602932 16.9947874,12.7945055 C17.6620947,13.7387522 18.1285075,14.7861345 18.3382182,15.9098391 C19.0682604,14.7139638 19.4889116,13.3085797 19.4889116,11.8049472 C19.4889116,10.9204414 19.3433522,10.0699327 19.0748808,9.27606867 Z M8.15942583,4.70325966 C6.74507624,5.38967055 5.56664524,6.4861495 4.7786764,7.83815297 C5.60845025,7.76238638 6.43728621,7.75728283 7.25332122,7.8171426 C7.44122064,6.76505023 7.74208426,5.71706199 8.15942583,4.70325966 Z M11.599639,21.3885603 C6.30675568,21.3885603 2.01602597,17.0978305 2.01602597,11.8049472 C2.01602597,6.51206388 6.30675568,2.22133417 11.599639,2.22133417 C16.8925223,2.22133417 21.1832521,6.51206388 21.1832521,11.8049472 C21.1832521,17.0978305 16.8925223,21.3885603 11.599639,21.3885603 Z" id="path-1"></path>
+        <path d="M11.599639,2.22133417 C16.8925223,2.22133417 21.1832521,6.51206388 21.1832521,11.8049472 C21.1832521,17.0978305 16.8925223,21.3885603 11.599639,21.3885603 C6.30675568,21.3885603 2.01602597,17.0978305 2.01602597,11.8049472 C2.01602597,6.51206388 6.30675568,2.22133417 11.599639,2.22133417 Z M8.6967871,16.8871886 L8.66234389,16.892237 C7.69476761,17.0321963 6.70243947,17.0865596 5.70385017,17.0464285 C7.13474778,18.6557001 9.21493462,19.6749193 11.5335338,19.6939486 C10.3681392,19.0247825 9.41902018,18.0560587 8.6967871,16.8871886 Z M16.3803844,13.4024413 L16.2205781,13.5462843 C14.4749303,15.0863329 12.1516087,16.2037087 9.60679513,16.7269998 C10.4660066,17.9997823 11.6323379,18.9716282 13.0815945,19.4706473 L13.0508027,19.56104 C14.8631196,19.2240797 16.4577279,18.2675844 17.6065968,16.9195847 C17.5391229,15.6467441 17.0997938,14.459153 16.3803844,13.4024413 Z M4.55089244,8.71301682 L4.32769491,8.74035832 C3.93014895,9.68254223 3.7103664,10.7180782 3.7103664,11.8049472 C3.7103664,13.4118939 4.1908093,14.9066272 5.01588879,16.1533407 C6.10858424,16.250401 7.19725573,16.2253866 8.25599131,16.0922114 C7.19797338,13.9656816 6.8028173,11.3243052 7.12718933,8.65784495 C6.27868031,8.59895146 5.41481845,8.61489764 4.55089244,8.71301682 Z M7.97170265,8.7407342 L7.96908288,8.75571761 C7.65122427,11.3680404 8.06697896,13.9440729 9.14201053,15.9546956 C11.7655582,15.4673614 14.1495623,14.3167975 15.8633063,12.7220347 C14.099075,10.6249469 11.1840734,9.1530305 7.97170265,8.7407342 Z M19.0747202,9.27559369 L19.0197813,9.45066002 C18.6160678,10.6806455 17.9161956,11.8073522 16.9941728,12.795164 C17.661867,13.7383461 18.1283079,14.7856156 18.3380989,15.9092002 C19.0681616,14.7142935 19.4889116,13.3087561 19.4889116,11.8049472 C19.4889116,10.920265 19.3432942,10.0695935 19.0747202,9.27559369 Z M11.599639,3.9156746 C10.7943473,3.9156746 10.0172361,4.03632958 9.28539669,4.26054824 C8.71793855,5.43280056 8.32528059,6.66556565 8.0988625,7.90309014 C11.4761013,8.34027974 14.5552881,9.88371559 16.4640854,12.1137497 C17.5517492,10.9149707 18.2797095,9.50837024 18.4967367,7.97128041 C17.1487141,5.55201293 14.5652702,3.9156746 11.599639,3.9156746 Z M8.15981264,4.70232013 C6.74509043,5.38956982 5.56638809,6.48633342 4.77834782,7.83871681 C5.60909564,7.76238032 6.43764108,7.75730494 7.25339403,7.81714795 C7.44118588,6.76504848 7.74220578,5.71657086 8.15981264,4.70232013 Z" id="path-1"></path>
     </defs>
-    <g id="icon-/-Shapes-/-Sphere-Shape" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+    <g id="icon-/-Shapes-/-SphereShape" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <mask id="mask-2" fill="white">
             <use xlink:href="#path-1"></use>
         </mask>
diff --git a/Assets/Editor/Icons/Components/StaticMesh.svg b/Assets/Editor/Icons/Components/StaticMesh.svg
deleted file mode 100644
index dd3cf27091..0000000000
--- a/Assets/Editor/Icons/Components/StaticMesh.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
-    <title>icon / Rendering / Mesh</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <path d="M18.3335668,6.73886165 C17.9644382,6.2548475 17.5410782,5.77470036 17.066048,5.3229573 C16.798558,5.06858032 16.5241548,4.8317302 16.2429325,4.61378551 L16.2429325,6.04615991 L17.9813669,6.90220825 L18.3335668,6.73886165 Z M15.4999286,4.09281448 C15.4745972,4.0768764 15.4492154,4.0610886 15.4237832,4.04545198 L14.0663538,3.37701998 C13.947765,3.3325955 13.8282357,3.29134878 13.707771,3.25335415 L12.0230598,4.08294784 L12.0230598,6.04615991 L13.7614942,6.90220825 L15.4999286,6.04615991 L15.4999286,4.09281448 Z M12.8358306,3.03904792 C12.4453621,2.96973131 12.0458641,2.93393664 11.6374916,2.93393664 C11.236342,2.93393664 10.8437557,2.96847631 10.4598798,3.03540137 L11.6515578,3.62221327 L12.8358306,3.03904792 Z M9.58439063,3.2479601 C9.49500411,3.27590258 9.40613174,3.30563491 9.31777559,3.33712679 L7.80318708,4.08294784 L7.80318708,6.04615991 L9.54162148,6.90220825 L11.2800559,6.04615991 L11.2800559,4.08294784 L9.58439063,3.2479601 Z M7.06018317,4.59206371 C6.76912149,4.81596664 6.48533757,5.06010484 6.20893517,5.3229573 C5.74944005,5.75992682 5.33829087,6.22347299 4.97780558,6.6913882 L5.32174877,6.90220825 L7.06018317,6.04615991 L7.06018317,4.59206371 Z M4.60965497,7.19522692 C4.582472,7.23448436 4.55665841,7.27228554 4.53222113,7.30854431 C4.63065324,7.39506 4.73307543,7.49326064 4.83771688,7.60357464 L4.83771688,7.30753027 L4.60965497,7.19522692 Z M5.41517314,8.321464 C5.71385193,8.7578028 5.96072353,9.24354894 6.14579345,9.77959983 L7.31915519,10.3573923 L9.05758958,9.501344 L9.05758958,7.53813193 L7.31915519,6.6820836 L5.41517314,7.61965171 L5.41517314,8.321464 Z M6.37362401,10.6109991 C6.47767629,11.1125433 6.53283589,11.6512652 6.53283589,12.2277275 C6.53283589,12.6012298 6.50958987,12.9549486 6.46473303,13.2892506 L7.06018317,12.9651227 L7.06018317,10.9847214 L6.37362401,10.6109991 Z M6.30688834,14.0909171 C6.11668363,14.8086623 5.81212346,15.4184294 5.41517314,15.9251462 L5.41517314,16.3301924 L7.31915519,17.2677605 L9.05758958,16.4117122 L9.05758958,14.4485001 L7.31915519,13.5924518 L6.30688834,14.0909171 Z M4.83771688,16.5369156 C4.74737728,16.6157992 4.65830445,16.6864513 4.57150773,16.7493301 C4.57558394,16.7552929 4.57969423,16.7612929 4.58383858,16.7673298 L4.83771688,16.6423138 L4.83771688,16.5369171 Z M4.89994015,17.2064353 C5.27872852,17.7089449 5.71601402,18.2082858 6.20893517,18.6770427 C6.48533757,18.9398952 6.76912149,19.1840334 7.06018317,19.4079363 L7.06018317,17.9036842 L5.32174877,17.0476359 L4.89994007,17.2064354 Z M10.3852979,20.9511687 C10.7928673,21.0268981 11.2103244,21.0660634 11.6374916,21.0660634 C12.071781,21.0660634 12.4960338,21.0255812 12.9100635,20.9473503 L11.6515578,20.3276308 L10.3852979,20.9511687 Z M16.2429325,19.3862145 C16.5241548,19.1682698 16.798558,18.9314197 17.066048,18.6770427 C17.5715354,18.1963356 18.0185143,17.6834653 18.4038987,17.1679977 L17.9813669,17.0476359 L16.2429325,17.9036842 L16.2429325,19.3862145 Z M18.6982457,16.7569734 C18.7062979,16.7452156 18.714219,16.7336003 18.7220089,16.7221301 C18.5679461,16.6015697 18.40532,16.4558384 18.2403389,16.2830244 L18.2403389,16.5314887 L18.6982457,16.7569734 Z M17.6628826,15.559316 C17.39823,15.1587023 17.1839576,14.7118553 17.0289358,14.2178487 L15.7589006,13.5924518 L14.0204662,14.4485001 L14.0204662,16.4117122 L15.7589006,17.2677605 L17.6628826,16.3301924 L17.6628826,15.559316 Z M16.8214046,13.3149768 C16.7692815,12.9730662 16.7421473,12.6126407 16.7421473,12.2334762 C16.7421473,11.6458557 16.8070903,11.0917533 16.9287509,10.5713891 L16.2429325,10.9769409 L16.2429325,12.9729032 L16.8214046,13.3149768 Z M17.2203571,9.6377348 C17.3459332,9.32027745 17.4942438,9.01774792 17.6628826,8.73021056 L17.6628826,7.61965171 L15.7589006,6.6820836 L14.0204662,7.53813193 L14.0204662,9.501344 L15.7589006,10.3573923 L17.2203571,9.6377348 Z M18.2403389,7.89563279 C18.4197214,7.67341906 18.5952104,7.48552817 18.7579794,7.3311885 C18.7312093,7.29123658 18.7027046,7.24932007 18.6724752,7.20556068 L18.2403389,7.41835536 L18.2403389,7.89563279 Z M18.2352186,14.168181 L18.2403389,14.1707023 L18.2403389,14.1811069 C18.3999778,14.5822009 18.6109571,14.9356416 18.864027,15.2455198 C19.2168449,15.6775371 19.561386,15.9291033 19.7650812,16.0274849 L20.3164873,16.2938055 L20.0183078,16.8286553 C19.9190809,17.0066403 19.7321984,17.3041861 19.4594847,17.6818096 C19.008426,18.3063854 18.4756091,18.9303437 17.8619233,19.513945 C16.0886658,21.200273 14.0067933,22.2209759 11.6374916,22.2209759 C9.26818991,22.2209759 7.18631733,21.200273 5.41305989,19.513945 C4.79937413,18.9303437 4.26655723,18.3063854 3.81549852,17.6818096 C3.54278482,17.3041861 3.3559023,17.0066403 3.25667543,16.8286553 L2.93144984,16.2452925 L3.55568048,16.0077637 C3.74542684,15.9355625 4.0761493,15.7221825 4.41852755,15.3200416 C5.01460546,14.6199173 5.37792336,13.616206 5.37792336,12.2277275 C5.37792336,10.8271229 5.00616719,9.72293824 4.39037167,8.87184037 C4.0298524,8.37356265 3.67831059,8.07378427 3.46832347,7.95029628 L2.9818878,7.66423605 L3.25667543,7.1713447 C3.3559023,6.99335974 3.54278482,6.69581389 3.81549852,6.31819039 C4.26655723,5.69361462 4.79937413,5.06965634 5.41305989,4.48605498 C7.18631733,2.79972705 9.26818991,1.77902411 11.6374916,1.77902411 C14.0067933,1.77902411 16.0886658,2.79972705 17.8619233,4.48605498 C18.4756091,5.06965634 19.008426,5.69361462 19.4594847,6.31819039 C19.7321984,6.69581389 19.9190809,6.99335974 20.0183078,7.1713447 L20.2728714,7.62795986 L19.8437441,7.92653956 C19.7976997,7.95857651 19.6998319,8.03703817 19.5672353,8.16206989 C19.3379991,8.37822758 19.1070197,8.64170092 18.8907832,8.95249242 C18.2696785,9.84519122 17.8970598,10.9333346 17.8970598,12.2334762 C17.8970598,12.9751759 18.0177388,13.6165574 18.2352186,14.168181 Z M15.4999286,17.9036842 L13.7614942,17.0476359 L12.0230598,17.9036842 L12.0230598,19.8668963 L13.7614942,20.7229446 L15.4999286,19.8668963 L15.4999286,17.9036842 Z M11.2800559,19.8668963 L11.2800559,17.9036842 L9.54162148,17.0476359 L7.80318708,17.9036842 L7.80318708,19.8668963 L9.54162148,20.7229446 L11.2800559,19.8668963 Z M13.2774623,14.4485001 L11.5390279,13.5924518 L9.8005935,14.4485001 L9.8005935,16.4117122 L11.5390279,17.2677605 L13.2774623,16.4117122 L13.2774623,14.4485001 Z M13.2774623,9.501344 L13.2774623,7.53813193 L11.5390279,6.6820836 L9.8005935,7.53813193 L9.8005935,9.501344 L11.5390279,10.3573923 L13.2774623,9.501344 Z M15.4999286,10.993316 L13.7614942,10.1372677 L12.0230598,10.993316 L12.0230598,12.9565281 L13.7614942,13.8125764 L15.4999286,12.9565281 L15.4999286,10.993316 Z M11.2800559,12.9565281 L11.2800559,10.993316 L9.54162148,10.1372677 L7.80318708,10.993316 L7.80318708,12.9565281 L9.54162148,13.8125764 L11.2800559,12.9565281 Z" id="path-1"></path>
-    </defs>
-    <g id="icon-/-Rendering-/-Mesh" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <mask id="mask-2" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <use id="Combined-Shape" fill="#B29EDF" fill-rule="nonzero" xlink:href="#path-1"></use>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/StaticPhysics.svg b/Assets/Editor/Icons/Components/StaticPhysics.svg
index b2bba9e426..69f4135ed0 100644
--- a/Assets/Editor/Icons/Components/StaticPhysics.svg
+++ b/Assets/Editor/Icons/Components/StaticPhysics.svg
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
-    <title>icon / Physics / Cry / Static Physics</title>
-    <desc>Created with Sketch.</desc>
+    <title>icon / Physics / PhysX / Physics</title>
     <defs>
         <path d="M17.2581434,9.0146003 C17.5128802,8.32065986 17.7350344,7.64515979 17.8860993,7.02109867 C18.398535,4.87716241 18.1971152,3.47666443 17.3045489,2.97100993 C17.0873315,2.84678004 16.8385188,2.78272399 16.5650223,2.78272399 C15.3890859,2.78272399 13.7214483,4.00755313 12.0004937,6.00978967 C11.7023134,5.66427527 11.4080824,5.35078889 11.1148389,5.05380179 C11.2214729,4.85678094 11.2965117,4.64131971 11.2965117,4.40256538 C11.2965117,3.62224634 10.6517708,2.98945031 9.85793971,2.98945031 C9.52224,2.98945031 9.22800909,3.11950348 8.98413313,3.30681887 C8.41146894,2.97295102 7.88619764,2.78272399 7.43497775,2.78272399 C7.16246858,2.78272399 6.91266851,2.84678004 6.69643841,2.97100993 C5.80288479,3.47666443 5.60146497,4.87716241 6.1158754,7.02109867 C6.26595291,7.64515979 6.48810712,8.32065986 6.74383131,9.0146003 C3.70969843,9.54548899 1.39238314,10.5558275 1.39238314,12.0029116 C1.39238314,13.4470842 3.70871107,14.454511 6.73889455,14.9853997 C6.54537354,15.5104651 6.38246045,16.0229135 6.24719322,16.5130392 C5.54024915,16.6052411 4.98634464,17.1768927 4.98634464,17.8941263 C4.98634464,18.4725717 5.34376609,18.9714324 5.8542271,19.1907758 C5.88680972,20.058444 6.1405592,20.7184153 6.69643841,21.0338428 C6.91266851,21.1561316 7.16049388,21.217276 7.4339904,21.217276 C8.60696464,21.217276 10.276577,19.9934174 12.0004937,17.9882692 C13.723423,19.9934174 15.3930354,21.217276 16.566997,21.217276 C16.8395061,21.217276 17.0873315,21.1561316 17.3045489,21.0328723 C18.5772457,20.3088449 18.308686,17.8310408 17.2620928,14.9853997 C17.8624029,14.8815513 18.4330923,14.7582919 18.9652751,14.6156217 C19.2249487,14.9756942 19.6317377,15.2290068 20.1185023,15.2290068 C20.9123334,15.2290068 21.5600363,14.5932991 21.5600363,13.8120095 C21.5600363,13.727572 21.5235043,13.6538105 21.5116561,13.5751963 C22.1958911,13.1277745 22.6076169,12.6046502 22.6076169,12.0029116 C22.6076169,10.5558275 20.2893142,9.54743009 17.2581434,9.0146003 L17.2581434,9.0146003 Z M16.5650223,3.59312996 C16.6953527,3.59312996 16.8019867,3.61836416 16.8938105,3.67174419 C17.2966501,3.89982252 17.5592858,4.85095767 17.0833821,6.83572437 C16.9293552,7.47240259 16.6973274,8.16828412 16.4287677,8.88357658 C15.638886,8.77002269 14.8174091,8.68655572 13.9791472,8.63802842 C13.5002815,7.92176542 13.0154916,7.27538174 12.5297144,6.66587881 C14.1963647,4.70246412 15.7139248,3.59312996 16.5650223,3.59312996 L16.5650223,3.59312996 Z M8.53390059,12.8841675 C8.68397811,13.1607731 8.82319475,13.4344671 8.98610784,13.7110727 C9.14803357,13.9876783 9.31884548,14.242932 9.48570798,14.5098321 C8.91995525,14.4671281 8.37000015,14.4156892 7.86348854,14.3487215 C8.0579969,13.8818888 8.28903728,13.3888514 8.53390059,12.8841675 L8.53390059,12.8841675 Z M8.52698913,11.0964216 C8.28903728,10.6062958 8.06688307,10.1239345 7.86941266,9.65127852 C8.37296221,9.5813992 8.92390466,9.53384244 9.48373327,9.49016787 C9.31884548,9.75609749 9.14803357,10.0113511 8.98610784,10.2898978 C8.82911886,10.5558275 8.67706664,10.8246687 8.52698913,11.0964216 L8.52698913,11.0964216 Z M8.98610784,12.0029116 C9.21319881,11.5739303 9.43436567,11.1459195 9.69996338,10.6946155 C9.95963697,10.2520465 10.2222726,9.84150555 10.4858956,9.43581729 C10.9815463,9.41349473 11.4692983,9.38923108 12.0004937,9.38923108 C12.5316891,9.38923108 13.0184537,9.41349473 13.5141044,9.43581729 C13.7777274,9.84150555 14.0413504,10.2520465 14.301024,10.6946155 C14.5666217,11.1459195 14.7877885,11.5739303 15.0158669,12.0029116 C14.7868012,12.4367457 14.5567482,12.8705798 14.301024,13.306355 C14.0383883,13.7508651 13.773778,14.1575239 13.5062056,14.5651533 C13.0154916,14.5865053 12.528727,14.6117395 12.0004937,14.6117395 C11.4722603,14.6117395 10.9854958,14.5865053 10.4947818,14.5651533 C10.2272094,14.1575239 9.95963697,13.748924 9.69996338,13.306355 C9.44423919,12.8705798 9.21517351,12.4367457 8.98610784,12.0029116 L8.98610784,12.0029116 Z M15.0158669,13.7110727 C15.1768053,13.4344671 15.3140472,13.1607731 15.4690615,12.8841675 C15.7139248,13.3888514 15.9449652,13.8818888 16.1365115,14.3487215 C15.6309872,14.4156892 15.0810321,14.4671281 14.5152794,14.5098321 C14.6821419,14.242932 14.8529538,13.9876783 15.0158669,13.7110727 L15.0158669,13.7110727 Z M15.0158669,10.2898978 C14.8529538,10.0113511 14.6821419,9.75609749 14.5162667,9.49016787 C15.0770827,9.53384244 15.6270378,9.5813992 16.1305873,9.65127852 C15.9321296,10.1239345 15.7119501,10.6062958 15.4720235,11.0964216 C15.3249081,10.8246687 15.1708811,10.5558275 15.0158669,10.2898978 L15.0158669,10.2898978 Z M12.9414402,8.59144221 C12.6284496,8.5827073 12.3144716,8.57882511 12.0004937,8.57882511 C11.6865157,8.57882511 11.3715504,8.5827073 11.0595472,8.59144221 C11.3735251,8.13916774 11.6865157,7.7169802 12.0004937,7.32099741 C12.3115096,7.7169802 12.6264749,8.13916774 12.9414402,8.59144221 L12.9414402,8.59144221 Z M7.10717687,3.67174419 C7.19900061,3.61836416 7.30464728,3.59312996 7.43497775,3.59312996 C7.72032249,3.59312996 8.08959217,3.73968242 8.50526738,3.97455457 C8.45984919,4.11140156 8.4164057,4.2511602 8.4164057,4.40256538 C8.4164057,5.1867666 9.0631213,5.81859209 9.85793971,5.81859209 C10.1047777,5.81859209 10.3269319,5.73997786 10.5313138,5.63224725 C10.8364056,5.94379254 11.1513709,6.29027748 11.471273,6.66587881 C10.9854958,7.27538174 10.4987312,7.92176542 10.0218401,8.63802842 C9.1825909,8.68655572 8.36111398,8.77002269 7.57221969,8.88357658 C7.30365993,8.16828412 7.06965749,7.47240259 6.91661792,6.83572437 C6.44170158,4.85095767 6.70334987,3.89982252 7.10717687,3.67174419 L7.10717687,3.67174419 Z M2.21682211,12.0029116 C2.21682211,11.2546206 3.99405582,10.3161026 7.04398633,9.7900666 C7.33624254,10.5111823 7.66503078,11.2487973 8.05009808,12.0009705 C7.6749043,12.7395561 7.33624254,13.4800828 7.04102428,14.2089629 C3.99405582,13.6858385 2.21682211,12.7492616 2.21682211,12.0029116 L2.21682211,12.0029116 Z M7.10717687,20.3331085 C6.8593515,20.1904383 6.71421075,19.8148369 6.68261548,19.2606551 C7.35204018,19.1373958 7.86941266,18.5851551 7.86941266,17.8941263 C7.86941266,17.3447972 7.53864972,16.8828173 7.0755816,16.6469746 C7.20492472,16.171407 7.37277457,15.6618703 7.57518174,15.1183645 C8.36308869,15.2290068 9.1865403,15.3134443 10.0238149,15.361001 C10.4947818,16.0714408 10.9785843,16.7149128 11.4613995,17.319563 C9.53310088,19.5799648 7.80622212,20.721327 7.10717687,20.3331085 L7.10717687,20.3331085 Z M11.0625092,15.4075872 C11.3735251,15.4153516 11.6865157,15.4211749 12.0004937,15.4211749 C12.3115096,15.4211749 12.6264749,15.4153516 12.9384781,15.4075872 C12.6254875,15.855009 12.3115096,16.2849609 12.0004937,16.6770615 C11.6894778,16.2849609 11.3754998,15.855009 11.0625092,15.4075872 L11.0625092,15.4075872 Z M16.8938105,20.3331085 C16.2006893,20.732003 14.4678865,19.5857881 12.5386005,17.319563 C13.0204284,16.7149128 13.5042309,16.0724113 13.9771725,15.361001 C14.814447,15.3134443 15.6378987,15.2290068 16.4248183,15.1183645 C17.4891838,17.973711 17.551387,19.9575072 16.8938105,20.3331085 L16.8938105,20.3331085 Z M21.1492979,12.831758 C20.8886369,12.5667989 20.5252914,12.3988944 20.1185023,12.3988944 C19.3236839,12.3988944 18.678943,13.0316905 18.678943,13.8120095 C18.678943,13.821715 18.6828924,13.8285088 18.6828924,13.8382143 C18.1694693,13.9770023 17.5928557,14.1002617 16.9599631,14.2089629 C16.6637575,13.4800828 16.3260831,12.7395561 15.952864,12.0009705 C16.3359566,11.2487973 16.6637575,10.5131234 16.957001,9.7900666 C20.0059442,10.3161026 21.7841652,11.2546206 21.7841652,12.0029116 C21.7841652,12.263018 21.5600363,12.5493291 21.1492979,12.831758 L21.1492979,12.831758 Z" id="path-1"></path>
     </defs>
-    <g id="icon-/-Physics-/-Cry-/-Static-Physics" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+    <g id="icon-/-Physics-/-PhysX-/-Physics" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <mask id="mask-2" fill="white">
             <use xlink:href="#path-1"></use>
         </mask>
diff --git a/Assets/Editor/Icons/Components/Tag.svg b/Assets/Editor/Icons/Components/Tag.svg
index 72b5d79a25..b7c1f9f5de 100644
--- a/Assets/Editor/Icons/Components/Tag.svg
+++ b/Assets/Editor/Icons/Components/Tag.svg
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
-    <title>icon / Gameplay / Tags </title>
-    <desc>Created with Sketch.</desc>
+    <title>icon / Gameplay / Tag</title>
     <defs>
-        <path d="M4.25244716,5.12194458 L10.5172558,0.171972357 L16.7820643,5.12194458 L16.7820643,21.621852 L4.25244716,21.621852 L4.25244716,5.12194458 Z M10.7409328,8.83042115 C11.6115714,8.83042115 12.3173635,8.12462908 12.3173635,7.25399044 C12.3173635,6.3833518 11.6115714,5.67755973 10.7409328,5.67755973 C9.87029412,5.67755973 9.16450205,6.3833518 9.16450205,7.25399044 C9.16450205,8.12462908 9.87029412,8.83042115 10.7409328,8.83042115 Z" id="path-1"></path>
+        <path d="M10.5172558,0.171972357 L16.7820643,5.12194458 L16.7820643,21.621852 L4.25244716,21.621852 L4.25244716,5.12194458 L10.5172558,0.171972357 Z M10.7409328,5.67755973 C9.87029412,5.67755973 9.16450205,6.3833518 9.16450205,7.25399044 C9.16450205,8.12462908 9.87029412,8.83042115 10.7409328,8.83042115 C11.6115714,8.83042115 12.3173635,8.12462908 12.3173635,7.25399044 C12.3173635,6.3833518 11.6115714,5.67755973 10.7409328,5.67755973 Z" id="path-1"></path>
     </defs>
-    <g id="icon-/-Gameplay-/-Tags-" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+    <g id="icon-/-Gameplay-/-Tag" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <mask id="mask-2" fill="white">
             <use xlink:href="#path-1"></use>
         </mask>
diff --git a/Assets/Editor/Icons/Components/Transform.svg b/Assets/Editor/Icons/Components/Transform.svg
index 059dabd6c9..0c5d0c9e64 100644
--- a/Assets/Editor/Icons/Components/Transform.svg
+++ b/Assets/Editor/Icons/Components/Transform.svg
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
     <title>icon / Gameplay / Transform</title>
-    <desc>Created with Sketch.</desc>
     <defs>
-        <path d="M15.9522403,9.51007463 L7.96252407,17.6380228 L16.6574208,17.6380228 L16.6574208,15.1883807 L22.9067163,19.0941904 L16.6574208,23 L16.6574208,20.1191132 L3.46589817,20.1191132 L3.45687888,7.43690338 L1.09328375,7.43690338 L4.99909339,1.18760796 L8.90490302,7.43690338 L6.27428022,7.43690338 L6.27428022,15.2178454 L14.0844857,7.64232009 L12.3897381,5.94757242 L19.5704817,4.29047773 L17.913387,11.4712214 L15.9522403,9.51007463 Z" id="path-1"></path>
+        <path d="M4.99909339,1.18760796 L8.90490302,7.43690338 L6.27328375,7.43660796 L6.27428022,15.2178454 L14.0842837,7.64160796 L12.3897381,5.94757242 L19.5704817,4.29047773 L17.913387,11.4712214 L15.9522837,9.50960796 L7.96252407,17.6380228 L16.6572837,17.637608 L16.6574208,15.1883807 L22.9067163,19.0941904 L16.6574208,23 L16.6572837,20.118608 L3.46589817,20.1191132 L3.45628375,7.43660796 L1.09328375,7.43690338 L4.99909339,1.18760796 Z" id="path-1"></path>
     </defs>
     <g id="icon-/-Gameplay-/-Transform" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <mask id="mask-2" fill="white">
diff --git a/Assets/Editor/Icons/Components/UICanvasProxyRef.svg b/Assets/Editor/Icons/Components/UICanvasProxyRef.svg
index 9add5dc723..abe920e5aa 100644
--- a/Assets/Editor/Icons/Components/UICanvasProxyRef.svg
+++ b/Assets/Editor/Icons/Components/UICanvasProxyRef.svg
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
-    <title>icon / UI / UI Canvas Proxy Ref</title>
-    <desc>Created with Sketch.</desc>
+    <title>icon / UI / UI CanvasProxyRef</title>
     <defs>
-        <path d="M5.91385633,16.995352 L16.2965623,16.995352 C16.5600066,16.995352 16.7761956,17.0462622 16.8564106,17.195838 L18.9136623,21.031961 C18.9876946,21.1700079 18.9502807,21.4362238 18.6449716,21.560015 C18.3396625,21.6838063 18.0186708,21.5456822 17.9461108,21.4103809 L16.1146853,17.995352 L6.09573336,17.995352 L4.2643078,21.4103809 C4.19174789,21.5456822 3.85574204,21.6838063 3.55043293,21.560015 C3.24512381,21.4362238 3.22272403,21.1700079 3.29675638,21.031961 L5.35400802,17.195838 C5.4515664,17.067176 5.6096213,16.995352 5.91385633,16.995352 Z M10.6052093,2.08812845 C10.6052093,1.81008868 10.8371429,1.58469292 11.1052093,1.58469292 C11.3813517,1.58469292 11.6052093,1.80592923 11.6052093,2.08812845 L11.6052093,3.1757978 L10.6052093,3.1757978 L10.6052093,2.08812845 Z M5.91738797,19.5107512 C5.91738797,19.2346088 6.14670507,19.0107512 6.41767299,19.0107512 L15.8674053,19.0107512 C16.1437051,19.0107512 16.3676903,19.2426848 16.3676903,19.5107512 C16.3676903,19.7868935 16.1383732,20.0107512 15.8674053,20.0107512 L6.41767299,20.0107512 C6.14137321,20.0107512 5.91738797,19.7788176 5.91738797,19.5107512 Z M4,3.65703333 L18.3710785,3.65703333 C18.9233633,3.65703333 19.3710785,4.10474858 19.3710785,4.65703333 L19.3710785,15 C19.3710785,15.5522847 18.9233633,16 18.3710785,16 L4,16 C3.44771525,16 3,15.5522847 3,15 L3,4.65703333 C3,4.10474858 3.44771525,3.65703333 4,3.65703333 Z" id="path-1"></path>
+        <path d="M20.2187493,13.4748383 C20.4158221,13.4748383 20.577545,13.5129223 20.6375509,13.6248143 L22.176504,16.4944746 C22.2318848,16.5977423 22.2038969,16.7968885 21.9755065,16.8894921 C21.7471162,16.9820957 21.5069943,16.8787702 21.4527149,16.7775564 L20.0826939,14.2229009 L16.7089653,14.2227 L16.7089653,13.4747 L20.2187493,13.4748383 Z M19.897713,14.982483 C20.1044025,14.982483 20.2719575,15.1559839 20.2719575,15.3565143 C20.2719575,15.5630861 20.1004139,15.7305457 19.897713,15.7305457 L16.7089653,15.7297 L16.7089653,14.9817 L19.897713,14.982483 Z M21.51868,3.49694043 C22.0709648,3.49694043 22.51868,3.94465568 22.51868,4.49694043 L22.51868,11.7302526 C22.51868,12.2825373 22.0709648,12.7302526 21.51868,12.7302526 L16.7089653,12.7297 L16.7093234,8.06897608 C16.7093234,7.01461429 15.8934456,6.15081096 14.8585858,6.07446182 L14.7093234,6.06897608 L10.2719653,6.0687 L10.2720879,4.49694043 C10.2720879,3.94465568 10.7198031,3.49694043 11.2720879,3.49694043 L21.51868,3.49694043 Z M16.3352921,1.9467 C16.5418639,1.9467 16.7093234,2.11219862 16.7093234,2.32330131 L16.7093234,3.13694611 L15.9612608,3.13694611 L15.9612608,2.32330131 C15.9612608,2.11531015 16.1347616,1.9467 16.3352921,1.9467 Z" id="path-1"></path>
     </defs>
-    <g id="icon-/-UI-/-UI-Canvas-Proxy-Ref" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+    <g id="icon-/-UI-/-UI-CanvasProxyRef" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M12.7084595,17.9100205 C12.9055323,17.9100205 13.0672552,17.9481045 13.1272611,18.0599965 L14.6662142,20.9296568 C14.721595,21.0329245 14.6936071,21.2320707 14.4652168,21.3246743 C14.2368264,21.4172779 13.9967045,21.3139525 13.9424251,21.2127386 L12.5724041,18.6580831 L5.07760055,18.6580831 L3.70757952,21.2127386 C3.65330017,21.3139525 3.40194675,21.4172779 3.17355641,21.3246743 C2.94516606,21.2320707 2.92840962,21.0329245 2.98379046,20.9296568 L4.52274354,18.0599965 C4.59572332,17.9637494 4.71395828,17.9100205 4.94154514,17.9100205 L12.7084595,17.9100205 Z M12.3874232,19.4176653 C12.5941127,19.4176653 12.7616677,19.5911661 12.7616677,19.7916966 C12.7616677,19.9982684 12.5901242,20.1657279 12.3874232,20.1657279 L5.31843156,20.1657279 C5.11174201,20.1657279 4.94418703,19.9922271 4.94418703,19.7916966 C4.94418703,19.5851248 5.11573058,19.4176653 5.31843156,19.4176653 L12.3874232,19.4176653 Z M3.20057791,15.258117 L3.20057791,15.8439035 C3.20057791,16.1200459 3.42443554,16.3439035 3.70057791,16.3439035 L3.70057791,16.3439035 L5.31724075,16.3439035 L5.31724075,17.3439035 L3.70057791,17.3439035 L3.5561179,17.3370369 C2.79546599,17.2643522 2.20057791,16.6235996 2.20057791,15.8439035 L2.20057791,15.8439035 L2.20057791,15.258117 L3.20057791,15.258117 Z M15.3290638,15.258117 L15.3290638,15.8439035 C15.3290638,16.6235996 14.7341757,17.2643522 13.9735238,17.3370369 L13.8290638,17.3439035 L12.2124009,17.3439035 L12.2124009,16.3439035 L13.8290638,16.3439035 C14.1052061,16.3439035 14.3290638,16.1200459 14.3290638,15.8439035 L14.3290638,15.258117 L15.3290638,15.258117 Z M11.2124009,16.3010103 L11.2124009,17.3010103 L9.21240093,17.3010103 L9.21240093,16.3010103 L11.2124009,16.3010103 Z M8.31724075,16.3010103 L8.31724075,17.3010103 L6.31724075,17.3010103 L6.31724075,16.3010103 L8.31724075,16.3010103 Z M15.44717,12.473128 L15.44717,14.473128 L14.44717,14.473128 L14.44717,12.473128 L15.44717,12.473128 Z M3.20057791,12.473128 L3.20057791,14.473128 L2.20057791,14.473128 L2.20057791,12.473128 L3.20057791,12.473128 Z M15.44717,9.83475542 L15.44717,11.8347554 L14.44717,11.8347554 L14.44717,9.83475542 L15.44717,9.83475542 Z M3.20057791,9.83475542 L3.20057791,11.8347554 L2.20057791,11.8347554 L2.20057791,9.83475542 L3.20057791,9.83475542 Z M13.94717,7.11059642 L14.0916301,7.117463 C14.852282,7.19014774 15.44717,7.8309003 15.44717,8.61059642 L15.44717,8.61059642 L15.44717,9.19638285 L14.44717,9.19638285 L14.44717,8.61059642 C14.44717,8.33445404 14.2233124,8.11059642 13.94717,8.11059642 L13.94717,8.11059642 L12.3305072,8.11059642 L12.3305072,7.11059642 L13.94717,7.11059642 Z M5.31724075,7.11059642 L5.31724075,8.11059642 L3.70057791,8.11059642 C3.42443554,8.11059642 3.20057791,8.33445404 3.20057791,8.61059642 L3.20057791,9.19638285 L2.20057791,9.19638285 L2.20057791,8.61059642 C2.20057791,7.8309003 2.79546599,7.19014774 3.5561179,7.117463 L3.70057791,7.11059642 L5.31724075,7.11059642 Z M8.31724075,7.11059642 L8.31724075,8.11059642 L6.31724075,8.11059642 L6.31724075,7.11059642 L8.31724075,7.11059642 Z M11.3305072,7.11059642 L11.3305072,8.11059642 L9.33050721,8.11059642 L9.33050721,7.11059642 L11.3305072,7.11059642 Z" id="Combined-Shape" fill="#BD5F8B"></path>
         <mask id="mask-2" fill="white">
             <use xlink:href="#path-1"></use>
         </mask>
-        <use id="Combined-Shape" fill="#BD5F8B" xlink:href="#path-1"></use>
+        <use id="Combined-Shape-Copy" fill-opacity="0.75" fill="#BD5F8B" xlink:href="#path-1"></use>
     </g>
 </svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/VRPreview.svg b/Assets/Editor/Icons/Components/VRPreview.svg
index 3a0f842933..2818ab92de 100644
--- a/Assets/Editor/Icons/Components/VRPreview.svg
+++ b/Assets/Editor/Icons/Components/VRPreview.svg
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
-    <title>icon / VR / VR Preview</title>
-    <desc>Created with Sketch.</desc>
+    <title>icon / VR / VRPreview</title>
     <defs>
-        <path d="M3.52611385,3.71323478 C3.52611385,3.37928545 3.52973254,3.20508105 3.84387168,3.20508105 C3.94109127,3.20508105 4.1499038,3.20508105 4.47030929,3.20508105 C4.47030929,2.85310651 4.47030929,2.62412785 4.47030929,2.51814508 C4.47030929,2.22143022 4.87065672,2.28495093 5.15496619,2.28495093 C6.14768163,2.28495093 16.9678352,2.28495093 18.3385148,2.28495093 C18.6650005,2.28495093 18.8790257,2.28495093 18.8790257,2.58217943 C18.8790257,2.64640748 18.8790257,2.79000623 18.8790257,3.01297567 C19.278709,3.01297567 19.5253021,3.01297567 19.6188049,3.01297567 C19.9559661,3.01297567 19.9559661,3.2947172 19.9559661,3.60156025 C19.9559661,4.90657591 19.9559661,8.250284 19.9559661,8.9377088 C19.9559661,9.494082 19.7929935,10.114419 19.1793605,10.114419 C18.5657275,10.114419 18.5209821,10.114419 18.0079756,10.114419 C17.6643532,10.114419 17.4696665,10.9805518 17.1368059,10.9805518 C15.4113616,10.9805518 14.9323753,10.9805518 14.291725,10.9805518 C13.6510748,10.9805518 13.2578451,11.1788833 12.9040466,10.6014467 C12.5502482,10.0240101 12.5192587,9.46054823 12.1955143,9.31461529 C11.8717698,9.16868235 11.6215077,9.16868235 11.3380608,9.31461529 C11.0546139,9.46054823 10.9714044,9.82799628 10.596953,10.3502039 C10.2225017,10.8724116 10.2225017,10.9805518 9.54826979,10.9805518 C8.87403792,10.9805518 7.47967704,10.9805518 6.81741358,10.9805518 C6.18396611,10.9805518 6.359686,10.114419 5.8682708,10.114419 C5.32002907,10.114419 5.00269124,10.114419 4.47030929,10.114419 C3.74418012,10.114419 3.52611385,9.62969469 3.52611385,9.16868235 C3.52611385,8.16084854 3.52611385,4.56982928 3.52611385,3.71323478 Z M4.61268549,5.50463454 C4.61268549,6.14691948 4.63170859,7.58191213 4.63170859,8.33759815 C4.63170859,8.6832708 4.82655365,9.1234178 5.44241973,9.1234178 C5.8939592,9.1234178 6.16310911,9.1234178 6.62810005,9.1234178 C7.0448936,9.1234178 6.89366652,9.72460303 7.43092466,9.72460303 C7.99262307,9.72460303 8.7379626,9.71673753 9.30981202,9.71673753 C9.88166143,9.71673753 9.88166143,9.63565267 10.1992522,9.24409504 C10.5168429,8.85253741 10.3787418,8.98994424 10.8278223,8.46759812 C11.2769028,7.945252 12.5131865,8.0431303 12.9493111,8.46759812 C13.3854357,8.89206593 13.2501785,8.99951096 13.5502525,9.43247993 C13.8503264,9.8654489 14.1888135,9.74628199 14.7321807,9.74628199 C15.2755479,9.74628199 15.7824721,9.73364591 16.6181631,9.71673753 C16.9001242,9.71103266 17.0754943,9.14399548 17.3669374,9.14399548 C17.8020436,9.14399548 17.8399945,9.14399548 18.360447,9.14399548 C18.8808994,9.14399548 18.8875825,8.60216443 18.8875825,8.18498906 C18.8875825,7.6695496 18.8685594,6.29811272 18.8685594,5.31959614 C18.8685594,5.15492602 18.8386066,5.02584807 18.5900153,5.02584807 C18.3414239,5.02584807 17.9111425,5.02584807 17.6856414,5.02584807 C17.4500501,5.02584807 17.2188483,5.04830418 17.2188483,4.88140982 C17.2188483,4.78322441 17.2349576,4.440876 17.2289695,4.27610302 C17.2198705,4.0257283 17.2198705,4.00272595 16.879185,4.00272595 C15.6801755,4.00272595 7.57994098,4.01731774 6.7379699,4.01731774 C6.49683297,4.01731774 6.35003617,4.18487523 6.35003617,4.53388203 C6.35003617,4.74483389 6.24039468,4.99704685 6.01862979,4.99704685 C5.7968649,4.99704685 5.31005437,4.99704685 5.13266594,4.99704685 C4.68422302,4.99704685 4.61268549,5.25423528 4.61268549,5.50463454 Z M8.08202795,14.4258852 L8.99277132,15.2711402 C5.25154432,15.6794021 2.55724136,16.806685 2.55724136,17.9436548 C2.55724136,19.3676663 6.78368972,20.7764824 12,20.7764824 C17.2163103,20.7764824 21.4427586,19.3676663 21.4427586,17.9436548 C21.4427586,16.785342 18.6463522,15.6370832 14.7954437,15.2489135 L15.7077452,14.3974798 C19.6128497,14.9078542 22.3870345,16.2241752 22.3870345,17.9436548 C22.3870345,20.1702074 17.7353821,21.7207583 12,21.7207583 C6.26461793,21.7207583 1.61296549,20.1702074 1.61296549,17.9436548 C1.61296549,16.255194 4.28796226,14.9554774 8.08202795,14.4258852 Z M10.6710302,11.5763978 L12.8322063,11.5763978 L12.8322063,12.4311569 L14.850272,12.4311569 L14.850272,13.1625386 C13.1980102,14.8512889 12.2798056,15.7773227 12.095658,15.9406401 C11.8194366,16.1856162 11.4665742,16.245118 11.1852894,15.9358406 C10.9977662,15.7296556 10.1466057,14.8068236 8.631808,13.1673445 L8.631808,12.4311569 L10.6710302,12.4311569 L10.6710302,11.5763978 Z" id="path-1"></path>
+        <path d="M15.7077452,14.3974798 C19.6128497,14.9078542 22.3870345,16.2241752 22.3870345,17.9436548 C22.3870345,20.1702074 17.7353821,21.7207583 12,21.7207583 C6.26461793,21.7207583 1.61296549,20.1702074 1.61296549,17.9436548 C1.61296549,16.255194 4.28796226,14.9554774 8.08202795,14.4258852 L8.99277132,15.2711402 C5.25154432,15.6794021 2.55724136,16.806685 2.55724136,17.9436548 C2.55724136,19.3676663 6.78368972,20.7764824 12,20.7764824 C17.2163103,20.7764824 21.4427586,19.3676663 21.4427586,17.9436548 C21.4427586,16.785342 18.6463522,15.6370832 14.7954437,15.2489135 L15.7077452,14.3974798 Z M12.8322063,11.5763978 L12.8322063,12.4311569 L14.850272,12.4311569 L14.850272,13.1625386 C13.8176084,14.2180075 13.0716858,14.9755403 12.6125043,15.435137 L12.4441246,15.6030858 C12.2655232,15.7804878 12.1493677,15.8930059 12.095658,15.9406401 C11.8194366,16.1856162 11.4665742,16.245118 11.1852894,15.9358406 C10.9977662,15.7296556 10.1466057,14.8068236 8.631808,13.1673445 L8.631808,12.4311569 L10.6710302,12.4311569 L10.6710302,11.5763978 L12.8322063,11.5763978 Z M5.15496619,2.28495093 L18.3385148,2.28495093 C18.6650005,2.28495093 18.8790257,2.28495093 18.8790257,2.58217943 L18.8790257,3.01297567 L19.6188049,3.01297567 C19.9253151,3.01297567 19.9531797,3.24581991 19.9557128,3.51869095 L19.9559661,8.9377088 C19.9559661,9.494082 19.7929935,10.114419 19.1793605,10.114419 L18.0079756,10.114419 C17.6643532,10.114419 17.4696665,10.9805518 17.1368059,10.9805518 L14.291725,10.9805518 C13.6510748,10.9805518 13.2578451,11.1788833 12.9040466,10.6014467 C12.5502482,10.0240101 12.5192587,9.46054823 12.1955143,9.31461529 C11.8717698,9.16868235 11.6215077,9.16868235 11.3380608,9.31461529 C11.0546139,9.46054823 10.9714044,9.82799628 10.596953,10.3502039 C10.2225017,10.8724116 10.2225017,10.9805518 9.54826979,10.9805518 L6.81741358,10.9805518 C6.18396611,10.9805518 6.359686,10.114419 5.8682708,10.114419 L4.47030929,10.114419 C3.74418012,10.114419 3.52611385,9.62969469 3.52611385,9.16868235 L3.52611385,3.71323478 C3.52611385,3.37928545 3.52973254,3.20508105 3.84387168,3.20508105 L4.47030929,3.20508105 L4.47030929,2.51814508 C4.47030929,2.22143022 4.87065672,2.28495093 5.15496619,2.28495093 Z M16.879185,4.00272595 L16.3443433,4.00311551 C16.2855429,4.00317818 16.2234588,4.00324784 16.1582965,4.00332405 L15.4942715,4.00417579 C15.248924,4.00451115 14.9814197,4.00489415 14.6973056,4.00531335 L14.1085747,4.00619664 C13.5009845,4.00712142 12.8417472,4.00816053 12.1752391,4.00922251 L11.5079508,4.01028872 C10.6193845,4.01171146 9.74418911,4.01312065 8.98755258,4.01429949 L8.44394853,4.01513705 L8.31614996,4.01533056 L8.31614996,4.01533056 L7.73347592,4.01618696 L7.62928346,4.01633378 L7.62928346,4.01633378 L6.91135551,4.01721696 L6.84265483,4.01727245 L6.84265483,4.01727245 L6.7379699,4.01731774 L6.7379699,4.01731774 C6.49683297,4.01731774 6.35003617,4.18487523 6.35003617,4.53388203 C6.35003617,4.71846491 6.2660919,4.93463831 6.09654069,4.98579755 L6.01862979,4.99704685 L5.13266594,4.99704685 C4.68422302,4.99704685 4.61268549,5.25423528 4.61268549,5.50463454 C4.61268549,6.14691948 4.63170859,7.58191213 4.63170859,8.33759815 C4.63170859,8.6585799 4.79971275,9.06102167 5.3168102,9.11687569 L5.44241973,9.1234178 L6.62810005,9.1234178 C7.0448936,9.1234178 6.89366652,9.72460303 7.43092466,9.72460303 C7.99262307,9.72460303 8.7379626,9.71673753 9.30981202,9.71673753 C9.83400731,9.71673753 9.87769025,9.64860373 10.1259562,9.33564902 L10.1992522,9.24409504 C10.225718,9.21146524 10.2490194,9.1825088 10.2697598,9.15653781 L10.3682979,9.03103395 C10.4844912,8.88000627 10.4910119,8.85935771 10.8278223,8.46759812 C11.2769028,7.945252 12.5131865,8.0431303 12.9493111,8.46759812 C13.3854357,8.89206593 13.2501785,8.99951096 13.5502525,9.43247993 C13.8253203,9.82936816 14.1326658,9.76230886 14.6005109,9.74837614 L14.7321807,9.74628199 L15.0930343,9.74450176 C15.517083,9.74045497 15.9681812,9.72988849 16.6181631,9.71673753 C16.864879,9.71174577 17.0299863,9.27698396 17.2626523,9.1683715 L17.3669374,9.14399548 L18.360447,9.14399548 C18.8437243,9.14399548 18.8840065,8.67680442 18.8872954,8.27604889 L18.8873052,8.06189089 C18.884962,7.47563474 18.8685594,6.22821867 18.8685594,5.31959614 C18.8685594,5.17550979 18.8456268,5.05867369 18.6733569,5.03171601 L18.5900153,5.02584807 L17.6856414,5.02584807 C17.4500501,5.02584807 17.2188483,5.04830418 17.2188483,4.88140982 C17.2188483,4.78322441 17.2349576,4.440876 17.2289695,4.27610302 C17.2198705,4.0257283 17.2198705,4.00272595 16.879185,4.00272595 Z" id="path-1"></path>
     </defs>
-    <g id="icon-/-VR-/-VR-Preview" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+    <g id="icon-/-VR-/-VRPreview" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <mask id="mask-2" fill="white">
             <use xlink:href="#path-1"></use>
         </mask>
diff --git a/Assets/Editor/Icons/Components/Viewport/AnimGraphNetSync.svg b/Assets/Editor/Icons/Components/Viewport/AnimGraphNetSync.svg
new file mode 100644
index 0000000000..357b246ddf
--- /dev/null
+++ b/Assets/Editor/Icons/Components/Viewport/AnimGraphNetSync.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Networking / AnimGraphNetSync - box</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
+            <stop stop-color="#9D9D9D" offset="100%"></stop>
+        </linearGradient>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
+    </defs>
+    <g id="icon-/-Networking-/-AnimGraphNetSync---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/general/color/-box-template">
+            <mask id="mask-3" fill="white">
+                <use xlink:href="#path-2"></use>
+            </mask>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#D179BD">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="Rectangle-2" x="0" y="0" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+        <path d="M15.049674,6.47369367 C15.4432627,6.6892261 15.7604258,7.03456112 15.9372202,7.4597408 L18.2809307,10.7388937 L20.5360597,13.1099302 L19.1977985,14.5962199 L16.7162512,11.9890965 L16.6986951,12 L16.5958385,11.8625904 L16.3813051,11.6372009 L16.4079396,11.6115701 L15.3771738,10.2345359 L13.8743689,13.609891 L16.5991717,16 L16.6094599,16 L16.6094599,22 L14.6094599,22 L14.6094599,16.9335637 L11.6612465,14.4145916 L11.3980432,14.2974059 L10.0226048,17.3866912 L9.249451,19.1359308 L3.60945994,15.6954658 L4.66929847,13.9993696 L8.35173206,16.2223461 L9.57095227,13.4839327 L9.55505528,13.4768549 L11.6580994,8.75334034 L10.0814102,9.12452852 L8.49311047,12.0950967 L6.74387106,11.1254774 L8.75357795,7.42096143 L8.74387106,7.3871095 L13.8051816,6.24191249 L13.8065756,6.24907236 L13.8467182,6.24373869 C14.2785593,6.19071527 14.6951248,6.27953958 15.049674,6.47369367 Z M13.5987889,17.6350711 C13.572509,17.9597225 13.6285826,18.2952382 13.6964241,18.6560991 C13.1795955,18.7733829 12.6442829,18.8412727 12.0958161,18.8565495 L11.6150583,18.8565495 C11.275482,18.8469001 10.9409546,18.8170831 10.6126317,18.7682539 C10.670507,18.4605621 10.7266734,18.1354685 10.7972551,17.8226088 C11.1428332,17.8726889 11.4972759,17.8983461 11.8577112,17.8983461 C12.4404519,17.8983461 13.0075283,17.8312796 13.5516431,17.704444 L13.5516431,17.704444 Z M11.647504,16.2486556 C11.7899433,16.1769877 11.9536953,16.1729445 12.1289629,16.2145006 L12.1295992,17.8915701 L11.6488414,17.8915701 Z M18.076658,14.5384251 C18.3408687,14.8129591 18.5792009,15.0601343 18.7602727,15.2490003 C18.4630094,15.6715982 18.1302432,16.0674992 17.7642931,16.4299561 C17.760008,16.1031617 17.6330796,15.7725209 17.3827022,15.4371459 C17.6213444,15.172391 17.84157,14.889567 18.0408193,14.59153 Z M15.7132934,12 C15.7720323,12.0788945 15.8816793,12.2068494 16.0267203,12.3685635 C15.9587005,12.9569594 15.8529563,13.5224281 15.7151024,14.0660205 C15.5766074,13.9827778 15.431612,13.8997912 15.2796434,13.8165372 C15.4086802,13.2916983 15.5049326,12.7449573 15.5663281,12.177658 Z M11.8577112,2.07231992 C12.3964417,2.07231992 12.9233182,2.12307294 13.4338202,2.22005843 C13.3482946,2.46634834 13.3291871,2.80942794 13.3257056,3.18009412 C12.9372153,3.10094608 12.5375985,3.05338777 12.1295992,3.03871626 L12.1295992,3.03871626 L12.1285895,5.46156689 C11.9512681,5.48541444 11.7949663,5.52203287 11.647511,5.56512663 L11.6488414,3.03671385 C11.1516919,3.05043211 10.6667409,3.11297065 10.1986107,3.21970705 L10.1986107,3.21970705 L10.2319111,3.24530673 C10.1658846,3.3311949 10.0462903,3.50418212 9.89087978,3.75915386 C9.62977538,4.1875304 9.36819157,4.68780657 9.12380485,5.25485042 C9.01341424,5.51098675 8.90999389,5.77227871 8.81409497,6.03857038 C8.92044292,6.05347287 9.02990059,6.06739803 9.14251161,6.08031397 C8.59089467,6.2854912 8.24016554,6.82439202 7.90471412,7.41951697 C7.98348273,7.07932431 8.07527683,6.74650702 8.17795828,6.42043512 C7.70466339,6.32943083 7.29881452,6.21619073 6.95569933,6.08380127 C6.60329126,5.9478262 6.34968167,5.80643758 6.17669795,5.67370956 C5.25272496,6.7678951 4.63912903,8.13267068 4.47171053,9.63223592 L4.47171053,9.63223592 L6.46106208,9.63135388 C6.39057266,9.78245667 6.33155,9.94284808 6.28399409,10.1125281 L4.43369564,10.1129937 C4.42822282,10.2300057 4.42545584,10.3477251 4.42545584,10.4660908 C4.42545584,11.3842275 4.59193882,12.26348 4.89636373,13.0753073 C4.4091113,12.7914229 4.00443311,12.6090845 3.7852425,12.7756598 C3.57626503,12.0427631 3.46394029,11.2675444 3.46394029,10.4660908 C3.46394029,5.83033915 7.22195951,2.07231992 11.8577112,2.07231992 Z M20.251482,10.4660908 C20.251482,10.7723701 20.2350779,11.0748181 20.2031002,11.3726039 C19.9170941,11.0443975 19.6050883,10.7000998 19.2884819,10.3539205 L19.2878989,10.2890346 L19.2878989,10.2890346 L19.2817267,10.1129937 L19.0676605,10.1128629 C18.9200071,9.95185943 18.7724397,9.79115444 18.6271237,9.6321612 L19.2437118,9.63223592 C19.0902448,8.25763436 18.5618648,6.99629356 17.7631727,5.95281444 C18.0066226,5.74364905 18.2476986,5.51417296 18.4443564,5.26451895 C19.5763742,6.69409029 20.251482,8.5012506 20.251482,10.4660908 Z M15.7438711,2 C16.8484406,2 17.7438711,2.8954305 17.7438711,4 C17.7438711,5.1045695 16.8484406,6 15.7438711,6 C14.6393016,6 13.7438711,5.1045695 13.7438711,4 C13.7438711,2.8954305 14.6393016,2 15.7438711,2 Z M9.54775478,3.39980534 C8.37597945,3.78261085 7.33234419,4.44876384 6.49779749,5.31731583 C6.62432768,5.40795739 6.82688388,5.51879497 7.12876186,5.63527324 C7.46055004,5.76329221 7.85977995,5.87292013 8.33153044,5.96044351 C8.43917765,5.65550174 8.55635657,5.35680658 8.68230527,5.06457125 C8.93591679,4.47612336 9.20790254,3.95595361 9.48036769,3.50893822 C9.50354598,3.47091116 9.52602488,3.43452899 9.54775478,3.39980534 Z" id="Combined-Shape" fill="#FFFFFF" fill-rule="nonzero"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/Viewport/Animation.png b/Assets/Editor/Icons/Components/Viewport/Animation.png
deleted file mode 100644
index dc98478033..0000000000
--- a/Assets/Editor/Icons/Components/Viewport/Animation.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b25a1a9b6bd273c7d9338007f21ad6b37e2b4e9c8e0fd2956a71dbe6e6f0bc01
-size 4725
diff --git a/Assets/Editor/Icons/Components/Viewport/Animation.svg b/Assets/Editor/Icons/Components/Viewport/Animation.svg
new file mode 100644
index 0000000000..a6c6845de4
--- /dev/null
+++ b/Assets/Editor/Icons/Components/Viewport/Animation.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Animation / Animation - box</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
+            <stop stop-color="#9D9D9D" offset="100%"></stop>
+        </linearGradient>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
+    </defs>
+    <g id="icon-/-Animation-/-Animation---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/general/color/-box-template">
+            <mask id="mask-3" fill="white">
+                <use xlink:href="#path-2"></use>
+            </mask>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#5AA9D2">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="UI" x="0" y="0" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+        <path d="M14.305803,6.47369367 C14.6993916,6.6892261 15.0165548,7.03456112 15.1933492,7.4597408 L17.5370596,10.7388937 L19.7921887,13.1099302 L18.4539274,14.5962199 L15.9723802,11.9890965 L15.954824,12 L15.8519674,11.8625904 L15.6374341,11.6372009 L15.6640685,11.6115701 L14.6333027,10.2345359 L13.1304978,13.609891 L15.8553007,16 L15.8655889,16 L15.8655889,22 L13.8655889,22 L13.8655889,16.9335637 L10.9173755,14.4145916 L10.6541721,14.2974059 L9.2787337,17.3866912 L8.50557994,19.1359308 L2.86558888,15.6954658 L3.92542741,13.9993696 L7.607861,16.2223461 L8.82708121,13.4839327 L8.81118422,13.4768549 L10.9142284,8.75334034 L9.33753914,9.12452852 L7.74923941,12.0950967 L6,11.1254774 L8.00970689,7.42096143 L8,7.3871095 L13.0613105,6.24191249 L13.0627046,6.24907236 L13.1028472,6.24373869 L13.1028472,6.24373869 C13.5346882,6.19071527 13.9512538,6.27953958 14.305803,6.47369367 Z M15,2 C16.1045695,2 17,2.8954305 17,4 C17,5.1045695 16.1045695,6 15,6 C13.8954305,6 13,5.1045695 13,4 C13,2.8954305 13.8954305,2 15,2 Z" id="Combined-Shape" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/Viewport/AreaLight.png b/Assets/Editor/Icons/Components/Viewport/AreaLight.png
deleted file mode 100644
index 462e20873e..0000000000
--- a/Assets/Editor/Icons/Components/Viewport/AreaLight.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3e6caa86ba02f53302813aa5220336483fbb8a48e33bee16402423fa92502254
-size 3831
diff --git a/Assets/Editor/Icons/Components/Viewport/AreaLight.svg b/Assets/Editor/Icons/Components/Viewport/AreaLight.svg
new file mode 100644
index 0000000000..b7ef9043ba
--- /dev/null
+++ b/Assets/Editor/Icons/Components/Viewport/AreaLight.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Rendering / AreaLight - box</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
+            <stop stop-color="#9D9D9D" offset="100%"></stop>
+        </linearGradient>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
+    </defs>
+    <g id="icon-/-Rendering-/-AreaLight---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/general/color/-box-template">
+            <mask id="mask-3" fill="white">
+                <use xlink:href="#path-2"></use>
+            </mask>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#B29EDF">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="Rectangle-2" x="0" y="-0.00055502734" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+        <path d="M11.9641749,17.7856148 C13.3257638,17.7856148 14.6875407,17.7783003 16.0491297,17.7914288 C16.3488653,17.7943359 16.4603031,17.7128449 16.4576722,17.3984152 C16.4447995,15.7896941 16.4434841,14.180598 16.4586739,12.571877 C16.4617125,12.2379419 16.3492412,12.1518559 16.0274247,12.153154 C13.3355358,12.1641405 10.6434589,12.1639529 7.95147605,12.1537314 C7.63416972,12.1525123 7.51427548,12.2310963 7.51775203,12.5700952 C7.53391333,14.1631557 7.53560462,15.7566851 7.51681242,17.3497456 C7.51267814,17.7094689 7.62994148,17.7972429 7.97318104,17.7926479 C9.30329307,17.7749243 10.633781,17.7854272 11.9641749,17.7856148 M17.417318,10.9086252 C17.7666558,10.9054384 17.8832382,10.9838127 17.8807817,11.3429203 C17.8645073,13.7157593 17.8639955,16.0886978 17.88123,18.4615367 C17.8838524,18.8295075 17.7500743,18.8904542 17.4115861,18.8894708 C13.795996,18.8789022 10.1802011,18.8790018 6.564611,18.8894708 C6.2227451,18.8905538 6.09193533,18.8201464 6.09439186,18.4560595 C6.11066631,16.0832205 6.11107573,13.7101824 6.09415129,11.3373435 C6.09152591,10.9653893 6.2368701,10.9075297 6.57044524,10.9099198 C8.37813795,10.9229656 10.1860354,10.9160941 11.9938304,10.9161937 C13.8017279,10.9162933 15.6096253,10.9251565 17.417318,10.9086252 Z M22.1425293,14.3060428 C22.374268,14.3060428 22.5118219,14.5294084 22.5047846,14.9512705 C22.4975837,15.3784726 22.3426821,15.5574398 22.1177352,15.5546935 C21.6685779,15.5487431 21.2193388,15.5528626 20.7701815,15.5520997 C20.3074407,15.5513369 19.8445362,15.5508792 19.3817953,15.5514894 C19.1635584,15.551642 19.006693,15.4184465 19.0050422,14.9494396 C19.0034198,14.498894 19.1435922,14.3084839 19.3658388,14.3072634 C20.2914023,14.3023811 21.2169658,14.3060428 22.1425293,14.3060428 Z M1.5732486,14.2740399 C2.45849733,14.283445 3.34374605,14.2832933 4.2289129,14.274495 C4.46463535,14.2720679 4.64705619,14.3991879 4.65303318,14.880211 C4.65966517,15.415389 4.46078715,15.5305251 4.21106382,15.5232438 C3.76172559,15.5100464 3.3122236,15.5194514 2.86280349,15.5200582 C2.44056637,15.5205133 2.01832926,15.5120184 1.5962559,15.5236989 C1.34882511,15.5305251 1.1478183,15.4252492 1.15330403,14.8840033 C1.15821662,14.3997946 1.33637988,14.2714611 1.5732486,14.2740399 Z M20.7135484,6.70057394 C21.0527418,7.06128361 20.9487352,7.29258258 20.7637641,7.472642 C20.4277314,7.79926079 20.0995557,8.13398532 19.7684748,8.46568023 C19.4373938,8.79737514 19.1024646,9.12534621 18.7759482,9.46148123 C18.5895017,9.65324859 18.3364452,9.71025034 17.9918223,9.36377019 C17.6470031,9.01707701 17.7132609,8.7594714 17.896424,8.57548973 C18.5577673,7.91128131 19.2202984,7.24813627 19.885837,6.58812318 C20.0794937,6.39610373 20.3398031,6.30319801 20.7135484,6.70057394 Z M4.09437258,6.58988655 C4.42099138,6.92591925 4.7557159,7.25409497 5.08741081,7.58517593 C5.41910572,7.91625689 5.74707679,8.25118606 6.08321182,8.57770253 C6.27497917,8.76414899 6.33198093,9.01720546 5.98550077,9.36182841 C5.6388076,9.70664764 5.38120199,9.64038979 5.19722031,9.45722672 C4.53301189,8.7958834 3.86986686,8.13335232 3.20985377,7.46781367 C3.01783431,7.27415702 2.9249286,7.01384759 3.32230453,6.64010226 C3.68301419,6.30090887 3.91431317,6.40491553 4.09437258,6.58988655 Z M12.0304506,3.67725265 C12.5253568,3.69246695 12.615366,3.92956384 12.611893,4.18767934 C12.6052364,4.6562447 12.6098671,5.12498596 12.6103012,5.59363927 C12.6107353,6.06229258 12.6058152,6.53103384 12.6126166,6.99959921 C12.616379,7.26703676 12.4777474,7.48628103 11.9890637,7.48496779 C11.5000906,7.48364271 11.3647873,7.25463667 11.3642084,6.99502612 C11.3621825,6.0577195 11.3617484,5.12032493 11.3656555,4.18301831 C11.3668132,3.91030412 11.4851855,3.6605433 12.0304506,3.67725265 Z" id="Combined-Shape" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/Viewport/Attachment.png b/Assets/Editor/Icons/Components/Viewport/Attachment.png
deleted file mode 100644
index cec7b9aa0e..0000000000
--- a/Assets/Editor/Icons/Components/Viewport/Attachment.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2479f20de2e99874fa09e3a285b5faa8709de2572deef009b14e57c2729639b3
-size 3036
diff --git a/Assets/Editor/Icons/Components/Viewport/Attachment.svg b/Assets/Editor/Icons/Components/Viewport/Attachment.svg
new file mode 100644
index 0000000000..73dfe5a5a1
--- /dev/null
+++ b/Assets/Editor/Icons/Components/Viewport/Attachment.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Animation / Attachment Copy</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
+            <stop stop-color="#9D9D9D" offset="100%"></stop>
+        </linearGradient>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
+    </defs>
+    <g id="icon-/-Animation-/-Attachment-Copy" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/general/color/-box-template">
+            <mask id="mask-3" fill="white">
+                <use xlink:href="#path-2"></use>
+            </mask>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#5AA9D2">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="UI" x="0" y="0" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+        <path d="M5.12085575,9.92719073 C3.52225029,9.92719073 2.22632452,8.63126496 2.22632452,7.0326595 C2.22632452,5.43405404 3.52225029,4.13812826 5.12085575,4.13812826 C6.71946121,4.13812826 8.01538699,5.43405404 8.01538699,7.0326595 C8.01538699,8.63126496 6.71946121,9.92719073 5.12085575,9.92719073 Z M19.1800075,20.6783068 C17.581402,20.6783068 16.2854762,19.382381 16.2854762,17.7837755 C16.2854762,16.1851701 17.581402,14.8892443 19.1800075,14.8892443 C20.7786129,14.8892443 22.0745387,16.1851701 22.0745387,17.7837755 C22.0745387,19.382381 20.7786129,20.6783068 19.1800075,20.6783068 Z M7.83518264,9.6379601 L8.42681801,8.86555959 L9.97161904,10.0488303 L9.37998367,10.8212308 L7.83518264,9.6379601 Z M10.1523842,11.4128662 L10.7440196,10.6404657 L12.2888206,11.8237364 L11.6971852,12.5961369 L10.1523842,11.4128662 Z M12.4695857,13.1877723 L13.0612211,12.4153718 L14.6060221,13.5986425 L14.0143868,14.371043 L12.4695857,13.1877723 Z M14.7867873,14.9626784 L15.3784226,14.1902779 L16.9232237,15.3735486 L16.3315883,16.1459491 L14.7867873,14.9626784 Z" id="Combined-Shape" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/Viewport/AudioAnimationEventsProxy.svg b/Assets/Editor/Icons/Components/Viewport/AudioAnimationEventsProxy.svg
new file mode 100644
index 0000000000..d0a1b39c65
--- /dev/null
+++ b/Assets/Editor/Icons/Components/Viewport/AudioAnimationEventsProxy.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Audio / AudioAnimationEventsProxy - box</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
+            <stop stop-color="#9D9D9D" offset="100%"></stop>
+        </linearGradient>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
+    </defs>
+    <g id="icon-/-Audio-/-AudioAnimationEventsProxy---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/general/color/-box-template">
+            <mask id="mask-3" fill="white">
+                <use xlink:href="#path-2"></use>
+            </mask>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#DF9557">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="Rectangle-2" x="0" y="0" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+        <path d="M10.6,18.8501837 L10.6,20.8501837 L13.4,20.8501837 L13.4,18.8501837 L10.6,18.8501837 Z M14.5560317,18.8501837 L14.5560317,20.8501837 L17.3560317,20.8501837 L16.4479179,19.8501837 L17.3560317,18.8501837 L14.5560317,18.8501837 Z M3.79702045,17.37531 L6.27189419,19.8501837 L3.79702045,22.3250574 L1.32214672,19.8501837 L3.79702045,17.37531 Z M20.2029795,17.37531 L22.6778533,19.8501837 L20.2029795,22.3250574 L17.7281058,19.8501837 L20.2029795,17.37531 Z M9.44396834,18.8501837 L9.44396834,20.8501837 L6.64396834,20.8501837 L7.55208208,19.8501837 L6.64396834,18.8501837 L9.44396834,18.8501837 Z M12,2.9629324 L7.1028973,4.31152442 L7.1028973,13.6712754 L12,16.1201934 L12,6.45443512 L16.8971027,4.31152442 L12,2.9629324 Z M18.1520313,3.68396613 L18.1520313,14.2988336 L12,17.37531 L5.84796867,14.2988336 L5.84796867,3.68396613 L12,2.09479475 L18.1520313,3.68396613 Z M12.4082377,6.84868858 L12.4082377,16.713906 L11.7807734,16.713906 L11.7807734,6.84333874 L6.49900254,4.80708901 L6.7953934,4.26394696 L12.0997358,6.31207657 L17.0541547,4.26817209 L17.3660694,4.80286388 L12.4082377,6.84868858 Z M15.2193583,9.04081364 C15.9258956,8.83320244 16.3715544,8.18503342 16.2751635,7.3648751 C16.1787726,6.54471679 15.6858976,6.07643165 15.0252764,6.21423905 C14.3646553,6.35204645 13.8983017,7.05393555 13.8983017,7.82030812 C13.8983017,8.58668069 14.5128209,9.24842484 15.2193583,9.04081364 Z M15.4020263,14.2751389 C16.5178205,13.9472703 17.221624,12.923654 17.0693993,11.6284247 C16.9171747,10.3331955 16.1388053,9.59365951 15.095524,9.81129087 C14.0522426,10.0289222 13.315757,11.1373757 13.315757,12.3476641 C13.315757,13.5579526 14.2862322,14.6030074 15.4020263,14.2751389 Z" id="Shape" fill="#FFFFFF" fill-rule="nonzero"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/Viewport/AudioArea.png b/Assets/Editor/Icons/Components/Viewport/AudioArea.png
deleted file mode 100644
index a025e4685c..0000000000
--- a/Assets/Editor/Icons/Components/Viewport/AudioArea.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:74c5fe002468e61d9b6efa2e619eb6d60b8cf6bae740163f496fb85121a254a2
-size 3318
diff --git a/Assets/Editor/Icons/Components/Viewport/AudioArea.svg b/Assets/Editor/Icons/Components/Viewport/AudioArea.svg
new file mode 100644
index 0000000000..c29c26b67d
--- /dev/null
+++ b/Assets/Editor/Icons/Components/Viewport/AudioArea.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Audio / AudioArea - box</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
+            <stop stop-color="#9D9D9D" offset="100%"></stop>
+        </linearGradient>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
+    </defs>
+    <g id="icon-/-Audio-/-AudioArea---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/general/color/-box-template">
+            <mask id="mask-3" fill="white">
+                <use xlink:href="#path-2"></use>
+            </mask>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#DF9557">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="Rectangle-2" x="0" y="0" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+        <path d="M18.9078388,17.9629694 L18.9078388,8.99092059 C17.8346161,8.83010669 16.9438759,8.15066675 16.5405659,7.23313164 L7.85873857,7.23313164 C7.47841885,8.22637695 6.56309448,8.97046804 5.4491689,9.14162489 L5.4491689,17.9629694 L9.41580881,17.9629694 C9.65102383,16.5448715 10.9276829,15.4611937 12.4673165,15.4611937 C14.0069501,15.4611937 15.2836092,16.5448715 15.5188242,17.9629694 L18.9078388,17.9629694 L18.9078388,17.9629694 Z M19.8898019,8.99092059 L19.8898019,18.9080846 L15.5188242,18.9080846 C15.2836092,20.3261825 14.0069501,21.4098602 12.4673165,21.4098602 C10.9276829,21.4098602 9.65102383,20.3261825 9.41580881,18.9080846 L4.46720586,18.9080846 L4.46720586,9.14162489 C2.99381974,8.91523623 1.86789192,7.68648331 1.86789192,6.20462388 C1.86789192,4.56194498 3.25146433,3.23029062 4.95818738,3.23029062 C6.66491043,3.23029062 8.04848283,4.56194498 8.04848283,6.20462388 C8.04848283,6.2325127 8.04808403,6.26031187 8.04729162,6.2880164 L16.3131002,6.2880164 C16.3100632,6.23531621 16.3085249,6.18223611 16.3085249,6.1288125 C16.3085249,4.5246936 17.6954207,3.23029062 19.3988203,3.23029062 C21.10222,3.23029062 22.4891158,4.5246936 22.4891158,6.1288125 C22.4891158,7.57562658 21.3608896,8.77048979 19.8898019,8.99092059 Z M19.4031303,4.17540985 C19.4041263,4.51495692 19.4081035,5.1090237 19.4150621,6.14839461 C19.4083638,7.14889366 19.4071904,7.73677396 19.4069849,8.08220482 C20.5709249,8.0781242 21.5071528,7.20183194 21.5071528,6.1288125 C21.5071528,5.05460882 20.5688572,4.1775668 19.4031303,4.17540985 L19.4031303,4.17540985 Z M4.95818738,8.23384189 C6.12258722,8.23384189 7.06651979,7.32533004 7.06651979,6.20462388 C7.06651979,5.08391771 6.12258722,4.17540586 4.95818738,4.17540586 C3.79378754,4.17540586 2.84985497,5.08391771 2.84985497,6.20462388 C2.84985497,7.32533004 3.79378754,8.23384189 4.95818738,8.23384189 Z" id="Shape" fill="#FFFFFF" fill-rule="nonzero"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/Viewport/AudioAreaEnvironment.png b/Assets/Editor/Icons/Components/Viewport/AudioAreaEnvironment.png
deleted file mode 100644
index a025e4685c..0000000000
--- a/Assets/Editor/Icons/Components/Viewport/AudioAreaEnvironment.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:74c5fe002468e61d9b6efa2e619eb6d60b8cf6bae740163f496fb85121a254a2
-size 3318
diff --git a/Assets/Editor/Icons/Components/Viewport/AudioAreaEnvironment.svg b/Assets/Editor/Icons/Components/Viewport/AudioAreaEnvironment.svg
new file mode 100644
index 0000000000..60c07a5129
--- /dev/null
+++ b/Assets/Editor/Icons/Components/Viewport/AudioAreaEnvironment.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Audio / AudioAreaEnvironment - box</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
+            <stop stop-color="#9D9D9D" offset="100%"></stop>
+        </linearGradient>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
+    </defs>
+    <g id="icon-/-Audio-/-AudioAreaEnvironment---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/general/color/-box-template">
+            <mask id="mask-3" fill="white">
+                <use xlink:href="#path-2"></use>
+            </mask>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#DF9557">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="Rectangle-2" x="0" y="0" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+        <path d="M20.1493763,19.7230415 L20.1493763,3.83676722 L3.78023646,3.83676722 L3.78023646,19.7230415 L20.1493763,19.7230415 Z M3.78023646,1.37415326 L3.78023646,2.82274971 L20.1493763,2.82274971 L20.1493763,1.37415326 L21.1633938,1.37415326 L21.1633938,2.82274971 L22.6103656,2.82274971 L22.6103656,3.83676722 L21.1633938,3.83676722 L21.1633938,19.7230415 L22.6103656,19.7230415 L22.6103656,20.7370591 L21.1633938,20.7370591 L21.1633938,22.668521 L20.1493763,22.668521 L20.1493763,20.7370591 L3.78023646,20.7370591 L3.78023646,22.668521 L2.76621895,22.668521 L2.76621895,20.7370591 L1.3176225,20.7370591 L1.3176225,19.7230415 L2.76621895,19.7230415 L2.76621895,3.83676722 L1.3176225,3.83676722 L1.3176225,2.82274971 L2.76621895,2.82274971 L2.76621895,1.37415326 L3.78023646,1.37415326 Z M12.1338093,4.29548942 L11.6268005,4.29548942 L11.6268005,19.2643193 L12.1338093,19.2643193 L12.1338093,4.29548942 Z M13.5534338,6.70981683 L13.046425,6.70981683 L13.046425,17.8157229 L13.5534338,17.8157229 L13.5534338,6.70981683 Z M10.7141848,6.22695135 L10.207176,6.22695135 L10.207176,17.3328574 L10.7141848,17.3328574 L10.7141848,6.22695135 Z M9.29456025,9.12414423 L8.78755149,9.12414423 L8.78755149,14.4356645 L9.29456025,14.4356645 L9.29456025,9.12414423 Z M14.9730583,9.12414423 L14.4660496,9.12414423 L14.4660496,14.4356645 L14.9730583,14.4356645 L14.9730583,9.12414423 Z M19.2319318,10.5727407 L18.7249231,10.5727407 L18.7249231,12.9870681 L19.2319318,12.9870681 L19.2319318,10.5727407 Z M7.87493574,10.5727407 L7.36792698,10.5727407 L7.36792698,12.9870681 L7.87493574,12.9870681 L7.87493574,10.5727407 Z M16.3926828,10.5727407 L15.8856741,10.5727407 L15.8856741,12.9870681 L16.3926828,12.9870681 L16.3926828,10.5727407 Z M5.03568671,10.5727407 L4.52867795,10.5727407 L4.52867795,12.9870681 L5.03568671,12.9870681 L5.03568671,10.5727407 Z M6.45531122,11.0556062 L5.94830247,11.0556062 L5.94830247,12.5042026 L6.45531122,12.5042026 L6.45531122,11.0556062 Z M17.8123073,11.0556062 L17.3052986,11.0556062 L17.3052986,12.5042026 L17.8123073,12.5042026 L17.8123073,11.0556062 Z" id="Combined-Shape" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/Viewport/AudioListener.png b/Assets/Editor/Icons/Components/Viewport/AudioListener.png
deleted file mode 100644
index 96ef318cb9..0000000000
--- a/Assets/Editor/Icons/Components/Viewport/AudioListener.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:545c0c391e16106ebf975607c3a4cefb21289df6f53ec0234d11c8b79cb40e9c
-size 5001
diff --git a/Assets/Editor/Icons/Components/Viewport/AudioListener.svg b/Assets/Editor/Icons/Components/Viewport/AudioListener.svg
new file mode 100644
index 0000000000..2af8ac797b
--- /dev/null
+++ b/Assets/Editor/Icons/Components/Viewport/AudioListener.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Audio / AudioListener - box</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
+            <stop stop-color="#9D9D9D" offset="100%"></stop>
+        </linearGradient>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
+    </defs>
+    <g id="icon-/-Audio-/-AudioListener---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/general/color/-box-template">
+            <mask id="mask-3" fill="white">
+                <use xlink:href="#path-2"></use>
+            </mask>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#DF9557">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="Rectangle-2" x="0" y="0" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+        <path d="M4.10041385,9.80566392 L4.41978753,10.2090112 C4.35375385,10.2612972 4.24266874,10.3778241 4.12904125,10.5554631 C3.63821291,11.3227976 3.6622782,12.341479 4.58996878,13.6569395 L4.16952511,13.9534453 C3.12147055,12.4673093 3.0920482,11.221864 3.69564225,10.2782378 C3.84283396,10.0481263 3.99256806,9.8910571 4.10041385,9.80566392 Z M2.24380753,8.48742944 L2.66465763,8.78335808 C2.57598915,8.90945651 2.43551499,9.166404 2.29283365,9.54353432 C1.80543457,10.8318105 1.72721767,12.4049741 2.32442068,14.2172793 L1.83578798,14.3782969 C1.2000228,12.4489687 1.28421881,10.7555482 1.81164157,9.36148285 C1.97045646,8.94170889 2.13147853,8.64717631 2.24380753,8.48742944 Z M6.57665767,18.642551 C6.85348308,19.0948391 7.9276686,19.592857 8.56161817,19.592857 C8.61064636,19.592857 8.65295957,19.5933546 8.74501071,19.5947526 C9.19493421,19.6014458 9.42606213,19.5858936 9.68205745,19.5112326 C10.1635461,19.3708064 10.5172696,19.0323263 10.7606959,18.3442911 C11.1599395,17.215844 11.9013761,16.6404893 13.6967589,15.708131 C13.8090485,15.6498641 13.8090485,15.6498641 13.9207646,15.5918453 C14.6479144,15.2137449 15.0397195,14.987665 15.4155975,14.7090914 C16.8670422,13.6333853 17.2570973,12.7228619 17.2570971,10.2362182 C17.2570969,7.02015982 15.4756113,4.5767267 12.1311429,4.5767267 C10.4193504,4.5767267 9.22451797,5.09663107 8.42742551,5.95709796 C8.15227965,6.25411984 7.94501337,6.57202117 7.79665689,6.88829732 C7.71037976,7.0722286 7.66423119,7.20859248 7.6487538,7.27296505 L6.64830699,7.03242312 C6.76015877,6.56721627 7.06842971,5.91002389 7.67257585,5.2578439 C8.66475288,4.18678185 10.1333181,3.54776886 12.1311429,3.54776886 C16.1267536,3.54776886 18.286055,6.50940259 18.286055,10.2362181 C18.286055,13.0285324 17.7626343,14.2503778 16.0282681,15.5357648 C15.5959808,15.856145 15.1686717,16.1027113 14.3954598,16.5047629 C14.2827528,16.5632965 14.2827528,16.5632965 14.1709746,16.6212979 C12.606314,17.4338401 12.0107647,17.8959863 11.7307317,18.687489 C11.3776754,19.6853892 10.771679,20.2652707 9.97015048,20.4990365 C9.58628265,20.6109916 9.27778303,20.63175 8.72970525,20.6235966 C8.63937677,20.6222365 8.60351686,20.6218148 8.56161817,20.6218148 C7.5945769,20.6218148 6.18039374,19.966166 5.69903562,19.1797044 C5.1823534,18.335529 5.18842083,17.6160844 5.50317901,16.7902536 C5.46926822,16.8792507 5.62813758,16.4752195 5.64369041,16.421539 L6.63200291,16.7078826 C6.60246216,16.8098423 6.42184741,17.2704868 6.45733135,17.1760656 C6.25329791,17.7182142 6.25289236,18.1135707 6.57665767,18.642551 Z M10.4301379,8.00166743 L10.8769786,7.74667335 C10.9402408,7.85753129 11.0658777,8.03357607 11.2409257,8.20868131 C11.5197934,8.48764016 11.8208237,8.64968484 12.1290397,8.64968484 C13.0881459,8.64968484 14.256743,9.1831326 14.6677462,9.81981431 C14.8862434,10.1582865 15.0129769,10.6916344 14.9701013,11.1355779 C14.9141899,11.714498 14.5806875,12.1061168 14.0020178,12.1061168 C12.884071,12.1061168 11.4428305,12.584971 11.2154326,13.1318 C10.8310859,14.0560472 9.87477382,15.3242971 9.28379878,15.5698746 C8.85022885,15.7500429 8.09982192,15.513894 7.6607661,15.0168781 C7.09405059,14.3753501 7.05501759,13.4209938 7.67451611,12.2547403 C8.11149397,11.432096 8.67473189,10.9174382 9.34191828,10.6680151 C9.96046411,10.436776 10.5552082,10.4448122 11.3161388,10.5950442 C11.3800712,10.6076665 11.6050222,10.6544867 11.6521947,10.6636178 C11.7467483,10.6819204 11.8067325,10.6901833 11.8406735,10.6901833 L11.8406735,11.2046622 C11.7646592,11.2046622 11.6794902,11.1929301 11.5544229,11.168721 C11.5028069,11.1587298 11.2765912,11.1116463 11.2164878,11.09978 C10.5408848,10.9663944 10.0314049,10.9595103 9.52207506,11.1499198 C8.97624446,11.3539749 8.5085359,11.7813428 8.12887242,12.4960884 C7.60351937,13.4851058 7.63310494,14.2084726 8.0463446,14.6762643 C8.34914461,15.0190371 8.87239501,15.1837011 9.08637594,15.0947822 C9.52173002,14.9138724 10.4034119,13.7445962 10.740391,12.9342548 C11.0751433,12.1292683 12.6932867,11.5916379 14.0020178,11.5916379 C14.2831999,11.5916379 14.425298,11.4247777 14.4580052,11.0861202 C14.4898279,10.7566199 14.3906266,10.339139 14.2355058,10.0988426 C13.9275472,9.62178654 12.9250561,9.16416376 12.1290397,9.16416376 C11.6618919,9.16416376 11.2434672,8.93892572 10.8770747,8.57241338 C10.6649666,8.3602359 10.5142136,8.14899796 10.4301379,8.00166743 Z M19.723529,9.80566392 C19.8313748,9.8910571 19.9811089,10.0481263 20.1283006,10.2782378 C20.7318947,11.221864 20.7024723,12.4673093 19.6544177,13.9534453 L19.2339741,13.6569395 C20.1616646,12.341479 20.1857299,11.3227976 19.6949016,10.5554631 C19.5812741,10.3778241 19.470189,10.2612972 19.4041553,10.2090112 L19.723529,9.80566392 Z M21.5832463,8.48742944 C21.6955753,8.64717631 21.8565974,8.94170889 22.0154123,9.36148285 C22.542835,10.7555482 22.6270311,12.4489687 21.9912659,14.3782969 L21.5026332,14.2172793 C22.0998362,12.4049741 22.0216193,10.8318105 21.5342202,9.54353432 C21.3915389,9.166404 21.2510647,8.90945651 21.1623962,8.78335808 L21.5832463,8.48742944 Z" id="Combined-Shape" fill="#FFFFFF" fill-rule="nonzero"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/Viewport/AudioMultiPosition.png b/Assets/Editor/Icons/Components/Viewport/AudioMultiPosition.png
deleted file mode 100644
index 5f98d78553..0000000000
--- a/Assets/Editor/Icons/Components/Viewport/AudioMultiPosition.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ae836a60d1df878d493d3080230e68a478860d0fdd24623fb312a9c7899e5f07
-size 2947
diff --git a/Assets/Editor/Icons/Components/Viewport/AudioMultiPosition.svg b/Assets/Editor/Icons/Components/Viewport/AudioMultiPosition.svg
new file mode 100644
index 0000000000..e581ba223f
--- /dev/null
+++ b/Assets/Editor/Icons/Components/Viewport/AudioMultiPosition.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Audio / AudioMultiPosition - box</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
+            <stop stop-color="#9D9D9D" offset="100%"></stop>
+        </linearGradient>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
+    </defs>
+    <g id="icon-/-Audio-/-AudioMultiPosition---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/general/color/-box-template">
+            <mask id="mask-3" fill="white">
+                <use xlink:href="#path-2"></use>
+            </mask>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#DF9557">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="Rectangle-2" x="0" y="0" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+        <path d="M18.8634151,13.8021518 C21.0935523,13.8021518 22.9014357,15.6100352 22.9014357,17.8401724 L22.9014357,22.9950937 L17.9194412,22.9950937 C15.5671121,22.9950937 13.6601727,21.0881542 13.6601727,18.7358252 L13.6601727,18.2891057 C13.6601727,16.0589685 16.050667,13.8021518 18.2808042,13.8021518 L18.8634151,13.8021518 Z M12.9712395,1.04989456 C13.2857356,1.05234146 13.5428007,1.05606524 13.7424349,1.0610659 C14.445831,2.3405871 14.8435686,3.79404612 14.8435686,5.33807451 C14.8435686,5.81843088 14.8050729,6.29002133 14.7308539,6.75033555 C15.4163722,6.54643488 16.1279706,6.39562305 16.8590453,6.30240747 C16.8676223,6.15091877 16.8711488,5.99729491 16.8711488,5.84292062 C16.8711488,4.14299317 16.4435338,2.53405947 15.6820367,1.10435279 L17.0629971,1.08901478 C17.7388397,2.54545721 18.1136166,4.15271135 18.1136166,5.84292062 C18.1136166,5.96321114 18.1117183,6.08308149 18.1079484,6.20250721 C18.2731481,6.19481383 18.4403758,6.1917938 18.6083494,6.1917938 C19.9413536,6.1917938 21.2273749,6.38198525 22.436718,6.73503124 L22.8865693,6.87500389 L22.8776557,8.18747427 C21.5572524,7.70152738 20.116946,7.43426166 18.6083494,7.43426166 C18.4037933,7.43426166 18.2004927,7.43917551 17.9985763,7.44888209 C17.9015978,8.12973246 17.7426226,8.79225348 17.5277609,9.43153348 C18.0089826,9.36289595 18.5020805,9.3279473 19.003591,9.3279473 C20.3877705,9.3279473 21.7078654,9.59417624 22.9076829,10.0757573 L22.8691091,12.8044696 C21.7439646,12.1758306 20.4218626,11.812883 19.003591,11.812883 C17.946632,11.812883 16.9430846,12.0144602 16.0346649,12.3773602 C15.0316952,13.8132317 13.7075828,15.0333533 12.1585133,15.9514907 C11.7654265,16.783616 11.5487839,17.7007528 11.5487839,18.6619255 C11.5487839,20.2805315 12.1631445,21.7742592 13.1926851,22.9509074 L10.9361773,22.9501054 C10.6216813,22.9476585 10.3646161,22.9439348 10.164982,22.9389341 C9.46158582,21.6594129 9.06384821,20.2059539 9.06384821,18.6619255 C9.06384821,18.181702 9.10232269,17.7102397 9.17650138,17.2500466 C8.49104462,17.4535651 7.77944622,17.6043769 7.04837152,17.6975925 C7.03979458,17.8490812 7.0362681,18.0027051 7.0362681,18.1570794 C7.0362681,19.8570068 7.4638831,21.4659405 8.22538017,22.8956472 L6.84441979,22.9109852 C6.16857714,21.4545428 5.79380024,19.8472887 5.79380024,18.1570794 C5.79380024,18.0371249 5.79568791,17.9175882 5.79943689,17.7984936 C5.6342687,17.8051862 5.46704108,17.8082062 5.29906742,17.8082062 C3.96606326,17.8082062 2.68004191,17.6180147 1.47069888,17.2649688 L1.02084754,17.1249961 L1.02976113,15.8125257 C2.35016445,16.2984726 3.79047084,16.5657383 5.29906742,16.5657383 C5.50362356,16.5657383 5.70692415,16.5608245 5.9088405,16.5511179 C6.00576825,15.8706216 6.16462894,15.2084357 6.37932071,14.569464 C5.89843422,14.637104 5.40533631,14.6720527 4.90382581,14.6720527 C3.51964631,14.6720527 2.19955149,14.4058238 0.999733965,13.9242427 L1.03830772,11.1955304 C2.16345222,11.8241694 3.48555421,12.187117 4.90382581,12.187117 C5.96078483,12.187117 6.96433229,11.9855398 7.87275199,11.6226398 C8.87512523,10.1873075 10.1995274,8.96681061 11.7489988,8.04845281 C12.1420738,7.21603057 12.3586329,6.29906203 12.3586329,5.33807451 C12.3586329,3.71946854 11.7442723,2.22574081 10.7147317,1.0490926 L12.9712395,1.04989456 Z M19.5695488,15.0688395 L14.9515749,19.6868134 C14.5092787,20.1291095 14.6528476,20.56431 15.2721805,20.6514684 L17.9364826,21.0281297 L19.1072665,22.1989136 C19.3583815,22.4467753 19.7625639,22.4451898 20.0117271,22.1953662 L22.0954859,20.1116073 C22.3443071,19.8627862 22.348091,19.4557314 22.0992699,19.2069102 L20.9036511,18.0157854 L20.5332577,15.3901546 C20.4462176,14.7707035 20.0118449,14.6265433 19.5695488,15.0688395 Z M16.7202487,7.57798318 L16.5257194,7.60736371 C15.7822444,7.73252367 15.0637103,7.92348455 14.377329,8.1734575 C13.3909314,11.0851001 10.9275848,13.3672535 7.82577081,14.2619377 C7.5340867,14.9503564 7.31860301,15.6737763 7.18699222,16.4230179 C8.00042053,16.3001509 8.78460966,16.0980906 9.53079366,15.8262854 C10.5164855,12.9148999 12.9798321,10.6327465 16.081646,9.73806235 C16.3732009,9.04995044 16.5886219,8.32686802 16.7202487,7.57798318 Z M5.98797568,1.00490631 C8.3403047,1.00490631 10.2472442,2.91184576 10.2472442,5.26417479 L10.2472442,5.71089432 C10.2472442,7.94103147 7.85674983,10.1978482 5.62661267,10.1978482 L5.04400171,10.1978482 C2.81386455,10.1978482 1.00598118,8.38996479 1.00598118,6.15982764 L1.00598118,1.00490631 L5.98797568,1.00490631 Z M3.89568979,1.80463384 L1.81193093,3.8883927 C1.56310978,4.13721385 1.55932583,4.54426863 1.80814698,4.79308977 L2.98851005,5.97345284 L3.00376571,5.98421459 L3.37415917,8.60984537 C3.46119927,9.2292965 3.89557193,9.37345666 4.33786808,8.93116051 L8.95584197,4.31318663 C9.39813812,3.87089048 9.25456926,3.43568999 8.63523639,3.34853163 L5.97093427,2.97187034 L4.80015034,1.80108641 C4.54903537,1.55322471 4.14485294,1.55481015 3.89568979,1.80463384 Z" id="Combined-Shape" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/Viewport/AudioPreload.svg b/Assets/Editor/Icons/Components/Viewport/AudioPreload.svg
new file mode 100644
index 0000000000..1762cbc50c
--- /dev/null
+++ b/Assets/Editor/Icons/Components/Viewport/AudioPreload.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Audio / AudioPreload - box</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
+            <stop stop-color="#9D9D9D" offset="100%"></stop>
+        </linearGradient>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
+    </defs>
+    <g id="icon-/-Audio-/-AudioPreload---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/general/color/-box-template">
+            <mask id="mask-3" fill="white">
+                <use xlink:href="#path-2"></use>
+            </mask>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#DF9557">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="Rectangle-2" x="0" y="0" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+        <path d="M15.1203509,2.44554921 C15.8194168,2.76269043 16.0102655,3.3521478 15.8458379,3.93342403 C15.6814104,4.51470025 15.2739896,4.7831104 14.4015524,4.57173247 C13.4924121,4.35146193 12.4123873,4.32887171 11.3969511,4.43552297 C10.4357829,4.53647446 9.29595995,4.90595862 8.687256,5.2668505 C8.08081453,5.626401 7.08466298,6.25121503 6.33632986,7.06861033 C5.54000424,7.93842728 5.002093,9.00936755 4.75092877,9.62913208 C4.53666356,10.1578458 4.32387306,11.1379754 4.23866853,12.1851804 C4.11475926,13.7080853 4.54591296,15.3613499 5.12230145,16.4199184 C6.18420273,18.3701573 7.62520062,19.5781877 9.24866143,20.3135376 C10.8721222,21.0488875 13.1546375,21.1395238 15.056469,20.5580685 C16.9583006,19.9766132 20.509327,17.6882596 21.086191,15.9118111 C20.7124226,17.9875464 18.2337271,19.7442125 17.4384631,20.2590651 C16.6431992,20.7739178 14.5243561,21.7166729 12.2275096,21.6609282 C9.93066313,21.6051835 8.19063526,20.8818689 6.97901323,20.066626 C6.06573505,19.4521244 5.26556161,18.7906438 4.40852985,17.6063692 C3.70153067,16.6294145 3.21956312,15.5383183 2.91572218,14.5124207 C2.66032748,13.6500985 2.52827982,12.596485 2.54038603,11.7671425 C2.56144009,10.3248222 2.87670333,9.04664527 3.38683483,7.9074765 C4.1902949,6.11327908 5.21084046,4.73061521 7.34274871,3.4155105 C8.16857176,2.90608718 9.359817,2.35377926 11.0239763,2.12784041 C12.8175167,1.88433579 14.6671076,2.23992891 15.1203509,2.44554921 Z M14.182268,7.27499779 C14.8610758,6.76367625 15.4171664,7.04388045 15.4171664,7.89381049 L15.4171664,7.89381049 L15.4171664,16.7678527 C15.4171664,17.6177827 14.861303,17.8966234 14.1824953,17.3850746 L14.1824953,17.3850746 L11.3038686,15.2182075 C11.2954602,15.2184348 11.2872791,15.2225254 11.2788707,15.2225254 L11.2788707,15.2225254 L9.0106483,15.2225254 C8.53250584,15.2225254 8.14503696,14.8277851 8.14503696,14.3496427 L8.14503696,14.3496427 L8.14503696,10.3454269 C8.14440231,9.86599254 8.53122376,9.47612446 9.0106483,9.47299867 L9.0106483,9.47299867 L11.2604631,9.47299867 Z" id="Path-2" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/Viewport/AudioProxy.svg b/Assets/Editor/Icons/Components/Viewport/AudioProxy.svg
new file mode 100644
index 0000000000..a9024c1ece
--- /dev/null
+++ b/Assets/Editor/Icons/Components/Viewport/AudioProxy.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Audio / AudioProxy - box</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
+            <stop stop-color="#9D9D9D" offset="100%"></stop>
+        </linearGradient>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
+    </defs>
+    <g id="icon-/-Audio-/-AudioProxy---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/general/color/-box-template">
+            <mask id="mask-3" fill="white">
+                <use xlink:href="#path-2"></use>
+            </mask>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#DF9557">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="Rectangle-2" x="0" y="0" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+        <path d="M12.6629004,2.20655653 C12.7302237,2.24596805 12.7939587,2.29392864 12.8525458,2.35045228 L15.218991,4.63355271 C15.2232143,4.63762725 15.227401,4.64173955 15.2315506,4.64588913 C15.6151373,5.02947587 15.6151373,5.65139285 15.2315506,6.03497958 L15.218989,6.04754114 C14.833405,6.43312514 14.2099948,6.43871212 13.8175621,6.06010067 L13.0837445,5.35212769 L13.0837445,9.02480771 C14.1313744,9.23450178 15.0777343,9.72458491 15.8412399,10.4134728 L18.7921077,8.7097885 L17.8120763,8.4282703 C17.2879728,8.27771934 16.9811062,7.7350368 17.1222397,7.20831926 L17.1268376,7.19115986 C17.2672401,6.66717063 17.805836,6.35621214 18.3298252,6.49661463 C18.3354936,6.49813348 18.3411483,6.4997031 18.3467886,6.5013233 L21.5072342,7.40917478 C21.5854786,7.43165083 21.6588813,7.46286673 21.7266743,7.50146459 C22.1617777,7.69563794 22.4070985,8.1789301 22.2884446,8.65578009 L21.4944442,11.846732 C21.4930272,11.8524267 21.4915592,11.8581087 21.4900403,11.8637771 C21.3496378,12.3877663 20.8110419,12.6987248 20.2870527,12.5583223 L20.2698933,12.5537245 C19.7431758,12.4125909 19.4266322,11.8754954 19.558303,11.346333 L19.7819006,10.4477324 L17.0855856,12.0044506 C17.5222737,12.8226887 17.7698096,13.7571258 17.7698096,14.749378 C17.7698096,17.9737471 15.155942,20.5876146 11.9315729,20.5876146 C8.70720387,20.5876146 6.09333629,17.9737471 6.09333629,14.749378 C6.09333629,13.7060531 6.3670101,12.7266481 6.84648663,11.8790342 L4.36739915,10.4477324 L4.59099674,11.346333 C4.72266753,11.8754954 4.40612397,12.4125909 3.87940643,12.5537245 L3.86224702,12.5583223 C3.3382578,12.6987248 2.7996619,12.3877663 2.65925941,11.8637771 C2.65774055,11.8581087 2.65627253,11.8524267 2.65485552,11.846732 L1.86085517,8.65578009 C1.74220122,8.1789301 1.98752209,7.69563794 2.42262547,7.50146459 C2.49041846,7.46286673 2.56382109,7.43165083 2.64206552,7.40917478 L5.80251111,6.5013233 C5.80815141,6.4997031 5.81380611,6.49813348 5.81947453,6.49661463 C6.34346376,6.35621214 6.88205966,6.66717063 7.02246215,7.19115986 L7.02706,7.20831926 C7.16819354,7.7350368 6.86132692,8.27771934 6.33722344,8.4282703 L5.35719204,8.7097885 L8.13533171,10.3137482 C8.95327431,9.61305289 9.96729247,9.13467462 11.0837445,8.97225504 L11.0837445,5.36391383 L10.4173324,6.00685533 C10.0248997,6.38546677 9.40148951,6.37987979 9.0159055,5.99429579 L9.00334395,5.98173423 C8.61975721,5.5981475 8.61975721,4.97623052 9.00334395,4.59264378 L9.01590348,4.58030736 L9.01590348,4.58030736 L11.3823487,2.29720693 C11.735986,1.95602459 12.2771897,1.92683262 12.6629004,2.20655653 Z M13.5759095,10.9296012 L11.2490866,12.5846077 L9.45741293,12.5846077 C9.07561604,12.5869613 8.767565,12.8805163 8.76807041,13.2415111 L8.76807041,16.2565249 C8.76807041,16.616547 9.07663705,16.9137705 9.45741293,16.9137705 L11.2637457,16.9137705 C11.2704419,16.9137705 11.276957,16.9106905 11.2836532,16.9105194 L13.5760905,18.5420833 C14.1166692,18.927259 14.5593393,18.7173032 14.5593393,18.07734 L14.5593393,11.3955424 C14.5593393,10.7555791 14.1164882,10.5445966 13.5759095,10.9296012 Z" id="Combined-Shape" fill="#FFFFFF" fill-rule="nonzero"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/Viewport/AudioRtpc.png b/Assets/Editor/Icons/Components/Viewport/AudioRtpc.png
deleted file mode 100644
index da819bbb6c..0000000000
--- a/Assets/Editor/Icons/Components/Viewport/AudioRtpc.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6d84ff0349bfc7d046cf38cf370180a77c0888c3f27d78a2c6d21d4ccc765cbd
-size 4286
diff --git a/Assets/Editor/Icons/Components/Viewport/AudioRtpc.svg b/Assets/Editor/Icons/Components/Viewport/AudioRtpc.svg
new file mode 100644
index 0000000000..42bd56db2f
--- /dev/null
+++ b/Assets/Editor/Icons/Components/Viewport/AudioRtpc.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Audio / AudioRtpc - box</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
+            <stop stop-color="#9D9D9D" offset="100%"></stop>
+        </linearGradient>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
+    </defs>
+    <g id="icon-/-Audio-/-AudioRtpc---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/general/color/-box-template">
+            <mask id="mask-3" fill="white">
+                <use xlink:href="#path-2"></use>
+            </mask>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#DF9557">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="Rectangle-2" x="0" y="0" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+        <path d="M17.5213734,17.4167143 C16.9197823,17.4797543 16.308297,17.4783416 15.720839,17.3842135 C14.5130191,17.1906854 13.5734582,16.6243468 13.0630755,15.5972458 L13.9111365,15.1758309 C14.2687337,15.8954643 14.9398727,16.3000064 15.8706642,16.4491465 C16.3827674,16.5312005 16.9321986,16.5295115 17.4747027,16.4691154 C17.6491354,15.4006091 18.5764981,14.5851243 19.6943274,14.5851243 C20.9364771,14.5851243 21.9434385,15.5920856 21.9434385,16.8342353 C21.9434385,18.0763851 20.9364771,19.0833464 19.6943274,19.0833464 C18.6536199,19.0833464 17.7780042,18.3765046 17.5213734,17.4167143 L17.5213734,17.4167143 Z M18.4649687,17.2644794 C18.6426459,17.7721997 19.1259604,18.1363523 19.6943274,18.1363523 C20.4134667,18.1363523 20.9964443,17.5533747 20.9964443,16.8342353 C20.9964443,16.115096 20.4134667,15.5321184 19.6943274,15.5321184 C19.0520957,15.5321184 18.5184596,15.9970717 18.4116665,16.6087309 L18.5772671,17.2370912 C18.5459621,17.2453414 18.5083963,17.2545662 18.4649687,17.2644794 L18.4649687,17.2644794 Z M6.41269282,7.75955074 C6.48530035,7.74554426 6.56620141,7.73105601 6.65462238,7.71664096 C7.41334843,7.59294773 8.20368929,7.5617412 8.95475585,7.68208411 C10.1625758,7.87561231 11.1021367,8.44195087 11.6125194,9.46905189 L10.7644584,9.89046678 C10.4068612,9.17083331 9.73572217,8.76629123 8.80493068,8.61715112 C8.16829992,8.51514419 7.47397986,8.54255934 6.80699687,8.65129593 C6.70920885,8.66723807 6.62294762,8.68306303 6.54988526,8.69766867 C6.47287876,9.8700561 5.49754262,10.7971477 4.30567263,10.7971477 C3.06352288,10.7971477 2.05656155,9.79018638 2.05656155,8.54803663 C2.05656155,7.30588688 3.06352288,6.29892555 4.30567263,6.29892555 C5.27039587,6.29892555 6.09325469,6.90631937 6.41269282,7.75955074 L6.41269282,7.75955074 Z M6.52399202,16.4612087 C6.64215608,16.4441001 6.77431579,16.4229376 6.91828166,16.3971941 C7.58783099,16.2774677 8.25666476,16.0998341 8.87630612,15.8546154 C10.5778142,15.1812557 11.5572814,14.1562214 11.5572814,12.6911362 C11.5572814,9.97039983 12.8250527,8.42109955 14.890389,7.87698913 C15.7865707,7.64089109 16.7255021,7.6190278 17.6008433,7.72430547 C17.9295241,6.8896413 18.7429412,6.29892555 19.6943274,6.29892555 C20.9364771,6.29892555 21.9434385,7.30588688 21.9434385,8.54803663 C21.9434385,9.79018638 20.9364771,10.7971477 19.6943274,10.7971477 C18.4896709,10.7971477 17.5062192,9.85005756 17.4479474,8.65985241 C16.692317,8.57312646 15.8820418,8.59504544 15.1316418,8.79273744 C13.4716819,9.23005193 12.5042755,10.4122864 12.5042755,12.6911362 C12.5042755,14.6201354 11.2485651,15.9342643 9.224777,16.7351641 C8.54056471,17.0059362 7.81241243,17.199324 7.0849757,17.3294017 C6.86820908,17.3681631 6.66439824,17.3988727 6.47707086,17.4225015 C6.21847349,18.3793446 5.34428727,19.0833464 4.30567263,19.0833464 C3.06352288,19.0833464 2.05656155,18.0763851 2.05656155,16.8342353 C2.05656155,15.5920856 3.06352288,14.5851243 4.30567263,14.5851243 C5.42074309,14.5851243 6.34628588,15.3965887 6.52399202,16.4612087 L6.52399202,16.4612087 Z M4.30567263,9.85015357 C5.02481196,9.85015357 5.60778957,9.26717596 5.60778957,8.54803663 C5.60778957,7.8288973 5.02481196,7.24591969 4.30567263,7.24591969 C3.5865333,7.24591969 3.00355569,7.8288973 3.00355569,8.54803663 C3.00355569,9.26717596 3.5865333,9.85015357 4.30567263,9.85015357 Z M4.30567263,18.1363523 C5.02481196,18.1363523 5.60778957,17.5533747 5.60778957,16.8342353 C5.60778957,16.115096 5.02481196,15.5321184 4.30567263,15.5321184 C3.5865333,15.5321184 3.00355569,16.115096 3.00355569,16.8342353 C3.00355569,17.5533747 3.5865333,18.1363523 4.30567263,18.1363523 Z M19.6943274,9.85015357 C20.4134667,9.85015357 20.9964443,9.26717596 20.9964443,8.54803663 C20.9964443,7.8288973 20.4134667,7.24591969 19.6943274,7.24591969 C18.975188,7.24591969 18.3922104,7.8288973 18.3922104,8.54803663 C18.3922104,9.26717596 18.975188,9.85015357 19.6943274,9.85015357 Z" id="Shape" fill="#FFFFFF" fill-rule="nonzero"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/Viewport/AudioSwitch.png b/Assets/Editor/Icons/Components/Viewport/AudioSwitch.png
deleted file mode 100644
index 4525730401..0000000000
--- a/Assets/Editor/Icons/Components/Viewport/AudioSwitch.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3c4488476a9f7b8196b9561d3be5f0bfa737648600ffe3792f644aaeb577cec9
-size 3976
diff --git a/Assets/Editor/Icons/Components/Viewport/AudioSwitch.svg b/Assets/Editor/Icons/Components/Viewport/AudioSwitch.svg
new file mode 100644
index 0000000000..950f6a3daf
--- /dev/null
+++ b/Assets/Editor/Icons/Components/Viewport/AudioSwitch.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Audio / AudioSwitch - box</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
+            <stop stop-color="#9D9D9D" offset="100%"></stop>
+        </linearGradient>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
+    </defs>
+    <g id="icon-/-Audio-/-AudioSwitch---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/general/color/-box-template">
+            <mask id="mask-3" fill="white">
+                <use xlink:href="#path-2"></use>
+            </mask>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#DF9557">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="Rectangle-2" x="0" y="0" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+        <path d="M12.0172841,3.17763841 C12.0084453,4.01699637 12.0222844,6.23179768 12.0588015,12.0759608 C12.0243002,17.5975209 12.0302856,19.8793481 12.0292472,20.8223307 C16.8882615,20.8065621 20.8223782,16.8627121 20.8223782,12 C20.8223782,7.13329775 16.8818025,3.18696625 12.0172841,3.17763841 L12.0172841,3.17763841 Z M12,21.9986952 C6.4778731,21.9986952 2.00130475,17.5221269 2.00130475,12 C2.00130475,6.4778731 6.4778731,2.00130475 12,2.00130475 C17.5221269,2.00130475 21.9986952,6.4778731 21.9986952,12 C21.9986952,17.5221269 17.5221269,21.9986952 12,21.9986952 Z" id="Shape" fill="#FFFFFF" fill-rule="nonzero"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/Viewport/AudioTrigger.png b/Assets/Editor/Icons/Components/Viewport/AudioTrigger.png
deleted file mode 100644
index 47e2d35331..0000000000
--- a/Assets/Editor/Icons/Components/Viewport/AudioTrigger.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a036c3763b96079dde8505ad6995f8b717a777c78d7a434ac8de6f1ccb5d8dd1
-size 4327
diff --git a/Assets/Editor/Icons/Components/Viewport/AudioTrigger.svg b/Assets/Editor/Icons/Components/Viewport/AudioTrigger.svg
new file mode 100644
index 0000000000..4953daf13e
--- /dev/null
+++ b/Assets/Editor/Icons/Components/Viewport/AudioTrigger.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Audio / AudioTrigger - box</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
+            <stop stop-color="#9D9D9D" offset="100%"></stop>
+        </linearGradient>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
+    </defs>
+    <g id="icon-/-Audio-/-AudioTrigger---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/general/color/-box-template">
+            <mask id="mask-3" fill="white">
+                <use xlink:href="#path-2"></use>
+            </mask>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#DF9557">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="Rectangle-2" x="0" y="0" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+        <path d="M21.9554951,13.501167 C21.9573625,13.5240734 21.9586219,13.7625648 21.9594249,14.1468542 L21.960005,14.5103232 C21.9600842,14.5763097 21.960155,14.6448648 21.9602178,14.715785 L21.9601473,17.349457 C21.9600945,17.447333 21.9600381,17.5455394 21.9599787,17.6438729 L21.9593709,18.5268103 C21.9592966,18.6240748 21.9592206,18.7208559 21.9591432,18.8169502 L21.9581771,19.9240934 C21.9580959,20.0114378 21.9580151,20.0972816 21.9579351,20.1814212 L21.9572502,20.8871735 C21.9571794,20.9592574 21.9571106,21.0290267 21.9570445,21.096278 L21.9562181,22.1518785 L19.1544961,20.0429916 L18.9469777,19.8867902 L16.4757199,19.8977378 C16.4242384,19.8977378 16.3767275,19.8496775 16.3767275,19.791673 L16.3767275,19.791673 L16.3767275,15.8950515 C16.3766507,15.8365552 16.4230543,15.7897881 16.4805667,15.7894132 L16.4805667,15.7894132 L18.9135751,15.789429 Z M19.7506558,1.98900188 C20.2878552,1.98900188 20.8060413,2.23433146 20.8060413,2.79139563 C20.8060413,3.11184775 21.4042135,7.8038927 21.935398,11.8450373 C21.6650107,11.8912719 21.38135,12.0145654 21.1029374,12.2242836 L20.7491343,12.4904408 L19.6223863,2.99245521 L3.52626836,2.99245521 L1.83946785,17.0427884 L14.876728,17.0427884 L14.8767278,18.5250305 L1.9499277,18.48765 L2.70628013,20.0494329 L14.9011203,20.0494329 C14.9684446,20.4316845 15.1710412,20.7685564 15.4577514,21.0072269 L2.15867295,21.0072269 C1.88666786,21.0072269 1.64108984,20.9266265 1.51893361,20.6223196 C1.39677739,20.3180128 0.868937176,18.7750726 0.789326883,18.5664813 C0.709716591,18.3578899 0.642346124,17.9863238 0.676031358,17.7102078 C0.692312554,17.5767517 1.08975107,14.0945182 1.50721219,10.5007016 L1.59375069,9.75662304 C2.01225591,6.16281252 2.42587788,2.68067361 2.47348189,2.54740049 C2.57197294,2.27166301 2.82155936,1.98900188 3.28727912,1.98900188 L19.7506558,1.98900188 Z M16.496181,5.90732527 C16.7588103,6.12328418 16.9543036,6.2994488 17.0826612,6.43581913 C17.525792,6.90661273 17.8905798,7.41118062 18.0133077,7.64492603 C18.2773857,8.14788451 18.680364,8.89887112 18.625427,10.2536773 C18.5704899,11.6084835 16.6086107,15.3546527 11.6716268,15.3546527 C6.73464296,15.3546527 4.80327155,12.403868 4.80327155,10.1219695 C4.80327155,8.60070381 5.43427349,7.27990002 6.69627737,6.15955814 C6.1549366,7.07416029 5.95333067,8.13885984 6.09145957,9.35365679 C6.29865294,11.1758522 8.29995097,13.3172976 11.6716268,13.3172976 C15.0433027,13.3172976 17.239707,11.0500209 17.239707,8.96429485 C17.239707,7.87934003 17.080924,7.01242691 16.7633579,6.36355548 L16.496181,5.90732527 Z M11.6912052,3.37099816 C14.5767197,3.37099816 16.2157462,4.96355875 16.2157462,7.12201477 L16.2157462,8.88089522 C16.2157462,10.5260021 14.6530785,12.572228 11.5589119,12.572228 C8.55888206,12.572228 6.90801002,10.7304621 6.90801002,8.31014104 L6.90801002,7.12201477 C6.90801002,4.96355875 8.80569069,3.37099816 11.6912052,3.37099816 Z M15.0124524,5.47035497 C15.0755044,5.87553282 15.2049024,6.14040559 15.0755044,6.6142278 C14.9461065,7.08805001 14.0861119,8.89757799 11.5618781,8.89757799 C9.03764427,8.89757799 8.29842716,7.11392019 8.12776671,6.6142278 C8.01399308,6.28109954 8.04159614,5.9498999 8.2105759,5.62062888 C8.12476007,5.64229708 8.06058283,5.73394207 8.01804417,5.89556384 C7.93792591,6.19996594 7.90644937,6.55794173 7.89270344,6.81937171 C7.85444388,7.54701928 8.5778855,9.8546201 11.6187129,9.76258641 C14.6595402,9.67055273 15.2323647,7.34316617 15.2323647,6.97716126 C15.2323647,6.61115634 15.2443677,5.97183782 15.0124524,5.47035497 Z" id="Combined-Shape" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/Viewport/BehaviorTree.svg b/Assets/Editor/Icons/Components/Viewport/BehaviorTree.svg
new file mode 100644
index 0000000000..32f9a378fc
--- /dev/null
+++ b/Assets/Editor/Icons/Components/Viewport/BehaviorTree.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / AI / BehaviorTree - box</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
+            <stop stop-color="#9D9D9D" offset="100%"></stop>
+        </linearGradient>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
+    </defs>
+    <g id="icon-/-AI-/-BehaviorTree---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/general/color/-box-template">
+            <mask id="mask-3" fill="white">
+                <use xlink:href="#path-2"></use>
+            </mask>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#65C9C9">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="Rectangle-2" x="0" y="0" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+        <path d="M9.93791406,5.0548197 L9.93791406,8.05128515 L13.9379141,8.05128515 L13.9379141,5.0548197 L9.93791406,5.0548197 Z M15.4379141,4.05305242 L15.4379141,9.05305242 L8.43791406,9.05305242 L8.43791406,4.05305242 L15.4379141,4.05305242 Z M12.966227,10.6897839 L20.0369237,10.6897839 L20.0369237,15.0655662 L22.0633154,15.0655662 L22.0633154,20.0655662 L16.0633154,20.0655662 L16.0633154,15.0655662 L18.0897071,15.0655662 L18.0897071,12.6212458 L12.966227,12.6212458 L12.966227,15.0655662 L14.966227,15.0655662 L14.966227,20.0655662 L8.96622696,20.0655662 L8.96622696,15.0655662 L10.966227,15.0655662 L10.966227,12.6212458 L5.82978223,12.6212458 L5.81583068,15.0655662 L7.86913852,15.0655662 L7.86913852,20.0655662 L1.86913852,20.0655662 L1.86913852,15.0655662 L3.89590888,15.0655662 L3.90986044,12.6212458 L3.8955302,12.6212458 L3.8955302,10.6897839 L10.966227,10.6897839 L10.966227,8.12198221 L12.966227,8.12198221 L12.966227,10.6897839 Z M3.1548528,19.0655662 L6.58342423,19.0655662 L6.58342423,16.0655662 L3.1548528,16.0655662 L3.1548528,19.0655662 Z M10.2519413,19.0655662 L13.6805127,19.0655662 L13.6805127,16.0655662 L10.2519413,16.0655662 L10.2519413,19.0655662 Z M17.3490297,16.0655662 L17.3490297,19.0655662 L20.7776011,19.0655662 L20.7776011,16.0655662 L17.3490297,16.0655662 Z" id="Shape" fill="#FFFFFF" fill-rule="nonzero"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/Viewport/Box.png b/Assets/Editor/Icons/Components/Viewport/Box.png
deleted file mode 100644
index e6ddaf3d72..0000000000
--- a/Assets/Editor/Icons/Components/Viewport/Box.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:eb3e830c75a17445f5d62b75b820f8556ee59833177cca4677c1a8c47ea2ff46
-size 5215
diff --git a/Assets/Editor/Icons/Components/Viewport/Box.svg b/Assets/Editor/Icons/Components/Viewport/Box.svg
new file mode 100644
index 0000000000..49a7491d1d
--- /dev/null
+++ b/Assets/Editor/Icons/Components/Viewport/Box.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Shapes / Box - box</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
+            <stop stop-color="#9D9D9D" offset="100%"></stop>
+        </linearGradient>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
+    </defs>
+    <g id="icon-/-Shapes-/-Box---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/general/color/-box-template">
+            <mask id="mask-3" fill="white">
+                <use xlink:href="#path-2"></use>
+            </mask>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#5A69A1">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="Rectangle-2" x="0" y="0" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+        <path d="M14.9104468,4.3572224 L12.3128297,5.76093751 L16.0323823,7.5841228 L18.8324648,6.03460766 L14.9104468,4.3572224 L14.9104468,4.3572224 Z M14.3295329,4.10877467 L11.8900329,3.06543897 L9.21101211,4.24054281 L11.7671344,5.49345813 L14.3295329,4.10877467 L14.3295329,4.10877467 Z M8.38222655,7.88497915 L11.8905679,9.87612824 L15.5034882,7.87680326 L11.7772657,6.05034863 L8.38222655,7.88497915 Z M7.87464586,7.59690319 L11.2315704,5.78286925 L8.61677453,4.50119435 L5.12147016,6.0343462 L7.87464586,7.59690319 L7.87464586,7.59690319 Z M13.4248204,16.5292285 L13.4248204,20.2714109 L16.7212531,18.3032444 L16.7212531,14.7683696 L13.4248204,16.5292285 L13.4248204,16.5292285 Z M13.4248204,15.9681994 L16.7212531,14.2073405 L16.7212531,10.6116223 L13.4248204,12.5573954 L13.4248204,15.9681994 L13.4248204,15.9681994 Z M20.0150235,13.0089329 L17.1953634,14.5151136 L17.1953634,18.0201723 L20.0150235,16.3366674 L20.0150235,13.0089329 L20.0150235,13.0089329 Z M20.0150235,12.4479038 L20.0150235,8.66742073 L17.1953634,10.331771 L17.1953634,13.9540845 L20.0150235,12.4479038 L20.0150235,12.4479038 Z M10.5822419,16.6160095 L7.71315676,15.0944695 L7.71315676,18.6332262 L10.5822419,20.3155143 L10.5822419,16.6160095 L10.5822419,16.6160095 Z M10.5822419,16.0558018 L10.5822419,12.5941648 L7.71315676,10.8873807 L7.71315676,14.5342618 L10.5822419,16.0558018 L10.5822419,16.0558018 Z M3.88624372,13.064972 L3.88624372,16.3893156 L7.23904643,18.3552316 L7.23904643,14.8430382 L3.88624372,13.064972 L3.88624372,13.064972 Z M3.88624372,12.5047643 L7.23904643,14.2828305 L7.23904643,10.6053382 L3.88624372,8.61079627 L3.88624372,12.5047643 Z M20.9632442,6.96066648 L20.9632442,16.9207316 L12.4765998,21.9877635 L12.4765998,11.9700465 L20.9632442,6.96066648 Z M2.93802306,6.89751494 L11.5304626,12.0090536 L11.5304626,22.0167477 L2.93802306,16.9785706 L2.93802306,6.89751494 Z M11.8854851,1.98325228 L21.0857681,5.91806831 L11.88495,11.0096352 L2.91423186,5.91832977 L11.8854851,1.98325228 Z" id="Shape" fill="#FFFFFF" fill-rule="nonzero"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/Viewport/Box_Shape.png b/Assets/Editor/Icons/Components/Viewport/Box_Shape.png
deleted file mode 100644
index 28cd7f3219..0000000000
--- a/Assets/Editor/Icons/Components/Viewport/Box_Shape.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cd618a2c952bae92ad9232e305c49d260f518e378c6857b0ba368a8fa5df6ac0
-size 5689
diff --git a/Assets/Editor/Icons/Components/Viewport/Box_Shape.svg b/Assets/Editor/Icons/Components/Viewport/Box_Shape.svg
new file mode 100644
index 0000000000..d3d2c95cfb
--- /dev/null
+++ b/Assets/Editor/Icons/Components/Viewport/Box_Shape.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Shapes / Box_Shape - box</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
+            <stop stop-color="#9D9D9D" offset="100%"></stop>
+        </linearGradient>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
+    </defs>
+    <g id="icon-/-Shapes-/-Box_Shape---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/general/color/-box-template">
+            <mask id="mask-3" fill="white">
+                <use xlink:href="#path-2"></use>
+            </mask>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#5A69A1">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="Rectangle-2" x="0" y="0" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+        <path d="M14.9104468,4.3572224 L12.3128297,5.76093751 L16.0323823,7.5841228 L18.8324648,6.03460766 L14.9104468,4.3572224 L14.9104468,4.3572224 Z M14.3295329,4.10877467 L11.8900329,3.06543897 L9.21101211,4.24054281 L11.7671344,5.49345813 L14.3295329,4.10877467 L14.3295329,4.10877467 Z M8.38222655,7.88497915 L11.8905679,9.87612824 L15.5034882,7.87680326 L11.7772657,6.05034863 L8.38222655,7.88497915 Z M7.87464586,7.59690319 L11.2315704,5.78286925 L8.61677453,4.50119435 L5.12147016,6.0343462 L7.87464586,7.59690319 L7.87464586,7.59690319 Z M13.4248204,16.5292285 L13.4248204,20.2714109 L16.7212531,18.3032444 L16.7212531,14.7683696 L13.4248204,16.5292285 L13.4248204,16.5292285 Z M13.4248204,15.9681994 L16.7212531,14.2073405 L16.7212531,10.6116223 L13.4248204,12.5573954 L13.4248204,15.9681994 L13.4248204,15.9681994 Z M20.0150235,13.0089329 L17.1953634,14.5151136 L17.1953634,18.0201723 L20.0150235,16.3366674 L20.0150235,13.0089329 L20.0150235,13.0089329 Z M20.0150235,12.4479038 L20.0150235,8.66742073 L17.1953634,10.331771 L17.1953634,13.9540845 L20.0150235,12.4479038 L20.0150235,12.4479038 Z M10.5822419,16.6160095 L7.71315676,15.0944695 L7.71315676,18.6332262 L10.5822419,20.3155143 L10.5822419,16.6160095 L10.5822419,16.6160095 Z M10.5822419,16.0558018 L10.5822419,12.5941648 L7.71315676,10.8873807 L7.71315676,14.5342618 L10.5822419,16.0558018 L10.5822419,16.0558018 Z M3.88624372,13.064972 L3.88624372,16.3893156 L7.23904643,18.3552316 L7.23904643,14.8430382 L3.88624372,13.064972 L3.88624372,13.064972 Z M3.88624372,12.5047643 L7.23904643,14.2828305 L7.23904643,10.6053382 L3.88624372,8.61079627 L3.88624372,12.5047643 Z M20.9632442,6.96066648 L20.9632442,16.9207316 L12.4765998,21.9877635 L12.4765998,11.9700465 L20.9632442,6.96066648 Z M2.93802306,6.89751494 L11.5304626,12.0090536 L11.5304626,22.0167477 L2.93802306,16.9785706 L2.93802306,6.89751494 Z M11.8854851,1.98325228 L21.0857681,5.91806831 L11.88495,11.0096352 L2.91423186,5.91832977 L11.8854851,1.98325228 Z" id="Shape" fill="#FFFFFF" fill-rule="nonzero"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/Viewport/Capsule.png b/Assets/Editor/Icons/Components/Viewport/Capsule.png
deleted file mode 100644
index 9c7b4f75c8..0000000000
--- a/Assets/Editor/Icons/Components/Viewport/Capsule.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6cc176d9e097e8cd015b61939658f96d1a60b72f99f1a021e854a1437e446894
-size 4973
diff --git a/Assets/Editor/Icons/Components/Viewport/Capsule.svg b/Assets/Editor/Icons/Components/Viewport/Capsule.svg
new file mode 100644
index 0000000000..f5f948face
--- /dev/null
+++ b/Assets/Editor/Icons/Components/Viewport/Capsule.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Shapes / Capsule - box</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
+            <stop stop-color="#9D9D9D" offset="100%"></stop>
+        </linearGradient>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
+    </defs>
+    <g id="icon-/-Shapes-/-Capsule---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/general/color/-box-template">
+            <mask id="mask-3" fill="white">
+                <use xlink:href="#path-2"></use>
+            </mask>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#5A69A1">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="Rectangle-2" x="0" y="0" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+        <path d="M18.1690143,16.0244823 L15.444714,12.4017835 C14.6352822,13.340816 13.5726735,14.2676139 12.5054186,14.9651968 L15.1717325,18.6135269 C16.2528883,17.9230289 17.3550742,16.9692392 18.1690143,16.0244823 L18.1690143,16.0244823 Z M18.4345733,16.4498033 C17.606154,17.3930032 16.5291353,18.3174468 15.4560945,19.0026208 L15.9423005,19.6678987 C15.9504964,19.6694829 16.0321813,19.7350696 16.1528185,19.8157378 C16.6958785,20.1788736 17.3435072,20.3982029 18.0675896,20.3597291 C18.236709,20.2647428 18.401477,20.1573496 18.5606762,20.0373844 C18.739299,19.9027825 18.9046566,19.7570803 19.0564932,19.6019933 C19.1299377,19.3579096 19.1607501,19.0906484 19.1521512,18.8016514 C19.1354309,18.2396999 18.9708189,17.6286159 18.7059937,17.0133187 C18.6193531,16.812017 18.5272468,16.6228174 18.4345733,16.4498033 L18.4345733,16.4498033 Z M12.8684437,19.6136635 C13.4210801,19.531436 14.0779047,19.2583597 14.7592348,18.8645972 L12.0952656,15.2217172 C11.4172255,15.6263957 10.7502294,15.9267663 10.1585281,16.0667348 L12.5432626,19.2313844 C12.6452424,19.3667161 12.7538958,19.4941778 12.8684437,19.6136635 L12.8684437,19.6136635 Z M13.307268,20.011006 C14.3763105,20.8493735 15.7929587,21.1192485 17.0993837,20.7585311 C16.6570396,20.6540414 16.2499702,20.4663695 15.884742,20.2221471 C15.7420988,20.1267638 15.6410187,20.0456042 15.5847239,19.9934231 L15.0439743,19.2539679 C14.4379725,19.60591 13.8436838,19.8716894 13.307268,20.011006 L13.307268,20.011006 Z M19.3983818,13.9696798 L16.7159827,10.410016 C16.5335823,10.9093392 16.1980662,11.4601589 15.7614039,12.0171031 L18.48509,15.6392312 C18.9514493,15.0401441 19.2828048,14.459919 19.3983818,13.9696798 L19.3983818,13.9696798 Z M19.7385812,14.4768728 C19.5412601,14.9695772 19.2020644,15.5082288 18.7689713,16.050941 C18.7858037,16.0804186 18.8039665,16.1127657 18.8232947,16.1478532 C18.9362894,16.3529776 19.049119,16.5807323 19.1544811,16.8255315 C19.4410098,17.4912548 19.6204138,18.1572507 19.6391678,18.7875543 C19.6398687,18.8111084 19.640341,18.8345643 19.6405836,18.8579208 C20.4591901,17.5405472 20.525762,15.852631 19.7385812,14.4768728 L19.7385812,14.4768728 Z M15.1497228,12.0095124 L12.2863454,8.20187271 C11.495596,9.12387204 10.4590141,10.0356948 9.41171764,10.7320709 L12.2210337,14.5760716 C13.2851065,13.8798338 14.359326,12.9380319 15.1497228,12.0095124 L15.1497228,12.0095124 Z M9.83902839,15.6427443 C10.4155977,15.5500304 11.1023333,15.2539619 11.8106608,14.8325307 L9.00263316,10.9926561 C8.30487191,11.4174064 7.61596278,11.7344135 7.00567848,11.882762 L9.83902839,15.6427443 L9.83902839,15.6427443 Z M16.3532727,9.92868356 L13.5481721,6.20618931 C13.3704406,6.70542196 13.0376533,7.25728564 12.6023111,7.81594421 L15.4638792,11.6214362 C15.9327625,11.0099586 16.2580225,10.4203527 16.3532727,9.92868356 L16.3532727,9.92868356 Z M11.9912431,7.80945381 L10.7793547,6.19791826 C10.7263694,6.1339984 10.623575,6.01863287 10.4779403,5.86908504 C10.2341547,5.61874906 9.96122598,5.36829936 9.66645468,5.13502716 C8.73691817,4.39942285 7.81036713,4.00210355 6.97345173,4.1057669 C6.91876921,4.11254007 6.86452356,4.12146231 6.8107185,4.13257103 C6.37458953,5.01619718 6.48097788,6.05346894 6.98587544,7.16970735 C7.14596669,7.52364054 7.33501472,7.85686599 7.53536759,8.1586617 C7.65499084,8.33885268 7.75089455,8.46739928 7.80529075,8.53398921 L9.12729664,10.3428962 C10.1722859,9.64694568 11.2196602,8.720818 11.9912431,7.80945381 L11.9912431,7.80945381 Z M6.68738466,11.4603718 C7.28169525,11.3592411 7.99039934,11.0456358 8.71809464,10.6035601 L7.42509648,8.83543266 C7.36907914,8.76740792 7.26382606,8.62632969 7.13490883,8.43213899 C6.92102759,8.10996522 6.71938412,7.75453841 6.54778961,7.37517358 C6.06640077,6.31090874 5.91063233,5.2847275 6.19740261,4.36689142 C6.14869598,4.39484428 6.1004164,4.42498621 6.05256723,4.4573512 C4.55823339,5.9522198 4.33999323,8.3452782 5.63263875,10.0606767 L6.68738466,11.4603718 L6.68738466,11.4603718 Z M13.181837,5.7200463 L12.5338993,4.86020389 C11.2918943,3.21200751 9.06001813,2.73116198 7.24573027,3.60857538 C8.13991747,3.60867877 9.06216243,4.0406856 9.9713639,4.76019743 C10.2837311,5.00739446 10.5717956,5.27173324 10.8293283,5.53618573 C10.9844845,5.69551098 11.095747,5.82038008 11.1636166,5.90267831 L12.304587,7.42001216 C12.7735626,6.80417763 13.0954767,6.2115492 13.181837,5.7200463 L13.181837,5.7200463 Z M4.85440635,10.6471169 C3.11735775,8.34197557 3.6072803,5.04298443 5.93806432,3.28661269 C8.27360069,1.5266598 11.5796688,1.97470779 13.3121317,4.27376372 L20.2227556,13.4444714 C21.9598042,15.7496127 21.4698817,19.0486038 19.1390976,20.8049756 C16.8035613,22.5649285 13.4974931,22.1168805 11.7650302,19.8178246 L4.85440635,10.6471169 Z" id="Shape" fill="#FFFFFF" fill-rule="nonzero"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/Viewport/Capsule_Shape.png b/Assets/Editor/Icons/Components/Viewport/Capsule_Shape.png
deleted file mode 100644
index 8735d28fba..0000000000
--- a/Assets/Editor/Icons/Components/Viewport/Capsule_Shape.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d88204ebac79b0685219458353186f2bf24fef5fac6b4d163b948882076a6437
-size 5429
diff --git a/Assets/Editor/Icons/Components/Viewport/Capsule_Shape.svg b/Assets/Editor/Icons/Components/Viewport/Capsule_Shape.svg
new file mode 100644
index 0000000000..2c0bf9ceae
--- /dev/null
+++ b/Assets/Editor/Icons/Components/Viewport/Capsule_Shape.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Shapes / Capsule_Shape - box</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
+            <stop stop-color="#9D9D9D" offset="100%"></stop>
+        </linearGradient>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
+    </defs>
+    <g id="icon-/-Shapes-/-Capsule_Shape---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/general/color/-box-template">
+            <mask id="mask-3" fill="white">
+                <use xlink:href="#path-2"></use>
+            </mask>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#5A69A1">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="Rectangle-2" x="0" y="0" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+        <path d="M18.1690143,16.0244823 L15.444714,12.4017835 C14.6352822,13.340816 13.5726735,14.2676139 12.5054186,14.9651968 L15.1717325,18.6135269 C16.2528883,17.9230289 17.3550742,16.9692392 18.1690143,16.0244823 L18.1690143,16.0244823 Z M18.4345733,16.4498033 C17.606154,17.3930032 16.5291353,18.3174468 15.4560945,19.0026208 L15.9423005,19.6678987 C15.9504964,19.6694829 16.0321813,19.7350696 16.1528185,19.8157378 C16.6958785,20.1788736 17.3435072,20.3982029 18.0675896,20.3597291 C18.236709,20.2647428 18.401477,20.1573496 18.5606762,20.0373844 C18.739299,19.9027825 18.9046566,19.7570803 19.0564932,19.6019933 C19.1299377,19.3579096 19.1607501,19.0906484 19.1521512,18.8016514 C19.1354309,18.2396999 18.9708189,17.6286159 18.7059937,17.0133187 C18.6193531,16.812017 18.5272468,16.6228174 18.4345733,16.4498033 L18.4345733,16.4498033 Z M12.8684437,19.6136635 C13.4210801,19.531436 14.0779047,19.2583597 14.7592348,18.8645972 L12.0952656,15.2217172 C11.4172255,15.6263957 10.7502294,15.9267663 10.1585281,16.0667348 L12.5432626,19.2313844 C12.6452424,19.3667161 12.7538958,19.4941778 12.8684437,19.6136635 L12.8684437,19.6136635 Z M13.307268,20.011006 C14.3763105,20.8493735 15.7929587,21.1192485 17.0993837,20.7585311 C16.6570396,20.6540414 16.2499702,20.4663695 15.884742,20.2221471 C15.7420988,20.1267638 15.6410187,20.0456042 15.5847239,19.9934231 L15.0439743,19.2539679 C14.4379725,19.60591 13.8436838,19.8716894 13.307268,20.011006 L13.307268,20.011006 Z M19.3983818,13.9696798 L16.7159827,10.410016 C16.5335823,10.9093392 16.1980662,11.4601589 15.7614039,12.0171031 L18.48509,15.6392312 C18.9514493,15.0401441 19.2828048,14.459919 19.3983818,13.9696798 L19.3983818,13.9696798 Z M19.7385812,14.4768728 C19.5412601,14.9695772 19.2020644,15.5082288 18.7689713,16.050941 C18.7858037,16.0804186 18.8039665,16.1127657 18.8232947,16.1478532 C18.9362894,16.3529776 19.049119,16.5807323 19.1544811,16.8255315 C19.4410098,17.4912548 19.6204138,18.1572507 19.6391678,18.7875543 C19.6398687,18.8111084 19.640341,18.8345643 19.6405836,18.8579208 C20.4591901,17.5405472 20.525762,15.852631 19.7385812,14.4768728 L19.7385812,14.4768728 Z M15.1497228,12.0095124 L12.2863454,8.20187271 C11.495596,9.12387204 10.4590141,10.0356948 9.41171764,10.7320709 L12.2210337,14.5760716 C13.2851065,13.8798338 14.359326,12.9380319 15.1497228,12.0095124 L15.1497228,12.0095124 Z M9.83902839,15.6427443 C10.4155977,15.5500304 11.1023333,15.2539619 11.8106608,14.8325307 L9.00263316,10.9926561 C8.30487191,11.4174064 7.61596278,11.7344135 7.00567848,11.882762 L9.83902839,15.6427443 L9.83902839,15.6427443 Z M16.3532727,9.92868356 L13.5481721,6.20618931 C13.3704406,6.70542196 13.0376533,7.25728564 12.6023111,7.81594421 L15.4638792,11.6214362 C15.9327625,11.0099586 16.2580225,10.4203527 16.3532727,9.92868356 L16.3532727,9.92868356 Z M11.9912431,7.80945381 L10.7793547,6.19791826 C10.7263694,6.1339984 10.623575,6.01863287 10.4779403,5.86908504 C10.2341547,5.61874906 9.96122598,5.36829936 9.66645468,5.13502716 C8.73691817,4.39942285 7.81036713,4.00210355 6.97345173,4.1057669 C6.91876921,4.11254007 6.86452356,4.12146231 6.8107185,4.13257103 C6.37458953,5.01619718 6.48097788,6.05346894 6.98587544,7.16970735 C7.14596669,7.52364054 7.33501472,7.85686599 7.53536759,8.1586617 C7.65499084,8.33885268 7.75089455,8.46739928 7.80529075,8.53398921 L9.12729664,10.3428962 C10.1722859,9.64694568 11.2196602,8.720818 11.9912431,7.80945381 L11.9912431,7.80945381 Z M6.68738466,11.4603718 C7.28169525,11.3592411 7.99039934,11.0456358 8.71809464,10.6035601 L7.42509648,8.83543266 C7.36907914,8.76740792 7.26382606,8.62632969 7.13490883,8.43213899 C6.92102759,8.10996522 6.71938412,7.75453841 6.54778961,7.37517358 C6.06640077,6.31090874 5.91063233,5.2847275 6.19740261,4.36689142 C6.14869598,4.39484428 6.1004164,4.42498621 6.05256723,4.4573512 C4.55823339,5.9522198 4.33999323,8.3452782 5.63263875,10.0606767 L6.68738466,11.4603718 L6.68738466,11.4603718 Z M13.181837,5.7200463 L12.5338993,4.86020389 C11.2918943,3.21200751 9.06001813,2.73116198 7.24573027,3.60857538 C8.13991747,3.60867877 9.06216243,4.0406856 9.9713639,4.76019743 C10.2837311,5.00739446 10.5717956,5.27173324 10.8293283,5.53618573 C10.9844845,5.69551098 11.095747,5.82038008 11.1636166,5.90267831 L12.304587,7.42001216 C12.7735626,6.80417763 13.0954767,6.2115492 13.181837,5.7200463 L13.181837,5.7200463 Z M4.85440635,10.6471169 C3.11735775,8.34197557 3.6072803,5.04298443 5.93806432,3.28661269 C8.27360069,1.5266598 11.5796688,1.97470779 13.3121317,4.27376372 L20.2227556,13.4444714 C21.9598042,15.7496127 21.4698817,19.0486038 19.1390976,20.8049756 C16.8035613,22.5649285 13.4974931,22.1168805 11.7650302,19.8178246 L4.85440635,10.6471169 Z" id="Shape" fill="#FFFFFF" fill-rule="nonzero"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/Viewport/CharacterPhysics.png b/Assets/Editor/Icons/Components/Viewport/CharacterPhysics.png
deleted file mode 100644
index 5318b5e0d0..0000000000
--- a/Assets/Editor/Icons/Components/Viewport/CharacterPhysics.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:833418055ee86cef9914a9d8f41f1d67939a764bf307b405030d04a3186058da
-size 3686
diff --git a/Assets/Editor/Icons/Components/Viewport/CharacterPhysics.svg b/Assets/Editor/Icons/Components/Viewport/CharacterPhysics.svg
new file mode 100644
index 0000000000..7b5b07b214
--- /dev/null
+++ b/Assets/Editor/Icons/Components/Viewport/CharacterPhysics.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Physics / Cry / CharacterPhysics - box</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
+            <stop stop-color="#9D9D9D" offset="100%"></stop>
+        </linearGradient>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
+    </defs>
+    <g id="icon-/-Physics-/-Cry-/-CharacterPhysics---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/general/color/-box-template">
+            <mask id="mask-3" fill="white">
+                <use xlink:href="#path-2"></use>
+            </mask>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#DD7F6D">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="Rectangle-2" x="0" y="0" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+        <path d="M14.5909091,20.409636 C14.5909091,20.9047092 14.2190616,21.3127409 13.7333174,21.3685053 L13.6193182,21.375 C13.0827233,21.375 12.6477273,20.9330841 12.6477273,20.409636 L12.6473457,16.1218184 C12.4918792,16.1614973 12.3306121,16.187193 12.1649174,16.1974831 L12,16.2025862 C11.7762378,16.2025862 11.5591008,16.1741021 11.3519887,16.1205776 L11.3522727,20.409636 C11.3522727,20.9047092 10.9804253,21.3127409 10.4946811,21.3685053 L10.3806818,21.375 C9.84408698,21.375 9.40909091,20.9330841 9.40909091,20.409636 L9.40909091,9.74472291 C9.40909091,9.51853084 9.4377616,9.29910096 9.49172108,9.08993696 L5.85446021,9.09051724 C5.31351927,9.09051724 4.875,8.66004489 4.875,8.12068966 C4.875,7.58506867 5.3171002,7.15086207 5.85446021,7.15086207 L18.1455398,7.15086207 C18.6478421,7.15086207 19.0618318,7.52203466 19.1184105,8.00689731 L19.125,8.12068966 C19.125,8.65631064 18.6828998,9.09051724 18.1455398,9.09051724 L14.5073892,9.09011263 C14.5618969,9.29933306 14.5909091,9.51872391 14.5909091,9.74472291 L14.5909091,20.409636 Z M12,2.625 C13.0731897,2.625 13.9431818,3.4934132 13.9431818,4.56465517 C13.9431818,5.63589714 13.0731897,6.50431034 12,6.50431034 C10.9268103,6.50431034 10.0568182,5.63589714 10.0568182,4.56465517 C10.0568182,3.4934132 10.9268103,2.625 12,2.625 Z" id="Combined-Shape" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/Viewport/Cloth.svg b/Assets/Editor/Icons/Components/Viewport/Cloth.svg
new file mode 100644
index 0000000000..826d0f2615
--- /dev/null
+++ b/Assets/Editor/Icons/Components/Viewport/Cloth.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Physics / PhysX / Cloth2 - box</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
+            <stop stop-color="#9D9D9D" offset="100%"></stop>
+        </linearGradient>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
+    </defs>
+    <g id="icon-/-Physics-/-PhysX-/-Cloth2---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/general/color/-box-template">
+            <mask id="mask-3" fill="white">
+                <use xlink:href="#path-2"></use>
+            </mask>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#DD7F6D">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="Rectangle-2" x="0" y="0" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+        <path d="M10.0036651,1.43413916 C11.5801714,1.9207849 12.5534224,2.38199852 13.2745607,3.18045828 C13.995699,3.97891803 14.7589632,5.02940622 14.9639393,6.61100176 C15.1689154,8.1925973 15.3492023,10.5905861 16.2680667,12.3021417 C16.8185123,13.3274489 17.9272393,14.6068897 19.2921748,15.6581332 C20.20574,16.3617412 19.6027081,16.991228 21.6348189,17.7234653 C22.4122445,17.9381522 22.4122445,18.0666767 22.1995296,18.1867803 C21.7218053,18.4565143 21.1292076,18.6447025 20.556022,18.7546421 C19.6026723,18.4065461 18.769502,18.0094137 18.0543121,17.5633487 C16.7703016,16.7625094 16.5215153,16.6040214 15.3656152,15.1716466 C14.2097151,13.7392719 13.0029241,10.471132 12.4389642,9.39990351 C12.3465911,9.80491152 12.3465911,10.233545 12.4389642,10.6858041 C12.9688285,12.6237369 13.5172039,14.1235751 14.0840904,15.1853188 C14.9344201,16.7779342 15.8814004,17.461732 16.9673883,18.0875012 C17.4779306,18.3816864 18.1026722,18.6623445 18.8416131,18.9294753 C18.1532009,19.1583622 18.0432914,19.9807069 17.7730145,20.405422 C17.4526496,20.9088459 17.007063,22.0970993 14.0799126,21.6970259 C11.1527622,21.2969524 11.7891197,21.1162211 10.998486,21.3621412 C10.2078524,21.6080613 10.50009,21.9890996 10.50009,22.7041122 C10.0615126,22.8296089 9.08078899,22.5979137 8.44749691,22.0598448 C7.35870611,21.1347668 5.97335754,18.6086859 5.59653892,16.8969726 C5.00054483,14.1896462 5.29460466,12.6885919 4.94500601,11.867106 C4.71194025,11.3194487 4.26993415,10.6379216 3.61898773,9.82252478 C4.27295213,8.93334384 4.34883673,8.08396692 3.84664154,7.27439402 C3.48238237,6.68718338 2.95594454,6.2533723 2.55814516,5.97816604 C2.38079973,5.85547461 2.08790193,5.536538 1.67945175,5.02135619 C1.6843009,4.63689465 1.75478156,4.40996588 1.89089374,4.34056986 C2.03177682,4.26874144 2.21993574,4.24850344 2.4902665,4.29455 C3.26679969,4.64922153 3.96231386,5.13647883 4.57975575,5.75601992 C5.0816712,6.2596418 5.39690701,6.75678187 5.69870041,7.45668928 C5.97934739,8.10755474 6.07973814,8.94041832 6.16387851,9.80787143 C6.32737014,11.4934038 6.83171543,13.0923038 7.32068468,14.4975295 C7.80965394,15.9027553 8.75249953,16.8032098 9.81473619,17.8701613 C9.61176459,17.0407211 8.84379666,15.5674553 8.3920348,14.4975295 C7.94027293,13.4276038 7.18352528,11.2001604 7.18352528,9.23525328 C7.18352528,7.27034618 6.5093995,6.17776937 5.69870041,5.33656753 C5.10481843,4.7203406 3.77190328,4.2209447 2.74539169,3.95220774 C2.86286709,3.41204512 3.21732457,3.00980873 3.61898773,2.7866107 C3.97984688,2.58608683 5.00371059,2.49658133 5.94863828,2.54057189 L6.14845175,2.55153773 L6.20586466,2.60137258 C6.63362577,2.96324468 7.01186019,3.25364053 7.34056792,3.47256013 C7.91580644,3.85566942 8.11792663,4.05698899 8.91103352,5.05877677 C9.25014289,5.48711199 9.54075889,5.99377608 9.71197379,6.70139568 C9.91636869,7.54614583 9.92964689,8.67620582 9.92964689,9.25117666 C9.92964689,10.2556168 10.3209417,11.9488057 10.8252257,12.9050738 C11.3295097,13.8613418 12.1505465,15.0249785 12.7656674,15.5798301 C12.4677309,14.7351306 11.8732377,13.2736878 11.5547955,12.400629 C11.2363533,11.5275702 10.8252257,10.1730251 10.8252257,9.1636979 C10.8252257,8.6077794 10.8189891,7.27352415 10.5947827,6.56228442 C10.4119193,5.98219528 10.2533199,5.51659601 9.97596209,5.04085701 C9.65465119,4.48972725 9.12066154,3.84073108 8.07165254,3.20428248 C7.82114634,3.05229683 7.4427027,2.83989621 6.93632164,2.56708063 C7.16769872,2.6045404 7.45993643,2.67030338 7.81114876,2.76368433 C8.94945302,3.06633869 9.27816849,3.24240498 10.2770799,4.07361693 C11.2759914,4.90482888 11.7748326,5.89517785 12.3696844,6.6083092 C12.3696844,5.95730958 11.9168827,4.80145962 11.2791592,4.07361693 C10.6414356,3.34577424 10.2312433,3.07926521 9.36269629,2.6488596 C8.83242542,2.38608564 7.94849849,2.22230044 6.71091547,2.15750397 C6.76082242,2.06828755 6.83019598,1.9625711 6.91751628,1.84092988 C7.92394467,1.24530558 8.95266096,1.10970867 10.0036651,1.43413916 Z" id="Combined-Shape" fill="#FFFFFF" fill-rule="nonzero"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/Viewport/Comment.png b/Assets/Editor/Icons/Components/Viewport/Comment.png
deleted file mode 100644
index 6a160ca0be..0000000000
--- a/Assets/Editor/Icons/Components/Viewport/Comment.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fb55a0d6ce3cf16994afbcedf47309e0d1cb055377b26749ea73aa76247496e6
-size 2725
diff --git a/Assets/Editor/Icons/Components/Viewport/Comment.svg b/Assets/Editor/Icons/Components/Viewport/Comment.svg
new file mode 100644
index 0000000000..b4860b54fa
--- /dev/null
+++ b/Assets/Editor/Icons/Components/Viewport/Comment.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Other / Comment - box</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
+            <stop stop-color="#9D9D9D" offset="100%"></stop>
+        </linearGradient>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
+    </defs>
+    <g id="icon-/-Other-/-Comment---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/general/color/-box-template">
+            <mask id="mask-3" fill="white">
+                <use xlink:href="#path-2"></use>
+            </mask>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#CCCCCC">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="Rectangle-2" x="0" y="0" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+        <path d="M7.02749543,18.2117232 C7.8834099,18.0387856 8.54248262,17.8471758 8.88341584,17.6633902 L9.13660094,17.5269066 L9.41318015,17.6058648 C10.2365316,17.8409162 11.1075671,17.9625414 12,17.9625414 C16.3237915,17.9625414 19.7799758,15.1162719 19.7799758,11.6803149 C19.7799758,8.24435789 16.3237915,5.39808842 12,5.39808842 C7.67620852,5.39808842 4.22002417,8.24435789 4.22002417,11.6803149 C4.22002417,13.43386 5.11977547,15.0821543 6.6930318,16.269688 L7.21492385,16.6636253 L6.12154393,18.3763334 C6.43148919,18.3255971 6.73578148,18.270664 7.02749543,18.2117232 Z M3.94487569,20.0540483 L5.67352379,17.3462342 C3.80549981,15.9362024 2.63427705,13.910191 2.63427705,11.6589 C2.63427705,7.3991563 6.82745404,3.94595171 12,3.94595171 C17.172546,3.94595171 21.3657229,7.3991563 21.3657229,11.6589 C21.3657229,15.9186438 17.172546,19.3718483 12,19.3718483 C10.9251584,19.3718483 9.89260571,19.2227398 8.93117829,18.9482703 C7.61917454,19.6555273 3.94487569,20.0540483 3.94487569,20.0540483 Z" id="Combined-Shape" fill="#FFFFFF" fill-rule="nonzero"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/Viewport/ComponentPlaceholder.png b/Assets/Editor/Icons/Components/Viewport/ComponentPlaceholder.png
deleted file mode 100644
index ca80091024..0000000000
--- a/Assets/Editor/Icons/Components/Viewport/ComponentPlaceholder.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:15f0306bf2c2710f892a791ba0813966677f85165a92ad718c52a3cb9573eb41
-size 3193
diff --git a/Assets/Editor/Icons/Components/Viewport/ComponentPlaceholder.svg b/Assets/Editor/Icons/Components/Viewport/ComponentPlaceholder.svg
new file mode 100644
index 0000000000..abe5a78bf7
--- /dev/null
+++ b/Assets/Editor/Icons/Components/Viewport/ComponentPlaceholder.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Other / ComponentPlaceholder - box</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
+            <stop stop-color="#9D9D9D" offset="100%"></stop>
+        </linearGradient>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
+    </defs>
+    <g id="icon-/-Other-/-ComponentPlaceholder---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/general/color/-box-template" transform="translate(0.000000, 0.086473)">
+            <mask id="mask-3" fill="white">
+                <use xlink:href="#path-2"></use>
+            </mask>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#CCCCCC">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="Rectangle-2" x="0" y="0" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+        <path d="M6.88567588,11.4392131 L2.6789578,13.8679629 L2.6789578,18.7254625 L6.88567588,21.1542124 L11.092394,18.7254625 L11.092394,13.8679629 L6.88567588,11.4392131 Z M12.1907173,13.2338456 L12.1907173,19.3595798 L6.88567588,22.422447 L1.58063441,19.3595798 L1.58063441,13.2338456 L6.88567588,10.1709785 L12.1907173,13.2338456 Z M16.8621133,11.2561592 L12.5761306,13.7306725 L12.5761306,18.6796991 L16.8621133,21.1542124 L21.1480961,18.6796991 L21.1480961,13.7306725 L16.8621133,11.2561592 Z M22.2464194,13.0965552 L22.2464194,19.3138164 L16.8621133,22.422447 L11.4778072,19.3138164 L11.4778072,13.0965552 L16.8621133,9.98792459 L22.2464194,13.0965552 Z M11.7828422,3.01873379 L7.61534548,5.42483916 L7.61534548,10.2370499 L11.7828422,12.6431553 L15.950339,10.2370499 L15.950339,5.42483916 L11.7828422,3.01873379 Z M17.0486624,4.79072186 L17.0486624,10.8711672 L11.7828422,13.9113899 L6.51702209,10.8711672 L6.51702209,4.79072186 L11.7828422,1.75049918 L17.0486624,4.79072186 Z M11.2343588,13.8152765 L11.507349,14.2917792 L6.98034199,16.8853189 L2.14795994,14.2955445 L2.40736355,13.8115111 L6.97146167,16.2575066 L11.2343588,13.8152765 Z M6.69245108,16.5547281 L7.24161277,16.5547281 L7.24161277,21.4693642 L6.69245108,21.4693642 L6.69245108,16.5547281 Z M21.2855492,13.6863631 L21.5585394,14.1628658 L16.9582832,16.7983703 L12.0475971,14.1666312 L12.3070007,13.6825978 L16.9494029,16.1705579 L21.2855492,13.6863631 Z M16.6702444,16.4675015 L17.2194061,16.4675015 L17.2194061,21.4640481 L16.6702444,21.4640481 L16.6702444,16.4675015 Z M16.0945363,5.36800761 L16.3675265,5.84451037 L11.8767643,8.41728531 L7.08312819,5.84827569 L7.34253179,5.36424229 L11.8678839,7.78947295 L16.0945363,5.36800761 Z M11.5889465,8.08683212 L12.1381082,8.08683212 L12.1381082,12.9609376 L11.5889465,12.9609376 L11.5889465,8.08683212 Z" id="Combined-Shape" fill="#FFFFFF" fill-rule="nonzero"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/Viewport/Component_Placeholder.svg b/Assets/Editor/Icons/Components/Viewport/Component_Placeholder.svg
new file mode 100644
index 0000000000..50a36fba0a
--- /dev/null
+++ b/Assets/Editor/Icons/Components/Viewport/Component_Placeholder.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Other / Component_Placeholder - box</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
+            <stop stop-color="#9D9D9D" offset="100%"></stop>
+        </linearGradient>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
+    </defs>
+    <g id="icon-/-Other-/-Component_Placeholder---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/general/color/-box-template" transform="translate(0.000000, 0.086473)">
+            <mask id="mask-3" fill="white">
+                <use xlink:href="#path-2"></use>
+            </mask>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#CCCCCC">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="Rectangle-2" x="0" y="0" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+        <path d="M6.88567588,11.4392131 L2.6789578,13.8679629 L2.6789578,18.7254625 L6.88567588,21.1542124 L11.092394,18.7254625 L11.092394,13.8679629 L6.88567588,11.4392131 Z M12.1907173,13.2338456 L12.1907173,19.3595798 L6.88567588,22.422447 L1.58063441,19.3595798 L1.58063441,13.2338456 L6.88567588,10.1709785 L12.1907173,13.2338456 Z M16.8621133,11.2561592 L12.5761306,13.7306725 L12.5761306,18.6796991 L16.8621133,21.1542124 L21.1480961,18.6796991 L21.1480961,13.7306725 L16.8621133,11.2561592 Z M22.2464194,13.0965552 L22.2464194,19.3138164 L16.8621133,22.422447 L11.4778072,19.3138164 L11.4778072,13.0965552 L16.8621133,9.98792459 L22.2464194,13.0965552 Z M11.7828422,3.01873379 L7.61534548,5.42483916 L7.61534548,10.2370499 L11.7828422,12.6431553 L15.950339,10.2370499 L15.950339,5.42483916 L11.7828422,3.01873379 Z M17.0486624,4.79072186 L17.0486624,10.8711672 L11.7828422,13.9113899 L6.51702209,10.8711672 L6.51702209,4.79072186 L11.7828422,1.75049918 L17.0486624,4.79072186 Z M11.2343588,13.8152765 L11.507349,14.2917792 L6.98034199,16.8853189 L2.14795994,14.2955445 L2.40736355,13.8115111 L6.97146167,16.2575066 L11.2343588,13.8152765 Z M6.69245108,16.5547281 L7.24161277,16.5547281 L7.24161277,21.4693642 L6.69245108,21.4693642 L6.69245108,16.5547281 Z M21.2855492,13.6863631 L21.5585394,14.1628658 L16.9582832,16.7983703 L12.0475971,14.1666312 L12.3070007,13.6825978 L16.9494029,16.1705579 L21.2855492,13.6863631 Z M16.6702444,16.4675015 L17.2194061,16.4675015 L17.2194061,21.4640481 L16.6702444,21.4640481 L16.6702444,16.4675015 Z M16.0945363,5.36800761 L16.3675265,5.84451037 L11.8767643,8.41728531 L7.08312819,5.84827569 L7.34253179,5.36424229 L11.8678839,7.78947295 L16.0945363,5.36800761 Z M11.5889465,8.08683212 L12.1381082,8.08683212 L12.1381082,12.9609376 L11.5889465,12.9609376 L11.5889465,8.08683212 Z" id="Combined-Shape" fill="#FFFFFF" fill-rule="nonzero"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/Viewport/Compound_Shape.svg b/Assets/Editor/Icons/Components/Viewport/Compound_Shape.svg
new file mode 100644
index 0000000000..fa24a36279
--- /dev/null
+++ b/Assets/Editor/Icons/Components/Viewport/Compound_Shape.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Shapes / CompoundShape - box</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
+            <stop stop-color="#9D9D9D" offset="100%"></stop>
+        </linearGradient>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
+    </defs>
+    <g id="icon-/-Shapes-/-CompoundShape---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/general/color/-box-template">
+            <mask id="mask-3" fill="white">
+                <use xlink:href="#path-2"></use>
+            </mask>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#5A69A1">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="Rectangle-2" x="0" y="0" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+        <path d="M10.4370799,14.5703981 C10.8949783,13.60622 11.1341132,12.5187237 11.1341132,11.4107285 L11.3022587,11.4437822 C12.3108028,11.5867879 13.2303131,11.4877485 14.0520545,11.2068482 C13.3525652,9.86352915 13.0799875,8.19218852 13.2708888,6.49835529 C12.3065662,6.31182193 11.287252,6.26722591 10.2699746,6.39292235 C10.0043739,6.997927 9.85742934,7.66375171 9.85742934,8.36251642 C9.85742934,8.82096255 9.92045585,9.27068986 10.0434769,9.70351974 L10.3058563,10.6266594 L9.36979307,10.4354298 C9.0218634,10.3643508 8.66503627,10.3281859 8.30305193,10.3281859 C8.04232229,10.3281859 7.78615888,10.3469733 7.53590302,10.3832261 C7.11789063,11.2083584 6.83888064,12.0822188 6.69194783,12.9566996 C8.09969725,13.2327954 9.400157,13.7951165 10.4370799,14.5703981 L10.4370799,14.5703981 Z M10.9232713,14.9668966 C11.8471551,15.7894655 12.4957489,16.8034633 12.7238287,17.9407937 C13.1940279,17.1837205 13.4644359,16.2964336 13.4644359,15.3485303 C13.4644359,14.8900842 13.4014094,14.4403569 13.2783883,14.007527 L13.016009,13.0843873 L13.9520722,13.2756169 C14.3000019,13.3466959 14.656829,13.3828609 15.0188133,13.3828609 C15.3251643,13.3828609 15.6252112,13.3569236 15.9167784,13.3071935 C15.2762912,12.8933024 14.7447682,12.3378555 14.327342,11.6837376 C13.519573,11.9762733 12.6259988,12.1075788 11.6565476,12.0298022 C11.5944827,13.065899 11.3448739,14.0672359 10.9232713,14.9668966 Z M17.3632814,8.4760959 C16.4453567,7.62223145 15.202923,6.97365894 13.81776,6.62076135 C13.650692,8.208232 13.9159204,9.764365 14.5717517,10.9995273 C15.7336023,10.4673853 16.673772,9.55968715 17.3632814,8.4760959 L17.3632814,8.4760959 Z M17.7570161,8.8774549 C17.0240417,9.98410273 16.0424011,10.9068423 14.8491255,11.46719 C15.3179091,12.1766997 15.9342666,12.7487066 16.6883092,13.1145166 C17.583414,12.8171071 18.3672468,12.2871959 18.9642625,11.5992371 C18.8983375,10.5887929 18.4575257,9.6624411 17.7570161,8.8774549 L17.7570161,8.8774549 Z M18.6620548,4.80646463 C17.7291186,3.90193421 16.4419903,3.34217199 15.0188133,3.34217199 C14.9506814,3.34217199 14.8828612,3.34345488 14.8153768,3.34599706 C14.3523948,4.21742569 14.0472757,5.14736992 13.8916765,6.0778721 C15.3433623,6.43671771 16.6564905,7.1025468 17.6495088,7.99022868 C18.1902138,6.99705485 18.5342746,5.89070272 18.6620548,4.80646463 L18.6620548,4.80646463 Z M19.1463005,5.34796023 C18.9651694,6.4018396 18.5959194,7.44715106 18.0584996,8.38774375 C18.7586487,9.12921696 19.2477966,9.99839279 19.4395901,10.9547798 C19.9097893,10.1977066 20.1801973,9.31041968 20.1801973,8.36251642 C20.1801973,7.23211703 19.7956451,6.18792129 19.1463005,5.34796023 L19.1463005,5.34796023 Z M4.50851928,18.7516012 C5.45099407,19.7455777 6.80127766,20.3688748 8.30305193,20.3688748 C8.51955448,20.3688748 8.73290854,20.3559205 8.94234612,20.3307689 C8.15984011,19.8833349 7.52711252,19.2334063 7.05250307,18.4506637 C6.28773631,18.6934906 5.43736424,18.8040339 4.50851928,18.7516012 L4.50851928,18.7516012 Z M3.9192969,17.9994899 C4.95069928,18.1282707 5.88472399,18.0505216 6.71263514,17.8103347 C6.11867175,16.5239819 5.89403559,14.9736272 6.06789212,13.4029553 C5.25056692,13.2876925 4.40168326,13.2742215 3.55421314,13.3789362 C3.28861248,13.9839409 3.14166792,14.6497656 3.14166792,15.3485303 C3.14166792,16.3210411 3.42629774,17.2297474 3.9192969,17.9994899 L3.9192969,17.9994899 Z M10.6608547,15.4745497 C9.96507307,16.6998747 8.92464754,17.6915884 7.58486349,18.2548164 C8.1272957,19.114971 8.87985921,19.7843906 9.82582886,20.1468902 C10.782016,19.8601781 11.6190818,19.3105493 12.2485011,18.585251 C12.1713355,17.402521 11.5805444,16.3350044 10.6608547,15.4745497 L10.6608547,15.4745497 Z M10.1770888,15.064031 C9.20638719,14.3156142 7.96749042,13.7670754 6.61790358,13.4967282 C6.46018097,14.9796905 6.67972355,16.4358311 7.24255032,17.6290932 C8.52500448,17.120976 9.51608249,16.2008535 10.1770888,15.064031 L10.1770888,15.064031 Z M14.1612071,3.41111666 C12.6304247,3.66001011 11.329394,4.56396956 10.5704935,5.81512659 C11.511794,5.73454261 12.450767,5.78877767 13.3473121,5.95902856 C13.4951745,5.09358934 13.7648509,4.23073338 14.1612071,3.41111666 L14.1612071,3.41111666 Z M6.85184083,10.5292666 C5.58055716,10.8907807 4.51343301,11.7151769 3.85473205,12.8011405 C4.62644692,12.7350746 5.39659736,12.7596254 6.14308636,12.8644316 C6.27647887,12.0738129 6.5114939,11.2850936 6.85184083,10.5292666 L6.85184083,10.5292666 Z M8.69662356,8.36251642 C8.69662356,4.94159182 11.5309239,2.17545288 15.0188133,2.17545288 C18.5067027,2.17545288 21.3410031,4.94159182 21.3410031,8.36251642 C21.3410031,11.783441 18.5067027,14.54958 15.0188133,14.54958 C14.8688158,14.54958 14.7194521,14.5444585 14.5709166,14.534272 C14.6069933,14.8026078 14.6252417,15.0744502 14.6252417,15.3485303 C14.6252417,18.7694549 11.7909413,21.5355939 8.30305193,21.5355939 C4.81516252,21.5355939 1.98086215,18.7694549 1.98086215,15.3485303 C1.98086215,11.9276057 4.81516252,9.16146678 8.30305193,9.16146678 C8.45304947,9.16146678 8.60241317,9.16658828 8.75094864,9.17677477 C8.714872,8.9084389 8.69662356,8.63659649 8.69662356,8.36251642 Z" id="Shape" fill="#FFFFFF" fill-rule="nonzero"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/Viewport/Cylinder_Shape.png b/Assets/Editor/Icons/Components/Viewport/Cylinder_Shape.png
deleted file mode 100644
index c7497148b4..0000000000
--- a/Assets/Editor/Icons/Components/Viewport/Cylinder_Shape.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3ecaf0fcd87206e3039634889c36b89bafb35358579335087790a0f86ecedc2e
-size 4872
diff --git a/Assets/Editor/Icons/Components/Viewport/Cylinder_Shape.svg b/Assets/Editor/Icons/Components/Viewport/Cylinder_Shape.svg
new file mode 100644
index 0000000000..0b0fa5d906
--- /dev/null
+++ b/Assets/Editor/Icons/Components/Viewport/Cylinder_Shape.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Shapes / Cylinder_Shape - box</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
+            <stop stop-color="#9D9D9D" offset="100%"></stop>
+        </linearGradient>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
+    </defs>
+    <g id="icon-/-Shapes-/-Cylinder_Shape---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/general/color/-box-template">
+            <mask id="mask-3" fill="white">
+                <use xlink:href="#path-2"></use>
+            </mask>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#5A69A1">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="Rectangle-2" x="0" y="0" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+        <path d="M20.9868292,5.35754848 L20.565056,19.2227347 L20.5638581,19.2259355 L20.553863,19.2508839 C20.4107275,19.5950398 18.8240013,22.9792395 11.7744186,22.9792395 C9.87704932,22.9792395 8.34565478,22.734089 7.11707334,22.3690406 C4.40054385,21.7944597 2.48091577,20.679065 2.48091577,19.309197 C2.48091577,19.190405 2.4953723,19.0731931 2.52353014,18.9577824 L2.3684924,5.35754848 C2.45004589,5.35754848 2.66272237,5.52805531 3.03985592,5.78381556 L3.22571636,5.90760182 C4.44536357,6.70445158 7.03875276,8.08565782 11.7744186,8.08565782 C18.4299489,8.08565782 20.9868292,5.35754848 20.9868292,5.35754848 Z M11.388955,16.7327468 C7.59729509,16.7327468 4.15134701,17.8934316 3.59878434,19.0052446 C3.63454664,19.0513645 3.67554212,19.1044532 3.72303415,19.1628088 C4.01965636,19.527282 4.42066207,19.8994586 4.94157226,20.253123 C5.58098064,20.68724 6.33460611,21.0521123 7.21259297,21.3312397 C8.43944842,21.5999366 9.88075706,21.7673841 11.388955,21.7673841 C15.3448746,21.7673841 19.2561806,19.9847641 19.2561806,18.6692189 C19.2561806,17.6323607 15.8915641,16.7327468 11.388955,16.7327468 Z M3.27191021,7.27712046 L3.51548242,17.6392532 C5.05184999,16.4787454 8.10979255,15.7079343 11.388955,15.7079343 C15.2216264,15.7079343 18.2809268,16.2633417 19.5970598,17.3532931 L19.900698,7.35772914 C19.7155573,7.4556365 19.5178978,7.55381291 19.3074817,7.65136136 C17.3325493,8.56693589 14.8341095,9.1104703 11.7744186,9.1104703 C8.72055866,9.1104703 6.1621305,8.56943281 4.08196184,7.66071773 C3.78965989,7.53302655 3.51974504,7.40446577 3.27191021,7.27712046 Z M10.9717037,2.00735637 C15.9983759,2.00735637 20.9590851,3.42994384 20.9590851,5.40166751 C20.9590851,6.68469771 18.8559935,7.74326951 16.0079822,8.32708473 L16.0075005,21.7326934 L14.982688,21.7326934 L14.9828717,8.51164385 C13.7161719,8.70971499 12.3451503,8.81813985 10.9717037,8.81813985 C9.52024888,8.81813985 8.14668788,8.68592984 6.94074968,8.44383282 L6.94135645,21.7295047 L5.91654398,21.7295047 L5.91657296,8.20063214 C5.89049889,8.19339099 5.86453414,8.1860917 5.83867991,8.17873456 L5.81278229,8.18863157 L5.80493363,8.16908073 C3.7245079,7.570781 2.3684924,6.5959324 2.3684924,5.40166751 C2.3684924,3.3814089 6.24636431,2.00735637 10.9717037,2.00735637 Z M11.1844924,5.94235637 L7.47520026,7.4941899 C8.52277815,7.68193711 9.71262598,7.79332738 10.9717037,7.79332738 C12.4059675,7.79332738 13.8581059,7.65256297 15.163871,7.42578214 L11.1844924,5.94235637 Z M3.39330488,5.40166751 C3.39330488,6.01010842 4.31445848,6.63217326 5.7845445,7.08932783 L9.7804924,5.41835637 L5.49419244,3.82029659 C4.19327993,4.26202142 3.39330488,4.83648141 3.39330488,5.40166751 Z M16.4258431,3.64705002 L16.4632524,3.73630187 L12.5674924,5.36335637 L17.0138437,7.02214027 C18.7531767,6.55452427 19.9342727,5.94516188 19.9342727,5.40166751 C19.9342727,4.80102097 18.4831322,4.12333639 16.4258431,3.64705002 Z M10.9717037,3.03216885 C9.61058506,3.03216885 8.33219927,3.15993052 7.22703563,3.37248167 L11.1634924,4.84035637 L14.7765088,3.33103015 C13.5752957,3.14486995 12.2673304,3.03216885 10.9717037,3.03216885 Z" id="Combined-Shape" fill="#FFFFFF" fill-rule="nonzero"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/Viewport/DebugDrawLine.svg b/Assets/Editor/Icons/Components/Viewport/DebugDrawLine.svg
new file mode 100644
index 0000000000..6b916fd2ee
--- /dev/null
+++ b/Assets/Editor/Icons/Components/Viewport/DebugDrawLine.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Other / DebugDrawLine - box</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
+            <stop stop-color="#9D9D9D" offset="100%"></stop>
+        </linearGradient>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
+    </defs>
+    <g id="icon-/-Other-/-DebugDrawLine---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/general/color/-box-template">
+            <mask id="mask-3" fill="white">
+                <use xlink:href="#path-2"></use>
+            </mask>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#CCCCCC">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="Rectangle-2" x="0" y="0" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+        <path d="M22.2617674,7.2962465 L22.2617674,11.5410941 L18.874379,11.5410941 L11.3484071,19.9956154 L11.3484071,23.3830038 L7.10355942,23.3830038 L7.10355942,19.1381562 L10.4909478,19.1381562 L18.0169198,10.6836349 L18.0169198,7.2962465 L22.2617674,7.2962465 Z M6.90881443,1.96021433 C7.18462425,1.68440451 7.42561637,1.5818885 7.7014262,1.85769832 C7.97723602,2.13350815 7.85624661,2.45195904 7.58043678,2.72776887 C7.21269035,3.0955153 7.212219,3.32843769 7.30415561,3.78812073 C7.90174356,3.83408904 8.70110694,4.26171041 9.11482168,4.67542515 C9.25272659,4.81333006 9.3446632,4.99720328 9.48256811,5.13510819 C9.85031455,5.2270448 10.1720927,5.36494971 10.5858074,5.50285462 L10.5858074,5.50285462 L11.3672686,4.72139345 C11.1224548,4.12514021 10.9385816,3.69610271 10.8156489,3.43428093 C10.63125,3.04154827 11.7982569,2.45288212 12.0108248,2.97459789 C12.1206202,3.24407388 12.3201099,3.71867438 12.609294,4.3983994 C12.6933575,4.59599005 12.6665147,5.26087948 12.5576608,5.36973343 C12.395281,5.53211324 12.1517112,5.77568295 11.8269516,6.10044258 C12.1487298,6.23834749 12.3785713,6.3762524 12.6084128,6.51415731 C12.8842226,6.69803053 13.2060008,6.92787205 13.4818106,7.20368188 C13.4818106,7.20368188 13.5133375,7.17215493 13.5763914,7.10910105 L13.7714644,6.91402809 C13.8266365,6.85885594 13.8896904,6.79580205 13.960626,6.72486643 C14.1623869,6.5231056 14.7098138,6.60915772 14.9095711,6.69302722 C15.5395966,6.95754789 16.0136881,7.15841165 16.3318454,7.29561849 C16.9603951,7.5666834 16.2569348,8.65924984 15.8721624,8.49079439 C15.6156475,8.37849076 15.18661,8.19461755 14.5850499,7.93917474 L14.5850499,7.93917474 L14.3092401,8.21498457 C14.5390816,8.72063592 14.9337671,9.41779404 15.0257037,9.96941369 C15.1277339,11.0237257 13.8529763,13.5390725 13.7103852,13.8803049 L13.7103852,13.8803049 L13.5578602,13.956779 C12.8844549,14.2859248 10.8248905,15.2095706 9.87725359,15.1178638 C9.27966564,15.0718955 8.51723373,14.7424838 8.05755068,14.4666739 L8.05755068,14.4666739 L7.78174086,14.7424838 C8.01275917,15.2482504 8.19663239,15.6772879 8.33336051,16.0295963 C8.53845269,16.5580588 7.33585669,16.9701884 7.1381846,16.4892793 C7.03543661,16.2393075 6.83581761,15.7650669 6.53932761,15.0665575 C6.41215755,14.7669539 6.48624631,14.1992462 6.59697605,14.0885164 C6.63691133,14.0485811 6.68483367,14.0006588 6.74074307,13.9447494 L6.93243243,13.75306 L6.93243243,13.75306 L7.04624799,13.6392445 C6.77043817,13.3634346 6.54059664,13.0416565 6.35672343,12.7658467 C6.17285021,12.4900369 6.0809136,12.214227 5.94300869,11.9843855 L5.94300869,11.9843855 L5.19899404,12.7284002 L5.19899404,12.7284002 L5.11444693,12.8129473 C5.03821051,12.8891837 4.6820417,12.9633964 4.58373545,12.9250126 C3.87063868,12.6465831 3.28178153,12.3943318 2.817164,12.1682587 C2.25342212,11.8052375 2.71624773,10.8541607 3.27684705,10.9730828 C3.54552872,11.07386 3.989889,11.2424104 4.60992787,11.4787342 L4.60992787,11.4787342 L5.39138904,10.697273 C5.20751582,10.3295266 5.11557921,9.96178013 5.02364261,9.5940337 C4.83976939,9.50209709 4.65589617,9.41016048 4.51799126,9.27225557 C4.10427652,8.85854083 3.85022958,7.96803064 3.75829297,7.41641099 C3.25264163,7.27850608 3.00097536,7.39559963 2.63322892,7.76334606 C2.3574191,8.03915589 1.95732254,8.29725379 1.68151272,8.02144396 C1.40570289,7.74563414 1.46225844,7.50464864 1.73806826,7.22883882 C2.38162452,6.58528256 2.95506892,6.3302841 3.8284667,6.46818901 C4.01233991,5.91656936 4.28814974,5.36494971 4.74783278,4.90526667 C5.20751582,4.44558362 5.71316717,4.2157421 6.26478682,4.03186889 C6.12688191,3.15847111 6.26525817,2.60377059 6.90881443,1.96021433 Z M9.44472557,6.51501606 C9.07830433,7.22030328 8.64303228,7.82324702 8.13890941,8.32384728 C7.63478655,8.82444754 7.03529678,9.25598406 6.34044012,9.61845684 C6.83143088,11.1280592 7.37085109,12.1793963 7.95870075,12.7724682 C8.84051933,13.6620319 10.5086101,14.3077427 12.8593,13.0351232 C14.124171,10.3024798 13.3536895,8.98403166 12.6428004,8.1675116 C12.1688743,7.6231649 11.1028494,7.07233305 9.44472557,6.51501606 Z M8.1954556,5.59479123 C7.55189934,4.95123497 6.44866004,5.04317158 5.66719887,5.82463275 C4.88573769,6.60609392 4.79380109,7.70933322 5.43735734,8.35288948 C5.57526226,8.49079439 5.63451781,8.49565536 5.83939814,8.42877072 C6.56024928,8.08096189 7.04204901,7.78568332 7.28479734,7.54293499 C7.53237759,7.29535474 7.84371206,6.84012102 8.21880074,6.17723384 C8.3336518,5.91787976 8.33336051,5.73269614 8.1954556,5.59479123 Z" id="Combined-Shape" fill="#FFFFFF" fill-rule="nonzero"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/Viewport/DebugDrawObb.svg b/Assets/Editor/Icons/Components/Viewport/DebugDrawObb.svg
new file mode 100644
index 0000000000..eb77432f96
--- /dev/null
+++ b/Assets/Editor/Icons/Components/Viewport/DebugDrawObb.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Other / DebugDrawObb - box</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
+            <stop stop-color="#9D9D9D" offset="100%"></stop>
+        </linearGradient>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
+    </defs>
+    <g id="icon-/-Other-/-DebugDrawObb---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/general/color/-box-template">
+            <mask id="mask-3" fill="white">
+                <use xlink:href="#path-2"></use>
+            </mask>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#CCCCCC">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="Rectangle-2" x="0" y="0" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+        <path d="M17.3297596,10.3636567 L22.4763023,13.3350146 L22.4763023,19.2777302 L17.3297596,22.2490881 L12.1832168,19.2777302 L12.1832168,13.3350146 L17.3297596,10.3636567 Z M17.6704975,20.8396941 L17.3297596,21.0368569 L17.1454975,20.9306941 L17.1463633,21.3330108 L17.6712748,21.3330108 L17.6704975,20.8396941 Z M13.2324975,14.6286941 L13.2330398,18.6716147 L17.1454975,20.9306941 L17.1463633,16.7258134 L13.2324975,14.6286941 Z M21.4254975,14.5786941 L17.6712748,16.7303705 L17.6704975,20.8396941 L21.4264793,18.6716147 L21.4254975,14.5786941 Z M7.90814998,1.85628152 C8.1839598,2.13209135 8.06297039,2.45054224 7.78716056,2.72635207 C7.41941413,3.0940985 7.41894278,3.32702089 7.51087939,3.78670393 C8.10846734,3.83267224 8.90783072,4.26029361 9.32154546,4.67400835 C9.45945037,4.81191326 9.55138698,4.99578648 9.68929189,5.13369139 C10.0570383,5.225628 10.3788165,5.36353291 10.7925312,5.50143782 L11.5739924,4.71997665 C11.3291786,4.12372342 11.1453053,3.69468591 11.0223727,3.43286413 C10.8379738,3.04013147 12.0049807,2.45146532 12.2175486,2.97318109 C12.3273439,3.24265708 12.5268337,3.71725758 12.8160178,4.3969826 C12.9000813,4.59457325 12.8732385,5.25946268 12.7643846,5.36831663 L12.0336754,6.09902578 C12.3554535,6.23693069 12.5852951,6.3748356 12.8151366,6.51274052 C13.0909464,6.69661373 13.4127245,6.92645525 13.6885344,7.20226508 L14.1673498,6.72344963 C14.3691106,6.5216888 14.9165375,6.60774092 15.1162948,6.69161043 C15.7463204,6.95613109 16.2204118,7.15699485 16.5385692,7.29420169 C17.1671188,7.5652666 16.4636586,8.65783304 16.0788862,8.4893776 C15.8223712,8.37707396 15.3933337,8.19320075 14.7917737,7.93775795 L14.5159638,8.21356777 C14.7458054,8.71921912 15.2688907,9.30833115 15.6118847,10.3098789 C14.9532881,10.6649372 13.475052,11.5159179 11.1771766,12.862821 L11.199459,15.525243 C10.3109975,15.4755262 8.72395751,14.741067 8.26427446,14.4652571 L7.98846464,14.741067 C8.21948295,15.2468336 8.40335617,15.6758711 8.54008429,16.0281795 C8.74517647,16.556642 7.54258047,16.9687717 7.34490838,16.4878625 C7.24216039,16.2378907 7.04254139,15.7636501 6.74605139,15.0651407 C6.61888134,14.7655371 6.69297009,14.1978294 6.80369983,14.0870996 L7.25297177,13.6378277 C6.97716195,13.3620178 6.74732043,13.0402397 6.56344721,12.7644299 C6.37957399,12.4886201 6.28763738,12.2128102 6.14973247,11.9829687 L5.32117071,12.8115305 C5.2449343,12.8877669 4.88876548,12.9619796 4.79045923,12.9235958 C4.07736246,12.6451663 3.48850531,12.392915 3.02388779,12.1668419 C2.4601459,11.8038207 2.92297151,10.8527439 3.48357083,10.971666 C3.7522525,11.0724432 4.19661278,11.2409936 4.81665165,11.4773174 L5.59811282,10.6958562 C5.4142396,10.3281098 5.322303,9.96036333 5.23036639,9.5926169 C5.04649317,9.50068029 4.86261995,9.40874368 4.72471504,9.27083877 C4.3110003,8.85712403 4.05695336,7.96661384 3.96501675,7.41499419 C3.45936541,7.27708928 3.20769914,7.39418283 2.8399527,7.76192926 C2.56414288,8.03773909 2.16404633,8.29583699 1.8882365,8.02002716 C1.61242668,7.74421734 1.66898222,7.50323185 1.94479204,7.22742202 C2.5883483,6.58386576 3.1617927,6.3288673 4.03519048,6.46677221 C4.21906369,5.91515256 4.49487352,5.36353291 4.95455656,4.90384987 C5.4142396,4.44416683 5.91989095,4.21432531 6.4715106,4.03045209 C6.33360569,3.15705431 6.47198195,2.60235379 7.11553821,1.95879753 C7.39134803,1.68298771 7.63234015,1.5804717 7.90814998,1.85628152 Z M17.3297596,11.5758879 L13.2330398,13.9411302 L13.2324975,14.0326941 L17.4131945,16.2732737 L21.4254975,13.9746941 L21.4264793,13.9411302 L17.3297596,11.5758879 Z M12.9757943,13.8951783 L12.7278456,14.3578375 L13.2324975,14.6286941 L13.2324975,14.0326941 L12.9757943,13.8951783 Z M21.5578627,13.8987774 L21.4254975,13.9746941 L21.4254975,14.5786941 L21.8187981,14.3542385 L21.5578627,13.8987774 Z M9.65144935,6.51359926 C9.28502811,7.21888648 8.84975606,7.82183022 8.34563319,8.32243048 C7.84151033,8.82303074 7.24202056,9.25456726 6.5471639,9.61704004 C7.03815466,11.1266424 7.57758222,12.1779722 8.16544658,12.7710294 C8.71734135,13.3277992 9.25045944,13.9116383 10.2169736,13.9801598 C10.2165964,13.9203507 10.2163432,13.8699938 10.2161963,13.8272879 L10.21645,13.648452 C10.2168658,13.6098362 10.2175657,13.5874126 10.2184086,13.5667702 L10.2197625,13.5353408 C10.2219011,13.4847962 10.224406,13.4067896 10.2256685,13.1371674 L10.2256032,12.0830666 L10.2256032,12.0830666 C11.1314526,11.6743846 13.3736007,10.2971277 14.1940558,9.88793053 C13.5517309,8.86203962 13.2508544,8.27986424 12.6368654,7.79171276 C11.8303152,7.15046557 10.4768917,6.57661485 9.65144935,6.51359926 Z M5.87392265,5.82321595 C5.09246147,6.60467712 5.00052487,7.70791642 5.64408112,8.35147268 C5.78198604,8.4893776 5.84124159,8.49423856 6.04612192,8.42735392 C6.76697306,8.0795451 7.24877279,7.78426652 7.49152112,7.54151819 C7.73910137,7.29393794 8.05043584,6.83870422 8.42552452,6.17581704 C8.54037558,5.91646296 8.54008429,5.73127934 8.40217938,5.59337443 C7.75862312,4.94981817 6.65538382,5.04175478 5.87392265,5.82321595 Z" id="Combined-Shape" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/Viewport/DebugDrawRay.svg b/Assets/Editor/Icons/Components/Viewport/DebugDrawRay.svg
new file mode 100644
index 0000000000..e1145b44b9
--- /dev/null
+++ b/Assets/Editor/Icons/Components/Viewport/DebugDrawRay.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Other / DebugDrawRay - box</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
+            <stop stop-color="#9D9D9D" offset="100%"></stop>
+        </linearGradient>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
+    </defs>
+    <g id="icon-/-Other-/-DebugDrawRay---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/general/color/-box-template">
+            <mask id="mask-3" fill="white">
+                <use xlink:href="#path-2"></use>
+            </mask>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#CCCCCC">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="Rectangle-2" x="0" y="0" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+        <path d="M22.9916363,10.1866113 L16.9465831,12.1757763 L17.0280468,12.7618314 L20.0496435,13.1998383 L16.9919648,13.6646278 L18.0013335,14.6501898 L16.5368468,14.4169581 L18.8940864,16.9555382 L15.6939392,16.1613601 L16.417813,18.9461912 L14.6306333,16.4031474 L13.9227092,19.6485431 L13.2867925,17.2532406 L12.4846785,17.2782312 L10.183711,22.8521931 L11.2419254,15.9116172 C12.5787955,15.3092488 13.6114019,14.8414695 14.3397446,14.5082793 C14.7236284,13.5878139 15.7055083,11.7505573 15.9141516,10.7581591 C16.7653232,10.6110184 19.1244848,10.4205025 22.9916363,10.1866113 Z M15.6798307,19.8312919 C15.7723208,20.1338135 15.7724617,20.8723201 15.8597371,21.4835621 C15.5203979,20.9705034 15.1211001,20.2032159 15.02861,19.9006944 C14.9361199,19.5981729 14.9123628,19.4897262 15.2148843,19.3972361 C15.5174059,19.304746 15.5873406,19.5287704 15.6798307,19.8312919 Z M19.2597284,19.2786561 C19.5090111,19.4734171 20.8694357,20.9992314 21.2915215,21.4498724 C20.7192727,21.2242363 19.01537,19.9037931 18.7660873,19.7090321 C18.5168046,19.5142711 18.4351415,19.4390633 18.6299025,19.1897806 C18.8246635,18.9404979 19.0104457,19.0838951 19.2597284,19.2786561 Z M6.90881443,1.96021433 C7.18462425,1.68440451 7.42561637,1.5818885 7.7014262,1.85769832 C7.97723602,2.13350815 7.85624661,2.45195904 7.58043678,2.72776887 C7.21269035,3.0955153 7.212219,3.32843769 7.30415561,3.78812073 C7.90174356,3.83408904 8.70110694,4.26171041 9.11482168,4.67542515 C9.25272659,4.81333006 9.3446632,4.99720328 9.48256811,5.13510819 C9.85031455,5.2270448 10.1720927,5.36494971 10.5858074,5.50285462 L10.5858074,5.50285462 L11.3672686,4.72139345 C11.1224548,4.12514021 10.9385816,3.69610271 10.8156489,3.43428093 C10.63125,3.04154827 11.7982569,2.45288212 12.0108248,2.97459789 C12.1206202,3.24407388 12.3201099,3.71867438 12.609294,4.3983994 C12.6933575,4.59599005 12.6665147,5.26087948 12.5576608,5.36973343 C12.395281,5.53211324 12.1517112,5.77568295 11.8269516,6.10044258 C12.1487298,6.23834749 12.3785713,6.3762524 12.6084128,6.51415731 C12.8842226,6.69803053 13.2060008,6.92787205 13.4818106,7.20368188 C13.4818106,7.20368188 13.5133375,7.17215493 13.5763914,7.10910105 L13.7714644,6.91402809 C13.8266365,6.85885594 13.8896904,6.79580205 13.960626,6.72486643 C14.1623869,6.5231056 14.7098138,6.60915772 14.9095711,6.69302722 C15.5395966,6.95754789 16.0136881,7.15841165 16.3318454,7.29561849 C16.9603951,7.5666834 16.2569348,8.65924984 15.8721624,8.49079439 C15.6156475,8.37849076 15.18661,8.19461755 14.5850499,7.93917474 L14.5850499,7.93917474 L14.3092401,8.21498457 C14.5390816,8.72063592 14.9337671,9.41779404 15.0257037,9.96941369 C15.1277339,11.0237257 13.8529763,13.5390725 13.7103852,13.8803049 L13.7103852,13.8803049 L13.5578602,13.956779 C12.8844549,14.2859248 10.8248905,15.2095706 9.87725359,15.1178638 C9.27966564,15.0718955 8.51723373,14.7424838 8.05755068,14.4666739 L8.05755068,14.4666739 L7.78174086,14.7424838 C8.01275917,15.2482504 8.19663239,15.6772879 8.33336051,16.0295963 C8.53845269,16.5580588 7.33585669,16.9701884 7.1381846,16.4892793 C7.03543661,16.2393075 6.83581761,15.7650669 6.53932761,15.0665575 C6.41215755,14.7669539 6.48624631,14.1992462 6.59697605,14.0885164 C6.63691133,14.0485811 6.68483367,14.0006588 6.74074307,13.9447494 L6.93243243,13.75306 L6.93243243,13.75306 L7.04624799,13.6392445 C6.77043817,13.3634346 6.54059664,13.0416565 6.35672343,12.7658467 C6.17285021,12.4900369 6.0809136,12.214227 5.94300869,11.9843855 L5.94300869,11.9843855 L5.19899404,12.7284002 L5.19899404,12.7284002 L5.11444693,12.8129473 C5.03821051,12.8891837 4.6820417,12.9633964 4.58373545,12.9250126 C3.87063868,12.6465831 3.28178153,12.3943318 2.817164,12.1682587 C2.25342212,11.8052375 2.71624773,10.8541607 3.27684705,10.9730828 C3.54552872,11.07386 3.989889,11.2424104 4.60992787,11.4787342 L4.60992787,11.4787342 L5.39138904,10.697273 C5.20751582,10.3295266 5.11557921,9.96178013 5.02364261,9.5940337 C4.83976939,9.50209709 4.65589617,9.41016048 4.51799126,9.27225557 C4.10427652,8.85854083 3.85022958,7.96803064 3.75829297,7.41641099 C3.25264163,7.27850608 3.00097536,7.39559963 2.63322892,7.76334606 C2.3574191,8.03915589 1.95732254,8.29725379 1.68151272,8.02144396 C1.40570289,7.74563414 1.46225844,7.50464864 1.73806826,7.22883882 C2.38162452,6.58528256 2.95506892,6.3302841 3.8284667,6.46818901 C4.01233991,5.91656936 4.28814974,5.36494971 4.74783278,4.90526667 C5.20751582,4.44558362 5.71316717,4.2157421 6.26478682,4.03186889 C6.12688191,3.15847111 6.26525817,2.60377059 6.90881443,1.96021433 Z M19.636274,14.6991643 C19.7515923,14.7176917 20.2858323,14.9485029 20.8636668,15.2040981 L21.2512294,15.3761091 C21.7656073,15.6048657 22.2485293,15.8202831 22.436391,15.8906742 C21.9397559,15.9858451 19.6269258,15.3423918 19.3834761,15.3032784 C19.1400263,15.2641651 19.0570693,15.2418259 19.1344753,14.937095 C19.2118814,14.6323642 19.3928243,14.660051 19.636274,14.6991643 Z M9.44472557,6.51501606 C9.07830433,7.22030328 8.64303228,7.82324702 8.13890941,8.32384728 C7.63478655,8.82444754 7.03529678,9.25598406 6.34044012,9.61845684 C6.83143088,11.1280592 7.37085109,12.1793963 7.95870075,12.7724682 C8.84051933,13.6620319 10.5086101,14.3077427 12.8593,13.0351232 C14.124171,10.3024798 13.3536895,8.98403166 12.6428004,8.1675116 C12.1688743,7.6231649 11.1028494,7.07233305 9.44472557,6.51501606 Z M8.1954556,5.59479123 C7.55189934,4.95123497 6.44866004,5.04317158 5.66719887,5.82463275 C4.88573769,6.60609392 4.79380109,7.70933322 5.43735734,8.35288948 C5.57526226,8.49079439 5.63451781,8.49565536 5.83939814,8.42877072 C6.56024928,8.08096189 7.04204901,7.78568332 7.28479734,7.54293499 C7.53237759,7.29535474 7.84371206,6.84012102 8.21880074,6.17723384 C8.3336518,5.91787976 8.33336051,5.73269614 8.1954556,5.59479123 Z" id="Combined-Shape" fill="#FFFFFF" fill-rule="nonzero"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/Viewport/DebugDrawSphere.svg b/Assets/Editor/Icons/Components/Viewport/DebugDrawSphere.svg
new file mode 100644
index 0000000000..068cc60e54
--- /dev/null
+++ b/Assets/Editor/Icons/Components/Viewport/DebugDrawSphere.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Other / DebugDrawSphere - box</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
+            <stop stop-color="#9D9D9D" offset="100%"></stop>
+        </linearGradient>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
+    </defs>
+    <g id="icon-/-Other-/-DebugDrawSphere---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/general/color/-box-template">
+            <mask id="mask-3" fill="white">
+                <use xlink:href="#path-2"></use>
+            </mask>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#CCCCCC">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="Rectangle-2" x="0" y="0" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+        <path d="M16.1734284,11.1786341 C19.1780328,11.1786341 21.6137459,13.6143472 21.6137459,16.6189515 C21.6137459,19.6235559 19.1780328,22.059269 16.1734284,22.059269 C13.168824,22.059269 10.7331109,19.6235559 10.7331109,16.6189515 C10.7331109,13.6143472 13.168824,11.1786341 16.1734284,11.1786341 Z M14.5255793,19.5039959 C13.9699963,19.585577 13.3998919,19.617444 12.8261493,19.5943595 C13.6387114,20.5078181 14.8195399,21.0864339 16.1357174,21.0972895 C15.4745728,20.7176572 14.9356523,20.1676579 14.5255793,19.5039959 Z M18.8873546,17.5258673 C17.8868739,18.4422524 16.5312824,19.1068494 15.0420793,19.4130621 C15.5298432,20.1355177 16.1919547,20.6872399 17.0146882,20.9705298 L16.9970067,21.0218804 C18.0259569,20.8306189 18.9312959,20.2875637 19.5835256,19.5222128 C19.5451866,18.8001104 19.295793,18.1258296 18.8873546,17.5258673 Z M12.0454131,14.8791854 C11.8197134,15.4140591 11.694935,16.0019335 11.694935,16.6189515 C11.694935,17.5312041 11.9676908,18.3797512 12.4360996,19.0874898 C13.055891,19.1424947 13.6739581,19.1283219 14.275031,19.0527367 C13.6747098,17.8454556 13.4504037,16.3459587 13.6345836,14.832234 C13.111346,14.7961485 12.5779663,14.8099362 12.0454131,14.8791854 Z M14.1135216,14.8794371 C13.9311377,16.3652384 14.1668526,17.8309415 14.7782293,18.974484 C16.2673447,18.6981439 17.6209592,18.0448976 18.5939354,17.1394078 C17.5921359,15.9489743 15.9372232,15.1134022 14.1135216,14.8794371 Z M20.4168894,15.1833862 C20.1936518,15.920101 19.7839818,16.5936029 19.2360855,17.1806928 C19.6148949,17.7167121 19.8796629,18.3112783 19.9987091,18.9491703 C20.4131312,18.2703093 20.6519218,17.4725167 20.6519218,16.6189515 C20.6519218,16.1168452 20.5692923,15.634038 20.4168894,15.1833862 Z M7.86241817,2.18855107 C8.138228,2.46436089 8.01723858,2.78281179 7.74142876,3.05862161 C7.37368232,3.42636805 7.37321098,3.65929044 7.46514759,4.11897348 C8.06273554,4.16494178 8.86209892,4.59256316 9.27581366,5.00627789 C9.41371857,5.14418281 9.50565518,5.32805602 9.64356009,5.46596094 C10.0113065,5.55789754 10.3330847,5.69580246 10.7467994,5.83370737 L11.5282606,5.0522462 C11.2834468,4.45599296 11.0995735,4.02695545 10.9766409,3.76513368 C10.792242,3.37240102 11.9592489,2.78373486 12.1718168,3.30545064 C12.2816121,3.57492663 12.4811019,4.04952713 12.770286,4.72925214 C12.8543495,4.9268428 12.8275067,5.59173223 12.7186528,5.70058618 L11.9879436,6.43129532 C12.3097217,6.56920024 12.5395633,6.70710515 12.7694048,6.84501006 C13.0452146,7.02888328 13.3669927,7.2587248 13.6428026,7.53453462 L14.121618,7.05571918 C14.3233788,6.85395834 14.8708057,6.94001046 15.070563,7.02387997 C15.7005886,7.28840064 16.17468,7.48926439 16.4928374,7.62647123 C17.121387,7.89753615 16.4179268,8.99010259 16.0331544,8.82164714 C15.7766394,8.70934351 15.3476019,8.52547029 14.7460419,8.27002749 L14.470232,8.54583732 C14.7000736,9.05148866 15.094759,9.74864679 15.1866956,10.3002664 C14.4972712,10.3150821 12.6625756,10.5343079 11.4165175,11.7461524 C10.1704594,12.9579969 9.87484232,14.4327057 9.64257686,15.4047648 C9.23458794,15.2728341 8.50469264,14.9692167 8.21854266,14.7975267 L7.94273283,15.0733365 C8.17375115,15.5791032 8.35762436,16.0081407 8.49435249,16.360449 C8.69944467,16.8889116 7.49684866,17.3010412 7.29917658,16.8201321 C7.19642859,16.5701603 6.99680959,16.0959197 6.70031958,15.3974103 C6.57314953,15.0978066 6.56153632,14.606021 6.75796802,14.4193692 L7.20723997,13.9700972 C6.93143014,13.6942874 6.70158862,13.3725093 6.5177154,13.0966994 C6.33384219,12.8208896 6.24190558,12.5450798 6.10400067,12.3152383 L5.2754389,13.1438 C5.19920249,13.2200364 4.84303368,13.2942491 4.74472743,13.2558653 C4.03163065,12.9774358 3.44277351,12.7251845 2.97815598,12.4991115 C2.4144141,12.1360902 2.87723971,11.1850135 3.43783902,11.3039356 C3.7065207,11.4047127 4.15088097,11.5732632 4.77091984,11.8095869 L5.55238102,11.0281257 C5.3685078,10.6603793 5.27657119,10.2926329 5.18463458,9.92488644 C5.00076137,9.83294983 4.81688815,9.74101323 4.67898324,9.60310831 C4.2652685,9.18939358 4.01122156,8.29888339 3.91928495,7.74726374 C3.4136336,7.60935882 3.16196733,7.72645237 2.7942209,8.09419881 C2.51841108,8.37000863 2.11831452,8.62810654 1.8425047,8.35229671 C1.56669487,8.07648689 1.62325041,7.83550139 1.89906024,7.55969157 C2.5426165,6.91613531 3.11606089,6.66113684 3.98945867,6.79904176 C4.17333189,6.24742211 4.44914172,5.69580246 4.90882476,5.23611941 C5.3685078,4.77643637 5.87415915,4.54659485 6.4257788,4.36272163 C6.28787388,3.48932385 6.42625014,2.93462334 7.0698064,2.29106708 C7.34561623,2.01525725 7.58660835,1.91274124 7.86241817,2.18855107 Z M16.1734284,12.1404581 C15.7161715,12.1404581 15.2749201,12.2089855 14.8593838,12.3363306 C14.5376264,13.0015515 14.3147153,13.701348 14.1861728,14.4038485 C16.1031176,14.6520509 17.8513066,15.5283007 18.9349403,16.7943866 C19.5522363,16.1137331 19.965431,15.3153559 20.088664,14.4429187 C19.3237085,13.0695106 17.8570644,12.1404581 16.1734284,12.1404581 Z M14.2205269,12.5875456 C13.4176449,12.9771996 12.7486864,13.5996364 12.3013812,14.3671265 C12.7724178,14.3241161 13.2429221,14.321219 13.7061597,14.3551995 C13.8128243,13.7579596 13.9836152,13.1630494 14.2205269,12.5875456 Z M9.60571755,6.8458688 C9.23929631,7.55115603 8.80402425,8.15409977 8.29990139,8.65470003 C7.79577852,9.15530028 7.19628876,9.58683681 6.5014321,9.94930959 C6.74963201,10.7124262 6.84931129,11.3303269 7.31440502,12.1024639 C7.77949875,12.8746008 8.57334944,13.4740576 8.96210738,13.6505172 C9.06340773,12.937299 9.60093028,12.0460988 10.5562918,10.9967604 C11.5116533,9.94742197 12.6843627,9.53337579 13.4411672,9.47850047 C13.2696729,9.07877696 12.663937,8.36438098 11.9923894,7.89415327 C11.2384407,7.36622711 10.6153961,7.07596431 9.60571755,6.8458688 Z M5.82819084,6.1554855 C5.04672967,6.93694667 4.95479306,8.04018597 5.59834932,8.68374223 C5.73625423,8.82164714 5.79550978,8.82650811 6.00039011,8.75962347 C6.72124125,8.41181464 7.20304099,8.11653606 7.44578931,7.87378774 C7.69336957,7.62620749 8.00470403,7.17097377 8.37979272,6.50808658 C8.49464378,6.2487325 8.49435249,6.06354889 8.35644757,5.92564398 C7.71289131,5.28208772 6.60965201,5.37402433 5.82819084,6.1554855 Z" id="Combined-Shape" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/Viewport/DebugDrawText.svg b/Assets/Editor/Icons/Components/Viewport/DebugDrawText.svg
new file mode 100644
index 0000000000..a8a2e263e1
--- /dev/null
+++ b/Assets/Editor/Icons/Components/Viewport/DebugDrawText.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Other / DebugDrawText - box</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
+            <stop stop-color="#9D9D9D" offset="100%"></stop>
+        </linearGradient>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
+    </defs>
+    <g id="icon-/-Other-/-DebugDrawText---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/general/color/-box-template">
+            <mask id="mask-3" fill="white">
+                <use xlink:href="#path-2"></use>
+            </mask>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#CCCCCC">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="Rectangle-2" x="0" y="0" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+        <path d="M21.5896061,10.9985441 L21.5815985,14.3439139 L20.2243869,14.3439139 L20.2270335,12.358462 L17.5311662,12.358462 L17.5152611,20.483175 L18.8857266,20.4884681 L18.8804199,21.8456796 L14.7928808,21.8323789 L14.7981875,20.4751674 L16.1580497,20.4804687 L16.1739588,12.3584115 L13.4489327,12.3584115 L13.443626,14.3465143 L12.0864145,14.3465143 L12.0943678,11.0038508 L12.0943678,10.9985441 L21.5896061,10.9985441 Z M7.7014262,1.85769832 C7.97723602,2.13350815 7.85624661,2.45195904 7.58043678,2.72776887 C7.21269035,3.0955153 7.212219,3.32843769 7.30415561,3.78812073 C7.90174356,3.83408904 8.70110694,4.26171041 9.11482168,4.67542515 C9.25272659,4.81333006 9.3446632,4.99720328 9.48256811,5.13510819 C9.85031455,5.2270448 10.1720927,5.36494971 10.5858074,5.50285462 L11.3672686,4.72139345 C11.1224548,4.12514021 10.9385816,3.69610271 10.8156489,3.43428093 C10.63125,3.04154827 11.7982569,2.45288212 12.0108248,2.97459789 C12.1206202,3.24407388 12.3201099,3.71867438 12.609294,4.3983994 C12.6933575,4.59599005 12.6665147,5.26087948 12.5576608,5.36973343 L11.8269516,6.10044258 C12.1487298,6.23834749 12.3785713,6.3762524 12.6084128,6.51415731 C12.8842226,6.69803053 13.2060008,6.92787205 13.4818106,7.20368188 L13.960626,6.72486643 C14.1623869,6.5231056 14.7098138,6.60915772 14.9095711,6.69302722 C15.5395966,6.95754789 16.0136881,7.15841165 16.3318454,7.29561849 C16.9603951,7.5666834 16.2569348,8.65924984 15.8721624,8.49079439 C15.6156475,8.37849076 15.18661,8.19461755 14.5850499,7.93917474 L14.3092401,8.21498457 C14.5390816,8.72063592 14.9337671,9.41779404 15.0257037,9.96941369 C15.0267516,9.98024208 15.0276543,9.99122459 15.0284144,10.0023573 L11.0449088,10.0106767 L10.9989588,14.9599573 C10.5681023,15.0777565 10.1697215,15.1461671 9.87725359,15.1178638 C9.27966564,15.0718955 8.51723373,14.7424838 8.05755068,14.4666739 L7.78174086,14.7424838 C8.01275917,15.2482504 8.19663239,15.6772879 8.33336051,16.0295963 C8.53845269,16.5580588 7.33585669,16.9701884 7.1381846,16.4892793 C7.03543661,16.2393075 6.83581761,15.7650669 6.53932761,15.0665575 C6.41215755,14.7669539 6.48624631,14.1992462 6.59697605,14.0885164 L7.04624799,13.6392445 C6.77043817,13.3634346 6.54059664,13.0416565 6.35672343,12.7658467 C6.17285021,12.4900369 6.0809136,12.214227 5.94300869,11.9843855 L5.11444693,12.8129473 C5.03821051,12.8891837 4.6820417,12.9633964 4.58373545,12.9250126 C3.87063868,12.6465831 3.28178153,12.3943318 2.817164,12.1682587 C2.25342212,11.8052375 2.71624773,10.8541607 3.27684705,10.9730828 C3.54552872,11.07386 3.989889,11.2424104 4.60992787,11.4787342 L5.39138904,10.697273 C5.20751582,10.3295266 5.11557921,9.96178013 5.02364261,9.5940337 C4.83976939,9.50209709 4.65589617,9.41016048 4.51799126,9.27225557 C4.10427652,8.85854083 3.85022958,7.96803064 3.75829297,7.41641099 C3.25264163,7.27850608 3.00097536,7.39559963 2.63322892,7.76334606 C2.3574191,8.03915589 1.95732254,8.29725379 1.68151272,8.02144396 C1.40570289,7.74563414 1.46225844,7.50464864 1.73806826,7.22883882 C2.38162452,6.58528256 2.95506892,6.3302841 3.8284667,6.46818901 C4.01233991,5.91656936 4.28814974,5.36494971 4.74783278,4.90526667 C5.20751582,4.44558362 5.71316717,4.2157421 6.26478682,4.03186889 C6.12688191,3.15847111 6.26525817,2.60377059 6.90881443,1.96021433 C7.18462425,1.68440451 7.42561637,1.5818885 7.7014262,1.85769832 Z M9.44472557,6.51501606 C9.07830433,7.22030328 8.64303228,7.82324702 8.13890941,8.32384728 C7.63478655,8.82444754 7.03529678,9.25598406 6.34044012,9.61845684 C6.83143088,11.1280592 7.37085844,12.179389 7.9587228,12.7724462 C8.51061757,13.329216 9.37051957,13.7904552 10.513006,13.7456408 C10.4869884,13.0805595 10.471424,11.7104731 10.4663127,9.63538152 C11.5248573,9.61221042 12.515653,9.60710523 13.4386998,9.62006596 C13.2818081,8.9858806 12.9565021,8.52782619 12.6428004,8.1675116 C12.1688743,7.6231649 11.1028494,7.07233305 9.44472557,6.51501606 Z M5.66719887,5.82463275 C4.88573769,6.60609392 4.79380109,7.70933322 5.43735734,8.35288948 C5.57526226,8.49079439 5.63451781,8.49565536 5.83939814,8.42877072 C6.56024928,8.08096189 7.04204901,7.78568332 7.28479734,7.54293499 C7.53237759,7.29535474 7.84371206,6.84012102 8.21880074,6.17723384 C8.3336518,5.91787976 8.33336051,5.73269614 8.1954556,5.59479123 C7.55189934,4.95123497 6.44866004,5.04317158 5.66719887,5.82463275 Z" id="Combined-Shape" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/Viewport/Decal.png b/Assets/Editor/Icons/Components/Viewport/Decal.png
deleted file mode 100644
index 247a83cdec..0000000000
--- a/Assets/Editor/Icons/Components/Viewport/Decal.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0d16b09d87333dafd50c25f5869c2c5d3b438d1b7d3ef197df950f5448d89ba2
-size 5190
diff --git a/Assets/Editor/Icons/Components/Viewport/Decal.svg b/Assets/Editor/Icons/Components/Viewport/Decal.svg
new file mode 100644
index 0000000000..9d41b49b7c
--- /dev/null
+++ b/Assets/Editor/Icons/Components/Viewport/Decal.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Rendering / Decal - box</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
+            <stop stop-color="#9D9D9D" offset="100%"></stop>
+        </linearGradient>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
+    </defs>
+    <g id="icon-/-Rendering-/-Decal---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/general/color/-box-template">
+            <mask id="mask-3" fill="white">
+                <use xlink:href="#path-2"></use>
+            </mask>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#B29EDF">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="Rectangle-2" x="0" y="-0.00055502734" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+        <path d="M10.3601087,17.8244045 L11.9375,14.8823836 L13.5148913,17.8244045 L13.4099418,14.487844 L16.2470132,16.2470132 L14.487844,13.4099418 L17.8244045,13.5148913 L14.8823836,11.9375 L17.8244045,10.3601087 L14.487844,10.4650582 L16.2470132,7.62798682 L13.4099418,9.38715598 L13.5148913,6.05059552 L11.9375,8.99261638 L10.3601087,6.05059552 L10.4650582,9.38715598 L7.62798682,7.62798682 L9.38715598,10.4650582 L6.05059552,10.3601087 L8.99261638,11.9375 L6.05059552,13.5148913 L9.38715598,13.4099418 L7.62798682,16.2470132 L10.4650582,14.487844 L10.3601087,17.8244045 Z M11.9375,17.114281 L9.16461986,22.2860296 L9.34910951,16.4207238 L4.36185057,19.5131494 L7.45427616,14.5258905 L1.58897043,14.7103801 L6.76071902,11.9375 L1.58897043,9.16461986 L7.45427616,9.34910951 L4.36185057,4.36185057 L9.34910951,7.45427616 L9.16461986,1.58897043 L11.9375,6.76071902 L14.7103801,1.58897043 L14.5258905,7.45427616 L19.5131494,4.36185057 L16.4207238,9.34910951 L22.2860296,9.16461986 L17.114281,11.9375 L22.2860296,14.7103801 L16.4207238,14.5258905 L19.5131494,19.5131494 L14.5258905,16.4207238 L14.7103801,22.2860296 L11.9375,17.114281 Z" id="Star-1" fill="#FFFFFF" fill-rule="nonzero"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/Viewport/Disk_Shape.png b/Assets/Editor/Icons/Components/Viewport/Disk_Shape.png
deleted file mode 100644
index cc4599c563..0000000000
--- a/Assets/Editor/Icons/Components/Viewport/Disk_Shape.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:13406a7c5bc10ab0fe93f5afda3ae70583d5e4af14f59a62757cad779d5c1e0f
-size 18214
diff --git a/Assets/Editor/Icons/Components/Viewport/Disk_shape.svg b/Assets/Editor/Icons/Components/Viewport/Disk_shape.svg
new file mode 100644
index 0000000000..9f456575c4
--- /dev/null
+++ b/Assets/Editor/Icons/Components/Viewport/Disk_shape.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Shapes / Disk_shape - box</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
+            <stop stop-color="#9D9D9D" offset="100%"></stop>
+        </linearGradient>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
+    </defs>
+    <g id="icon-/-Shapes-/-Disk_shape---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/general/color/-box-template">
+            <mask id="mask-3" fill="white">
+                <use xlink:href="#path-2"></use>
+            </mask>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#5A69A1">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="Rectangle-2" x="0" y="0" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+        <path d="M11.2949674,2.86381314 C14.965583,2.86381314 17.9412049,7.01769439 17.9412049,12.1417666 C17.9412049,17.2658388 14.965583,21.4197201 11.2949674,21.4197201 C7.62435182,21.4197201 4.64872995,17.2658388 4.64872995,12.1417666 C4.64872995,7.01769439 7.62435182,2.86381314 11.2949674,2.86381314 Z M11.229071,4.5041143 C8.37024708,4.5041143 6.05271243,7.92360771 6.05271243,12.1417666 C6.05271243,16.3599255 8.37024708,19.7794189 11.229071,19.7794189 C14.0878948,19.7794189 16.4054295,16.3599255 16.4054295,12.1417666 C16.4054295,7.92360771 14.0878948,4.5041143 11.229071,4.5041143 Z M8.43336452,11.5810482 L11.0006639,11.591655 C11.1656209,11.7447723 11.2412282,11.9410219 11.2274857,12.1804038 C11.2137433,12.4197856 11.138136,12.5938127 11.0006639,12.7024851 L8.43336452,12.6918782 L8.43336452,11.5810482 Z" id="Combined-Shape" fill="#FFFFFF" fill-rule="nonzero" transform="translate(11.294967, 12.141767) rotate(28.000000) translate(-11.294967, -12.141767) "></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/Viewport/EnvironmentProbe.png b/Assets/Editor/Icons/Components/Viewport/EnvironmentProbe.png
deleted file mode 100644
index 0d3815f2b0..0000000000
--- a/Assets/Editor/Icons/Components/Viewport/EnvironmentProbe.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a7f51c26ce7e7fd501d4ebfa149c44504448b8169f1f8cb9ea6a3cc1eb9b2c69
-size 4933
diff --git a/Assets/Editor/Icons/Components/Viewport/EnvironmentProbe.svg b/Assets/Editor/Icons/Components/Viewport/EnvironmentProbe.svg
new file mode 100644
index 0000000000..c73d6d03e9
--- /dev/null
+++ b/Assets/Editor/Icons/Components/Viewport/EnvironmentProbe.svg
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Rendering / EnvironmentProbe - box</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
+            <stop stop-color="#9D9D9D" offset="100%"></stop>
+        </linearGradient>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
+    </defs>
+    <g id="icon-/-Rendering-/-EnvironmentProbe---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/general/color/-box-template">
+            <mask id="mask-3" fill="white">
+                <use xlink:href="#path-2"></use>
+            </mask>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#B29EDF">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="Rectangle-2" x="0" y="-0.00055502734" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+        <path d="M11.9429909,15.4250285 C13.8345623,15.4250285 15.3679839,13.8916069 15.3679839,12.0000355 C15.3679839,10.1084641 13.8345623,8.57504255 11.9429909,8.57504255 C10.0514195,8.57504255 8.51799793,10.1084641 8.51799793,12.0000355 C8.51799793,13.8916069 10.0514195,15.4250285 11.9429909,15.4250285 Z" id="Path" fill-opacity="0.25" fill="#FFFFFF" fill-rule="nonzero"></path>
+        <path d="M14.4537214,20.5180654 L14.7043395,21.3697485 C13.8150213,21.6314413 12.8877441,21.765741 11.9429909,21.765741 L11.9429909,20.8779496 C12.8026863,20.8779496 13.6455771,20.7558717 14.4537214,20.5180654 Z M7.40468432,19.6319874 C8.13338373,20.0662862 8.92119595,20.3942662 9.74681506,20.6043301 L9.52790705,21.4647096 C8.61910894,21.2334823 7.75198645,20.872484 6.95016905,20.3946075 L7.40468432,19.6319874 Z M18.670864,17.7927808 L19.343367,18.3723611 C18.7334295,19.0800885 18.0249346,19.6979001 17.2405469,20.2053186 L16.7583378,19.4599006 C17.4716446,18.9984642 18.1160775,18.436515 18.670864,17.7927808 Z M3.99005267,15.9503114 C4.36859938,16.710883 4.85508854,17.4134975 5.43304627,18.036484 L4.78220258,18.6402854 C4.14671211,17.9552837 3.61169769,17.1825863 3.1952623,16.3458892 L3.99005267,15.9503114 Z M11.8974849,7.59650149 C14.3295053,7.59650149 16.3010473,9.56804354 16.3010473,12.0000639 C16.3010473,14.4320843 14.3295053,16.4036263 11.8974849,16.4036263 C9.46546454,16.4036263 7.49392249,14.4320843 7.49392249,12.0000639 C7.49392249,9.56804354 9.46546454,7.59650149 11.8974849,7.59650149 Z M20.738106,13.2179682 L21.6176659,13.3385837 C21.4898859,14.2703883 21.229054,15.1718618 20.8452452,16.0204419 L20.0363454,15.6545803 C20.3850496,14.8836144 20.6219907,14.0647112 20.738106,13.2179682 Z M11.8974849,8.57507092 C10.0059135,8.57507092 8.47249192,10.1084925 8.47249192,12.0000639 C8.47249192,13.8916353 10.0059135,15.4250569 11.8974849,15.4250569 C13.7890563,15.4250569 15.3224779,13.8916353 15.3224779,12.0000639 C15.3224779,10.1084925 13.7890563,8.57507092 11.8974849,8.57507092 Z M11.9429909,10.0428967 C13.0238889,10.0428967 13.9001298,10.9191376 13.9001298,12.0000355 C13.9001298,13.0809335 13.0238889,13.9571744 11.9429909,13.9571744 C10.862093,13.9571744 9.98585207,13.0809335 9.98585207,12.0000355 C9.98585207,10.9191376 10.862093,10.0428967 11.9429909,10.0428967 Z M2.23904308,10.8959898 L3.1212618,10.995306 C3.08455294,11.3213881 3.06573361,11.6507804 3.06509454,11.9816784 C3.06507785,12.5194604 3.1096535,13.0353621 3.19869359,13.5434779 L2.32422705,13.6967157 C2.22629139,13.1378366 2.17728485,12.5706535 2.17730395,11.9808084 C2.17800679,11.6164394 2.19868775,11.2544632 2.23904308,10.8959898 Z M20.7799773,7.83834929 C21.1774359,8.68091117 21.4526819,9.57811335 21.5952528,10.507212 L20.7177328,10.641868 C20.5881869,9.79764977 20.338154,8.98263344 19.9770394,8.21711618 L20.7799773,7.83834929 Z M4.41709312,5.77630839 L5.10094889,6.34244872 C4.55907419,6.99699341 4.11317846,7.72583049 3.77847363,8.50711492 L2.9624149,8.15751268 C3.33070231,7.29783812 3.82118533,6.49612107 4.41709312,5.77630839 Z M17.0932806,3.70133925 C17.886601,4.1946823 18.6059071,4.79981046 19.2283235,5.4965952 L18.5662221,6.08803009 C18.0000858,5.45424999 17.3458403,4.90385519 16.6244496,4.45524311 L17.0932806,3.70133925 Z M8.9822993,2.69131867 L9.25117773,3.5374144 C8.44018228,3.79513841 7.67240414,4.16861156 6.96951726,4.64487108 L6.47152202,3.90990555 C7.2447667,3.38597325 8.08966373,2.97498687 8.9822993,2.69131867 Z M11.9777531,2.23438676 C12.8518663,2.23743957 13.7108985,2.35548777 14.5386751,2.58316907 L14.3032304,3.43917103 C13.5509812,3.23226367 12.7700716,3.12495108 11.9759444,3.12217929 C11.8849543,3.12212591 11.8218372,3.12269124 11.7560794,3.12404805 L11.737765,2.23644557 L11.8103134,2.23523569 L11.9777531,2.23438676 Z" id="Combined-Shape" fill="#FFFFFF" fill-rule="nonzero"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/Viewport/Flipbook.png b/Assets/Editor/Icons/Components/Viewport/Flipbook.png
deleted file mode 100644
index e1bbcae110..0000000000
--- a/Assets/Editor/Icons/Components/Viewport/Flipbook.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:792b474feb0b9c09ba20fd0e89a59e1fd5d556223adf2293efa5533f942cc986
-size 5609
diff --git a/Assets/Editor/Icons/Components/Viewport/FogVolume.png b/Assets/Editor/Icons/Components/Viewport/FogVolume.png
deleted file mode 100644
index ff1c361a58..0000000000
--- a/Assets/Editor/Icons/Components/Viewport/FogVolume.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:037b701eefed3983aebe69676bdeb5e4408f7b3dcecb7ef488ad6cd5948bf0b5
-size 3472
diff --git a/Assets/Editor/Icons/Components/Viewport/FogVolume.svg b/Assets/Editor/Icons/Components/Viewport/FogVolume.svg
new file mode 100644
index 0000000000..8bc4bde0cd
--- /dev/null
+++ b/Assets/Editor/Icons/Components/Viewport/FogVolume.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Environmental / FogVolume - box</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
+            <stop stop-color="#9D9D9D" offset="100%"></stop>
+        </linearGradient>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
+    </defs>
+    <g id="icon-/-Environmental-/-FogVolume---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/general/color/-box-template">
+            <mask id="mask-3" fill="white">
+                <use xlink:href="#path-2"></use>
+            </mask>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#8BDD15">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="Rectangle-2" x="0" y="0" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+        <path d="M20.625,17.67 L20.625,18.75 L3.375,18.75 L3.375,17.67 L20.625,17.67 Z M20.625,15.51 L20.625,16.59 L3.375,16.59 L3.375,15.51 L20.625,15.51 Z M20.625,13.35 L20.625,14.43 L3.375,14.43 L3.375,13.35 L20.625,13.35 Z M11.9591906,5.25 C14.1747379,5.25 16.0949018,6.54178988 17.0371512,8.42821107 C18.9538811,8.68993253 20.4575939,10.2848877 20.625,12.27 L3.375,12.27 C3.48477691,10.3828508 4.93117226,8.86321338 6.76061606,8.68509376 C7.6521371,6.66004803 9.64445163,5.25 11.9591906,5.25 Z" id="Icon" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/Viewport/ForceVolume.png b/Assets/Editor/Icons/Components/Viewport/ForceVolume.png
deleted file mode 100644
index 3c38d88afc..0000000000
--- a/Assets/Editor/Icons/Components/Viewport/ForceVolume.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7ccfb20f990b6d6390ee09d65bf460011adb64060f9e09f847cf030fb5104473
-size 5270
diff --git a/Assets/Editor/Icons/Components/Viewport/ForceVolume.svg b/Assets/Editor/Icons/Components/Viewport/ForceVolume.svg
new file mode 100644
index 0000000000..2a76d1950c
--- /dev/null
+++ b/Assets/Editor/Icons/Components/Viewport/ForceVolume.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Physics / PhysX / ForceVolume - box</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
+            <stop stop-color="#9D9D9D" offset="100%"></stop>
+        </linearGradient>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
+    </defs>
+    <g id="icon-/-Physics-/-PhysX-/-ForceVolume---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/general/color/-box-template">
+            <mask id="mask-3" fill="white">
+                <use xlink:href="#path-2"></use>
+            </mask>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#DD7F6D">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="Rectangle-2" x="0" y="0" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+        <path d="M12.8485825,6.55130618 L16.7034482,6.55130618 L20.2189166,10.9557258 L20.2189166,12.5484138 L16.7034482,17.5513062 L12.8485825,17.5513062 L16.3377333,12.5484138 L16.3377333,10.9557258 L12.8485825,6.55130618 Z M9.24066553,6.55130618 L11.768073,6.55130618 L15.2835414,10.9557258 L15.2835414,12.5484138 L11.768073,17.5513062 L9.24066553,17.5513062 L12.7298164,12.5484138 L12.7298164,10.9557258 L9.24066553,6.55130618 Z M6.47688416,6.55130618 L8.16015604,6.55130618 L11.6756245,10.9557258 L11.6756245,12.5484138 L8.16015604,17.5513062 L6.47688416,17.5513062 L9.966035,12.5484138 L9.966035,10.9557258 L6.47688416,6.55130618 Z M12,21 C16.9705627,21 21,16.9705627 21,12 C21,7.02943725 16.9705627,3 12,3 C7.02943725,3 3,7.02943725 3,12 C3,16.9705627 7.02943725,21 12,21 Z M12,22.5 C6.20101013,22.5 1.5,17.7989899 1.5,12 C1.5,6.20101013 6.20101013,1.5 12,1.5 C17.7989899,1.5 22.5,6.20101013 22.5,12 C22.5,17.7989899 17.7989899,22.5 12,22.5 Z" id="Shape" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/Viewport/GeometryCache.png b/Assets/Editor/Icons/Components/Viewport/GeometryCache.png
deleted file mode 100644
index 5cfc4155bb..0000000000
--- a/Assets/Editor/Icons/Components/Viewport/GeometryCache.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e20cca4ca67233e7da923b328fb07e99a61b43f5742d2d71d52de3376b064e62
-size 2864
diff --git a/Assets/Editor/Icons/Components/Viewport/GeometryCache.svg b/Assets/Editor/Icons/Components/Viewport/GeometryCache.svg
new file mode 100644
index 0000000000..694efe52b5
--- /dev/null
+++ b/Assets/Editor/Icons/Components/Viewport/GeometryCache.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Rendering / GeometryCache - box</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
+            <stop stop-color="#9D9D9D" offset="100%"></stop>
+        </linearGradient>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
+    </defs>
+    <g id="icon-/-Rendering-/-GeometryCache---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/general/color/-box-template">
+            <mask id="mask-3" fill="white">
+                <use xlink:href="#path-2"></use>
+            </mask>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#B29EDF">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="Rectangle-2" x="0" y="-0.00055502734" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+        <path d="M21.5445757,7.41402559 L21.5397656,20.5769086 C21.5397656,21.1037689 21.1126609,21.5308735 20.5858006,21.5308735 L3.4144315,21.5308735 C2.88757121,21.5308735 2.46046655,21.1037689 2.46046655,20.5769086 L2.46527664,7.41402559 L21.5445757,7.41402559 Z M9.08770901,9.83859909 L9.08770901,18.0743612 L16.2940009,13.9564802 L9.08770901,9.83859909 Z M16.1244201,2.08785302 L11.6223105,5.90371283 L7.26925124,5.90371283 L11.7713608,2.08785302 L16.1244201,2.08785302 Z M20.5858006,2.08785302 C21.1126609,2.08785302 21.5397656,2.51495768 21.5397656,3.04181797 L21.5397656,5.90371283 L14.4366065,5.90371283 L18.9387161,2.08785302 L20.5858006,2.08785302 Z M8.95706478,2.08785302 L4.45495525,5.90371283 L2.46046655,5.90371283 L2.46046655,3.04181797 C2.46046655,2.51495768 2.88757121,2.08785302 3.4144315,2.08785302 L8.95706478,2.08785302 Z" id="Combined-Shape" fill="#FFFFFF" fill-rule="nonzero"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/Viewport/LensFlare.png b/Assets/Editor/Icons/Components/Viewport/LensFlare.png
deleted file mode 100644
index 9216540197..0000000000
--- a/Assets/Editor/Icons/Components/Viewport/LensFlare.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c475df6cf2e17f08061af22e50d3c30ba2bf64703cb535cd9ddc1aea6897901c
-size 5062
diff --git a/Assets/Editor/Icons/Components/Viewport/LensFlare.svg b/Assets/Editor/Icons/Components/Viewport/LensFlare.svg
new file mode 100644
index 0000000000..9b88070f3a
--- /dev/null
+++ b/Assets/Editor/Icons/Components/Viewport/LensFlare.svg
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Rendering / LensFlare - box</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
+            <stop stop-color="#9D9D9D" offset="100%"></stop>
+        </linearGradient>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
+    </defs>
+    <g id="icon-/-Rendering-/-LensFlare---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/general/color/-box-template">
+            <mask id="mask-3" fill="white">
+                <use xlink:href="#path-2"></use>
+            </mask>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#B29EDF">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="Rectangle-2" x="0" y="-0.00055502734" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+        <ellipse id="Oval-242" fill-opacity="0.25" fill="#FAFAFA" cx="11.2093678" cy="12" rx="5.9846165" ry="6.10621564"></ellipse>
+        <path d="M9.26428558,10.7436477 L8.30532815,9.76520557 C7.84734726,10.3869697 7.57567341,11.1607113 7.57567341,12 C7.57567341,12.7967625 7.82051368,13.534452 8.23715744,14.139122 L9.2384369,13.2137815 C9.02844732,12.8595652 8.90759222,12.444183 8.90759222,12 C8.90759222,11.5378969 9.03839562,11.1069653 9.26428558,10.7436477 L9.26428558,10.7436477 Z M9.97803449,10.0153964 C10.2033246,9.86957396 10.4551415,9.76258785 10.7244394,9.70366769 L10.7244394,8.31545885 C10.0889507,8.40220943 9.50507883,8.65708229 9.01725375,9.03509392 L9.97803449,10.0153964 L9.97803449,10.0153964 Z M13.15445,13.2563523 L14.1134075,14.2347944 C14.5713883,13.6130303 14.8430622,12.8392887 14.8430622,12 C14.8430622,11.0638025 14.5050284,10.2091627 13.9474442,9.55604035 L12.95693,10.471432 C13.3024047,10.8822334 13.5111434,11.4162447 13.5111434,12 C13.5111434,12.4621031 13.38034,12.8930347 13.15445,13.2563523 L13.15445,13.2563523 Z M12.4407011,13.9846036 C12.0910666,14.2109098 11.6775428,14.3436792 11.2339411,14.3484134 L11.2339411,15.717295 C12.0473787,15.711779 12.7979393,15.4325863 13.4014818,14.9649061 L12.4407011,13.9846036 L12.4407011,13.9846036 Z M14.1190144,15.6970179 C13.3284332,16.342997 12.3260146,16.7315708 11.2339411,16.7373171 L11.2339411,19.7703432 L10.7244394,19.7703432 L10.7244394,16.711975 C9.57596844,16.5909343 8.55218686,16.044729 7.80671104,15.2310485 L5.91035949,16.9835771 L5.56473929,16.6088588 L7.48254065,14.8365072 C6.90096158,14.045481 6.55667011,13.0633649 6.55667011,12 C6.55667011,10.8758703 6.94143414,9.84254045 7.58454627,9.0297784 L1.28175431,2.59892242 L2.0091584,1.88460374 L8.29972123,8.30298213 C8.97781578,7.74891517 9.81175433,7.38421553 10.7244394,7.28802497 L10.7244394,4.22965681 L11.2339411,4.22965681 L11.2339411,7.26267823 C12.4314891,7.26898417 13.5212278,7.73563241 14.3420437,8.49724206 L15.8135774,7.13731231 C15.5266771,6.80601057 15.3525638,6.37064377 15.3525638,5.89378436 C15.3525638,4.85613212 16.1769959,4.01494877 17.1939843,4.01494877 C18.2109727,4.01494877 19.0354048,4.85613212 19.0354048,5.89378436 C19.0354048,6.9314366 18.2109727,7.77261994 17.1939843,7.77261994 C16.8275156,7.77261994 16.4860503,7.66339234 16.1991546,7.47510399 L14.6965583,8.86374052 C15.4220251,9.69950674 15.8620655,10.7978311 15.8620655,12 C15.8620655,13.1241297 15.4773015,14.1574595 14.8341893,14.9702216 L21.1369813,21.4010776 L20.4095772,22.1153963 L14.1190144,15.6970179 L14.1190144,15.6970179 Z M9.54615434,13.6235279 L8.55540417,14.5391377 C9.11462491,15.1505064 9.87322794,15.5683423 10.7244394,15.6845411 L10.7244394,14.2963323 C10.2662088,14.1960752 9.85859191,13.95665 9.54615434,13.6235279 L9.54615434,13.6235279 Z M12.587482,10.1187344 L13.5903969,9.19188244 C12.9581264,8.63041339 12.1345735,8.28881229 11.2339411,8.28270495 L11.2339411,9.65158659 C11.7413383,9.65700163 12.2093844,9.82992607 12.587482,10.1187344 L12.587482,10.1187344 Z M3.84368595,19.9850512 C3.08094462,19.9850512 2.46262061,19.3541637 2.46262061,18.5759245 C2.46262061,17.7976854 3.08094462,17.1667979 3.84368595,17.1667979 C4.60642728,17.1667979 5.2247513,17.7976854 5.2247513,18.5759245 C5.2247513,19.3541637 4.60642728,19.9850512 3.84368595,19.9850512 Z M20.8768252,12.4697089 C21.8938137,12.4697089 22.7182457,13.3108922 22.7182457,14.3485445 C22.7182457,15.3861967 21.8938137,16.2273801 20.8768252,16.2273801 C19.8598368,16.2273801 19.0354048,15.3861967 19.0354048,14.3485445 C19.0354048,13.3108922 19.8598368,12.4697089 20.8768252,12.4697089 Z" id="Shape" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/Viewport/Light.png b/Assets/Editor/Icons/Components/Viewport/Light.png
deleted file mode 100644
index 2f198954db..0000000000
--- a/Assets/Editor/Icons/Components/Viewport/Light.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b5339a51993cc176609f95c66829d1069affcb51034077ef9a970362aa4036da
-size 4651
diff --git a/Assets/Editor/Icons/Components/Viewport/Light.svg b/Assets/Editor/Icons/Components/Viewport/Light.svg
new file mode 100644
index 0000000000..c80990f24a
--- /dev/null
+++ b/Assets/Editor/Icons/Components/Viewport/Light.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Rendering / Light - box</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
+            <stop stop-color="#9D9D9D" offset="100%"></stop>
+        </linearGradient>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
+    </defs>
+    <g id="icon-/-Rendering-/-Light---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/general/color/-box-template">
+            <mask id="mask-3" fill="white">
+                <use xlink:href="#path-2"></use>
+            </mask>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#B29EDF">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="Rectangle-2" x="0" y="-0.00055502734" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+        <path d="M11.0039744,20.4705948 C11.5393978,21.1503288 13.4649954,21.1240649 13.8493579,20.4705948 L11.0039744,20.4705948 Z M12.4098795,18.9471874 C12.8523277,18.9471874 13.2948542,18.9522206 13.7372241,18.9438844 C13.8589659,18.941525 14.0228008,19.0217422 14.031329,18.6233302 C14.0400136,18.2162672 13.8775088,18.2727339 13.7527939,18.2719474 C12.8678975,18.2672288 11.9829228,18.2675433 11.0980264,18.2713183 C10.9715903,18.2719474 10.8095548,18.2255473 10.8223862,18.6296217 C10.8348264,19.0218995 10.9994438,18.9401094 11.1214984,18.9424688 C11.5508805,18.9506478 11.9804191,18.9456145 12.4098795,18.9471874 L12.4098795,18.9471874 Z M12.3797874,20.0090599 C12.8486026,20.0090599 13.3174177,20.0104378 13.7861546,20.0079576 C13.9060968,20.0074065 14.0347237,20.0052019 14.033173,19.7053785 C14.0316723,19.4032128 13.9001506,19.4123067 13.7822426,19.4120312 C12.8838106,19.4096888 11.9852222,19.4089999 11.086712,19.4112044 C10.9719336,19.41148 10.8321184,19.3802025 10.8209301,19.6778212 C10.8080204,20.0246298 10.9597281,20.0071309 11.090624,20.0080954 C11.5203973,20.0109889 11.9500923,20.0091977 12.3797874,20.0090599 L12.3797874,20.0090599 Z M13.2607657,13.4947637 C12.8423777,14.33615 12.9912741,15.5980916 12.9993731,16.7900821 C13.0002814,16.9251159 13.0659817,16.9582688 13.1924623,16.9452498 C13.596201,16.9036951 14.1723547,16.6033321 14.2230681,16.1863474 C14.3123841,15.4519879 14.5085766,14.7623622 14.9058059,14.1261747 C15.1081294,13.8022149 15.4106261,13.4539499 15.7053802,13.1295359 C16.2802575,12.5331621 16.3863751,11.6125545 16.282181,11.1194792 C16.1343075,10.4197004 15.8025237,9.83930799 15.3809974,9.26465773 C14.5181894,8.08848671 13.3847841,7.39764992 11.9494452,7.51746964 C10.1519223,7.66756599 8.93608888,8.752453 8.22519383,10.380654 C7.93143491,11.0536276 7.82338977,11.8171831 8.09064542,12.4952166 C8.27274784,12.7688913 8.44538055,13.0085133 8.64543332,13.2286243 C9.38138228,14.0383725 9.92726975,14.9343334 10.0408828,16.0513893 C10.097273,16.606057 10.243509,16.7726541 10.7758477,16.9037519 C11.0066313,16.9606719 10.9940011,16.9911189 11.2299317,17.0267696 C11.4405056,17.0586358 11.5379963,17.0083766 11.5475335,16.75428 C11.5882555,15.6633377 11.4969715,14.6108467 11.0690872,13.5781111 C10.865931,13.0877813 10.6415761,12.4372614 10.5233511,12.1323409 C10.4051261,11.8274204 10.3156207,11.6908656 10.6150333,11.5694299 C10.9144459,11.4479943 11.0056578,11.7906463 11.0802895,12.0394533 C11.0986069,12.2095322 11.1946594,12.2732645 11.3625433,12.2645599 C11.5379206,12.2554013 12.013591,12.2747973 12.1886866,12.2747973 C12.6309555,12.2747973 12.5785397,12.2645599 13.0031142,12.2645599 C13.1924623,12.2747973 13.2726196,12.0804781 13.3015338,12.0270399 C13.4098484,11.8264572 13.3755601,11.4516327 13.7381227,11.5354232 C14.1248308,11.624815 13.9705714,11.9055741 13.8822394,12.1594244 C13.7618604,12.4690754 13.6791537,12.6533774 13.2607657,13.4947637 Z M13.059965,12.9584771 C13.1175824,12.7896262 13.1342274,12.6776725 12.8985565,12.6807935 C12.4208926,12.6871154 11.9430688,12.6852748 11.465405,12.6815937 C11.2670253,12.6800733 11.2473679,12.7651457 11.3079976,12.9322292 C11.465405,13.3660132 11.770323,14.3349715 11.9334121,14.7679018 C11.9334121,15.4766571 11.9554987,15.6348818 11.9334121,16.3511774 C11.9260499,16.5900493 11.9317316,16.7591709 11.9334121,16.9983629 C11.9343724,17.1280819 11.9744652,17.3020965 12.1866091,17.3078583 C12.415398,17.3141002 12.4692272,17.1912714 12.4683469,17.0392256 C12.4637856,16.2821977 12.4609847,15.5250098 12.4576237,14.7679018 C12.6576839,14.1645202 12.8543832,13.5599381 13.059965,12.9584771 Z M17.0110834,10.4301747 C17.1345606,10.9103993 17.1209393,11.2191923 17.0895699,11.7117406 C16.9279743,13.2144364 16.112733,13.7535753 15.5561654,14.6554468 C15.1950967,15.240503 14.9633469,15.8726933 14.8982874,16.562661 C14.8592356,16.977906 14.6707695,17.3160081 14.3141021,17.5263114 C14.0276159,17.6951623 13.8810512,17.659675 13.5698375,17.7839524 C13.7525325,17.7839524 13.9012002,17.815694 14.0804475,17.868768 C14.3564163,17.9504805 14.6827562,18.109812 14.5827261,18.6695005 C14.4963,19.1523659 14.4265891,18.9822162 14.5827261,19.4085753 C14.6799129,19.673961 14.5116974,20.4812898 14.0804475,20.9316398 C13.6491977,21.3819899 13.2534311,21.4608118 12.9315742,21.4766565 C12.3888508,21.5035446 11.8342986,21.5614912 11.3081402,21.3752751 C10.5694378,21.1139964 10.101697,20.2008415 10.2788703,19.4271686 C10.3137608,19.2748828 10.274549,19.1440434 10.2396585,19 C10.101857,18.4315889 10.4387848,17.9814882 10.9349341,17.8158383 C10.5318528,17.7075657 10.1458966,17.6426662 9.83916424,17.38971 C9.63086153,17.2178983 9.4278404,17.0252803 9.40751428,16.7446358 C9.3265299,15.6241385 8.8586658,14.593961 8.16377984,13.8166343 C7.76979732,13.37591 7.49372655,13 7.25810683,12.2575729 C6.6568058,10.4026945 7.85144581,8.63443412 9.21073504,7.62597051 C12.1994748,5.40874298 16.1994791,7.27202395 17.0110834,10.4301747 Z M21.2967102,11.0432284 C21.5148559,11.0458692 21.654818,11.2283241 21.6396935,11.4563128 C21.6252891,11.6753387 21.5081338,11.832586 21.2600592,11.8329061 C20.3166551,11.8337864 19.3732511,11.8365873 18.4298471,11.8313057 C18.0502928,11.829145 18.0241516,11.7207879 18.0339946,11.4371825 C18.0438376,11.1535771 18.1457663,11.0432284 18.3706075,11.0432284 C19.36705,11.0432284 20.3012105,11.0310647 21.2967102,11.0432284 Z M2.81444431,11.0548988 C3.85907881,11.0568194 4.56656903,11.0568194 5.69165542,11.1146174 C5.89611697,11.1146174 6.0342204,11.2710548 6.00509137,11.5007759 C5.97596234,11.730497 5.75573959,11.8351247 5.5327827,11.8344341 C4.62666687,11.8316273 3.7206154,11.834194 2.81444431,11.834194 C2.62377423,11.834194 2.54911919,11.8220304 2.47218127,11.747768 C2.39524335,11.6735056 2.36086775,11.3551863 2.46689968,11.1441627 C2.53994244,11.0398749 2.74050205,11.0548188 2.81444431,11.0548988 Z M20.4365886,4.47417829 C20.5631867,4.54291898 20.627366,4.65543286 20.6171229,4.84276926 C20.5991975,4.88030056 20.5814322,4.96624643 20.5296566,5.01866221 C19.8412093,5.7158321 19.1502813,6.4106813 18.4542317,7.1002489 C18.2899423,7.26293788 18.092923,7.28454439 17.9255926,7.10585059 C17.757382,6.9261965 17.8048362,6.7388601 17.9664049,6.57657124 C18.6327655,5.90692964 19.3012868,5.23936866 19.9689278,4.57092742 C20.1037684,4.4360068 20.2574946,4.37686899 20.4365886,4.47417829 Z M4.75616242,4.5290507 C5.51255014,5.21325669 6.22180367,5.94587725 6.92177441,6.68714042 C6.96282677,6.73067353 6.96866853,6.80741663 6.98083219,6.8408667 C6.98043207,7.02028072 6.91065106,7.13047389 6.78189229,7.19233251 C6.59991751,7.27971882 6.45155284,7.21097813 6.31751249,7.07597748 C5.85897444,6.61391838 5.3971554,6.15506023 4.93685682,5.6946016 C4.7208718,5.47853655 4.49976523,5.2671129 4.29194266,5.04336554 C4.14517848,4.88523793 4.14229761,4.70582392 4.2910624,4.54313494 C4.43670625,4.38372695 4.62108175,4.40685391 4.75616242,4.5290507 Z M12.381869,1.32250507 C12.6513101,1.34379148 12.8546513,1.513764 12.8546513,1.78536442 C12.8546513,2.6733431 12.7846302,4.59108912 12.7508601,4.67367398 C12.6693955,4.87293397 12.5000646,4.93871378 12.2980037,4.91478657 C12.0927419,4.89037922 12.0012744,4.75041709 12.0005542,4.55755902 C11.9971932,3.58814717 11.9995139,2.61881534 11.9988737,1.64940349 C11.9987136,1.40653037 12.1484387,1.33346837 12.381869,1.32250507 Z" id="Combined-Shape" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/Viewport/Lightning.png b/Assets/Editor/Icons/Components/Viewport/Lightning.png
deleted file mode 100644
index 59eb65234f..0000000000
--- a/Assets/Editor/Icons/Components/Viewport/Lightning.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3c8ca059a17d6459033c6ab6ec394daafadf1b49e9163038d3af7ba61e8462cd
-size 4102
diff --git a/Assets/Editor/Icons/Components/Viewport/Lightning.svg b/Assets/Editor/Icons/Components/Viewport/Lightning.svg
new file mode 100644
index 0000000000..895c44fc60
--- /dev/null
+++ b/Assets/Editor/Icons/Components/Viewport/Lightning.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Environmental / Lighting - box</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
+            <stop stop-color="#9D9D9D" offset="100%"></stop>
+        </linearGradient>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
+    </defs>
+    <g id="icon-/-Environmental-/-Lighting---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/general/color/-box-template">
+            <mask id="mask-3" fill="white">
+                <use xlink:href="#path-2"></use>
+            </mask>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#8BDD15">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="Rectangle-2" x="0" y="0" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+        <polygon id="Path-30" fill="#FFFFFF" points="10.2528012 1.91197338 19.5426318 1.91197338 13.5102743 9.10078113 19.5426318 9.10078113 5.54756227 22.1433323 10.2528012 13.2086713 4.94432651 13.2086713"></polygon>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/Viewport/LightningArc.png b/Assets/Editor/Icons/Components/Viewport/LightningArc.png
deleted file mode 100644
index 72fd79ddb2..0000000000
--- a/Assets/Editor/Icons/Components/Viewport/LightningArc.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:89f34ac1cb1e4b457117cfc46adc2b827e9e85b7cb76b52a4fbd4a9d9e19311a
-size 4559
diff --git a/Assets/Editor/Icons/Components/Viewport/LightningArc.svg b/Assets/Editor/Icons/Components/Viewport/LightningArc.svg
new file mode 100644
index 0000000000..e13231d759
--- /dev/null
+++ b/Assets/Editor/Icons/Components/Viewport/LightningArc.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Rendering / LightningArc - box</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
+            <stop stop-color="#9D9D9D" offset="100%"></stop>
+        </linearGradient>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
+    </defs>
+    <g id="icon-/-Rendering-/-LightningArc---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/general/color/-box-template">
+            <mask id="mask-3" fill="white">
+                <use xlink:href="#path-2"></use>
+            </mask>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#B29EDF">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="Rectangle-2" x="0" y="-0.00055502734" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+        <path d="M16.4805626,15.3973272 C16.8031021,15.763174 17.0870239,16.0026461 17.3323279,16.1157437 C17.5776319,16.2288412 17.9656722,16.2991775 18.4964487,16.3267526 L15.4036622,21.3264389 C15.0972331,21.3900909 14.8770774,21.3898202 14.7431953,21.3256268 C14.6093132,21.2614334 14.4735172,21.0910334 14.3358072,20.8144268 L16.4805626,15.3973272 Z M7.51943741,15.216445 L9.6641928,20.6335446 C9.52648282,20.9101512 9.39068678,21.0805512 9.25680467,21.1447447 C9.12292256,21.2089381 8.90276695,21.2092087 8.59633783,21.1455567 L8.59633783,21.1455567 L5.50355129,16.1458704 C6.03432785,16.1182954 6.42236812,16.0479591 6.66767212,15.9348615 C6.91297612,15.821764 7.19689789,15.5822918 7.51943741,15.216445 L7.51943741,15.216445 Z M8.80508638,2.62602425 L11.0075597,7.33565202 L13.5189819,4.01571498 L15.0899278,6.97856217 L17.8943618,3.70728641 L19.0344185,10.0261604 C20.0552118,10.0381718 21.0256448,10.6306371 21.4720818,11.6241204 C22.0837692,12.9853453 21.4804563,14.5870926 20.1219837,15.2059776 C18.7565236,15.8280458 17.1475152,15.2204424 16.5326059,13.8520475 C15.9387556,12.5305164 16.4900789,10.9822858 17.7658011,10.326808 L16.5608945,8.80163643 L13.0360968,14.9660623 L12.5565006,8.40488812 L9.50233023,12.4434503 L8.32917886,8.47414178 L6.61972154,10.386682 C7.61515488,11.1314156 7.99745187,12.4915957 7.46739413,13.6711653 C6.85248483,15.0395602 5.24347636,15.6471637 3.87801633,15.0250954 C2.51954373,14.4062104 1.91623085,12.8044631 2.5279182,11.4432382 C3.0879353,10.1969982 4.47248948,9.58178254 5.74667522,9.95177821 L8.80508638,2.62602425 Z M19.2517843,11.2307019 L19.479075,12.4938063 L18.5291701,11.2907015 C18.4813591,11.3069412 18.4338893,11.3257296 18.3869212,11.3471271 C17.6209745,11.6960725 17.27836,12.6056866 17.624121,13.3751294 C17.967241,14.1386951 18.8581223,14.475115 19.6177665,14.1290408 C20.3837131,13.7800953 20.7263277,12.8704813 20.3805667,12.1010385 C20.1647234,11.6207094 19.7321216,11.3094092 19.2517843,11.2307019 Z M5.28360798,11.0593981 C4.61156088,10.9242822 3.91384957,11.264974 3.61943331,11.9201563 C3.27367234,12.6895991 3.61628685,13.5992131 4.38223349,13.9481586 C5.14187771,14.2942329 6.03275903,13.9578129 6.37587901,13.1942472 C6.68863098,12.4982613 6.4381688,11.6875903 5.82064286,11.2809041 L4.64200456,12.5998277 Z" id="Combined-Shape" fill="#FFFFFF" fill-rule="nonzero"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/Viewport/LookAt.png b/Assets/Editor/Icons/Components/Viewport/LookAt.png
deleted file mode 100644
index 76505009cc..0000000000
--- a/Assets/Editor/Icons/Components/Viewport/LookAt.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3572d39f9042596d2a73d6d32c54cefc662e1fc6eef0c1bb6e4955ab34d2152b
-size 4569
diff --git a/Assets/Editor/Icons/Components/Viewport/LookAt.svg b/Assets/Editor/Icons/Components/Viewport/LookAt.svg
new file mode 100644
index 0000000000..d7090e4782
--- /dev/null
+++ b/Assets/Editor/Icons/Components/Viewport/LookAt.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Gameplay / LookAt - box</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
+            <stop stop-color="#9D9D9D" offset="100%"></stop>
+        </linearGradient>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
+    </defs>
+    <g id="icon-/-Gameplay-/-LookAt---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/general/color/-box-template">
+            <mask id="mask-3" fill="white">
+                <use xlink:href="#path-2"></use>
+            </mask>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#65C98C">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="Rectangle-2" x="0" y="0" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+        <path d="M14.2559026,1.88023205 L13.5099928,4.87817679 L11.7612182,6.17233976 C12.9270679,7.45423212 13.5099928,9.39678553 13.5099928,12 C13.5099928,14.6032145 12.6987801,16.7035556 11.0763549,18.3010235 L12.5635715,19.7320409 L12.5635715,22.119768 C10.3199503,20.7494942 8.48824877,19.4765794 7.06846702,18.3010235 C5.64868527,17.1254676 3.59849,15.184236 0.917881228,12.4773286 L0.917881228,11.0627198 L8.38092366,4.87817679 L14.2559026,1.88023205 Z M14.7911976,14.2690899 L21.4147725,17.806502 L21.2804047,18.3614758 L21.2804047,18.3614758 L21.1349228,18.9262701 L14.7096043,15.0462071 C14.7437593,14.884978 14.7709571,14.6259389 14.7911976,14.2690899 Z M10.7928135,6.83802235 C9.39839605,7.21963409 8.24864656,7.72828887 7.34356504,8.36398667 C6.43848353,8.99968447 5.13842613,10.2116889 3.44339286,12 C4.76069149,13.7430881 5.78817532,14.9100279 6.52584433,15.5008192 C7.20204094,16.042378 8.15329421,16.5151387 9.37960415,16.9191013 L9.72087191,17.0275671 L10.7928135,15.5008192 C8.97633095,14.8213606 8.06808967,13.6544208 8.06808967,12 C8.06808967,10.4092107 9.04677789,9.36673997 11.0041543,8.87258771 L11.2437372,8.81592137 L10.7928135,6.83802235 Z M20.0532593,9.50362742 L23.16934,12.1431311 L20.0532593,14.7826347 L20.0528122,12.8258067 L15.0330202,12.7807274 L15.0330202,11.158635 L20.0528122,11.158635 L20.0532593,9.50362742 Z M20.8714732,5.07372992 C21.0284802,5.56712123 21.1711523,6.04841163 21.2994894,6.51760113 L14.7870726,9.83956091 C14.7712654,9.58161554 14.7515774,9.37795191 14.7280086,9.22857002 L14.7096043,9.12671142 L20.8714732,5.07372992 Z" id="Combined-Shape" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/Viewport/LuaScript.svg b/Assets/Editor/Icons/Components/Viewport/LuaScript.svg
new file mode 100644
index 0000000000..5bdf58047c
--- /dev/null
+++ b/Assets/Editor/Icons/Components/Viewport/LuaScript.svg
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Scripting / Lua Script - box</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
+            <stop stop-color="#9D9D9D" offset="100%"></stop>
+        </linearGradient>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
+        <path d="M10.2240613,1.73746441 L10.2240613,3.52757639 C8.48778345,3.57236944 7.09327909,4.26660794 7.09327909,5.70745128 L7.09327909,7.84579578 C7.09327909,9.45088033 6.25157443,11.3305517 4.56813985,11.6217066 L4.56813985,11.7560851 C6.25157443,12.04724 7.09327909,13.6204375 7.09327909,15.2255221 L7.09327909,17.6803403 C7.09327909,18.4418223 7.31408502,18.9942617 7.75570351,19.3376752 C8.197322,19.6810886 9.37102043,19.9088267 10.2240613,19.9237577 L10.2240613,21.7374644 C8.78974481,21.7225334 7.04393546,21.4808081 6.25883592,20.8462398 C5.47373639,20.2116715 4.6575518,19.1727085 4.6575518,18.0230201 L4.6575518,14.8962291 C4.6575518,14.1198161 4.41976079,13.5655104 3.94417165,13.2332952 C3.46858251,12.90108 2.77785626,12.7349749 1.87197218,12.7349749 L1.87197218,10.4216594 C2.8533466,10.4067284 3.56294515,10.2275589 4.00078912,9.88414543 C4.43863309,9.540732 4.6575518,9.01068877 4.6575518,8.29399986 L4.6575518,5.33545009 C4.6575518,4.17829611 5.48883423,3.42556366 6.3041299,2.78352984 C7.11942557,2.14149602 8.85013708,1.73746441 10.2240613,1.73746441 Z M13.5198831,1.73746441 C14.8938073,1.73746441 16.6245188,2.14149602 17.4398145,2.78352984 C18.2551101,3.42556366 19.0863926,4.17829611 19.0863926,5.33545009 L19.0863926,5.33545009 L19.0863926,8.29399986 C19.0863926,9.01068877 19.3053113,9.540732 19.7431552,9.88414543 C20.1809992,10.2275589 20.8905978,10.4067284 21.8719722,10.4216594 L21.8719722,10.4216594 L21.8719722,12.7349749 C20.9660881,12.7349749 20.2753619,12.90108 19.7997727,13.2332952 C19.3241836,13.5655104 19.0863926,14.1198161 19.0863926,14.8962291 L19.0863926,14.8962291 L19.0863926,18.0230201 C19.0863926,19.1727085 18.270208,20.2116715 17.4851084,20.8462398 C16.7000089,21.4808081 14.9541996,21.7225334 13.5198831,21.7374644 L13.5198831,21.7374644 L13.5198831,19.9237577 C14.3729239,19.9088267 15.5466224,19.6810886 15.9882408,19.3376752 C16.4298593,18.9942617 16.6506653,18.4418223 16.6506653,17.6803403 L16.6506653,17.6803403 L16.6506653,15.2255221 C16.6506653,13.6204375 17.4923699,12.04724 19.1758045,11.7560851 L19.1758045,11.7560851 L19.1758045,11.6217066 C17.4923699,11.3305517 16.6506653,9.45088033 16.6506653,7.84579578 L16.6506653,7.84579578 L16.6506653,5.70745128 C16.6506653,4.26660794 15.2561609,3.57236944 13.5198831,3.52757639 L13.5198831,3.52757639 Z" id="path-4"></path>
+    </defs>
+    <g id="icon-/-Scripting-/-Lua-Script---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/general/color/-box-template">
+            <mask id="mask-3" fill="white">
+                <use xlink:href="#path-2"></use>
+            </mask>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#D8D872">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="Rectangle-2" x="0" y="0" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+        <mask id="mask-5" fill="white">
+            <use xlink:href="#path-4"></use>
+        </mask>
+        <use id="Combined-Shape" fill="#FFFFFF" xlink:href="#path-4"></use>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/Viewport/Mannequin.png b/Assets/Editor/Icons/Components/Viewport/Mannequin.png
deleted file mode 100644
index 00d6a2a35d..0000000000
--- a/Assets/Editor/Icons/Components/Viewport/Mannequin.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7cb59ad46da631fc394858781f4c000c5b1a74ef2fade85fec28994cfd898cbe
-size 5325
diff --git a/Assets/Editor/Icons/Components/Viewport/Mannequin.svg b/Assets/Editor/Icons/Components/Viewport/Mannequin.svg
new file mode 100644
index 0000000000..c99daf489d
--- /dev/null
+++ b/Assets/Editor/Icons/Components/Viewport/Mannequin.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Animation / Mannequin - box</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
+            <stop stop-color="#9D9D9D" offset="100%"></stop>
+        </linearGradient>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
+    </defs>
+    <g id="icon-/-Animation-/-Mannequin---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/general/color/-box-template">
+            <mask id="mask-3" fill="white">
+                <use xlink:href="#path-2"></use>
+            </mask>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#5AA9D2">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="UI" x="0" y="0" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+        <path d="M19.4327549,4.10611099 L19.4327549,19.7994767 C19.2482987,19.8115609 18.7806422,19.8692451 18.5502145,19.8843503 L18.5502145,19.8843503 L18.5502145,18.0739613 L16.1187459,18.0739613 L16.1187459,19.8442887 L15.5154132,19.8442887 L15.5154132,16.7634881 L8.5079014,16.7634881 L8.5079014,19.8618895 L7.90080425,19.8618895 L7.90080425,18.0654236 L5.47344233,18.0654236 L5.47344233,19.8511189 L4.5672451,19.893889 L4.5672451,4.19671416 C4.75500945,4.18607485 5.21666373,4.13397893 5.44777588,4.12084399 L5.44777588,4.12084399 L5.44777588,5.92952547 L7.88015702,5.92952547 L7.88015702,4.15643968 L8.47413575,4.15643968 L8.47413575,7.21727516 L15.4781113,7.21727516 L15.4781113,4.15972342 C15.6967894,4.14619443 15.8702946,4.13542378 16.1051712,4.12097534 L16.1051712,4.12097534 L16.1051712,5.95632075 L18.5048134,5.95632075 L18.5048134,4.15315595 L19.4327549,4.10611099 Z M7.86361641,15.7942608 L5.49694139,15.7942608 L5.49694139,17.2253127 L7.86361641,17.225444 L7.86361641,15.7942608 Z M18.5037867,15.8404958 L16.1417887,15.8404958 L16.1417887,17.219796 L18.5037867,17.219796 L18.5037867,15.8404958 Z M15.4279191,8.00668516 L8.56083132,8.00668516 L8.56083132,15.9990345 L15.4279191,15.9990345 L15.4279191,8.00668516 Z M18.4912387,13.5652612 L16.1324347,13.5652612 L16.1324347,14.9856738 L18.4912387,14.9858051 L18.4912387,13.5652612 Z M7.85608759,13.5244115 L5.50196061,13.5244115 L5.50196061,14.9840976 L7.85608759,14.9840976 L7.85608759,13.5244115 Z M18.4842802,11.2814888 L16.1244496,11.2814888 L16.1244496,12.7403868 L18.4842802,12.7405182 L18.4842802,11.2814888 Z M7.85232318,11.2772857 L5.49272068,11.2772857 L5.49272068,12.7277773 L7.85232318,12.7277773 L7.85232318,11.2772857 Z M18.4966001,9.04079913 L16.1268451,9.04079913 L16.1268451,10.4684359 L18.4966001,10.4684359 L18.4966001,9.04079913 Z M7.86464307,9.03370626 L5.49386142,9.03370626 L5.49386142,10.465809 L7.86464307,10.465809 L7.86464307,9.03370626 Z M18.4999082,6.79288519 L16.1440701,6.79288519 L16.1440701,8.21526804 L18.4999082,8.21526804 L18.4999082,6.79288519 Z M7.87205782,6.7798816 L5.5159916,6.7798816 L5.5159916,8.17402432 L7.87205782,8.17402432 L7.87205782,6.7798816 Z" id="Page-1" fill="#FFFFFF" transform="translate(12.000000, 12.000000) rotate(45.000000) translate(-12.000000, -12.000000) "></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/Viewport/MannequinScopeContext.png b/Assets/Editor/Icons/Components/Viewport/MannequinScopeContext.png
deleted file mode 100644
index b7c5c65daa..0000000000
--- a/Assets/Editor/Icons/Components/Viewport/MannequinScopeContext.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2ae7731eb2bcbf49c07b38affcc462958cb052b0c7ab99eff15b19be6250076e
-size 4527
diff --git a/Assets/Editor/Icons/Components/Viewport/Mesh.svg b/Assets/Editor/Icons/Components/Viewport/Mesh.svg
new file mode 100644
index 0000000000..cc2cf6af48
--- /dev/null
+++ b/Assets/Editor/Icons/Components/Viewport/Mesh.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Rendering / StaticMesh - box</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
+            <stop stop-color="#9D9D9D" offset="100%"></stop>
+        </linearGradient>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
+    </defs>
+    <g id="icon-/-Rendering-/-StaticMesh---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/general/color/-box-template">
+            <mask id="mask-3" fill="white">
+                <use xlink:href="#path-2"></use>
+            </mask>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#B29EDF">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="Rectangle-2" x="0" y="-0.00055502734" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+        <path d="M11.6374916,1.77902411 C14.0067933,1.77902411 16.0886658,2.79972705 17.8619233,4.48605498 C18.4756091,5.06965634 19.008426,5.69361462 19.4594847,6.31819039 C19.7321984,6.69581389 19.9190809,6.99335974 20.0183078,7.1713447 L20.2728714,7.62795986 L19.8437441,7.92653956 C19.7976997,7.95857651 19.6998319,8.03703817 19.5672353,8.16206989 C19.3379991,8.37822758 19.1070197,8.64170092 18.8907832,8.95249242 C18.2696785,9.84519122 17.8970598,10.9333346 17.8970598,12.2334762 C17.8970598,12.975499 18.017844,13.6171163 18.2355029,14.1689019 L18.2403389,14.1707023 L18.2399254,14.1800676 C18.3996134,14.5815904 18.6107385,14.935374 18.864027,15.2455198 C19.2168449,15.6775371 19.561386,15.9291033 19.7650812,16.0274849 L20.3164873,16.2938055 L20.0183078,16.8286553 C19.9190809,17.0066403 19.7321984,17.3041861 19.4594847,17.6818096 C19.008426,18.3063854 18.4756091,18.9303437 17.8619233,19.513945 C16.0886658,21.200273 14.0067933,22.2209759 11.6374916,22.2209759 C9.26818991,22.2209759 7.18631733,21.200273 5.41305989,19.513945 C4.79937413,18.9303437 4.26655723,18.3063854 3.81549852,17.6818096 C3.54278482,17.3041861 3.3559023,17.0066403 3.25667543,16.8286553 L2.93144984,16.2452925 L3.55568048,16.0077637 C3.74542684,15.9355625 4.0761493,15.7221825 4.41852755,15.3200416 C5.01460546,14.6199173 5.37792336,13.616206 5.37792336,12.2277275 C5.37792336,10.8271229 5.00616719,9.72293824 4.39037167,8.87184037 C4.0298524,8.37356265 3.67831059,8.07378427 3.46832347,7.95029628 L2.9818878,7.66423605 L3.25667543,7.1713447 C3.3559023,6.99335974 3.54278482,6.69581389 3.81549852,6.31819039 C4.26655723,5.69361462 4.79937413,5.06965634 5.41305989,4.48605498 C7.18631733,2.79972705 9.26818991,1.77902411 11.6374916,1.77902411 Z M11.6509858,20.3270374 L10.3857845,20.9512591 C10.7931996,21.0269292 11.2104944,21.0660634 11.6374916,21.0660634 C12.0711606,21.0660634 12.4948217,21.0256968 12.908289,20.9476853 L11.6509858,20.3270374 Z M9.54162148,17.0476359 L7.80298584,17.9030374 L7.80298584,19.8670374 L9.54162148,20.7229446 L11.2799858,19.8660374 L11.2799858,17.9040374 L9.54162148,17.0476359 Z M13.7614942,17.0476359 L12.0229858,17.9030374 L12.0229858,19.8670374 L13.7614942,20.7229446 L15.4989858,19.8670374 L15.4989858,17.9030374 L13.7614942,17.0476359 Z M5.32174877,17.0476359 L4.90144984,17.2050241 L5.00772268,17.3472845 C5.3609877,17.8020547 5.76210238,18.2521148 6.20893517,18.6770427 C6.48520318,18.9397674 6.76884555,19.183796 7.05975864,19.4076097 L7.05998584,17.9040374 L5.32174877,17.0476359 Z M17.9813669,17.0476359 L16.2419858,17.9040374 L16.2421956,19.3867855 C16.5236755,19.1686835 16.7983244,18.9316419 17.066048,18.6770427 C17.5716746,18.1962032 18.0187605,17.6831828 18.4042171,17.1675718 L17.9813669,17.0476359 Z M7.31915519,13.5924518 L6.30643851,14.0926136 C6.11617634,14.809726 5.8117234,15.4190034 5.41500254,15.925364 L5.41517314,16.3301924 L7.31915519,17.2677605 L9.05698584,16.4120374 L9.05698584,14.4470374 L7.31915519,13.5924518 Z M11.5390279,13.5924518 L9.79998584,14.4480374 L9.79998584,16.4110374 L11.5390279,17.2677605 L13.2769858,16.4120374 L13.2769858,14.4470374 L11.5390279,13.5924518 Z M15.7589006,13.5924518 L14.0199858,14.4470374 L14.0199858,16.4120374 L15.7589006,17.2677605 L17.6628826,16.3301924 L17.6626161,15.5589125 C17.3981168,15.1584486 17.1839552,14.7117929 17.0289896,14.2180202 L15.7589006,13.5924518 Z M9.54162148,10.1372677 L7.80298584,10.9920374 L7.80298584,12.9560374 L9.54162148,13.8125764 L11.2799858,12.9550374 L11.2799858,10.9930374 L9.54162148,10.1372677 Z M13.7614942,10.1372677 L12.0229858,10.9920374 L12.0229858,12.9560374 L13.7614942,13.8125764 L15.4989858,12.9560374 L15.4989858,10.9920374 L13.7614942,10.1372677 Z M16.929326,10.5689312 L16.2419858,10.9760374 L16.2419858,12.9720374 L16.8216119,13.3163363 C16.7693535,12.9740217 16.7421473,12.6131433 16.7421473,12.2334762 C16.7421473,11.6449304 16.807295,11.0900084 16.929326,10.5689312 Z M6.53283589,12.2277275 C6.53283589,12.6017536 6.50952462,12.9559407 6.46454417,13.2906571 L7.05998584,12.9640374 L7.05998584,10.9840374 L6.3733863,10.6098538 C6.47759228,11.1117231 6.53283589,11.6508264 6.53283589,12.2277275 Z M7.31915519,6.6820836 L5.41517314,7.61965171 L5.41444984,8.32302411 L5.47308237,8.40767149 C5.74552371,8.82100882 5.97225389,9.27744802 6.14514378,9.77771901 L7.31915519,10.3573923 L9.05698584,9.50103744 L9.05698584,7.53703744 L7.31915519,6.6820836 Z M11.5390279,6.6820836 L9.79998584,7.53803744 L9.79998584,9.50003744 L11.5390279,10.3573923 L13.2769858,9.50103744 L13.2769858,7.53703744 L11.5390279,6.6820836 Z M15.7589006,6.6820836 L14.0199858,7.53703744 L14.0199858,9.50103744 L15.7589006,10.3573923 L17.2211405,9.63575541 C17.3464224,9.31934178 17.4942934,9.0177639 17.6623696,8.73108554 L17.6628826,7.61965171 L15.7589006,6.6820836 Z M18.672869,7.20613073 L18.2399858,7.41803744 L18.2405347,7.89539028 C18.4198491,7.67328235 18.5952696,7.48547202 18.7579794,7.3311885 C18.7313256,7.29141009 18.7029522,7.24968413 18.672869,7.20613073 Z M6.20893517,5.3229573 C5.74936372,5.75999941 5.33815428,6.22362699 4.97762595,6.69162137 L5.32174877,6.90220825 L7.05998584,6.04503744 L7.05975864,4.5923903 C6.76884555,4.81620404 6.48520318,5.06023264 6.20893517,5.3229573 Z M9.31062813,3.33967853 L7.80298584,4.08203744 L7.80298584,6.04603744 L9.54162148,6.90220825 L11.2799858,6.04503744 L11.2799858,4.08303744 L9.58590325,3.24748744 C9.4935959,3.27632025 9.40183677,3.30706174 9.31062813,3.33967853 Z M13.7071325,3.25315279 L12.0229858,4.08203744 L12.0229858,6.04603744 L13.7614942,6.90220825 L15.4989858,6.04603744 L15.4996369,4.09263093 C15.4716509,4.07502419 15.4436034,4.05760087 15.4154945,4.04036219 L14.088653,3.38541509 C13.9625435,3.33770229 13.835368,3.29358497 13.7071325,3.25315279 Z M16.2431937,4.61398797 L16.2419858,6.04503744 L17.9813669,6.90220825 L18.3314498,6.73902411 L18.2672605,6.65271553 C17.9139955,6.19794525 17.5128808,5.74788524 17.066048,5.3229573 C16.7986408,5.06865909 16.5243247,4.83187689 16.2431937,4.61398797 Z M11.6374916,2.93393664 C11.2363934,2.93393664 10.8438564,2.96846745 10.4600274,3.03537564 L11.6509858,3.62203744 L12.8358702,3.03905496 C12.4453891,2.96973373 12.0458779,2.93393664 11.6374916,2.93393664 Z" id="Combined-Shape" fill="#FFFFFF" fill-rule="nonzero"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/Viewport/MeshCollider.png b/Assets/Editor/Icons/Components/Viewport/MeshCollider.png
deleted file mode 100644
index c0c473c299..0000000000
--- a/Assets/Editor/Icons/Components/Viewport/MeshCollider.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:35cda4408284f3925feda998465eaa0351467e8f0ed449b516cdf1dee0905be1
-size 4191
diff --git a/Assets/Editor/Icons/Components/Viewport/MeshCollider.svg b/Assets/Editor/Icons/Components/Viewport/MeshCollider.svg
new file mode 100644
index 0000000000..3b2246b0d7
--- /dev/null
+++ b/Assets/Editor/Icons/Components/Viewport/MeshCollider.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Physics / Cry / MeshCollider - box</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
+            <stop stop-color="#9D9D9D" offset="100%"></stop>
+        </linearGradient>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
+    </defs>
+    <g id="icon-/-Physics-/-Cry-/-MeshCollider---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/general/color/-box-template">
+            <mask id="mask-3" fill="white">
+                <use xlink:href="#path-2"></use>
+            </mask>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#DD7F6D">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="Rectangle-2" x="0" y="0" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+        <path d="M21.4017278,2.55458948 C21.6565254,2.7943201 21.8126781,3.09535399 21.873713,3.44308416 C21.8903519,3.53789527 21.8960303,3.63278305 21.8933807,3.72897434 C21.8943391,4.16867858 21.7295219,4.54247893 21.4299066,4.85739135 C21.3224821,4.97029823 21.1966168,5.06610613 21.054496,5.13419531 C20.9948029,5.16279582 20.9715698,5.1972238 20.9715698,5.265543 C20.9732951,9.75421433 20.9732567,14.2428473 20.9719149,18.7315187 C20.9718765,18.7970775 20.9911608,18.8324639 21.0508922,18.8653583 C21.5132545,19.1198876 21.7904801,19.5097135 21.873368,20.0310404 C21.9576743,20.5611468 21.8055088,21.0257327 21.437766,21.4093094 C21.1897159,21.6680559 20.8803625,21.8258572 20.517412,21.8756589 C19.9918678,21.9477736 19.5412371,21.794803 19.1555135,21.4409386 C19.0379677,21.3331308 18.939016,21.2055019 18.8707352,21.0598923 C18.8386458,20.9914197 18.798007,20.9704869 18.7236303,20.970717 L17.3961982,20.9726003 L17.3961982,20.9726003 L16.068766,20.9724422 C12.4810494,20.9724422 8.89329444,20.9728256 5.3055778,20.9703719 C5.21429384,20.9702952 5.16736752,20.9962504 5.12021117,21.077298 C4.85786083,21.5279287 4.46999024,21.8000937 3.94858667,21.8748921 C3.41928537,21.9508407 2.95949177,21.79718 2.58304606,21.4285936 C2.09031968,20.9460653 1.9729272,20.2171738 2.25287491,19.6098536 C2.31594174,19.4730235 2.3915836,19.3441678 2.49463748,19.2327945 C2.55099507,19.1718746 2.5712378,19.1033254 2.57116112,19.0169488 L2.56913877,14.2727322 L2.56913877,14.2727322 L2.56901417,9.52851559 C2.56901417,8.01100117 2.56843909,6.49348675 2.57050937,4.97597232 C2.57062438,4.88702701 2.54509094,4.82204326 2.48570461,4.75399242 C2.25394839,4.48845999 2.13141855,4.1747744 2.11017902,3.82321037 C2.08594909,3.42245805 2.19080488,3.05755223 2.43766647,2.74014781 C2.74905175,2.33977887 3.16042383,2.12523664 3.66978912,2.10890444 C4.1004838,2.09510258 4.47819468,2.22993908 4.79697929,2.52265351 C4.83175231,2.55462782 4.87062755,2.57191848 4.91839732,2.56850635 C4.93748989,2.5671645 4.95673581,2.56831466 4.97590506,2.56831466 C9.65941264,2.56831466 14.3429202,2.56804629 19.0264661,2.57007823 C19.1169066,2.57011657 19.181507,2.53998251 19.2481777,2.48304984 C19.5214161,2.24979842 19.839894,2.12680852 20.1992024,2.10855939 C20.6642484,2.08490454 21.066726,2.23948536 21.4017278,2.55458948 Z M5.43746184,3.74137553 C5.44620512,3.86913295 5.44390624,3.9976441 5.4215958,4.12551457 C5.36193799,4.46755773 5.20791305,4.7633218 4.95872956,4.99939037 C4.62784162,5.31279174 4.22859027,5.46263348 3.76798522,5.44032304 C3.64079781,5.43418955 3.63179544,5.41922681 3.63153215,5.52189728 L3.6315599,18.4139944 L3.6315599,18.4139944 C3.6315599,18.4328376 3.63359497,18.4519447 3.63122072,18.4704865 C3.62292968,18.5357596 3.64833041,18.5582962 3.71552554,18.5557335 C3.86570645,18.5498544 4.0172064,18.5432592 4.16493769,18.5786846 C4.82241729,18.7364028 5.24333841,19.1380661 5.40260178,19.7988998 C5.42510065,19.8922494 5.46124206,19.9118466 5.55063456,19.9118466 L11.9991666,19.9099668 L11.9991666,19.9099668 L18.4947973,19.9101505 C18.5493674,19.9173487 18.5655727,19.8942845 18.578273,19.8396767 C18.7337301,19.1693836 19.142403,18.7436386 19.8157864,18.5859958 C19.9029177,18.5656074 19.9119248,18.5286745 19.9118871,18.4540929 L19.9105728,15.2274785 L19.9105728,15.2274785 L19.9105304,7.71440503 C19.9105304,6.98897657 19.9086084,6.2635858 19.9130258,5.53819502 C19.9135453,5.45128983 19.888333,5.42031148 19.8059879,5.40489768 C19.4741201,5.34294099 19.1930161,5.17896679 18.9690449,4.93227062 C18.6745999,4.60790245 18.5341044,4.22097461 18.553023,3.77842142 C18.5590576,3.63662576 18.576172,3.63012542 18.4673,3.63071589 L5.58142448,3.63084087 L5.58142448,3.63084087 C5.57200284,3.63084087 5.56235508,3.63212222 5.55315956,3.63061475 C5.4650484,3.61610543 5.43101744,3.64670691 5.43746184,3.74137553 Z M9.35789975,4.46855086 L9.35789975,6.97840081 C9.85924947,7.18134202 10.2595793,7.58167183 10.4625205,8.08302155 L12.7358213,8.08302155 C12.9387625,7.58167183 13.3390923,7.18134202 13.8404421,6.97840081 L13.8404421,4.46855086 L15.3404421,4.46855086 L15.3404421,6.97840081 C15.8417918,7.18134202 16.2421216,7.58167183 16.4450628,8.08302155 L19.160537,8.08302155 L19.160537,9.58302155 L16.4450628,9.58302155 C16.2421216,10.0843713 15.8417918,10.4847011 15.3404421,10.6876423 L15.3404421,12.741147 C15.8417918,12.9440882 16.2421216,13.344418 16.4450628,13.8457678 L19.2763345,13.8457678 L19.2763345,15.3457678 L16.4450628,15.3457678 C16.2421216,15.8471175 15.8417918,16.2474473 15.3404421,16.4503885 L15.3246535,19.0602275 L13.8246535,19.0602275 L13.8404421,16.4503885 C13.3390923,16.2474473 12.9387625,15.8471175 12.7358213,15.3457678 L10.4625205,15.3457678 C10.2595793,15.8471175 9.85924947,16.2474473 9.35789975,16.4503885 L9.3421112,19.0602275 L7.8421112,19.0602275 L7.85789975,16.4503885 C7.35655002,16.2474473 6.95622022,15.8471175 6.75327901,15.3457678 L4.4013749,15.3457678 L4.4013749,13.8457678 L6.75327901,13.8457678 C6.95622022,13.344418 7.35655002,12.9440882 7.85789975,12.741147 L7.85789975,10.6876423 C7.35655002,10.4847011 6.95622022,10.0843713 6.75327901,9.58302155 L4.28557734,9.58302155 L4.28557734,8.08302155 L6.75327901,8.08302155 C6.95622022,7.58167183 7.35655002,7.18134202 7.85789975,6.97840081 L7.85789975,4.46855086 L9.35789975,4.46855086 Z M12.7358213,9.58302155 L10.4625205,9.58302155 C10.2595793,10.0843713 9.85924947,10.4847011 9.35789975,10.6876423 L9.35789975,12.741147 C9.85924947,12.9440882 10.2595793,13.344418 10.4625205,13.8457678 L12.7358213,13.8457678 C12.9387625,13.344418 13.3390923,12.9440882 13.8404421,12.741147 L13.8404421,10.6876423 C13.3390923,10.4847011 12.9387625,10.0843713 12.7358213,9.58302155 Z" id="Combined-Shape" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/Viewport/MotionParameterSmoothing.png b/Assets/Editor/Icons/Components/Viewport/MotionParameterSmoothing.png
deleted file mode 100644
index dc98478033..0000000000
--- a/Assets/Editor/Icons/Components/Viewport/MotionParameterSmoothing.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b25a1a9b6bd273c7d9338007f21ad6b37e2b4e9c8e0fd2956a71dbe6e6f0bc01
-size 4725
diff --git a/Assets/Editor/Icons/Components/Viewport/Navigation.png b/Assets/Editor/Icons/Components/Viewport/Navigation.png
deleted file mode 100644
index 3c18f5087a..0000000000
--- a/Assets/Editor/Icons/Components/Viewport/Navigation.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bb999768f5f5d39335e1e03db21c4b22b07588d561623f809369fe1cfdb24239
-size 4733
diff --git a/Assets/Editor/Icons/Components/Viewport/Navigation.svg b/Assets/Editor/Icons/Components/Viewport/Navigation.svg
new file mode 100644
index 0000000000..97535f622f
--- /dev/null
+++ b/Assets/Editor/Icons/Components/Viewport/Navigation.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / AI / Navigation - box</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
+            <stop stop-color="#9D9D9D" offset="100%"></stop>
+        </linearGradient>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
+    </defs>
+    <g id="icon-/-AI-/-Navigation---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/general/color/-box-template">
+            <mask id="mask-3" fill="white">
+                <use xlink:href="#path-2"></use>
+            </mask>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#65C9C9">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="Rectangle-2" x="0" y="0" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+        <path d="M11.9996038,2.679588 C17.1471131,2.679588 21.3199938,6.85246872 21.3199938,11.999978 C21.3199938,17.1474872 17.1471131,21.3203679 11.9996038,21.3203679 C6.85209459,21.3203679 2.67921387,17.1474872 2.67921387,11.999978 C2.67921387,6.85246872 6.85209459,2.679588 11.9996038,2.679588 Z M11.9996038,3.71518688 C7.42404006,3.71518688 3.71481276,7.42441419 3.71481276,11.999978 C3.71481276,16.5755417 7.42404006,20.284769 11.9996038,20.284769 C16.5751676,20.284769 20.2843949,16.5755417 20.2843949,11.999978 C20.2843949,7.42441419 16.5751676,3.71518688 11.9996038,3.71518688 Z M16.1789855,7.98940493 L11.8219983,17.7926263 L11.2773748,12.8910156 L6.37576417,12.3463922 L16.1789855,7.98940493 Z" id="Combined-Shape" fill="#FFFFFF" fill-rule="nonzero"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/Viewport/NavigationArea.png b/Assets/Editor/Icons/Components/Viewport/NavigationArea.png
deleted file mode 100644
index 7076d6e1d9..0000000000
--- a/Assets/Editor/Icons/Components/Viewport/NavigationArea.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bd604dbd1f5cc4f64d0eaa3cdfe5214bd08daefca612bb3416f8126fe0adfb34
-size 4981
diff --git a/Assets/Editor/Icons/Components/Viewport/NavigationArea.svg b/Assets/Editor/Icons/Components/Viewport/NavigationArea.svg
new file mode 100644
index 0000000000..aaafaed249
--- /dev/null
+++ b/Assets/Editor/Icons/Components/Viewport/NavigationArea.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / AI / NavigationArea - box</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
+            <stop stop-color="#9D9D9D" offset="100%"></stop>
+        </linearGradient>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
+    </defs>
+    <g id="icon-/-AI-/-NavigationArea---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/general/color/-box-template">
+            <mask id="mask-3" fill="white">
+                <use xlink:href="#path-2"></use>
+            </mask>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#65C9C9">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="Rectangle-2" x="0" y="0" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+        <path d="M20.7255907,11.98644 C20.6698294,11.98644 20.614135,11.986373 20.5584406,11.98644 C20.048288,11.987511 20.048288,11.987511 20.0328248,12.4954546 C20.0150856,13.0828563 20.0150856,13.0828563 20.7250552,13.1908312 C21.3362208,13.2838783 21.3406389,13.2802635 21.3679505,12.6685624 C21.3984754,11.9846326 21.3984754,11.9846326 20.7255907,11.98644 M3.30502783,12.0733955 C3.39379077,12.0733955 3.48429416,12.0618818 3.57084806,12.0754707 C3.87141034,12.1224628 3.98480733,12.0283446 4.00154242,11.6971906 C4.03936374,10.9485964 4.06312757,10.9498013 3.28769028,10.8601012 C2.7409213,10.7968426 2.7409213,10.7968426 2.67264212,11.3264079 C2.57564552,12.0780813 2.57564552,12.0780813 3.30502783,12.0733955 M6.78960899,18.158811 C6.74837372,18.0035093 6.61703671,17.944334 6.51937071,17.8609263 C6.3354855,17.7038842 6.20066759,17.3809639 5.9888013,17.4008452 C5.78891735,17.4196554 5.61179312,17.6844715 5.425565,17.84225 C4.98248666,18.2175847 4.98275442,18.2178524 5.40869602,18.6417858 C5.93785968,19.1684057 5.93819438,19.1687404 6.41614865,18.6199632 C6.51127092,18.5107835 6.60364864,18.3991939 6.69562471,18.2873365 C6.73029982,18.2450971 6.76035605,18.1991091 6.78960899,18.158811 M5.8705846,6.81074413 C5.76361389,6.6294696 5.60021243,6.52925986 5.45702697,6.40957047 C4.84927532,5.90182773 4.84860592,5.90256408 4.39126928,6.55302369 C4.07952796,6.99630285 4.0757793,7.00239442 4.54603543,7.28635549 C4.76319,7.41749168 4.97097292,7.67963018 5.20104698,7.64448649 C5.43808285,7.60833868 5.50140844,7.25911075 5.67833185,7.07576107 C5.75323813,6.9980433 5.80699125,6.89990871 5.8705846,6.81074413 M17.1426072,19.8334583 C17.1656347,19.8221454 17.1983685,19.8119035 17.2242075,19.7925578 C17.4991986,19.5871847 17.7714451,19.3781299 18.0480427,19.1748989 C18.1619752,19.0912235 18.1309818,19.0231451 18.0524608,18.9350516 C17.8385863,18.6953381 17.6282596,18.4521437 17.4226188,18.2053346 C17.3358641,18.1013092 17.2678527,18.0899294 17.1467575,18.1695884 C16.3353063,18.7037726 16.3332312,18.7006264 16.8646038,19.5152238 C16.9130687,19.5893937 16.962136,19.663229 17.0100653,19.7378005 C17.0402554,19.7848596 17.0711149,19.8301113 17.1426072,19.8334583 M4.16086051,9.78470412 C4.26046779,9.81134639 4.30029731,9.75371073 4.32955026,9.67224429 C4.42293208,9.41198012 4.51464039,9.15091266 4.61585424,8.89359386 C4.66525623,8.76801372 4.61170393,8.70857067 4.50694225,8.66231487 C4.22338282,8.53700249 3.9394887,8.41235951 3.65787055,8.28276295 C3.52519472,8.22178027 3.42572133,8.2264661 3.3696253,8.38223635 C3.26466279,8.67369473 3.1547467,8.96341267 3.05092218,9.25533964 C3.01524296,9.35561632 3.00613907,9.45803509 3.13961817,9.49659275 C3.47967527,9.59479428 3.82080342,9.68938103 4.16086051,9.78470412 M6.66088266,5.97378864 C6.74569611,5.93034433 6.77742585,5.91956693 6.80266237,5.90022117 C7.03213397,5.72450268 7.25778997,5.54356285 7.49034083,5.37206162 C7.59952058,5.29153235 7.58445899,5.21722853 7.51885743,5.11996417 C7.33845312,4.85260431 7.15764717,4.58517752 6.98889049,4.31045423 C6.91137353,4.18427162 6.84423234,4.1688084 6.72849243,4.26044977 C6.48442783,4.45370663 6.23440553,4.63966699 5.98458406,4.82549346 C5.86897803,4.91151184 5.82031238,4.9862173 5.94529006,5.11621551 C6.16873703,5.34856554 6.37705547,5.5957094 6.58818541,5.83970707 C6.62373075,5.88080846 6.64160383,5.93723919 6.66088266,5.97378864 M15.8602974,20.3721945 C15.7177144,20.0788617 15.6079991,19.6742072 15.3560356,19.4003541 C15.2012694,19.232066 14.9078028,19.5431379 14.6602573,19.5836369 C14.5844808,19.5960878 14.5134571,19.6349132 14.4388186,19.6568027 C14.3145772,19.6933521 14.2977752,19.7643089 14.3359982,19.8834628 C14.4346013,20.1903175 14.5244353,20.5001845 14.6094496,20.8111225 C14.6407777,20.9257244 14.6845567,21.0008315 14.8148896,20.952032 C15.1375422,20.8312046 15.458856,20.7068963 15.7805714,20.583726 C15.8488506,20.5575524 15.8973154,20.5177898 15.8602974,20.3721945 M9.17295407,3.06964746 C9.04462937,3.11463139 8.88638232,3.16764816 8.72987573,3.22535077 C8.05250609,3.47530612 8.05263997,3.47577471 8.34121992,4.11304706 C8.35956158,4.15354599 8.37924205,4.19350939 8.39798536,4.23394138 C8.61761672,4.70774535 8.61714814,4.70660736 9.09316114,4.52084782 C9.22777823,4.46829963 9.36326555,4.4138771 9.50303705,4.37960363 C9.66704096,4.33930553 9.68558345,4.24384856 9.64300937,4.10534892 C9.55163576,3.80766508 9.46608596,3.50810691 9.36975876,3.21202963 C9.34606187,3.13906463 9.3409744,3.01897359 9.17295407,3.06964746 M15.9313211,3.47296321 C15.8841951,3.50810691 15.8357972,3.52544446 15.8209365,3.55804443 C15.6606143,3.91155654 15.4187587,4.25877626 15.3821423,4.62594421 C15.3607883,4.839484 15.8024609,4.87643509 16.008972,5.035954 C16.0439149,5.06293097 16.0880286,5.07805949 16.1226367,5.10537117 C16.2614711,5.21461786 16.3563925,5.17907252 16.442344,5.03146899 C16.5653134,4.82013823 16.6815219,4.5995697 16.8378277,4.41434569 C17.0605383,4.15046673 16.9921922,4.00902172 16.7020726,3.87996068 C16.4394655,3.76314973 16.19192,3.61226613 15.9313211,3.47296321 M19.9081818,14.2796163 C19.7957889,14.251903 19.7212843,14.2724537 19.6788441,14.3999082 C19.5915538,14.6621136 19.4898714,14.9195663 19.3906658,15.1776884 C19.3566601,15.2660497 19.3723241,15.3235515 19.4630953,15.3631802 C19.8163396,15.5178124 20.1836415,15.8456864 20.5185441,15.7737924 C20.7997607,15.7133453 20.8053167,15.1981722 20.9344447,14.885092 C20.9470964,14.8545003 20.9563342,14.8223689 20.9657728,14.7906392 C21.0029916,14.6651929 20.9795625,14.5818521 20.8336994,14.5437631 C20.5233639,14.4626313 20.2165092,14.3684462 19.9081818,14.2796163 M18.8275634,16.3603909 C18.6792235,16.4082533 18.63598,16.5459496 18.5669645,16.6513138 C18.4336862,16.8544109 18.1441691,17.0198205 18.1686693,17.2402552 C18.194776,17.476287 18.5059818,17.5957755 18.6922099,17.7654024 C19.1101187,18.1460254 19.1156078,18.1400008 19.4631622,17.6914333 C19.9430578,17.0719671 19.9431916,17.0716993 19.2778043,16.6435487 C19.1289289,16.5478909 18.9781792,16.4550446 18.8275634,16.3603909 M4.64510718,15.4515415 C4.31770181,15.6084497 3.96559544,15.774261 3.6168361,15.9468333 C3.53905138,15.985324 3.56234663,16.0600964 3.59641928,16.1209452 C3.76497514,16.4215075 3.93513757,16.7211995 4.10536694,17.0208916 C4.15249297,17.1038307 4.21842924,17.1250508 4.29889157,17.0684862 C4.61538565,16.8462442 5.0722537,16.7262201 5.21570693,16.3893761 C5.31203412,16.1632515 4.94834707,15.8659693 4.82979567,15.5804017 C4.81714394,15.5498769 4.79391563,15.523971 4.77898793,15.4941825 C4.7555588,15.4476589 4.71987958,15.4326643 4.64510718,15.4515415 M8.71119937,19.4892509 C8.74714635,19.3153398 8.64318795,19.2951239 8.56948659,19.2546919 C8.36511763,19.1425667 8.1515109,19.0454363 7.95564337,18.9203247 C7.79163945,18.815563 7.70983831,18.8567313 7.62100844,19.0149784 C7.47983119,19.2666073 7.32124944,19.5087975 7.16173053,19.7495151 C7.07597991,19.8788439 7.04264361,19.9711547 7.2200356,20.0569053 C7.49964554,20.1920579 7.7676748,20.3509744 8.04507571,20.4910136 C8.10304607,20.5201996 8.1946205,20.6086948 8.24609765,20.5030629 C8.41592538,20.1539688 8.57095928,19.7977122 8.71119937,19.4892509 M2.77111141,13.5845744 C2.80638899,13.7476412 2.83825261,13.9115112 2.87734579,14.0735739 C3.07528847,14.8936604 2.98893539,14.7319324 3.67688161,14.535931 C4.29922627,14.3586729 4.29621395,14.3482302 4.17217344,13.7221369 C4.14834266,13.6021128 4.11989301,13.4826912 4.10349261,13.3615961 C4.08762775,13.2447851 4.03139783,13.2188122 3.92007599,13.2380911 C3.59146569,13.2951912 3.26158353,13.3461328 2.93129973,13.3927903 C2.81207892,13.4096592 2.74098824,13.4499573 2.77111141,13.5845744 M20.1947536,10.8061473 C20.3373366,10.7823165 20.479384,10.7542685 20.6227034,10.7353913 C21.3062985,10.6453565 21.3063654,10.6462267 21.1708111,9.98592688 C21.0337842,9.31839747 21.0339181,9.31866524 20.3975829,9.51165433 C20.2592171,9.55362595 20.1221902,9.60724519 19.9804774,9.62933551 C19.7459184,9.66581801 19.732865,9.7997657 19.7824009,9.98914002 C19.8330078,10.1823969 19.8763851,10.3784652 19.9081818,10.5756046 C19.9357613,10.7472398 20.0005595,10.8489891 20.1947536,10.8061473 M13.1097175,3.8620876 C13.0564329,3.99375932 13.1366944,4.05139498 13.2649522,4.07582822 C13.4175762,4.1048134 13.5717399,4.12710454 13.7232929,4.16084249 C14.2143006,4.27029 14.2139659,4.27182963 14.3528671,3.77064705 C14.3558125,3.75986965 14.3587579,3.74915919 14.3617702,3.73851567 C14.5814685,2.96314532 14.5838114,2.95049359 13.7941828,2.80382723 C13.2294738,2.69893167 13.2663579,2.58332564 13.2003547,3.21899143 C13.1785991,3.42878256 13.1419158,3.63703407 13.1097175,3.8620876 M10.9618017,20.1982164 C11.0145507,20.0326729 10.9607306,19.9631218 10.8215616,19.9374167 C10.5598247,19.8890858 10.2988242,19.8362029 10.0389617,19.7784334 C9.91820125,19.7516572 9.86069947,19.7934949 9.8135065,19.9063564 C9.35436248,21.0045802 9.39117968,21.0733949 10.5604941,21.2579495 C10.5823836,21.2614304 10.6040723,21.2672542 10.6252924,21.2738813 C10.787422,21.3244882 10.8433842,21.2521926 10.8577763,21.0958868 C10.8862929,20.7863546 10.9285992,20.4780941 10.9618017,20.1982164 M18.1444368,4.91733022 C18.0459006,4.91666625 18.0098867,4.97791669 17.9673126,5.02671623 C17.8798885,5.12699291 17.7971502,5.23128601 17.7093244,5.33122799 C17.2399385,5.86527829 17.2396038,5.86501053 17.72211,6.35842802 C18.0472394,6.69092086 18.0472394,6.69092086 18.4046341,6.38861813 C19.0998099,5.80068083 19.1002784,5.80014531 18.4322805,5.16775959 C18.336288,5.07678763 18.2326643,4.99378156 18.1444368,4.91733022 M12.0086822,20.6726229 C12.0086822,21.3835966 12.0086822,21.3835966 12.4905859,21.3681333 C13.3944149,21.3391482 13.3944149,21.3391482 13.2344274,20.4444901 C13.1439909,19.939358 13.1430538,19.9329987 12.6205841,20.0128585 C12.4263901,20.0425801 12.1724853,19.9402952 12.0509885,20.0905763 C11.9250067,20.2464804 12.0291659,20.4968374 12.0086822,20.6726229 M20.4858103,7.98106269 C20.3180577,7.64549059 20.1463557,7.28414645 19.9045001,6.96383677 C19.8494751,6.8909387 19.7826017,6.96430535 19.7315931,6.99710613 C19.4606854,7.17121804 19.1964718,7.35624124 18.9209452,7.52252113 C18.7813076,7.60679906 18.7754168,7.68270944 18.8578874,7.81284153 C19.0174063,8.06453733 19.1066378,8.4534609 19.3274741,8.54918564 C19.5783666,8.65803069 19.8828114,8.35934274 20.1669733,8.2455441 C20.249243,8.21267638 20.3266261,8.16775939 20.4070215,8.13020584 C20.4609754,8.10503626 20.5021438,8.07350734 20.4858103,7.98106269 M11.9775549,3.32850588 C11.9736054,2.5971823 11.9736054,2.5971823 11.3481815,2.64618265 C10.6416928,2.70160928 10.6417597,2.70154234 10.7259038,3.39404051 C10.731259,3.43822116 10.7316607,3.48300427 10.7373506,3.52705103 C10.8086421,4.07837195 10.808776,4.07837195 11.3675942,4.00031948 C11.3785724,3.99877985 11.3892829,3.99536589 11.4003281,3.9938932 C11.980768,3.91697871 11.980768,3.91697871 11.9775549,3.32850588 M11.6454637,17.8755193 C11.6702986,17.8785986 11.6950665,17.8817448 11.7198345,17.884891 C13.179871,14.5990558 14.6399744,11.3132206 16.1000109,8.02738542 C16.0789916,8.00890988 16.0579054,7.99043434 16.0368192,7.97189185 C12.7533938,9.43125894 9.4699685,10.8905591 6.18661011,12.3499262 C6.52044175,12.4640595 6.83800689,12.5023494 7.15597366,12.5372254 C8.4060182,12.6743862 9.6559958,12.8122164 10.9065759,12.9447583 C11.0601371,12.9610918 11.1114134,13.034927 11.1265419,13.1795182 C11.2373283,14.2421297 11.3526665,15.3042726 11.4695444,16.3662817 C11.5249041,16.8696733 11.5866901,17.3724624 11.6454637,17.8755193" id="Fill-1" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/Viewport/NavigationSeed.png b/Assets/Editor/Icons/Components/Viewport/NavigationSeed.png
deleted file mode 100644
index d94f4c2baf..0000000000
--- a/Assets/Editor/Icons/Components/Viewport/NavigationSeed.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:27a604d07e2de256d47b406427c776ad7082ef2ef53ca5af2aebdb4bf342abe8
-size 5037
diff --git a/Assets/Editor/Icons/Components/Viewport/NavigationSeed.svg b/Assets/Editor/Icons/Components/Viewport/NavigationSeed.svg
new file mode 100644
index 0000000000..5f90e816be
--- /dev/null
+++ b/Assets/Editor/Icons/Components/Viewport/NavigationSeed.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / AI / NavigationSeed - box</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
+            <stop stop-color="#9D9D9D" offset="100%"></stop>
+        </linearGradient>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
+    </defs>
+    <g id="icon-/-AI-/-NavigationSeed---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/general/color/-box-template">
+            <mask id="mask-3" fill="white">
+                <use xlink:href="#path-2"></use>
+            </mask>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#65C9C9">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="Rectangle-2" x="0" y="0" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+        <path d="M12.617855,20.0128806 C13.1403246,19.9330207 13.1412618,19.9393801 13.2316983,20.4445121 C13.3916857,21.3391702 13.3916857,21.3391702 12.4878568,21.3681554 C12.0059531,21.3836186 12.0059531,21.3836186 12.0059531,20.6726449 C12.0264368,20.4968595 11.9222776,20.2465025 12.0482594,20.0905984 C12.1697562,19.9403172 12.423661,20.0426021 12.617855,20.0128806 Z M9.97094375,19.7706427 L10.0362326,19.7784554 C10.2960951,19.8362249 10.5570956,19.8891078 10.8188325,19.9374388 C10.9580015,19.9631439 11.0118216,20.0326949 10.9590726,20.1982385 C10.9258701,20.4781162 10.8835638,20.7863766 10.8550472,21.0959089 C10.840655,21.2522147 10.7846929,21.3245103 10.6225633,21.2739033 C10.6013432,21.2672763 10.5796545,21.2614524 10.557765,21.2579715 C9.38845057,21.0734169 9.35163337,21.0046022 9.81077739,19.9063785 C9.85797036,19.793517 9.91547214,19.7516792 10.0362326,19.7784554 Z M14.6575282,19.5836589 C14.9050737,19.54316 15.1985403,19.2320881 15.3533065,19.4003762 C15.60527,19.6742292 15.7149853,20.0788838 15.8575683,20.3722165 C15.8945863,20.5178118 15.8461215,20.5575744 15.7778423,20.5837481 C15.4561269,20.7069184 15.1348131,20.8312267 14.8121605,20.952054 C14.6818276,21.0008536 14.6380486,20.9257465 14.6067205,20.8111445 C14.5217062,20.5002065 14.4318722,20.1903395 14.333269,19.8834848 C14.2950461,19.764331 14.3118481,19.6933742 14.4360895,19.6568247 C14.510728,19.6349352 14.5817517,19.5961098 14.6575282,19.5836589 Z M7.61827933,19.0150004 C7.7071092,18.8567534 7.78891034,18.8155851 7.95291426,18.9203467 C8.14878179,19.0454583 8.36238852,19.1425888 8.56675748,19.2547139 C8.64045884,19.2951459 8.74441724,19.3153619 8.70847026,19.489273 C8.56823017,19.7977342 8.41319627,20.1539909 8.24336854,20.5030849 C8.19189139,20.6087169 8.10031696,20.5202217 8.0423466,20.4910357 C7.76494569,20.3509964 7.49691643,20.19208 7.21730649,20.0569274 C7.0399145,19.9711767 7.0732508,19.878866 7.15900142,19.7495372 C7.31852033,19.5088196 7.47710208,19.2666293 7.61827933,19.0150004 Z M17.1440284,18.1696105 C17.2651235,18.0899514 17.333135,18.1013313 17.4198897,18.2053566 C17.6255305,18.4521658 17.8358572,18.6953601 18.0497317,18.9350736 C18.1282527,19.0231672 18.1592461,19.0912455 18.0453136,19.174921 C17.768716,19.378152 17.4964695,19.5872067 17.2214784,19.7925798 C17.1956394,19.8119256 17.1629056,19.8221675 17.1398781,19.8334804 C17.0683858,19.8301334 17.0375263,19.7848817 17.0073362,19.7378226 L17.0073362,19.7378226 L16.8618747,19.5152458 C16.330502,18.7006484 16.3325772,18.7037946 17.1440284,18.1696105 Z M5.98607219,17.4008672 C6.19793848,17.3809859 6.33275639,17.7039063 6.5166416,17.8609484 C6.6143076,17.9443561 6.74564461,18.0035314 6.78687988,18.1588331 C6.75762694,18.1991312 6.72757071,18.2451192 6.6928956,18.2873586 C6.60091953,18.3992159 6.50854181,18.5108055 6.41341954,18.6199853 C5.93546527,19.1687625 5.93513057,19.1684278 5.40596691,18.6418078 C4.98002531,18.2178745 4.97975755,18.2176067 5.42283589,17.842272 C5.60906401,17.6844936 5.78618824,17.4196774 5.98607219,17.4008672 Z M11.8604343,5.25002205 C12.5031795,5.25002205 13.0242274,5.78332992 13.0242274,6.44119852 C13.0242274,6.95996172 12.7002328,7.40127141 12.2480581,7.56470587 L12.2486615,9.27718312 C12.6521108,9.39891687 12.9533954,9.70503052 13.0133213,10.0767996 C15.6622808,10.4305712 17.6793998,12.2235664 17.6793998,14.382375 C17.6793998,16.7945599 15.1610015,18.750022 12.0543998,18.750022 C8.94779808,18.750022 6.4293998,16.7945599 6.4293998,14.382375 C6.4293998,12.3324076 8.24825082,10.612297 10.7012479,10.1419316 C10.7330362,9.74097939 11.0454727,9.40594273 11.472207,9.27718312 L11.4724218,7.56456533 C11.0204501,7.40101852 10.6966412,6.95981309 10.6966412,6.44119852 C10.6966412,5.78332992 11.2176891,5.25002205 11.8604343,5.25002205 Z M18.8248343,16.360413 C18.9754501,16.4550667 19.1261998,16.547913 19.2750752,16.6435707 C19.9404625,17.0717214 19.9403286,17.0719891 19.4604331,17.6914554 C19.1128787,18.1400228 19.1073896,18.1460474 18.6894808,17.7654245 C18.5032527,17.5957976 18.1920469,17.476309 18.1659402,17.2402772 C18.14144,17.0198426 18.4309571,16.8544329 18.5642354,16.6513358 C18.6332509,16.5459717 18.6764944,16.4082753 18.8248343,16.360413 Z M4.64237807,15.4515635 C4.71715047,15.4326863 4.75282968,15.447681 4.77625882,15.4942045 C4.79118652,15.523993 4.81441483,15.5498989 4.82706656,15.5804237 C4.94561796,15.8659914 5.30930501,16.1632736 5.21297781,16.3893981 C5.06952459,16.7262421 4.61265654,16.8462662 4.29616245,17.0685082 C4.21570013,17.1250729 4.14976386,17.1038528 4.10263783,17.0209136 C3.93240846,16.7212216 3.76224603,16.4215295 3.59369017,16.1209673 C3.55961752,16.0601185 3.53632227,15.9853461 3.61410699,15.9468553 C3.96286633,15.7742831 4.3149727,15.6084717 4.64237807,15.4515635 Z M19.8523867,14.2700752 L19.9054527,14.2796384 C20.2137801,14.3684683 20.5206347,14.4626534 20.8309703,14.5437851 C20.9768334,14.5818742 21.0002625,14.6652149 20.9630437,14.7906612 C20.9536051,14.8223909 20.9443673,14.8545223 20.9317156,14.8851141 C20.8025876,15.1981942 20.7970315,15.7133673 20.515815,15.7738145 C20.1809123,15.8457084 19.8136105,15.5178345 19.4603662,15.3632022 C19.369595,15.3235735 19.353931,15.2660717 19.3879367,15.1777104 C19.4871423,14.9195884 19.5888247,14.6621357 19.676115,14.3999302 C19.7185552,14.2724758 19.7930598,14.2519251 19.9054527,14.2796384 Z M3.91734688,13.2381131 C4.02866872,13.2188343 4.08489863,13.2448071 4.1007635,13.3616181 C4.11716389,13.4827132 4.14561355,13.6021349 4.16944433,13.722159 C4.29348484,14.3482523 4.29649716,14.358695 3.6741525,14.5359531 C2.98620628,14.7319545 3.07255936,14.8936824 2.87461668,14.0735959 C2.8355235,13.9115333 2.80365988,13.7476632 2.7683823,13.5845965 C2.73825913,13.4499794 2.80934981,13.4096813 2.92857062,13.3928123 C3.25885442,13.3461549 3.58873658,13.2952132 3.91734688,13.2381131 Z M9.53284807,11.6029632 C8.89010289,11.6029632 8.36905497,12.1362711 8.36905497,12.7941397 C8.36905497,13.4520083 8.89010289,13.9853162 9.53284807,13.9853162 C10.1755933,13.9853162 10.6966412,13.4520083 10.6966412,12.7941397 C10.6966412,12.1362711 10.1755933,11.6029632 9.53284807,11.6029632 Z M14.1880205,11.6029632 C13.5452753,11.6029632 13.0242274,12.1362711 13.0242274,12.7941397 C13.0242274,13.4520083 13.5452753,13.9853162 14.1880205,13.9853162 C14.8307657,13.9853162 15.3518136,13.4520083 15.3518136,12.7941397 C15.3518136,12.1362711 14.8307657,11.6029632 14.1880205,11.6029632 Z M20.9334564,11.9870099 C21.3953238,11.9941208 21.3921551,12.0651169 21.3652214,12.6685844 C21.3379098,13.2802855 21.3334917,13.2839003 20.7223261,13.1908532 C20.0123565,13.0828784 20.0123565,13.0828784 20.0300957,12.4954766 C20.0455589,11.987533 20.0455589,11.987533 20.5557115,11.986462 Z M2.66991301,11.3264299 C2.73819219,10.7968646 2.73819219,10.7968646 3.28496117,10.8601233 C4.06039846,10.9498234 4.03663463,10.9486184 3.99881331,11.6972126 C3.98207822,12.0283667 3.86868123,12.1224848 3.56811895,12.0754927 C3.48156505,12.0619038 3.39106166,12.0734175 3.30229872,12.0734175 L3.30229872,12.0734175 L3.08531798,12.0737813 C2.5741139,12.0688235 2.58369381,11.9945841 2.66991301,11.3264299 Z M20.3948538,9.51167638 C21.031189,9.31868728 21.0310551,9.31841952 21.168082,9.98594893 C21.3036363,10.6462488 21.3035694,10.6453786 20.6199743,10.7354134 C20.4766549,10.7542905 20.3346074,10.7823386 20.1920244,10.8061693 C19.9978304,10.8490112 19.9330321,10.7472618 19.9054527,10.5756267 C19.873656,10.3784873 19.8302787,10.1824189 19.7796717,9.98916207 C19.7301359,9.79978775 19.7431892,9.66584006 19.9777483,9.62935756 C20.1194611,9.60726723 20.256488,9.55364799 20.3948538,9.51167638 Z M3.36689618,8.38225839 C3.42299222,8.22648814 3.52246561,8.22180232 3.65514143,8.282785 C3.93675959,8.41238156 4.22065371,8.53702454 4.50421314,8.66233692 C4.60897482,8.70859272 4.66252712,8.76803577 4.61312512,8.89361591 C4.51191128,9.15093471 4.42020297,9.41200216 4.32682115,9.67226634 C4.2975682,9.75373277 4.25773868,9.81136843 4.1581314,9.78472616 C3.8180743,9.68940307 3.47694616,9.59481632 3.13688906,9.4966148 C3.00340995,9.45805714 3.01251385,9.35563837 3.04819307,9.25536169 C3.15201758,8.96343472 3.26193368,8.67371678 3.36689618,8.38225839 Z M19.728864,6.99712818 C19.7798726,6.96432739 19.846746,6.89096074 19.901771,6.96385881 C20.1436266,7.2841685 20.3153286,7.64551264 20.4830812,7.98108473 C20.4994146,8.07352939 20.4582463,8.1050583 20.4042924,8.13022789 C20.323897,8.16778143 20.2465139,8.21269843 20.1642442,8.24556615 C19.8800823,8.35936478 19.5756375,8.65805273 19.324745,8.54920769 C19.1039087,8.45348295 19.0146772,8.06455938 18.8551582,7.81286357 C18.7726877,7.68273149 18.7785785,7.6068211 18.9182161,7.52254317 C19.1937427,7.35626328 19.4579563,7.17124009 19.728864,6.99712818 Z M4.38854017,6.55304574 C4.8458768,5.90258612 4.84654621,5.90184978 5.45429786,6.40959252 C5.59748332,6.5292819 5.76088477,6.62949164 5.86785549,6.81076618 C5.80426214,6.89993075 5.75050902,6.99806534 5.67560274,7.07578312 C5.49867933,7.2591328 5.43535374,7.60836073 5.19831787,7.64450853 C4.96824381,7.67965223 4.76046089,7.41751372 4.54330631,7.28637753 C4.07305019,7.00241647 4.07679885,6.99632489 4.38854017,6.55304574 Z M18.1417077,4.91735226 C18.2299351,4.99380361 18.3335588,5.07680967 18.4295513,5.16778164 C19.0975493,5.80016735 19.0970808,5.80070288 18.401905,6.38864018 C18.0445103,6.69094291 18.0445103,6.69094291 17.7193809,6.35845007 C17.2368747,5.86503257 17.2372094,5.86530034 17.7065953,5.33125003 C17.7944211,5.23130806 17.8771594,5.12701495 17.9645835,5.02673827 C18.0071576,4.97793874 18.0431715,4.9166883 18.1417077,4.91735226 Z M6.72576332,4.26047181 C6.84150323,4.16883044 6.90864442,4.18429367 6.98616138,4.31047627 C7.15491806,4.58519957 7.33572401,4.85262636 7.51612832,5.11998621 C7.58172988,5.21725058 7.59679147,5.29155439 7.48761172,5.37208366 C7.25506086,5.5435849 7.02940486,5.72452473 6.79993326,5.90024321 C6.77469674,5.91958898 6.742967,5.93036638 6.65815355,5.97381068 C6.63887472,5.93726124 6.62100164,5.8808305 6.5854563,5.83972911 C6.37432636,5.59573145 6.16600792,5.34858759 5.94256095,5.11623755 C5.81758327,4.98623935 5.86624892,4.91153389 5.98185495,4.82551551 C6.23167642,4.63968903 6.48169872,4.45372867 6.72576332,4.26047181 Z M15.928592,3.47298526 C16.1891909,3.61228817 16.4367364,3.76317178 16.6993435,3.87998273 C16.9894631,4.00904377 17.0578092,4.15048878 16.8350986,4.41436773 C16.6787928,4.59959175 16.5625843,4.82016028 16.4396149,5.03149104 C16.3536634,5.17909456 16.258742,5.2146399 16.1199076,5.10539321 C16.0852995,5.07808154 16.0411857,5.06295302 16.0062429,5.03597604 C15.7997318,4.87645713 15.3580592,4.83950605 15.3794132,4.62596626 C15.4160296,4.2587983 15.6578852,3.91157859 15.8182074,3.55806647 C15.8330681,3.52546651 15.881466,3.50812895 15.928592,3.47298526 Z M9.17022495,3.0696695 C9.33824529,3.01899564 9.34333276,3.13908667 9.36702965,3.21205168 C9.46335685,3.50812895 9.54890665,3.80768713 9.64028026,4.10537097 C9.68285434,4.2438706 9.66431185,4.33932757 9.50030794,4.37962568 C9.36053644,4.41389915 9.22504912,4.46832167 9.09043203,4.52086987 C8.61441903,4.70662941 8.61488761,4.70776739 8.39525625,4.23396343 C8.37651294,4.19353144 8.35683247,4.15356804 8.33849081,4.11306911 C8.04991086,3.47579675 8.04977698,3.47532817 8.72714662,3.22537281 C8.88365321,3.16767021 9.04190026,3.11465343 9.17022495,3.0696695 Z M13.1976256,3.21901348 C13.2636288,2.58334769 13.2267447,2.69895371 13.7914537,2.80384928 C14.5810823,2.95051564 14.5787394,2.96316737 14.3590411,3.73853772 C14.3560288,3.74918124 14.3530834,3.7598917 14.350138,3.7706691 C14.2112367,4.27185168 14.2115714,4.27031205 13.7205638,4.16086454 C13.5690108,4.12712659 13.4148471,4.10483544 13.2622231,4.07585026 C13.1339653,4.05141703 13.0537038,3.99378136 13.1069883,3.86210965 C13.1391867,3.63705611 13.17587,3.42880461 13.1976256,3.21901348 Z M11.3454524,2.6462047 C11.9708763,2.59720435 11.9708763,2.59720435 11.9748258,3.32852793 C11.9780389,3.91700076 11.9780389,3.91700076 11.397599,3.99391525 C11.3865538,3.99538793 11.3758433,3.99880189 11.3648651,4.00034152 C10.8060469,4.078394 10.805913,4.078394 10.7346215,3.52707308 C10.7289316,3.48302631 10.7285299,3.4382432 10.7231747,3.39406256 C10.6390306,2.70156439 10.6389637,2.70163133 11.3454524,2.6462047 Z" id="Combined-Shape" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/Viewport/NetBinding.png b/Assets/Editor/Icons/Components/Viewport/NetBinding.png
deleted file mode 100644
index a4e5db2505..0000000000
--- a/Assets/Editor/Icons/Components/Viewport/NetBinding.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:05b50aaffa05e3b3c5d3903a80352a994ed46f13dfded91e6af9d351c60906ee
-size 5160
diff --git a/Assets/Editor/Icons/Components/Viewport/NetBinding.svg b/Assets/Editor/Icons/Components/Viewport/NetBinding.svg
new file mode 100644
index 0000000000..d0673ea7f2
--- /dev/null
+++ b/Assets/Editor/Icons/Components/Viewport/NetBinding.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Networking / NetBinding - box</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
+            <stop stop-color="#9D9D9D" offset="100%"></stop>
+        </linearGradient>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
+    </defs>
+    <g id="icon-/-Networking-/-NetBinding---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/general/color/-box-template">
+            <mask id="mask-3" fill="white">
+                <use xlink:href="#path-2"></use>
+            </mask>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#D179BD">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="Rectangle-2" x="0" y="0" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+        <path d="M17.9913911,20.0308183 C18.0485186,19.3796214 18.5952547,18.8688655 19.2612841,18.8688655 C19.9653484,18.8688655 20.5361053,19.4396224 20.5361053,20.1436866 C20.5361053,20.8477509 19.9653484,21.4185077 19.2612841,21.4185077 C18.6776176,21.4185077 18.1855645,21.0262639 18.0343463,20.4909976 L14.293761,20.4909976 C14.1923219,20.8916915 13.8265073,21.1884181 13.3928707,21.1884181 L10.549227,21.1884181 C10.1132424,21.1884181 9.74741753,20.8974042 9.64742772,20.4909976 L5.90974106,20.4909976 C5.75852285,21.0262639 5.26646977,21.4185077 4.68280323,21.4185077 C3.97873897,21.4185077 3.40798211,20.8477509 3.40798211,20.1436866 C3.40798211,19.4396224 3.97873897,18.8688655 4.68280323,18.8688655 C5.3488327,18.8688655 5.89556872,19.3796214 5.95269631,20.0308183 L9.62040308,20.0308183 L9.62040308,20.0215062 C9.62040308,19.5119953 10.0376113,19.0989552 10.549227,19.0989552 L11.6566964,19.0989552 L11.6566964,18.1379919 C7.32679164,18.0150756 3.85448035,14.4664398 3.85448035,10.1068023 C3.85448035,5.66948021 7.45164063,2.07231992 11.8889627,2.07231992 C16.3262848,2.07231992 19.9234451,5.66948021 19.9234451,10.1068023 C19.9234451,14.4679008 16.4488062,18.0174539 12.1168758,18.1381143 L12.1168758,19.0989552 L13.3928707,19.0989552 C13.905846,19.0989552 14.3216946,19.5018246 14.3216946,20.0215062 L14.3216946,20.0308183 L17.9913911,20.0308183 L17.9913911,20.0308183 Z M12.1492128,9.76881923 L12.1492128,14.4005414 C13.1633002,14.4258364 14.0291726,14.5113631 14.7592548,14.6462557 C15.2367895,13.3622462 15.5141239,11.9204545 15.5141239,10.3325316 C15.5141239,10.1430412 15.5101738,9.95512478 15.5024043,9.76881923 L12.1492128,9.76881923 Z M12.1492128,9.3086399 L15.4752678,9.3086399 C15.3917423,8.21435379 15.1764016,7.17837735 14.8569189,6.20854001 C14.1067426,6.35411446 13.2088997,6.44631713 12.1492128,6.47274949 L12.1492128,9.3086399 Z M11.6890335,9.76881923 L8.21302901,9.76881923 C8.20525953,9.95512478 8.20130943,10.1430412 8.20130943,10.3325316 C8.20130943,11.8800096 8.46469614,13.2887057 8.92008049,14.5478365 C9.64081901,14.4472818 10.4974007,14.3926721 11.5030548,14.3926721 C11.5655559,14.3926721 11.6275479,14.392883 11.6890335,14.3933027 L11.6890335,9.76881923 Z M11.6890335,9.3086399 L11.6890335,6.47998826 C11.6275479,6.48040791 11.5655559,6.4806188 11.5030548,6.4806188 C10.4527931,6.4806188 9.5651219,6.42105703 8.82497224,6.31180319 C8.52394814,7.25181044 8.32073369,8.25309831 8.24016545,9.3086399 L11.6890335,9.3086399 Z M18.9951993,9.76881923 L15.9629787,9.76881923 C15.9704878,9.95518165 15.9743032,10.1430971 15.9743032,10.3325316 C15.9743032,11.9504238 15.6959433,13.4239443 15.2148663,14.7407906 C15.4935881,14.8054191 15.7494006,14.8781394 15.9831911,14.9581756 C16.3121108,15.0707785 16.5670764,15.1857279 16.7579571,15.2937055 C18.1399095,13.9959444 19.0030864,12.1521762 19.0030864,10.1068023 C19.0030864,9.99350316 19.0004379,9.88082263 18.9951993,9.76881923 L18.9951993,9.76881923 Z M18.9588116,9.3086399 C18.7872214,7.77170891 18.1259823,6.38270027 17.1346698,5.30118956 C16.9812364,5.46927728 16.6214464,5.69661402 15.9831911,5.91511531 C15.7759566,5.98606028 15.5514188,6.05125699 15.3089597,6.11016504 C15.6349054,7.11143983 15.8535692,8.18022736 15.9367638,9.3086399 L18.9588116,9.3086399 L18.9588116,9.3086399 Z M4.78272611,9.76881923 C4.77748756,9.88082263 4.77483901,9.99350316 4.77483901,10.1068023 C4.77483901,12.0613636 5.56306898,13.8318238 6.83899432,15.1176485 C6.94410595,15.0652435 7.06300539,15.0128132 7.1967775,14.9611978 C7.54701784,14.8260592 7.96554745,14.7117657 8.45783665,14.6219003 C8.00304553,13.3354392 7.7411301,11.9019067 7.7411301,10.3325316 C7.7411301,10.1430971 7.7449455,9.95518165 7.75245457,9.76881923 L4.78272611,9.76881923 L4.78272611,9.76881923 Z M4.81911381,9.3086399 L7.77866949,9.3086399 C7.85843501,8.22673729 8.06273261,7.19964584 8.36671865,6.2343176 C7.91368276,6.14720868 7.52520592,6.03881572 7.1967775,5.91209309 C6.85945397,5.78193832 6.61669993,5.64660173 6.45112063,5.51955502 C5.56669756,6.56690484 4.97936609,7.87326232 4.81911381,9.3086399 L4.81911381,9.3086399 Z M12.1492128,14.8608511 L12.1492128,17.21444 L11.6890335,17.21444 L11.6890335,14.8534916 C11.6275758,14.8530656 11.5655838,14.8528515 11.5030548,14.8528515 C10.5651648,14.8528515 9.76457677,14.9010236 9.08989775,14.9890377 C9.147583,15.1302334 9.20771246,15.2694204 9.2701764,15.406582 C9.50340571,15.9187192 9.75295137,16.3649241 10.0019255,16.742422 C10.074029,16.8517463 10.1379699,16.9434543 10.191782,17.0172238 C10.7356538,17.1503408 11.3040652,17.220926 11.8889627,17.220926 C12.4467597,17.220926 12.9895629,17.1567302 13.5103873,17.0353237 C13.5668445,16.9586434 13.6353849,16.8608729 13.7135078,16.742422 C13.9624819,16.3649241 14.2120276,15.9187192 14.4452569,15.406582 C14.4938807,15.2998113 14.5410899,15.1918133 14.5868328,15.0825959 C13.9036999,14.962121 13.0948036,14.8848527 12.1492128,14.8608511 Z M16.3881493,15.6178069 C16.24383,15.5473631 16.060856,15.471162 15.8341446,15.3935492 C15.5972531,15.3124514 15.3352021,15.2390629 15.0469176,15.1743722 C14.9883442,15.3173204 14.9273545,15.4583032 14.8640532,15.5973035 C14.6523,16.0622823 14.4271316,16.4761423 14.1998404,16.8371931 C15.0040901,16.5611159 15.7432385,16.1449417 16.3881493,15.6178069 L16.3881493,15.6178069 Z M7.19975823,15.4568922 C7.86715246,16.0423147 8.64501902,16.5048526 9.49802299,16.8091712 C9.27670379,16.454775 9.05767565,16.0502981 8.85138011,15.5973035 C8.77122589,15.4212967 8.69477781,15.2421111 8.62224885,15.0597816 C8.12305828,15.1465511 7.70515594,15.2582886 7.36243223,15.390527 C7.30443809,15.4129038 7.25027352,15.4350631 7.19975823,15.4568922 L7.19975823,15.4568922 Z M12.1492128,6.0124398 C13.1492464,5.98705633 13.9963918,5.90209587 14.7035792,5.76945808 C14.6221163,5.54884583 14.5352589,5.33186867 14.4433543,5.11862481 C14.2094283,4.5758528 13.9590414,4.09699055 13.7091133,3.68695031 C13.560355,3.44289243 13.4458799,3.27730979 13.3826796,3.19509799 L13.4286706,3.15974237 C13.0145745,3.06837644 12.5869335,3.01309074 12.1492128,2.99735045 L12.1492128,6.0124398 Z M11.6890335,6.01979937 L11.6890335,2.99543376 C11.2131641,3.00856482 10.748971,3.06842645 10.3008787,3.17059408 L10.3327537,3.19509799 C10.2695534,3.27730979 10.1550783,3.44289243 10.0063199,3.68695031 C9.75639191,4.09699055 9.50600498,4.5758528 9.27207903,5.11862481 C9.1664136,5.36379742 9.06742008,5.613905 8.97562604,5.86879828 C9.67365441,5.96661268 10.5116451,6.02043947 11.5030548,6.02043947 C11.5655838,6.02043947 11.6275758,6.0202253 11.6890335,6.01979937 L11.6890335,6.01979937 Z M17.108395,5.27267939 C16.2771391,4.37559332 15.2174625,3.6931922 14.021821,3.31793189 C14.0474495,3.35860853 14.074225,3.40178814 14.1020538,3.44744495 C14.3628563,3.87532621 14.6231999,4.37323052 14.8659558,4.93649038 C14.969827,5.1774998 15.0674667,5.42309932 15.1584084,5.67315842 C15.4031477,5.61494845 15.6281577,5.55025958 15.8341446,5.47974171 C16.4042934,5.28455612 16.6978224,5.0982983 16.7955746,4.99008904 L17.108395,5.27267939 L17.108395,5.27267939 Z M6.75847578,5.17841643 C6.87958994,5.26517815 7.07347589,5.37127143 7.36243223,5.48276393 C7.68001849,5.60530316 8.06215969,5.71023854 8.51371728,5.79401556 C8.61675674,5.50212657 8.72891992,5.21621681 8.84947749,4.93649038 C9.09223337,4.37323052 9.35257699,3.87532621 9.6133795,3.44744495 C9.63556565,3.4110456 9.65708237,3.37622074 9.67788214,3.34298342 C8.55626369,3.70940324 7.55730038,4.3470421 6.75847578,5.17841643 L6.75847578,5.17841643 Z" id="Combined-Shape" fill="#FFFFFF" fill-rule="nonzero"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/Viewport/Non Uniform Scale.svg b/Assets/Editor/Icons/Components/Viewport/Non Uniform Scale.svg
new file mode 100644
index 0000000000..56d8889a41
--- /dev/null
+++ b/Assets/Editor/Icons/Components/Viewport/Non Uniform Scale.svg	
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Gameplay / Non Uniform Scale - box</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
+            <stop stop-color="#9D9D9D" offset="100%"></stop>
+        </linearGradient>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
+        <rect id="path-4" x="2.5" y="3" width="18" height="18"></rect>
+    </defs>
+    <g id="icon-/-Gameplay-/-Non-Uniform-Scale---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/general/color/-box-template">
+            <mask id="mask-3" fill="white">
+                <use xlink:href="#path-2"></use>
+            </mask>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#65C98C">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="Rectangle-2" x="0" y="0" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+        <rect id="Icon-Background" x="-0.5" y="0" width="24" height="24"></rect>
+        <polygon id="Path" fill="#FFFFFF" fill-rule="nonzero" points="8.28679662 5 12.4289322 9.14213562 9.262661 9.142 9.26310735 11.2132034 7.31048589 11.2132034 7.309661 9.142 4.144661 9.14213562"></polygon>
+        <polygon id="Path" fill="#FFFFFF" fill-rule="nonzero" points="14.1446608 10.857864 18.2867964 14.9999996 14.1446608 19.1421353 14.144593 15.975864 12.573593 15.9763104 12.573593 14.0236889 14.144593 14.022864"></polygon>
+        <rect id="Rectangle" stroke="#FFFFFF" fill="#FFFFFF" fill-rule="nonzero" x="3" y="12.5" width="8" height="8"></rect>
+        <mask id="mask-5" fill="white">
+            <use xlink:href="#path-4"></use>
+        </mask>
+        <g id="path-1"></g>
+        <path d="M21.5,4 L19.5,4 L19.5,3 L21.5,3 L21.5,4 Z M21.5,6 L19.5,6 L19.5,5 L21.5,5 L21.5,6 Z M21.5,8 L19.5,8 L19.5,7 L21.5,7 L21.5,8 Z M21.5,10 L19.5,10 L19.5,9 L21.5,9 L21.5,10 Z M21.5,12 L19.5,12 L19.5,11 L21.5,11 L21.5,12 Z M21.5,14 L19.5,14 L19.5,13 L21.5,13 L21.5,14 Z M21.5,16 L19.5,16 L19.5,15 L21.5,15 L21.5,16 Z M21.5,18 L19.5,18 L19.5,17 L21.5,17 L21.5,18 Z M21.5,20 L19.5,20 L19.5,19 L21.5,19 L21.5,20 Z M19.5,22 L19.5,20 L20.5,20 L20.5,22 L19.5,22 Z M17.5,22 L17.5,20 L18.5,20 L18.5,22 L17.5,22 Z M15.5,22 L15.5,20 L16.5,20 L16.5,22 L15.5,22 Z M13.5,22 L13.5,20 L14.5,20 L14.5,22 L13.5,22 Z M11.5,22 L11.5,20 L12.5,20 L12.5,22 L11.5,22 Z M9.5,22 L9.5,20 L10.5,20 L10.5,22 L9.5,22 Z M7.5,22 L7.5,20 L8.5,20 L8.5,22 L7.5,22 Z M5.5,22 L5.5,20 L6.5,20 L6.5,22 L5.5,22 Z M3.5,22 L3.5,20 L4.5,20 L4.5,22 L3.5,22 Z M1.5,20 L3.5,20 L3.5,21 L1.5,21 L1.5,20 Z M1.5,18 L3.5,18 L3.5,19 L1.5,19 L1.5,18 Z M1.5,16 L3.5,16 L3.5,17 L1.5,17 L1.5,16 Z M1.5,14 L3.5,14 L3.5,15 L1.5,15 L1.5,14 Z M1.5,12 L3.5,12 L3.5,13 L1.5,13 L1.5,12 Z M1.5,10 L3.5,10 L3.5,11 L1.5,11 L1.5,10 Z M1.5,8 L3.5,8 L3.5,9 L1.5,9 L1.5,8 Z M1.5,6 L3.5,6 L3.5,7 L1.5,7 L1.5,6 Z M1.5,4 L3.5,4 L3.5,5 L1.5,5 L1.5,4 Z M3.5,2 L3.5,4 L2.5,4 L2.5,2 L3.5,2 Z M5.5,2 L5.5,4 L4.5,4 L4.5,2 L5.5,2 Z M7.5,2 L7.5,4 L6.5,4 L6.5,2 L7.5,2 Z M9.5,2 L9.5,4 L8.5,4 L8.5,2 L9.5,2 Z M11.5,2 L11.5,4 L10.5,4 L10.5,2 L11.5,2 Z M13.5,2 L13.5,4 L12.5,4 L12.5,2 L13.5,2 Z M15.5,2 L15.5,4 L14.5,4 L14.5,2 L15.5,2 Z M17.5,2 L17.5,4 L16.5,4 L16.5,2 L17.5,2 Z M19.5,2 L19.5,4 L18.5,4 L18.5,2 L19.5,2 Z" id="path-1" fill="#FFFFFF" fill-rule="nonzero" mask="url(#mask-5)"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/Viewport/Particle.png b/Assets/Editor/Icons/Components/Viewport/Particle.png
deleted file mode 100644
index c831c105bd..0000000000
--- a/Assets/Editor/Icons/Components/Viewport/Particle.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2f2f59021b439bdc158181a2fc736dc707492f6992a5c4049492432adaf7a243
-size 5142
diff --git a/Assets/Editor/Icons/Components/Viewport/Particle.svg b/Assets/Editor/Icons/Components/Viewport/Particle.svg
new file mode 100644
index 0000000000..a2286bef37
--- /dev/null
+++ b/Assets/Editor/Icons/Components/Viewport/Particle.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Rendering / Particle - box</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
+            <stop stop-color="#9D9D9D" offset="100%"></stop>
+        </linearGradient>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
+    </defs>
+    <g id="icon-/-Rendering-/-Particle---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/general/color/-box-template">
+            <mask id="mask-3" fill="white">
+                <use xlink:href="#path-2"></use>
+            </mask>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#B29EDF">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="Rectangle-2" x="0" y="-0.00055502734" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+        <path d="M14.0607748,19.0077454 L12.5882256,14.7159203 L13.3721675,13.9391315 L14.8686626,18.3876527 C15.4569114,18.1911862 16.1312298,18.358455 16.556226,18.8616128 C17.1120869,19.5194676 17.032266,20.5039239 16.3769848,21.0632398 C15.7184448,21.6253006 14.7293206,21.5442661 14.1705679,20.883013 C13.7115388,20.3393449 13.6862516,19.5730825 14.0607748,19.0077454 L14.0607748,19.0077454 Z M6.70784344,17.4937914 L10.9791027,13.898116 L10.9791027,14.7159203 L7.48427807,18.2611839 C7.53158448,18.4230605 7.54266836,18.5980057 7.50988404,18.7750335 C7.39702096,19.3842955 6.80692818,19.7876511 6.19192888,19.6758092 C5.57692958,19.5639674 5.16989096,18.9792139 5.28275405,18.3699519 C5.3957913,17.7605173 5.98570991,17.3571617 6.60070921,17.4690036 C6.63717337,17.4756348 6.67290646,17.4839286 6.70784344,17.4937914 L6.70784344,17.4937914 Z M16.2369563,15.9893799 L14.1561094,14.3275259 L14.1561094,13.550737 L16.7853999,15.4116656 C17.2396953,15.1911429 17.8036928,15.2940023 18.145978,15.6936091 C18.5508334,16.1658886 18.4926485,16.8739626 18.0158459,17.2751239 C17.5392175,17.6761127 16.8246232,17.6184587 16.4197678,17.1461792 C16.1353749,16.8141599 16.079577,16.3657744 16.2369563,15.9893799 L16.2369563,15.9893799 Z M9.55246117,5.69297913 L11.4123128,10.0551872 L11.0203419,10.3939945 L8.91100116,5.96730759 C8.555728,6.00005841 8.19047397,5.86632225 7.94194336,5.57640172 C7.53709038,5.10395248 7.59544914,4.3960554 8.07207468,3.99489646 C8.54870022,3.59373752 9.26329012,3.65156379 9.6681431,4.12384041 C10.068868,4.59130141 10.0157793,5.28977142 9.55246117,5.69297913 L9.55246117,5.69297913 Z M4.99956189,12.3855538 L8.66851642,12.3855538 L8.66851642,13.1704917 L5.06179681,13.1704917 C5.00241245,13.3760301 4.8831922,13.5670143 4.70640294,13.7157495 C4.2296003,14.1169161 3.51500605,14.0592613 3.11032482,13.5868031 C2.70546938,13.1145174 2.76365428,12.4064342 3.24045692,12.0054402 C3.71708536,11.6042736 4.4316796,11.6619284 4.83653504,12.134214 C4.90347526,12.2123656 4.95775052,12.2969643 4.99956189,12.3855538 L4.99956189,12.3855538 Z M19.9625055,12.0494813 L19.6597344,12.0494813 L14.1561094,13.1623427 L14.1561094,12.3855537 L19.3107922,11.2042104 C19.1250468,10.6214645 19.2920162,9.95842172 19.7858247,9.53677702 C20.4443704,8.97446927 21.4335414,9.05550183 21.9922329,9.71690359 C22.5480348,10.3746849 22.4681422,11.3591276 21.8130386,11.9184962 C21.2784046,12.3750003 20.5257761,12.4073876 19.9625055,12.0494813 L19.9625055,12.0494813 Z M14.1333272,4.61615825 C13.638189,5.03273576 12.8961148,4.97286619 12.4758715,4.48225833 C12.0554473,3.99182972 12.1160506,3.25654531 12.6110079,2.8399678 C13.1059652,2.42339028 13.8480393,2.4834391 14.2684635,2.97386771 C14.6888878,3.46447557 14.6282845,4.19975998 14.1333272,4.61615825 Z M17.7383366,5.01414199 C17.2730252,4.92952189 16.8259059,5.23512336 16.7401927,5.69782375 C16.6543736,6.1612269 16.9634601,6.6052397 17.4292913,6.68995431 C17.8946238,6.77457824 18.3417179,6.46895352 18.4274352,6.00609996 C18.5132476,5.54273285 18.2042044,5.09886325 17.7383366,5.01414199 Z M17.3295563,7.22094766 C16.5654122,7.08198278 16.0603938,6.35650756 16.2003077,5.60100512 C16.3403252,4.84515676 17.0734229,4.34409199 17.8380716,4.48314864 C18.6022317,4.62211641 19.1072311,5.34743212 18.9673227,6.10290532 C18.8273181,6.85889785 18.0942457,7.3600117 17.3295563,7.22094766 Z M3.97138085,4.30919868 C3.60899647,3.88033673 2.97242051,3.82813666 2.54663301,4.19170078 C2.11731296,4.55828122 2.06458226,5.20807999 2.4297559,5.64024289 C2.79214028,6.06910485 3.42871624,6.12130492 3.85450374,5.7577408 C4.28382379,5.39116036 4.33655449,4.74136158 3.97138085,4.30919868 Z M4.39335388,3.96396912 C4.94917304,4.62175049 4.86928515,5.60620646 4.21417534,6.16558038 C3.55569591,6.7278315 2.56652971,6.64671856 2.00778288,5.98547246 C1.45196371,5.32769109 1.5318516,4.34323512 2.18696141,3.7838612 C2.84544084,3.22161008 3.83460704,3.30272301 4.39335388,3.96396912 Z M16.1342345,19.2068204 C15.7720108,18.7779642 15.1354671,18.7257628 14.7096473,19.0893545 C14.2802562,19.4558617 14.2275364,20.1054767 14.5926095,20.5378646 C14.9549316,20.9666529 15.5915275,21.0188064 16.0173948,20.6553305 C16.4467921,20.2888181 16.4994709,19.6390577 16.1342345,19.2068204 Z M21.5702441,10.0621145 C21.2078949,9.63313746 20.5713583,9.58098886 20.1454963,9.9446166 C19.7161635,10.3112079 19.6634428,10.9608346 20.0286192,11.3931587 C20.3910035,11.8220207 21.0275795,11.8742207 21.453367,11.5106566 C21.882687,11.1440762 21.9354177,10.4942774 21.5702441,10.0621145 Z M12.3497248,10.5442764 L12.7271783,5.2176906 L13.3736468,5.2176906 L12.7271783,10.5442764 L12.3497248,10.5442764 Z M3.96486518,6.94803173 L4.74880704,6.17124285 L9.4524582,10.831976 L9.06048727,11.6087649 L3.96486518,6.94803173 Z M14.1560889,10.8319761 L14.1560889,11.3675821 L13.3721675,10.8319761 L16.5079349,6.92709002 L17.2918769,7.72482056 L14.1560889,10.8319761 Z" id="Shape" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/Viewport/PhysXCharacter.svg b/Assets/Editor/Icons/Components/Viewport/PhysXCharacter.svg
new file mode 100644
index 0000000000..d97a560e4f
--- /dev/null
+++ b/Assets/Editor/Icons/Components/Viewport/PhysXCharacter.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Physics  / PhysX / character Copy</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
+            <stop stop-color="#9D9D9D" offset="100%"></stop>
+        </linearGradient>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
+    </defs>
+    <g id="icon-/-Physics--/-PhysX-/-character-Copy" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/general/color/-box-template">
+            <mask id="mask-3" fill="white">
+                <use xlink:href="#path-2"></use>
+            </mask>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#DD7F6D">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="Rectangle-2" x="0" y="0" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+        <path d="M11.9299461,1.54397367 C18.2973073,1.54397367 21.0275184,6.44688647 21.0275184,10.557283 C21.0275184,12.5177179 21.0183642,14.9310325 21.0087878,17.0502739 C21.0083113,17.1557314 21.0079255,17.2409955 21.0076175,17.3101316 L21.0067131,17.5261023 C21.0066612,17.5410523 21.0066239,17.5534948 21.0065996,17.5639381 L21.0066871,17.6176701 C21.0067261,17.6206918 21.0067731,17.6232389 21.0068265,17.6258194 L21.0076759,17.6909194 C21.0077553,17.7018992 21.0078347,17.7149452 21.0079125,17.7305658 L21.0086646,18.0741104 C21.0087424,18.1628048 21.0087878,18.2699282 21.0087878,18.3995459 C21.0087878,19.2468139 20.77724,20.1614587 19.908171,20.8625721 C19.3812347,21.2876731 18.0671789,21.7442976 17.0548061,21.7442976 C17.7740175,20.7435047 18.074528,20.7435047 18.2518198,19.9845099 C18.4291116,19.2255151 18.074528,18.75 17.4617905,18.75 C16.849053,18.75 16.1818378,19.2445658 15.5063168,19.9845099 C14.7604361,20.8015237 13.4749913,21.7442976 12.5541786,21.7442976 C11.6456442,21.7442976 12.7433421,20.7502874 12.7433421,19.9845099 C12.7433421,19.2187324 12.3634471,18.75 11.5724934,18.75 C10.7815398,18.75 10.5858251,19.4364611 9.91899292,20.2442976 C9.25216069,21.0521342 8.46,21.7442976 7.28342994,21.7442976 C6.10685987,21.7442976 7.47521771,20.9732427 7.55343393,19.9845099 C7.59678872,19.4364611 7.59678872,18.75 6.66266994,18.75 C5.73129927,18.75 5.17803306,19.5807078 4.6267821,20.2442976 C4.00304832,20.9951415 3.30956388,21.375 1.78270399,21.375 C2.40648486,20.4932745 2.08814236,20.9548149 2.6362088,19.9845099 C2.99733829,19.3451609 3.00844573,18.7140819 3.00844573,18 L3.00771272,17.3738173 C3.0076617,17.362536 3.00761107,17.3526159 3.00756197,17.3435054 L3.00770006,16.7615098 C3.00789338,16.6653607 3.00813887,16.5503875 3.00844573,16.4121779 C3.01015712,15.6413734 3.01118394,14.8509316 3.01180004,14.0596901 L3.01268996,11.7024044 C3.01272419,11.3154029 3.01272419,10.9329108 3.01272419,10.557283 C3.01272419,6.59272982 5.56258483,1.54397367 11.9299461,1.54397367 Z M9.95989699,8.35430322 L8.80742414,8.35430322 C8.53128176,8.35430322 8.30742414,8.57816085 8.30742414,8.85430322 L8.30742414,8.85430322 L8.30742414,11.9400639 C8.30742414,12.2162063 8.53128176,12.4400639 8.80742414,12.4400639 L8.80742414,12.4400639 L9.95989699,12.4400639 C10.2360394,12.4400639 10.459897,12.2162063 10.459897,11.9400639 L10.459897,11.9400639 L10.459897,8.85430322 C10.459897,8.57816085 10.2360394,8.35430322 9.95989699,8.35430322 L9.95989699,8.35430322 Z M15.7312221,8.35430322 L14.5787492,8.35430322 C14.3026068,8.35430322 14.0787492,8.57816085 14.0787492,8.85430322 L14.0787492,8.85430322 L14.0787492,11.8460459 C14.0787492,12.1221883 14.3026068,12.3460459 14.5787492,12.3460459 L14.5787492,12.3460459 L15.7312221,12.3460459 C16.0073644,12.3460459 16.2312221,12.1221883 16.2312221,11.8460459 L16.2312221,11.8460459 L16.2312221,8.85430322 C16.2312221,8.57816085 16.0073644,8.35430322 15.7312221,8.35430322 L15.7312221,8.35430322 Z" id="Combined-Shape" fill="#FFFFFF" fill-rule="nonzero"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/Viewport/PhysXCollider.svg b/Assets/Editor/Icons/Components/Viewport/PhysXCollider.svg
new file mode 100644
index 0000000000..0d8904e1c3
--- /dev/null
+++ b/Assets/Editor/Icons/Components/Viewport/PhysXCollider.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Physics  / PhysX /  PrimitiveCollider - box</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
+            <stop stop-color="#9D9D9D" offset="100%"></stop>
+        </linearGradient>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
+    </defs>
+    <g id="icon-/-Physics--/-PhysX-/--PrimitiveCollider---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/general/color/-box-template">
+            <mask id="mask-3" fill="white">
+                <use xlink:href="#path-2"></use>
+            </mask>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#DD7F6D">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="Rectangle-2" x="0" y="0" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+        <path d="M21.4907699,10.5433391 C21.3020512,11.2024573 20.6814268,12.5978913 19.6288966,14.7296411 L19.6288966,14.7296411 L22.5610808,15.3982147 L19.6288966,17.2525258 L22.1909472,21.4161022 L18.0064794,19.1661022 L16.2208527,22.1367553 L15.6543753,19.1661022 C13.1041804,20.4389108 11.618329,21.0753151 11.1968212,21.0753151 C11.8299803,20.3253151 13.1725928,18.8802813 14.0309227,17.7622709 C14.8892526,16.6442604 14.8595823,15.0680195 14.7587637,14.2497659 C15.4011037,14.3875886 17.2043991,14.151932 18.3840142,13.2963327 C19.5933693,12.4191624 21.0084367,10.9161022 21.4907699,10.5433391 Z M22.3790759,1.90353749 C19.8097725,3.14674644 19.6777979,5.24734988 19.6739828,6.94059186 L19.6739465,7.57297641 C19.6715755,7.97737876 19.6578963,8.34378364 19.5932228,8.65045446 C19.3047236,10.0184689 19.0411048,10.4176579 19.0411048,10.4176579 C19.0411048,10.4176579 19.0421558,10.3901126 19.0428316,10.3391328 C18.3466128,12.0890837 16.5938037,13.2831335 14.6086839,13.1790978 C14.1703378,13.1561251 13.7498731,13.0713888 13.3552808,12.9337641 C13.7029408,13.6163616 13.881436,14.3966813 13.838464,15.2166358 C13.7692038,16.5381994 13.1385421,17.6972294 12.1896873,18.4747399 L12.1963718,18.4733283 C11.6414797,19.13201 9.60351024,20.09961 8.95986008,20.3085147 C5.56742949,21.4095705 2.28865841,21.5392397 1.78172358,21.5126723 C5.16300325,20.2460801 4.26326515,16.6375199 4.61088524,14.9891643 C4.89938446,13.6211499 5.16300325,13.2219608 5.16300325,13.2219608 L5.16273593,13.2300006 C5.87988102,11.5235982 7.60945094,10.3672474 9.56430092,10.4696968 C10.002647,10.4926695 10.4231118,10.5774058 10.8177041,10.7150305 C10.4700441,10.032433 10.2915489,9.25211326 10.3345209,8.43215881 C10.40524,7.08275773 11.0612604,5.90280964 12.043679,5.12543204 C12.6455376,4.46828516 14.6137828,3.53572943 15.244248,3.33110407 C17.009147,2.75828401 18.7315616,2.38790865 20.0493963,2.16811396 C21.2646599,1.96542655 22.135872,1.89079171 22.3790759,1.90353749 Z M6.31530622,14.8223638 C6.22810928,16.4861805 7.50621217,17.9056576 9.17002893,17.9928546 C10.8338457,18.0800515 12.2533227,16.8019486 12.3405197,15.1381319 C12.4277166,13.4743151 11.1496137,12.054838 9.48579698,11.9676411 C7.82198023,11.8804441 6.40250316,13.158547 6.31530622,14.8223638 Z M7.98683911,1.52934685 L8.55331654,4.5 C11.1035114,3.22719138 12.5893628,2.59078707 13.0108706,2.59078707 C12.3777116,3.34078707 11.035099,4.78582089 10.1767691,5.90383133 C9.31843918,7.02184178 9.34810954,8.59808265 9.44892816,9.41633625 C8.80658814,9.27851364 7.00329275,9.5141702 5.82367767,10.3697694 C4.61432252,11.2469398 3.19925517,12.75 2.71692188,13.1227631 C2.90564063,12.4636449 3.52626507,11.0682109 4.57879521,8.93646111 L4.57879521,8.93646111 L1.646611,8.26788751 L4.57879521,6.41357644 L2.01674464,2.25 L6.20121245,4.5 L7.98683911,1.52934685 Z M11.8324652,8.51066274 C11.7452682,10.1744795 13.0233711,11.5939566 14.6871879,11.6811535 C16.3510046,11.7683504 17.7704817,10.4902476 17.8576786,8.8264308 C17.9448756,7.16261404 16.6667727,5.74313698 15.0029559,5.65594004 C13.3391392,5.5687431 11.9196621,6.84684599 11.8324652,8.51066274 Z" id="Combined-Shape" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/Viewport/PhysXRagdoll.svg b/Assets/Editor/Icons/Components/Viewport/PhysXRagdoll.svg
new file mode 100644
index 0000000000..e083bd2648
--- /dev/null
+++ b/Assets/Editor/Icons/Components/Viewport/PhysXRagdoll.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Physics  / PhysX / ragdoll - box</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
+            <stop stop-color="#9D9D9D" offset="100%"></stop>
+        </linearGradient>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
+    </defs>
+    <g id="icon-/-Physics--/-PhysX-/-ragdoll---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/general/color/-box-template">
+            <mask id="mask-3" fill="white">
+                <use xlink:href="#path-2"></use>
+            </mask>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#DD7F6D">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="Rectangle-2" x="0" y="0" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+        <path d="M11.8480332,6.39683902 L9.34536997,7.30773395 L9.34536997,15.1456379 L10.4834726,15.8790622 L14.3629618,17.9906933 L16.7337828,17.5833364 L17.7664808,15.8790622 L17.7664808,8.58434379 L11.8480332,6.39683902 Z M18.8912,8.8798081 L18.8912,14.2867823 L20.4881928,15.1884775 L18.08798,19.4236113 L14.3173821,19.9400493 L13.0576372,22.6306649 L5.65749546,22.6306649 L9.33128484,17.2716353 L7.7728097,16.2555343 L4.57245497,18.3184106 L3.54439439,16.6574545 L4.57245497,16.040176 L4.57245497,9.04493294 L4.237333,9.16690736 L3.51180719,7.17354158 L8.74690658,5.26812123 L3.51180719,3.36270088 L4.237333,1.3693351 L11.8480332,4.13940344 L19.6921966,1.3693351 L20.4821716,3.36270088 L14.9491599,5.26812123 L20.4881928,7.17354158 L19.8243289,9.16690736 L18.8912,8.8798081 Z M8.20737156,7.70511516 L5.76528005,8.64195487 L5.76528005,15.4875756 L8.20737156,13.9411036 L8.20737156,7.70511516 Z M13.0576372,16.241668 C11.886078,16.241668 10.9363416,15.2919316 10.9363416,14.1203724 C10.9363416,12.9488133 11.886078,11.9990769 13.0576372,11.9990769 C14.2291964,11.9990769 15.1789328,12.9488133 15.1789328,14.1203724 C15.1789328,15.2919316 14.2291964,16.241668 13.0576372,16.241668 Z" id="Shape" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/Viewport/PhysXRigidBody.svg b/Assets/Editor/Icons/Components/Viewport/PhysXRigidBody.svg
new file mode 100644
index 0000000000..d84593860a
--- /dev/null
+++ b/Assets/Editor/Icons/Components/Viewport/PhysXRigidBody.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Physics  / PhysX / RigidBody Copy</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
+            <stop stop-color="#9D9D9D" offset="100%"></stop>
+        </linearGradient>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
+    </defs>
+    <g id="icon-/-Physics--/-PhysX-/-RigidBody-Copy" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/general/color/-box-template">
+            <mask id="mask-3" fill="white">
+                <use xlink:href="#path-2"></use>
+            </mask>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#DD7F6D">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="Rectangle-2" x="0" y="0" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+        <path d="M6.06439372,8.73059848 C7.22282584,5.73027271 7.55858573,3.38869793 7.55858573,3.38869793 C7.55858573,3.38869793 8.89765488,5.85207938 10.1148668,4.88869793 C11.3320787,3.92531647 12.0146389,2.11938257 12.8782346,-0.136094256 C13.8148347,2.12073764 14.58533,3.97848317 15.5185091,4.88869793 C16.4402663,5.78777178 18.1538916,3.38869793 18.1538916,3.38869793 C18.1538916,3.38869793 18.0136947,6.6788915 18.756118,9.18514995 C19.4985412,11.6914084 20.301079,14.4141943 19.5359438,17.0754207 C18.7708086,19.7366471 14.9530868,22.318147 11.1960571,21.7094659 C7.84115704,21.1659343 5.42910667,19.2503752 4.92957605,16.5004335 C4.43004543,13.7504917 4.90596161,11.7309242 6.06439372,8.73059848 Z M11.5949964,19.3302867 C14.7115962,19.6562263 17.0251698,17.782465 17.5363628,15.8533337 C18.0475558,13.9242024 17.2703097,9.58251059 16.7093989,8.34953951 C16.2518243,9.01292591 15.6065529,11.1812624 14.1901866,10.2479022 C13.2254196,9.61213784 12.7921825,7.20926102 12.4042465,5.68763021 C11.5404379,6.73156683 11.4873114,9.52009101 10.2642116,10.4417628 C9.0411118,11.3634346 8.71984249,9.24689167 8.35379103,8.73986737 C7.35918322,9.98195405 6.86909773,14.1090906 7.00166792,15.6648395 C7.1342381,17.2205884 8.47839668,19.0043471 11.5949964,19.3302867 Z" id="Shape" fill="#FFFFFF" transform="translate(12.289158, 10.831691) rotate(37.000000) translate(-12.289158, -10.831691) "></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/Viewport/Physics.png b/Assets/Editor/Icons/Components/Viewport/Physics.png
deleted file mode 100644
index a526f70a8f..0000000000
--- a/Assets/Editor/Icons/Components/Viewport/Physics.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5a6fe6fbdf27dd66c7c53007ba373f3cc271c54842be5276c4193c4a39980936
-size 5149
diff --git a/Assets/Editor/Icons/Components/Viewport/PhysicsConstraint.png b/Assets/Editor/Icons/Components/Viewport/PhysicsConstraint.png
deleted file mode 100644
index 9b18526b4d..0000000000
--- a/Assets/Editor/Icons/Components/Viewport/PhysicsConstraint.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:36f3a663ef30a31a6ac8b2ff50152e1f3a1ea288f68f38fab3dc76d1d3c4df4c
-size 4152
diff --git a/Assets/Editor/Icons/Components/Viewport/PhysicsConstraint.svg b/Assets/Editor/Icons/Components/Viewport/PhysicsConstraint.svg
new file mode 100644
index 0000000000..7c4d1a159f
--- /dev/null
+++ b/Assets/Editor/Icons/Components/Viewport/PhysicsConstraint.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Physics / PhysX / PhysicsConstraint - box</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
+            <stop stop-color="#9D9D9D" offset="100%"></stop>
+        </linearGradient>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
+    </defs>
+    <g id="icon-/-Physics-/-PhysX-/-PhysicsConstraint---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/general/color/-box-template">
+            <mask id="mask-3" fill="white">
+                <use xlink:href="#path-2"></use>
+            </mask>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#DD7F6D">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="Rectangle-2" x="0" y="0" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+        <path d="M8.64922765,13.850432 C8.82859372,14.2018836 8.97089521,14.5546589 9.17673598,14.8650747 C9.38059114,15.1708575 9.64930931,15.432957 10.015322,15.8625089 C8.32954569,15.8115451 6.78143782,15.8916311 5.27039453,15.687114 C3.34303664,15.4263383 2.00076953,13.6737134 2.08350296,11.8343839 C2.16756012,9.96593216 3.60844547,8.35428502 5.55367378,8.22786834 C7.4439671,8.10476101 9.35477831,8.10807034 11.2450716,8.23382515 C13.075135,8.35627062 14.527934,9.91364463 14.6808253,11.639133 C14.747674,12.3929999 14.4491718,12.8635877 13.8501817,12.951616 C13.2458968,13.0396444 12.8567188,12.6901784 12.7051511,11.9230741 C12.5105621,10.9395391 11.9909962,10.2981896 11.0226842,10.2485495 C9.25682193,10.1572118 7.48103168,10.1499313 5.71384569,10.2280317 C4.74685741,10.271053 4.10616976,11.0719126 4.08829934,11.938297 C4.06910518,12.8364511 4.70714537,13.6015698 5.7178169,13.7187204 C6.6702441,13.8292522 7.63657052,13.8107199 8.64922765,13.850432 Z M14.2608705,8.27678034 C15.5614399,8.24434884 16.9070164,8.1192559 18.2400173,8.20000373 C20.3765253,8.328406 21.9358849,10.0148442 21.9201204,12.0136837 C21.905439,13.9807537 20.3619642,15.6380697 18.2519309,15.7558821 C16.459594,15.8564859 14.6520341,15.8545003 12.8596972,15.745954 C10.9376342,15.6294654 9.4636555,14.0892999 9.31076413,12.2777688 C9.256491,11.6317862 9.48086405,11.1770833 10.1294941,11.0275013 C10.6900958,10.8984371 11.1361944,11.2823202 11.2824671,11.9594106 C11.5419192,13.1600381 12.1270099,13.7398339 13.3468316,13.7841791 C14.8903064,13.8410996 16.4384142,13.8338191 17.9825509,13.7815316 C19.1090492,13.7431433 19.8933621,12.9667728 19.9105707,12.0176549 C19.9284411,11.0414005 19.224876,10.315332 18.0513851,10.2021526 C17.2975181,10.1286854 16.5323994,10.1829585 15.7738994,10.1432464 C15.5852672,10.1333184 15.3317719,10.0280815 15.2331537,9.88180881 C14.8697885,9.34768181 14.5587108,8.77847584 14.2608705,8.27678034 Z" id="Shape" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/Viewport/PointLight.png b/Assets/Editor/Icons/Components/Viewport/PointLight.png
deleted file mode 100644
index f58aa0dda9..0000000000
--- a/Assets/Editor/Icons/Components/Viewport/PointLight.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e8a0fd849a150ef48cafc012532b95babe95b5f4b5170118bfb49e0d0d97eed4
-size 4994
diff --git a/Assets/Editor/Icons/Components/Viewport/PointLight.svg b/Assets/Editor/Icons/Components/Viewport/PointLight.svg
new file mode 100644
index 0000000000..d9b0f970fb
--- /dev/null
+++ b/Assets/Editor/Icons/Components/Viewport/PointLight.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Rendering / PointLight - box</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
+            <stop stop-color="#9D9D9D" offset="100%"></stop>
+        </linearGradient>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
+    </defs>
+    <g id="icon-/-Rendering-/-PointLight---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/general/color/-box-template">
+            <mask id="mask-3" fill="white">
+                <use xlink:href="#path-2"></use>
+            </mask>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#B29EDF">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="Rectangle-2" x="0" y="-0.00055502734" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+        <path d="M11.0039744,20.4705948 C11.5393978,21.1503288 13.4649954,21.1240649 13.8493579,20.4705948 L11.0039744,20.4705948 Z M12.4098795,18.9471874 C12.8523277,18.9471874 13.2948542,18.9522206 13.7372241,18.9438844 C13.8589659,18.941525 14.0228008,19.0217422 14.031329,18.6233302 C14.0400136,18.2162672 13.8775088,18.2727339 13.7527939,18.2719474 C12.8678975,18.2672288 11.9829228,18.2675433 11.0980264,18.2713183 C10.9715903,18.2719474 10.8095548,18.2255473 10.8223862,18.6296217 C10.8348264,19.0218995 10.9994438,18.9401094 11.1214984,18.9424688 C11.5508805,18.9506478 11.9804191,18.9456145 12.4098795,18.9471874 L12.4098795,18.9471874 Z M12.3797874,20.0090599 C12.8486026,20.0090599 13.3174177,20.0104378 13.7861546,20.0079576 C13.9060968,20.0074065 14.0347237,20.0052019 14.033173,19.7053785 C14.0316723,19.4032128 13.9001506,19.4123067 13.7822426,19.4120312 C12.8838106,19.4096888 11.9852222,19.4089999 11.086712,19.4112044 C10.9719336,19.41148 10.8321184,19.3802025 10.8209301,19.6778212 C10.8080204,20.0246298 10.9597281,20.0071309 11.090624,20.0080954 C11.5203973,20.0109889 11.9500923,20.0091977 12.3797874,20.0090599 L12.3797874,20.0090599 Z M13.2607657,13.4947637 C12.8423777,14.33615 12.9912741,15.5980916 12.9993731,16.7900821 C13.0002814,16.9251159 13.0659817,16.9582688 13.1924623,16.9452498 C13.596201,16.9036951 14.1723547,16.6033321 14.2230681,16.1863474 C14.3123841,15.4519879 14.5085766,14.7623622 14.9058059,14.1261747 C15.1081294,13.8022149 15.4106261,13.4539499 15.7053802,13.1295359 C16.2802575,12.5331621 16.3863751,11.6125545 16.282181,11.1194792 C16.1343075,10.4197004 15.8025237,9.83930799 15.3809974,9.26465773 C14.5181894,8.08848671 13.3847841,7.39764992 11.9494452,7.51746964 C10.1519223,7.66756599 8.93608888,8.752453 8.22519383,10.380654 C7.93143491,11.0536276 7.82338977,11.8171831 8.09064542,12.4952166 C8.27274784,12.7688913 8.44538055,13.0085133 8.64543332,13.2286243 C9.38138228,14.0383725 9.92726975,14.9343334 10.0408828,16.0513893 C10.097273,16.606057 10.243509,16.7726541 10.7758477,16.9037519 C11.0066313,16.9606719 10.9940011,16.9911189 11.2299317,17.0267696 C11.4405056,17.0586358 11.5379963,17.0083766 11.5475335,16.75428 C11.5882555,15.6633377 11.4969715,14.6108467 11.0690872,13.5781111 C10.865931,13.0877813 10.6415761,12.4372614 10.5233511,12.1323409 C10.4051261,11.8274204 10.3156207,11.6908656 10.6150333,11.5694299 C10.9144459,11.4479943 11.0056578,11.7906463 11.0802895,12.0394533 C11.0986069,12.2095322 11.1946594,12.2732645 11.3625433,12.2645599 C11.5379206,12.2554013 12.013591,12.2747973 12.1886866,12.2747973 C12.6309555,12.2747973 12.5785397,12.2645599 13.0031142,12.2645599 C13.1924623,12.2747973 13.2726196,12.0804781 13.3015338,12.0270399 C13.4098484,11.8264572 13.3755601,11.4516327 13.7381227,11.5354232 C14.1248308,11.624815 13.9705714,11.9055741 13.8822394,12.1594244 C13.7618604,12.4690754 13.6791537,12.6533774 13.2607657,13.4947637 Z M13.059965,12.9584771 C13.1175824,12.7896262 13.1342274,12.6776725 12.8985565,12.6807935 C12.4208926,12.6871154 11.9430688,12.6852748 11.465405,12.6815937 C11.2670253,12.6800733 11.2473679,12.7651457 11.3079976,12.9322292 C11.465405,13.3660132 11.770323,14.3349715 11.9334121,14.7679018 C11.9334121,15.4766571 11.9554987,15.6348818 11.9334121,16.3511774 C11.9260499,16.5900493 11.9317316,16.7591709 11.9334121,16.9983629 C11.9343724,17.1280819 11.9744652,17.3020965 12.1866091,17.3078583 C12.415398,17.3141002 12.4692272,17.1912714 12.4683469,17.0392256 C12.4637856,16.2821977 12.4609847,15.5250098 12.4576237,14.7679018 C12.6576839,14.1645202 12.8543832,13.5599381 13.059965,12.9584771 Z M17.0110834,10.4301747 C17.1345606,10.9103993 17.1209393,11.2191923 17.0895699,11.7117406 C16.9279743,13.2144364 16.112733,13.7535753 15.5561654,14.6554468 C15.1950967,15.240503 14.9633469,15.8726933 14.8982874,16.562661 C14.8592356,16.977906 14.6707695,17.3160081 14.3141021,17.5263114 C14.0276159,17.6951623 13.8810512,17.659675 13.5698375,17.7839524 C13.7525325,17.7839524 13.9012002,17.815694 14.0804475,17.868768 C14.3564163,17.9504805 14.6827562,18.109812 14.5827261,18.6695005 C14.4963,19.1523659 14.4265891,18.9822162 14.5827261,19.4085753 C14.6799129,19.673961 14.5116974,20.4812898 14.0804475,20.9316398 C13.6491977,21.3819899 13.2534311,21.4608118 12.9315742,21.4766565 C12.3888508,21.5035446 11.8342986,21.5614912 11.3081402,21.3752751 C10.5694378,21.1139964 10.101697,20.2008415 10.2788703,19.4271686 C10.3137608,19.2748828 10.274549,19.1440434 10.2396585,19 C10.101857,18.4315889 10.4387848,17.9814882 10.9349341,17.8158383 C10.5318528,17.7075657 10.1458966,17.6426662 9.83916424,17.38971 C9.63086153,17.2178983 9.4278404,17.0252803 9.40751428,16.7446358 C9.3265299,15.6241385 8.8586658,14.593961 8.16377984,13.8166343 C7.76979732,13.37591 7.49372655,13 7.25810683,12.2575729 C6.6568058,10.4026945 7.85144581,8.63443412 9.21073504,7.62597051 C12.1994748,5.40874298 16.1994791,7.27202395 17.0110834,10.4301747 Z M21.2967102,11.0432284 C21.5148559,11.0458692 21.654818,11.2283241 21.6396935,11.4563128 C21.6252891,11.6753387 21.5081338,11.832586 21.2600592,11.8329061 C20.3166551,11.8337864 19.3732511,11.8365873 18.4298471,11.8313057 C18.0502928,11.829145 18.0241516,11.7207879 18.0339946,11.4371825 C18.0438376,11.1535771 18.1457663,11.0432284 18.3706075,11.0432284 C19.36705,11.0432284 20.3012105,11.0310647 21.2967102,11.0432284 Z M2.81444431,11.0548988 C3.85907881,11.0568194 4.56656903,11.0568194 5.69165542,11.1146174 C5.89611697,11.1146174 6.0342204,11.2710548 6.00509137,11.5007759 C5.97596234,11.730497 5.75573959,11.8351247 5.5327827,11.8344341 C4.62666687,11.8316273 3.7206154,11.834194 2.81444431,11.834194 C2.62377423,11.834194 2.54911919,11.8220304 2.47218127,11.747768 C2.39524335,11.6735056 2.36086775,11.3551863 2.46689968,11.1441627 C2.53994244,11.0398749 2.74050205,11.0548188 2.81444431,11.0548988 Z M20.4365886,4.47417829 C20.5631867,4.54291898 20.627366,4.65543286 20.6171229,4.84276926 C20.5991975,4.88030056 20.5814322,4.96624643 20.5296566,5.01866221 C19.8412093,5.7158321 19.1502813,6.4106813 18.4542317,7.1002489 C18.2899423,7.26293788 18.092923,7.28454439 17.9255926,7.10585059 C17.757382,6.9261965 17.8048362,6.7388601 17.9664049,6.57657124 C18.6327655,5.90692964 19.3012868,5.23936866 19.9689278,4.57092742 C20.1037684,4.4360068 20.2574946,4.37686899 20.4365886,4.47417829 Z M4.75616242,4.5290507 C5.51255014,5.21325669 6.22180367,5.94587725 6.92177441,6.68714042 C6.96282677,6.73067353 6.96866853,6.80741663 6.98083219,6.8408667 C6.98043207,7.02028072 6.91065106,7.13047389 6.78189229,7.19233251 C6.59991751,7.27971882 6.45155284,7.21097813 6.31751249,7.07597748 C5.85897444,6.61391838 5.3971554,6.15506023 4.93685682,5.6946016 C4.7208718,5.47853655 4.49976523,5.2671129 4.29194266,5.04336554 C4.14517848,4.88523793 4.14229761,4.70582392 4.2910624,4.54313494 C4.43670625,4.38372695 4.62108175,4.40685391 4.75616242,4.5290507 Z M12.381869,1.32250507 C12.6513101,1.34379148 12.8546513,1.513764 12.8546513,1.78536442 C12.8546513,2.6733431 12.7846302,4.59108912 12.7508601,4.67367398 C12.6693955,4.87293397 12.5000646,4.93871378 12.2980037,4.91478657 C12.0927419,4.89037922 12.0012744,4.75041709 12.0005542,4.55755902 C11.9971932,3.58814717 11.9995139,2.61881534 11.9988737,1.64940349 C11.9987136,1.40653037 12.1484387,1.33346837 12.381869,1.32250507 Z" id="Combined-Shape" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/Viewport/PolygonPrism.png b/Assets/Editor/Icons/Components/Viewport/PolygonPrism.png
deleted file mode 100644
index d6748b86b5..0000000000
--- a/Assets/Editor/Icons/Components/Viewport/PolygonPrism.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:96c1367c487de74750f4ba059108a9c48c587ef7a90a3b2eb6d1d8310301eebb
-size 4714
diff --git a/Assets/Editor/Icons/Components/Viewport/PolygonPrism.svg b/Assets/Editor/Icons/Components/Viewport/PolygonPrism.svg
new file mode 100644
index 0000000000..a1943f57f1
--- /dev/null
+++ b/Assets/Editor/Icons/Components/Viewport/PolygonPrism.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Shapes / PolygonPrism - box</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
+            <stop stop-color="#9D9D9D" offset="100%"></stop>
+        </linearGradient>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
+    </defs>
+    <g id="icon-/-Shapes-/-PolygonPrism---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/general/color/-box-template">
+            <mask id="mask-3" fill="white">
+                <use xlink:href="#path-2"></use>
+            </mask>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#5A69A1">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="Rectangle-2" x="0" y="0" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+        <path d="M19.9017239,5.27764074 L15.8749409,3.39494038 L12.934303,5.60108461 L16.511702,8.1367453 L19.9017239,5.27764074 Z M14.9503518,8.36249704 L12.0210661,6.28621909 L9.25353102,8.36249704 L14.9503518,8.36249704 Z M9.52998834,3.18810609 L12.0053289,4.94262769 L14.343985,3.18810609 L9.52998834,3.18810609 L9.52998834,3.18810609 Z M3.95625753,5.62776217 L7.63852378,8.2187203 L11.092092,5.62776217 L7.9824946,3.4236793 L3.95625753,5.62776217 Z M8.21789762,14.4595831 L15.8351155,14.4595831 L15.9290657,14.5125239 L15.9290657,9.7479088 L8.21789762,9.7479088 L8.21789762,14.4595831 Z M7.20742071,14.5124396 L7.20742071,9.88310602 L2.96107346,6.3077052 L2.86163064,16.9500775 L7.20742071,14.5124396 Z M8.21789762,20.4321632 L15.9290657,20.4321632 L15.9290657,16.1915223 L15.4889456,15.9890137 L8.37165088,15.9890137 L8.21789762,16.0689342 L8.21789762,20.4321632 L8.21789762,20.4321632 Z M7.20742071,19.9359513 L7.20742071,16.2905422 L4.60896521,17.7480662 L7.20742071,19.9359513 Z M16.9395426,14.6242043 L20.986906,16.6338121 L20.986906,6.19452546 L16.9395426,9.84259567 L16.9395426,14.6242043 Z M16.9395426,19.8373467 L19.428755,17.5937078 L16.9395426,16.3577573 L16.9395426,19.8373467 L16.9395426,19.8373467 Z M21.9973829,17.3534034 L21.4660563,17.8323119 L16.849041,21.993835 L7.25618921,21.993835 L1.90393561,17.5019559 L1.95843809,5.46349178 L1.95915632,5.38662663 L2.02910093,5.34739335 L7.98580078,2.00616503 L15.8351155,2.00616503 L21.7321276,4.93416544 L21.9973829,5.0658707 L21.9973829,5.28373728 L21.9973829,17.1355368 L21.9973829,17.3534034 Z" id="Shape" fill="#FFFFFF" fill-rule="nonzero"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/Viewport/PolygonPrism_Shape.svg b/Assets/Editor/Icons/Components/Viewport/PolygonPrism_Shape.svg
new file mode 100644
index 0000000000..0d047e5b07
--- /dev/null
+++ b/Assets/Editor/Icons/Components/Viewport/PolygonPrism_Shape.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Shapes / PolygonPrismShape - box</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
+            <stop stop-color="#9D9D9D" offset="100%"></stop>
+        </linearGradient>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
+    </defs>
+    <g id="icon-/-Shapes-/-PolygonPrismShape---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/general/color/-box-template">
+            <mask id="mask-3" fill="white">
+                <use xlink:href="#path-2"></use>
+            </mask>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#5A69A1">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="Rectangle-2" x="0" y="0" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+        <path d="M19.9017239,5.27764074 L15.8749409,3.39494038 L12.934303,5.60108461 L16.511702,8.1367453 L19.9017239,5.27764074 Z M14.9503518,8.36249704 L12.0210661,6.28621909 L9.25353102,8.36249704 L14.9503518,8.36249704 Z M9.52998834,3.18810609 L12.0053289,4.94262769 L14.343985,3.18810609 L9.52998834,3.18810609 L9.52998834,3.18810609 Z M3.95625753,5.62776217 L7.63852378,8.2187203 L11.092092,5.62776217 L7.9824946,3.4236793 L3.95625753,5.62776217 Z M8.21789762,14.4595831 L15.8351155,14.4595831 L15.9290657,14.5125239 L15.9290657,9.7479088 L8.21789762,9.7479088 L8.21789762,14.4595831 Z M7.20742071,14.5124396 L7.20742071,9.88310602 L2.96107346,6.3077052 L2.86163064,16.9500775 L7.20742071,14.5124396 Z M8.21789762,20.4321632 L15.9290657,20.4321632 L15.9290657,16.1915223 L15.4889456,15.9890137 L8.37165088,15.9890137 L8.21789762,16.0689342 L8.21789762,20.4321632 L8.21789762,20.4321632 Z M7.20742071,19.9359513 L7.20742071,16.2905422 L4.60896521,17.7480662 L7.20742071,19.9359513 Z M16.9395426,14.6242043 L20.986906,16.6338121 L20.986906,6.19452546 L16.9395426,9.84259567 L16.9395426,14.6242043 Z M16.9395426,19.8373467 L19.428755,17.5937078 L16.9395426,16.3577573 L16.9395426,19.8373467 L16.9395426,19.8373467 Z M21.9973829,17.3534034 L21.4660563,17.8323119 L16.849041,21.993835 L7.25618921,21.993835 L1.90393561,17.5019559 L1.95843809,5.46349178 L1.95915632,5.38662663 L2.02910093,5.34739335 L7.98580078,2.00616503 L15.8351155,2.00616503 L21.7321276,4.93416544 L21.9973829,5.0658707 L21.9973829,5.28373728 L21.9973829,17.1355368 L21.9973829,17.3534034 Z" id="Shape" fill="#FFFFFF" fill-rule="nonzero"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/Viewport/Primitive Collider.png b/Assets/Editor/Icons/Components/Viewport/Primitive Collider.png
deleted file mode 100644
index decdf1f52d..0000000000
--- a/Assets/Editor/Icons/Components/Viewport/Primitive Collider.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b9b8d210bd3ed4666951e9436359812b7882bae1a329a7e8598d8078505170fc
-size 4898
diff --git a/Assets/Editor/Icons/Components/Viewport/PrimitiveCollider.png b/Assets/Editor/Icons/Components/Viewport/PrimitiveCollider.png
deleted file mode 100644
index decdf1f52d..0000000000
--- a/Assets/Editor/Icons/Components/Viewport/PrimitiveCollider.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b9b8d210bd3ed4666951e9436359812b7882bae1a329a7e8598d8078505170fc
-size 4898
diff --git a/Assets/Editor/Icons/Components/Viewport/ProjectorLight.png b/Assets/Editor/Icons/Components/Viewport/ProjectorLight.png
deleted file mode 100644
index 7161aa6aad..0000000000
--- a/Assets/Editor/Icons/Components/Viewport/ProjectorLight.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8800ab4f65fc969bda7a0c16a709fd583937c3648dc2a66f44ae7bd623b8e13f
-size 3934
diff --git a/Assets/Editor/Icons/Components/Viewport/ProjectorLight.svg b/Assets/Editor/Icons/Components/Viewport/ProjectorLight.svg
new file mode 100644
index 0000000000..48c9b9f13b
--- /dev/null
+++ b/Assets/Editor/Icons/Components/Viewport/ProjectorLight.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Rendering / ProjectorLight - box</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
+            <stop stop-color="#9D9D9D" offset="100%"></stop>
+        </linearGradient>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
+    </defs>
+    <g id="icon-/-Rendering-/-ProjectorLight---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/general/color/-box-template">
+            <mask id="mask-3" fill="white">
+                <use xlink:href="#path-2"></use>
+            </mask>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#B29EDF">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="Rectangle-2" x="0" y="-0.00055502734" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+        <path d="M3.80820088,6.90293957 C3.81434755,6.90293957 3.81303329,6.90426001 3.81303329,6.90553645 L3.81303329,17.4000226 L12.2176097,17.4026195 C12.211463,17.4026195 12.2127772,17.4012991 12.2127772,17.4000226 L12.2127772,15.3026835 L14.3127132,15.3026835 L14.3127132,9.00287556 L12.2127772,9.00287556 L12.2127772,6.90553645 L3.80820088,6.90293957 Z M14.3138088,7.95290756 C14.8930851,7.95290756 15.3626812,8.42251297 15.3626812,8.9997573 L15.3626812,15.3058018 C15.3626812,15.8839609 14.8911088,16.3526515 14.3138088,16.3526515 L13.1449081,16.3584014 L13.1449081,17.4000226 C13.169096,17.9861548 12.6063151,18.3560013 12.27958,18.3560013 L3.8701712,18.3560013 C3.12672687,18.3560013 2.49454948,17.9243807 2.49454948,16.8907887 C2.49454948,16.2017273 2.50592504,13.0099047 2.52867615,7.31532082 C2.52867615,6.15648121 2.59569996,5.82170689 3.7515268,5.82170689 L12.27958,5.82170689 C12.9793604,5.82170689 13.2699595,6.39028754 13.2699595,7.05094252 L13.2699595,7.95290756 L14.3138088,7.95290756 Z M17.2150389,6.16909157 C17.3892152,6.34326788 17.4662487,6.68113548 17.3866313,6.76075288 L16.1898732,7.95751098 C16.1102558,8.03712838 15.8067783,7.92863112 15.6323916,7.75424445 C15.4580049,7.57985778 15.3430392,7.26991176 15.4226566,7.19029436 L16.6194147,5.99353626 C16.6990321,5.91391886 17.0406523,5.9947049 17.2150389,6.16909157 Z M19.1623344,4.22179611 C19.3365107,4.39597242 19.4135442,4.73384002 19.3339268,4.81345742 L18.1371687,6.01021552 C18.0575513,6.08983292 17.7540737,5.98133566 17.5796871,5.80694899 C17.4053004,5.63256232 17.2903347,5.3226163 17.3699521,5.2429989 L18.5667102,4.0462408 C18.6463276,3.9666234 18.9879477,4.04740944 19.1623344,4.22179611 Z M21.1096298,2.27450065 C21.2838062,2.44867695 21.3608397,2.78654455 21.2812223,2.86616196 L20.0844642,4.06292006 C20.0048468,4.14253746 19.7013692,4.03404019 19.5269825,3.85965353 C19.3525959,3.68526686 19.2376301,3.37532084 19.3172475,3.29570344 L20.5140056,2.09894534 C20.593623,2.01932794 20.9352432,2.10011398 21.1096298,2.27450065 Z M17.4045557,17.8342159 C17.2303793,18.0083923 16.8925117,18.0854258 16.8128943,18.0058084 L15.6161362,16.8090503 C15.5365188,16.7294329 15.6450161,16.4259553 15.8194028,16.2515686 C15.9937894,16.077182 16.3037355,15.9622162 16.3833529,16.0418337 L17.580111,17.2385917 C17.6597284,17.3182092 17.5789423,17.6598293 17.4045557,17.8342159 Z M19.3518511,19.7815114 C19.1776748,19.9556877 18.8398072,20.0327212 18.7601898,19.9531038 L17.5634317,18.7563457 C17.4838143,18.6767283 17.5923116,18.3732508 17.7666982,18.1988641 C17.9410849,18.0244774 18.2510309,17.9095117 18.3306483,17.9891291 L19.5274064,19.1858872 C19.6070238,19.2655046 19.5262378,19.6071247 19.3518511,19.7815114 Z M21.2991466,21.7288069 C21.1249703,21.9029832 20.7871027,21.9800167 20.7074853,21.9003993 L19.5107272,20.7036412 C19.4311098,20.6240238 19.539607,20.3205462 19.7139937,20.1461595 C19.8883804,19.9717729 20.1983264,19.8568072 20.2779438,19.9364246 L21.4747019,21.1331827 C21.5543193,21.2128001 21.4735332,21.5544202 21.2991466,21.7288069 Z" id="Shape" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/Viewport/Ragdoll.png b/Assets/Editor/Icons/Components/Viewport/Ragdoll.png
deleted file mode 100644
index 2b916c6e6f..0000000000
--- a/Assets/Editor/Icons/Components/Viewport/Ragdoll.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7f0b172462c35e537c6101ee8fe65c1d4fe5c1ecbe90c23829ca0177b69e9687
-size 4874
diff --git a/Assets/Editor/Icons/Components/Viewport/RandomTimedSpawner.png b/Assets/Editor/Icons/Components/Viewport/RandomTimedSpawner.png
deleted file mode 100644
index e4c010ffe7..0000000000
--- a/Assets/Editor/Icons/Components/Viewport/RandomTimedSpawner.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8d712da308ecbec4d899ce180dcefac90dc8537005d13c5d15bf2fc89252cfe2
-size 4239
diff --git a/Assets/Editor/Icons/Components/Viewport/RandomTimedSpawner.svg b/Assets/Editor/Icons/Components/Viewport/RandomTimedSpawner.svg
new file mode 100644
index 0000000000..ac1d101de6
--- /dev/null
+++ b/Assets/Editor/Icons/Components/Viewport/RandomTimedSpawner.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Gameplay / RandomTimedSpawner - box</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
+            <stop stop-color="#9D9D9D" offset="100%"></stop>
+        </linearGradient>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
+    </defs>
+    <g id="icon-/-Gameplay-/-RandomTimedSpawner---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/general/color/-box-template">
+            <mask id="mask-3" fill="white">
+                <use xlink:href="#path-2"></use>
+            </mask>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#65C98C">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="Rectangle-2" x="0" y="0" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+        <path d="M11.4717187,1.26147319 C15.9746763,1.26147319 19.6250446,10.0571346 19.6250446,14.5690256 C19.6250446,19.0809165 15.9746763,22.7385268 11.4717187,22.7385268 C6.96876116,22.7385268 3.31839282,19.0809165 3.31839282,14.5690256 C3.31839282,10.0571346 6.96876116,1.26147319 11.4717187,1.26147319 Z M15.732635,8.81821428 L15.7323928,10.2574732 L13.0488627,10.2575935 L10.8383928,12.5534732 L8.77491792,10.4091071 L5.50021567,10.4091071 C5.17385404,10.4091071 4.90928568,10.6641948 4.90928568,10.9788614 C4.90928568,11.293528 5.17385404,11.5486157 5.50021567,11.5486157 L5.50021567,11.5486157 L8.25921963,11.5486157 L10.0323928,13.3914732 L8.25921963,15.2354468 L5.50021567,15.2354468 C5.17385404,15.2354468 4.90928568,15.4905345 4.90928568,15.8052011 C4.90928568,16.1198677 5.17385404,16.3749554 5.50021567,16.3749554 L8.77491792,16.3749554 L10.8383928,14.2294732 L13.0488627,16.526469 L15.7323928,16.5254732 L15.732635,17.9658482 L18.0341518,15.9867018 L15.732635,14.127035 L15.7323928,15.3864732 L13.564561,15.3869604 L11.6443928,13.3914732 L13.564561,11.3971021 L15.7323928,11.3964732 L15.732635,12.6570275 L18.0341518,10.7973608 L15.732635,8.81821428 Z" id="Icon" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/Viewport/RigidPhysics.png b/Assets/Editor/Icons/Components/Viewport/RigidPhysics.png
deleted file mode 100644
index e0c17c212f..0000000000
--- a/Assets/Editor/Icons/Components/Viewport/RigidPhysics.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fb0921b5c381e42963e9d0f690e36de094678bc0ad03681233792fb11b780506
-size 3688
diff --git a/Assets/Editor/Icons/Components/Viewport/RigidPhysics.svg b/Assets/Editor/Icons/Components/Viewport/RigidPhysics.svg
new file mode 100644
index 0000000000..d655a4a8f9
--- /dev/null
+++ b/Assets/Editor/Icons/Components/Viewport/RigidPhysics.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Physics / PhysX / RigidPhysics - box</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
+            <stop stop-color="#9D9D9D" offset="100%"></stop>
+        </linearGradient>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
+    </defs>
+    <g id="icon-/-Physics-/-PhysX-/-RigidPhysics---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/general/color/-box-template">
+            <mask id="mask-3" fill="white">
+                <use xlink:href="#path-2"></use>
+            </mask>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#DD7F6D">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="Rectangle-2" x="0" y="0" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+        <path d="M12.1875,21 C7.32049064,21 3.375,17.0545094 3.375,12.1875 C3.375,7.32049064 7.32049064,3.375 12.1875,3.375 C17.0545094,3.375 21,7.32049064 21,12.1875 C21,17.0545094 17.0545094,21 12.1875,21 Z M11.375,11.375 L11.375,4.03978956 C7.50197046,4.4212683 4.4212683,7.50197046 4.03978956,11.375 L11.375,11.375 Z M12.625,20.3635108 C16.7985591,20.1437686 20.1437686,16.7985591 20.3635108,12.625 L12.625,12.625 L12.625,20.3635108 Z" id="Shape" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/Viewport/SimpleLODDistance.svg b/Assets/Editor/Icons/Components/Viewport/SimpleLODDistance.svg
new file mode 100644
index 0000000000..d7942b5234
--- /dev/null
+++ b/Assets/Editor/Icons/Components/Viewport/SimpleLODDistance.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Animation / SimpleLODDistance - box</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
+            <stop stop-color="#9D9D9D" offset="100%"></stop>
+        </linearGradient>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
+    </defs>
+    <g id="icon-/-Animation-/-SimpleLODDistance---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/general/color/-box-template">
+            <mask id="mask-3" fill="white">
+                <use xlink:href="#path-2"></use>
+            </mask>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#5AA9D2">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="UI" x="0" y="0" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+        <path d="M9.65613074,9.14003989 L9.69357906,9.10058594 L9.70614106,9.11587953 L12.6844813,2.69553277 L15.5012533,9.48599975 L17.7301967,6.42458544 L21.4153176,11.6958371 L21.4971533,11.8911908 L23.0203335,20.1084517 L1.74190235,20.1084517 L3.29787764,12.6661124 L3.3499047,12.526177 L6.68990442,6.4958984 L9.65613074,9.14003989 Z M2.76516829,18.6424246 L4.66700321,15.1304007 L3.72000332,14.5942809 L2.76516829,18.6424246 Z M3.66540341,19.1084517 L8.44101431,19.1084517 L7.10155675,17.6720694 L3.66540341,19.1084517 Z M9.12468027,19.1084517 L9.16319006,19.1084517 L12.1789615,17.3692315 L10.5272435,16.2400624 L10.0842651,16.4252364 L7.59346891,17.4664401 L9.12468027,19.1084517 Z M10.1640251,19.1084517 L14.7230459,19.1084517 L12.6369246,17.6823102 L10.1640251,19.1084517 Z M15.6090065,19.1084517 L15.7204922,19.1084517 L18.2576751,17.6376261 L15.5246665,16.2551354 L15.1116158,16.2551354 L13.1174865,17.4051662 L15.6090065,19.1084517 Z M16.7174432,19.1084517 L21.2677357,19.1084517 L18.7986435,17.901963 L16.7174432,19.1084517 L16.7174432,19.1084517 Z M21.7593047,18.792151 L21.3230336,16.4385534 L19.319542,17.5999938 L21.7593047,18.792151 L21.7593047,18.792151 Z M20.9534894,15.4737454 L18.8896286,15.2431297 L16.3404756,16.1443131 L18.7785737,17.3356569 L21.1268329,15.974352 L20.9534894,15.4737454 L20.9534894,15.4737454 Z M12.6486957,14.0965621 L11.0973608,15.6197946 L14.4307823,15.6774679 L12.6486957,14.0965621 Z M9.49502638,16.1655987 L5.53645171,15.2776294 L7.2298524,17.0765119 L9.49502638,16.1655987 Z M4.16639829,13.3984048 L5.05116924,13.9916313 L8.96736287,9.8656964 L6.95846449,8.07493232 L4.26126433,12.9446538 L4.16639829,13.3984048 Z M6.03479188,14.4079065 L9.95571405,15.3645391 L11.9309805,13.400001 L9.63945513,10.6101867 L6.03479188,14.4079065 L6.03479188,14.4079065 Z M16.2533124,10.1520165 L19.1120782,14.2617627 L20.9577649,14.4679996 L20.5336522,12.179994 L17.713667,8.14624529 L16.2533124,10.1520165 L16.2533124,10.1520165 Z M15.3045292,11.4551534 L15.2605297,11.5155859 L15.2556338,11.5037832 L13.3554671,13.3936294 L15.5929419,15.3479333 L18.0461975,14.4806518 L15.6811113,11.0806166 L15.3045292,11.4551534 L15.3045292,11.4551534 Z M14.8414617,10.5053275 L12.6333311,5.18212826 L10.4102232,9.97443621 L12.6387321,12.6960934 L14.8414617,10.5053275 L14.8414617,10.5053275 Z M3.29785273,18.7201681 L6.73794023,17.2821412 L5.06429406,15.487388 L3.29785273,18.7201681 Z M12.6595234,17.0920875 L14.0307231,16.3013053 L11.3392906,16.1895326 L12.6595234,17.0920875 Z" id="Shape" fill="#FFFFFF" fill-rule="nonzero"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/Viewport/SimpleState.png b/Assets/Editor/Icons/Components/Viewport/SimpleState.png
deleted file mode 100644
index 555ab0e6c3..0000000000
--- a/Assets/Editor/Icons/Components/Viewport/SimpleState.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:84f87c255bfa8f1aeb09ddb52748e256a95afdd1b6d28fe535d8a0bc82f71e63
-size 2745
diff --git a/Assets/Editor/Icons/Components/Viewport/SimpleState.svg b/Assets/Editor/Icons/Components/Viewport/SimpleState.svg
new file mode 100644
index 0000000000..5c12474458
--- /dev/null
+++ b/Assets/Editor/Icons/Components/Viewport/SimpleState.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Gameplay / SimpleState - box</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
+            <stop stop-color="#9D9D9D" offset="100%"></stop>
+        </linearGradient>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
+    </defs>
+    <g id="icon-/-Gameplay-/-SimpleState---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/general/color/-box-template">
+            <mask id="mask-3" fill="white">
+                <use xlink:href="#path-2"></use>
+            </mask>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#65C98C">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="Rectangle-2" x="0" y="0" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+        <path d="M2.39750293,6.23957535 C2.39750293,6.9288074 2.95867953,7.48957535 3.64750293,7.48957535 C4.33632633,7.48957535 4.89750293,6.9288074 4.89750293,6.23957535 C4.89750293,5.5503433 4.33632633,4.98957535 3.64750293,4.98957535 C2.95867953,4.98957535 2.39750293,5.5503433 2.39750293,6.23957535 Z M5.64750293,6.23957535 C5.64750293,7.34226888 4.75069712,8.23957535 3.64750293,8.23957535 C2.54430874,8.23957535 1.64750293,7.34226888 1.64750293,6.23957535 C1.64750293,5.13688182 2.54430874,4.23957535 3.64750293,4.23957535 C4.75069712,4.23957535 5.64750293,5.13688182 5.64750293,6.23957535 Z M21.8747157,6.23957535 C21.8747157,7.34226888 20.9779099,8.23957535 19.8747157,8.23957535 C18.7715215,8.23957535 17.8747157,7.34226888 17.8747157,6.23957535 C17.8747157,5.13688182 18.7715215,4.23957535 19.8747157,4.23957535 C20.9779099,4.23957535 21.8747157,5.13688182 21.8747157,6.23957535 Z M18.6247157,6.23957535 C18.6247157,6.9288074 19.1858923,7.48957535 19.8747157,7.48957535 C20.5635391,7.48957535 21.1247157,6.9288074 21.1247157,6.23957535 C21.1247157,5.5503433 20.5635391,4.98957535 19.8747157,4.98957535 C19.1858923,4.98957535 18.6247157,5.5503433 18.6247157,6.23957535 Z M17.2405032,6.64341836 L11.8632089,15.7085814 L6.44979209,6.64341836 L17.2405032,6.64341836 Z M14.0504317,18.7526036 C14.0504317,19.8552971 13.1536259,20.7526036 12.0504317,20.7526036 C10.9472375,20.7526036 10.0504317,19.8552971 10.0504317,18.7526036 C10.0504317,17.64991 10.9472375,16.7526036 12.0504317,16.7526036 C13.1536259,16.7526036 14.0504317,17.64991 14.0504317,18.7526036 Z M10.8004317,18.7526036 C10.8004317,19.4418356 11.3616083,20.0026036 12.0504317,20.0026036 C12.7392551,20.0026036 13.3004317,19.4418356 13.3004317,18.7526036 C13.3004317,18.0633715 12.7392551,17.5026036 12.0504317,17.5026036 C11.3616083,17.5026036 10.8004317,18.0633715 10.8004317,18.7526036 Z" id="Combined-Shape" fill="#FFFFFF" fill-rule="nonzero"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/Viewport/Spawner.png b/Assets/Editor/Icons/Components/Viewport/Spawner.png
deleted file mode 100644
index 7fbaa19651..0000000000
--- a/Assets/Editor/Icons/Components/Viewport/Spawner.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:be39ff9e4f288eb43233084c674383ff52235cc8ff7b8c743c588783e43a41b5
-size 3847
diff --git a/Assets/Editor/Icons/Components/Viewport/Spawner.svg b/Assets/Editor/Icons/Components/Viewport/Spawner.svg
new file mode 100644
index 0000000000..8480dea56b
--- /dev/null
+++ b/Assets/Editor/Icons/Components/Viewport/Spawner.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Gameplay / Spawner - box</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
+            <stop stop-color="#9D9D9D" offset="100%"></stop>
+        </linearGradient>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
+    </defs>
+    <g id="icon-/-Gameplay-/-Spawner---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/general/color/-box-template">
+            <mask id="mask-3" fill="white">
+                <use xlink:href="#path-2"></use>
+            </mask>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#65C98C">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="Rectangle-2" x="0" y="0" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+        <path d="M18.4882988,9.38492584 C19.1320276,11.2084531 19.5,13.031262 19.5,14.4222488 C19.5,18.6763608 16.058189,22.125 11.8125,22.125 C7.56681099,22.125 4.125,18.6763608 4.125,14.4222488 C4.125,13.1547199 4.43055184,11.5286207 4.9718788,9.87015258 L8.99000427,13.574806 L12,10.5132013 L14.9996797,13.574806 Z M11.8125,1.875 C14.3034043,1.875 16.5176094,4.72954269 17.9224059,7.94824717 L14.9996797,11.038324 L12,8 L8.99000427,11.038324 L5.69035715,7.97634103 C7.09451301,4.74617164 9.31435097,1.875 11.8125,1.875 Z" id="Combined-Shape" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/Viewport/Sphere_Shape.png b/Assets/Editor/Icons/Components/Viewport/Sphere_Shape.png
deleted file mode 100644
index 00ef4b636e..0000000000
--- a/Assets/Editor/Icons/Components/Viewport/Sphere_Shape.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c683db733fb34f5f176b4c655a10d6e5022bc37d555611f25f1e95e7555aaa6d
-size 5292
diff --git a/Assets/Editor/Icons/Components/Viewport/Sphere_Shape.svg b/Assets/Editor/Icons/Components/Viewport/Sphere_Shape.svg
new file mode 100644
index 0000000000..56f95386cd
--- /dev/null
+++ b/Assets/Editor/Icons/Components/Viewport/Sphere_Shape.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Shapes / SphereShape - box</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
+            <stop stop-color="#9D9D9D" offset="100%"></stop>
+        </linearGradient>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
+    </defs>
+    <g id="icon-/-Shapes-/-SphereShape---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/general/color/-box-template">
+            <mask id="mask-3" fill="white">
+                <use xlink:href="#path-2"></use>
+            </mask>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#5A69A1">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="Rectangle-2" x="0" y="0" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+        <path d="M11.599639,2.22133417 C16.8925223,2.22133417 21.1832521,6.51206388 21.1832521,11.8049472 C21.1832521,17.0978305 16.8925223,21.3885603 11.599639,21.3885603 C6.30675568,21.3885603 2.01602597,17.0978305 2.01602597,11.8049472 C2.01602597,6.51206388 6.30675568,2.22133417 11.599639,2.22133417 Z M8.6967871,16.8871886 L8.66234389,16.892237 C7.69476761,17.0321963 6.70243947,17.0865596 5.70385017,17.0464285 C7.13474778,18.6557001 9.21493462,19.6749193 11.5335338,19.6939486 C10.3681392,19.0247825 9.41902018,18.0560587 8.6967871,16.8871886 Z M16.3803844,13.4024413 L16.2205781,13.5462843 C14.4749303,15.0863329 12.1516087,16.2037087 9.60679513,16.7269998 C10.4660066,17.9997823 11.6323379,18.9716282 13.0815945,19.4706473 L13.0508027,19.56104 C14.8631196,19.2240797 16.4577279,18.2675844 17.6065968,16.9195847 C17.5391229,15.6467441 17.0997938,14.459153 16.3803844,13.4024413 Z M4.55089244,8.71301682 L4.32769491,8.74035832 C3.93014895,9.68254223 3.7103664,10.7180782 3.7103664,11.8049472 C3.7103664,13.4118939 4.1908093,14.9066272 5.01588879,16.1533407 C6.10858424,16.250401 7.19725573,16.2253866 8.25599131,16.0922114 C7.19797338,13.9656816 6.8028173,11.3243052 7.12718933,8.65784495 C6.27868031,8.59895146 5.41481845,8.61489764 4.55089244,8.71301682 Z M7.97170265,8.7407342 L7.96908288,8.75571761 C7.65122427,11.3680404 8.06697896,13.9440729 9.14201053,15.9546956 C11.7655582,15.4673614 14.1495623,14.3167975 15.8633063,12.7220347 C14.099075,10.6249469 11.1840734,9.1530305 7.97170265,8.7407342 Z M19.0747202,9.27559369 L19.0197813,9.45066002 C18.6160678,10.6806455 17.9161956,11.8073522 16.9941728,12.795164 C17.661867,13.7383461 18.1283079,14.7856156 18.3380989,15.9092002 C19.0681616,14.7142935 19.4889116,13.3087561 19.4889116,11.8049472 C19.4889116,10.920265 19.3432942,10.0695935 19.0747202,9.27559369 Z M11.599639,3.9156746 C10.7943473,3.9156746 10.0172361,4.03632958 9.28539669,4.26054824 C8.71793855,5.43280056 8.32528059,6.66556565 8.0988625,7.90309014 C11.4761013,8.34027974 14.5552881,9.88371559 16.4640854,12.1137497 C17.5517492,10.9149707 18.2797095,9.50837024 18.4967367,7.97128041 C17.1487141,5.55201293 14.5652702,3.9156746 11.599639,3.9156746 Z M8.15981264,4.70232013 C6.74509043,5.38956982 5.56638809,6.48633342 4.77834782,7.83871681 C5.60909564,7.76238032 6.43764108,7.75730494 7.25339403,7.81714795 C7.44118588,6.76504848 7.74220578,5.71657086 8.15981264,4.70232013 Z" id="Combined-Shape" fill="#FFFFFF" fill-rule="nonzero"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/Viewport/Spline.png b/Assets/Editor/Icons/Components/Viewport/Spline.png
deleted file mode 100644
index a86b7422ef..0000000000
--- a/Assets/Editor/Icons/Components/Viewport/Spline.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5b20297a98d1931357825f3367fd29a651100a2e8ed92b204f3cb73cdd4e03bb
-size 4761
diff --git a/Assets/Editor/Icons/Components/Viewport/Spline.svg b/Assets/Editor/Icons/Components/Viewport/Spline.svg
new file mode 100644
index 0000000000..b17aefb9f6
--- /dev/null
+++ b/Assets/Editor/Icons/Components/Viewport/Spline.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Shapes / Spline - box</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
+            <stop stop-color="#9D9D9D" offset="100%"></stop>
+        </linearGradient>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
+    </defs>
+    <g id="icon-/-Shapes-/-Spline---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/general/color/-box-template">
+            <mask id="mask-3" fill="white">
+                <use xlink:href="#path-2"></use>
+            </mask>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#5A69A1">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="Rectangle-2" x="0" y="0" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+        <path d="M5.13943344,17.5004125 C6.39489733,17.8741027 7.31038697,19.0371324 7.31038697,20.4139862 C7.31038697,22.0926395 5.94956953,23.453457 4.27091614,23.453457 C2.59226276,23.453457 1.23144531,22.0926395 1.23144531,20.4139862 C1.23144531,18.9902587 2.21032996,17.795162 3.53178144,17.4650139 C3.57148415,16.2680462 3.71630406,15.1230421 3.85473205,13.8672417 C4.10234921,11.6208915 4.38904544,10.2370145 4.85166509,9.34929711 C4.70752953,8.99556773 4.62810907,8.60858335 4.62810907,8.20304933 C4.62810907,6.52439595 5.98892651,5.1635785 7.6675799,5.1635785 C9.34623329,5.1635785 10.7070507,6.52439595 10.7070507,8.20304933 C10.7070507,8.50815126 10.6620968,8.80275364 10.5784511,9.08059424 C11.172912,9.96652346 11.7928735,11.005986 11.8852981,11.170231 C12.3649508,12.0212353 12.769613,12.6741735 13.1342386,13.1590806 C13.6818026,12.6260707 14.4296351,12.2977708 15.2541461,12.2977708 C15.8588524,12.2977708 16.4223138,12.4743611 16.8957745,12.7787858 C17.2514908,12.2198967 17.5845134,11.5193172 17.88623,10.6937436 C18.2111061,9.80479995 18.474141,8.8439932 18.6786817,7.88204841 C18.7222342,7.67722339 18.7952673,7.27515153 18.8476576,6.9781575 C17.6526739,6.56883185 16.7936169,5.43573261 16.7936169,4.10198987 C16.7936169,2.42333649 18.1544344,1.06251904 19.8330878,1.06251904 C21.5117412,1.06251904 22.8725586,2.42333649 22.8725586,4.10198987 C22.8725586,5.58253716 21.8139818,6.81584058 20.4124118,7.08631659 C20.3568308,7.40953116 20.2481054,8.02034212 20.1899435,8.29387465 C19.9672422,9.34122782 19.6802023,10.389719 19.3197091,11.3761202 C18.8567021,12.6430255 18.5611738,13.3268479 18.0498533,14.1426079 C18.2067559,14.5093187 18.2936169,14.9131364 18.2936169,15.3372417 C18.2936169,17.0158951 16.9327995,18.3767125 15.2541461,18.3767125 C13.5754927,18.3767125 12.2146753,17.0158951 12.2146753,15.3372417 C12.2146753,15.0998465 12.2418911,14.868808 12.2933728,14.6470759 C11.6876482,13.972317 11.0815286,13.0229448 10.3752157,11.7697978 C10.2814693,11.6032059 9.94032389,11.0142439 9.64062704,10.5151522 C9.10966996,10.9686808 8.42060423,11.2425202 7.6675799,11.2425202 C7.06303914,11.2425202 6.49972066,11.0660266 6.02634033,10.7617552 C5.67490136,12.0644704 5.4456334,13.2016126 5.33853647,14.1731818 C5.2183431,15.2635602 5.15703781,16.3974132 5.13943344,17.5004125 L5.13943344,17.5004125 Z M19.8330878,5.6414607 C20.683314,5.6414607 21.3725586,4.95221614 21.3725586,4.10198987 C21.3725586,3.25176361 20.683314,2.56251904 19.8330878,2.56251904 C18.9828615,2.56251904 18.2936169,3.25176361 18.2936169,4.10198987 C18.2936169,4.95221614 18.9828615,5.6414607 19.8330878,5.6414607 Z M7.6675799,9.74252016 C8.51780616,9.74252016 9.20705073,9.0532756 9.20705073,8.20304933 C9.20705073,7.35282307 8.51780616,6.6635785 7.6675799,6.6635785 C6.81735364,6.6635785 6.12810907,7.35282307 6.12810907,8.20304933 C6.12810907,9.0532756 6.81735364,9.74252016 7.6675799,9.74252016 Z M15.2541461,16.8767125 C16.1043724,16.8767125 16.7936169,16.1874679 16.7936169,15.3372417 C16.7936169,14.4870154 16.1043724,13.7977708 15.2541461,13.7977708 C14.4039198,13.7977708 13.7146753,14.4870154 13.7146753,15.3372417 C13.7146753,16.1874679 14.4039198,16.8767125 15.2541461,16.8767125 Z M4.27091614,21.953457 C5.12114241,21.953457 5.81038697,21.2642124 5.81038697,20.4139862 C5.81038697,19.5637599 5.12114241,18.8745153 4.27091614,18.8745153 C3.42068988,18.8745153 2.73144531,19.5637599 2.73144531,20.4139862 C2.73144531,21.2642124 3.42068988,21.953457 4.27091614,21.953457 Z" id="Shape" fill="#FFFFFF" fill-rule="nonzero"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/Viewport/StaticMesh.png b/Assets/Editor/Icons/Components/Viewport/StaticMesh.png
deleted file mode 100644
index f251d6a6e0..0000000000
--- a/Assets/Editor/Icons/Components/Viewport/StaticMesh.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2b79a104ed3d299789b4388065d1686bd940fadd3a001a6967bde7a55d4563aa
-size 5146
diff --git a/Assets/Editor/Icons/Components/Viewport/StaticMesh.svg b/Assets/Editor/Icons/Components/Viewport/StaticMesh.svg
new file mode 100644
index 0000000000..b43f2e90a0
--- /dev/null
+++ b/Assets/Editor/Icons/Components/Viewport/StaticMesh.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Rendering / Mesh - box</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
+            <stop stop-color="#9D9D9D" offset="100%"></stop>
+        </linearGradient>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
+    </defs>
+    <g id="icon-/-Rendering-/-Mesh---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/general/color/-box-template">
+            <mask id="mask-3" fill="white">
+                <use xlink:href="#path-2"></use>
+            </mask>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#B29EDF">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="Rectangle-2" x="0" y="-0.00055502734" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+        <path d="M11.6374916,1.77902411 C14.0067933,1.77902411 16.0886658,2.79972705 17.8619233,4.48605498 C18.4756091,5.06965634 19.008426,5.69361462 19.4594847,6.31819039 C19.7321984,6.69581389 19.9190809,6.99335974 20.0183078,7.1713447 L20.2728714,7.62795986 L19.8437441,7.92653956 C19.7976997,7.95857651 19.6998319,8.03703817 19.5672353,8.16206989 C19.3379991,8.37822758 19.1070197,8.64170092 18.8907832,8.95249242 C18.2696785,9.84519122 17.8970598,10.9333346 17.8970598,12.2334762 C17.8970598,12.975499 18.017844,13.6171163 18.2355029,14.1689019 L18.2403389,14.1707023 L18.2399254,14.1800676 C18.3996134,14.5815904 18.6107385,14.935374 18.864027,15.2455198 C19.2168449,15.6775371 19.561386,15.9291033 19.7650812,16.0274849 L20.3164873,16.2938055 L20.0183078,16.8286553 C19.9190809,17.0066403 19.7321984,17.3041861 19.4594847,17.6818096 C19.008426,18.3063854 18.4756091,18.9303437 17.8619233,19.513945 C16.0886658,21.200273 14.0067933,22.2209759 11.6374916,22.2209759 C9.26818991,22.2209759 7.18631733,21.200273 5.41305989,19.513945 C4.79937413,18.9303437 4.26655723,18.3063854 3.81549852,17.6818096 C3.54278482,17.3041861 3.3559023,17.0066403 3.25667543,16.8286553 L2.93144984,16.2452925 L3.55568048,16.0077637 C3.74542684,15.9355625 4.0761493,15.7221825 4.41852755,15.3200416 C5.01460546,14.6199173 5.37792336,13.616206 5.37792336,12.2277275 C5.37792336,10.8271229 5.00616719,9.72293824 4.39037167,8.87184037 C4.0298524,8.37356265 3.67831059,8.07378427 3.46832347,7.95029628 L2.9818878,7.66423605 L3.25667543,7.1713447 C3.3559023,6.99335974 3.54278482,6.69581389 3.81549852,6.31819039 C4.26655723,5.69361462 4.79937413,5.06965634 5.41305989,4.48605498 C7.18631733,2.79972705 9.26818991,1.77902411 11.6374916,1.77902411 Z M11.6509858,20.3270374 L10.3857845,20.9512591 C10.7931996,21.0269292 11.2104944,21.0660634 11.6374916,21.0660634 C12.0711606,21.0660634 12.4948217,21.0256968 12.908289,20.9476853 L11.6509858,20.3270374 Z M9.54162148,17.0476359 L7.80298584,17.9030374 L7.80298584,19.8670374 L9.54162148,20.7229446 L11.2799858,19.8660374 L11.2799858,17.9040374 L9.54162148,17.0476359 Z M13.7614942,17.0476359 L12.0229858,17.9030374 L12.0229858,19.8670374 L13.7614942,20.7229446 L15.4989858,19.8670374 L15.4989858,17.9030374 L13.7614942,17.0476359 Z M5.32174877,17.0476359 L4.90144984,17.2050241 L5.00772268,17.3472845 C5.3609877,17.8020547 5.76210238,18.2521148 6.20893517,18.6770427 C6.48520318,18.9397674 6.76884555,19.183796 7.05975864,19.4076097 L7.05998584,17.9040374 L5.32174877,17.0476359 Z M17.9813669,17.0476359 L16.2419858,17.9040374 L16.2421956,19.3867855 C16.5236755,19.1686835 16.7983244,18.9316419 17.066048,18.6770427 C17.5716746,18.1962032 18.0187605,17.6831828 18.4042171,17.1675718 L17.9813669,17.0476359 Z M7.31915519,13.5924518 L6.30643851,14.0926136 C6.11617634,14.809726 5.8117234,15.4190034 5.41500254,15.925364 L5.41517314,16.3301924 L7.31915519,17.2677605 L9.05698584,16.4120374 L9.05698584,14.4470374 L7.31915519,13.5924518 Z M11.5390279,13.5924518 L9.79998584,14.4480374 L9.79998584,16.4110374 L11.5390279,17.2677605 L13.2769858,16.4120374 L13.2769858,14.4470374 L11.5390279,13.5924518 Z M15.7589006,13.5924518 L14.0199858,14.4470374 L14.0199858,16.4120374 L15.7589006,17.2677605 L17.6628826,16.3301924 L17.6626161,15.5589125 C17.3981168,15.1584486 17.1839552,14.7117929 17.0289896,14.2180202 L15.7589006,13.5924518 Z M9.54162148,10.1372677 L7.80298584,10.9920374 L7.80298584,12.9560374 L9.54162148,13.8125764 L11.2799858,12.9550374 L11.2799858,10.9930374 L9.54162148,10.1372677 Z M13.7614942,10.1372677 L12.0229858,10.9920374 L12.0229858,12.9560374 L13.7614942,13.8125764 L15.4989858,12.9560374 L15.4989858,10.9920374 L13.7614942,10.1372677 Z M16.929326,10.5689312 L16.2419858,10.9760374 L16.2419858,12.9720374 L16.8216119,13.3163363 C16.7693535,12.9740217 16.7421473,12.6131433 16.7421473,12.2334762 C16.7421473,11.6449304 16.807295,11.0900084 16.929326,10.5689312 Z M6.53283589,12.2277275 C6.53283589,12.6017536 6.50952462,12.9559407 6.46454417,13.2906571 L7.05998584,12.9640374 L7.05998584,10.9840374 L6.3733863,10.6098538 C6.47759228,11.1117231 6.53283589,11.6508264 6.53283589,12.2277275 Z M7.31915519,6.6820836 L5.41517314,7.61965171 L5.41444984,8.32302411 L5.47308237,8.40767149 C5.74552371,8.82100882 5.97225389,9.27744802 6.14514378,9.77771901 L7.31915519,10.3573923 L9.05698584,9.50103744 L9.05698584,7.53703744 L7.31915519,6.6820836 Z M11.5390279,6.6820836 L9.79998584,7.53803744 L9.79998584,9.50003744 L11.5390279,10.3573923 L13.2769858,9.50103744 L13.2769858,7.53703744 L11.5390279,6.6820836 Z M15.7589006,6.6820836 L14.0199858,7.53703744 L14.0199858,9.50103744 L15.7589006,10.3573923 L17.2211405,9.63575541 C17.3464224,9.31934178 17.4942934,9.0177639 17.6623696,8.73108554 L17.6628826,7.61965171 L15.7589006,6.6820836 Z M18.672869,7.20613073 L18.2399858,7.41803744 L18.2405347,7.89539028 C18.4198491,7.67328235 18.5952696,7.48547202 18.7579794,7.3311885 C18.7313256,7.29141009 18.7029522,7.24968413 18.672869,7.20613073 Z M6.20893517,5.3229573 C5.74936372,5.75999941 5.33815428,6.22362699 4.97762595,6.69162137 L5.32174877,6.90220825 L7.05998584,6.04503744 L7.05975864,4.5923903 C6.76884555,4.81620404 6.48520318,5.06023264 6.20893517,5.3229573 Z M9.31062813,3.33967853 L7.80298584,4.08203744 L7.80298584,6.04603744 L9.54162148,6.90220825 L11.2799858,6.04503744 L11.2799858,4.08303744 L9.58590325,3.24748744 C9.4935959,3.27632025 9.40183677,3.30706174 9.31062813,3.33967853 Z M13.7071325,3.25315279 L12.0229858,4.08203744 L12.0229858,6.04603744 L13.7614942,6.90220825 L15.4989858,6.04603744 L15.4996369,4.09263093 C15.4716509,4.07502419 15.4436034,4.05760087 15.4154945,4.04036219 L14.088653,3.38541509 C13.9625435,3.33770229 13.835368,3.29358497 13.7071325,3.25315279 Z M16.2431937,4.61398797 L16.2419858,6.04503744 L17.9813669,6.90220825 L18.3314498,6.73902411 L18.2672605,6.65271553 C17.9139955,6.19794525 17.5128808,5.74788524 17.066048,5.3229573 C16.7986408,5.06865909 16.5243247,4.83187689 16.2431937,4.61398797 Z M11.6374916,2.93393664 C11.2363934,2.93393664 10.8438564,2.96846745 10.4600274,3.03537564 L11.6509858,3.62203744 L12.8358702,3.03905496 C12.4453891,2.96973373 12.0458779,2.93393664 11.6374916,2.93393664 Z" id="Combined-Shape" fill="#FFFFFF" fill-rule="nonzero"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/Viewport/StaticPhysics.svg b/Assets/Editor/Icons/Components/Viewport/StaticPhysics.svg
new file mode 100644
index 0000000000..5a8692e058
--- /dev/null
+++ b/Assets/Editor/Icons/Components/Viewport/StaticPhysics.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Physics / PhysX / Physics - box</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
+            <stop stop-color="#9D9D9D" offset="100%"></stop>
+        </linearGradient>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
+    </defs>
+    <g id="icon-/-Physics-/-PhysX-/-Physics---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/general/color/-box-template">
+            <mask id="mask-3" fill="white">
+                <use xlink:href="#path-2"></use>
+            </mask>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#DD7F6D">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="Rectangle-2" x="0" y="0" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+        <path d="M17.2581434,9.0146003 C17.5128802,8.32065986 17.7350344,7.64515979 17.8860993,7.02109867 C18.398535,4.87716241 18.1971152,3.47666443 17.3045489,2.97100993 C17.0873315,2.84678004 16.8385188,2.78272399 16.5650223,2.78272399 C15.3890859,2.78272399 13.7214483,4.00755313 12.0004937,6.00978967 C11.7023134,5.66427527 11.4080824,5.35078889 11.1148389,5.05380179 C11.2214729,4.85678094 11.2965117,4.64131971 11.2965117,4.40256538 C11.2965117,3.62224634 10.6517708,2.98945031 9.85793971,2.98945031 C9.52224,2.98945031 9.22800909,3.11950348 8.98413313,3.30681887 C8.41146894,2.97295102 7.88619764,2.78272399 7.43497775,2.78272399 C7.16246858,2.78272399 6.91266851,2.84678004 6.69643841,2.97100993 C5.80288479,3.47666443 5.60146497,4.87716241 6.1158754,7.02109867 C6.26595291,7.64515979 6.48810712,8.32065986 6.74383131,9.0146003 C3.70969843,9.54548899 1.39238314,10.5558275 1.39238314,12.0029116 C1.39238314,13.4470842 3.70871107,14.454511 6.73889455,14.9853997 C6.54537354,15.5104651 6.38246045,16.0229135 6.24719322,16.5130392 C5.54024915,16.6052411 4.98634464,17.1768927 4.98634464,17.8941263 C4.98634464,18.4725717 5.34376609,18.9714324 5.8542271,19.1907758 C5.88680972,20.058444 6.1405592,20.7184153 6.69643841,21.0338428 C6.91266851,21.1561316 7.16049388,21.217276 7.4339904,21.217276 C8.60696464,21.217276 10.276577,19.9934174 12.0004937,17.9882692 C13.723423,19.9934174 15.3930354,21.217276 16.566997,21.217276 C16.8395061,21.217276 17.0873315,21.1561316 17.3045489,21.0328723 C18.5772457,20.3088449 18.308686,17.8310408 17.2620928,14.9853997 C17.8624029,14.8815513 18.4330923,14.7582919 18.9652751,14.6156217 C19.2249487,14.9756942 19.6317377,15.2290068 20.1185023,15.2290068 C20.9123334,15.2290068 21.5600363,14.5932991 21.5600363,13.8120095 C21.5600363,13.727572 21.5235043,13.6538105 21.5116561,13.5751963 C22.1958911,13.1277745 22.6076169,12.6046502 22.6076169,12.0029116 C22.6076169,10.5558275 20.2893142,9.54743009 17.2581434,9.0146003 L17.2581434,9.0146003 Z M16.5650223,3.59312996 C16.6953527,3.59312996 16.8019867,3.61836416 16.8938105,3.67174419 C17.2966501,3.89982252 17.5592858,4.85095767 17.0833821,6.83572437 C16.9293552,7.47240259 16.6973274,8.16828412 16.4287677,8.88357658 C15.638886,8.77002269 14.8174091,8.68655572 13.9791472,8.63802842 C13.5002815,7.92176542 13.0154916,7.27538174 12.5297144,6.66587881 C14.1963647,4.70246412 15.7139248,3.59312996 16.5650223,3.59312996 L16.5650223,3.59312996 Z M8.53390059,12.8841675 C8.68397811,13.1607731 8.82319475,13.4344671 8.98610784,13.7110727 C9.14803357,13.9876783 9.31884548,14.242932 9.48570798,14.5098321 C8.91995525,14.4671281 8.37000015,14.4156892 7.86348854,14.3487215 C8.0579969,13.8818888 8.28903728,13.3888514 8.53390059,12.8841675 L8.53390059,12.8841675 Z M8.52698913,11.0964216 C8.28903728,10.6062958 8.06688307,10.1239345 7.86941266,9.65127852 C8.37296221,9.5813992 8.92390466,9.53384244 9.48373327,9.49016787 C9.31884548,9.75609749 9.14803357,10.0113511 8.98610784,10.2898978 C8.82911886,10.5558275 8.67706664,10.8246687 8.52698913,11.0964216 L8.52698913,11.0964216 Z M8.98610784,12.0029116 C9.21319881,11.5739303 9.43436567,11.1459195 9.69996338,10.6946155 C9.95963697,10.2520465 10.2222726,9.84150555 10.4858956,9.43581729 C10.9815463,9.41349473 11.4692983,9.38923108 12.0004937,9.38923108 C12.5316891,9.38923108 13.0184537,9.41349473 13.5141044,9.43581729 C13.7777274,9.84150555 14.0413504,10.2520465 14.301024,10.6946155 C14.5666217,11.1459195 14.7877885,11.5739303 15.0158669,12.0029116 C14.7868012,12.4367457 14.5567482,12.8705798 14.301024,13.306355 C14.0383883,13.7508651 13.773778,14.1575239 13.5062056,14.5651533 C13.0154916,14.5865053 12.528727,14.6117395 12.0004937,14.6117395 C11.4722603,14.6117395 10.9854958,14.5865053 10.4947818,14.5651533 C10.2272094,14.1575239 9.95963697,13.748924 9.69996338,13.306355 C9.44423919,12.8705798 9.21517351,12.4367457 8.98610784,12.0029116 L8.98610784,12.0029116 Z M15.0158669,13.7110727 C15.1768053,13.4344671 15.3140472,13.1607731 15.4690615,12.8841675 C15.7139248,13.3888514 15.9449652,13.8818888 16.1365115,14.3487215 C15.6309872,14.4156892 15.0810321,14.4671281 14.5152794,14.5098321 C14.6821419,14.242932 14.8529538,13.9876783 15.0158669,13.7110727 L15.0158669,13.7110727 Z M15.0158669,10.2898978 C14.8529538,10.0113511 14.6821419,9.75609749 14.5162667,9.49016787 C15.0770827,9.53384244 15.6270378,9.5813992 16.1305873,9.65127852 C15.9321296,10.1239345 15.7119501,10.6062958 15.4720235,11.0964216 C15.3249081,10.8246687 15.1708811,10.5558275 15.0158669,10.2898978 L15.0158669,10.2898978 Z M12.9414402,8.59144221 C12.6284496,8.5827073 12.3144716,8.57882511 12.0004937,8.57882511 C11.6865157,8.57882511 11.3715504,8.5827073 11.0595472,8.59144221 C11.3735251,8.13916774 11.6865157,7.7169802 12.0004937,7.32099741 C12.3115096,7.7169802 12.6264749,8.13916774 12.9414402,8.59144221 L12.9414402,8.59144221 Z M7.10717687,3.67174419 C7.19900061,3.61836416 7.30464728,3.59312996 7.43497775,3.59312996 C7.72032249,3.59312996 8.08959217,3.73968242 8.50526738,3.97455457 C8.45984919,4.11140156 8.4164057,4.2511602 8.4164057,4.40256538 C8.4164057,5.1867666 9.0631213,5.81859209 9.85793971,5.81859209 C10.1047777,5.81859209 10.3269319,5.73997786 10.5313138,5.63224725 C10.8364056,5.94379254 11.1513709,6.29027748 11.471273,6.66587881 C10.9854958,7.27538174 10.4987312,7.92176542 10.0218401,8.63802842 C9.1825909,8.68655572 8.36111398,8.77002269 7.57221969,8.88357658 C7.30365993,8.16828412 7.06965749,7.47240259 6.91661792,6.83572437 C6.44170158,4.85095767 6.70334987,3.89982252 7.10717687,3.67174419 L7.10717687,3.67174419 Z M2.21682211,12.0029116 C2.21682211,11.2546206 3.99405582,10.3161026 7.04398633,9.7900666 C7.33624254,10.5111823 7.66503078,11.2487973 8.05009808,12.0009705 C7.6749043,12.7395561 7.33624254,13.4800828 7.04102428,14.2089629 C3.99405582,13.6858385 2.21682211,12.7492616 2.21682211,12.0029116 L2.21682211,12.0029116 Z M7.10717687,20.3331085 C6.8593515,20.1904383 6.71421075,19.8148369 6.68261548,19.2606551 C7.35204018,19.1373958 7.86941266,18.5851551 7.86941266,17.8941263 C7.86941266,17.3447972 7.53864972,16.8828173 7.0755816,16.6469746 C7.20492472,16.171407 7.37277457,15.6618703 7.57518174,15.1183645 C8.36308869,15.2290068 9.1865403,15.3134443 10.0238149,15.361001 C10.4947818,16.0714408 10.9785843,16.7149128 11.4613995,17.319563 C9.53310088,19.5799648 7.80622212,20.721327 7.10717687,20.3331085 L7.10717687,20.3331085 Z M11.0625092,15.4075872 C11.3735251,15.4153516 11.6865157,15.4211749 12.0004937,15.4211749 C12.3115096,15.4211749 12.6264749,15.4153516 12.9384781,15.4075872 C12.6254875,15.855009 12.3115096,16.2849609 12.0004937,16.6770615 C11.6894778,16.2849609 11.3754998,15.855009 11.0625092,15.4075872 L11.0625092,15.4075872 Z M16.8938105,20.3331085 C16.2006893,20.732003 14.4678865,19.5857881 12.5386005,17.319563 C13.0204284,16.7149128 13.5042309,16.0724113 13.9771725,15.361001 C14.814447,15.3134443 15.6378987,15.2290068 16.4248183,15.1183645 C17.4891838,17.973711 17.551387,19.9575072 16.8938105,20.3331085 L16.8938105,20.3331085 Z M21.1492979,12.831758 C20.8886369,12.5667989 20.5252914,12.3988944 20.1185023,12.3988944 C19.3236839,12.3988944 18.678943,13.0316905 18.678943,13.8120095 C18.678943,13.821715 18.6828924,13.8285088 18.6828924,13.8382143 C18.1694693,13.9770023 17.5928557,14.1002617 16.9599631,14.2089629 C16.6637575,13.4800828 16.3260831,12.7395561 15.952864,12.0009705 C16.3359566,11.2487973 16.6637575,10.5131234 16.957001,9.7900666 C20.0059442,10.3161026 21.7841652,11.2546206 21.7841652,12.0029116 C21.7841652,12.263018 21.5600363,12.5493291 21.1492979,12.831758 L21.1492979,12.831758 Z" id="Imported-Layers-Copy-8" fill="#FFFFFF" transform="translate(12.000000, 12.000000) rotate(-360.000000) translate(-12.000000, -12.000000) "></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/Viewport/Tag.png b/Assets/Editor/Icons/Components/Viewport/Tag.png
deleted file mode 100644
index 09985cc1d0..0000000000
--- a/Assets/Editor/Icons/Components/Viewport/Tag.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:11cef56808775234c4d2f4b3790f9fd2d313fbc7a5d0a191030ae1f4902f2ca2
-size 4862
diff --git a/Assets/Editor/Icons/Components/Viewport/Tag.svg b/Assets/Editor/Icons/Components/Viewport/Tag.svg
new file mode 100644
index 0000000000..0ae984230d
--- /dev/null
+++ b/Assets/Editor/Icons/Components/Viewport/Tag.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Gameplay / Tag - box</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
+            <stop stop-color="#9D9D9D" offset="100%"></stop>
+        </linearGradient>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
+    </defs>
+    <g id="icon-/-Gameplay-/-Tag---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/general/color/-box-template">
+            <mask id="mask-3" fill="white">
+                <use xlink:href="#path-2"></use>
+            </mask>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#65C98C">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="Rectangle-2" x="0" y="0" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+        <path d="M10.5172558,0.171972357 L16.7820643,5.12194458 L16.7820643,21.621852 L4.25244716,21.621852 L4.25244716,5.12194458 L10.5172558,0.171972357 Z M10.7409328,5.67755973 C9.87029412,5.67755973 9.16450205,6.3833518 9.16450205,7.25399044 C9.16450205,8.12462908 9.87029412,8.83042115 10.7409328,8.83042115 C11.6115714,8.83042115 12.3173635,8.12462908 12.3173635,7.25399044 C12.3173635,6.3833518 11.6115714,5.67755973 10.7409328,5.67755973 Z" id="Combined-Shape" fill="#FFFFFF" transform="translate(10.517256, 10.896912) rotate(-52.000000) translate(-10.517256, -10.896912) "></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/Viewport/Transform.png b/Assets/Editor/Icons/Components/Viewport/Transform.png
deleted file mode 100644
index 4c38cf5e33..0000000000
--- a/Assets/Editor/Icons/Components/Viewport/Transform.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e2a5744fdedea7cc2521e4bef36fedf83d594b277eb51832b70a05fa0fc690bf
-size 4049
diff --git a/Assets/Editor/Icons/Components/Viewport/Transform.svg b/Assets/Editor/Icons/Components/Viewport/Transform.svg
new file mode 100644
index 0000000000..5b3f4c5697
--- /dev/null
+++ b/Assets/Editor/Icons/Components/Viewport/Transform.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Gameplay / Transform - box</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
+            <stop stop-color="#9D9D9D" offset="100%"></stop>
+        </linearGradient>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
+    </defs>
+    <g id="icon-/-Gameplay-/-Transform---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/general/color/-box-template">
+            <mask id="mask-3" fill="white">
+                <use xlink:href="#path-2"></use>
+            </mask>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#65C98C">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="Rectangle-2" x="0" y="0" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+        <path d="M4.99909339,1.18760796 L8.90490302,7.43690338 L6.27328375,7.43660796 L6.27428022,15.2178454 L14.0842837,7.64160796 L12.3897381,5.94757242 L19.5704817,4.29047773 L17.913387,11.4712214 L15.9522837,9.50960796 L7.96252407,17.6380228 L16.6572837,17.637608 L16.6574208,15.1883807 L22.9067163,19.0941904 L16.6574208,23 L16.6572837,20.118608 L3.46589817,20.1191132 L3.45628375,7.43660796 L1.09328375,7.43690338 L4.99909339,1.18760796 Z" id="Combined-Shape" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/Viewport/Tube_Shape.png b/Assets/Editor/Icons/Components/Viewport/Tube_Shape.png
deleted file mode 100644
index c80b937b5c..0000000000
--- a/Assets/Editor/Icons/Components/Viewport/Tube_Shape.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:63d5efc11e3d844871415ab89491ebbf2e23ee6f821e55fadc186ff464354d2b
-size 4118
diff --git a/Assets/Editor/Icons/Components/Viewport/Tube_Shape.svg b/Assets/Editor/Icons/Components/Viewport/Tube_Shape.svg
new file mode 100644
index 0000000000..96b9a58ad1
--- /dev/null
+++ b/Assets/Editor/Icons/Components/Viewport/Tube_Shape.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Shapes / Tube_Shape - box</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
+            <stop stop-color="#9D9D9D" offset="100%"></stop>
+        </linearGradient>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
+    </defs>
+    <g id="icon-/-Shapes-/-Tube_Shape---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/general/color/-box-template">
+            <mask id="mask-3" fill="white">
+                <use xlink:href="#path-2"></use>
+            </mask>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#5A69A1">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="Rectangle-2" x="0" y="0" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+        <path d="M10.1781802,7.93073964 L5.28680804,7.93073964 C4.68484467,7.93073964 4.10047782,8.59720404 3.72130603,9.64798692 L9.37381828,9.64798692 C9.57281877,8.97779752 9.84623869,8.39194211 10.1781802,7.93073964 L10.1781802,7.93073964 Z M12,7.93073964 C11.3980364,7.93073964 10.8136695,8.59720404 10.4344977,9.64798692 L16.08701,9.64798692 C16.2860105,8.97779752 16.5594304,8.39194211 16.8913719,7.93073964 L11.9999997,7.93073964 L12,7.93073964 Z M10.1781802,16.7145504 C9.81241599,16.2063544 9.5177069,15.5468086 9.31532243,14.7898551 L3.65073953,14.7898551 C4.02537972,15.9595973 4.64612743,16.7145504 5.28680828,16.7145504 L10.1781802,16.7145504 L10.1781802,16.7145504 Z M12,16.7145504 L16.8913719,16.7145504 C16.5256077,16.2063544 16.2308986,15.5468086 16.0285141,14.7898551 L10.3639313,14.7898551 C10.7385714,15.9595973 11.3593191,16.7145504 12,16.7145504 Z M9.0971436,13.6918788 C9.03763115,13.2529364 9.00632989,12.7939129 9.00632989,12.322645 C9.00632989,11.7765811 9.04835542,11.2469565 9.12759923,10.7459633 L3.43004281,10.7459633 C3.34093831,11.2330699 3.29102821,11.7640026 3.29102821,12.322645 C3.29102821,12.8029542 3.32792277,13.2627798 3.39490136,13.6918788 L9.0971436,13.6918788 L9.0971436,13.6918788 Z M10.1080931,13.6918788 L15.8103353,13.6918788 C15.7508229,13.2529364 15.7195216,12.7939129 15.7195216,12.322645 C15.7195216,11.7765811 15.7615471,11.2469565 15.8407909,10.7459633 L10.1432345,10.7459633 C10.05413,11.2330699 10.0042199,11.7640026 10.0042199,12.322645 C10.0042199,12.8029542 10.0411145,13.2627798 10.1080931,13.6918788 L10.1080931,13.6918788 Z M4.78786327,6.90400294 L19.2121367,6.90400294 C20.682433,7.33128057 21.7068618,9.62659575 21.7068618,12.322645 C21.7068618,15.2360187 20.5106213,17.6814493 18.8481934,17.8074312 L18.8481934,17.8125268 L4.78786327,17.7412871 C3.31756701,17.3140095 2.29313818,15.0186943 2.29313818,12.322645 C2.29313818,9.62659575 3.31756701,7.33128057 4.78786327,6.90400294 Z M18.7131917,16.7145504 C19.736508,16.7145504 20.7089718,14.7885506 20.7089718,12.322645 C20.7089718,9.85673945 19.736508,7.93073964 18.7131917,7.93073964 C17.6898754,7.93073964 16.7174116,9.85673945 16.7174116,12.322645 C16.7174116,14.7885506 17.6898754,16.7145504 18.7131917,16.7145504 Z" id="Shape" fill="#FFFFFF" fill-rule="nonzero"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/Viewport/UICanvasProxyRef.svg b/Assets/Editor/Icons/Components/Viewport/UICanvasProxyRef.svg
new file mode 100644
index 0000000000..d14aae02d5
--- /dev/null
+++ b/Assets/Editor/Icons/Components/Viewport/UICanvasProxyRef.svg
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / UI / UI CanvasProxyRef - box</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
+            <stop stop-color="#9D9D9D" offset="100%"></stop>
+        </linearGradient>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
+    </defs>
+    <g id="icon-/-UI-/-UI-CanvasProxyRef---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/general/color/-box-template">
+            <mask id="mask-3" fill="white">
+                <use xlink:href="#path-2"></use>
+            </mask>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#BD5F8B">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="UI" x="0" y="0" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+        <path d="M12.7084595,17.9100205 C12.9055323,17.9100205 13.0672552,17.9481045 13.1272611,18.0599965 L14.6662142,20.9296568 C14.721595,21.0329245 14.6936071,21.2320707 14.4652168,21.3246743 C14.2368264,21.4172779 13.9967045,21.3139525 13.9424251,21.2127386 L12.5724041,18.6580831 L5.07760055,18.6580831 L3.70757952,21.2127386 C3.65330017,21.3139525 3.40194675,21.4172779 3.17355641,21.3246743 C2.94516606,21.2320707 2.92840962,21.0329245 2.98379046,20.9296568 L4.52274354,18.0599965 C4.59572332,17.9637494 4.71395828,17.9100205 4.94154514,17.9100205 L12.7084595,17.9100205 Z M12.3874232,19.4176653 C12.5941127,19.4176653 12.7616677,19.5911661 12.7616677,19.7916966 C12.7616677,19.9982684 12.5901242,20.1657279 12.3874232,20.1657279 L5.31843156,20.1657279 C5.11174201,20.1657279 4.94418703,19.9922271 4.94418703,19.7916966 C4.94418703,19.5851248 5.11573058,19.4176653 5.31843156,19.4176653 L12.3874232,19.4176653 Z M3.20057791,15.258117 L3.20057791,15.8439035 C3.20057791,16.1200459 3.42443554,16.3439035 3.70057791,16.3439035 L3.70057791,16.3439035 L5.31724075,16.3439035 L5.31724075,17.3439035 L3.70057791,17.3439035 L3.5561179,17.3370369 C2.79546599,17.2643522 2.20057791,16.6235996 2.20057791,15.8439035 L2.20057791,15.8439035 L2.20057791,15.258117 L3.20057791,15.258117 Z M15.3290638,15.258117 L15.3290638,15.8439035 C15.3290638,16.6235996 14.7341757,17.2643522 13.9735238,17.3370369 L13.8290638,17.3439035 L12.2124009,17.3439035 L12.2124009,16.3439035 L13.8290638,16.3439035 C14.1052061,16.3439035 14.3290638,16.1200459 14.3290638,15.8439035 L14.3290638,15.258117 L15.3290638,15.258117 Z M11.2124009,16.3010103 L11.2124009,17.3010103 L9.21240093,17.3010103 L9.21240093,16.3010103 L11.2124009,16.3010103 Z M8.31724075,16.3010103 L8.31724075,17.3010103 L6.31724075,17.3010103 L6.31724075,16.3010103 L8.31724075,16.3010103 Z M15.44717,12.473128 L15.44717,14.473128 L14.44717,14.473128 L14.44717,12.473128 L15.44717,12.473128 Z M3.20057791,12.473128 L3.20057791,14.473128 L2.20057791,14.473128 L2.20057791,12.473128 L3.20057791,12.473128 Z M15.44717,9.83475542 L15.44717,11.8347554 L14.44717,11.8347554 L14.44717,9.83475542 L15.44717,9.83475542 Z M3.20057791,9.83475542 L3.20057791,11.8347554 L2.20057791,11.8347554 L2.20057791,9.83475542 L3.20057791,9.83475542 Z M13.94717,7.11059642 L14.0916301,7.117463 C14.852282,7.19014774 15.44717,7.8309003 15.44717,8.61059642 L15.44717,8.61059642 L15.44717,9.19638285 L14.44717,9.19638285 L14.44717,8.61059642 C14.44717,8.33445404 14.2233124,8.11059642 13.94717,8.11059642 L13.94717,8.11059642 L12.3305072,8.11059642 L12.3305072,7.11059642 L13.94717,7.11059642 Z M5.31724075,7.11059642 L5.31724075,8.11059642 L3.70057791,8.11059642 C3.42443554,8.11059642 3.20057791,8.33445404 3.20057791,8.61059642 L3.20057791,9.19638285 L2.20057791,9.19638285 L2.20057791,8.61059642 C2.20057791,7.8309003 2.79546599,7.19014774 3.5561179,7.117463 L3.70057791,7.11059642 L5.31724075,7.11059642 Z M8.31724075,7.11059642 L8.31724075,8.11059642 L6.31724075,8.11059642 L6.31724075,7.11059642 L8.31724075,7.11059642 Z M11.3305072,7.11059642 L11.3305072,8.11059642 L9.33050721,8.11059642 L9.33050721,7.11059642 L11.3305072,7.11059642 Z" id="Combined-Shape" fill="#FFFFFF"></path>
+        <path d="M20.2187493,13.4748383 C20.4158221,13.4748383 20.577545,13.5129223 20.6375509,13.6248143 L22.176504,16.4944746 C22.2318848,16.5977423 22.2038969,16.7968885 21.9755065,16.8894921 C21.7471162,16.9820957 21.5069943,16.8787702 21.4527149,16.7775564 L20.0826939,14.2229009 L16.7089653,14.2227 L16.7089653,13.4747 L20.2187493,13.4748383 Z M19.897713,14.982483 C20.1044025,14.982483 20.2719575,15.1559839 20.2719575,15.3565143 C20.2719575,15.5630861 20.1004139,15.7305457 19.897713,15.7305457 L16.7089653,15.7297 L16.7089653,14.9817 L19.897713,14.982483 Z M21.51868,3.49694043 C22.0709648,3.49694043 22.51868,3.94465568 22.51868,4.49694043 L22.51868,11.7302526 C22.51868,12.2825373 22.0709648,12.7302526 21.51868,12.7302526 L16.7089653,12.7297 L16.7093234,8.06897608 C16.7093234,7.01461429 15.8934456,6.15081096 14.8585858,6.07446182 L14.7093234,6.06897608 L10.2719653,6.0687 L10.2720879,4.49694043 C10.2720879,3.94465568 10.7198031,3.49694043 11.2720879,3.49694043 L21.51868,3.49694043 Z M16.3352921,1.9467 C16.5418639,1.9467 16.7093234,2.11219862 16.7093234,2.32330131 L16.7093234,3.13694611 L15.9612608,3.13694611 L15.9612608,2.32330131 C15.9612608,2.11531015 16.1347616,1.9467 16.3352921,1.9467 Z" id="Combined-Shape-Copy" fill-opacity="0.75" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/Viewport/UiCanvasAssetRef.svg b/Assets/Editor/Icons/Components/Viewport/UiCanvasAssetRef.svg
new file mode 100644
index 0000000000..6afe906b47
--- /dev/null
+++ b/Assets/Editor/Icons/Components/Viewport/UiCanvasAssetRef.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / UI / UiCanvasRef - box</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
+            <stop stop-color="#9D9D9D" offset="100%"></stop>
+        </linearGradient>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
+    </defs>
+    <g id="icon-/-UI-/-UiCanvasRef---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/general/color/-box-template">
+            <mask id="mask-3" fill="white">
+                <use xlink:href="#path-2"></use>
+            </mask>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#BD5F8B">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="UI" x="0" y="0" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+        <path d="M17.111023,17.3988922 C17.3744673,17.3988922 17.5906563,17.4498024 17.6708714,17.5993781 L19.728123,21.4355011 C19.8021553,21.5735481 19.7647414,21.839764 19.4594323,21.9635552 C19.1541232,22.0873465 18.8331315,21.9492224 18.7605716,21.8139211 L16.929146,18.3988922 L6.91019409,18.3988922 L5.07876853,21.8139211 C5.00620862,21.9492224 4.67020277,22.0873465 4.36489366,21.9635552 C4.05958454,21.839764 4.03718476,21.5735481 4.11121711,21.4355011 L6.16846875,17.5993781 C6.26602713,17.4707162 6.42408203,17.3988922 6.72831706,17.3988922 L17.111023,17.3988922 Z M16.681866,19.4142913 C16.9581658,19.4142913 17.182151,19.6462249 17.182151,19.9142913 C17.182151,20.1904337 16.9528339,20.4142913 16.681866,20.4142913 L7.23213372,20.4142913 C6.95583393,20.4142913 6.7318487,20.1823577 6.7318487,19.9142913 C6.7318487,19.638149 6.9611658,19.4142913 7.23213372,19.4142913 L16.681866,19.4142913 Z M19.1855393,4.0605735 C19.737824,4.0605735 20.1855393,4.50828875 20.1855393,5.0605735 L20.1855393,15.4035402 C20.1855393,15.9558249 19.737824,16.4035402 19.1855393,16.4035402 L4.81446073,16.4035402 C4.26217598,16.4035402 3.81446073,15.9558249 3.81446073,15.4035402 L3.81446073,5.0605735 C3.81446073,4.50828875 4.26217598,4.0605735 4.81446073,4.0605735 L19.1855393,4.0605735 Z M11.9196701,1.98823309 C12.1958124,1.98823309 12.4196701,2.20946941 12.4196701,2.49166862 L12.4196701,3.57933797 L11.4196701,3.57933797 L11.4196701,2.49166862 C11.4196701,2.21362885 11.6516036,1.98823309 11.9196701,1.98823309 Z" id="Combined-Shape" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/Viewport/UiCanvasOnMesh.png b/Assets/Editor/Icons/Components/Viewport/UiCanvasOnMesh.png
deleted file mode 100644
index 15bd72d6ce..0000000000
--- a/Assets/Editor/Icons/Components/Viewport/UiCanvasOnMesh.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9a0e50a6daf7f85fd4e03e5e4af28ca8386734725462800967820b33bef550cc
-size 2742
diff --git a/Assets/Editor/Icons/Components/Viewport/UiCanvasOnMesh.svg b/Assets/Editor/Icons/Components/Viewport/UiCanvasOnMesh.svg
new file mode 100644
index 0000000000..51585a5160
--- /dev/null
+++ b/Assets/Editor/Icons/Components/Viewport/UiCanvasOnMesh.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / UI / UiCanvasOnMesh - box</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
+            <stop stop-color="#9D9D9D" offset="100%"></stop>
+        </linearGradient>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
+    </defs>
+    <g id="icon-/-UI-/-UiCanvasOnMesh---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/general/color/-box-template">
+            <mask id="mask-3" fill="white">
+                <use xlink:href="#path-2"></use>
+            </mask>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#BD5F8B">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="UI" x="0" y="0" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+        <path d="M11.9269111,1.04705679 L21.147179,6.48574709 L21.147179,17.341971 L11.9269111,22.7806613 L2.70664322,17.341971 L2.70664322,6.48574709 L11.9269111,1.04705679 Z M11.9269111,2.35934119 L3.83694144,7.13131095 L3.83694144,16.6964071 L11.9269111,21.4683769 L20.0168807,16.6964071 L20.0168807,7.13131095 L11.9269111,2.35934119 Z M14.7960146,14.6957827 C14.9439007,14.6957827 15.0652597,14.7243614 15.1102889,14.8083267 L16.2651395,16.9617574 C16.306698,17.0392509 16.2856955,17.1886928 16.1143084,17.2581838 C15.9429212,17.3276747 15.7627306,17.2501379 15.7219987,17.1741857 L14.6939169,15.2571387 L9.06971789,15.2571387 L8.04163613,17.1741857 C8.00090418,17.2501379 7.81228528,17.3276747 7.64089817,17.2581838 C7.46951106,17.1886928 7.4569368,17.0392509 7.49849531,16.9617574 L8.65334591,14.8083267 C8.70811089,14.7361015 8.79683596,14.6957827 8.96762013,14.6957827 L14.7960146,14.6957827 Z M14.5551048,15.8271391 C14.7102073,15.8271391 14.8359428,15.9573364 14.8359428,16.1078171 C14.8359428,16.2628313 14.7072142,16.3884951 14.5551048,16.3884951 L9.25044064,16.3884951 C9.0953381,16.3884951 8.96960264,16.2582978 8.96960264,16.1078171 C8.96960264,15.952803 9.09833117,15.8271391 9.25044064,15.8271391 L14.5551048,15.8271391 Z M15.5219129,7.20823716 C16.0741976,7.20823716 16.5219129,7.65595241 16.5219129,8.20823716 L16.5219129,13.1370358 C16.5219129,13.6893206 16.0741976,14.1370358 15.5219129,14.1370358 L8.33190933,14.1370358 C7.77962458,14.1370358 7.33190933,13.6893206 7.33190933,13.1370358 L7.33190933,8.20823716 C7.33190933,7.65595241 7.77962458,7.20823716 8.33190933,7.20823716 L15.5219129,7.20823716 Z M11.8818174,6.04491638 C12.0368316,6.04491638 12.1624954,6.16910872 12.1624954,6.32752295 L12.1624954,6.93809269 L11.6011394,6.93809269 L11.6011394,6.32752295 C11.6011394,6.17144365 11.7313367,6.04491638 11.8818174,6.04491638 Z" id="Combined-Shape" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/Viewport/UiCanvasRef.png b/Assets/Editor/Icons/Components/Viewport/UiCanvasRef.png
deleted file mode 100644
index 5c0b5e7a22..0000000000
--- a/Assets/Editor/Icons/Components/Viewport/UiCanvasRef.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:59cde361e99d8bd7f6df8e4e91cc9383a901dfdc2c5c4977dbf5871ce02f6ba4
-size 1935
diff --git a/Assets/Editor/Icons/Components/Viewport/VRPreview.png b/Assets/Editor/Icons/Components/Viewport/VRPreview.png
deleted file mode 100644
index 5778d61914..0000000000
--- a/Assets/Editor/Icons/Components/Viewport/VRPreview.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:73a084f943c3737c9d7724b0477fa1d22296e0378d77379861b7333f563d8c2f
-size 22138
diff --git a/Assets/Editor/Icons/Components/Viewport/VRPreview.svg b/Assets/Editor/Icons/Components/Viewport/VRPreview.svg
new file mode 100644
index 0000000000..1a0b2f2f61
--- /dev/null
+++ b/Assets/Editor/Icons/Components/Viewport/VRPreview.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / VR / VRPreview - box</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
+            <stop stop-color="#9D9D9D" offset="100%"></stop>
+        </linearGradient>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
+    </defs>
+    <g id="icon-/-VR-/-VRPreview---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/general/color/-box-template">
+            <mask id="mask-3" fill="white">
+                <use xlink:href="#path-2"></use>
+            </mask>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#7D5BB6">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="Lights" x="0" y="0" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+        <path d="M15.7077452,14.3974798 C19.6128497,14.9078542 22.3870345,16.2241752 22.3870345,17.9436548 C22.3870345,20.1702074 17.7353821,21.7207583 12,21.7207583 C6.26461793,21.7207583 1.61296549,20.1702074 1.61296549,17.9436548 C1.61296549,16.255194 4.28796226,14.9554774 8.08202795,14.4258852 L8.99277132,15.2711402 C5.25154432,15.6794021 2.55724136,16.806685 2.55724136,17.9436548 C2.55724136,19.3676663 6.78368972,20.7764824 12,20.7764824 C17.2163103,20.7764824 21.4427586,19.3676663 21.4427586,17.9436548 C21.4427586,16.785342 18.6463522,15.6370832 14.7954437,15.2489135 L15.7077452,14.3974798 Z M12.8322063,11.5763978 L12.8322063,12.4311569 L14.850272,12.4311569 L14.850272,13.1625386 C13.8176084,14.2180075 13.0716858,14.9755403 12.6125043,15.435137 L12.4441246,15.6030858 C12.2655232,15.7804878 12.1493677,15.8930059 12.095658,15.9406401 C11.8194366,16.1856162 11.4665742,16.245118 11.1852894,15.9358406 C10.9977662,15.7296556 10.1466057,14.8068236 8.631808,13.1673445 L8.631808,12.4311569 L10.6710302,12.4311569 L10.6710302,11.5763978 L12.8322063,11.5763978 Z M5.15496619,2.28495093 L18.3385148,2.28495093 C18.6650005,2.28495093 18.8790257,2.28495093 18.8790257,2.58217943 L18.8790257,3.01297567 L19.6188049,3.01297567 C19.9253151,3.01297567 19.9531797,3.24581991 19.9557128,3.51869095 L19.9559661,8.9377088 C19.9559661,9.494082 19.7929935,10.114419 19.1793605,10.114419 L18.0079756,10.114419 C17.6643532,10.114419 17.4696665,10.9805518 17.1368059,10.9805518 L14.291725,10.9805518 C13.6510748,10.9805518 13.2578451,11.1788833 12.9040466,10.6014467 C12.5502482,10.0240101 12.5192587,9.46054823 12.1955143,9.31461529 C11.8717698,9.16868235 11.6215077,9.16868235 11.3380608,9.31461529 C11.0546139,9.46054823 10.9714044,9.82799628 10.596953,10.3502039 C10.2225017,10.8724116 10.2225017,10.9805518 9.54826979,10.9805518 L6.81741358,10.9805518 C6.18396611,10.9805518 6.359686,10.114419 5.8682708,10.114419 L4.47030929,10.114419 C3.74418012,10.114419 3.52611385,9.62969469 3.52611385,9.16868235 L3.52611385,3.71323478 C3.52611385,3.37928545 3.52973254,3.20508105 3.84387168,3.20508105 L4.47030929,3.20508105 L4.47030929,2.51814508 C4.47030929,2.22143022 4.87065672,2.28495093 5.15496619,2.28495093 Z M16.879185,4.00272595 L16.3443433,4.00311551 C16.2855429,4.00317818 16.2234588,4.00324784 16.1582965,4.00332405 L15.4942715,4.00417579 C15.248924,4.00451115 14.9814197,4.00489415 14.6973056,4.00531335 L14.1085747,4.00619664 C13.5009845,4.00712142 12.8417472,4.00816053 12.1752391,4.00922251 L11.5079508,4.01028872 C10.6193845,4.01171146 9.74418911,4.01312065 8.98755258,4.01429949 L8.44394853,4.01513705 L8.31614996,4.01533056 L8.31614996,4.01533056 L7.73347592,4.01618696 L7.62928346,4.01633378 L7.62928346,4.01633378 L6.91135551,4.01721696 L6.84265483,4.01727245 L6.84265483,4.01727245 L6.7379699,4.01731774 L6.7379699,4.01731774 C6.49683297,4.01731774 6.35003617,4.18487523 6.35003617,4.53388203 C6.35003617,4.71846491 6.2660919,4.93463831 6.09654069,4.98579755 L6.01862979,4.99704685 L5.13266594,4.99704685 C4.68422302,4.99704685 4.61268549,5.25423528 4.61268549,5.50463454 C4.61268549,6.14691948 4.63170859,7.58191213 4.63170859,8.33759815 C4.63170859,8.6585799 4.79971275,9.06102167 5.3168102,9.11687569 L5.44241973,9.1234178 L6.62810005,9.1234178 C7.0448936,9.1234178 6.89366652,9.72460303 7.43092466,9.72460303 C7.99262307,9.72460303 8.7379626,9.71673753 9.30981202,9.71673753 C9.83400731,9.71673753 9.87769025,9.64860373 10.1259562,9.33564902 L10.1992522,9.24409504 C10.225718,9.21146524 10.2490194,9.1825088 10.2697598,9.15653781 L10.3682979,9.03103395 C10.4844912,8.88000627 10.4910119,8.85935771 10.8278223,8.46759812 C11.2769028,7.945252 12.5131865,8.0431303 12.9493111,8.46759812 C13.3854357,8.89206593 13.2501785,8.99951096 13.5502525,9.43247993 C13.8253203,9.82936816 14.1326658,9.76230886 14.6005109,9.74837614 L14.7321807,9.74628199 L15.0930343,9.74450176 C15.517083,9.74045497 15.9681812,9.72988849 16.6181631,9.71673753 C16.864879,9.71174577 17.0299863,9.27698396 17.2626523,9.1683715 L17.3669374,9.14399548 L18.360447,9.14399548 C18.8437243,9.14399548 18.8840065,8.67680442 18.8872954,8.27604889 L18.8873052,8.06189089 C18.884962,7.47563474 18.8685594,6.22821867 18.8685594,5.31959614 C18.8685594,5.17550979 18.8456268,5.05867369 18.6733569,5.03171601 L18.5900153,5.02584807 L17.6856414,5.02584807 C17.4500501,5.02584807 17.2188483,5.04830418 17.2188483,4.88140982 C17.2188483,4.78322441 17.2349576,4.440876 17.2289695,4.27610302 C17.2198705,4.0257283 17.2198705,4.00272595 16.879185,4.00272595 Z" id="Combined-Shape" fill="#FFFFFF" fill-rule="nonzero"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Assets/Editor/Icons/ScriptCanvas/Viewport/ScriptCanvas.svg b/Assets/Editor/Icons/ScriptCanvas/Viewport/ScriptCanvas.svg
new file mode 100644
index 0000000000..c42bf4fc63
--- /dev/null
+++ b/Assets/Editor/Icons/ScriptCanvas/Viewport/ScriptCanvas.svg
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Scripting / ScriptCanvas - box</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
+            <stop stop-color="#9D9D9D" offset="100%"></stop>
+        </linearGradient>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
+        <path d="M10.2004041,4.44422132 L2.29191921,4.44422132 L2.29191921,7.80398091 C2.29191921,8.11554558 2.54545663,8.36952144 2.85655972,8.36952144 L9.63576355,8.36952144 C9.95068218,8.36952144 10.2004041,8.11875281 10.2004041,7.80398091 L10.2004041,4.44422132 Z M13.8217189,16.0516515 L13.8217189,19.4114115 C13.8217189,19.7229762 14.0752563,19.976952 14.3863594,19.976952 L21.1655632,19.976952 C21.4804819,19.976952 21.7302037,19.7261834 21.7302037,19.4114115 L21.7302037,16.0516515 L13.8217189,16.0516515 Z M13.0858978,17.9626061 C10.4322333,17.9626061 9.27786554,17.0827776 9.27786554,15.2322894 C9.27786554,13.0912024 11.3788467,11.1128472 13.0464262,9.48385474 C13.9610839,8.59036186 15.4742118,7.51691761 15.2602148,6.43325922 C14.9755538,4.99176665 13.3670162,5.27315511 12.5199363,5.27315511 C12.0710065,5.27315511 11.5224799,5.27315511 10.940431,5.27315511 L10.9485877,8.1095667 C10.9485877,8.73160374 10.4502333,9.23586439 9.82319007,9.23586439 L2.73306892,9.23586439 C2.11152895,9.23586439 1.60767126,8.73008927 1.60767126,8.1095667 L1.60767126,3.32749037 C1.60767126,2.70545333 2.10602572,2.20119268 2.73306892,2.20119268 L9.82319007,2.20119268 C10.44473,2.20119268 10.9485877,2.7069678 10.9485877,3.32749037 L10.940431,4.43325922 C11.0108682,4.44988121 12.3686789,4.43325922 12.8502508,4.43325922 C14.1142425,4.43325922 15.7782212,4.43325922 16.0810542,6.43325922 C16.2896171,7.81067149 15.1037906,8.60620537 14.2112955,9.48385474 C13.3188004,10.3615041 10.2011292,12.9353275 10.2011292,15.2322894 C10.2011292,16.583745 10.8934973,17.0827776 13.0858978,17.2023335 L13.0858978,14.99877 C13.0858978,14.376733 13.5842523,13.8724723 14.2112955,13.8724723 L21.2669311,13.8724723 C21.888471,13.8724723 22.3923287,14.3782474 22.3923287,14.99877 L22.3923287,19.6788282 C22.3923287,20.3008653 21.8939743,20.8051259 21.2669311,20.8051259 L14.2112955,20.8051259 C13.5897555,20.8051259 13.0858978,20.2993508 13.0858978,19.6788282 L13.0858978,17.9626061 Z" id="path-4"></path>
+    </defs>
+    <g id="icon-/-Scripting-/-ScriptCanvas---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/general/color/-box-template">
+            <mask id="mask-3" fill="white">
+                <use xlink:href="#path-2"></use>
+            </mask>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#D8D872">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="Rectangle-2" x="0" y="0" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+        <mask id="mask-5" fill="white">
+            <use xlink:href="#path-4"></use>
+        </mask>
+        <use id="Shape" fill="#FFFFFF" fill-rule="nonzero" xlink:href="#path-4"></use>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Assets/Editor/Translation/scriptcanvas_en_us.ts b/Assets/Editor/Translation/scriptcanvas_en_us.ts
index 5cafabaf60..f057ba2f30 100644
--- a/Assets/Editor/Translation/scriptcanvas_en_us.ts
+++ b/Assets/Editor/Translation/scriptcanvas_en_us.ts
@@ -42001,245 +42001,255 @@ An Entity can be selected by using the pick button, or by dragging an Entity fro
         <source>WORLD_RAYCASTMULTIPLELOCALSPACE_OUTPUT0_NAME</source>
         <translation type="unfinished">Hits</translation>
     </message>
-    <message id="WORLD_OVERLAPSPHERE_NAME">
-        <source>WORLD_OVERLAPSPHERE_NAME</source>
+    <message id="WORLD_OVERLAPSPHEREWITHGROUP_NAME">
+        <source>WORLD_OVERLAPSPHEREWITHGROUP_NAME</source>
         <translation type="unfinished">Overlap Sphere</translation>
     </message>
-    <message id="WORLD_OVERLAPSPHERE_PARAM0_NAME">
-        <source>WORLD_OVERLAPSPHERE_PARAM0_NAME</source>
+    <message id="WORLD_OVERLAPSPHEREWITHGROUP_PARAM0_NAME">
+        <source>WORLD_OVERLAPSPHEREWITHGROUP_PARAM0_NAME</source>
         <translation type="unfinished">Position</translation>
     </message>
-    <message id="WORLD_OVERLAPSPHERE_PARAM1_NAME">
-        <source>WORLD_OVERLAPSPHERE_PARAM1_NAME</source>
+    <message id="WORLD_OVERLAPSPHEREWITHGROUP_PARAM1_NAME">
+        <source>WORLD_OVERLAPSPHEREWITHGROUP_PARAM1_NAME</source>
         <translation type="unfinished">Radius</translation>
     </message>
-    <message id="WORLD_OVERLAPSPHERE_PARAM2_NAME">
-        <source>WORLD_OVERLAPSPHERE_PARAM2_NAME</source>
+    <message id="WORLD_OVERLAPSPHEREWITHGROUP_PARAM2_NAME">
+        <source>WORLD_OVERLAPSPHEREWITHGROUP_PARAM2_NAME</source>
         <translation type="unfinished">Collision Group</translation>
     </message>
-    <message id="WORLD_OVERLAPSPHERE_PARAM3_NAME">
-        <source>WORLD_OVERLAPSPHERE_PARAM3_NAME</source>
+    <message id="WORLD_OVERLAPSPHEREWITHGROUP_PARAM3_NAME">
+        <source>WORLD_OVERLAPSPHEREWITHGROUP_PARAM3_NAME</source>
         <translation type="unfinished">Ignore</translation>
     </message>
-    <message id="WORLD_OVERLAPSPHERE_OUTPUT0_NAME">
-        <source>WORLD_OVERLAPSPHERE_OUTPUT0_NAME</source>
+    <message id="WORLD_OVERLAPSPHEREWITHGROUP_OUTPUT0_NAME">
+        <source>WORLD_OVERLAPSPHEREWITHGROUP_OUTPUT0_NAME</source>
         <translation type="unfinished">Is Overlapping</translation>
     </message>
-    <message id="WORLD_OVERLAPSPHERE_OUTPUT1_NAME">
-        <source>WORLD_OVERLAPSPHERE_OUTPUT1_NAME</source>
+    <message id="WORLD_OVERLAPSPHEREWITHGROUP_OUTPUT1_NAME">
+        <source>WORLD_OVERLAPSPHEREWITHGROUP_OUTPUT1_NAME</source>
         <translation type="unfinished">Overlaps</translation>
     </message>
-    <message id="WORLD_OVERLAPBOX_NAME">
-        <source>WORLD_OVERLAPBOX_NAME</source>
+    <message id="WORLD_OVERLAPBOXWITHGROUP_NAME">
+        <source>WORLD_OVERLAPBOXWITHGROUP_NAME</source>
         <translation type="unfinished">Overlap Box</translation>
     </message>
-    <message id="WORLD_OVERLAPBOX_PARAM0_NAME">
-        <source>WORLD_OVERLAPBOX_PARAM0_NAME</source>
+    <message id="WORLD_OVERLAPBOXWITHGROUP_PARAM0_NAME">
+        <source>WORLD_OVERLAPBOXWITHGROUP_PARAM0_NAME</source>
         <translation type="unfinished">Pose</translation>
     </message>
-    <message id="WORLD_OVERLAPBOX_PARAM1_NAME">
-        <source>WORLD_OVERLAPBOX_PARAM1_NAME</source>
+    <message id="WORLD_OVERLAPBOXWITHGROUP_PARAM1_NAME">
+        <source>WORLD_OVERLAPBOXWITHGROUP_PARAM1_NAME</source>
         <translation type="unfinished">Dimensions</translation>
     </message>
-    <message id="WORLD_OVERLAPBOX_PARAM2_NAME">
-        <source>WORLD_OVERLAPBOX_PARAM2_NAME</source>
+    <message id="WORLD_OVERLAPBOXWITHGROUP_PARAM2_NAME">
+        <source>WORLD_OVERLAPBOXWITHGROUP_PARAM2_NAME</source>
         <translation type="unfinished">Collision Group</translation>
     </message>
-    <message id="WORLD_OVERLAPBOX_PARAM3_NAME">
-        <source>WORLD_OVERLAPBOX_PARAM3_NAME</source>
+    <message id="WORLD_OVERLAPBOXWITHGROUP_PARAM3_NAME">
+        <source>WORLD_OVERLAPBOXWITHGROUP_PARAM3_NAME</source>
         <translation type="unfinished">Ignore</translation>
     </message>
-    <message id="WORLD_OVERLAPBOX_OUTPUT0_NAME">
-        <source>WORLD_OVERLAPBOX_OUTPUT0_NAME</source>
+    <message id="WORLD_OVERLAPBOXWITHGROUP_OUTPUT0_NAME">
+        <source>WORLD_OVERLAPBOXWITHGROUP_OUTPUT0_NAME</source>
         <translation type="unfinished">Is Overlapping</translation>
     </message>
-    <message id="WORLD_OVERLAPBOX_OUTPUT1_NAME">
-        <source>WORLD_OVERLAPBOX_OUTPUT1_NAME</source>
+    <message id="WORLD_OVERLAPBOXWITHGROUP_OUTPUT1_NAME">
+        <source>WORLD_OVERLAPBOXWITHGROUP_OUTPUT1_NAME</source>
         <translation type="unfinished">Overlaps</translation>
     </message>
-    <message id="WORLD_OVERLAPCAPSULE_NAME">
-        <source>WORLD_OVERLAPCAPSULE_NAME</source>
+    <message id="WORLD_OVERLAPCAPSULEWITHGROUP_NAME">
+        <source>WORLD_OVERLAPCAPSULEWITHGROUP_NAME</source>
         <translation type="unfinished">Overlap Capsule</translation>
     </message>
-    <message id="WORLD_OVERLAPCAPSULE_PARAM0_NAME">
-        <source>WORLD_OVERLAPCAPSULE_PARAM0_NAME</source>
+    <message id="WORLD_OVERLAPCAPSULEWITHGROUP_PARAM0_NAME">
+        <source>WORLD_OVERLAPCAPSULEWITHGROUP_PARAM0_NAME</source>
         <translation type="unfinished">Pose</translation>
     </message>
-    <message id="WORLD_OVERLAPCAPSULE_PARAM1_NAME">
-        <source>WORLD_OVERLAPCAPSULE_PARAM1_NAME</source>
+    <message id="WORLD_OVERLAPCAPSULEWITHGROUP_PARAM1_NAME">
+        <source>WORLD_OVERLAPCAPSULEWITHGROUP_PARAM1_NAME</source>
         <translation type="unfinished">Height</translation>
     </message>
-    <message id="WORLD_OVERLAPCAPSULE_PARAM2_NAME">
-        <source>WORLD_OVERLAPCAPSULE_PARAM2_NAME</source>
+    <message id="WORLD_OVERLAPCAPSULEWITHGROUP_PARAM2_NAME">
+        <source>WORLD_OVERLAPCAPSULEWITHGROUP_PARAM2_NAME</source>
         <translation type="unfinished">Radius</translation>
     </message>
-    <message id="WORLD_OVERLAPCAPSULE_PARAM3_NAME">
-        <source>WORLD_OVERLAPCAPSULE_PARAM3_NAME</source>
+    <message id="WORLD_OVERLAPCAPSULEWITHGROUP_PARAM3_NAME">
+        <source>WORLD_OVERLAPCAPSULEWITHGROUP_PARAM3_NAME</source>
         <translation type="unfinished">Collision Group</translation>
     </message>
-    <message id="WORLD_OVERLAPCAPSULE_PARAM4_NAME">
-        <source>WORLD_OVERLAPCAPSULE_PARAM4_NAME</source>
+    <message id="WORLD_OVERLAPCAPSULEWITHGROUP_PARAM4_NAME">
+        <source>WORLD_OVERLAPCAPSULEWITHGROUP_PARAM4_NAME</source>
         <translation type="unfinished">Ignore</translation>
     </message>
-    <message id="WORLD_OVERLAPCAPSULE_OUTPUT0_NAME">
-        <source>WORLD_OVERLAPCAPSULE_OUTPUT0_NAME</source>
+    <message id="WORLD_OVERLAPCAPSULEWITHGROUP_OUTPUT0_NAME">
+        <source>WORLD_OVERLAPCAPSULEWITHGROUP_OUTPUT0_NAME</source>
         <translation type="unfinished">Is Overlapping</translation>
     </message>
-    <message id="WORLD_OVERLAPCAPSULE_OUTPUT1_NAME">
-        <source>WORLD_OVERLAPCAPSULE_OUTPUT1_NAME</source>
+    <message id="WORLD_OVERLAPCAPSULEWITHGROUP_OUTPUT1_NAME">
+        <source>WORLD_OVERLAPCAPSULEWITHGROUP_OUTPUT1_NAME</source>
         <translation type="unfinished">Overlaps</translation>
-    </message>
-    
-    <message id="WORLD_SPHERECAST_NAME">
-        <source>WORLD_SPHERECAST_NAME</source>
+    </message>    
+    <message id="WORLD_SPHERECASTWITHGROUP_NAME">
+        <source>WORLD_SPHERECASTWITHGROUP_NAME</source>
         <translation type="unfinished">Sphere Cast</translation>
     </message>
-    <message id="WORLD_SPHERECAST_PARAM0_NAME">
-        <source>WORLD_SPHERECAST_PARAM0_NAME</source>
+    <message id="WORLD_SPHERECASTWITHGROUP_PARAM0_NAME">
+        <source>WORLD_SPHERECASTWITHGROUP_PARAM0_NAME</source>
         <translation type="unfinished">Distance</translation>
     </message>
-    <message id="WORLD_SPHERECAST_PARAM1_NAME">
-        <source>WORLD_SPHERECAST_PARAM1_NAME</source>
+    <message id="WORLD_SPHERECASTWITHGROUP_PARAM1_NAME">
+        <source>WORLD_SPHERECASTWITHGROUP_PARAM1_NAME</source>
         <translation type="unfinished">Start Pose</translation>
     </message>
-    <message id="WORLD_SPHERECAST_PARAM2_NAME">
-        <source>WORLD_SPHERECAST_PARAM2_NAME</source>
+    <message id="WORLD_SPHERECASTWITHGROUP_PARAM2_NAME">
+        <source>WORLD_SPHERECASTWITHGROUP_PARAM2_NAME</source>
         <translation type="unfinished">Direction</translation>
     </message>
-    <message id="WORLD_SPHERECAST_PARAM3_NAME">
-        <source>WORLD_SPHERECAST_PARAM3_NAME</source>
+    <message id="WORLD_SPHERECASTWITHGROUP_PARAM3_NAME">
+        <source>WORLD_SPHERECASTWITHGROUP_PARAM3_NAME</source>
         <translation type="unfinished">Radius</translation>
     </message>
-    <message id="WORLD_SPHERECAST_PARAM4_NAME">
-        <source>WORLD_SPHERECAST_PARAM4_NAME</source>
+    <message id="WORLD_SPHERECASTWITHGROUP_PARAM4_NAME">
+        <source>WORLD_SPHERECASTWITHGROUP_PARAM4_NAME</source>
         <translation type="unfinished">Collision Group</translation>
     </message>
-    <message id="WORLD_SPHERECAST_PARAM5_NAME">
-        <source>WORLD_SPHERECAST_PARAM5_NAME</source>
+    <message id="WORLD_SPHERECASTWITHGROUP_PARAM5_NAME">
+        <source>WORLD_SPHERECASTWITHGROUP_PARAM5_NAME</source>
         <translation type="unfinished">Ignore</translation>
     </message>
-    <message id="WORLD_SPHERECAST_OUTPUT0_NAME">
-        <source>WORLD_SPHERECAST_OUTPUT0_NAME</source>
+    <message id="WORLD_SPHERECASTWITHGROUP_OUTPUT0_NAME">
+        <source>WORLD_SPHERECASTWITHGROUP_OUTPUT0_NAME</source>
         <translation type="unfinished">Object Hit</translation>
     </message>
-    <message id="WORLD_SPHERECAST_OUTPUT1_NAME">
-        <source>WORLD_SPHERECAST_OUTPUT1_NAME</source>
+    <message id="WORLD_SPHERECASTWITHGROUP_OUTPUT1_NAME">
+        <source>WORLD_SPHERECASTWITHGROUP_OUTPUT1_NAME</source>
         <translation type="unfinished">Position</translation>
     </message>
-    <message id="WORLD_SPHERECAST_OUTPUT2_NAME">
-        <source>WORLD_SPHERECAST_OUTPUT2_NAME</source>
+    <message id="WORLD_SPHERECASTWITHGROUP_OUTPUT2_NAME">
+        <source>WORLD_SPHERECASTWITHGROUP_OUTPUT2_NAME</source>
         <translation type="unfinished">Normal</translation>
     </message>
-    <message id="WORLD_SPHERECAST_OUTPUT3_NAME">
-        <source>WORLD_SPHERECAST_OUTPUT3_NAME</source>
+    <message id="WORLD_SPHERECASTWITHGROUP_OUTPUT3_NAME">
+        <source>WORLD_SPHERECASTWITHGROUP_OUTPUT3_NAME</source>
         <translation type="unfinished">Distance</translation>
     </message>
-    <message id="WORLD_SPHERECAST_OUTPUT4_NAME">
-        <source>WORLD_SPHERECAST_OUTPUT4_NAME</source>
+    <message id="WORLD_SPHERECASTWITHGROUP_OUTPUT4_NAME">
+        <source>WORLD_SPHERECASTWITHGROUP_OUTPUT4_NAME</source>
         <translation type="unfinished">EntityId</translation>
     </message>
-
-    <message id="WORLD_BOXCAST_NAME">
-        <source>WORLD_BOXCAST_NAME</source>
+    <message id="WORLD_BOXCASTWITHGROUP_NAME">
+        <source>WORLD_BOXCASTWITHGROUP_NAME</source>
         <translation type="unfinished">Box Cast</translation>
     </message>
-    <message id="WORLD_BOXCAST_PARAM0_NAME">
-        <source>WORLD_BOXCAST_PARAM0_NAME</source>
+    <message id="WORLD_BOXCASTWITHGROUP_PARAM0_NAME">
+        <source>WORLD_BOXCASTWITHGROUP_PARAM0_NAME</source>
         <translation type="unfinished">Distance</translation>
     </message>
-    <message id="WORLD_BOXCAST_PARAM1_NAME">
-        <source>WORLD_BOXCAST_PARAM1_NAME</source>
+    <message id="WORLD_BOXCASTWITHGROUP_PARAM1_NAME">
+        <source>WORLD_BOXCASTWITHGROUP_PARAM1_NAME</source>
         <translation type="unfinished">Start Pose</translation>
     </message>
-    <message id="WORLD_BOXCAST_PARAM2_NAME">
-        <source>WORLD_BOXCAST_PARAM2_NAME</source>
+    <message id="WORLD_BOXCASTWITHGROUP_PARAM2_NAME">
+        <source>WORLD_BOXCASTWITHGROUP_PARAM2_NAME</source>
         <translation type="unfinished">Direction</translation>
     </message>
-    <message id="WORLD_BOXCAST_PARAM3_NAME">
-        <source>WORLD_BOXCAST_PARAM3_NAME</source>
+    <message id="WORLD_BOXCASTWITHGROUP_PARAM3_NAME">
+        <source>WORLD_BOXCASTWITHGROUP_PARAM3_NAME</source>
         <translation type="unfinished">Dimensions</translation>
     </message>
-    <message id="WORLD_BOXCAST_PARAM4_NAME">
-        <source>WORLD_BOXCAST_PARAM4_NAME</source>
+    <message id="WORLD_BOXCASTWITHGROUP_PARAM4_NAME">
+        <source>WORLD_BOXCASTWITHGROUP_PARAM4_NAME</source>
         <translation type="unfinished">Collision Group</translation>
     </message>
-    <message id="WORLD_BOXCAST_PARAM5_NAME">
-        <source>WORLD_BOXCAST_PARAM5_NAME</source>
+    <message id="WORLD_BOXCASTWITHGROUP_PARAM5_NAME">
+        <source>WORLD_BOXCASTWITHGROUP_PARAM5_NAME</source>
         <translation type="unfinished">Ignore</translation>
     </message>
-    <message id="WORLD_BOXCAST_OUTPUT0_NAME">
-        <source>WORLD_BOXCAST_OUTPUT0_NAME</source>
+    <message id="WORLD_BOXCASTWITHGROUP_OUTPUT0_NAME">
+        <source>WORLD_BOXCASTWITHGROUP_OUTPUT0_NAME</source>
         <translation type="unfinished">Object Hit</translation>
     </message>
-    <message id="WORLD_BOXCAST_OUTPUT1_NAME">
-        <source>WORLD_BOXCAST_OUTPUT1_NAME</source>
+    <message id="WORLD_BOXCASTWITHGROUP_OUTPUT1_NAME">
+        <source>WORLD_BOXCASTWITHGROUP_OUTPUT1_NAME</source>
         <translation type="unfinished">Position</translation>
     </message>
-    <message id="WORLD_BOXCAST_OUTPUT2_NAME">
-        <source>WORLD_BOXCAST_OUTPUT2_NAME</source>
+    <message id="WORLD_BOXCASTWITHGROUP_OUTPUT2_NAME">
+        <source>WORLD_BOXCASTWITHGROUP_OUTPUT2_NAME</source>
         <translation type="unfinished">Normal</translation>
     </message>
-    <message id="WORLD_BOXCAST_OUTPUT3_NAME">
-        <source>WORLD_BOXCAST_OUTPUT3_NAME</source>
+    <message id="WORLD_BOXCASTWITHGROUP_OUTPUT3_NAME">
+        <source>WORLD_BOXCASTWITHGROUP_OUTPUT3_NAME</source>
         <translation type="unfinished">Distance</translation>
     </message>
-    <message id="WORLD_BOXCAST_OUTPUT4_NAME">
-        <source>WORLD_BOXCAST_OUTPUT4_NAME</source>
+    <message id="WORLD_BOXCASTWITHGROUP_OUTPUT4_NAME">
+        <source>WORLD_BOXCASTWITHGROUP_OUTPUT4_NAME</source>
         <translation type="unfinished">EntityId</translation>
     </message>
-
-    <message id="WORLD_CAPSULECAST_NAME">
-        <source>WORLD_CAPSULECAST_NAME</source>
+    <message id="WORLD_CAPSULECASTWITHGROUP_NAME">
+        <source>WORLD_CAPSULECASTWITHGROUP_NAME</source>
         <translation type="unfinished">Capsule Cast</translation>
     </message>
-    <message id="WORLD_CAPSULECAST_PARAM0_NAME">
-        <source>WORLD_CAPSULECAST_PARAM0_NAME</source>
+    <message id="WORLD_CAPSULECASTWITHGROUP_PARAM0_NAME">
+        <source>WORLD_CAPSULECASTWITHGROUP_PARAM0_NAME</source>
         <translation type="unfinished">Distance</translation>
     </message>
-    <message id="WORLD_CAPSULECAST_PARAM1_NAME">
-        <source>WORLD_CAPSULECAST_PARAM1_NAME</source>
+    <message id="WORLD_CAPSULECASTWITHGROUP_PARAM1_NAME">
+        <source>WORLD_CAPSULECASTWITHGROUP_PARAM1_NAME</source>
         <translation type="unfinished">Start Pose</translation>
     </message>
-    <message id="WORLD_CAPSULECAST_PARAM2_NAME">
-        <source>WORLD_CAPSULECAST_PARAM2_NAME</source>
+    <message id="WORLD_CAPSULECASTWITHGROUP_PARAM2_NAME">
+        <source>WORLD_CAPSULECASTWITHGROUP_PARAM2_NAME</source>
         <translation type="unfinished">Direction</translation>
     </message>
-    <message id="WORLD_CAPSULECAST_PARAM3_NAME">
-        <source>WORLD_CAPSULECAST_PARAM3_NAME</source>
+    <message id="WORLD_CAPSULECASTWITHGROUP_PARAM3_NAME">
+        <source>WORLD_CAPSULECASTWITHGROUP_PARAM3_NAME</source>
         <translation type="unfinished">Height</translation>
     </message>
-    <message id="WORLD_CAPSULECAST_PARAM4_NAME">
-        <source>WORLD_CAPSULECAST_PARAM4_NAME</source>
+    <message id="WORLD_CAPSULECASTWITHGROUP_PARAM4_NAME">
+        <source>WORLD_CAPSULECASTWITHGROUP_PARAM4_NAME</source>
         <translation type="unfinished">Radius</translation>
     </message>
-    <message id="WORLD_CAPSULECAST_PARAM5_NAME">
-        <source>WORLD_CAPSULECAST_PARAM5_NAME</source>
+    <message id="WORLD_CAPSULECASTWITHGROUP_PARAM5_NAME">
+        <source>WORLD_CAPSULECASTWITHGROUP_PARAM5_NAME</source>
         <translation type="unfinished">Collision Group</translation>
     </message>
-    <message id="WORLD_CAPSULECAST_PARAM6_NAME">
-        <source>WORLD_CAPSULECAST_PARAM6_NAME</source>
+    <message id="WORLD_CAPSULECASTWITHGROUP_PARAM6_NAME">
+        <source>WORLD_CAPSULECASTWITHGROUP_PARAM6_NAME</source>
         <translation type="unfinished">Ignore</translation>
     </message>
-    <message id="WORLD_CAPSULECAST_OUTPUT0_NAME">
-        <source>WORLD_CAPSULECAST_OUTPUT0_NAME</source>
+    <message id="WORLD_CAPSULECASTWITHGROUP_OUTPUT0_NAME">
+        <source>WORLD_CAPSULECASTWITHGROUP_OUTPUT0_NAME</source>
         <translation type="unfinished">Object Hit</translation>
     </message>
-    <message id="WORLD_CAPSULECAST_OUTPUT1_NAME">
-        <source>WORLD_CAPSULECAST_OUTPUT1_NAME</source>
+    <message id="WORLD_CAPSULECASTWITHGROUP_OUTPUT1_NAME">
+        <source>WORLD_CAPSULECASTWITHGROUP_OUTPUT1_NAME</source>
+        <source>WORLD_CAPSULECASTWITHGROUP_OUTPUT1_NAME</source>
         <translation type="unfinished">Position</translation>
     </message>
-    <message id="WORLD_BOXCAST_OUTPUT2_NAME">
-        <source>WORLD_BOXCAST_OUTPUT2_NAME</source>
+    <message id="WORLD_CAPSULECASTWITHGROUP_OUTPUT2_NAME">
+        <source>WORLD_CAPSULECASTWITHGROUP_OUTPUT2_NAME</source>
         <translation type="unfinished">Normal</translation>
     </message>
-    <message id="WORLD_CAPSULECAST_OUTPUT3_NAME">
-        <source>WORLD_CAPSULECAST_OUTPUT3_NAME</source>
+    <message id="WORLD_CAPSULECASTWITHGROUP_OUTPUT3_NAME">
+        <source>WORLD_CAPSULECASTWITHGROUP_OUTPUT3_NAME</source>
         <translation type="unfinished">Distance</translation>
     </message>
-    <message id="WORLD_CAPSULECAST_OUTPUT4_NAME">
-        <source>WORLD_CAPSULECAST_OUTPUT4_NAME</source>
+    <message id="WORLD_CAPSULECASTWITHGROUP_OUTPUT4_NAME">
+        <source>WORLD_CAPSULECASTWITHGROUP_OUTPUT4_NAME</source>
         <translation type="unfinished">EntityId</translation>
     </message>
+    <message id="WORLD_RAYCASTLOCALSPACEWITHGROUP_NAME">
+        <source>WORLD_RAYCASTLOCALSPACEWITHGROUP_NAME</source>
+        <translation type="unfinished">Raycast (Local Space)</translation>
+    </message>
+    <message id="WORLD_RAYCASTMULTIPLELOCALSPACEWITHGROUP_NAME">
+        <source>WORLD_RAYCASTMULTIPLELOCALSPACEWITHGROUP_NAME</source>
+        <translation type="unfinished">Raycast Multiple (Local Space)</translation>
+    </message>
+    <message id="WORLD_RAYCASTWORLDSPACEWITHGROUP_NAME">
+        <source>WORLD_RAYCASTWORLDSPACEWITHGROUP_NAME</source>
+        <translation type="unfinished">Raycast (World Space)</translation>
+    </message>
 </context>
 <context>
     <name>EBus: CollisionFilteringBus</name>
@@ -42368,7 +42378,7 @@ An Entity can be selected by using the pick button, or by dragging an Entity fro
     <name>EBus: RigidBodyRequestBus</name>
     <message id="RIGIDBODYREQUESTBUS_NAME">
         <source>RIGIDBODYREQUESTBUS_NAME</source>
-        <translation type="unfinished">RigidBody</translation>
+        <translation type="unfinished">Rigid Body</translation>
     </message>
     <message id="RIGIDBODYREQUESTBUS_TOOLTIP">
         <source>RIGIDBODYREQUESTBUS_TOOLTIP</source>
@@ -42413,6 +42423,23 @@ An Entity can be selected by using the pick button, or by dragging an Entity fro
         <source>RIGIDBODYREQUESTBUS_ISPHYSICSENABLED_OUTPUT0_TOOLTIP</source>
         <translation type="unfinished">Indicates whether physics is enabled</translation>
     </message>
+    <message id="RIGIDBODYREQUESTBUS_ISGRAVITYENABLED_NAME">
+        <source>RIGIDBODYREQUESTBUS_ISGRAVITYENABLED_NAME</source>
+        <comment>Class/Bus: RigidBodyRequestBus  Event/Method: IsGravityEnabled</comment>
+        <translation type="unfinished">Is Gravity Enabled</translation>
+    </message>
+    <message id="RIGIDBODYREQUESTBUS_ISGRAVITYENABLED_TOOLTIP">
+        <source>RIGIDBODYREQUESTBUS_ISGRAVITYENABLED_TOOLTIP</source>
+        <translation type="unfinished">Returns true if the rigid body has gravity enabled</translation>
+    </message>
+    <message id="RIGIDBODYREQUESTBUS_ISGRAVITYENABLED_OUTPUT0_NAME">
+        <source>RIGIDBODYREQUESTBUS_ISGRAVITYENABLED_OUTPUT0_NAME</source>
+        <translation type="unfinished">Enabled</translation>
+    </message>
+    <message id="RIGIDBODYREQUESTBUS_ISGRAVITYENABLED_OUTPUT0_TOOLTIP">
+        <source>RIGIDBODYREQUESTBUS_ISGRAVITYENABLED_OUTPUT0_TOOLTIP</source>
+        <translation type="unfinished">Indicates whether gravity is enabled</translation>
+    </message>
     <message id="RIGIDBODYREQUESTBUS_GETCENTEROFMASSWORLD_NAME">
         <source>RIGIDBODYREQUESTBUS_GETCENTEROFMASSWORLD_NAME</source>
         <comment>Class/Bus: RigidBodyRequestBus  Event/Method: GetCenterOfMassWorld</comment>
@@ -42915,7 +42942,50 @@ An Entity can be selected by using the pick button, or by dragging an Entity fro
         <source>RIGIDBODYREQUESTBUS_GETAABB_OUTPUT0_TOOLTIP</source>
         <translation type="unfinished">The aabb of the rigid body</translation>
     </message>
-</context>    
+</context>
+<context>
+    <name>Method: SceneQueries</name>
+    <message id="SCENEQUERIES_NAME">
+        <source>SCENEQUERIES_NAME</source>
+        <translation type="unfinished">Scene Queries</translation>
+    </message>
+    <message id="SCENEQUERIES_CREATERAYCASTREQUEST_NAME">
+        <source>SCENEQUERIES_CREATERAYCASTREQUEST_NAME</source>
+        <translation type="unfinished">Create Raycast Request</translation>
+    </message>
+    <message id="SCENEQUERIES_CREATERAYCASTREQUEST_PARAM0_NAME">
+        <source>SCENEQUERIES_CREATERAYCASTREQUEST_PARAM0_NAME</source>
+        <translation type="unfinished">Start</translation>
+    </message>
+    <message id="SCENEQUERIES_CREATERAYCASTREQUEST_PARAM0_TOOLTIP">
+        <source>SCENEQUERIES_CREATERAYCASTREQUEST_PARAM0_TOOLTIP</source>
+        <translation type="unfinished">The position from which the raycast starts</translation>
+    </message>
+    <message id="SCENEQUERIES_CREATERAYCASTREQUEST_PARAM1_NAME">
+        <source>SCENEQUERIES_CREATERAYCASTREQUEST_PARAM1_NAME</source>
+        <translation type="unfinished">Direction</translation>
+    </message>
+    <message id="SCENEQUERIES_CREATERAYCASTREQUEST_PARAM1_TOOLTIP">
+        <source>SCENEQUERIES_CREATERAYCASTREQUEST_PARAM1_TOOLTIP</source>
+        <translation type="unfinished">The (normalized) direction in which to fire the raycast</translation>
+    </message>
+    <message id="SCENEQUERIES_CREATERAYCASTREQUEST_PARAM2_NAME">
+        <source>SCENEQUERIES_CREATERAYCASTREQUEST_PARAM2_NAME</source>
+        <translation type="unfinished">Distance</translation>
+    </message>
+    <message id="SCENEQUERIES_CREATERAYCASTREQUEST_PARAM2_TOOLTIP">
+        <source>SCENEQUERIES_CREATERAYCASTREQUEST_PARAM2_TOOLTIP</source>
+        <translation type="unfinished">The length of the raycast</translation>
+    </message>
+    <message id="SCENEQUERIES_CREATERAYCASTREQUEST_PARAM3_NAME">
+        <source>SCENEQUERIES_CREATERAYCASTREQUEST_PARAM3_NAME</source>
+        <translation type="unfinished">Collision Group</translation>
+    </message>
+    <message id="SCENEQUERIES_CREATERAYCASTREQUEST_PARAM3_TOOLTIP">
+        <source>SCENEQUERIES_CREATERAYCASTREQUEST_PARAM3_TOOLTIP</source>
+        <translation type="unfinished">Allows filtering of objects intersecting the raycast based on their collision layers</translation>
+    </message>
+</context>
 <context>
     <name>Handler: TriggerNotificationBus</name>
     <message id="HANDLER_TRIGGERNOTIFICATIONBUS_NAME">
@@ -43199,12 +43269,12 @@ An Entity can be selected by using the pick button, or by dragging an Entity fro
         <source>PHYSXCHARACTERCONTROLLERREQUESTBUS_NAME</source>
         <translation type="unfinished">Character Controller (PhysX Specific)</translation>
     </message>
-    <message id="CHARACTERCONTROLLERREQUESTBUS_TOOLTIP">
-        <source>CHARACTERCONTROLLERREQUESTBUS_TOOLTIP</source>
+    <message id="PHYSXCHARACTERCONTROLLERREQUESTBUS_TOOLTIP">
+        <source>PHYSXCHARACTERCONTROLLERREQUESTBUS_TOOLTIP</source>
         <translation type="unfinished">PhysX Character Controller Request Bus</translation>
     </message>
-    <message id="CHARACTERCONTROLLERREQUESTBUS_CATEGORY">
-        <source>CHARACTERCONTROLLERREQUESTBUS_CATEGORY</source>
+    <message id="PHYSXCHARACTERCONTROLLERREQUESTBUS_CATEGORY">
+        <source>PHYSXCHARACTERCONTROLLERREQUESTBUS_CATEGORY</source>
         <translation type="unfinished">PhysX</translation>
     </message>
     <message id="PHYSXCHARACTERCONTROLLERREQUESTBUS_GETHALFFORWARDEXTENT_NAME">
@@ -44616,6 +44686,96 @@ An Entity can be selected by using the pick button, or by dragging an Entity fro
         <translation></translation>
     </message>
 </context>
+<context>
+    <name>EBus: SimulatedBodyComponentRequestBus</name>
+    <message id="SIMULATEDBODYCOMPONENTREQUESTBUS_NAME">
+        <source>SIMULATEDBODYCOMPONENTREQUESTBUS_NAME</source>
+        <translation type="unfinished">Simulated Body</translation>
+    </message>
+    <message id="SIMULATEDBODYCOMPONENTREQUESTBUS_TOOLTIP">
+        <source>SIMULATEDBODYCOMPONENTREQUESTBUS_TOOLTIP</source>
+        <translation type="unfinished">Simulated Body Component Request Bus</translation>
+    </message>
+    <message id="SIMULATEDBODYCOMPONENTREQUESTBUS_CATEGORY">
+        <source>SIMULATEDBODYCOMPONENTREQUESTBUS_CATEGORY</source>
+        <translation type="unfinished">PhysX</translation>
+    </message>
+    <message id="SIMULATEDBODYCOMPONENTREQUESTBUS_DISABLEPHYSICS_NAME">
+        <source>SIMULATEDBODYCOMPONENTREQUESTBUS_DISABLEPHYSICS_NAME</source>
+        <translation type="unfinished">Disable Physics</translation>
+    </message>
+    <message id="SIMULATEDBODYCOMPONENTREQUESTBUS_ENABLEPHYSICS_NAME">
+        <source>SIMULATEDBODYCOMPONENTREQUESTBUS_ENABLEPHYSICS_NAME</source>
+        <translation type="unfinished">Enable Physics</translation>
+    </message>
+    <message id="SIMULATEDBODYCOMPONENTREQUESTBUS_GETAABB_NAME">
+        <source>SIMULATEDBODYCOMPONENTREQUESTBUS_GETAABB_NAME</source>
+        <translation type="unfinished">Get AABB</translation>
+    </message>
+    <message id="SIMULATEDBODYCOMPONENTREQUESTBUS_ISPHYSICSENABLED_NAME">
+        <source>SIMULATEDBODYCOMPONENTREQUESTBUS_ISPHYSICSENABLED_NAME</source>
+        <translation type="unfinished">Is Physics Enabled</translation>
+    </message>
+    <message id="SIMULATEDBODYCOMPONENTREQUESTBUS_RAYCAST_NAME">
+        <source>SIMULATEDBODYCOMPONENTREQUESTBUS_RAYCAST_NAME</source>
+        <translation type="unfinished">Raycast (Single Body)</translation>
+    </message>
+    <message id="SIMULATEDBODYCOMPONENTREQUESTBUS_RAYCAST_TOOLTIP">
+        <source>SIMULATEDBODYCOMPONENTREQUESTBUS_RAYCAST_TOOLTIP</source>
+        <translation type="unfinished">Perform a raycast against a single simulated body (not the whole scene)</translation>
+    </message>
+    <message id="SIMULATEDBODYCOMPONENTREQUESTBUS_RAYCAST_PARAM0_NAME">
+        <source>SIMULATEDBODYCOMPONENTREQUESTBUS_RAYCAST_PARAM0_NAME</source>
+        <translation type="unfinished">Raycast Request</translation>
+    </message>
+</context>
+<context>
+    <name>EBus: WindRequestsBus</name>
+    <message id="WINDREQUESTSBUS_NAME">
+        <source>WINDREQUESTSBUS_NAME</source>
+        <translation type="unfinished">Wind</translation>
+    </message>
+    <message id="WINDREQUESTSBUS_TOOLTIP">
+        <source>WINDREQUESTSBUS_TOOLTIP</source>
+        <translation type="unfinished">Wind Request Bus</translation>
+    </message>
+    <message id="WINDREQUESTSBUS_CATEGORY">
+        <source>WINDREQUESTSBUS_CATEGORY</source>
+        <translation type="unfinished">PhysX</translation>
+    </message>
+    <message id="WINDREQUESTSBUS_GETGLOBALWIND_NAME">
+        <source>WINDREQUESTSBUS_GETGLOBALWIND_NAME</source>
+        <translation type="unfinished">Get Global Wind</translation>
+    </message>
+    <message id="WINDREQUESTSBUS_GETGLOBALWIND_OUTPUT0_NAME">
+        <source>WINDREQUESTSBUS_GETGLOBALWIND_OUTPUT0_NAME</source>
+        <translation type="unfinished">Wind Vector</translation>
+    </message>
+    <message id="WINDREQUESTSBUS_GETWINDATPOSITION_NAME">
+        <source>WINDREQUESTSBUS_GETWINDATPOSITION_NAME</source>
+        <translation type="unfinished">Get Wind At Position</translation>
+    </message>
+    <message id="WINDREQUESTSBUS_GETWINDATPOSITION_PARAM0_NAME">
+        <source>WINDREQUESTSBUS_GETWINDATPOSITION_PARAM0_NAME</source>
+        <translation type="unfinished">Position</translation>
+    </message>
+    <message id="WINDREQUESTSBUS_GETWINDATPOSITION_OUTPUT0_NAME">
+        <source>WINDREQUESTSBUS_GETWINDATPOSITION_OUTPUT0_NAME</source>
+        <translation type="unfinished">Wind Vector</translation>
+    </message>
+    <message id="WINDREQUESTSBUS_GETWINDINSIDEAABB_NAME">
+        <source>WINDREQUESTSBUS_GETWINDINSIDEAABB_NAME</source>
+        <translation type="unfinished">Get Wind Inside AABB</translation>
+    </message>
+    <message id="WINDREQUESTSBUS_GETWINDINSIDEAABB_PARAM0_NAME">
+        <source>WINDREQUESTSBUS_GETWINDINSIDEAABB_PARAM0_NAME</source>
+        <translation type="unfinished">AABB</translation>
+    </message>
+    <message id="WINDREQUESTSBUS_GETWINDINSIDEAABB_OUTPUT0_NAME">
+        <source>WINDREQUESTSBUS_GETWINDINSIDEAABB_OUTPUT0_NAME</source>
+        <translation type="unfinished">Wind Vector</translation>
+    </message>
+</context>
 <context>
     <name>EBus: ChatPlayRequestBus</name>
     <message id="CHATPLAYREQUESTBUS_NAME">
@@ -62374,6 +62534,37 @@ An Entity can be selected by using the pick button, or by dragging an Entity fro
         <translation></translation>
     </message>
 </context>
+<context>
+    <name>EBus: NonUniformScaleRequestBus</name>
+    <message id="NONUNIFORMSCALEREQUESTBUS_NAME">
+        <source>NONUNIFORMSCALEREQUESTBUS_NAME</source>
+        <translation type="unfinished">Non-uniform Scale</translation>
+    </message>
+    <message id="NONUNIFORMSCALEREQUESTBUS_TOOLTIP">
+        <source>NONUNIFORMSCALEREQUESTBUS_TOOLTIP</source>
+        <translation type="unfinished">Non-uniform Scale Request Bus</translation>
+    </message>
+    <message id="NONUNIFORMSCALEREQUESTBUS_CATEGORY">
+        <source>NONUNIFORMSCALEREQUESTBUS_CATEGORY</source>
+        <translation type="unfinished">Entity</translation>
+    </message>
+    <message id="NONUNIFORMSCALEREQUESTBUS_GETSCALE_NAME">
+        <source>NONUNIFORMSCALEREQUESTBUS_GETSCALE_NAME</source>
+        <translation type="unfinished">Get Scale</translation>
+    </message>
+    <message id="NONUNIFORMSCALEREQUESTBUS_GETSCALE_OUTPUT0_NAME">
+        <source>NONUNIFORMSCALEREQUESTBUS_GETSCALE_OUTPUT0_NAME</source>
+        <translation type="unfinished">Non-uniform Scale</translation>
+    </message>
+    <message id="NONUNIFORMSCALEREQUESTBUS_SETSCALE_NAME">
+        <source>NONUNIFORMSCALEREQUESTBUS_SETSCALE_NAME</source>
+        <translation type="unfinished">Set Scale</translation>
+    </message>
+    <message id="NONUNIFORMSCALEREQUESTBUS_SETSCALE_PARAM0_NAME">
+        <source>NONUNIFORMSCALEREQUESTBUS_SETSCALE_PARAM0_NAME</source>
+        <translation type="unfinished">Non-uniform Scale</translation>
+    </message>
+</context>
 <context>
     <name>EBus: TransformBus</name>
     <message id="TRANSFORMBUS_NAME">
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/PositionModifier_AutoSnapToSurfaceWorks.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/PositionModifier_AutoSnapToSurfaceWorks.py
index fe33da550a..a55e88488c 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/PositionModifier_AutoSnapToSurfaceWorks.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/PositionModifier_AutoSnapToSurfaceWorks.py
@@ -82,22 +82,7 @@ class TestPositionModifierAutoSnapToSurface(EditorTestHelper):
 
         # 3) Create a spherical planting surface and a flat surface
         flat_entity = dynveg.create_surface_entity("Flat Surface", spawner_center_point, 32.0, 32.0, 1.0)
-        hill_entity = dynveg.create_mesh_surface_entity_with_slopes("Planting Surface", spawner_center_point, 5.0, 5.0, 5.0)
-
-        # Disable/Re-enable Mesh component due to ATOM-14299
-        general.idle_wait(1.0)
-        editor.EditorComponentAPIBus(bus.Broadcast, 'DisableComponents', [hill_entity.components[0]])
-        is_enabled = editor.EditorComponentAPIBus(bus.Broadcast, 'IsComponentEnabled', hill_entity.components[0])
-        if is_enabled:
-            print("Mesh component is still enabled")
-        else:
-            print("Mesh component was disabled")
-        editor.EditorComponentAPIBus(bus.Broadcast, 'EnableComponents', [hill_entity.components[0]])
-        is_enabled = editor.EditorComponentAPIBus(bus.Broadcast, 'IsComponentEnabled', hill_entity.components[0])
-        if is_enabled:
-            print("Mesh component is now enabled")
-        else:
-            print("Mesh component is still disabled")
+        hill_entity = dynveg.create_mesh_surface_entity_with_slopes("Planting Surface", spawner_center_point, 5.0)
 
         # Disable the Flat Surface Box Shape component, and temporarily ignore initial instance counts due to LYN-2245
         editor.EditorComponentAPIBus(bus.Broadcast, 'DisableComponents', [flat_entity.components[0]])
@@ -117,14 +102,14 @@ class TestPositionModifierAutoSnapToSurface(EditorTestHelper):
         # Pin the Constant Gradient to the X axis of the spawner's Position Modifier component
         spawner_entity.get_set_test(3, 'Configuration|Position X|Gradient|Gradient Entity Id', gradient_entity.id)
 
-        # 6) Set the Position Modifier offset to 5 on the x-axis
-        spawner_entity.get_set_test(3, position_modifier_paths[0], 5)
-        spawner_entity.get_set_test(3, position_modifier_paths[1], 5)
+        # 6) Set the Position Modifier offset to 2.5 on the x-axis
+        spawner_entity.get_set_test(3, position_modifier_paths[0], 2.5)
+        spawner_entity.get_set_test(3, position_modifier_paths[1], 2.5)
 
         # 7) Validate instance count at the top of the sphere mesh and inside the sphere mesh while Auto Snap to Surface
         # is enabled
         top_point = math.Vector3(512.0, 512.0, 37.0)
-        inside_point = math.Vector3(512.0, 512.0, 33.0)
+        inside_point = math.Vector3(512.0, 512.0, 35.0)
         radius = 0.5
         num_expected = 1
         self.log(f"Checking for instances in a {radius * 2}m area at {top_point.ToString()}")
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SlopeAlignmentModifierOverrides_InstanceSurfaceAlignment.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SlopeAlignmentModifierOverrides_InstanceSurfaceAlignment.py
index 0fc917b7a2..abd3dc35d5 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SlopeAlignmentModifierOverrides_InstanceSurfaceAlignment.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SlopeAlignmentModifierOverrides_InstanceSurfaceAlignment.py
@@ -53,17 +53,19 @@ class TestSlopeAlignmentModifierOverrides(EditorTestHelper):
             use_terrain=False,
         )
 
+        general.set_current_view_position(512.0, 480.0, 38.0)
+
         # Create a spawner entity setup with all needed components
         center_point = math.Vector3(512.0, 512.0, 32.0)
         asset_path = os.path.join("Slices", "PinkFlower.dynamicslice")
         spawner_entity = dynveg.create_vegetation_area("Instance Spawner", center_point, 16.0, 16.0, 32.0, asset_path)
 
         # Create a sloped mesh surface for the instances to plant on
+        center_point = math.Vector3(502.0, 512.0, 24.0)
         mesh_asset_path = os.path.join("objects", "_primitives", "_box_1x1.azmodel")
         mesh_asset = asset.AssetCatalogRequestBus(bus.Broadcast, "GetAssetIdByPath", mesh_asset_path, math.Uuid(),
                                                   False)
         rotation = math.Vector3(0.0, radians(45.0), 0.0)
-        scale = math.Vector3(10.0, 10.0, 10.0)
         surface_entity = hydra.Entity("Surface Entity")
         surface_entity.create_entity(
             center_point,
@@ -73,7 +75,7 @@ class TestSlopeAlignmentModifierOverrides(EditorTestHelper):
             print(f"'{surface_entity.name}' created")
         hydra.get_set_test(surface_entity, 0, "Controller|Configuration|Mesh Asset", mesh_asset)
         components.TransformBus(bus.Event, "SetLocalRotation", surface_entity.id, rotation)
-        components.TransformBus(bus.Event, "SetLocalScale", surface_entity.id, scale)
+        components.TransformBus(bus.Event, "SetLocalUniformScale", surface_entity.id, 30.0)
 
         # Add a Vegetation Debugger component to allow refreshing instances
         hydra.add_level_component("Vegetation Debugger")
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SlopeAlignmentModifier_InstanceSurfaceAlignment.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SlopeAlignmentModifier_InstanceSurfaceAlignment.py
index 49db829447..6e9e36957f 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SlopeAlignmentModifier_InstanceSurfaceAlignment.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SlopeAlignmentModifier_InstanceSurfaceAlignment.py
@@ -62,11 +62,11 @@ class TestSlopeAlignmentModifier(EditorTestHelper):
         spawner_entity = dynveg.create_vegetation_area("Instance Spawner", center_point, 16.0, 16.0, 32.0, asset_path)
 
         # Create a sloped mesh surface for the instances to plant on
+        center_point = math.Vector3(502.0, 512.0, 24.0)
         mesh_asset_path = os.path.join("objects", "_primitives", "_box_1x1.azmodel")
         mesh_asset = asset.AssetCatalogRequestBus(bus.Broadcast, "GetAssetIdByPath", mesh_asset_path, math.Uuid(),
                                                   False)
         rotation = math.Vector3(0.0, radians(45.0), 0.0)
-        scale = math.Vector3(10.0, 10.0, 10.0)
         surface_entity = hydra.Entity("Surface Entity")
         surface_entity.create_entity(
             center_point,
@@ -76,7 +76,7 @@ class TestSlopeAlignmentModifier(EditorTestHelper):
             print(f"'{surface_entity.name}' created")
         hydra.get_set_test(surface_entity, 0, "Controller|Configuration|Mesh Asset", mesh_asset)
         components.TransformBus(bus.Event, "SetLocalRotation", surface_entity.id, rotation)
-        components.TransformBus(bus.Event, "SetLocalScale", surface_entity.id, scale)
+        components.TransformBus(bus.Event, "SetLocalUniformScale", surface_entity.id, 30.0)
 
         # Add a Vegetation Debugger component to allow refreshing instances
         hydra.add_level_component("Vegetation Debugger")
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SlopeFilter_ComponentAndOverrides_InstancesPlantOnValidSlope.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SlopeFilter_ComponentAndOverrides_InstancesPlantOnValidSlope.py
index 895b979f95..d66716cee3 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SlopeFilter_ComponentAndOverrides_InstancesPlantOnValidSlope.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SlopeFilter_ComponentAndOverrides_InstancesPlantOnValidSlope.py
@@ -81,7 +81,7 @@ class TestSlopeFilterComponentAndOverrides(EditorTestHelper):
         # 3) Add surfaces to plant on. This will include a flat surface and a sphere mesh to provide a sloped surface
         dynveg.create_surface_entity("Planting Surface", center_point, 32.0, 32.0, 1.0)
         sloped_surface_center = math.Vector3(512.0, 512.0, 38.0)
-        dynveg.create_mesh_surface_entity_with_slopes("Sloped Planting Surface", sloped_surface_center, 5.0, 5.0, 5.0)
+        dynveg.create_mesh_surface_entity_with_slopes("Sloped Planting Surface", sloped_surface_center, 10.0)
 
         # Set instances to spawn on a center snap point to avoid unexpected instances around the edges of the box shape
         veg_system_settings_component = hydra.add_level_component("Vegetation System Settings")
@@ -101,7 +101,7 @@ class TestSlopeFilterComponentAndOverrides(EditorTestHelper):
         spawner_entity.get_set_test(3, "Configuration|Slope Max", 45)
 
         # 6) Validate instance counts post-filter: instances should only plant on slopes between 20-45 degrees
-        num_expected_slopes_post_filter = 44
+        num_expected_slopes_post_filter = 48
         slope_min_max_success = self.wait_for_condition(lambda: dynveg.validate_instance_count_in_entity_shape(
             spawner_entity.id, num_expected_slopes_post_filter), 5.0)
         self.test_success = slope_min_max_success and self.test_success
@@ -115,7 +115,7 @@ class TestSlopeFilterComponentAndOverrides(EditorTestHelper):
         spawner_entity.get_set_test(2, "Configuration|Embedded Assets|[0]|Slope Filter|Max", 20)
 
         # 9) Validate instance counts post-filter: instances should only plant on slopes between 5-20 degrees
-        num_expected_slopes_post_filter_overrides = 16
+        num_expected_slopes_post_filter_overrides = 12
         overrides_min_max_success = self.wait_for_condition(lambda: dynveg.validate_instance_count_in_entity_shape(
             spawner_entity.id, num_expected_slopes_post_filter_overrides), 5.0)
         self.test_success = overrides_min_max_success and self.test_success
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_AltitudeFilter.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_AltitudeFilter.py
index b79f4a7dee..ec8c225d3b 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_AltitudeFilter.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_AltitudeFilter.py
@@ -84,7 +84,7 @@ class TestAltitudeFilter(object):
     @pytest.mark.test_case_id("C4847478")
     @pytest.mark.SUITE_periodic
     @pytest.mark.dynveg_filter
-    @pytest.mark.xfail  # LYN-3275
+    @pytest.mark.xfail(reason="https://github.com/o3de/o3de/issues/2303")
     def test_AltitudeFilter_FilterStageToggle(self, request, editor, level, workspace, launcher_platform):
         cfg_args = [level]
 
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_LayerSpawner.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_LayerSpawner.py
index e9087ad25b..65d994f841 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_LayerSpawner.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_LayerSpawner.py
@@ -100,7 +100,7 @@ class TestLayerSpawner(object):
     @pytest.mark.test_case_id("C4765973")
     @pytest.mark.SUITE_periodic
     @pytest.mark.dynveg_misc
-    @pytest.mark.xfail      # LYN-3275
+    @pytest.mark.xfail(reason="https://github.com/o3de/o3de/issues/2303")
     def test_LayerSpawner_FilterStageToggle(self, request, editor, level, workspace, launcher_platform):
 
         expected_lines = [
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_PositionModifier.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_PositionModifier.py
index 0e211ba311..ebbd58557e 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_PositionModifier.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_PositionModifier.py
@@ -56,9 +56,9 @@ class TestPositionModifier(object):
         )
 
     @pytest.mark.test_case_id("C4874100")
-    @pytest.mark.SUITE_sandbox
+    @pytest.mark.SUITE_periodic
     @pytest.mark.dynveg_modifier
-    @pytest.mark.xfail  # LYN-3275
+    @pytest.mark.xfail(reason="https://github.com/o3de/o3de/issues/2303")
     def test_PositionModifier_AutoSnapToSurfaceWorks(self, request, editor, level, launcher_platform):
 
         expected_lines = [
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_SlopeAlignmentModifier.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_SlopeAlignmentModifier.py
index b5918b7097..3a01521d8e 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_SlopeAlignmentModifier.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_SlopeAlignmentModifier.py
@@ -38,7 +38,7 @@ class TestSlopeAlignmentModifier(object):
     @pytest.mark.test_case_id("C4896941")
     @pytest.mark.SUITE_periodic
     @pytest.mark.dynveg_modifier
-    @pytest.mark.skip   # ATOM-14299
+    @pytest.mark.xfail(reason="https://github.com/o3de/o3de/issues/2303")
     def test_SlopeAlignmentModifier_InstanceSurfaceAlignment(self, request, editor, level, launcher_platform):
 
         expected_lines = [
@@ -61,7 +61,7 @@ class TestSlopeAlignmentModifier(object):
     @pytest.mark.test_case_id("C4814459")
     @pytest.mark.SUITE_periodic
     @pytest.mark.dynveg_modifier
-    @pytest.mark.skip  # ATOM-14299
+    @pytest.mark.xfail(reason="https://github.com/o3de/o3de/issues/2303")
     def test_SlopeAlignmentModifierOverrides_InstanceSurfaceAlignment(self, request, editor, level, launcher_platform):
 
         expected_lines = [
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_SlopeFilter.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_SlopeFilter.py
index 414a089575..3065b2df61 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_SlopeFilter.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_SlopeFilter.py
@@ -68,7 +68,7 @@ class TestSlopeFilter(object):
     @pytest.mark.test_case_id("C4814464", "C4874096")
     @pytest.mark.SUITE_periodic
     @pytest.mark.dynveg_filter
-    @pytest.mark.skip  # LYN-2211
+    @pytest.mark.xfail(reason="https://github.com/o3de/o3de/issues/2303")
     def test_SlopeFilter_ComponentAndOverrides_InstancesPlantOnValidSlopes(self, request, editor, level,
                                                                            launcher_platform):
 
@@ -79,10 +79,10 @@ class TestSlopeFilter(object):
             "instance count validation: True (found=1720, expected=1720)",
             "Instance Spawner Configuration|Slope Min: SUCCESS",
             "Instance Spawner Configuration|Slope Max: SUCCESS",
-            "instance count validation: True (found=44, expected=44)",
+            "instance count validation: True (found=48, expected=48)",
             "Instance Spawner Configuration|Embedded Assets|[0]|Slope Filter|Min: SUCCESS",
             "Instance Spawner Configuration|Embedded Assets|[0]|Slope Filter|Max: SUCCESS",
-            "instance count validation: True (found=16, expected=16)",
+            "instance count validation: True (found=12, expected=12)",
             "SlopeFilter_InstancesPlantOnValidSlope:  result=SUCCESS"
         ]
 
diff --git a/AutomatedTesting/Gem/PythonTests/physics/TestSuite_Main.py b/AutomatedTesting/Gem/PythonTests/physics/TestSuite_Main.py
index 8e659b2ef6..bda4dae82b 100644
--- a/AutomatedTesting/Gem/PythonTests/physics/TestSuite_Main.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/TestSuite_Main.py
@@ -43,11 +43,6 @@ class TestAutomation(TestAutomationBase):
         from . import C4044459_Material_DynamicFriction as test_module
         self._run_test(request, workspace, editor, test_module)
 
-    @revert_physics_config
-    def test_C15425929_Undo_Redo(self, request, workspace, editor, launcher_platform):
-        from . import C15425929_Undo_Redo as test_module
-        self._run_test(request, workspace, editor, test_module)
-        
     @revert_physics_config
     def test_C4976243_Collision_SameCollisionGroupDiffCollisionLayers(self, request, workspace, editor,
                                                                       launcher_platform):
diff --git a/AutomatedTesting/Gem/PythonTests/physics/TestSuite_Sandbox.py b/AutomatedTesting/Gem/PythonTests/physics/TestSuite_Sandbox.py
index fb798371a4..255016ddd6 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/TestSuite_Sandbox.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/TestSuite_Sandbox.py
@@ -43,3 +43,11 @@ class TestAutomation(TestAutomationBase):
         # Fixme:    unexpected_lines.append(f"GroupName: {group}")
         # Fixme: expected_lines=["GroupName: "]
         self._run_test(request, workspace, editor, test_module)
+
+    ## Seems to be flaky, need to investigate
+    @pytest.mark.xfail(
+        reason="Editor crashes and errors about files accessed by multiple processes appear in the log.")
+    @revert_physics_config
+    def test_C15425929_Undo_Redo(self, request, workspace, editor, launcher_platform):
+        from . import C15425929_Undo_Redo as test_module
+        self._run_test(request, workspace, editor, test_module)
diff --git a/Code/Editor/EditorViewportWidget.cpp b/Code/Editor/EditorViewportWidget.cpp
index b052e7e222..1f0c87ff6f 100644
--- a/Code/Editor/EditorViewportWidget.cpp
+++ b/Code/Editor/EditorViewportWidget.cpp
@@ -403,6 +403,19 @@ bool EditorViewportWidget::event(QEvent* event)
         m_keyDown.clear();
         break;
 
+    case QEvent::ShortcutOverride:
+    {
+        // Ensure we exit game mode on escape, even if something else would eat our escape key event.
+        if (static_cast<QKeyEvent*>(event)->key() == Qt::Key_Escape && GetIEditor()->IsInGameMode())
+        {
+            GetIEditor()->SetInGameMode(false);
+            event->accept();
+            return true;
+        }
+        break;
+    }
+
+
     case QEvent::Shortcut:
         // a shortcut should immediately clear us, otherwise the release event never gets sent
         m_keyDown.clear();
@@ -456,7 +469,6 @@ void EditorViewportWidget::Update()
         auto m = AZMatrix3x4ToLYMatrix3x4(matrix);
 
         SetViewTM(m);
-        SetFOV(cameraState.m_fovOrZoom);
         m_Camera.SetZRange(cameraState.m_nearClip, cameraState.m_farClip);
     }
 
@@ -2601,6 +2613,8 @@ void EditorViewportWidget::DestroyRenderContext()
 //////////////////////////////////////////////////////////////////////////
 void EditorViewportWidget::SetDefaultCamera()
 {
+    // Ensure the FOV matches our internally stored setting
+    SetFOV(GetFOV());
     if (IsDefaultCamera())
     {
         return;
diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.h b/Code/Editor/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.h
index ffef14e84d..a2ec3b579b 100644
--- a/Code/Editor/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.h
+++ b/Code/Editor/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.h
@@ -296,8 +296,8 @@ private:
     AZStd::unordered_set<AZ::EntityId> m_unsavedEntities;
 
     const AZStd::string m_defaultComponentIconLocation = "Icons/Components/Component_Placeholder.svg";
-    const AZStd::string m_defaultComponentViewportIconLocation = "Icons/Components/Viewport/Component_Placeholder.png";
-    const AZStd::string m_defaultEntityIconLocation = "Icons/Components/Viewport/Transform.png";
+    const AZStd::string m_defaultComponentViewportIconLocation = "Icons/Components/Viewport/Component_Placeholder.svg";
+    const AZStd::string m_defaultEntityIconLocation = "Icons/Components/Viewport/Transform.svg";
 
     bool m_debugDisplayBusImplementationActive = false;
 
diff --git a/Code/Editor/ShortcutDispatcher.cpp b/Code/Editor/ShortcutDispatcher.cpp
index df7b25eb55..50e309d955 100644
--- a/Code/Editor/ShortcutDispatcher.cpp
+++ b/Code/Editor/ShortcutDispatcher.cpp
@@ -346,7 +346,6 @@ bool ShortcutDispatcher::eventFilter(QObject* obj, QEvent* ev)
 
     case QEvent::Shortcut:
         return shortcutFilter(obj, static_cast<QShortcutEvent*>(ev));
-        break;
 
     case QEvent::MouseButtonPress:
         if (!s_lastFocus || !IsAContainerForB(qobject_cast<QWidget*>(obj), s_lastFocus))
diff --git a/Code/Framework/AzFramework/AzFramework/Physics/Common/PhysicsSceneQueries.cpp b/Code/Framework/AzFramework/AzFramework/Physics/Common/PhysicsSceneQueries.cpp
index 2070d13972..ff79f097de 100644
--- a/Code/Framework/AzFramework/AzFramework/Physics/Common/PhysicsSceneQueries.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Physics/Common/PhysicsSceneQueries.cpp
@@ -67,6 +67,17 @@ namespace AzPhysics
         }
     }
 
+    // class for exposing free functions to script
+    class SceneQueries
+    {
+    public:
+        AZ_TYPE_INFO(SceneQueries, "{4EFA3DA5-C0E3-4753-8C55-202228CA527E}");
+        AZ_CLASS_ALLOCATOR(SceneQueries, AZ::SystemAllocator, 0);
+
+        SceneQueries() = default;
+        ~SceneQueries() = default;
+    };
+
     /*static*/ void SceneQueryRequest::Reflect(AZ::ReflectContext* context)
     {
         if (auto* serializeContext = azdynamic_cast<AZ::SerializeContext*>(context))
@@ -96,6 +107,7 @@ namespace AzPhysics
                 ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Common)
                 ->Attribute(AZ::Script::Attributes::Module, "physics")
                 ->Attribute(AZ::Script::Attributes::Category, "PhysX")
+                ->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::ExcludeFlags::All)
                 ->Property("Collision", BehaviorValueProperty(&SceneQueryRequest::m_collisionGroup))
                 // Until enum class support for behavior context is done, expose this as an int
                 ->Property("QueryType", [](const SceneQueryRequest& self) { return static_cast<int>(self.m_queryType); },
@@ -134,11 +146,28 @@ namespace AzPhysics
                 ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Common)
                 ->Attribute(AZ::Script::Attributes::Module, "physics")
                 ->Attribute(AZ::Script::Attributes::Category, "PhysX")
+                ->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::ExcludeFlags::All)
                 ->Property("Distance", BehaviorValueProperty(&RayCastRequest::m_distance))
                 ->Property("Start", BehaviorValueProperty(&RayCastRequest::m_start))
                 ->Property("Direction", BehaviorValueProperty(&RayCastRequest::m_direction))
                 ->Property("ReportMultipleHits", BehaviorValueProperty(&RayCastRequest::m_reportMultipleHits))
                 ;
+
+            behaviorContext->Class<SceneQueries>("SceneQueries")
+                ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Common)
+                ->Attribute(AZ::Script::Attributes::Module, "physics")
+                ->Attribute(AZ::Script::Attributes::Category, "PhysX")
+                ->Method(
+                    "CreateRayCastRequest",
+                    [](const AZ::Vector3& start, const AZ::Vector3& direction, float distance, const AZStd::string& collisionGroup)
+                    {
+                        RayCastRequest request;
+                        request.m_start = start;
+                        request.m_direction = direction;
+                        request.m_distance = distance;
+                        request.m_collisionGroup = CollisionGroup(collisionGroup);
+                        return request;
+                    });
         }
     }
 
@@ -162,6 +191,7 @@ namespace AzPhysics
                 ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Common)
                 ->Attribute(AZ::Script::Attributes::Module, "physics")
                 ->Attribute(AZ::Script::Attributes::Category, "PhysX")
+                ->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::ExcludeFlags::All)
                 ->Property("Distance", BehaviorValueProperty(&ShapeCastRequest::m_distance))
                 ->Property("Start", BehaviorValueProperty(&ShapeCastRequest::m_start))
                 ->Property("Direction", BehaviorValueProperty(&ShapeCastRequest::m_direction))
@@ -175,7 +205,6 @@ namespace AzPhysics
                     return ShapeCastRequestHelpers::CreateSphereCastRequest(
                         radius, startPose, direction, distance, queryType, collisionGroup, nullptr);
                 });
-
             behaviorContext->Method(
                 "CreateBoxCastRequest",
                 [](const AZ::Vector3& boxDimensions, const AZ::Transform& startPose, const AZ::Vector3& direction, float distance,
@@ -184,7 +213,6 @@ namespace AzPhysics
                     return ShapeCastRequestHelpers::CreateBoxCastRequest(
                         boxDimensions, startPose, direction, distance, queryType, collisionGroup, nullptr);
                 });
-
             behaviorContext->Method(
                 "CreateCapsuleCastRequest",
                 [](float capsuleRadius, float capsuleHeight, const AZ::Transform& startPose, const AZ::Vector3& direction, float distance,
@@ -267,6 +295,7 @@ namespace AzPhysics
                 ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Common)
                 ->Attribute(AZ::Script::Attributes::Module, "physics")
                 ->Attribute(AZ::Script::Attributes::Category, "PhysX")
+                ->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::ExcludeFlags::All)
                 ->Property("Pose", BehaviorValueProperty(&OverlapRequest::m_pose))
                 ;
 
@@ -349,6 +378,7 @@ namespace AzPhysics
                 ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Common)
                 ->Attribute(AZ::Script::Attributes::Module, "physics")
                 ->Attribute(AZ::Script::Attributes::Category, "PhysX")
+                ->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::ExcludeFlags::All)
                 ->Property("Distance", BehaviorValueProperty(&SceneQueryHit::m_distance))
                 ->Property("Position", BehaviorValueProperty(&SceneQueryHit::m_position))
                 ->Property("Normal", BehaviorValueProperty(&SceneQueryHit::m_normal))
diff --git a/Code/Framework/AzFramework/AzFramework/Physics/PhysicsSystem.cpp b/Code/Framework/AzFramework/AzFramework/Physics/PhysicsSystem.cpp
index c241f1c5ca..2fda459e20 100644
--- a/Code/Framework/AzFramework/AzFramework/Physics/PhysicsSystem.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Physics/PhysicsSystem.cpp
@@ -51,7 +51,10 @@ namespace AzPhysics
                 ->Method("GetOnPostsimulateEvent", getOnPostsimulateEvent)
                     ->Attribute(AZ::Script::Attributes::AzEventDescription, postsimulateEventDescription)
                 ->Method("GetSceneHandle", &SystemInterface::GetSceneHandle)
-                ->Method("GetScene", &SystemInterface::GetScene);
+                ->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::ExcludeFlags::All)
+                ->Method("GetScene", &SystemInterface::GetScene)
+                ->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::ExcludeFlags::All)
+                ;
 
             behaviorContext->Method(
                     "GetPhysicsSystem",
diff --git a/Code/Framework/AzNetworking/AzNetworking/Serialization/AzContainerSerializers.h b/Code/Framework/AzNetworking/AzNetworking/Serialization/AzContainerSerializers.h
index b7f9b513ef..59e0cc8235 100644
--- a/Code/Framework/AzNetworking/AzNetworking/Serialization/AzContainerSerializers.h
+++ b/Code/Framework/AzNetworking/AzNetworking/Serialization/AzContainerSerializers.h
@@ -303,4 +303,22 @@ namespace AzNetworking
             return serializer.IsValid();
         }
     };
+
+    template <>
+    struct SerializeObjectHelper<AZ::Transform>
+    {
+        static bool SerializeObject(ISerializer& serializer, AZ::Transform& value)
+        {
+            AZ::Vector3 translation = value.GetTranslation();
+            AZ::Quaternion rotation = value.GetRotation();
+            float uniformScale = value.GetUniformScale();
+            serializer.Serialize(translation, "Translation");
+            serializer.Serialize(rotation, "Rotation");
+            serializer.Serialize(uniformScale, "Scale");
+            value.SetTranslation(translation);
+            value.SetRotation(rotation);
+            value.SetUniformScale(uniformScale);
+            return serializer.IsValid();
+        }
+    };
 }
diff --git a/Code/Framework/AzNetworking/AzNetworking/Serialization/HashSerializer.cpp b/Code/Framework/AzNetworking/AzNetworking/Serialization/HashSerializer.cpp
index cba01710df..23995d44ea 100644
--- a/Code/Framework/AzNetworking/AzNetworking/Serialization/HashSerializer.cpp
+++ b/Code/Framework/AzNetworking/AzNetworking/Serialization/HashSerializer.cpp
@@ -11,9 +11,9 @@
 
 namespace AzNetworking
 {
-    // This gives us a hash sensitivity of around 1/128th of a unit, and will detect errors within a range of -16,777,216 to +16,777,216
-    static const int32_t FloatHashMinValue = (INT_MIN >> 7);
-    static const int32_t FloatHashMaxValue = (INT_MAX >> 7);
+    // This gives us a hash sensitivity of around 1/512th of a unit, and will detect errors within a range of -4,194,304 to +4,194,304
+    static const int32_t FloatHashMinValue = (INT_MIN >> 9);
+    static const int32_t FloatHashMaxValue = (INT_MAX >> 9);
 
     AZ::HashValue32 HashSerializer::GetHash() const
     {
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Entries/RootAssetBrowserEntry.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Entries/RootAssetBrowserEntry.cpp
index 74edc3e1a6..2cfb7259b6 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Entries/RootAssetBrowserEntry.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Entries/RootAssetBrowserEntry.cpp
@@ -403,7 +403,7 @@ namespace AzToolsFramework
         void RootAssetBrowserEntry::UpdateChildPaths(AssetBrowserEntry* child) const
         {
             child->m_relativePath = child->m_name;
-            child->m_fullPath = child->m_name;
+            child->m_fullPath = m_fullPath / child->m_name;
             AssetBrowserEntry::UpdateChildPaths(child);
         }
 
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/PrefabEditorEntityOwnershipService.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/PrefabEditorEntityOwnershipService.cpp
index dfcbfd8c45..2d97689610 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/PrefabEditorEntityOwnershipService.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/PrefabEditorEntityOwnershipService.cpp
@@ -88,13 +88,15 @@ namespace AzToolsFramework
     {
         if (m_rootInstance)
         {
+            AzToolsFramework::ToolsApplicationRequestBus::Broadcast(
+                &AzToolsFramework::ToolsApplicationRequestBus::Events::ClearDirtyEntities);
             Prefab::TemplateId templateId = m_rootInstance->GetTemplateId();
+            m_rootInstance->Reset();
             if (templateId != Prefab::InvalidTemplateId)
             {
                 m_rootInstance->SetTemplateId(Prefab::InvalidTemplateId);
                 m_prefabSystemComponent->RemoveTemplate(templateId);
             }
-            m_rootInstance->Reset();
             m_rootInstance->SetContainerEntityName("Level");
         }
 
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/Instance.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/Instance.cpp
index 750efa1e36..043f864245 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/Instance.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/Instance.cpp
@@ -82,16 +82,7 @@ namespace AzToolsFramework
                 return;
             }
 
-            // If this instance's templateId is valid, we should be able to unregister this instance from 
-            // Template to Instance mapping successfully.
-            if (m_templateId != InvalidTemplateId &&
-                !m_templateInstanceMapper->UnregisterInstance(*this))
-            {
-                AZ_Assert(false,
-                    "Prefab - Attempted to Unregister Instance from Template with Id '%u'.  "
-                    "Instance may never have been registered or was unregistered early.",
-                    m_templateId);
-            }
+            m_templateInstanceMapper->UnregisterInstance(*this);
 
             m_templateId = templateId;
 
@@ -221,15 +212,7 @@ namespace AzToolsFramework
 
         void Instance::Reset()
         {
-            // Clean up Instance associations.
-            if (m_templateId != InvalidTemplateId && !m_templateInstanceMapper->UnregisterInstance(*this))
-            {
-                AZ_Assert(
-                    false,
-                    "Prefab - Attempted to unregister Instance from Template on file path '%s' with Id '%u'.  "
-                    "Instance may never have been registered or was unregistered early.",
-                    m_templateSourcePath.c_str(), m_templateId);
-            }
+            m_templateInstanceMapper->UnregisterInstance(*this);
 
             ClearEntities();
 
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorNonUniformScaleComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorNonUniformScaleComponent.cpp
index f02959a9f1..cc3870e27f 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorNonUniformScaleComponent.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorNonUniformScaleComponent.cpp
@@ -40,7 +40,7 @@ namespace AzToolsFramework
                         ->Attribute(AZ::Edit::Attributes::FixedComponentListIndex, 1)
                         ->Attribute(AZ::Edit::Attributes::RemoveableByUser, true)
                         ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/NonUniformScale.svg")
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/NonUniformScale.svg")
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/NonUniformScale.svg")
                         ->DataElement(
                             AZ::Edit::UIHandlers::Default, &EditorNonUniformScaleComponent::m_scale, "Non-uniform Scale",
                             "Non-uniform scale for this entity only (does not propagate through hierarchy)")
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/ScriptEditorComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/ScriptEditorComponent.cpp
index d5d50bc0d1..1ae1a3605a 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/ScriptEditorComponent.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/ScriptEditorComponent.cpp
@@ -1021,6 +1021,7 @@ namespace AzToolsFramework
                         ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                         ->Attribute(AZ::Edit::Attributes::Category, "Scripting")
                         ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/LuaScript.svg")
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/LuaScript.svg")
                         ->Attribute(AZ::Edit::Attributes::PrimaryAssetType, AZ::AzTypeInfo<AZ::ScriptAsset>::Uuid())
                         ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Script.png")
                         ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://o3de.org/docs/user-guide/components/reference/lua-script/")
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/TransformComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/TransformComponent.cpp
index f57e2828dc..7ab7dfdfe4 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/TransformComponent.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/TransformComponent.cpp
@@ -1182,7 +1182,7 @@ namespace AzToolsFramework
                         ClassElement(AZ::Edit::ClassElements::EditorData, "")->
                             Attribute(AZ::Edit::Attributes::FixedComponentListIndex, 0)->
                             Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Transform.svg")->
-                            Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Transform.png")->
+                            Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Transform.svg")->
                             Attribute(AZ::Edit::Attributes::AutoExpand, true)->
                         DataElement(AZ::Edit::UIHandlers::Default, &TransformComponent::m_parentEntityId, "Parent entity", "")->
                             Attribute(AZ::Edit::Attributes::ChangeValidate, &TransformComponent::ValidatePotentialParent)->
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/EntityPropertyEditor.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/EntityPropertyEditor.cpp
index 6e54a72b0f..319307009c 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/EntityPropertyEditor.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/EntityPropertyEditor.cpp
@@ -4965,21 +4965,29 @@ namespace AzToolsFramework
 
     void EntityPropertyEditor::SetEditorUiEnabled(bool enable)
     {
-        if (enable)
+        if (!m_selectedEntityIds.empty())
         {
-            EnableComponentActions(this, m_entityComponentActions);
+            if (enable)
+            {
+                EnableComponentActions(this, m_entityComponentActions);
+            }
+            else
+            {
+                DisableComponentActions(this, m_entityComponentActions);
+            }
+            SetPropertyEditorState(m_gui, enable);
+
+            for (auto componentEditor : m_componentEditors)
+            {
+                AzQtComponents::SetWidgetInteractEnabled(componentEditor, enable);
+            }
         }
         else
         {
-            DisableComponentActions(this, m_entityComponentActions);
+            AzQtComponents::SetWidgetInteractEnabled(m_gui->m_entityDetailsLabel, enable);
         }
         m_disabled = !enable;
-        SetPropertyEditorState(m_gui, enable);
 
-        for (auto componentEditor : m_componentEditors)
-        {
-            AzQtComponents::SetWidgetInteractEnabled(componentEditor, enable);
-        }
         // record the selected state after entering/leaving component mode
         SaveComponentEditorState();
     }
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/Button.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/Button.cpp
index 0d03271b93..3798bc1d22 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/Button.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/Button.cpp
@@ -6,7 +6,6 @@
  *
  */
 
-
 #include <AzToolsFramework/ViewportUi/Button.h>
 
 namespace AzToolsFramework::ViewportUi::Internal
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/Button.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/Button.h
index 2bd35ba75d..b18f4723d8 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/Button.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/Button.h
@@ -28,7 +28,7 @@ namespace AzToolsFramework::ViewportUi::Internal
 
         AZStd::string m_icon; //!< The icon for this button, string path to an image.
         AZStd::string m_name; //!< The name displayed as a label next to the button's icon.
-        State m_state = State::Deselected; 
-        ButtonId m_buttonId; 
+        State m_state = State::Deselected;
+        ButtonId m_buttonId;
     };
 } // namespace AzToolsFramework::ViewportUi::Internal
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ButtonGroup.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ButtonGroup.cpp
index eb846ddde8..e933940d95 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ButtonGroup.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ButtonGroup.cpp
@@ -45,11 +45,11 @@ namespace AzToolsFramework::ViewportUi::Internal
 
         if (name.empty())
         {
-            m_buttons.insert({buttonId, AZStd::make_unique<Button>(icon, buttonId)});
+            m_buttons.insert({ buttonId, AZStd::make_unique<Button>(icon, buttonId) });
         }
         else
         {
-            m_buttons.insert({buttonId, AZStd::make_unique<Button>(icon, name, buttonId)});
+            m_buttons.insert({ buttonId, AZStd::make_unique<Button>(icon, name, buttonId) });
         }
         return buttonId;
     }
@@ -73,7 +73,8 @@ namespace AzToolsFramework::ViewportUi::Internal
         return buttons;
     }
 
-    void ButtonGroup::ConnectEventHandler(AZ::Event<ButtonId>::Handler& handler) {
+    void ButtonGroup::ConnectEventHandler(AZ::Event<ButtonId>::Handler& handler)
+    {
         handler.Connect(m_buttonTriggeredEvent);
     }
 
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ButtonGroup.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ButtonGroup.h
index 080ccb447e..0500a80c36 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ButtonGroup.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ButtonGroup.h
@@ -1,5 +1,3 @@
-#pragma once
-
 /*
  * Copyright (c) Contributors to the Open 3D Engine Project.
  * For complete copyright and license terms please see the LICENSE at the root of this distribution.
@@ -8,6 +6,8 @@
  *
  */
 
+#pragma once
+
 #include <AzToolsFramework/ViewportUi/ViewportUiRequestBus.h>
 
 namespace AzToolsFramework::ViewportUi::Internal
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/TextField.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/TextField.cpp
index 44f856fe76..beb0db3147 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/TextField.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/TextField.cpp
@@ -10,9 +10,7 @@
 
 namespace AzToolsFramework::ViewportUi::Internal
 {
-    TextField::TextField(
-        const AZStd::string& labelText, const AZStd::string& fieldText,
-        TextFieldValidationType validationType)
+    TextField::TextField(const AZStd::string& labelText, const AZStd::string& fieldText, TextFieldValidationType validationType)
         : m_labelText(labelText)
         , m_fieldText(fieldText)
         , m_validationType(validationType)
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/TextField.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/TextField.h
index 9cecf14fb8..682e4881b4 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/TextField.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/TextField.h
@@ -19,16 +19,17 @@ namespace AzToolsFramework::ViewportUi::Internal
     {
     public:
         TextField(
-            const AZStd::string& labelText = "", const AZStd::string& fieldText = "",
+            const AZStd::string& labelText = "",
+            const AZStd::string& fieldText = "",
             TextFieldValidationType validationType = TextFieldValidationType::String);
         ~TextField() = default;
 
         void ConnectEventHandler(AZ::Event<AZStd::string>::Handler& handler);
 
         //! Default text for the text field. Will be cast to same type as m_validationType.
-        AZStd::string m_fieldText; 
+        AZStd::string m_fieldText;
         AZStd::string m_labelText;
-        TextFieldValidationType m_validationType; //<! The type of validator for this text edit.
+        TextFieldValidationType m_validationType; //!< The type of validator for this text edit.
         TextFieldId m_textFieldId;
         ViewportUiElementId m_viewportId;
         AZ::Event<AZStd::string> m_textEditedEvent;
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiCluster.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiCluster.cpp
index 5e4a8eb60c..bc299f9985 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiCluster.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiCluster.cpp
@@ -6,7 +6,6 @@
  *
  */
 
-
 #include <AzToolsFramework/ViewportUi/ButtonGroup.h>
 #include <AzToolsFramework/ViewportUi/ViewportUiCluster.h>
 
@@ -14,13 +13,12 @@ namespace AzToolsFramework::ViewportUi::Internal
 {
     ViewportUiCluster::ViewportUiCluster(AZStd::shared_ptr<ButtonGroup> buttonGroup)
         : QToolBar(nullptr)
-        , m_buttonGroup(buttonGroup)
+        , m_buttonGroup(AZStd::move(buttonGroup))
     {
         setOrientation(Qt::Orientation::Vertical);
         setStyleSheet("background: black;");
 
-        const AZStd::vector<Button*> buttons = buttonGroup->GetButtons();
-        for (auto button : buttons)
+        for (auto button : m_buttonGroup->GetButtons())
         {
             RegisterButton(button);
         }
@@ -34,10 +32,12 @@ namespace AzToolsFramework::ViewportUi::Internal
 
         AddClusterAction(
             action,
-            [this, button]() {
+            [this, button]()
+            {
                 m_buttonGroup->PressButton(button->m_buttonId);
             },
-            [button](QAction* action) {
+            [button](QAction* action)
+            {
                 action->setChecked(button->m_state == Button::State::Selected);
             });
 
@@ -46,8 +46,7 @@ namespace AzToolsFramework::ViewportUi::Internal
 
     void ViewportUiCluster::RemoveButton(ButtonId buttonId)
     {
-        if (auto actionEntry = m_buttonActionMap.find(buttonId);
-            actionEntry != m_buttonActionMap.end())
+        if (auto actionEntry = m_buttonActionMap.find(buttonId); actionEntry != m_buttonActionMap.end())
         {
             auto action = actionEntry->second;
             RemoveClusterAction(action);
@@ -56,8 +55,7 @@ namespace AzToolsFramework::ViewportUi::Internal
     }
 
     void ViewportUiCluster::AddClusterAction(
-        QAction* action, const AZStd::function<void()>& callback,
-        const AZStd::function<void(QAction*)>& updateCallback)
+        QAction* action, const AZStd::function<void()>& callback, const AZStd::function<void(QAction*)>& updateCallback)
     {
         if (!action)
         {
@@ -80,10 +78,12 @@ namespace AzToolsFramework::ViewportUi::Internal
         }
 
         // register the action
-        m_widgetCallbacks.AddWidget(action, [updateCallback](QPointer<QObject> object)
-        {
-            updateCallback(static_cast<QAction*>(object.data()));
-        });
+        m_widgetCallbacks.AddWidget(
+            action,
+            [updateCallback](QPointer<QObject> object)
+            {
+                updateCallback(static_cast<QAction*>(object.data()));
+            });
     }
 
     void ViewportUiCluster::RemoveClusterAction(QAction* action)
@@ -111,10 +111,13 @@ namespace AzToolsFramework::ViewportUi::Internal
         if (m_lockedButtonId.has_value() && isLocked)
         {
             // find the button to extract the old icon (without overlay)
-            auto findLocked = [this](const Button* button) { return (button->m_buttonId == m_lockedButtonId); };
+            auto findLocked = [this](const Button* button)
+            {
+                return (button->m_buttonId == m_lockedButtonId);
+            };
             if (auto lockedButtonIt = AZStd::find_if(buttons.begin(), buttons.end(), findLocked); lockedButtonIt != buttons.end())
             {
-                // get the action corresponding to the lockedButtonId 
+                // get the action corresponding to the lockedButtonId
                 if (auto actionEntry = m_buttonActionMap.find(m_lockedButtonId.value()); actionEntry != m_buttonActionMap.end())
                 {
                     // remove the overlay
@@ -124,14 +127,18 @@ namespace AzToolsFramework::ViewportUi::Internal
             }
         }
 
-        auto found = [buttonId](Button* button) { return (button->m_buttonId == buttonId); };
+        auto found = [buttonId](Button* button)
+        {
+            return (button->m_buttonId == buttonId);
+        };
+
         if (auto buttonIt = AZStd::find_if(buttons.begin(), buttons.end(), found); buttonIt != buttons.end())
         {
             QIcon newIcon;
 
             if (isLocked)
             {
-                // overlay the locked icon ontop of the button's icon
+                // overlay the locked icon on top of the button's icon
                 QPixmap comboPixmap(24, 24);
                 comboPixmap.fill(Qt::transparent);
                 QPixmap firstImage(QString((*buttonIt)->m_icon.c_str()));
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiCluster.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiCluster.h
index c417d9b33c..34f7ad6f22 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiCluster.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiCluster.h
@@ -12,16 +12,16 @@
 #include <AzCore/std/smart_ptr/shared_ptr.h>
 #include <AzToolsFramework/ViewportUi/Button.h>
 #include <AzToolsFramework/ViewportUi/ViewportUiWidgetCallbacks.h>
-#include <QToolBar>
+
 #include <QPainter>
+#include <QToolBar>
 
 namespace AzToolsFramework::ViewportUi::Internal
 {
     class ButtonGroup;
 
     //! Helper class to make clusters (toolbars) for display in Viewport UI.
-    class ViewportUiCluster
-        : public QToolBar
+    class ViewportUiCluster : public QToolBar
     {
         Q_OBJECT
 
@@ -45,8 +45,7 @@ namespace AzToolsFramework::ViewportUi::Internal
     private:
         //! Adds an action to the Viewport UI Cluster.
         void AddClusterAction(
-            QAction* action, const AZStd::function<void()>& callback = {},
-            const AZStd::function<void(QAction*)>& updateCallback = {});
+            QAction* action, const AZStd::function<void()>& callback = {}, const AZStd::function<void(QAction*)>& updateCallback = {});
         //! Removes an action from the Viewport UI Cluster.
         void RemoveClusterAction(QAction* action);
 
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.cpp
index 24ca3d7c39..3b2c26114d 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.cpp
@@ -6,13 +6,12 @@
  *
  */
 
-
 #include <AzCore/std/smart_ptr/make_shared.h>
 #include <AzFramework/Viewport/ViewportScreen.h>
 #include <AzToolsFramework/Viewport/ViewportMessages.h>
 #include <AzToolsFramework/ViewportSelection/EditorSelectionUtil.h>
-#include <AzToolsFramework/ViewportUi/ViewportUiDisplay.h>
 #include <AzToolsFramework/ViewportUi/ViewportUiCluster.h>
+#include <AzToolsFramework/ViewportUi/ViewportUiDisplay.h>
 #include <AzToolsFramework/ViewportUi/ViewportUiSwitcher.h>
 #include <AzToolsFramework/ViewportUi/ViewportUiTextField.h>
 #include <QWidget>
@@ -34,9 +33,9 @@ namespace AzToolsFramework::ViewportUi::Internal
         }
     }
 
-    static Qt::Alignment GetQtAlignment(Alignment align)
+    static Qt::Alignment GetQtAlignment(const Alignment alignment)
     {
-        switch (align)
+        switch (alignment)
         {
         case Alignment::TopRight:
             return Qt::AlignTop | Qt::AlignRight;
@@ -52,7 +51,7 @@ namespace AzToolsFramework::ViewportUi::Internal
             return Qt::AlignBottom;
         }
 
-        AZ_Assert(false, "ViewportUI", "Unhandled ViewportUI Alignment %d", static_cast<int>(align));
+        AZ_Assert(false, "ViewportUI", "Unhandled ViewportUI Alignment %d", static_cast<int>(alignment));
         return Qt::AlignTop;
     }
 
@@ -71,7 +70,7 @@ namespace AzToolsFramework::ViewportUi::Internal
         UnparentWidgets(m_viewportUiElements);
     }
 
-    void ViewportUiDisplay::AddCluster(AZStd::shared_ptr<ButtonGroup> buttonGroup, const Alignment align)
+    void ViewportUiDisplay::AddCluster(AZStd::shared_ptr<ButtonGroup> buttonGroup, const Alignment alignment)
     {
         if (!buttonGroup.get())
         {
@@ -81,11 +80,10 @@ namespace AzToolsFramework::ViewportUi::Internal
         auto viewportUiCluster = AZStd::make_shared<ViewportUiCluster>(buttonGroup);
         auto id = AddViewportUiElement(viewportUiCluster);
         buttonGroup->SetViewportUiElementId(id);
-        PositionViewportUiElementAnchored(id, GetQtAlignment(align));
+        PositionViewportUiElementAnchored(id, GetQtAlignment(alignment));
     }
 
-    void ViewportUiDisplay::AddClusterButton(
-        const ViewportUiElementId clusterId, Button* button)
+    void ViewportUiDisplay::AddClusterButton(const ViewportUiElementId clusterId, Button* button)
     {
         if (auto viewportUiCluster = qobject_cast<ViewportUiCluster*>(GetViewportUiElement(clusterId).get()))
         {
@@ -101,7 +99,8 @@ namespace AzToolsFramework::ViewportUi::Internal
         }
     }
 
-    void ViewportUiDisplay::SetClusterButtonTooltip(const ViewportUiElementId clusterId, const ButtonId buttonId, const AZStd::string& tooltip)
+    void ViewportUiDisplay::SetClusterButtonTooltip(
+        const ViewportUiElementId clusterId, const ButtonId buttonId, const AZStd::string& tooltip)
     {
         if (auto viewportUiCluster = qobject_cast<ViewportUiCluster*>(GetViewportUiElement(clusterId).get()))
         {
@@ -125,7 +124,7 @@ namespace AzToolsFramework::ViewportUi::Internal
         }
     }
 
-    void ViewportUiDisplay::AddSwitcher(AZStd::shared_ptr<ButtonGroup> buttonGroup, const Alignment align)
+    void ViewportUiDisplay::AddSwitcher(AZStd::shared_ptr<ButtonGroup> buttonGroup, const Alignment alignment)
     {
         if (!buttonGroup.get())
         {
@@ -135,7 +134,7 @@ namespace AzToolsFramework::ViewportUi::Internal
         auto viewportUiSwitcher = AZStd::make_shared<ViewportUiSwitcher>(buttonGroup);
         auto id = AddViewportUiElement(viewportUiSwitcher);
         buttonGroup->SetViewportUiElementId(id);
-        PositionViewportUiElementAnchored(id, GetQtAlignment(align));
+        PositionViewportUiElementAnchored(id, GetQtAlignment(alignment));
     }
 
     void ViewportUiDisplay::AddSwitcherButton(const ViewportUiElementId clusterId, Button* button)
@@ -198,11 +197,12 @@ namespace AzToolsFramework::ViewportUi::Internal
             const ViewportUiElementInfo& elementInfo = element.second;
             if (!elementInfo.m_anchored)
             {
-                const auto screenPoint = AzFramework::WorldToScreen(
-                    elementInfo.m_worldPosition, AzToolsFramework::GetCameraState(m_viewportId));
+                const auto screenPoint =
+                    AzFramework::WorldToScreen(elementInfo.m_worldPosition, AzToolsFramework::GetCameraState(m_viewportId));
                 elementInfo.m_widget->move(screenPoint.m_x, screenPoint.m_y);
             }
         }
+
         PositionUiOverlayOverRenderViewport();
     }
 
@@ -216,7 +216,6 @@ namespace AzToolsFramework::ViewportUi::Internal
         ViewportUiElementId newId = ViewportUiElementId(++m_numViewportElements);
         ViewportUiElementInfo newElement{ widget, newId, true };
         m_viewportUiElements.insert({ newId, newElement });
-        SetUiOverlayContents(widget.get());
         return newId;
     }
 
@@ -233,8 +232,11 @@ namespace AzToolsFramework::ViewportUi::Internal
     ViewportUiElementId ViewportUiDisplay::GetViewportUiElementId(QPointer<QWidget> widget)
     {
         if (auto element = AZStd::find_if(
-            m_viewportUiElements.begin(), m_viewportUiElements.end(),
-            [widget](const auto& it) { return it.second.m_widget.get() == widget; });
+                m_viewportUiElements.begin(), m_viewportUiElements.end(),
+                [widget](const auto& it)
+                {
+                    return it.second.m_widget.get() == widget;
+                });
             element != m_viewportUiElements.end())
         {
             return element->second.m_viewportUiElementId;
@@ -245,7 +247,8 @@ namespace AzToolsFramework::ViewportUi::Internal
 
     void ViewportUiDisplay::RemoveViewportUiElement(ViewportUiElementId elementId)
     {
-        AZ_Assert(elementId != AzToolsFramework::ViewportUi::InvalidViewportUiElementId,
+        AZ_Assert(
+            elementId != AzToolsFramework::ViewportUi::InvalidViewportUiElementId,
             "Tried to remove a Viewport UI element using an invalid or removed ViewportUiElementId.");
 
         auto viewportUiMapElement = m_viewportUiElements.find(elementId);
@@ -264,8 +267,7 @@ namespace AzToolsFramework::ViewportUi::Internal
 
     void ViewportUiDisplay::ShowViewportUiElement(ViewportUiElementId elementId)
     {
-        if (ViewportUiElementInfo element = GetViewportUiElementInfo(elementId);
-            element.m_widget)
+        if (ViewportUiElementInfo element = GetViewportUiElementInfo(elementId); element.m_widget)
         {
             element.m_widget->setVisible(true);
         }
@@ -273,8 +275,7 @@ namespace AzToolsFramework::ViewportUi::Internal
 
     void ViewportUiDisplay::HideViewportUiElement(ViewportUiElementId elementId)
     {
-        if (ViewportUiElementInfo element = GetViewportUiElementInfo(elementId);
-            element.m_widget)
+        if (ViewportUiElementInfo element = GetViewportUiElementInfo(elementId); element.m_widget)
         {
             element.m_widget->setVisible(false);
         }
@@ -282,8 +283,7 @@ namespace AzToolsFramework::ViewportUi::Internal
 
     bool ViewportUiDisplay::IsViewportUiElementVisible(ViewportUiElementId elementId)
     {
-        if (ViewportUiElementInfo element = GetViewportUiElementInfo(elementId);
-            element.m_widget)
+        if (ViewportUiElementInfo element = GetViewportUiElementInfo(elementId); element.m_widget)
         {
             return element.IsValid() && element.m_widget->isVisible();
         }
@@ -293,12 +293,12 @@ namespace AzToolsFramework::ViewportUi::Internal
     void ViewportUiDisplay::CreateComponentModeBorder(const AZStd::string& borderTitle)
     {
         AZStd::string styleSheet = AZStd::string::format(
-            "border: %dpx solid %s; border-top: %dpx solid %s;", HighlightBorderSize,
-            HighlightBorderColor, TopHighlightBorderSize, HighlightBorderColor);
+            "border: %dpx solid %s; border-top: %dpx solid %s;", HighlightBorderSize, HighlightBorderColor, TopHighlightBorderSize,
+            HighlightBorderColor);
         m_uiOverlay.setStyleSheet(styleSheet.c_str());
-        m_uiOverlayLayout.setContentsMargins(HighlightBorderSize + ViewportUiOverlayMargin,
-            TopHighlightBorderSize + ViewportUiOverlayMargin, HighlightBorderSize + ViewportUiOverlayMargin,
-            HighlightBorderSize + ViewportUiOverlayMargin);
+        m_uiOverlayLayout.setContentsMargins(
+            HighlightBorderSize + ViewportUiOverlayMargin, TopHighlightBorderSize + ViewportUiOverlayMargin,
+            HighlightBorderSize + ViewportUiOverlayMargin, HighlightBorderSize + ViewportUiOverlayMargin);
         m_componentModeBorderText.setVisible(true);
         m_componentModeBorderText.setText(borderTitle.c_str());
     }
@@ -314,8 +314,7 @@ namespace AzToolsFramework::ViewportUi::Internal
     {
         auto viewportUiMapElement = m_viewportUiElements.find(elementId);
 
-        if (viewportUiMapElement != m_viewportUiElements.end() &&
-            viewportUiMapElement->second.m_widget)
+        if (viewportUiMapElement != m_viewportUiElements.end() && viewportUiMapElement->second.m_widget)
         {
             viewportUiMapElement->second.m_anchored = false;
             viewportUiMapElement->second.m_worldPosition = pos;
@@ -328,51 +327,28 @@ namespace AzToolsFramework::ViewportUi::Internal
     {
         auto viewportUiMapElement = m_viewportUiElements.find(elementId);
 
-        if (viewportUiMapElement != m_viewportUiElements.end() &&
-            viewportUiMapElement->second.m_widget)
+        if (viewportUiMapElement != m_viewportUiElements.end() && viewportUiMapElement->second.m_widget)
         {
             viewportUiMapElement->second.m_anchored = true;
             SetUiOverlayContentsAnchored(viewportUiMapElement->second.m_widget.get(), alignment);
         }
     }
 
-    void ViewportUiDisplay::AddMaximumSizeViewportUiElement(QPointer<QWidget> widget)
-    {
-        if (widget)
-        {
-            return;
-        }
-
-        if (m_fullScreenWidget)
-        {
-            AZ_Warning(
-                "ViewportUi", false,
-                "Attaching a maximum size element when one already exists. Removing the previously attached element.");
-            RemoveViewportUiElement(GetViewportUiElementId(m_fullScreenWidget));
-        }
-
-        widget->setAttribute(Qt::WA_ShowWithoutActivating);
-        widget->setParent(&m_uiOverlay);
-        m_fullScreenWidget = widget;
-        m_fullScreenLayout.addWidget(m_fullScreenWidget, 0, 0, 1, 1);
-        m_renderOverlay->setFocus();
-    }
-
     // disables system background for widget and gives a transparent background
-    static void ConfigureWidgetForViewportUi(QPointer<QWidget> widget)
+    static void ConfigureWindowForViewportUi(QPointer<QMainWindow> mainWindow)
     {
-        // no background for the widget else each set of buttons/textfields/etc would have a black box around them
-        SetTransparentBackground(widget);
-        widget->setWindowFlags(Qt::Window | Qt::FramelessWindowHint);
+        // no background for the widget else each set of buttons/text-fields/etc would have a black box around them
+        SetTransparentBackground(mainWindow);
+        mainWindow->setWindowFlags(Qt::Window | Qt::FramelessWindowHint | Qt::WindowDoesNotAcceptFocus);
     }
 
     void ViewportUiDisplay::InitializeUiOverlay()
     {
-        m_uiMainWindow.setObjectName(m_uiMainWindow.windowTitle());
-        ConfigureWidgetForViewportUi(&m_uiMainWindow);
+        m_uiMainWindow.setObjectName(QString("ViewportUiWindow"));
+        ConfigureWindowForViewportUi(&m_uiMainWindow);
         m_uiMainWindow.setVisible(false);
 
-        m_uiOverlay.setObjectName(m_uiOverlay.windowTitle());
+        m_uiOverlay.setObjectName(QString("ViewportUiOverlay"));
         m_uiMainWindow.setCentralWidget(&m_uiOverlay);
         m_uiOverlay.setVisible(false);
 
@@ -382,8 +358,7 @@ namespace AzToolsFramework::ViewportUi::Internal
         m_fullScreenLayout.addLayout(&m_uiOverlayLayout, 0, 0, 1, 1);
 
         // format the label which will appear on top of the highlight border
-        AZStd::string styleSheet = AZStd::string::format(
-            "background-color: %s; border: none;", HighlightBorderColor);
+        AZStd::string styleSheet = AZStd::string::format("background-color: %s; border: none;", HighlightBorderColor);
         m_componentModeBorderText.setStyleSheet(styleSheet.c_str());
         m_componentModeBorderText.setFixedHeight(TopHighlightBorderSize);
         m_componentModeBorderText.setVisible(false);
@@ -408,7 +383,7 @@ namespace AzToolsFramework::ViewportUi::Internal
         m_renderOverlay->setFocus();
     }
 
-    void ViewportUiDisplay::SetUiOverlayContentsAnchored(QPointer<QWidget> widget, Qt::Alignment alignment)
+    void ViewportUiDisplay::SetUiOverlayContentsAnchored(QPointer<QWidget> widget, const Qt::Alignment alignment)
     {
         if (!widget)
         {
@@ -429,13 +404,8 @@ namespace AzToolsFramework::ViewportUi::Internal
             // get the border region by taking the entire region and subtracting the non-border area
             region += m_uiOverlay.rect();
             region -= QRect(
-                QPoint(
-                    m_uiOverlay.rect().left() + HighlightBorderSize,
-                    m_uiOverlay.rect().top() + TopHighlightBorderSize),
-                QPoint(
-                    m_uiOverlay.rect().right() - HighlightBorderSize,
-                    m_uiOverlay.rect().bottom() - HighlightBorderSize)
-            );
+                QPoint(m_uiOverlay.rect().left() + HighlightBorderSize, m_uiOverlay.rect().top() + TopHighlightBorderSize),
+                QPoint(m_uiOverlay.rect().right() - HighlightBorderSize, m_uiOverlay.rect().bottom() - HighlightBorderSize));
         }
 
         // add all children widget regions
@@ -465,8 +435,7 @@ namespace AzToolsFramework::ViewportUi::Internal
 
     ViewportUiElementInfo ViewportUiDisplay::GetViewportUiElementInfo(const ViewportUiElementId elementId)
     {
-        if (auto element = m_viewportUiElements.find(elementId);
-            element != m_viewportUiElements.end())
+        if (auto element = m_viewportUiElements.find(elementId); element != m_viewportUiElements.end())
         {
             return element->second;
         }
@@ -488,7 +457,7 @@ namespace AzToolsFramework::ViewportUi::Internal
         return &m_uiOverlayLayout;
     }
 
-    void SetTransparentBackground(QWidget * widget)
+    void SetTransparentBackground(QWidget* widget)
     {
         widget->setAttribute(Qt::WA_TranslucentBackground);
         widget->setAutoFillBackground(false);
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.h
index 04000df131..aafaf61ff3 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.h
@@ -11,11 +11,12 @@
 #include <AzToolsFramework/ViewportUi/Button.h>
 #include <AzToolsFramework/ViewportUi/ButtonGroup.h>
 #include <AzToolsFramework/ViewportUi/TextField.h>
-#include <AzToolsFramework/ViewportUi/ViewportUiRequestBus.h>
 #include <AzToolsFramework/ViewportUi/ViewportUiDisplayLayout.h>
+#include <AzToolsFramework/ViewportUi/ViewportUiRequestBus.h>
+
+#include <QLabel>
 #include <QMainWindow>
 #include <QPointer>
-#include <QLabel>
 
 AZ_PUSH_DISABLE_WARNING(4251, "-Wunknown-warning-option")
 #include <QGridLayout>
@@ -28,10 +29,10 @@ namespace AzToolsFramework::ViewportUi::Internal
     //! Used to track info for each widget in the Viewport UI.
     struct ViewportUiElementInfo
     {
-        AZStd::shared_ptr<QWidget> m_widget; //<! Reference to the widget.
-        ViewportUiElementId m_viewportUiElementId; //<! Corresponding ViewportUiElementId of the widget.
-        bool m_anchored = true; //<! Whether the widget is anchored to one position or moves with camera/entity.
-        AZ::Vector3 m_worldPosition; //<! If not anchored, use this to project widget position to screen space.
+        AZStd::shared_ptr<QWidget> m_widget; //!< Reference to the widget.
+        ViewportUiElementId m_viewportUiElementId; //!< Corresponding ViewportUiElementId of the widget.
+        bool m_anchored = true; //!< Whether the widget is anchored to one position or moves with camera/entity.
+        AZ::Vector3 m_worldPosition; //!< If not anchored, use this to project widget position to screen space.
 
         bool IsValid() const
         {
@@ -52,14 +53,14 @@ namespace AzToolsFramework::ViewportUi::Internal
         ViewportUiDisplay(QWidget* parent, QWidget* renderOverlay);
         ~ViewportUiDisplay();
 
-        void AddCluster(AZStd::shared_ptr<ButtonGroup> buttonGroup, Alignment align);
+        void AddCluster(AZStd::shared_ptr<ButtonGroup> buttonGroup, Alignment alignment);
         void AddClusterButton(ViewportUiElementId clusterId, Button* button);
         void SetClusterButtonLocked(ViewportUiElementId clusterId, ButtonId buttonId, bool isLocked);
         void SetClusterButtonTooltip(ViewportUiElementId clusterId, ButtonId buttonId, const AZStd::string& tooltip);
         void RemoveClusterButton(ViewportUiElementId clusterId, ButtonId buttonId);
         void UpdateCluster(const ViewportUiElementId clusterId);
 
-        void AddSwitcher(AZStd::shared_ptr<ButtonGroup> buttonGroup, Alignment align);
+        void AddSwitcher(AZStd::shared_ptr<ButtonGroup> buttonGroup, Alignment alignment);
         void AddSwitcherButton(ViewportUiElementId switcherId, Button* button);
         void RemoveSwitcherButton(ViewportUiElementId switcherId, ButtonId buttonId);
         void UpdateSwitcher(ViewportUiElementId switcherId);
@@ -90,13 +91,12 @@ namespace AzToolsFramework::ViewportUi::Internal
 
         void CreateComponentModeBorder(const AZStd::string& borderTitle);
         void RemoveComponentModeBorder();
-        
+
     private:
         void PrepareWidgetForViewportUi(QPointer<QWidget> widget);
 
         ViewportUiElementId AddViewportUiElement(AZStd::shared_ptr<QWidget> widget);
         ViewportUiElementId GetViewportUiElementId(QPointer<QWidget> widget);
-        void AddMaximumSizeViewportUiElement(QPointer<QWidget> widget);
 
         void PositionViewportUiElementFromWorldSpace(ViewportUiElementId elementId, const AZ::Vector3& pos);
         void PositionViewportUiElementAnchored(ViewportUiElementId elementId, const Qt::Alignment alignment);
@@ -109,16 +109,16 @@ namespace AzToolsFramework::ViewportUi::Internal
 
         ViewportUiElementInfo GetViewportUiElementInfo(const ViewportUiElementId elementId);
 
-        QMainWindow m_uiMainWindow; //<! The window which contains the UI Overlay.
-        QWidget m_uiOverlay; //<! The UI Overlay which displays Viewport UI Elements.
-        QGridLayout m_fullScreenLayout; //<! The layout which extends across the full screen.
-        ViewportUiDisplayLayout m_uiOverlayLayout; //<! The layout used for optionally anchoring Viewport UI Elements.
-        QLabel m_componentModeBorderText; //<! The text used for the Component Mode border.
+        QMainWindow m_uiMainWindow; //!< The window which contains the UI Overlay.
+        QWidget m_uiOverlay; //!< The UI Overlay which displays Viewport UI Elements.
+        QGridLayout m_fullScreenLayout; //!< The layout which extends across the full screen.
+        ViewportUiDisplayLayout m_uiOverlayLayout; //!< The layout used for optionally anchoring Viewport UI Elements.
+        QLabel m_componentModeBorderText; //!< The text used for the Component Mode border.
 
         QWidget* m_renderOverlay;
-        QPointer<QWidget> m_fullScreenWidget; //<! Reference to the widget attached to m_fullScreenLayout if any.
-        int m_viewportId;
-        int64_t m_numViewportElements = 0; 
+        QPointer<QWidget> m_fullScreenWidget; //!< Reference to the widget attached to m_fullScreenLayout if any.
+        int64_t m_numViewportElements = 0;
+        int m_viewportId = 0;
 
         ViewportUiElementIdInfoLookup m_viewportUiElements;
     };
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplayLayout.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplayLayout.cpp
index a6a472a181..f25d03a7be 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplayLayout.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplayLayout.cpp
@@ -6,15 +6,19 @@
  *
  */
 
-
 #include <AzCore/Console/IConsole.h>
 #include <AzToolsFramework/ViewportUi/ViewportUiDisplayLayout.h>
-#include <QtWidgets/QWidget>
+
+#include <QWidget>
 
 namespace AzToolsFramework::ViewportUi::Internal
 {
     AZ_CVAR(
-        int, ViewportUiDisplayLayoutSpacing, 5, nullptr, AZ::ConsoleFunctorFlags::Null,
+        int,
+        ViewportUiDisplayLayoutSpacing,
+        5,
+        nullptr,
+        AZ::ConsoleFunctorFlags::Null,
         "The spacing between elements attached to the Viewport UI Display Layout");
 
     ViewportUiDisplayLayout::ViewportUiDisplayLayout(QWidget* parent)
@@ -27,7 +31,7 @@ namespace AzToolsFramework::ViewportUi::Internal
         setSpacing(ViewportUiDisplayLayoutSpacing);
 
         // create a 3x2 map of sub layouts which will stack widgets according to their mapped alignment
-        m_internalLayouts = AZStd::unordered_map<Qt::Alignment, QBoxLayout*> {
+        m_internalLayouts = AZStd::unordered_map<Qt::Alignment, QBoxLayout*>{
             CreateSubLayout(new QVBoxLayout(), 0, 0, Qt::AlignTop | Qt::AlignLeft),
             CreateSubLayout(new QVBoxLayout(), 1, 0, Qt::AlignBottom | Qt::AlignLeft),
             CreateSubLayout(new QVBoxLayout(), 0, 1, Qt::AlignTop),
@@ -45,8 +49,7 @@ namespace AzToolsFramework::ViewportUi::Internal
         }
 
         // find the corresponding sub layout for the alignment and add the widget
-        if (auto layoutForAlignment = m_internalLayouts.find(alignment);
-            layoutForAlignment != m_internalLayouts.end())
+        if (auto layoutForAlignment = m_internalLayouts.find(alignment); layoutForAlignment != m_internalLayouts.end())
         {
             // place the widget before or after the invisible spacer
             // depending on the layout alignment
@@ -97,7 +100,7 @@ namespace AzToolsFramework::ViewportUi::Internal
         // without this, alignment and resizing within the sublayouts becomes difficult
         layout->addStretch(1);
 
-        addLayout(layout, row, column, /*rowSpan=*/ 1, /*colSpan=*/ 1, alignment);
+        addLayout(layout, row, column, /*rowSpan=*/1, /*colSpan=*/1, alignment);
 
         return { alignment, layout };
     }
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplayLayout.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplayLayout.h
index 67fac85ec5..4a44f07491 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplayLayout.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplayLayout.h
@@ -9,8 +9,9 @@
 #pragma once
 
 #include <AzCore/std/containers/unordered_map.h>
-#include <QGridLayout>
+
 #include <QBoxLayout>
+#include <QGridLayout>
 #include <QPointer>
 
 namespace AzToolsFramework::ViewportUi::Internal
@@ -33,8 +34,7 @@ namespace AzToolsFramework::ViewportUi::Internal
     private:
         //! Create a sub-layout to add to the grid of layouts.
         //! @return A pair of the new layout along with its alignment on the grid.
-        AZStd::pair<Qt::Alignment, QBoxLayout*> CreateSubLayout(
-            QBoxLayout* layout, int row, int column, Qt::Alignment alignment);
+        AZStd::pair<Qt::Alignment, QBoxLayout*> CreateSubLayout(QBoxLayout* layout, int row, int column, Qt::Alignment alignment);
 
         //! A mapping of each sub-layout to its corresponding alignment on the grid.
         AZStd::unordered_map<Qt::Alignment, QBoxLayout*> m_internalLayouts;
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiManager.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiManager.cpp
index 0ef00e006f..cee4a311e8 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiManager.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiManager.cpp
@@ -6,12 +6,11 @@
  *
  */
 
-
 #include <AzCore/std/smart_ptr/make_shared.h>
 #include <AzToolsFramework/ViewportUi/Button.h>
 #include <AzToolsFramework/ViewportUi/ButtonGroup.h>
-#include <AzToolsFramework/ViewportUi/ViewportUiManager.h>
 #include <AzToolsFramework/ViewportUi/ViewportUiDisplay.h>
+#include <AzToolsFramework/ViewportUi/ViewportUiManager.h>
 
 namespace AzToolsFramework::ViewportUi
 {
@@ -114,7 +113,8 @@ namespace AzToolsFramework::ViewportUi
         return ButtonId(0);
     }
 
-    const ButtonId ViewportUiManager::CreateSwitcherButton(const SwitcherId switcherId, const AZStd::string& icon, const AZStd::string& name)
+    const ButtonId ViewportUiManager::CreateSwitcherButton(
+        const SwitcherId switcherId, const AZStd::string& icon, const AZStd::string& name)
     {
         if (auto switcherIt = m_switcherButtonGroups.find(switcherId); switcherIt != m_switcherButtonGroups.end())
         {
@@ -146,8 +146,7 @@ namespace AzToolsFramework::ViewportUi
         }
     }
 
-    static void SetViewportUiElementVisible(
-        Internal::ViewportUiDisplay* ui, ViewportUiElementId id, bool visible)
+    static void SetViewportUiElementVisible(Internal::ViewportUiDisplay* ui, ViewportUiElementId id, bool visible)
     {
         if (visible)
         {
@@ -186,11 +185,9 @@ namespace AzToolsFramework::ViewportUi
     }
 
     const TextFieldId ViewportUiManager::CreateTextField(
-        const AZStd::string& labelText, const AZStd::string& textFieldDefaultText,
-        TextFieldValidationType validationType) 
+        const AZStd::string& labelText, const AZStd::string& textFieldDefaultText, TextFieldValidationType validationType)
     {
-        auto textField = AZStd::make_shared<Internal::TextField>(
-            labelText, textFieldDefaultText, validationType);
+        auto textField = AZStd::make_shared<Internal::TextField>(labelText, textFieldDefaultText, validationType);
         m_viewportUi->AddTextField(textField);
 
         return RegisterNewTextField(textField);
@@ -206,8 +203,7 @@ namespace AzToolsFramework::ViewportUi
         }
     }
 
-    void ViewportUiManager::RegisterTextFieldCallback(
-        TextFieldId textFieldId, AZ::Event<AZStd::string>::Handler& handler) 
+    void ViewportUiManager::RegisterTextFieldCallback(TextFieldId textFieldId, AZ::Event<AZStd::string>::Handler& handler)
     {
         if (auto textFieldIt = m_textFields.find(textFieldId); textFieldIt != m_textFields.end())
         {
@@ -234,7 +230,6 @@ namespace AzToolsFramework::ViewportUi
         }
     }
 
-
     void ViewportUiManager::CreateComponentModeBorder(const AZStd::string& borderTitle)
     {
         m_viewportUi->CreateComponentModeBorder(borderTitle);
@@ -248,8 +243,7 @@ namespace AzToolsFramework::ViewportUi
     void ViewportUiManager::PressButton(ClusterId clusterId, ButtonId buttonId)
     {
         // Find cluster using ID and cluster map
-        if (auto clusterIt = m_clusterButtonGroups.find(clusterId);
-            clusterIt != m_clusterButtonGroups.end())
+        if (auto clusterIt = m_clusterButtonGroups.find(clusterId); clusterIt != m_clusterButtonGroups.end())
         {
             clusterIt->second->PressButton(buttonId);
         }
@@ -305,7 +299,7 @@ namespace AzToolsFramework::ViewportUi
     SwitcherId ViewportUiManager::RegisterNewSwitcher(AZStd::shared_ptr<Internal::ButtonGroup>& buttonGroup)
     {
         SwitcherId newId = SwitcherId(m_switcherButtonGroups.size() + 1);
-        m_switcherButtonGroups.insert({newId, buttonGroup});
+        m_switcherButtonGroups.insert({ newId, buttonGroup });
 
         return newId;
     }
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiManager.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiManager.h
index 6ab4bd9e5c..137ee7b2c0 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiManager.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiManager.h
@@ -18,7 +18,7 @@ namespace AzToolsFramework::ViewportUi
     {
         class ButtonGroup;
         class ViewportUiDisplay;
-    }
+    } // namespace Internal
 
     class ViewportUiManager : public ViewportUiRequestBus::Handler
     {
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiSwitcher.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiSwitcher.cpp
index 80f064c04a..6b8b1873f7 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiSwitcher.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiSwitcher.cpp
@@ -65,8 +65,12 @@ namespace AzToolsFramework::ViewportUi::Internal
         // resize to fit new action with minimum extra space
         resize(minimumSizeHint());
 
-        const AZStd::function<void()>& callback = [this, button]() { m_buttonGroup->PressButton(button->m_buttonId); };
-        const AZStd::function<void(QAction*)>& updateCallback = [button](QAction* action) {
+        const AZStd::function<void()>& callback = [this, button]()
+        {
+            m_buttonGroup->PressButton(button->m_buttonId);
+        };
+        const AZStd::function<void(QAction*)>& updateCallback = [button](QAction* action)
+        {
             action->setChecked(button->m_state == Button::State::Selected);
         };
 
@@ -78,9 +82,13 @@ namespace AzToolsFramework::ViewportUi::Internal
 
         // register the action
         m_widgetCallbacks.AddWidget(
-            action, [updateCallback](QPointer<QObject> object) { updateCallback(static_cast<QAction*>(object.data())); });
+            action,
+            [updateCallback](QPointer<QObject> object)
+            {
+                updateCallback(static_cast<QAction*>(object.data()));
+            });
 
-        m_buttonActionMap.insert({button->m_buttonId, action});
+        m_buttonActionMap.insert({ button->m_buttonId, action });
     }
 
     void ViewportUiSwitcher::RemoveButton(ButtonId buttonId)
@@ -121,9 +129,12 @@ namespace AzToolsFramework::ViewportUi::Internal
         // Check if it is the first active mode to be set
         bool initialActiveMode = (m_activeButtonId == ButtonId(0));
 
-        // Change the toolbutton's name and icon to that button
+        // Change the tool button's name and icon to that button
         const AZStd::vector<Button*> buttons = m_buttonGroup->GetButtons();
-        auto found = [buttonId](Button* button) { return (button->m_buttonId == buttonId); };
+        auto found = [buttonId](Button* button)
+        {
+            return (button->m_buttonId == buttonId);
+        };
 
         if (auto buttonIt = AZStd::find_if(buttons.begin(), buttons.end(), found); buttonIt != buttons.end())
         {
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiSwitcher.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiSwitcher.h
index 9af8774b6d..6620cb6aca 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiSwitcher.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiSwitcher.h
@@ -8,11 +8,11 @@
 
 #pragma once
 
-#include <AzToolsFramework/ViewportUi/Button.h>
 #include <AzCore/std/containers/unordered_map.h>
 #include <AzCore/std/smart_ptr/shared_ptr.h>
+#include <AzToolsFramework/ViewportUi/Button.h>
 #include <AzToolsFramework/ViewportUi/ViewportUiWidgetCallbacks.h>
-#include <functional>
+
 #include <QPointer>
 #include <QToolBar>
 #include <QToolButton>
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiTextField.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiTextField.cpp
index d216749f99..d94c8d6dca 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiTextField.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiTextField.cpp
@@ -6,7 +6,6 @@
  *
  */
 
-
 #include "ViewportUiTextField.h"
 
 #include <AzCore/Console/IConsole.h>
@@ -16,7 +15,11 @@
 namespace AzToolsFramework::ViewportUi::Internal
 {
     AZ_CVAR(
-        int, ViewportUiTextFieldLength, 35, nullptr, AZ::ConsoleFunctorFlags::Null,
+        int,
+        ViewportUiTextFieldLength,
+        35,
+        nullptr,
+        AZ::ConsoleFunctorFlags::Null,
         "The pixel length of the text field part of a ViewportUiTextField");
 
     ViewportUiTextField::ViewportUiTextField(AZStd::shared_ptr<TextField> textField)
@@ -56,11 +59,14 @@ namespace AzToolsFramework::ViewportUi::Internal
 
         m_lineEdit.setValidator(m_validator);
 
-        connect(&m_lineEdit, &QLineEdit::textEdited, &m_lineEdit, [textField](QString text) {
-            // convert the text using toLocal8Bit().data() as recommended by Qt, then emit signal
-            textField->m_fieldText = text.toLocal8Bit().data();
-            textField->m_textEditedEvent.Signal(textField->m_fieldText);
-        });
+        connect(
+            &m_lineEdit, &QLineEdit::textEdited, &m_lineEdit,
+            [textField](QString text)
+            {
+                // convert the text using toLocal8Bit().data() as recommended by Qt, then emit signal
+                textField->m_fieldText = text.toLocal8Bit().data();
+                textField->m_textEditedEvent.Signal(textField->m_fieldText);
+            });
     }
 
     void ViewportUiTextField::Update()
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiTextField.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiTextField.h
index ad56e78671..0e7a9043eb 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiTextField.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiTextField.h
@@ -7,7 +7,10 @@
  */
 
 #pragma once
+
+#include <AzCore/std/smart_ptr/shared_ptr.h>
 #include <AzToolsFramework/ViewportUi/TextField.h>
+
 #include <QLabel>
 #include <QLineEdit>
 #include <QWidget>
@@ -17,13 +20,10 @@ AZ_PUSH_DISABLE_WARNING(4251, "-Wunknown-warning-option")
 #include <QVBoxLayout>
 AZ_POP_DISABLE_WARNING
 
-#include <AzCore/std/smart_ptr/shared_ptr.h>
-
 namespace AzToolsFramework::ViewportUi::Internal
 {
     //! Helper class for a widget that holds and manages multiple LabelTextFields.
-    class ViewportUiTextField
-        : public QWidget
+    class ViewportUiTextField : public QWidget
     {
         Q_OBJECT
 
@@ -34,9 +34,9 @@ namespace AzToolsFramework::ViewportUi::Internal
         void Update();
 
     private:
-        QLabel m_label; //<! The text label.
-        QLineEdit m_lineEdit; //<! The editable text field.
-        QValidator* m_validator; //<! The validator for the line edit text.
-        AZStd::shared_ptr<TextField> m_textField; //<! Reference to the text field data struct.
+        QLabel m_label; //!< The text label.
+        QLineEdit m_lineEdit; //!< The editable text field.
+        QValidator* m_validator; //!< The validator for the line edit text.
+        AZStd::shared_ptr<TextField> m_textField; //!< Reference to the text field data struct.
     };
 } // namespace AzToolsFramework::ViewportUi::Internal
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiWidgetCallbacks.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiWidgetCallbacks.cpp
index d86a4b7f06..1451912c82 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiWidgetCallbacks.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiWidgetCallbacks.cpp
@@ -6,13 +6,11 @@
  *
  */
 
-
 #include "ViewportUiWidgetCallbacks.h"
 
 namespace AzToolsFramework::ViewportUi::Internal
 {
-    void ViewportUiWidgetCallbacks::AddWidget(
-        QPointer<QObject> widget, const AZStd::function<void(QPointer<QObject>)>& updateCallback)
+    void ViewportUiWidgetCallbacks::AddWidget(QPointer<QObject> widget, const AZStd::function<void(QPointer<QObject>)>& updateCallback)
     {
         if (widget.isNull())
         {
@@ -40,7 +38,7 @@ namespace AzToolsFramework::ViewportUi::Internal
     {
         // if widget exists on the manager, register the callback
         auto callBackWidget = AZStd::find(m_widgets.begin(), m_widgets.end(), widget);
-        AZ_Assert(callBackWidget != m_widgets.end(), "Unable to register a callback for an unregistered widget.")
+        AZ_Assert(callBackWidget != m_widgets.end(), "Unable to register a callback for an unregistered widget.");
 
         if (callBackWidget != m_widgets.end())
         {
@@ -58,8 +56,7 @@ namespace AzToolsFramework::ViewportUi::Internal
                 RemoveWidget(widget);
             }
             // check if the widget has not been deleted externally
-            else if (auto callback = m_updateCallbacks.find(widget);
-                callback != m_updateCallbacks.end())
+            else if (auto callback = m_updateCallbacks.find(widget); callback != m_updateCallbacks.end())
             {
                 callback->second(widget);
             }
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiWidgetCallbacks.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiWidgetCallbacks.h
index 36d969ac8c..582f90349f 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiWidgetCallbacks.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiWidgetCallbacks.h
@@ -9,12 +9,12 @@
 #pragma once
 
 #include <AzCore/Memory/Memory.h>
-#include <AzCore/std/function/function_template.h>
 #include <AzCore/std/containers/unordered_map.h>
-#include <QPointer>
-#include <QObject>
-#include <QMetaMethod>
+#include <AzCore/std/function/function_template.h>
 
+#include <QMetaMethod>
+#include <QObject>
+#include <QPointer>
 
 namespace AzToolsFramework::ViewportUi::Internal
 {
@@ -30,7 +30,8 @@ namespace AzToolsFramework::ViewportUi::Internal
         //! Must call ViewportUiWidgetCallbacks::Update to execute the callback.
         void RegisterUpdateCallback(QPointer<QObject> widget, const AZStd::function<void(QPointer<QObject>)>& callback);
         void Update();
-        const AZStd::vector<QPointer<QObject>> GetWidgets() const { return m_widgets; }
+
+        const AZStd::vector<QPointer<QObject>>& GetWidgets() const;
 
     protected:
         //! A map of all update callbacks and their respective widgets.
@@ -38,4 +39,9 @@ namespace AzToolsFramework::ViewportUi::Internal
         AZStd::unordered_map<QObject*, AZStd::function<void(QPointer<QObject>)>> m_updateCallbacks;
         AZStd::vector<QPointer<QObject>> m_widgets;
     };
+
+    inline const AZStd::vector<QPointer<QObject>>& ViewportUiWidgetCallbacks::GetWidgets() const
+    {
+        return m_widgets;
+    }
 } // namespace AzToolsFramework::ViewportUi::Internal
diff --git a/Code/Tools/AssetProcessor/native/InternalBuilders/SettingsRegistryBuilder.cpp b/Code/Tools/AssetProcessor/native/InternalBuilders/SettingsRegistryBuilder.cpp
index f808850ad7..9781c200fd 100644
--- a/Code/Tools/AssetProcessor/native/InternalBuilders/SettingsRegistryBuilder.cpp
+++ b/Code/Tools/AssetProcessor/native/InternalBuilders/SettingsRegistryBuilder.cpp
@@ -315,7 +315,7 @@ namespace AssetProcessor
                             }
                         }
 
-                        for (const AZ::IO::Path& sourcePath : sourcePaths)
+                        for (const AZ::IO::PathView& sourcePath : sourcePaths)
                         {
                             // Use JSON Pointer to append elements to the SourcePaths array
                             registry.Set(FixedValueString::format("%s/SourcePaths/%zu", PlaceholderGemKey.c_str(), pathIndex++),
diff --git a/Code/Tools/SceneAPI/SceneCore/DataTypes/GraphData/IMeshVertexTangentData.h b/Code/Tools/SceneAPI/SceneCore/DataTypes/GraphData/IMeshVertexTangentData.h
index 3264bcf45d..ffeeedf9fe 100644
--- a/Code/Tools/SceneAPI/SceneCore/DataTypes/GraphData/IMeshVertexTangentData.h
+++ b/Code/Tools/SceneAPI/SceneCore/DataTypes/GraphData/IMeshVertexTangentData.h
@@ -25,8 +25,7 @@ namespace AZ
             enum class TangentSpace
             {
                 FromSourceScene = 0,
-                MikkT           = 1,
-                EMotionFX       = 2
+                MikkT           = 1
             };
 
             enum class BitangentMethod
diff --git a/Code/Tools/SceneAPI/SceneData/GraphData/MeshVertexBitangentData.cpp b/Code/Tools/SceneAPI/SceneData/GraphData/MeshVertexBitangentData.cpp
index 183288a470..faa9bf457e 100644
--- a/Code/Tools/SceneAPI/SceneData/GraphData/MeshVertexBitangentData.cpp
+++ b/Code/Tools/SceneAPI/SceneData/GraphData/MeshVertexBitangentData.cpp
@@ -34,7 +34,6 @@ namespace AZ
                         ->Method("GetBitangent", &MeshVertexBitangentData::GetBitangent)
                         ->Method("GetBitangentSetIndex", &MeshVertexBitangentData::GetBitangentSetIndex)
                         ->Method("GetTangentSpace", &MeshVertexBitangentData::GetTangentSpace)
-                        ->Enum<(int)SceneAPI::DataTypes::TangentSpace::EMotionFX>("EMotionFX")
                         ->Enum<(int)SceneAPI::DataTypes::TangentSpace::FromSourceScene>("FromSourceScene")
                         ->Enum<(int)SceneAPI::DataTypes::TangentSpace::MikkT>("MikkT");
                 }
diff --git a/Code/Tools/SceneAPI/SceneData/GraphData/MeshVertexTangentData.cpp b/Code/Tools/SceneAPI/SceneData/GraphData/MeshVertexTangentData.cpp
index 41e8bd9f65..9f27f4eb44 100644
--- a/Code/Tools/SceneAPI/SceneData/GraphData/MeshVertexTangentData.cpp
+++ b/Code/Tools/SceneAPI/SceneData/GraphData/MeshVertexTangentData.cpp
@@ -34,7 +34,6 @@ namespace AZ
                         ->Method("GetTangent", &MeshVertexTangentData::GetTangent)
                         ->Method("GetTangentSetIndex", &MeshVertexTangentData::GetTangentSetIndex)
                         ->Method("GetTangentSpace", &MeshVertexTangentData::GetTangentSpace)
-                        ->Enum<(int)SceneAPI::DataTypes::TangentSpace::EMotionFX>("EMotionFX")
                         ->Enum<(int)SceneAPI::DataTypes::TangentSpace::FromSourceScene>("FromSourceScene")
                         ->Enum<(int)SceneAPI::DataTypes::TangentSpace::MikkT>("MikkT");
                 }
diff --git a/Code/Tools/SceneAPI/SceneData/ManifestMetaInfoHandler.cpp b/Code/Tools/SceneAPI/SceneData/ManifestMetaInfoHandler.cpp
index 760221983e..a135ec5073 100644
--- a/Code/Tools/SceneAPI/SceneData/ManifestMetaInfoHandler.cpp
+++ b/Code/Tools/SceneAPI/SceneData/ManifestMetaInfoHandler.cpp
@@ -23,6 +23,7 @@
 #include <SceneAPI/SceneData/Rules/MaterialRule.h>
 #include <SceneAPI/SceneData/Rules/StaticMeshAdvancedRule.h>
 #include <SceneAPI/SceneData/Rules/SkeletonProxyRule.h>
+#include <SceneAPI/SceneData/Rules/TangentsRule.h>
 #include <SceneAPI/SceneData/Rules/SkinMeshAdvancedRule.h>
 #include <SceneAPI/SceneData/Rules/SkinRule.h>
 #include <SceneAPI/SceneData/Rules/CoordinateSystemRule.h>
@@ -82,6 +83,10 @@ namespace AZ
                     {
                         modifiers.push_back(azrtti_typeid<CoordinateSystemRule>());
                     }
+                    if (existingRules.find(SceneData::TangentsRule::TYPEINFO_Uuid()) == existingRules.end())
+                    {
+                        modifiers.push_back(SceneData::TangentsRule::TYPEINFO_Uuid());
+                    }
                 }
                 else if (target.RTTI_IsTypeOf(DataTypes::ISkinGroup::TYPEINFO_Uuid()))
                 {
diff --git a/Code/Tools/SceneAPI/SceneData/Rules/TangentsRule.cpp b/Code/Tools/SceneAPI/SceneData/Rules/TangentsRule.cpp
index 0bea5863bf..7b4be1dfdf 100644
--- a/Code/Tools/SceneAPI/SceneData/Rules/TangentsRule.cpp
+++ b/Code/Tools/SceneAPI/SceneData/Rules/TangentsRule.cpp
@@ -27,114 +27,14 @@ namespace AZ
             TangentsRule::TangentsRule()
                 : DataTypes::IRule()
                 , m_tangentSpace(AZ::SceneAPI::DataTypes::TangentSpace::MikkT)
-                , m_bitangentMethod(AZ::SceneAPI::DataTypes::BitangentMethod::Orthogonal)
-                , m_uvSetIndex(0)
-                , m_normalize(true)
             {
             }
 
-
             AZ::SceneAPI::DataTypes::TangentSpace TangentsRule::GetTangentSpace() const
             {
                 return m_tangentSpace;
             }
 
-
-            AZ::SceneAPI::DataTypes::BitangentMethod TangentsRule::GetBitangentMethod() const
-            {
-                return m_bitangentMethod;
-            }
-
-
-            AZ::u64 TangentsRule::GetUVSetIndex() const
-            {
-                return m_uvSetIndex;
-            }
-
-
-            bool TangentsRule::GetNormalizeVectors() const
-            {
-                return m_normalize;
-            }
-
-
-            // Find UV data.
-            AZ::SceneAPI::DataTypes::IMeshVertexUVData* TangentsRule::FindUVData(AZ::SceneAPI::Containers::SceneGraph& graph, const AZ::SceneAPI::Containers::SceneGraph::NodeIndex& nodeIndex, AZ::u64 uvSet)
-            {
-                const auto nameContentView = AZ::SceneAPI::Containers::Views::MakePairView(graph.GetNameStorage(), graph.GetContentStorage());
-
-                AZ::u64 uvSetIndex = 0;
-                auto meshChildView = AZ::SceneAPI::Containers::Views::MakeSceneGraphChildView<AZ::SceneAPI::Containers::Views::AcceptEndPointsOnly>(graph, nodeIndex, nameContentView.begin(), true);
-                for (auto child = meshChildView.begin(); child != meshChildView.end(); ++child)
-                {
-                    AZ::SceneAPI::DataTypes::IMeshVertexUVData* data = azrtti_cast<AZ::SceneAPI::DataTypes::IMeshVertexUVData*>(child->second.get());
-                    if (data)
-                    {
-                        if (uvSetIndex == uvSet)
-                        {
-                            return data;
-                        }
-                        uvSetIndex++;
-                    }
-                }
-
-                return nullptr;
-            }
-
-
-            // Find tangent data.
-            AZ::SceneAPI::DataTypes::IMeshVertexTangentData* TangentsRule::FindTangentData(AZ::SceneAPI::Containers::SceneGraph& graph, const AZ::SceneAPI::Containers::SceneGraph::NodeIndex& nodeIndex, AZ::u64 setIndex, AZ::SceneAPI::DataTypes::TangentSpace tangentSpace)
-            {
-                const auto nameContentView = AZ::SceneAPI::Containers::Views::MakePairView(graph.GetNameStorage(), graph.GetContentStorage());
-
-                auto meshChildView = AZ::SceneAPI::Containers::Views::MakeSceneGraphChildView<AZ::SceneAPI::Containers::Views::AcceptEndPointsOnly>(graph, nodeIndex, nameContentView.begin(), true);
-                for (auto child = meshChildView.begin(); child != meshChildView.end(); ++child)
-                {
-                    AZ::SceneAPI::DataTypes::IMeshVertexTangentData* data = azrtti_cast<AZ::SceneAPI::DataTypes::IMeshVertexTangentData*>(child->second.get());
-                    if (data)
-                    {
-                        if (setIndex == data->GetTangentSetIndex() && tangentSpace == data->GetTangentSpace())
-                        {
-                            return data;
-                        }
-                    }
-                }
-
-                return nullptr;
-            }
-
-
-            // Find bitangent data.
-            AZ::SceneAPI::DataTypes::IMeshVertexBitangentData* TangentsRule::FindBitangentData(AZ::SceneAPI::Containers::SceneGraph& graph, const AZ::SceneAPI::Containers::SceneGraph::NodeIndex& nodeIndex, AZ::u64 setIndex, AZ::SceneAPI::DataTypes::TangentSpace tangentSpace)
-            {
-                const auto nameContentView = AZ::SceneAPI::Containers::Views::MakePairView(graph.GetNameStorage(), graph.GetContentStorage());
-
-                auto meshChildView = AZ::SceneAPI::Containers::Views::MakeSceneGraphChildView<AZ::SceneAPI::Containers::Views::AcceptEndPointsOnly>(graph, nodeIndex, nameContentView.begin(), true);
-                for (auto child = meshChildView.begin(); child != meshChildView.end(); ++child)
-                {
-                    AZ::SceneAPI::DataTypes::IMeshVertexBitangentData* data = azrtti_cast<AZ::SceneAPI::DataTypes::IMeshVertexBitangentData*>(child->second.get());
-                    if (data)
-                    {
-                        if (setIndex == data->GetBitangentSetIndex() && tangentSpace == data->GetTangentSpace())
-                        {
-                            return data;
-                        }
-                    }
-                }
-
-                return nullptr;
-            }
-
-            AZ::Crc32 TangentsRule::GetNormalizeVisibility() const
-            {
-                return (m_tangentSpace == AZ::SceneAPI::DataTypes::TangentSpace::EMotionFX) ? AZ::Edit::PropertyVisibility::Hide : AZ::Edit::PropertyVisibility::Show;
-            }
-
-            AZ::Crc32 TangentsRule::GetOrthogonalVisibility() const
-            {
-                return (m_tangentSpace == AZ::SceneAPI::DataTypes::TangentSpace::EMotionFX) ? AZ::Edit::PropertyVisibility::Hide : AZ::Edit::PropertyVisibility::Show;
-            }
-
             void TangentsRule::Reflect(AZ::ReflectContext* context)
             {
                 AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(context);
@@ -143,11 +43,8 @@ namespace AZ
                     return;
                 }
 
-                serializeContext->Class<TangentsRule, DataTypes::IRule>()->Version(2)
-                    ->Field("tangentSpace", &TangentsRule::m_tangentSpace)
-                    ->Field("bitangentMethod", &TangentsRule::m_bitangentMethod)
-                    ->Field("normalize", &TangentsRule::m_normalize)
-                    ->Field("uvSetIndex", &TangentsRule::m_uvSetIndex);
+                serializeContext->Class<TangentsRule, DataTypes::IRule>()->Version(3)
+                    ->Field("tangentSpace", &TangentsRule::m_tangentSpace);
 
                 AZ::EditContext* editContext = serializeContext->GetEditContext();
                 if (editContext)
@@ -159,17 +56,7 @@ namespace AZ
                         ->DataElement(AZ::Edit::UIHandlers::ComboBox, &AZ::SceneAPI::SceneData::TangentsRule::m_tangentSpace, "Tangent space", "Specify the tangent space used for normal map baking. Choose 'From Fbx' to extract the tangents and bitangents directly from the Fbx file. When there is no tangents rule or the Fbx has no tangents stored inside it, the 'MikkT' option will be used with orthogonal tangents of unit length, so with the normalize option enabled, using the first UV set.")
                         ->EnumAttribute(AZ::SceneAPI::DataTypes::TangentSpace::FromSourceScene, "From Source Scene")
                         ->EnumAttribute(AZ::SceneAPI::DataTypes::TangentSpace::MikkT, "MikkT")
-                        ->EnumAttribute(AZ::SceneAPI::DataTypes::TangentSpace::EMotionFX, "EMotion FX")
                         ->Attribute(AZ::Edit::Attributes::ChangeNotify, AZ::Edit::PropertyRefreshLevels::EntireTree)
-                        ->DataElement(AZ::Edit::UIHandlers::ComboBox, &AZ::SceneAPI::SceneData::TangentsRule::m_bitangentMethod, "Bitangents", "Set to 'use from tangent space' to use the bitangents generated by the algorithm used or inside the fbx file. This can result in non-orthogonal tangents. Set to 'orthogonal' to skip storing the bitangents and let the engine calculate the bitangents in a way it will be perpendicular to both the normal and tangent.")
-                        ->EnumAttribute(AZ::SceneAPI::DataTypes::BitangentMethod::UseFromTangentSpace, "Use from tangent space")
-                        ->EnumAttribute(AZ::SceneAPI::DataTypes::BitangentMethod::Orthogonal, "Orthogonal")
-                        ->Attribute(AZ::Edit::Attributes::Visibility, &TangentsRule::GetOrthogonalVisibility)
-                        ->DataElement(AZ::Edit::UIHandlers::Default, &TangentsRule::m_uvSetIndex, "Uv set", "The UV set index to generate the tangents from. A value of 0 means the first uv set, while 1 means the second uv set.")
-                        ->Attribute(AZ::Edit::Attributes::Min, 0)
-                        ->Attribute(AZ::Edit::Attributes::Max, 1)
-                        ->DataElement(AZ::Edit::UIHandlers::Default, &TangentsRule::m_normalize, "Normalize", "Normalize the tangents and bitangents? When disabled the vectors might no be unit length, which can be useful for relief mapping.")
-                        ->Attribute(AZ::Edit::Attributes::Visibility, &TangentsRule::GetNormalizeVisibility)
                     ;
                 }
             }
diff --git a/Code/Tools/SceneAPI/SceneData/Rules/TangentsRule.h b/Code/Tools/SceneAPI/SceneData/Rules/TangentsRule.h
index 28627cfe0c..b368fce88a 100644
--- a/Code/Tools/SceneAPI/SceneData/Rules/TangentsRule.h
+++ b/Code/Tools/SceneAPI/SceneData/Rules/TangentsRule.h
@@ -46,24 +46,11 @@ namespace AZ
                 SCENE_DATA_API ~TangentsRule() override = default;
 
                 SCENE_DATA_API AZ::SceneAPI::DataTypes::TangentSpace GetTangentSpace() const;
-                SCENE_DATA_API AZ::SceneAPI::DataTypes::BitangentMethod GetBitangentMethod() const;
-                SCENE_DATA_API AZ::u64 GetUVSetIndex() const;
-                SCENE_DATA_API bool GetNormalizeVectors() const;
-
-                SCENE_DATA_API static AZ::SceneAPI::DataTypes::IMeshVertexUVData* FindUVData(AZ::SceneAPI::Containers::SceneGraph& graph, const AZ::SceneAPI::Containers::SceneGraph::NodeIndex& nodeIndex, AZ::u64 uvSet);
-                SCENE_DATA_API static AZ::SceneAPI::DataTypes::IMeshVertexTangentData* FindTangentData(AZ::SceneAPI::Containers::SceneGraph& graph, const AZ::SceneAPI::Containers::SceneGraph::NodeIndex& nodeIndex, AZ::u64 setIndex, AZ::SceneAPI::DataTypes::TangentSpace tangentSpace);
-                SCENE_DATA_API static AZ::SceneAPI::DataTypes::IMeshVertexBitangentData* FindBitangentData(AZ::SceneAPI::Containers::SceneGraph& graph, const AZ::SceneAPI::Containers::SceneGraph::NodeIndex& nodeIndex, AZ::u64 setIndex, AZ::SceneAPI::DataTypes::TangentSpace tangentSpace);
 
                 static void Reflect(ReflectContext* context);
 
             protected:
-                AZ::Crc32 GetNormalizeVisibility() const;
-                AZ::Crc32 GetOrthogonalVisibility() const;
-
-                AZ::SceneAPI::DataTypes::TangentSpace       m_tangentSpace;     /**< Specifies how to handle tangents. Either generate them, or import them. */
-                AZ::SceneAPI::DataTypes::BitangentMethod    m_bitangentMethod;  /**< Grab the bitangents from the generator/source or use an orthogonal basis by always calculating them? */
-                AZ::u64                                     m_uvSetIndex;       /**< Generate the tangents from this UV set. */
-                bool                                        m_normalize;        /**< Normalize the tangent and bitangents? */
+                AZ::SceneAPI::DataTypes::TangentSpace m_tangentSpace;     /**< Specifies how to handle tangents. Either generate them, or import them. */
             };
         } // SceneData
     } // SceneAPI
diff --git a/Code/Tools/SceneAPI/SceneData/Tests/GraphData/GraphDataBehaviorTests.cpp b/Code/Tools/SceneAPI/SceneData/Tests/GraphData/GraphDataBehaviorTests.cpp
index 9a2a6f7364..bdcf690844 100644
--- a/Code/Tools/SceneAPI/SceneData/Tests/GraphData/GraphDataBehaviorTests.cpp
+++ b/Code/Tools/SceneAPI/SceneData/Tests/GraphData/GraphDataBehaviorTests.cpp
@@ -94,7 +94,7 @@ namespace AZ
                         tangentData->AppendTangent(AZ::Vector4{0.12f, 0.34f, 0.56f, 0.78f});
                         tangentData->AppendTangent(AZ::Vector4{0.18f, 0.28f, 0.19f, 0.29f});
                         tangentData->AppendTangent(AZ::Vector4{0.21f, 0.43f, 0.65f, 0.87f});
-                        tangentData->SetTangentSpace(AZ::SceneAPI::DataTypes::TangentSpace::EMotionFX);
+                        tangentData->SetTangentSpace(AZ::SceneAPI::DataTypes::TangentSpace::MikkT);
                         tangentData->SetTangentSetIndex(2);
                         return true;
                     }
diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/Conversions.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/Conversions.cpp
index e18b94bfba..fce4db364f 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/Conversions.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/Conversions.cpp
@@ -780,7 +780,25 @@ namespace AZ
             };
             return table[static_cast<uint32_t>(func)];
         }
-        
+
+#if AZ_TRAIT_ATOM_METAL_SAMPLER_BORDERCOLOR_SUPPORT
+    MTLSamplerBorderColor ConvertBorderColor(RHI::BorderColor color)
+    {
+        switch (color)
+        {
+            case RHI::BorderColor::OpaqueBlack:
+                return MTLSamplerBorderColorOpaqueBlack;
+            case RHI::BorderColor::TransparentBlack:
+                return MTLSamplerBorderColorTransparentBlack;
+            case RHI::BorderColor::OpaqueWhite:
+                return MTLSamplerBorderColorOpaqueWhite;
+            default:
+                AZ_Assert(false, "Unsupported Border Color");
+        }
+        return MTLSamplerBorderColorOpaqueBlack;
+    }
+#endif
+
         void ConvertSamplerState(const RHI::SamplerState& state, MTLSamplerDescriptor* samplerDesc)
         {
             samplerDesc.sAddressMode = ConvertAddressMode(state.m_addressU);
@@ -948,24 +966,7 @@ namespace AZ
                     return false;
             }
         }
-    
-#if AZ_TRAIT_ATOM_METAL_SAMPLER_BORDERCOLOR_SUPPORT
-        MTLSamplerBorderColor ConvertBorderColor(RHI::BorderColor color)
-        {
-            switch (color)
-            {
-                case RHI::BorderColor::OpaqueBlack:
-                    return MTLSamplerBorderColorOpaqueBlack;
-                case RHI::BorderColor::TransparentBlack:
-                    return MTLSamplerBorderColorTransparentBlack;
-                case RHI::BorderColor::OpaqueWhite:
-                    return MTLSamplerBorderColorOpaqueWhite;
-                default:
-                    AZ_Assert(false, "Unsupported Border Color");
-            }
-            return MTLSamplerBorderColorOpaqueBlack;            
-        }
-#endif
+
         void ConvertImageArgumentDescriptor(MTLArgumentDescriptor* imgArgDescriptor, const RHI::ShaderInputImageDescriptor& shaderInputImage)
         {
             imgArgDescriptor.dataType = MTLDataTypeTexture;
diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/Metal.h b/Gems/Atom/RHI/Metal/Code/Source/RHI/Metal.h
index 85fb9bb00a..ff3cd62bde 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/Metal.h
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/Metal.h
@@ -9,6 +9,7 @@
 
 #include <stdint.h>
 #include <Metal_Traits_Platform.h>
+#include <Metal/Metal.h>
 
 namespace AZ
 {
diff --git a/Gems/Atom/RPI/Code/Source/RPI.Builders/Model/ModelAssetBuilderComponent.cpp b/Gems/Atom/RPI/Code/Source/RPI.Builders/Model/ModelAssetBuilderComponent.cpp
index 93744e0a51..aa2ad37647 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Builders/Model/ModelAssetBuilderComponent.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Builders/Model/ModelAssetBuilderComponent.cpp
@@ -540,7 +540,9 @@ namespace AZ
                 }
                 else
                 {
-                    AZ_Warning(s_builderName, false, "Found multiple tangent data sets. Only the first will be used.");
+                    AZ_Warning(s_builderName, false,
+                        "Found multiple tangent data sets for mesh '%s'. Only the first will be used.",
+                        content.m_name.GetCStr());
                 }
             }
             else if (azrtti_istypeof<BitangentData>(data.get()))
@@ -552,7 +554,9 @@ namespace AZ
                 }
                 else
                 {
-                    AZ_Warning(s_builderName, false, "Found multiple bitangent data sets. Only the first will be used.");
+                    AZ_Warning(s_builderName, false,
+                        "Found multiple bitangent data sets for mesh '%s'. Only the first will be used.",
+                        content.m_name.GetCStr());
                 }
             }
             else if (azrtti_istypeof<MaterialData>(data.get()))
diff --git a/Gems/AtomLyIntegration/AtomBridge/Code/Source/Editor/AssetCollectionAsyncLoaderTestComponent.cpp b/Gems/AtomLyIntegration/AtomBridge/Code/Source/Editor/AssetCollectionAsyncLoaderTestComponent.cpp
index 97d62816c9..08f3d8cf9e 100644
--- a/Gems/AtomLyIntegration/AtomBridge/Code/Source/Editor/AssetCollectionAsyncLoaderTestComponent.cpp
+++ b/Gems/AtomLyIntegration/AtomBridge/Code/Source/Editor/AssetCollectionAsyncLoaderTestComponent.cpp
@@ -44,7 +44,7 @@ namespace AZ
                         ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                             ->Attribute(AZ::Edit::Attributes::Category, "Test")
                             ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Comment.svg")
-                            ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Comment.png")
+                            ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Comment.svg")
                             ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZStd::vector<AZ::Crc32>({ AZ_CRC("Level", 0x9aeacc13), AZ_CRC("Game", 0x232b318c), AZ_CRC("Layer", 0xe4db211a) }))
                             ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                         ->DataElement(AZ::Edit::UIHandlers::LineEdit, &AssetCollectionAsyncLoaderTestComponent::m_pathToAssetListJson, "", "Path To Asset List")
diff --git a/Gems/AtomLyIntegration/AtomBridge/Code/Source/FlyCameraInputComponent.cpp b/Gems/AtomLyIntegration/AtomBridge/Code/Source/FlyCameraInputComponent.cpp
index d67e8b513d..e6439592b3 100644
--- a/Gems/AtomLyIntegration/AtomBridge/Code/Source/FlyCameraInputComponent.cpp
+++ b/Gems/AtomLyIntegration/AtomBridge/Code/Source/FlyCameraInputComponent.cpp
@@ -101,8 +101,8 @@ void FlyCameraInputComponent::Reflect(AZ::ReflectContext* reflection)
             editContext->Class<FlyCameraInputComponent>("Fly Camera Input", "The Fly Camera Input allows you to control the camera")
                 ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                 ->Attribute("Category", "Gameplay")
-                ->Attribute("Icon", "Icons/Components/CameraRig.svg")
-                ->Attribute("ViewportIcon", "Icons/Components/Viewport/CameraRig.png")
+                ->Attribute("Icon", "Icons/Components/FlyCameraInput.svg")
+                ->Attribute("ViewportIcon", "Icons/Components/Viewport/FlyCameraInput.svg")
                 ->Attribute("AutoExpand", true)
                 ->Attribute("AppearsInAddComponentMenu", AZ_CRC("Game", 0x232b318c))
                 ->DataElement(0, &FlyCameraInputComponent::m_moveSpeed, "Move Speed", "Speed at which the camera moves")
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Animation/EditorAttachmentComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Animation/EditorAttachmentComponent.cpp
index 8b96ee657c..878eb51efb 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Animation/EditorAttachmentComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Animation/EditorAttachmentComponent.cpp
@@ -65,7 +65,7 @@ namespace AZ
                         ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                         ->Attribute(AZ::Edit::Attributes::Category, "Animation")
                         ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Attachment.svg")
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Attachment.png")
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Attachment.svg")
                         ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                         ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                         ->Attribute(
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/EditorAreaLightComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/EditorAreaLightComponent.cpp
index c577737adc..b58ca6448a 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/EditorAreaLightComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/EditorAreaLightComponent.cpp
@@ -45,8 +45,8 @@ namespace AZ
                         "Light", "A light which emits from a point or goemetric shape.")
                         ->ClassElement(Edit::ClassElements::EditorData, "")
                             ->Attribute(Edit::Attributes::Category, "Atom")
-                            ->Attribute(Edit::Attributes::Icon, "Icons/Components/Component_Placeholder.svg")
-                            ->Attribute(Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Component_Placeholder.png")
+                            ->Attribute(Edit::Attributes::Icon, "Icons/Components/AreaLight.svg")
+                            ->Attribute(Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/AreaLight.svg")
                             ->Attribute(Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                             ->Attribute(Edit::Attributes::AutoExpand, true)
                             ->Attribute(Edit::Attributes::HelpPageURL, "https://o3de.org/docs/user-guide/components/reference/atom/area-light/")
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/EditorDirectionalLightComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/EditorDirectionalLightComponent.cpp
index eb68fc46ed..dced9314b7 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/EditorDirectionalLightComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/EditorDirectionalLightComponent.cpp
@@ -41,7 +41,7 @@ namespace AZ
                         ->ClassElement(Edit::ClassElements::EditorData, "")
                         ->Attribute(Edit::Attributes::Category, "Atom")
                         ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Component_Placeholder.svg") // [GFX TODO][ATOM-1998] create icons.
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Component_Placeholder.png") // [GFX TODO][ATOM-1998] create icons.
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Component_Placeholder.svg") // [GFX TODO][ATOM-1998] create icons.
                         ->Attribute(Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                         ->Attribute(Edit::Attributes::AutoExpand, true)
                         ->Attribute(Edit::Attributes::HelpPageURL, "https://") // [GFX TODO][ATOM-1998] create page
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Decals/EditorDecalComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Decals/EditorDecalComponent.cpp
index f99148d7db..c10e7e2e30 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Decals/EditorDecalComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Decals/EditorDecalComponent.cpp
@@ -35,8 +35,8 @@ namespace AZ
                         "Decal (Atom)", "The Decal component allows an entity to project a texture or material onto a mesh")
                         ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                         ->Attribute(AZ::Edit::Attributes::Category, "Atom")
-                        ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Component_Placeholder.svg")
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Component_Placeholder.png")
+                        ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Decal.svg")
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Decal.svg")
                         ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC_CE("Game"))
                         ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                         ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://o3de.org/docs/user-guide/components/reference/atom/decal/")
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/EditorDiffuseGlobalIlluminationComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/EditorDiffuseGlobalIlluminationComponent.cpp
index 5f9d21efc9..f6ae78a31d 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/EditorDiffuseGlobalIlluminationComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/EditorDiffuseGlobalIlluminationComponent.cpp
@@ -31,7 +31,7 @@ namespace AZ
                         ->ClassElement(Edit::ClassElements::EditorData, "")
                         ->Attribute(Edit::Attributes::Category, "Atom")
                         ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Component_Placeholder.svg")
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Component_Placeholder.png")
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Component_Placeholder.svg")
                         ->Attribute(Edit::Attributes::AppearsInAddComponentMenu, AZStd::vector<AZ::Crc32>({ AZ_CRC("Level", 0x9aeacc13) }))
                         ->Attribute(Edit::Attributes::AutoExpand, true)
                         ->Attribute(Edit::Attributes::HelpPageURL, "https://")
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/EditorDiffuseProbeGridComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/EditorDiffuseProbeGridComponent.cpp
index ee25afb1ee..013a8ee1b4 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/EditorDiffuseProbeGridComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/EditorDiffuseProbeGridComponent.cpp
@@ -50,7 +50,7 @@ namespace AZ
                         ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                             ->Attribute(AZ::Edit::Attributes::Category, "Atom")
                             ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Component_Placeholder.svg")
-                            ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Component_Placeholder.png")
+                            ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Component_Placeholder.svg")
                             ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                             ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                             ->Attribute(AZ::Edit::Attributes::PrimaryAssetType, AZ::AzTypeInfo<RPI::ModelAsset>::Uuid())
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Grid/EditorGridComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Grid/EditorGridComponent.cpp
index 368876b8e1..76f198852e 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Grid/EditorGridComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Grid/EditorGridComponent.cpp
@@ -31,7 +31,7 @@ namespace AZ
                         ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                             ->Attribute(AZ::Edit::Attributes::Category, "Atom")
                             ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Component_Placeholder.svg")
-                            ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Component_Placeholder.png")
+                            ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Component_Placeholder.svg")
                             ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                             ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                             ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://o3de.org/docs/user-guide/components/reference/atom/")
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ImageBasedLights/EditorImageBasedLightComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ImageBasedLights/EditorImageBasedLightComponent.cpp
index 97a2a5f53d..0547da6240 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ImageBasedLights/EditorImageBasedLightComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ImageBasedLights/EditorImageBasedLightComponent.cpp
@@ -31,7 +31,7 @@ namespace AZ
                         ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                             ->Attribute(AZ::Edit::Attributes::Category, "Atom")
                             ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Component_Placeholder.svg")
-                            ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Component_Placeholder.png")
+                            ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Component_Placeholder.svg")
                             ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                             ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                             ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://o3de.org/docs/user-guide/components/reference/atom/")
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponent.cpp
index 893319de46..d7dc4335b3 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponent.cpp
@@ -134,7 +134,7 @@ namespace AZ
                         ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                             ->Attribute(AZ::Edit::Attributes::Category, "Atom")
                             ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Component_Placeholder.svg")
-                            ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Component_Placeholder.png")
+                            ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Component_Placeholder.svg")
                             ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                             ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                             ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://o3de.org/docs/user-guide/components/reference/atom/")
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Mesh/EditorMeshComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Mesh/EditorMeshComponent.cpp
index a4a0a9f6b6..fc62690cc4 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Mesh/EditorMeshComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Mesh/EditorMeshComponent.cpp
@@ -44,8 +44,8 @@ namespace AZ
                         "Mesh", "The mesh component is the primary method of adding visual geometry to entities")
                         ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                             ->Attribute(AZ::Edit::Attributes::Category, "Atom")
-                            ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Component_Placeholder.svg")
-                            ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Component_Placeholder.png")
+                            ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Mesh.svg")
+                            ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Mesh.svg")
                             ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                             ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                             ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://o3de.org/docs/user-guide/components/reference/atom/")
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/OcclusionCullingPlane/EditorOcclusionCullingPlaneComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/OcclusionCullingPlane/EditorOcclusionCullingPlaneComponent.cpp
index 853c00db33..3908aafe89 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/OcclusionCullingPlane/EditorOcclusionCullingPlaneComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/OcclusionCullingPlane/EditorOcclusionCullingPlaneComponent.cpp
@@ -34,7 +34,7 @@ namespace AZ
                         ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                             ->Attribute(AZ::Edit::Attributes::Category, "Atom")
                             ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Component_Placeholder.svg")
-                            ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Component_Placeholder.png")
+                            ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Component_Placeholder.svg")
                             ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                             ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                         ;
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/Bloom/EditorBloomComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/Bloom/EditorBloomComponent.cpp
index b82d17cf2c..22c8e2dceb 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/Bloom/EditorBloomComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/Bloom/EditorBloomComponent.cpp
@@ -29,7 +29,7 @@ namespace AZ
                         ->ClassElement(Edit::ClassElements::EditorData, "")
                         ->Attribute(Edit::Attributes::Category, "Atom")
                         ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Component_Placeholder.svg") // [GFX TODO ATOM-2672][PostFX] need to create icons for PostProcessing.
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Component_Placeholder.png") // [GFX TODO ATOM-2672][PostFX] need to create icons for PostProcessing.
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Component_Placeholder.svg") // [GFX TODO ATOM-2672][PostFX] need to create icons for PostProcessing.
                         ->Attribute(Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                         ->Attribute(Edit::Attributes::AutoExpand, true)
                         ->Attribute(Edit::Attributes::HelpPageURL, "https://") // [TODO ATOM-2672][PostFX] need create page for PostProcessing.
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/DepthOfField/EditorDepthOfFieldComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/DepthOfField/EditorDepthOfFieldComponent.cpp
index fa862fa852..b3f77b1b8f 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/DepthOfField/EditorDepthOfFieldComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/DepthOfField/EditorDepthOfFieldComponent.cpp
@@ -29,7 +29,7 @@ namespace AZ
                         ->ClassElement(Edit::ClassElements::EditorData, "")
                         ->Attribute(Edit::Attributes::Category, "Atom")
                         ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Component_Placeholder.svg") // [GFX TODO ATOM-2672][PostFX] need to create icons for PostProcessing.
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Component_Placeholder.png") // [GFX TODO ATOM-2672][PostFX] need to create icons for PostProcessing.y 
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Component_Placeholder.svg") // [GFX TODO ATOM-2672][PostFX] need to create icons for PostProcessing.y 
                         ->Attribute(Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                         ->Attribute(Edit::Attributes::AutoExpand, true)
                         ->Attribute(Edit::Attributes::HelpPageURL, "https://") // [GFX TODO][ATOM-2672][PostFX] need create page for PostProcessing.
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/DisplayMapper/EditorDisplayMapperComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/DisplayMapper/EditorDisplayMapperComponent.cpp
index 451155dc11..d06bc981fe 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/DisplayMapper/EditorDisplayMapperComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/DisplayMapper/EditorDisplayMapperComponent.cpp
@@ -30,7 +30,7 @@ namespace AZ
                         ->ClassElement(Edit::ClassElements::EditorData, "")
                         ->Attribute(Edit::Attributes::Category, "Atom")
                         ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Component_Placeholder.svg") // [GFX TODO][ATOM-2672][PostFX] need to create icons for PostProcessing.
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Component_Placeholder.png") // [GFX TODO][ATOM-2672][PostFX] need to create icons for PostProcessing.
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Component_Placeholder.svg") // [GFX TODO][ATOM-2672][PostFX] need to create icons for PostProcessing.
                         ->Attribute(Edit::Attributes::AppearsInAddComponentMenu, AZStd::vector<AZ::Crc32>({ AZ_CRC("Level", 0x9aeacc13), AZ_CRC("Game", 0x232b318c) }))
                         ->Attribute(Edit::Attributes::AutoExpand, true)
                         ->Attribute(Edit::Attributes::HelpPageURL, "https://") // [GFX TODO][ATOM-2672][PostFX] need to create page for PostProcessing.
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/EditorPostFxLayerComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/EditorPostFxLayerComponent.cpp
index 1172215ce4..344c5f8edd 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/EditorPostFxLayerComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/EditorPostFxLayerComponent.cpp
@@ -29,7 +29,7 @@ namespace AZ
                         ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                             ->Attribute(AZ::Edit::Attributes::Category, "Atom")
                             ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Component_Placeholder.svg")
-                            ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Component_Placeholder.png")
+                            ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Component_Placeholder.svg")
                             ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                             ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                             ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://o3de.org/docs/user-guide/components/reference/atom/")
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/ExposureControl/EditorExposureControlComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/ExposureControl/EditorExposureControlComponent.cpp
index 895ba71d0f..5bf3e0ec9c 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/ExposureControl/EditorExposureControlComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/ExposureControl/EditorExposureControlComponent.cpp
@@ -29,7 +29,7 @@ namespace AZ
                         ->ClassElement(Edit::ClassElements::EditorData, "")
                         ->Attribute(Edit::Attributes::Category, "Atom")
                         ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Component_Placeholder.svg") // [GFX TODO ATOM-2672][PostFX] need to create icons for PostProcessing.
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Component_Placeholder.png") // [GFX TODO ATOM-2672][PostFX] need to create icons for PostProcessing.
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Component_Placeholder.svg") // [GFX TODO ATOM-2672][PostFX] need to create icons for PostProcessing.
                         ->Attribute(Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                         ->Attribute(Edit::Attributes::AutoExpand, true)
                         ->Attribute(Edit::Attributes::HelpPageURL, "https://") // [TODO ATOM-2672][PostFX] need create page for PostProcessing.
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/GradientWeightModifier/EditorGradientWeightModifierComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/GradientWeightModifier/EditorGradientWeightModifierComponent.cpp
index 756ae850c2..86b5ad554a 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/GradientWeightModifier/EditorGradientWeightModifierComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/GradientWeightModifier/EditorGradientWeightModifierComponent.cpp
@@ -29,7 +29,7 @@ namespace AZ
                         ->ClassElement(Edit::ClassElements::EditorData, "")
                         ->Attribute(Edit::Attributes::Category, "Atom")
                         ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Component_Placeholder.svg")
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Component_Placeholder.png")
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Component_Placeholder.svg")
                         ->Attribute(Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                         ->Attribute(Edit::Attributes::AutoExpand, true)
                         ->Attribute(Edit::Attributes::HelpPageURL, "")
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/LookModification/EditorLookModificationComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/LookModification/EditorLookModificationComponent.cpp
index a6439e33e5..a7dfb76e95 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/LookModification/EditorLookModificationComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/LookModification/EditorLookModificationComponent.cpp
@@ -29,7 +29,7 @@ namespace AZ
                         ->ClassElement(Edit::ClassElements::EditorData, "")
                         ->Attribute(Edit::Attributes::Category, "Atom")
                         ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Component_Placeholder.svg") // [GFX TODO ATOM-2672][PostFX] need to create icons for PostProcessing.
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Component_Placeholder.png") // [GFX TODO ATOM-2672][PostFX] need to create icons for PostProcessing.
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Component_Placeholder.svg") // [GFX TODO ATOM-2672][PostFX] need to create icons for PostProcessing.
                         ->Attribute(Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                         ->Attribute(Edit::Attributes::AutoExpand, true)
                         ->Attribute(Edit::Attributes::HelpPageURL, "https://") // [TODO ATOM-2672][PostFX] need to create page for PostProcessing.
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/RadiusWeightModifier/EditorRadiusWeightModifierComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/RadiusWeightModifier/EditorRadiusWeightModifierComponent.cpp
index e7136b6838..039255276c 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/RadiusWeightModifier/EditorRadiusWeightModifierComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/RadiusWeightModifier/EditorRadiusWeightModifierComponent.cpp
@@ -29,7 +29,7 @@ namespace AZ
                         ->ClassElement(Edit::ClassElements::EditorData, "")
                         ->Attribute(Edit::Attributes::Category, "Atom")
                         ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Component_Placeholder.svg")
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Component_Placeholder.png")
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Component_Placeholder.svg")
                         ->Attribute(Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                         ->Attribute(Edit::Attributes::AutoExpand, true)
                         ->Attribute(Edit::Attributes::HelpPageURL, "")
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/ShapeWeightModifier/EditorShapeWeightModifierComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/ShapeWeightModifier/EditorShapeWeightModifierComponent.cpp
index 9e6acdd8ce..46de0f0c68 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/ShapeWeightModifier/EditorShapeWeightModifierComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/ShapeWeightModifier/EditorShapeWeightModifierComponent.cpp
@@ -29,7 +29,7 @@ namespace AZ
                         ->ClassElement(Edit::ClassElements::EditorData, "")
                         ->Attribute(Edit::Attributes::Category, "Atom")
                         ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Component_Placeholder.svg")
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Component_Placeholder.png")
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Component_Placeholder.svg")
                         ->Attribute(Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                         ->Attribute(Edit::Attributes::AutoExpand, true)
                         ->Attribute(Edit::Attributes::HelpPageURL, "")
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/Ssao/EditorSsaoComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/Ssao/EditorSsaoComponent.cpp
index cf090b2b5b..b018ac7a54 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/Ssao/EditorSsaoComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/Ssao/EditorSsaoComponent.cpp
@@ -29,7 +29,7 @@ namespace AZ
                         ->ClassElement(Edit::ClassElements::EditorData, "")
                             ->Attribute(Edit::Attributes::Category, "Atom")
                             ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Component_Placeholder.svg") // [GFX TODO ATOM-2672][PostFX] need to create icons for PostProcessing.
-                            ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Component_Placeholder.png") // [GFX TODO ATOM-2672][PostFX] need to create icons for PostProcessing.
+                            ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Component_Placeholder.svg") // [GFX TODO ATOM-2672][PostFX] need to create icons for PostProcessing.
                             ->Attribute(Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC_CE("Game"))
                             ->Attribute(Edit::Attributes::AutoExpand, true)
                             ->Attribute(Edit::Attributes::HelpPageURL, "https://") // [GFX TODO][ATOM-2672][PostFX] need create page for PostProcessing.
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ReflectionProbe/EditorReflectionProbeComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ReflectionProbe/EditorReflectionProbeComponent.cpp
index 5909e51552..4f4f21ab0f 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ReflectionProbe/EditorReflectionProbeComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ReflectionProbe/EditorReflectionProbeComponent.cpp
@@ -47,7 +47,7 @@ namespace AZ
                         ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                             ->Attribute(AZ::Edit::Attributes::Category, "Atom")
                             ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Component_Placeholder.svg")
-                            ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Component_Placeholder.png")
+                            ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Component_Placeholder.svg")
                             ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                             ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                             ->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::ShowChildrenOnly)
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ScreenSpace/EditorDeferredFogComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ScreenSpace/EditorDeferredFogComponent.cpp
index 3bdc661f07..208747abaa 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ScreenSpace/EditorDeferredFogComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ScreenSpace/EditorDeferredFogComponent.cpp
@@ -29,7 +29,7 @@ namespace AZ
                         ->ClassElement(Edit::ClassElements::EditorData, "")
                         ->Attribute(Edit::Attributes::Category, "Atom")
                         ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Component_Placeholder.svg") // [GFX TODO ATOM-2672][PostFX] need to create icons for PostProcessing.
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Component_Placeholder.png") // [GFX TODO ATOM-2672][PostFX] need to create icons for PostProcessing.
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Component_Placeholder.svg") // [GFX TODO ATOM-2672][PostFX] need to create icons for PostProcessing.
                         ->Attribute(Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                         ->Attribute(Edit::Attributes::AutoExpand, true)
                         ->Attribute(Edit::Attributes::HelpPageURL, "https://") // [TODO][ATOM-13427] Create Wiki for Deferred Fog
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Scripting/EditorEntityReferenceComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Scripting/EditorEntityReferenceComponent.cpp
index a8fbc4be6d..65491a9833 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Scripting/EditorEntityReferenceComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Scripting/EditorEntityReferenceComponent.cpp
@@ -28,7 +28,7 @@ namespace AZ
                         ->ClassElement(Edit::ClassElements::EditorData, "")
                         ->Attribute(Edit::Attributes::Category, "Atom")
                         ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Component_Placeholder.svg")
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Component_Placeholder.png")
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Component_Placeholder.svg")
                         ->Attribute(Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                         ->Attribute(Edit::Attributes::AutoExpand, true)
                         ->Attribute(Edit::Attributes::HelpPageURL, "")
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyBox/EditorHDRiSkyboxComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyBox/EditorHDRiSkyboxComponent.cpp
index 6b9c33a90c..a0ffb4e509 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyBox/EditorHDRiSkyboxComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyBox/EditorHDRiSkyboxComponent.cpp
@@ -29,7 +29,7 @@ namespace AZ
                         ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                             ->Attribute(AZ::Edit::Attributes::Category, "Atom")
                             ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Component_Placeholder.svg")
-                            ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Component_Placeholder.png")
+                            ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Component_Placeholder.svg")
                             ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                             ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                             ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://o3de.org/docs/user-guide/components/reference/atom/")
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyBox/EditorPhysicalSkyComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyBox/EditorPhysicalSkyComponent.cpp
index 878be0482b..28cb4121cf 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyBox/EditorPhysicalSkyComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyBox/EditorPhysicalSkyComponent.cpp
@@ -29,7 +29,7 @@ namespace AZ
                         ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                             ->Attribute(AZ::Edit::Attributes::Category, "Atom")
                             ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Component_Placeholder.svg")
-                            ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Component_Placeholder.png")
+                            ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Component_Placeholder.svg")
                             ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                             ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                             ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://o3de.org/docs/user-guide/components/reference/atom/")
diff --git a/Gems/Camera/Assets/Editor/Icons/Components/Camera.svg b/Gems/Camera/Assets/Editor/Icons/Components/Camera.svg
index cfd94b793e..fd7465a2ac 100644
--- a/Gems/Camera/Assets/Editor/Icons/Components/Camera.svg
+++ b/Gems/Camera/Assets/Editor/Icons/Components/Camera.svg
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
     <title>icon / Gameplay / Camera / Camera </title>
-    <desc>Created with Sketch.</desc>
     <g id="icon-/-Gameplay-/-Camera-/-Camera-" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <path d="M15.6176679,16.8558918 C15.6176679,17.1754334 15.3209507,17.7460435 14.6818674,17.7460435 C14.0427841,17.7460435 4.02287111,17.7802801 3.72615387,17.7802801 C3.23542921,17.7802801 2.72188014,17.3580286 2.72188014,16.6048233 C2.72188014,16.1939841 2.73712684,11.6215257 2.73712684,11.2563353 C2.73712684,10.6629008 2.74470454,10.3509369 3.31531462,10.3509369 C3.88592469,10.3509369 14.6932796,10.3281125 14.6932796,10.3281125 C15.4236605,10.3281125 15.6290801,10.8416615 15.6290801,11.2753252 C15.6290801,11.7089889 15.6176679,16.5363501 15.6176679,16.8558918 L15.6176679,16.8558918 Z M4.37664936,6.72185678 C4.37664936,6.52784935 4.37664936,6.33384193 4.53642018,6.33384193 L13.4265252,6.33384193 C13.643357,6.33384193 13.8944255,6.37949073 13.8944255,6.61914697 C13.8944255,6.8588032 13.8830133,8.59345784 13.8830133,8.59345784 L4.37281486,8.56305573 L4.37664936,6.72185678 Z M22.3965156,10.2139905 L21.6661347,10.2254027 L19.5434652,12.0855915 L18.9956796,12.0855915 C18.9956796,12.0855915 17.5805666,9.64338038 17.4207957,9.32383874 C17.2610249,9.00429709 16.7360636,8.63910664 16.4849952,8.63910664 L15.0698822,8.63910664 C15.0698822,8.63910664 15.0470578,6.28819312 15.0470578,5.87735387 C15.0470578,5.46651461 14.659043,5.14697297 14.1569061,5.14697297 L3.84027589,5.14697297 C3.37995333,5.14697297 3.13271939,5.4094536 3.13271939,5.72516075 L3.13271939,8.54780903 C2.71357205,8.55602581 2.62400909,8.55538673 2.37951409,8.55538673 C1.82415071,8.55538673 1.58065998,8.76080636 1.58065998,9.57490717 L1.58065998,17.5406239 C1.58065998,18.4650122 2.04856024,18.853027 2.75611674,18.853027 C3.2126048,18.853027 15.6404923,18.8416148 16.2795756,18.8416148 C16.9186589,18.8416148 17.1925517,18.2938292 17.4207957,17.9971119 C17.6490398,17.7003947 19.0641528,15.3723056 19.0641528,15.3723056 L19.703236,15.3494812 L21.7688445,17.2439066 L22.41934,17.2439066 L22.3965156,10.2139905 Z" id="Icon" fill="#65C98C"></path>
     </g>
-</svg>
+</svg>
\ No newline at end of file
diff --git a/Gems/Camera/Assets/Editor/Icons/Components/Viewport/Camera.png b/Gems/Camera/Assets/Editor/Icons/Components/Viewport/Camera.png
deleted file mode 100644
index 3f5a572983..0000000000
--- a/Gems/Camera/Assets/Editor/Icons/Components/Viewport/Camera.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9de8e4084f9a76300fd582543133a080edc16f912a0f31843edf75257c496b10
-size 4089
diff --git a/Gems/Camera/Assets/Editor/Icons/Components/Viewport/Camera.svg b/Gems/Camera/Assets/Editor/Icons/Components/Viewport/Camera.svg
new file mode 100644
index 0000000000..ef4620775a
--- /dev/null
+++ b/Gems/Camera/Assets/Editor/Icons/Components/Viewport/Camera.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Gameplay / Camera / Camera - box</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
+            <stop stop-color="#9D9D9D" offset="100%"></stop>
+        </linearGradient>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
+    </defs>
+    <g id="icon-/-Gameplay-/-Camera-/-Camera---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/general/color/-box-template">
+            <mask id="mask-3" fill="white">
+                <use xlink:href="#path-2"></use>
+            </mask>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#65C98C">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="Rectangle-2" x="0" y="0" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+        <path d="M15.6176679,16.8558918 C15.6176679,17.1754334 15.3209507,17.7460435 14.6818674,17.7460435 C14.0427841,17.7460435 4.02287111,17.7802801 3.72615387,17.7802801 C3.23542921,17.7802801 2.72188014,17.3580286 2.72188014,16.6048233 C2.72188014,16.1939841 2.73712684,11.6215257 2.73712684,11.2563353 C2.73712684,10.6629008 2.74470454,10.3509369 3.31531462,10.3509369 C3.88592469,10.3509369 14.6932796,10.3281125 14.6932796,10.3281125 C15.4236605,10.3281125 15.6290801,10.8416615 15.6290801,11.2753252 C15.6290801,11.7089889 15.6176679,16.5363501 15.6176679,16.8558918 L15.6176679,16.8558918 Z M4.37664936,6.72185678 C4.37664936,6.52784935 4.37664936,6.33384193 4.53642018,6.33384193 L13.4265252,6.33384193 C13.643357,6.33384193 13.8944255,6.37949073 13.8944255,6.61914697 C13.8944255,6.8588032 13.8830133,8.59345784 13.8830133,8.59345784 L4.37281486,8.56305573 L4.37664936,6.72185678 Z M22.3965156,10.2139905 L21.6661347,10.2254027 L19.5434652,12.0855915 L18.9956796,12.0855915 C18.9956796,12.0855915 17.5805666,9.64338038 17.4207957,9.32383874 C17.2610249,9.00429709 16.7360636,8.63910664 16.4849952,8.63910664 L15.0698822,8.63910664 C15.0698822,8.63910664 15.0470578,6.28819312 15.0470578,5.87735387 C15.0470578,5.46651461 14.659043,5.14697297 14.1569061,5.14697297 L3.84027589,5.14697297 C3.37995333,5.14697297 3.13271939,5.4094536 3.13271939,5.72516075 L3.13271939,8.54780903 C2.71357205,8.55602581 2.62400909,8.55538673 2.37951409,8.55538673 C1.82415071,8.55538673 1.58065998,8.76080636 1.58065998,9.57490717 L1.58065998,17.5406239 C1.58065998,18.4650122 2.04856024,18.853027 2.75611674,18.853027 C3.2126048,18.853027 15.6404923,18.8416148 16.2795756,18.8416148 C16.9186589,18.8416148 17.1925517,18.2938292 17.4207957,17.9971119 C17.6490398,17.7003947 19.0641528,15.3723056 19.0641528,15.3723056 L19.703236,15.3494812 L21.7688445,17.2439066 L22.41934,17.2439066 L22.3965156,10.2139905 Z" id="Icon" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Gems/Camera/Code/Source/EditorCameraComponent.cpp b/Gems/Camera/Code/Source/EditorCameraComponent.cpp
index dfa662f206..beed4d7097 100644
--- a/Gems/Camera/Code/Source/EditorCameraComponent.cpp
+++ b/Gems/Camera/Code/Source/EditorCameraComponent.cpp
@@ -105,7 +105,7 @@ namespace Camera
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                         ->Attribute(AZ::Edit::Attributes::Category, "Camera")
                         ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/Camera.svg")
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Viewport/Camera.png")
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Viewport/Camera.svg")
                         ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                         ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                         ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://o3de.org/docs/user-guide/components/reference/camera/")
diff --git a/Gems/CameraFramework/Assets/Editor/Icons/Components/FlyCameraInput.svg b/Gems/CameraFramework/Assets/Editor/Icons/Components/FlyCameraInput.svg
new file mode 100644
index 0000000000..bccf8c1875
--- /dev/null
+++ b/Gems/CameraFramework/Assets/Editor/Icons/Components/FlyCameraInput.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Gameplay / FlyCameraInput</title>
+    <g id="icon-/-Gameplay-/-FlyCameraInput" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M15.8188933,18.2363689 C14.9516629,19.4776061 13.5122338,20.2895089 11.8831747,20.2895089 C10.3097325,20.2895089 8.91319324,19.5320973 8.03826474,18.3619817 L8.03826474,21.3741524 C6.98351751,21.1581981 6.45614389,20.8349335 6.45614389,20.4043586 C6.45614389,20.3499404 6.45205947,20.3003249 6.44389062,20.2555121 L6.44389947,18.0045092 C6.44389947,17.9011687 6.33197065,17.8173947 6.19389947,17.8173947 C6.05582828,17.8173947 5.94389947,17.9011687 5.94389947,18.0045092 L5.94389947,19.9166519 C5.04689627,19.7177182 4.58037028,19.4146469 4.5443215,19.007438 C4.54878599,18.9934435 4.55114989,18.9788387 4.55114989,18.9638207 L4.55114989,17.2517236 C4.55114989,17.1483831 4.43922107,17.0646091 4.30114989,17.0646091 C4.1630787,17.0646091 4.05114989,17.1483831 4.05114989,17.2517236 L4.05114989,18.6606985 C2.9931178,18.543785 2.46410175,18.2108283 2.46410175,17.6618285 L2.46410175,16.1621215 L5.79609849,16.1621215 L5.79609849,10.6370635 C5.79609849,9.32106479 6.95789293,8.14780584 8.45302205,8.14780584 L9.6010843,8.1600564 L9.6010843,8.14780584 C9.72215132,8.15198278 9.84121495,8.1560663 9.95827518,8.1600564 L9.95827518,6.24554261 C9.95827518,5.93696939 10.0600343,5.71916618 10.4513035,5.71916618 L11.5368802,5.71916618 L11.5368802,4.6910747 C11.2474459,4.52023964 11.1027287,4.38138711 11.1027287,4.27451709 C10.6685771,4.27451709 8.285557,4.6910747 6.45568591,4.6910747 C4.62581481,4.6910747 1.80384317,4.40195664 1.80384317,3.79634897 C1.80384317,3.1907413 5.26938946,3.00041587 6.45568591,3.00041587 C7.64198235,3.00041587 10.7945781,3.29787293 11.1027287,3.3522236 C11.1027287,2.99131666 11.500409,2.752151 11.8832179,2.66387774 C11.8844693,2.65002951 11.8857748,2.63735279 11.8871343,2.62584757 C11.9364301,2.62584757 11.9884925,2.62917618 12.0420742,2.63574525 C12.0956559,2.62917618 12.1477183,2.62584757 12.1970141,2.62584757 C12.1983736,2.63735279 12.1996791,2.65002951 12.2009305,2.66387774 C12.5837395,2.752151 12.9814197,2.99131666 12.9814197,3.3522236 C13.2895703,3.29787293 15.8038739,3.00041587 16.9901703,3.00041587 C18.1764668,3.00041587 22.1961568,3.1907413 22.1961568,3.79634897 C22.1961568,4.40195664 18.8200414,4.6910747 16.9901703,4.6910747 C15.1602992,4.6910747 13.4155713,4.27451709 12.9814197,4.27451709 C12.9814197,4.38138711 12.8367026,4.52023964 12.5472682,4.6910747 L12.5472682,5.71916618 L13.307082,5.71916618 C13.5972489,5.75658332 13.8080743,5.86130235 13.8080743,6.15202309 L13.8080743,8.17406982 C14.2018844,8.18254367 14.5048343,8.18678059 14.7169241,8.18678059 C15.7729925,8.18678059 18.0091976,9.0012304 18.0091976,11.7279125 L18.0091976,16.1621215 L21.3930563,16.1621215 L21.3930563,17.6618285 C21.3930563,18.2108283 20.8640403,18.543785 19.8060082,18.6606985 L19.8060082,17.2517236 C19.8060082,17.1483831 19.6940794,17.0646091 19.5560082,17.0646091 C19.417937,17.0646091 19.3060082,17.1483831 19.3060082,17.2517236 L19.3060082,18.9638207 C19.3060082,18.9788387 19.3083721,18.9934435 19.3128366,19.007438 C19.2767878,19.4146469 18.8102618,19.7177182 17.9132586,19.9166519 L17.9132586,18.0045092 C17.9132586,17.9011687 17.8013298,17.8173947 17.6632586,17.8173947 C17.5251874,17.8173947 17.4132586,17.9011687 17.4132586,18.0045092 L17.4132674,20.2555121 C17.4050986,20.3003249 17.4010142,20.3499404 17.4010142,20.4043586 C17.4010142,20.8349335 16.8736406,21.1581981 15.8188933,21.3741524 L15.8188933,18.2363689 L15.8188933,18.2363689 Z M15.8485796,16.5914183 C15.8614081,16.5604747 15.8784859,16.5286344 15.8999901,16.4969467 C16.2244581,15.8829401 16.4081718,15.1830654 16.4081718,14.4402821 C16.4081718,12.0057161 14.434566,10.0321104 12,10.0321104 C9.56543395,10.0321104 7.59182822,12.0057161 7.59182822,14.4402821 C7.59182822,16.8748482 9.56543395,18.8484539 12,18.8484539 C13.653408,18.8484539 15.0942075,17.938169 15.8485796,16.5914183 L15.8485796,16.5914183 Z M12,17.2824249 C10.4303279,17.2824249 9.15785719,16.0099543 9.15785719,14.4402821 C9.15785719,12.87061 10.4303279,11.5981393 12,11.5981393 C13.5696721,11.5981393 14.8421428,12.87061 14.8421428,14.4402821 C14.8421428,16.0099543 13.5696721,17.2824249 12,17.2824249 Z M10.8113831,12.6584181 C10.1192603,13.0965402 9.83596864,13.6163018 9.75722646,14.0800382 C9.67848428,14.5437746 9.88389697,14.8478193 10.0495597,15.0145537 C10.2152223,15.1812882 10.4999138,15.2197089 10.7696854,15.0145537 C11.039457,14.8093986 11.4376344,14.4290528 11.7721144,14.2262875 C12.1065944,14.0235222 12.8009231,13.7259922 13.0344341,13.6524599 C13.2679451,13.5789276 13.6721929,13.3557907 13.4166682,12.9000743 C13.1611434,12.4443579 12.7572207,12.3365345 12.3554749,12.2697229 C11.9537291,12.2029114 11.5035059,12.220296 10.8113831,12.6584181 Z" id="Shape" fill="#65C98C"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Gems/CameraFramework/Assets/Editor/Icons/Components/Viewport/FlyCameraInput.svg b/Gems/CameraFramework/Assets/Editor/Icons/Components/Viewport/FlyCameraInput.svg
new file mode 100644
index 0000000000..0a4f5f9b97
--- /dev/null
+++ b/Gems/CameraFramework/Assets/Editor/Icons/Components/Viewport/FlyCameraInput.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Gameplay / FlyCameraInput - box</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
+            <stop stop-color="#9D9D9D" offset="100%"></stop>
+        </linearGradient>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
+    </defs>
+    <g id="icon-/-Gameplay-/-FlyCameraInput---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/general/color/-box-template">
+            <mask id="mask-3" fill="white">
+                <use xlink:href="#path-2"></use>
+            </mask>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#65C98C">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="Rectangle-2" x="0" y="0" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+        <path d="M15.8188933,18.2363689 C14.9516629,19.4776061 13.5122338,20.2895089 11.8831747,20.2895089 C10.3097325,20.2895089 8.91319324,19.5320973 8.03826474,18.3619817 L8.03826474,21.3741524 C6.98351751,21.1581981 6.45614389,20.8349335 6.45614389,20.4043586 C6.45614389,20.3499404 6.45205947,20.3003249 6.44389062,20.2555121 L6.44389947,18.0045092 C6.44389947,17.9011687 6.33197065,17.8173947 6.19389947,17.8173947 C6.05582828,17.8173947 5.94389947,17.9011687 5.94389947,18.0045092 L5.94389947,19.9166519 C5.04689627,19.7177182 4.58037028,19.4146469 4.5443215,19.007438 C4.54878599,18.9934435 4.55114989,18.9788387 4.55114989,18.9638207 L4.55114989,17.2517236 C4.55114989,17.1483831 4.43922107,17.0646091 4.30114989,17.0646091 C4.1630787,17.0646091 4.05114989,17.1483831 4.05114989,17.2517236 L4.05114989,18.6606985 C2.9931178,18.543785 2.46410175,18.2108283 2.46410175,17.6618285 L2.46410175,16.1621215 L5.79609849,16.1621215 L5.79609849,10.6370635 C5.79609849,9.32106479 6.95789293,8.14780584 8.45302205,8.14780584 L9.6010843,8.1600564 L9.6010843,8.14780584 C9.72215132,8.15198278 9.84121495,8.1560663 9.95827518,8.1600564 L9.95827518,6.24554261 C9.95827518,5.93696939 10.0600343,5.71916618 10.4513035,5.71916618 L11.5368802,5.71916618 L11.5368802,4.6910747 C11.2474459,4.52023964 11.1027287,4.38138711 11.1027287,4.27451709 C10.6685771,4.27451709 8.285557,4.6910747 6.45568591,4.6910747 C4.62581481,4.6910747 1.80384317,4.40195664 1.80384317,3.79634897 C1.80384317,3.1907413 5.26938946,3.00041587 6.45568591,3.00041587 C7.64198235,3.00041587 10.7945781,3.29787293 11.1027287,3.3522236 C11.1027287,2.99131666 11.500409,2.752151 11.8832179,2.66387774 C11.8844693,2.65002951 11.8857748,2.63735279 11.8871343,2.62584757 C11.9364301,2.62584757 11.9884925,2.62917618 12.0420742,2.63574525 C12.0956559,2.62917618 12.1477183,2.62584757 12.1970141,2.62584757 C12.1983736,2.63735279 12.1996791,2.65002951 12.2009305,2.66387774 C12.5837395,2.752151 12.9814197,2.99131666 12.9814197,3.3522236 C13.2895703,3.29787293 15.8038739,3.00041587 16.9901703,3.00041587 C18.1764668,3.00041587 22.1961568,3.1907413 22.1961568,3.79634897 C22.1961568,4.40195664 18.8200414,4.6910747 16.9901703,4.6910747 C15.1602992,4.6910747 13.4155713,4.27451709 12.9814197,4.27451709 C12.9814197,4.38138711 12.8367026,4.52023964 12.5472682,4.6910747 L12.5472682,5.71916618 L13.307082,5.71916618 C13.5972489,5.75658332 13.8080743,5.86130235 13.8080743,6.15202309 L13.8080743,8.17406982 C14.2018844,8.18254367 14.5048343,8.18678059 14.7169241,8.18678059 C15.7729925,8.18678059 18.0091976,9.0012304 18.0091976,11.7279125 L18.0091976,16.1621215 L21.3930563,16.1621215 L21.3930563,17.6618285 C21.3930563,18.2108283 20.8640403,18.543785 19.8060082,18.6606985 L19.8060082,17.2517236 C19.8060082,17.1483831 19.6940794,17.0646091 19.5560082,17.0646091 C19.417937,17.0646091 19.3060082,17.1483831 19.3060082,17.2517236 L19.3060082,18.9638207 C19.3060082,18.9788387 19.3083721,18.9934435 19.3128366,19.007438 C19.2767878,19.4146469 18.8102618,19.7177182 17.9132586,19.9166519 L17.9132586,18.0045092 C17.9132586,17.9011687 17.8013298,17.8173947 17.6632586,17.8173947 C17.5251874,17.8173947 17.4132586,17.9011687 17.4132586,18.0045092 L17.4132674,20.2555121 C17.4050986,20.3003249 17.4010142,20.3499404 17.4010142,20.4043586 C17.4010142,20.8349335 16.8736406,21.1581981 15.8188933,21.3741524 L15.8188933,18.2363689 L15.8188933,18.2363689 Z M15.8485796,16.5914183 C15.8614081,16.5604747 15.8784859,16.5286344 15.8999901,16.4969467 C16.2244581,15.8829401 16.4081718,15.1830654 16.4081718,14.4402821 C16.4081718,12.0057161 14.434566,10.0321104 12,10.0321104 C9.56543395,10.0321104 7.59182822,12.0057161 7.59182822,14.4402821 C7.59182822,16.8748482 9.56543395,18.8484539 12,18.8484539 C13.653408,18.8484539 15.0942075,17.938169 15.8485796,16.5914183 L15.8485796,16.5914183 Z M12,17.2824249 C10.4303279,17.2824249 9.15785719,16.0099543 9.15785719,14.4402821 C9.15785719,12.87061 10.4303279,11.5981393 12,11.5981393 C13.5696721,11.5981393 14.8421428,12.87061 14.8421428,14.4402821 C14.8421428,16.0099543 13.5696721,17.2824249 12,17.2824249 Z M10.8113831,12.6584181 C10.1192603,13.0965402 9.83596864,13.6163018 9.75722646,14.0800382 C9.67848428,14.5437746 9.88389697,14.8478193 10.0495597,15.0145537 C10.2152223,15.1812882 10.4999138,15.2197089 10.7696854,15.0145537 C11.039457,14.8093986 11.4376344,14.4290528 11.7721144,14.2262875 C12.1065944,14.0235222 12.8009231,13.7259922 13.0344341,13.6524599 C13.2679451,13.5789276 13.6721929,13.3557907 13.4166682,12.9000743 C13.1611434,12.4443579 12.7572207,12.3365345 12.3554749,12.2697229 C11.9537291,12.2029114 11.5035059,12.220296 10.8113831,12.6584181 Z" id="Shape" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Gems/DebugDraw/Code/Source/EditorDebugDrawLineComponent.cpp b/Gems/DebugDraw/Code/Source/EditorDebugDrawLineComponent.cpp
index 946833b583..17db8ae962 100644
--- a/Gems/DebugDraw/Code/Source/EditorDebugDrawLineComponent.cpp
+++ b/Gems/DebugDraw/Code/Source/EditorDebugDrawLineComponent.cpp
@@ -33,6 +33,7 @@ namespace DebugDraw
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                     ->Attribute(AZ::Edit::Attributes::Category, "Debugging")
                     ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/DebugDrawLine.svg")
+                    ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/DebugDrawLine.svg")
                     ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                     ->DataElement(0, &EditorDebugDrawLineComponent::m_element, "Line element settings", "Settings for the line element.")
                     ->Attribute(AZ::Edit::Attributes::ChangeNotify, &EditorDebugDrawLineComponent::OnPropertyUpdate)
diff --git a/Gems/DebugDraw/Code/Source/EditorDebugDrawObbComponent.cpp b/Gems/DebugDraw/Code/Source/EditorDebugDrawObbComponent.cpp
index b21fc6e9cb..cc45f40ace 100644
--- a/Gems/DebugDraw/Code/Source/EditorDebugDrawObbComponent.cpp
+++ b/Gems/DebugDraw/Code/Source/EditorDebugDrawObbComponent.cpp
@@ -33,6 +33,7 @@ namespace DebugDraw
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                     ->Attribute(AZ::Edit::Attributes::Category, "Debugging")
                     ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/DebugDrawObb.svg")
+                    ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/DebugDrawObb.svg")
                     ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                     ->DataElement(0, &EditorDebugDrawObbComponent::m_element, "Obb element settings", "Settings for the obb element.")
                     ->Attribute(AZ::Edit::Attributes::ChangeNotify, &EditorDebugDrawObbComponent::OnPropertyUpdate)
diff --git a/Gems/DebugDraw/Code/Source/EditorDebugDrawRayComponent.cpp b/Gems/DebugDraw/Code/Source/EditorDebugDrawRayComponent.cpp
index ecbc6e0062..697897e752 100644
--- a/Gems/DebugDraw/Code/Source/EditorDebugDrawRayComponent.cpp
+++ b/Gems/DebugDraw/Code/Source/EditorDebugDrawRayComponent.cpp
@@ -33,6 +33,7 @@ namespace DebugDraw
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                     ->Attribute(AZ::Edit::Attributes::Category, "Debugging")
                     ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/DebugDrawRay.svg")
+                    ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/DebugDrawRay.svg")
                     ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                     ->DataElement(0, &EditorDebugDrawRayComponent::m_element, "Ray element settings", "Settings for the ray element.")
                     ->Attribute(AZ::Edit::Attributes::ChangeNotify, &EditorDebugDrawRayComponent::OnPropertyUpdate)
diff --git a/Gems/DebugDraw/Code/Source/EditorDebugDrawSphereComponent.cpp b/Gems/DebugDraw/Code/Source/EditorDebugDrawSphereComponent.cpp
index 3b1464135f..9817967877 100644
--- a/Gems/DebugDraw/Code/Source/EditorDebugDrawSphereComponent.cpp
+++ b/Gems/DebugDraw/Code/Source/EditorDebugDrawSphereComponent.cpp
@@ -33,6 +33,7 @@ namespace DebugDraw
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                     ->Attribute(AZ::Edit::Attributes::Category, "Debugging")
                     ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/DebugDrawSphere.svg")
+                    ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/DebugDrawSphere.svg")
                     ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                     ->DataElement(0, &EditorDebugDrawSphereComponent::m_element, "Sphere element settings", "Settings for the sphere element.")
                     ->Attribute(AZ::Edit::Attributes::ChangeNotify, &EditorDebugDrawSphereComponent::OnPropertyUpdate)
diff --git a/Gems/DebugDraw/Code/Source/EditorDebugDrawTextComponent.cpp b/Gems/DebugDraw/Code/Source/EditorDebugDrawTextComponent.cpp
index 95bc907d41..08a0f0466e 100644
--- a/Gems/DebugDraw/Code/Source/EditorDebugDrawTextComponent.cpp
+++ b/Gems/DebugDraw/Code/Source/EditorDebugDrawTextComponent.cpp
@@ -33,6 +33,7 @@ namespace DebugDraw
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                     ->Attribute(AZ::Edit::Attributes::Category, "Debugging")
                     ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/DebugDrawText.svg")
+                    ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/DebugDrawText.svg")
                     ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                     ->DataElement(0, &EditorDebugDrawTextComponent::m_element, "Text element settings", "Settings for the text element.")
                     ->Attribute(AZ::Edit::Attributes::ChangeNotify, &EditorDebugDrawTextComponent::OnPropertyUpdate)
diff --git a/Gems/EMotionFX/Assets/Editor/Images/Icons/Resources.qrc b/Gems/EMotionFX/Assets/Editor/Images/Icons/Resources.qrc
index a75503351f..3cc1afdf75 100644
--- a/Gems/EMotionFX/Assets/Editor/Images/Icons/Resources.qrc
+++ b/Gems/EMotionFX/Assets/Editor/Images/Icons/Resources.qrc
@@ -1,6 +1,7 @@
 <RCC>
     <qresource prefix="/EMotionFX">
         <file>ActorComponent.svg</file>
+        <file>Viewport/ActorComponent.svg</file>
         <file>AlignBottom.svg</file>
         <file>AlignLeft.svg</file>
         <file>AlignRight.svg</file>
diff --git a/Gems/EMotionFX/Assets/Editor/Images/Icons/Viewport/ActorComponent.svg b/Gems/EMotionFX/Assets/Editor/Images/Icons/Viewport/ActorComponent.svg
new file mode 100644
index 0000000000..aca209d632
--- /dev/null
+++ b/Gems/EMotionFX/Assets/Editor/Images/Icons/Viewport/ActorComponent.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Animation / Actor box</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
+            <stop stop-color="#9D9D9D" offset="100%"></stop>
+        </linearGradient>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
+    </defs>
+    <g id="icon-/-Animation-/-Actor-box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/general/color/-box-template">
+            <mask id="mask-3" fill="white">
+                <use xlink:href="#path-2"></use>
+            </mask>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#5AA9D2">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="UI" x="0" y="0" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+        <path d="M15,9 L15,22 L13,22 L13,16 L11,16 L11,22 L9,22 L9,9 L4,9 L4,7 L20,7 L20,9 L15,9 Z M12,6 C10.8954305,6 10,5.1045695 10,4 C10,2.8954305 10.8954305,2 12,2 C13.1045695,2 14,2.8954305 14,4 C14,5.1045695 13.1045695,6 12,6 Z" id="Combined-Shape" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Gems/EMotionFX/Assets/Editor/Images/Icons/Viewport/AnimGraphComponent.svg b/Gems/EMotionFX/Assets/Editor/Images/Icons/Viewport/AnimGraphComponent.svg
new file mode 100644
index 0000000000..1f1cb50260
--- /dev/null
+++ b/Gems/EMotionFX/Assets/Editor/Images/Icons/Viewport/AnimGraphComponent.svg
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Animation / Anim Graph box</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
+            <stop stop-color="#9D9D9D" offset="100%"></stop>
+        </linearGradient>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
+        <path d="M3.35104455,20.6489555 L1.90955197,20.6489555 L1.90955197,3.35104455 L3.35104455,3.35104455 L3.35104455,4.79253712 L4.79253712,4.79253712 L4.79253712,3.35104455 L6.2340297,3.35104455 L6.2340297,20.6489555 L4.79253712,20.6489555 L4.79253712,19.2074629 L3.35104455,19.2074629 L3.35104455,20.6489555 Z M3.35104455,6.2340297 L3.35104455,9.11701485 L4.79253712,9.11701485 L4.79253712,6.2340297 L3.35104455,6.2340297 Z M3.35104455,10.5585074 L3.35104455,13.4414926 L4.79253712,13.4414926 L4.79253712,10.5585074 L3.35104455,10.5585074 Z M3.35104455,14.8829852 L3.35104455,17.7659703 L4.79253712,17.7659703 L4.79253712,14.8829852 L3.35104455,14.8829852 Z M6.2340297,4.79253712 L17.7659703,4.79253712 L17.7659703,19.2074629 L6.2340297,19.2074629 L6.2340297,4.79253712 Z M16.3244777,12 L9.11701485,7.67552227 L9.11701485,16.3244777 L16.3244777,12 Z M19.2074629,20.6489555 L17.7659703,20.6489555 L17.7659703,3.35104455 L19.2074629,3.35104455 L19.2074629,4.79253712 L20.6489555,4.79253712 L20.6489555,3.35104455 L22.090448,3.35104455 L22.090448,20.6489555 L20.6489555,20.6489555 L20.6489555,19.2074629 L19.2074629,19.2074629 L19.2074629,20.6489555 Z M19.2074629,6.2340297 L19.2074629,9.11701485 L20.6489555,9.11701485 L20.6489555,6.2340297 L19.2074629,6.2340297 Z M19.2074629,10.5585074 L19.2074629,13.4414926 L20.6489555,13.4414926 L20.6489555,10.5585074 L19.2074629,10.5585074 Z M19.2074629,14.8829852 L19.2074629,17.7659703 L20.6489555,17.7659703 L20.6489555,14.8829852 L19.2074629,14.8829852 Z" id="path-4"></path>
+    </defs>
+    <g id="icon-/-Animation-/-Anim-Graph-box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/general/color/-box-template">
+            <mask id="mask-3" fill="white">
+                <use xlink:href="#path-2"></use>
+            </mask>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#5AA9D2">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="UI" x="0" y="0" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+        <mask id="mask-5" fill="white">
+            <use xlink:href="#path-4"></use>
+        </mask>
+        <use id="Shape" fill="#FFFFFF" xlink:href="#path-4"></use>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorActorComponent.cpp b/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorActorComponent.cpp
index 941b087592..efc5cbd9a2 100644
--- a/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorActorComponent.cpp
+++ b/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorActorComponent.cpp
@@ -102,7 +102,7 @@ namespace EMotionFX
                         ->Attribute(AZ::Edit::Attributes::Category, "Animation")
                         ->Attribute(AZ::Edit::Attributes::Icon, ":/EMotionFX/ActorComponent.svg")
                         ->Attribute(AZ::Edit::Attributes::PrimaryAssetType, azrtti_typeid<ActorAsset>())
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, ":/EMotionFX/ActorComponent.svg")
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, ":/EMotionFX/Viewport/ActorComponent.svg")
                         ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                         ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                         ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://o3de.org/docs/user-guide/components/reference/actor/")
diff --git a/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorAnimGraphComponent.cpp b/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorAnimGraphComponent.cpp
index b1e8aabf40..eef41bc919 100644
--- a/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorAnimGraphComponent.cpp
+++ b/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorAnimGraphComponent.cpp
@@ -61,7 +61,7 @@ namespace EMotionFX
                             ->Attribute(AZ::Edit::Attributes::Category, "Animation")
                             ->Attribute(AZ::Edit::Attributes::Icon, ":/EMotionFX/AnimGraphComponent.svg")
                             ->Attribute(AZ::Edit::Attributes::PrimaryAssetType, azrtti_typeid<AnimGraphAsset>())
-                            ->Attribute(AZ::Edit::Attributes::ViewportIcon, ":/EMotionFX/AnimGraphComponent.svg")
+                            ->Attribute(AZ::Edit::Attributes::ViewportIcon, ":/EMotionFX/Viewport/AnimGraphComponent.svg")
                             ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                             ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                             ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://o3de.org/docs/user-guide/components/reference/animgraph/")
diff --git a/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorSimpleLODComponent.cpp b/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorSimpleLODComponent.cpp
index 08a15ed0d4..030ca42ca1 100644
--- a/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorSimpleLODComponent.cpp
+++ b/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorSimpleLODComponent.cpp
@@ -43,7 +43,7 @@ namespace EMotionFX
                         ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                             ->Attribute(AZ::Edit::Attributes::Category, "Animation")
                             ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/SimpleLODDistance.svg")
-                            ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Mannequin.png")
+                            ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/SimpleLODDistance.svg")
                             ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                             ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                         ->DataElement(0, &EditorSimpleLODComponent::m_configuration, "LOD Configuration", "");
diff --git a/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorSimpleMotionComponent.cpp b/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorSimpleMotionComponent.cpp
index b0cef343b6..8446050254 100644
--- a/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorSimpleMotionComponent.cpp
+++ b/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorSimpleMotionComponent.cpp
@@ -44,7 +44,7 @@ namespace EMotionFX
                         ->Attribute(AZ::Edit::Attributes::Category, "Animation")
                         ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/SimpleMotion.svg")
                         ->Attribute(AZ::Edit::Attributes::PrimaryAssetType, azrtti_typeid<MotionAsset>())
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Mannequin.png")
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Mannequin.svg")
                         ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                         ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                         ->DataElement(0, &EditorSimpleMotionComponent::m_previewInEditor, "Preview In Editor", "Plays motion in Editor")
diff --git a/Gems/EMotionFX/Code/emotionfx_editor_files.cmake b/Gems/EMotionFX/Code/emotionfx_editor_files.cmake
index 6fd3a3118e..2128aa39d1 100644
--- a/Gems/EMotionFX/Code/emotionfx_editor_files.cmake
+++ b/Gems/EMotionFX/Code/emotionfx_editor_files.cmake
@@ -10,7 +10,9 @@ set(FILES
     ../Assets/Editor/Layouts/Layouts.qrc
     ../Assets/Editor/Images/Icons/Resources.qrc
     ../Assets/Editor/Images/Icons/ActorComponent.svg
+    ../Assets/Editor/Images/Icons/Viewport/ActorComponent.svg
     ../Assets/Editor/Images/Icons/AnimGraphComponent.svg
+    ../Assets/Editor/Images/Icons/Viewport/AnimGraphComponent.svg
     Source/Integration/Editor/Components/EditorActorComponent.h
     Source/Integration/Editor/Components/EditorActorComponent.cpp
     Source/Integration/Editor/Components/EditorAnimAudioComponent.h
diff --git a/Gems/EditorPythonBindings/Code/Source/PythonProxyBus.cpp b/Gems/EditorPythonBindings/Code/Source/PythonProxyBus.cpp
index 2c1ef481a4..89f8248202 100644
--- a/Gems/EditorPythonBindings/Code/Source/PythonProxyBus.cpp
+++ b/Gems/EditorPythonBindings/Code/Source/PythonProxyBus.cpp
@@ -264,7 +264,7 @@ namespace EditorPythonBindings
                 reinterpret_cast<PythonProxyNotificationHandler*>(userData)->OnEventGenericHook(eventName, eventIndex, result, numParameters, parameters);
             }
 
-            void OnEventGenericHook(const char* eventName, [[maybe_unused]] int eventIndex, [[maybe_unused]] AZ::BehaviorValueParameter* result, int numParameters, AZ::BehaviorValueParameter* parameters)
+            void OnEventGenericHook(const char* eventName, [[maybe_unused]] int eventIndex, AZ::BehaviorValueParameter* result, int numParameters, AZ::BehaviorValueParameter* parameters)
             {
                 // find the callback for the event
                 const auto& callbackEntry = m_callbackMap.find(eventName);
@@ -299,12 +299,17 @@ namespace EditorPythonBindings
                         // reset/prepare the stack allocator
                         m_stackVariableAllocator = {};
 
-                        AZ::BehaviorValueParameter coverted;
+                        // Reset the result parameter
+                        m_resultParam = {};
+
                         const AZ::u32 traits = result->m_traits;
-                        if (Convert::PythonToBehaviorValueParameter(*result, pyResult, coverted, m_stackVariableAllocator))
+                        if (Convert::PythonToBehaviorValueParameter(*result, pyResult, m_resultParam, m_stackVariableAllocator))
                         {
-                            result->Set(coverted);
-                            result->m_value = coverted.GetValueAddress();
+                            // Setting result parameter into the output parameter will not fix its pointers
+                            // to use output parameter's internal memory, because of this, result parameter
+                            // needs to be a member so its memory is still valid when accessed in BehaviorEBusHandler::CallResult.
+                            result->Set(m_resultParam);
+                            result->m_value = m_resultParam.GetValueAddress();
                             if ((traits & AZ::BehaviorParameter::TR_POINTER) == AZ::BehaviorParameter::TR_POINTER)
                             {
                                 result->m_value = &result->m_value;
@@ -323,6 +328,7 @@ namespace EditorPythonBindings
             AZ::BehaviorEBusHandler* m_handler = nullptr;
             AZStd::unordered_map<AZStd::string, pybind11::function> m_callbackMap;
             Convert::StackVariableAllocator m_stackVariableAllocator;
+            AZ::BehaviorValueParameter m_resultParam;
         };
     }
 
diff --git a/Gems/FastNoise/Code/Source/EditorFastNoiseGradientComponent.h b/Gems/FastNoise/Code/Source/EditorFastNoiseGradientComponent.h
index 047fe2b0c6..354fe18b03 100644
--- a/Gems/FastNoise/Code/Source/EditorFastNoiseGradientComponent.h
+++ b/Gems/FastNoise/Code/Source/EditorFastNoiseGradientComponent.h
@@ -27,7 +27,7 @@ namespace FastNoiseGem
         static constexpr const char* const s_componentName = "FastNoise Gradient";
         static constexpr const char* const s_componentDescription = "Generates gradient values using FastNoise a noise generation library with a collection of realtime noise algorithms";
         static constexpr const char* const s_icon = "Editor/Icons/Components/Gradient.svg";
-        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/Gradient.png";
+        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/Gradient.svg";
         static constexpr const char* const s_helpUrl = "https://o3de.org/docs/user-guide/components/";
 
     private:
diff --git a/Gems/GradientSignal/Assets/Editor/Icons/Components/Gradient.svg b/Gems/GradientSignal/Assets/Editor/Icons/Components/Gradient.svg
index c28bcc82df..8cb93dae41 100644
--- a/Gems/GradientSignal/Assets/Editor/Icons/Components/Gradient.svg
+++ b/Gems/GradientSignal/Assets/Editor/Icons/Components/Gradient.svg
@@ -1,69 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
-    <title>icon / Modifiers / Gradients Copy 2</title>
-    <desc>Created with Sketch.</desc>
-    <g id="icon-/-Modifiers-/-Gradients-Copy-2" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <polygon id="Path-Copy-5" fill="#D04160" points="5 21 5 23 7 23 7 21"></polygon>
-        <polygon id="Path-Copy-10" fill="#D04160" points="3 19 3 21 5 21 5 19"></polygon>
-        <polygon id="Path-Copy-14" fill="#D04160" points="5 1 5 3 7 3 7 1"></polygon>
-        <polygon id="Path-Copy-31" fill="#D04160" points="1 21 1 23 3 23 3 21"></polygon>
-        <polygon id="Path-Copy-32" fill="#D04160" points="1 7 1 9 3 9 3 7"></polygon>
-        <polygon id="Path-Copy-54" fill="#D04160" points="1.00047156 15 1.00047156 17 3.00047156 17 3.00047156 15"></polygon>
-        <polygon id="Path-Copy-55" fill="#D04160" points="1 1 1 3 3 3 3 1"></polygon>
-        <polygon id="Path" fill="#D04160" points="3 3 3 5 5 5 5 3"></polygon>
-        <polygon id="Path-Copy-8" fill="#D04160" points="7 3 7 5 9 5 9 3"></polygon>
-        <polygon id="Path-Copy-61" fill="#D04160" points="7 19.0049147 7 21.0049147 9 21.0049147 9 19.0049147"></polygon>
-        <polygon id="Path-Copy-23" fill="#D04160" points="5 15 5 17 7 17 7 15"></polygon>
-        <polygon id="Path" fill="#D04160" points="9 1 9 3 11 3 11 1"></polygon>
-        <polygon id="Path-Copy-24" fill="#D04160" points="9 17 9 19 11 19 11 17"></polygon>
-        <polygon id="Path-Copy-11" fill="#D04160" points="9 13 9 15 11 15 11 13"></polygon>
-        <polygon id="Path-Copy-3" fill="#D04160" points="5 7 5 9 7 9 7 7"></polygon>
-        <polygon id="Path-Copy-52" fill="#D04160" points="3.00047156 11 3.00047156 13 5.00047156 13 5.00047156 11"></polygon>
-        <polygon id="Path-Copy-22" fill="#D04160" transform="translate(8.000000, 12.000000) scale(1, -1) translate(-8.000000, -12.000000) " points="7 11 7 13 9 13 9 11"></polygon>
-        <polygon id="Path-Copy-25" fill="#D04160" points="9 9 9 11 11 11 11 9"></polygon>
-        <polygon id="Path-Copy-50" fill="#D04160" points="11 7 11 9 13 9 13 7"></polygon>
-        <polygon id="Path-Copy-51" fill="#D04160" points="11 15 11 17 13 17 13 15"></polygon>
-        <polygon id="Path-Copy-4" fill="#D04160" points="9 4.99508535 9 6.99508535 11 6.99508535 11 4.99508535"></polygon>
-        <polygon id="Path-Copy-26" fill="#D04160" points="9 21 9 23 11 23 11 21"></polygon>
-        <polygon id="Path-Copy-27" fill="#D04160" points="13 5 13 7 15 7 15 5"></polygon>
-        <polygon id="Path-Copy-28" fill="#D04160" points="13 21 13 23 15 23 15 21"></polygon>
-        <polygon id="Path" fill="#D04160" points="13 1 15 1 15 3 13 3"></polygon>
-        <polygon id="Path-Copy-34" fill="#D04160" points="13 17 15 17 15 19 13 19"></polygon>
-        <polygon id="Path-Copy-30" fill="#D04160" points="13 13 15 13 15 15 13 15"></polygon>
-        <polygon id="Path-Copy-29" fill="#D04160" points="13 9 15 9 15 11 13 11"></polygon>
-        <polygon id="Path-Copy-6" fill="#D04160" points="15 7 17 7 17 9 15 9"></polygon>
-        <polygon id="Path-Copy-35" fill="#D04160" transform="translate(15.998510, 12.000000) scale(1, -1) translate(-15.998510, -12.000000) " points="14.9985099 11 16.9985099 11 16.9985099 13 14.9985099 13"></polygon>
-        <polygon id="Path-Copy-7" fill="#D04160" points="17 5 19 5 19 7 17 7"></polygon>
-        <polygon id="Path-Copy-21" fill="#D04160" points="19 1 21 1 21 3 19 3"></polygon>
-        <polygon id="Path-Copy-37" fill="#D04160" points="17 21 19 21 19 23 17 23"></polygon>
-        <polygon id="Path-Copy-12" fill="#D04160" points="15 3 17 3 17 5 15 5"></polygon>
-        <polygon id="Path-Copy-39" fill="#D04160" points="15 19 17 19 17 21 15 21"></polygon>
-        <polygon id="Path-Copy-38" fill="#D04160" points="15 15 17 15 17 17 15 17"></polygon>
-        <polygon id="Path-Copy-59" fill="#D04160" points="15 17 17 17 17 19 15 19"></polygon>
-        <polygon id="Path-Copy-17" fill="#D04160" points="17 9 19 9 19 11 17 11"></polygon>
-        <polygon id="Path-Copy-13" fill="#D04160" points="17 1 19 1 19 3 17 3"></polygon>
-        <polygon id="Path-Copy-41" fill="#D04160" points="17 17 19 17 19 19 17 19"></polygon>
-        <polygon id="Path-Copy-40" fill="#D04160" points="17 13 19 13 19 15 17 15"></polygon>
-        <polygon id="Path-Copy-56" fill="#D04160" points="19 17 21 17 21 19 19 19"></polygon>
-        <polygon id="Path-Copy-57" fill="#D04160" points="19 9 21 9 21 11 19 11"></polygon>
-        <polygon id="Path-Copy-60" fill="#D04160" points="15 5 17 5 17 7 15 7"></polygon>
-        <polygon id="Path-Copy-58" fill="#D04160" points="19 21 21 21 21 23 19 23"></polygon>
-        <polygon id="Path-Copy-18" fill="#D04160" points="19 7 21 7 21 9 19 9"></polygon>
-        <polygon id="Path-Copy-36" fill="#D04160" points="21 7 23 7 23 9 21 9"></polygon>
-        <polygon id="Path-Copy-43" fill="#D04160" transform="translate(20.000000, 12.000000) scale(1, -1) translate(-20.000000, -12.000000) " points="19 11 21 11 21 13 19 13"></polygon>
-        <polygon id="Path-Copy-45" fill="#D04160" transform="translate(22.000000, 12.000000) scale(1, -1) translate(-22.000000, -12.000000) " points="21 11 23 11 23 13 21 13"></polygon>
-        <polygon id="Path-Copy-19" fill="#D04160" points="21 5 23 5 23 7 21 7"></polygon>
-        <polygon id="Path-Copy-33" fill="#D04160" points="21 3 23 3 23 5 21 5"></polygon>
-        <polygon id="Path-Copy-42" fill="#D04160" points="21 21 23 21 23 23 21 23"></polygon>
-        <polygon id="Path-Copy-44" fill="#D04160" points="21 19 23 19 23 21 21 21"></polygon>
-        <polygon id="Path-Copy-15" fill="#D04160" points="19 3 21 3 21 5 19 5"></polygon>
-        <polygon id="Path-Copy-46" fill="#D04160" points="19 19 21 19 21 21 19 21"></polygon>
-        <polygon id="Path-Copy-47" fill="#D04160" points="18.9995284 15 20.9995284 15 20.9995284 17 18.9995284 17"></polygon>
-        <polygon id="Path-Copy-20" fill="#D04160" points="21 9 23 9 23 11 21 11"></polygon>
-        <polygon id="Path-Copy-16" fill="#D04160" points="21 1 23 1 23 3 21 3"></polygon>
-        <polygon id="Path-Copy-48" fill="#D04160" points="21 17 23 17 23 19 21 19"></polygon>
-        <polygon id="Path-Copy-49" fill="#D04160" points="21 13 23 13 23 15 21 15"></polygon>
-        <polygon id="Path-Copy-53" fill="#D04160" points="21 15 23 15 23 17 21 17"></polygon>
+    <title>icon / Modifiers / Gradients </title>
+    <g id="icon-/-Modifiers-/-Gradients-" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M3,21 L3,23 L1,23 L1,21 L3,21 Z M9,19.0049147 L9,21 L11,21 L11,23 L9,23 L9,21.0049147 L7,21.0049147 L7,23 L5,23 L5,21 L7,21 L7,19.0049147 L9,19.0049147 Z M15,21 L15,23 L13,23 L13,21 L15,21 Z M23,23 L17,23 L17,21 L19,21 L19,19 L17,19 L17,21 L15,21 L15,19 L13,19 L13,17 L15,17 L15,15 L17,15 L17,13 L19,13 L19,11 L17,11 L17,9 L19,9 L19,7 L21,7 L21,5 L19,5 L19,3 L17,3 L17,5 L19,5 L19,7 L17,7 L17,9 L15,9 L15,7 L13,7 L13,9 L11,9 L11,7 L13,7 L13,5 L15,5 L15,3 L17,3 L17,1 L23,1 L23,23 Z M5,19 L5,21 L3,21 L3,19 L5,19 Z M11,17 L11,19 L9,19 L9,17 L11,17 Z M18.9995284,15 L17,15 L17,17 L18.9995284,17 L18.9995284,15 Z M3.00047156,15 L3.00047156,17 L1.00047156,17 L1.00047156,15 L3.00047156,15 Z M7,15 L7,17 L5,17 L5,15 L7,15 Z M13,15 L13,17 L11,17 L11,15 L13,15 Z M11,13 L11,15 L9,15 L9,13 L11,13 Z M15,9 L15,11 L16.9985099,11 L16.9985099,13 L15,13 L15,15 L13,15 L13,13 L14.9985099,13 L14.9985099,11 L13,11 L13,9 L15,9 Z M5.00047156,11 L5.00047156,13 L3.00047156,13 L3.00047156,11 L5.00047156,11 Z M9,11 L9,13 L7,13 L7,11 L9,11 Z M11,9 L11,11 L9,11 L9,9 L11,9 Z M3,7 L3,9 L1,9 L1,7 L3,7 Z M7,7 L7,9 L5,9 L5,7 L7,7 Z M9,3 L9,4.99508535 L11,4.99508535 L11,6.99508535 L9,6.99508535 L9,5 L7,5 L7,3 L9,3 Z M5,3 L5,5 L3,5 L3,3 L5,3 Z M7,1 L7,3 L5,3 L5,1 L7,1 Z M3,1 L3,3 L1,3 L1,1 L3,1 Z M11,1 L11,3 L9,3 L9,1 L11,1 Z M15,1 L15,3 L13,3 L13,1 L15,1 Z M19,15 L20.9995284,15 L20.9995284,17 L21,17 L21,13 L19,13 L19,15 Z" id="Combined-Shape" fill="#D04160"></path>
     </g>
-</svg>
+</svg>
\ No newline at end of file
diff --git a/Gems/GradientSignal/Assets/Editor/Icons/Components/GradientModifier.svg b/Gems/GradientSignal/Assets/Editor/Icons/Components/GradientModifier.svg
index 7fcb31a2a4..2694aa0c5b 100644
--- a/Gems/GradientSignal/Assets/Editor/Icons/Components/GradientModifier.svg
+++ b/Gems/GradientSignal/Assets/Editor/Icons/Components/GradientModifier.svg
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
-    <title>icon / Modifiers / Gradients Copy 3</title>
-    <desc>Created with Sketch.</desc>
-    <g id="icon-/-Modifiers-/-Gradients-Copy-3" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <path d="M13,4.90237112 C12.6723149,4.87038395 12.3345657,4.85376711 11.9867518,4.85376711 C11.6476316,4.85376711 11.3187503,4.8661135 11,4.89002548 L11,3 L9,3 L9,5 L7,5 L7,5.99959675 C5.59687817,6.7561289 4.58012347,7.82274016 3.92220571,9 L3,9 L3,7 L5,7 L5,5 L3,5 L3,3.00047156 L1,3.00047156 L1,1.00047156 L2.99508535,1.00047156 L4.99508535,1 L4.99508535,3 L5,3 L7,3.00047156 L5,3 L5,1 L7,1 L9,1 L11,1 L13,1 L15,1 L17,1 L19,1 L19,3 L19.0049147,3 L19.0049147,1 L21.0049147,1 L23.0049147,1 L23.0049147,3 L21.0049147,3 L21.0049147,5 L23,5 L23,7 L21,7 L21,5 L19.0049147,5 L19,5 L19,7 L21,7 L21,9 L19.6741167,9 C19.0222693,7.96287783 18.1309227,7.00542867 17,6.27249828 L17,5.00047156 L15,5.00047156 L15,3.00047156 L17,3.00047156 L17,5 L17.0049147,5 L17.0049147,3 L17,3 L15,3 L13,3 L13,4.90237112 Z M21,13.3176313 C21.0016365,13.3159559 21.0032747,13.3142794 21.0049147,13.3126018 C21.0049147,13.2310653 21.0032765,13.1487249 21,13.0656625 L21,13 L23,13 L23,15 L21.0049147,15 L21.0049147,17 L23,17 L23,19 L21,19 L21,17 L20.0049147,17 L20.0049147,15 L21,15 L21,13.3176313 Z M9,23 L7,23 L9,23 Z M5.00047156,13 L5.00047156,15 L4.99508535,15 L4.99508535,13 L5.00047156,13 Z M20.0049147,21 L20.0049147,19 L21,19 L21,21 L20.0049147,21 Z M1,19 L1,17 L3,17 L3,19 L1,19 Z M22,23 L22,21 L23,21 L23,23 L22,23 Z M1,23 L1,21 L2,21 L2,23 L1,23 Z M3,21 L3,19 L4,19 L4,21 L3,21 Z M3,17 L3,15 L4,15 L4,17 L3,17 Z M1,15 L1,13 L3,13 L3,15 L1,15 Z M21,11 L21,9 L23,9 L23,11 L21,11 Z M1,11 L1,9 L3,9 L3,11 L1,11 Z M1,7 L1,5 L3,5 L3,7 L1,7 Z" id="Combined-Shape" fill="#D04160"></path>
-        <path d="M4.06499057,13.4583309 C4.68568627,12.9256661 5.53729958,12.2472212 6.70688177,12.2472212 C7.48660323,12.2472212 8.42186043,12.6509245 9.51265337,13.4583309 C10.1656159,12.6509245 10.9663009,12.2472212 11.9147083,12.2472212 C12.8631157,12.2472212 13.6920095,12.6442211 14.4013899,13.4382208 C15.447479,12.6442211 16.3908247,12.2472212 17.231427,12.2472212 C18.4923303,12.2472212 19.0878809,12.7782064 19.9350094,13.4850428 C19.9350094,10.2447077 17.121932,6.23879932 12.6377997,6.23879932 C12.3069055,6.23879932 11.9147083,6.23879932 11.37559,6.23879932 C8.08749857,6.23879932 4.06499057,8.87677068 4.06499057,13.4583309 Z" id="Path-48" fill="#D04160"></path>
-        <path d="M12.9432575,14.4506417 C12.9432575,15.1921693 12.9432575,17.9349906 12.9432575,19.6280258 C12.9432575,21.321061 11.8802698,22.702033 10.4350335,22.702033 C8.9897972,22.702033 9.73203462,22.702033 9.30706659,22.702033 C8.06189692,22.702033 6.74671725,21.3377506 6.74671725,20.2078226 C6.74671725,20.0934976 6.74671725,20.2059582 6.74671725,19.7592882 C6.74671725,19.3126181 6.87175798,18.9731257 7.48840038,18.9731257 C8.10504278,18.9731257 8.17555313,19.6563439 8.17555313,19.9968513 C8.17555313,20.3373588 8.9255005,21.1604653 9.46974851,21.1610141 C10.0139965,21.1615628 9.622862,21.1613752 10.1078755,21.1604653 C10.5928891,21.1595554 11.3536399,20.7293311 11.3536399,19.7592882 C11.3536399,18.7892452 11.3536399,14.7598693 11.3536399,14.4506417 C11.3536399,14.1414141 11.5668004,13.4850428 12.0438468,13.4850428 C12.5208932,13.4850428 12.1751181,13.4850428 12.3354788,13.4850428 C12.4958394,13.4850428 12.9432575,13.7091142 12.9432575,14.4506417 Z" id="Path-49" fill="#D04160"></path>
+    <title>icon / Modifiers / GradientsModifiers</title>
+    <g id="icon-/-Modifiers-/-GradientsModifiers" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M23,21 L23,23 L21.0049147,23 L21.0049147,21 L23,21 Z M3,21 L3,23 L1,23 L1,21 L3,21 Z M12.3354788,13.4850428 C12.4958394,13.4850428 12.9432575,13.7091142 12.9432575,14.4506417 L12.9432575,19.6280258 C12.9432575,21.321061 11.8802698,22.702033 10.4350335,22.702033 L9.30706659,22.702033 C8.06189692,22.702033 6.74671725,21.3377506 6.74671725,20.2078226 L6.74671725,19.7592882 C6.74671725,19.3126181 6.87175798,18.9731257 7.48840038,18.9731257 C8.10504278,18.9731257 8.17555313,19.6563439 8.17555313,19.9968513 C8.17555313,20.3373588 8.9255005,21.1604653 9.46974851,21.1610141 L9.92999439,21.16086 L10.1078755,21.1604653 L10.1078755,21.1604653 C10.5928891,21.1595554 11.3536399,20.7293311 11.3536399,19.7592882 L11.3536399,14.4506417 C11.3536399,14.1414141 11.5668004,13.4850428 12.0438468,13.4850428 L12.3354788,13.4850428 Z M23,17 L23,19 L21,19 L21,17 L23,17 Z M3,17 L3,19 L1,19 L1,17 L3,17 Z M3,13 L3,15 L1,15 L1,13 L3,13 Z M23,13 L23,15 L21,15 L21,13.316 C21.0049147,13.2365309 21.0034887,13.1597602 21.0006368,13.0823563 L21,13 L23,13 Z M12.6377997,6.23879932 C17.121932,6.23879932 19.9350094,10.2447077 19.9350094,13.4850428 C19.0878809,12.7782064 18.4923303,12.2472212 17.231427,12.2472212 C16.3908247,12.2472212 15.447479,12.6442211 14.4013899,13.4382208 C13.6920095,12.6442211 12.8631157,12.2472212 11.9147083,12.2472212 C10.9663009,12.2472212 10.1656159,12.6509245 9.51265337,13.4583309 C8.42186043,12.6509245 7.48660323,12.2472212 6.70688177,12.2472212 C5.53729958,12.2472212 4.68568627,12.9256661 4.06499057,13.4583309 C4.06499057,8.96840188 7.92820725,6.34509561 11.1774613,6.24195933 L11.37559,6.23879932 L12.6377997,6.23879932 Z M3,9 L3,11 L1,11 L1,9 L3,9 Z M23,9 L23,11 L21,11 L21,9 L23,9 Z M19,5 L19,7 L21,7 L21,9 L19.6743681,9.00040014 C19.022753,7.96352888 18.1317639,7.00627032 17.001324,6.27335655 L17,5 L19,5 Z M7,5 L6.99970468,5.99975599 C5.59663653,6.75633194 4.57993386,7.82297324 3.92206649,9.00024914 L3,9 L3,7 L5,7 L5,5 L7,5 Z M23.0049147,1 L23.0049147,3 L21.0049147,3 L21.0049147,5 L23,5 L23,7 L21,7 L21,5 L19.0049147,5 L19.0049147,1 L23.0049147,1 Z M3,5 L3,7 L1,7 L1,5 L3,5 Z M4.99508535,1 L4.99508535,3 L5,3 L5,5 L3,5 L3,3 L1,3.00047156 L1,1.00047156 L4.99508535,1 Z M19,1 L19,3 L17,3 L17,5.00047156 L15,5.00047156 L15,3 L13,3 L11,3 L11,3 L9,3 L9,5 L7,5 L7,3 L5,3 L5,1 L19,1 Z M13,3 L13.0007924,4.90244849 C12.6728593,4.87041075 12.334846,4.85376711 11.9867518,4.85376711 C11.6477149,4.85376711 11.3189118,4.86610744 11.0002348,4.89000787 L11,3 L13,3 Z" id="Combined-Shape" fill="#D04160"></path>
     </g>
-</svg>
+</svg>
\ No newline at end of file
diff --git a/Gems/GradientSignal/Assets/Editor/Icons/Components/Viewport/Gradient.png b/Gems/GradientSignal/Assets/Editor/Icons/Components/Viewport/Gradient.png
deleted file mode 100644
index b7c66b2a11..0000000000
--- a/Gems/GradientSignal/Assets/Editor/Icons/Components/Viewport/Gradient.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:327acc2d66b1b8338b4481e67e646337ab3d4adc74a66635e4591e90424780a5
-size 807
diff --git a/Gems/GradientSignal/Assets/Editor/Icons/Components/Viewport/Gradient.svg b/Gems/GradientSignal/Assets/Editor/Icons/Components/Viewport/Gradient.svg
index daa0d83fc4..5cb1949e28 100644
--- a/Gems/GradientSignal/Assets/Editor/Icons/Components/Viewport/Gradient.svg
+++ b/Gems/GradientSignal/Assets/Editor/Icons/Components/Viewport/Gradient.svg
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
-    <title>icon / Modifiers / Gradients  (box)</title>
-    <desc>Created with Sketch.</desc>
+    <title>icon / Modifiers / Gradients - box</title>
     <defs>
         <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
             <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
             <stop stop-color="#9D9D9D" offset="100%"></stop>
         </linearGradient>
-        <path d="M20.924815,-3.10055012e-14 C23.1021676,-1.21881628e-13 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 1.16706519e-13,22.5147712 6.91022832e-14,21.1586662 C2.15231996e-14,19.8025612 2.19806118e-14,4.03532882 6.91022832e-14,2.67255351 C1.16426365e-13,1.3097782 1.36539793,-3.10055012e-14 2.60955829,-3.10055012e-14 C3.85371865,-3.10055012e-14 18.9601214,5.12500292e-14 20.924815,-3.10055012e-14 Z" id="path-2"></path>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
     </defs>
-    <g id="icon-/-Modifiers-/-Gradients--(box)" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+    <g id="icon-/-Modifiers-/-Gradients---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="icon/general/color/-box-template">
             <mask id="mask-3" fill="white">
                 <use xlink:href="#path-2"></use>
             </mask>
-            <use id="Path-3" fill="url(#linearGradient-1)" fill-rule="evenodd" xlink:href="#path-2"></use>
-            <g id="icon/general/color/Modifiers" style="mix-blend-mode: multiply;" mask="url(#mask-3)" fill="#D04160" fill-rule="evenodd">
-                <rect id="Lights" x="0" y="0" width="24" height="24"></rect>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#D04160">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="Lights" x="0" y="0" width="24" height="24"></rect>
+                </g>
             </g>
         </g>
-        <path d="M21,15 L21,13 L19,13 L19,11 L17,11 L17,9 L19,9 L19,7 L21,7 L21,5 L19,5 L19,3 L17,3 L17,1 L19,1 L21,1 C21.4201027,1 21.753436,1 22,1 C22.369846,1 23,1.51450797 23,2 C23,2.32366135 23,2.65699468 23,3 L23,5 L23,7 L23,9 L23,11 L23,13 L23,15 L23,17 L23,19 L23,21 L21,21 L21,21.0049147 L23,21.0049147 C23,21.34792 23,21.6812533 23,22.0049147 C23,22.4904067 22.369846,23.0049147 22,23.0049147 C21.753436,23.0049147 21.4201027,23.0049147 21,23.0049147 L21,23 L19,23 L17,23 L17,21 L19,21 L19,19 L17,19 L17,21 L15,21 L15,19 L13,19 L13,17 L15,17 L15,15 L17,15 L17,17 L18.9995284,17 L18.9995284,15 L17,15 L17,13 L19,13 L19,15 L20.9995284,15 L20.9995284,17 L21,15 Z M17,5 L15,5 L15,3 L17,3 L17,5 L19,5 L19,7 L17,7 L17,9 L15,9 L15,7 L13,7 L13,5 L15,5 Z M14.9985099,13 L14.9985099,11 L13,11 L13,9 L15,9 L15,11 L16.9985099,11 L16.9985099,13 L15,13 L15,15 L13,15 L13,13 L14.9985099,13 Z M9,21.0049147 L7,21.0049147 L7,23 L5,23 L5,21 L7,21 L7,19.0049147 L9,19.0049147 L9,21 L11,21 L11,23 L9,23 L9,21.0049147 Z M9,4.99508535 L11,4.99508535 L11,6.99508535 L9,6.99508535 L9,5 L7,5 L7,3 L9,3 L9,4.99508535 Z M3,19 L5,19 L5,21 L3,21 L3,19 Z M5,1 L7,1 L7,3 L5,3 L5,1 Z M1,7 L3,7 L3,9 L1,9 L1,7 Z M1.00047156,15 L3.00047156,15 L3.00047156,17 L1.00047156,17 L1.00047156,15 Z M3,3 L5,3 L5,5 L3,5 L3,3 Z M5,15 L7,15 L7,17 L5,17 L5,15 Z M9,1 L11,1 L11,3 L9,3 L9,1 Z M9,17 L11,17 L11,19 L9,19 L9,17 Z M9,13 L11,13 L11,15 L9,15 L9,13 Z M5,7 L7,7 L7,9 L5,9 L5,7 Z M3.00047156,11 L5.00047156,11 L5.00047156,13 L3.00047156,13 L3.00047156,11 Z M7,13 L7,11 L9,11 L9,13 L7,13 Z M9,9 L11,9 L11,11 L9,11 L9,9 Z M11,7 L13,7 L13,9 L11,9 L11,7 Z M11,15 L13,15 L13,17 L11,17 L11,15 Z M13,21 L15,21 L15,23 L13,23 L13,21 Z M13,1 L15,1 L15,3 L13,3 L13,1 Z M3,1 L3,3 L1,3 C1,2.65699468 1,2.32366135 1,2 C1,1.51450797 1.63015401,1 2,1 C2.24656399,1 2.57989733,1 3,1 Z M3,23.0049147 C2.57989733,23.0049147 2.24656399,23.0049147 2,23.0049147 C1.63015401,23.0049147 1,22.4904067 1,22.0049147 C1,21.6812533 1,21.34792 1,21.0049147 L3,21.0049147 L3,23.0049147 Z" id="Combined-Shape" fill="#FFFFFF"></path>
+        <path d="M3,21.0049147 L3,23.0049147 L2,23.0049147 L2,23.0049147 C1.63015401,23.0049147 1,22.4904067 1,22.0049147 L1,21.0049147 L1,21.0049147 L3,21.0049147 Z M23,21 L21,21 L21,21.0049147 L23,21.0049147 L23,21.0049147 L23,22.0049147 C23,22.4904067 22.369846,23.0049147 22,23.0049147 L22,23.0049147 L21,23.0049147 L21,23 L17,23 L17,21 L19,21 L19,19 L17,19 L17,21 L15,21 L15,19 L13,19 L13,17 L15,17 L15,15 L17,15 L17,13 L19,13 L19,11 L17,11 L17,9 L19,9 L19,7 L21,7 L21,5 L19,5 L19,3 L17,3 L17,5 L19,5 L19,7 L17,7 L17,9 L15,9 L15,7 L13,7 L13,9 L11,9 L11,7 L13,7 L13,5 L15,5 L15,3 L17,3 L17,1 L22,1 L22,1 C22.369846,1 23,1.51450797 23,2 L23,21 Z M9,19.0049147 L9,21 L11,21 L11,23 L9,23 L9,21.0049147 L7,21.0049147 L7,23 L5,23 L5,21 L7,21 L7,19.0049147 L9,19.0049147 Z M15,21 L15,23 L13,23 L13,21 L15,21 Z M5,19 L5,21 L3,21 L3,19 L5,19 Z M11,17 L11,19 L9,19 L9,17 L11,17 Z M18.9995284,15 L17,15 L17,17 L18.9995284,17 L18.9995284,15 Z M3.00047156,15 L3.00047156,17 L1.00047156,17 L1.00047156,15 L3.00047156,15 Z M7,15 L7,17 L5,17 L5,15 L7,15 Z M13,15 L13,17 L11,17 L11,15 L13,15 Z M11,13 L11,15 L9,15 L9,13 L11,13 Z M15,9 L15,11 L16.9985099,11 L16.9985099,13 L15,13 L15,15 L13,15 L13,13 L14.9985099,13 L14.9985099,11 L13,11 L13,9 L15,9 Z M5.00047156,11 L5.00047156,13 L3.00047156,13 L3.00047156,11 L5.00047156,11 Z M9,11 L9,13 L7,13 L7,11 L9,11 Z M11,9 L11,11 L9,11 L9,9 L11,9 Z M3,7 L3,9 L1,9 L1,7 L3,7 Z M7,7 L7,9 L5,9 L5,7 L7,7 Z M9,3 L9,4.99508535 L11,4.99508535 L11,6.99508535 L9,6.99508535 L9,5 L7,5 L7,3 L9,3 Z M5,3 L5,5 L3,5 L3,3 L5,3 Z M7,1 L7,3 L5,3 L5,1 L7,1 Z M11,1 L11,3 L9,3 L9,1 L11,1 Z M15,1 L15,3 L13,3 L13,1 L15,1 Z M3,1 L3,3 L1,3 L1,3 L1,2 C1,1.51450797 1.63015401,1 2,1 L2,1 L3,1 Z M19,15 L20.9995284,15 L20.9995284,17 L21,17 L21,13 L19,13 L19,15 Z" id="Combined-Shape" fill="#FFFFFF"></path>
     </g>
-</svg>
+</svg>
\ No newline at end of file
diff --git a/Gems/GradientSignal/Assets/Editor/Icons/Components/Viewport/GradientModifier.png b/Gems/GradientSignal/Assets/Editor/Icons/Components/Viewport/GradientModifier.png
deleted file mode 100644
index 68027a808d..0000000000
--- a/Gems/GradientSignal/Assets/Editor/Icons/Components/Viewport/GradientModifier.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ca4d67608f1742afabbbd5f8c3dd8c5e921db4b8c314894a1af10a332f73ddfc
-size 1111
diff --git a/Gems/GradientSignal/Assets/Editor/Icons/Components/Viewport/GradientModifier.svg b/Gems/GradientSignal/Assets/Editor/Icons/Components/Viewport/GradientModifier.svg
index d2b151b8cd..3ae6e9cd90 100644
--- a/Gems/GradientSignal/Assets/Editor/Icons/Components/Viewport/GradientModifier.svg
+++ b/Gems/GradientSignal/Assets/Editor/Icons/Components/Viewport/GradientModifier.svg
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
-    <title>icon / Modifiers / Gradients Modifiers (box)</title>
-    <desc>Created with Sketch.</desc>
+    <title>icon / Modifiers / GradientsModifiers - box</title>
     <defs>
         <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
             <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
             <stop stop-color="#9D9D9D" offset="100%"></stop>
         </linearGradient>
-        <path d="M20.924815,-3.10055012e-14 C23.1021676,-1.21881628e-13 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 1.16706519e-13,22.5147712 6.91022832e-14,21.1586662 C2.15231996e-14,19.8025612 2.19806118e-14,4.03532882 6.91022832e-14,2.67255351 C1.16426365e-13,1.3097782 1.36539793,-3.10055012e-14 2.60955829,-3.10055012e-14 C3.85371865,-3.10055012e-14 18.9601214,5.12500292e-14 20.924815,-3.10055012e-14 Z" id="path-2"></path>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
     </defs>
-    <g id="icon-/-Modifiers-/-Gradients-Modifiers-(box)" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+    <g id="icon-/-Modifiers-/-GradientsModifiers---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="icon/general/color/-box-template">
             <mask id="mask-3" fill="white">
                 <use xlink:href="#path-2"></use>
             </mask>
-            <use id="Path-3" fill="url(#linearGradient-1)" fill-rule="evenodd" xlink:href="#path-2"></use>
-            <g id="icon/general/color/Modifiers" style="mix-blend-mode: multiply;" mask="url(#mask-3)" fill="#D04160" fill-rule="evenodd">
-                <rect id="Lights" x="0" y="0" width="24" height="24"></rect>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#D04160">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="Lights" x="0" y="0" width="24" height="24"></rect>
+                </g>
             </g>
         </g>
-        <path d="M13,4.90237112 C12.6723149,4.87038395 12.3345657,4.85376711 11.9867518,4.85376711 C11.6476316,4.85376711 11.3187503,4.8661135 11,4.89002548 L11,3 L9,3 L9,5 L7,5 L7,3 L5,3 L5,1 L7,1 L9,1 L11,1 L13,1 L15,1 L17,1 L19,1 L19,3 L17,3 L15,3 L13,3 L13,4.90237112 Z M5,7.52877515 C4.56985817,7.98652039 4.21137255,8.48257286 3.92220571,9 L3,9 L3,7 L5,7 L5,5 L7,5 L7,5.99959675 C6.21357577,6.42361924 5.54852485,6.94504993 5,7.52877515 L5,7 L5,7.52877515 Z M19.6741167,9 C19.0222693,7.96287783 18.1309227,7.00542867 17,6.27249828 L17,5.00047156 L15,5.00047156 L15,3.00047156 L17,3.00047156 L17,5 L19,5 L19,7 L21,7 L21,9 L19.6741167,9 Z M21,13.3176313 C21.0016365,13.3159559 21.0032747,13.3142794 21.0049147,13.3126018 C21.0049147,13.2310653 21.0032765,13.1487249 21,13.0656625 L21,13 L23,13 L23,15 L21.0049147,15 L21.0049147,17 L23,17 L23,19 L21,19 L21,17 L20.0049147,17 L20.0049147,15 L21,15 L21,13.3176313 Z M9,23 L7,23 L9,23 Z M5.00047156,13 L5.00047156,15 L4.99508535,15 L4.99508535,13 L5.00047156,13 Z M21.0049147,3 L21.0049147,5 L23,5 L23,7 L21,7 L21,5 L19.0049147,5 L19.0049147,3 L19.0049147,1 L21.0049147,1 L23.0049147,1 L23.0049147,3 L21.0049147,3 Z M2.99508535,1 L4.99508535,1 L4.99508535,3 L5,3 L5,5 L3,5 L3,3.00047156 L1,3.00047156 L1,1.00047156 L2.99508535,1.00047156 L2.99508535,1 Z M20.0049147,21 L20.0049147,19 L21,19 L21,21 L20.0049147,21 Z M1,19 L1,17 L3,17 L3,19 L1,19 Z M22,23 L22,21 L23,21 L23,23 L22,23 Z M1,23 L1,21 L2,21 L2,23 L1,23 Z M3,21 L3,19 L4,19 L4,21 L3,21 Z M3,17 L3,15 L4,15 L4,17 L3,17 Z M1,15 L1,13 L3,13 L3,15 L1,15 Z M21,11 L21,9 L23,9 L23,11 L21,11 Z M1,11 L1,9 L3,9 L3,11 L1,11 Z M1,7 L1,5 L3,5 L3,7 L1,7 Z M4.06499057,13.4583309 C4.06499057,8.87677068 8.08749857,6.23879932 11.37559,6.23879932 C11.9147083,6.23879932 12.3069055,6.23879932 12.6377997,6.23879932 C17.121932,6.23879932 19.9350094,10.2447077 19.9350094,13.4850428 C19.0878809,12.7782064 18.4923303,12.2472212 17.231427,12.2472212 C16.3908247,12.2472212 15.447479,12.6442211 14.4013899,13.4382208 C13.6920095,12.6442211 12.8631157,12.2472212 11.9147083,12.2472212 C10.9663009,12.2472212 10.1656159,12.6509245 9.51265337,13.4583309 C8.42186043,12.6509245 7.48660323,12.2472212 6.70688177,12.2472212 C5.53729958,12.2472212 4.68568627,12.9256661 4.06499057,13.4583309 Z M12.9432575,14.4506417 C12.9432575,15.1921693 12.9432575,17.9349906 12.9432575,19.6280258 C12.9432575,21.321061 11.8802698,22.702033 10.4350335,22.702033 C8.9897972,22.702033 9.73203462,22.702033 9.30706659,22.702033 C8.06189692,22.702033 6.74671725,21.3377506 6.74671725,20.2078226 C6.74671725,20.0934976 6.74671725,20.2059582 6.74671725,19.7592882 C6.74671725,19.3126181 6.87175798,18.9731257 7.48840038,18.9731257 C8.10504278,18.9731257 8.17555313,19.6563439 8.17555313,19.9968513 C8.17555313,20.3373588 8.9255005,21.1604653 9.46974851,21.1610141 C10.0139965,21.1615628 9.622862,21.1613752 10.1078755,21.1604653 C10.5928891,21.1595554 11.3536399,20.7293311 11.3536399,19.7592882 C11.3536399,18.7892452 11.3536399,14.7598693 11.3536399,14.4506417 C11.3536399,14.1414141 11.5668004,13.4850428 12.0438468,13.4850428 C12.5208932,13.4850428 12.1751181,13.4850428 12.3354788,13.4850428 C12.4958394,13.4850428 12.9432575,13.7091142 12.9432575,14.4506417 Z" id="Combined-Shape" fill="#FFFFFF"></path>
+        <path d="M23,21 C23,22.0564621 22.1861271,22.9183561 21.1538102,22.9945273 L21.0049147,23 L21.0049147,21 L23,21 Z M2.99508535,21 L2.99508535,23 L2.84618979,22.9945277 C1.86548876,22.9221743 1.0819334,22.1408898 1.00602962,21.1611802 L1,21.0049147 L1,21 L2.99508535,21 Z M12.3354788,13.4850428 C12.4958394,13.4850428 12.9432575,13.7091142 12.9432575,14.4506417 L12.9432575,19.6280258 C12.9432575,21.321061 11.8802698,22.702033 10.4350335,22.702033 L9.30706659,22.702033 C8.06189692,22.702033 6.74671725,21.3377506 6.74671725,20.2078226 L6.74671725,19.7592882 C6.74671725,19.3126181 6.87175798,18.9731257 7.48840038,18.9731257 C8.10504278,18.9731257 8.17555313,19.6563439 8.17555313,19.9968513 C8.17555313,20.3373588 8.9255005,21.1604653 9.46974851,21.1610141 L9.92999439,21.16086 L10.1078755,21.1604653 L10.1078755,21.1604653 C10.5928891,21.1595554 11.3536399,20.7293311 11.3536399,19.7592882 L11.3536399,14.4506417 C11.3536399,14.1414141 11.5668004,13.4850428 12.0438468,13.4850428 L12.3354788,13.4850428 Z M23,17 L23,19 L21,19 L21,17 L23,17 Z M3,17 L3,19 L1,19 L1,17 L3,17 Z M3,13 L3,15 L1,15 L1,13 L3,13 Z M23,13 L23,15 L21,15 L21,13.316 C21.0049147,13.2365309 21.0034887,13.1597602 21.0006368,13.0823563 L21,13 L23,13 Z M12.6377997,6.23879932 C17.121932,6.23879932 19.9350094,10.2447077 19.9350094,13.4850428 C19.0878809,12.7782064 18.4923303,12.2472212 17.231427,12.2472212 C16.3908247,12.2472212 15.447479,12.6442211 14.4013899,13.4382208 C13.6920095,12.6442211 12.8631157,12.2472212 11.9147083,12.2472212 C10.9663009,12.2472212 10.1656159,12.6509245 9.51265337,13.4583309 C8.42186043,12.6509245 7.48660323,12.2472212 6.70688177,12.2472212 C5.53729958,12.2472212 4.68568627,12.9256661 4.06499057,13.4583309 C4.06499057,8.96840188 7.92820725,6.34509561 11.1774613,6.24195933 L11.37559,6.23879932 L12.6377997,6.23879932 Z M3,9 L3,11 L1,11 L1,9 L3,9 Z M23,9 L23,11 L21,11 L21,9 L23,9 Z M19,5 L19,7 L21,7 L21,9 L19.6743681,9.00040014 C19.022753,7.96352888 18.1317639,7.00627032 17.001324,6.27335655 L17,5 L19,5 Z M7,5 L6.99970468,5.99975599 C5.59663653,6.75633194 4.57993386,7.82297324 3.92206649,9.00024914 L3,9 L3,7 L5,7 L5,5 L7,5 Z M21.0049147,1 C22.0592764,1 22.9230798,1.81587779 22.9994289,2.85073766 L23.0049147,3 L21.0049147,3 L21.0049147,5 L23,5 L23,7 L21,7 L21,5 L19.0049147,5 L19.0049147,1 L21.0049147,1 Z M3,5 L3,7 L1,7 L1,5 L3,5 Z M4.99508535,1 L4.99508535,3 L5,3 L5,5 L3,5 L3,3 L1,3.00047156 C1,1.94610976 1.81587779,1.08230644 2.85073766,1.00595729 L2.99508535,1 L4.99508535,1 Z M19,1 L19,3 L17,3 L17,5.00047156 L15,5.00047156 L15,3 L13,3 L11,3 L11,3 L9,3 L9,5 L7,5 L7,3 L5,3 L5,1 L19,1 Z M13,3 L13.0007924,4.90244849 C12.6728593,4.87041075 12.334846,4.85376711 11.9867518,4.85376711 C11.6477149,4.85376711 11.3189118,4.86610744 11.0002348,4.89000787 L11,3 L13,3 Z" id="Combined-Shape" fill="#FFFFFF"></path>
     </g>
-</svg>
+</svg>
\ No newline at end of file
diff --git a/Gems/GradientSignal/Code/Source/Editor/EditorConstantGradientComponent.h b/Gems/GradientSignal/Code/Source/Editor/EditorConstantGradientComponent.h
index 321c126b91..02a5d8ec33 100644
--- a/Gems/GradientSignal/Code/Source/Editor/EditorConstantGradientComponent.h
+++ b/Gems/GradientSignal/Code/Source/Editor/EditorConstantGradientComponent.h
@@ -25,7 +25,7 @@ namespace GradientSignal
         static constexpr const char* const s_componentName = "Constant Gradient";
         static constexpr const char* const s_componentDescription = "Returns a specified value as a gradient when sampled";
         static constexpr const char* const s_icon = "Editor/Icons/Components/Gradient.svg";
-        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/Gradient.png";
+        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/Gradient.svg";
         static constexpr const char* const s_helpUrl = "https://o3de.org/docs/user-guide/components/";
     };
 }
diff --git a/Gems/GradientSignal/Code/Source/Editor/EditorDitherGradientComponent.h b/Gems/GradientSignal/Code/Source/Editor/EditorDitherGradientComponent.h
index eaa2ff2b8b..39ce4973c5 100644
--- a/Gems/GradientSignal/Code/Source/Editor/EditorDitherGradientComponent.h
+++ b/Gems/GradientSignal/Code/Source/Editor/EditorDitherGradientComponent.h
@@ -25,7 +25,7 @@ namespace GradientSignal
         static constexpr const char* const s_componentName = "Dither Gradient Modifier";
         static constexpr const char* const s_componentDescription = "Applies ordered dithering to the input gradient";
         static constexpr const char* const s_icon = "Editor/Icons/Components/GradientModifier.svg";
-        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/GradientModifier.png";
+        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/GradientModifier.svg";
         static constexpr const char* const s_helpUrl = "https://o3de.org/docs/user-guide/components/";
 
     protected:
diff --git a/Gems/GradientSignal/Code/Source/Editor/EditorGradientTransformComponent.h b/Gems/GradientSignal/Code/Source/Editor/EditorGradientTransformComponent.h
index 80cd5f679b..8478d3e434 100644
--- a/Gems/GradientSignal/Code/Source/Editor/EditorGradientTransformComponent.h
+++ b/Gems/GradientSignal/Code/Source/Editor/EditorGradientTransformComponent.h
@@ -34,7 +34,7 @@ namespace GradientSignal
         static constexpr const char* const s_componentName = "Gradient Transform Modifier";
         static constexpr const char* const s_componentDescription = "Transforms coordinates into a space relative to a shape, allowing other transform and sampling modifications";
         static constexpr const char* const s_icon = "Editor/Icons/Components/GradientModifier.svg";
-        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/GradientModifier.png";
+        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/GradientModifier.svg";
         static constexpr const char* const s_helpUrl = "https://o3de.org/docs/user-guide/components/";
 
     private:
diff --git a/Gems/GradientSignal/Code/Source/Editor/EditorImageGradientComponent.h b/Gems/GradientSignal/Code/Source/Editor/EditorImageGradientComponent.h
index 5a7a9742c1..d1682be46f 100644
--- a/Gems/GradientSignal/Code/Source/Editor/EditorImageGradientComponent.h
+++ b/Gems/GradientSignal/Code/Source/Editor/EditorImageGradientComponent.h
@@ -25,7 +25,7 @@ namespace GradientSignal
         static constexpr const char* const s_componentName = "Image Gradient";
         static constexpr const char* const s_componentDescription = "Generates a gradient by sampling an image asset";
         static constexpr const char* const s_icon = "Editor/Icons/Components/Gradient.svg";
-        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/Gradient.png";
+        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/Gradient.svg";
         static constexpr const char* const s_helpUrl = "https://o3de.org/docs/user-guide/components/";
     };
 }
diff --git a/Gems/GradientSignal/Code/Source/Editor/EditorInvertGradientComponent.h b/Gems/GradientSignal/Code/Source/Editor/EditorInvertGradientComponent.h
index 10c5e60692..ab9c13679c 100644
--- a/Gems/GradientSignal/Code/Source/Editor/EditorInvertGradientComponent.h
+++ b/Gems/GradientSignal/Code/Source/Editor/EditorInvertGradientComponent.h
@@ -25,7 +25,7 @@ namespace GradientSignal
         static constexpr const char* const s_componentName = "Invert Gradient Modifier";
         static constexpr const char* const s_componentDescription = "Inverts a gradient's values";
         static constexpr const char* const s_icon = "Editor/Icons/Components/GradientModifier.svg";
-        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/GradientModifier.png";
+        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/GradientModifier.svg";
         static constexpr const char* const s_helpUrl = "https://o3de.org/docs/user-guide/components/";
     };
 }
diff --git a/Gems/GradientSignal/Code/Source/Editor/EditorLevelsGradientComponent.h b/Gems/GradientSignal/Code/Source/Editor/EditorLevelsGradientComponent.h
index d914750b63..a2626d9a0a 100644
--- a/Gems/GradientSignal/Code/Source/Editor/EditorLevelsGradientComponent.h
+++ b/Gems/GradientSignal/Code/Source/Editor/EditorLevelsGradientComponent.h
@@ -25,7 +25,7 @@ namespace GradientSignal
         static constexpr const char* const s_componentName = "Levels Gradient Modifier";
         static constexpr const char* const s_componentDescription = "Modifies an input gradient's signal using low/mid/high points and allows clamping of min/max output values";
         static constexpr const char* const s_icon = "Editor/Icons/Components/GradientModifier.svg";
-        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/GradientModifier.png";
+        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/GradientModifier.svg";
         static constexpr const char* const s_helpUrl = "https://o3de.org/docs/user-guide/components/";
     };
 }
diff --git a/Gems/GradientSignal/Code/Source/Editor/EditorMixedGradientComponent.h b/Gems/GradientSignal/Code/Source/Editor/EditorMixedGradientComponent.h
index a4951f0c7b..837c64e6d8 100644
--- a/Gems/GradientSignal/Code/Source/Editor/EditorMixedGradientComponent.h
+++ b/Gems/GradientSignal/Code/Source/Editor/EditorMixedGradientComponent.h
@@ -57,7 +57,7 @@ namespace GradientSignal
         static constexpr const char* const s_componentName = "Gradient Mixer";
         static constexpr const char* const s_componentDescription = "Generates a new gradient by combining other gradients";
         static constexpr const char* const s_icon = "Editor/Icons/Components/GradientModifier.svg";
-        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/GradientModifier.png";
+        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/GradientModifier.svg";
         static constexpr const char* const s_helpUrl = "https://o3de.org/docs/user-guide/components/";
 
     protected:
diff --git a/Gems/GradientSignal/Code/Source/Editor/EditorPerlinGradientComponent.h b/Gems/GradientSignal/Code/Source/Editor/EditorPerlinGradientComponent.h
index fd8672357d..4ef09ee3e4 100644
--- a/Gems/GradientSignal/Code/Source/Editor/EditorPerlinGradientComponent.h
+++ b/Gems/GradientSignal/Code/Source/Editor/EditorPerlinGradientComponent.h
@@ -26,7 +26,7 @@ namespace GradientSignal
         static constexpr const char* const s_componentName = "Perlin Noise Gradient";
         static constexpr const char* const s_componentDescription = "Generates a gradient by sampling a perlin noise generator";
         static constexpr const char* const s_icon = "Editor/Icons/Components/Gradient.svg";
-        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/Gradient.png";
+        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/Gradient.svg";
         static constexpr const char* const s_helpUrl = "https://o3de.org/docs/user-guide/components/";
 
     private:
diff --git a/Gems/GradientSignal/Code/Source/Editor/EditorPosterizeGradientComponent.h b/Gems/GradientSignal/Code/Source/Editor/EditorPosterizeGradientComponent.h
index 9c36cd79c5..af85429b32 100644
--- a/Gems/GradientSignal/Code/Source/Editor/EditorPosterizeGradientComponent.h
+++ b/Gems/GradientSignal/Code/Source/Editor/EditorPosterizeGradientComponent.h
@@ -25,7 +25,7 @@ namespace GradientSignal
         static constexpr const char* const s_componentName = "Posterize Gradient Modifier";
         static constexpr const char* const s_componentDescription = "Divides an input gradient's signal into a specified number of bands";
         static constexpr const char* const s_icon = "Editor/Icons/Components/GradientModifier.svg";
-        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/GradientModifier.png";
+        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/GradientModifier.svg";
         static constexpr const char* const s_helpUrl = "https://o3de.org/docs/user-guide/components/";
     };
 }
diff --git a/Gems/GradientSignal/Code/Source/Editor/EditorRandomGradientComponent.h b/Gems/GradientSignal/Code/Source/Editor/EditorRandomGradientComponent.h
index eb010238c0..750e5bae4f 100644
--- a/Gems/GradientSignal/Code/Source/Editor/EditorRandomGradientComponent.h
+++ b/Gems/GradientSignal/Code/Source/Editor/EditorRandomGradientComponent.h
@@ -28,7 +28,7 @@ namespace GradientSignal
         static constexpr const char* const s_componentName = "Random Noise Gradient";
         static constexpr const char* const s_componentDescription = "Generates a gradient by sampling a random noise generator";
         static constexpr const char* const s_icon = "Editor/Icons/Components/Gradient.svg";
-        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/Gradient.png";
+        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/Gradient.svg";
         static constexpr const char* const s_helpUrl = "https://o3de.org/docs/user-guide/components/";
 
     private:
diff --git a/Gems/GradientSignal/Code/Source/Editor/EditorReferenceGradientComponent.h b/Gems/GradientSignal/Code/Source/Editor/EditorReferenceGradientComponent.h
index 2bd600ee3f..41eccf27e4 100644
--- a/Gems/GradientSignal/Code/Source/Editor/EditorReferenceGradientComponent.h
+++ b/Gems/GradientSignal/Code/Source/Editor/EditorReferenceGradientComponent.h
@@ -25,7 +25,7 @@ namespace GradientSignal
         static constexpr const char* const s_componentName = "Reference Gradient";
         static constexpr const char* const s_componentDescription = "References another gradient";
         static constexpr const char* const s_icon = "Editor/Icons/Components/Gradient.svg";
-        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/Gradient.png";
+        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/Gradient.svg";
         static constexpr const char* const s_helpUrl = "https://o3de.org/docs/user-guide/components/";
     };
 }
diff --git a/Gems/GradientSignal/Code/Source/Editor/EditorShapeAreaFalloffGradientComponent.h b/Gems/GradientSignal/Code/Source/Editor/EditorShapeAreaFalloffGradientComponent.h
index 6446893bd3..d8d7c052ce 100644
--- a/Gems/GradientSignal/Code/Source/Editor/EditorShapeAreaFalloffGradientComponent.h
+++ b/Gems/GradientSignal/Code/Source/Editor/EditorShapeAreaFalloffGradientComponent.h
@@ -25,7 +25,7 @@ namespace GradientSignal
         static constexpr const char* const s_componentName = "Shape Falloff Gradient";
         static constexpr const char* const s_componentDescription = "Generates a gradient based on distance from a shape";
         static constexpr const char* const s_icon = "Editor/Icons/Components/Gradient.svg";
-        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/Gradient.png";
+        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/Gradient.svg";
         static constexpr const char* const s_helpUrl = "https://o3de.org/docs/user-guide/components/";
     };
 }
diff --git a/Gems/GradientSignal/Code/Source/Editor/EditorSmoothStepGradientComponent.h b/Gems/GradientSignal/Code/Source/Editor/EditorSmoothStepGradientComponent.h
index 57997bbcaf..864a419985 100644
--- a/Gems/GradientSignal/Code/Source/Editor/EditorSmoothStepGradientComponent.h
+++ b/Gems/GradientSignal/Code/Source/Editor/EditorSmoothStepGradientComponent.h
@@ -25,7 +25,7 @@ namespace GradientSignal
         static constexpr const char* const s_componentName = "Smooth-Step Gradient Modifier";
         static constexpr const char* const s_componentDescription = "Generates a gradient with fall off, which creates a smoother input gradient";
         static constexpr const char* const s_icon = "Editor/Icons/Components/GradientModifier.svg";
-        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/GradientModifier.png";
+        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/GradientModifier.svg";
         static constexpr const char* const s_helpUrl = "https://o3de.org/docs/user-guide/components/";
     };
 }
diff --git a/Gems/GradientSignal/Code/Source/Editor/EditorSurfaceAltitudeGradientComponent.h b/Gems/GradientSignal/Code/Source/Editor/EditorSurfaceAltitudeGradientComponent.h
index 354507ae26..b334bb149d 100644
--- a/Gems/GradientSignal/Code/Source/Editor/EditorSurfaceAltitudeGradientComponent.h
+++ b/Gems/GradientSignal/Code/Source/Editor/EditorSurfaceAltitudeGradientComponent.h
@@ -25,7 +25,7 @@ namespace GradientSignal
         static constexpr const char* const s_componentName = "Altitude Gradient";
         static constexpr const char* const s_componentDescription = "Generates a gradient based on height within a range";
         static constexpr const char* const s_icon = "Editor/Icons/Components/Gradient.svg";
-        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/Gradient.png";
+        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/Gradient.svg";
         static constexpr const char* const s_helpUrl = "https://o3de.org/docs/user-guide/components/";
 
         // AZ::Component interface
diff --git a/Gems/GradientSignal/Code/Source/Editor/EditorSurfaceMaskGradientComponent.h b/Gems/GradientSignal/Code/Source/Editor/EditorSurfaceMaskGradientComponent.h
index 15132d9567..5df17a2699 100644
--- a/Gems/GradientSignal/Code/Source/Editor/EditorSurfaceMaskGradientComponent.h
+++ b/Gems/GradientSignal/Code/Source/Editor/EditorSurfaceMaskGradientComponent.h
@@ -25,7 +25,7 @@ namespace GradientSignal
         static constexpr const char* const s_componentName = "Surface Mask Gradient";
         static constexpr const char* const s_componentDescription = "Generates a gradient based on underlying surface types";
         static constexpr const char* const s_icon = "Editor/Icons/Components/Gradient.svg";
-        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/Gradient.png";
+        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/Gradient.svg";
         static constexpr const char* const s_helpUrl = "https://o3de.org/docs/user-guide/components/";
     };
 }
diff --git a/Gems/GradientSignal/Code/Source/Editor/EditorSurfaceSlopeGradientComponent.h b/Gems/GradientSignal/Code/Source/Editor/EditorSurfaceSlopeGradientComponent.h
index 4c3018eb88..ad1adb98f9 100644
--- a/Gems/GradientSignal/Code/Source/Editor/EditorSurfaceSlopeGradientComponent.h
+++ b/Gems/GradientSignal/Code/Source/Editor/EditorSurfaceSlopeGradientComponent.h
@@ -25,7 +25,7 @@ namespace GradientSignal
         static constexpr const char* const s_componentName = "Slope Gradient";
         static constexpr const char* const s_componentDescription = "Generates a gradient based on surface angle";
         static constexpr const char* const s_icon = "Editor/Icons/Components/Gradient.svg";
-        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/Gradient.png";
+        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/Gradient.svg";
         static constexpr const char* const s_helpUrl = "https://o3de.org/docs/user-guide/components/";
     };
 }
diff --git a/Gems/GradientSignal/Code/Source/Editor/EditorThresholdGradientComponent.h b/Gems/GradientSignal/Code/Source/Editor/EditorThresholdGradientComponent.h
index b6f97dc3ce..0291e65fd8 100644
--- a/Gems/GradientSignal/Code/Source/Editor/EditorThresholdGradientComponent.h
+++ b/Gems/GradientSignal/Code/Source/Editor/EditorThresholdGradientComponent.h
@@ -25,7 +25,7 @@ namespace GradientSignal
         static constexpr const char* const s_componentName = "Threshold Gradient Modifier";
         static constexpr const char* const s_componentDescription = "Converts input gradient to be 0 if below the threshold or 1 if above the threshold";
         static constexpr const char* const s_icon = "Editor/Icons/Components/GradientModifier.svg";
-        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/GradientModifier.png";
+        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/GradientModifier.svg";
         static constexpr const char* const s_helpUrl = "https://o3de.org/docs/user-guide/components/";
     };
 }
diff --git a/Gems/LandscapeCanvas/Assets/Editor/Icons/Components/LandscapeCanvas.svg b/Gems/LandscapeCanvas/Assets/Editor/Icons/Components/LandscapeCanvas.svg
index 6a285d145a..676c32797b 100644
--- a/Gems/LandscapeCanvas/Assets/Editor/Icons/Components/LandscapeCanvas.svg
+++ b/Gems/LandscapeCanvas/Assets/Editor/Icons/Components/LandscapeCanvas.svg
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 63.1 (92452) - https://sketch.com -->
-    <title>icon /landscape canvas</title>
-    <desc>Created with Sketch.</desc>
-    <g id="icon-/landscape-canvas" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <path d="M9.01604658,11.0538724 L9.01776803,11.1874447 C9.05257785,12.9928973 9.46375492,14.0316361 10.4237892,14.194109 C11.2637721,14.3362648 12.1289522,14.281615 12.4683774,13.8728236 C12.2243576,14.6436561 11.786799,15.0283726 11.2432064,15.0050276 L11.1628024,15 C10.2697126,14.9499969 4.33663518,15.0006853 2.94065357,15.0006853 C1.51618254,15.0006853 1,13.8125362 1,12.9942668 L1,11.1874447 L9.01604658,11.0538724 Z M12.1032963,1.00542684 C13.4772665,1.00542684 14.4144185,1.53653244 14.8048119,2.62715459 C15.0172217,3.22055298 15.0167783,4.0875702 14.984086,4.67549141 C14.9699002,4.930602 14.9155203,5.26926762 14.8209464,5.69148827 L14.8048119,5.76263204 L12.3409476,5.76263204 L12.3922574,6.61050948 C12.6085287,10.2562095 12.6909291,12.0861519 12.6160273,12.8306306 C12.6106656,12.883922 12.6042922,12.9362345 12.5969461,12.9875455 C12.1195209,13.5520231 11.4908624,13.7448605 10.7109811,13.5662291 C9.90039726,13.3805653 9.55431776,12.3610546 9.67274261,10.507697 L9.67722531,10.4403451 L2.87565963,10.4985312 L2.86394393,3.00893506 C2.86394393,1.92584113 3.97857862,1.01763722 4.87931521,1.00542684 L5.30226977,1.0021363 C6.66144265,0.995854352 10.8867602,1.00542684 12.1032963,1.00542684 Z M11.6878391,3.45165046 C10.0581662,5.65649883 10.6296409,6.68400996 10.5924179,9.17973908 L10.4675374,8.72232206 C10.1155789,7.44146349 9.80291168,6.42847229 9.20478136,5.84838302 C9.8467528,4.40165455 10.6296409,3.94335808 11.6878391,3.45165046 Z M8.4886756,5.7095582 C9.195913,6.79542643 9.58830956,7.86511342 9.66586526,8.91914425 L9.67174185,9.00945142 L7.27541881,9.01392456 C7.51189788,7.8633395 7.27282494,6.78239777 6.82471695,5.96586613 C6.15255498,4.74036873 5.45218496,4.12960514 3.63326587,3.67996987 C5.826145,3.40441603 7.39750932,4.0326631 8.4886756,5.7095582 Z M3.63326587,5.04904499 C4.88452248,5.04923611 5.99819077,5.98965045 6.39573967,6.80041513 C6.65130682,7.32144496 6.81665748,8.02511214 6.89179163,8.91146947 L6.89976861,9.01070543 L5.17523716,9.01392456 C5.39070501,8.3118447 5.40971903,7.71417153 5.23227921,7.22072261 L5.19741529,7.12619278 C4.91797291,6.38691943 4.36059265,5.32901258 3.63326587,5.04904499 Z M11.3973564,2.36759406 C9.40481597,3.58066591 9.09905557,4.61542723 8.94624087,5.28787533 C8.7831357,4.81474775 8.25537971,4.3106199 7.72114279,4.17880234 C8.580003,2.91895196 10.0968289,2.46779695 11.3973564,2.36759406 Z M12.8092868,2.70576481 C13.2468709,2.21649345 14.1089872,2.21649345 14.4404899,2.98201632 C14.6614917,3.49236491 14.6614917,4.25328275 14.4404899,5.26476987 L14.4404899,5.26476987 L12.2978874,5.26476987 C12.2734322,4.76441458 12.2734322,4.39215755 12.2978874,4.14799878 L12.2978874,4.14799878 L12.3174743,3.95379056 C12.3571436,3.59403429 12.4426623,3.11569487 12.8092868,2.70576481 Z" id="Shape" fill="#8BDD15"></path>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Scripting / LandscapeCanvas</title>
+    <g id="icon-/-Scripting-/-LandscapeCanvas" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M13.5240699,16.5743161 L13.5266521,16.7745884 C13.5788668,19.4816013 14.1956324,21.0390387 15.6356839,21.2826431 C16.8956581,21.495785 18.1934283,21.4138456 18.7025661,20.8009225 C18.3365364,21.9566736 17.6801985,22.5334997 16.8648096,22.4984974 L16.7442036,22.4909592 C15.4045689,22.4159868 6.50495277,22.4919868 4.41098036,22.4919868 C2.27427381,22.4919868 1.5,20.7105303 1.5,19.4836546 L1.5,16.7745884 L13.5240699,16.5743161 Z M18.1549444,1.50813675 C20.2158998,1.50813675 21.6216277,2.30445218 22.2072179,3.93968112 C22.5258326,4.8293955 22.5251675,6.12936144 22.476129,7.01086359 C22.4548503,7.39336473 22.3732805,7.90114446 22.2314196,8.53420279 L22.2072179,8.6408725 L18.5114213,8.6408725 L18.5883861,9.91214112 C18.9127931,15.3783369 19.0363937,18.1220687 18.9240409,19.2383061 C18.9159985,19.3182087 18.9064383,19.3966437 18.8954192,19.473577 C18.1792813,20.3199289 17.2362936,20.6090605 16.0664717,20.3412288 C14.8505959,20.0628529 14.3314766,18.5342453 14.5091139,15.7554058 L14.515838,15.6544213 L4.31348944,15.741663 L4.2959159,4.51210528 C4.2959159,2.88816382 5.96786792,1.52644444 7.31897281,1.50813675 L7.95340466,1.50320306 C9.99216398,1.49378421 16.3301402,1.50813675 18.1549444,1.50813675 Z M17.5317587,5.17589249 C15.0872493,8.48174122 15.9444613,10.0223444 15.8886269,13.7643264 L15.7013061,13.0784962 C15.1733684,11.1580355 14.7043675,9.6392029 13.807172,8.76944359 C14.7701292,6.60028513 15.9444613,5.91313638 17.5317587,5.17589249 Z M12.7330134,8.561296 C13.7938695,10.1893971 14.3824643,11.7932368 14.4987979,13.3736024 L14.5076128,13.5090049 L10.9131282,13.5157117 C11.2678468,11.7905771 10.9092374,10.1698626 10.2370754,8.94559239 C9.22883247,7.10813767 8.17827744,6.19238671 5.44989881,5.51822415 C8.73921749,5.10507134 11.096264,6.04703625 12.7330134,8.561296 Z M5.44989881,7.57095273 C7.32678371,7.5712393 8.99728615,8.9812535 9.59360951,10.196877 C9.97696024,10.9780852 10.2249862,12.0331316 10.3376874,13.3620952 L10.3496529,13.5108851 L7.76285574,13.5157117 C8.08605751,12.4630453 8.11457854,11.5669215 7.84841882,10.8270668 L7.79612294,10.6853331 C7.37695936,9.57690043 6.54088898,7.99072332 5.44989881,7.57095273 Z M17.0960347,3.55050794 C14.107224,5.36933234 13.6485833,6.92080611 13.4193613,7.92904401 C13.1747036,7.21965817 12.3830696,6.46379194 11.5817142,6.26615073 C12.8700045,4.37718874 15.1452434,3.70074757 17.0960347,3.55050794 Z M19.2139302,4.05754568 C19.8703064,3.3239546 21.1634809,3.3239546 21.6607349,4.47174456 C21.9922376,5.23693786 21.9922376,6.37782326 21.6607349,7.89440075 L21.6607349,7.89440075 L18.4468311,7.89440075 C18.4101484,7.14419093 18.4101484,6.58604577 18.4468311,6.21996529 L18.4468311,6.21996529 L18.4762114,5.92877837 C18.5357154,5.38937629 18.6639934,4.67217605 19.2139302,4.05754568 Z" id="Shape" fill="#D8D872"></path>
     </g>
-</svg>
+</svg>
\ No newline at end of file
diff --git a/Gems/LandscapeCanvas/Assets/Editor/Icons/Components/Viewport/LandscapeCanvas.png b/Gems/LandscapeCanvas/Assets/Editor/Icons/Components/Viewport/LandscapeCanvas.png
deleted file mode 100644
index 72e3defae4..0000000000
--- a/Gems/LandscapeCanvas/Assets/Editor/Icons/Components/Viewport/LandscapeCanvas.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:99c9f097d3662abd40064d080a07e9ec85f5def92130960ec6f8e916a5ff207e
-size 1278
diff --git a/Gems/LandscapeCanvas/Assets/Editor/Icons/Components/Viewport/LandscapeCanvas.svg b/Gems/LandscapeCanvas/Assets/Editor/Icons/Components/Viewport/LandscapeCanvas.svg
new file mode 100644
index 0000000000..85fbec0317
--- /dev/null
+++ b/Gems/LandscapeCanvas/Assets/Editor/Icons/Components/Viewport/LandscapeCanvas.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Scripting / LandscapeCanvas - box</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
+            <stop stop-color="#9D9D9D" offset="100%"></stop>
+        </linearGradient>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
+    </defs>
+    <g id="icon-/-Scripting-/-LandscapeCanvas---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/general/color/-box-template">
+            <mask id="mask-3" fill="white">
+                <use xlink:href="#path-2"></use>
+            </mask>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#D8D872">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="Rectangle-2" x="0" y="0" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+        <path d="M13.4514951,16.3564915 L13.4539543,16.547227 C13.5036826,19.1253346 14.0910785,20.6086083 15.4625561,20.8406125 C16.6625315,21.0436047 17.8985032,20.9655673 18.3833962,20.381831 C18.0347966,21.4825462 17.4097128,22.0319045 16.633152,21.9985689 L16.5182892,21.9913897 C15.2424465,21.9199874 6.76662168,21.9923684 4.77236224,21.9923684 C2.73740363,21.9923684 2,20.2957431 2,19.1272901 L2,16.547227 L13.4514951,16.3564915 Z M17.8618518,2.00774929 C19.8246664,2.00774929 21.163455,2.76614494 21.7211599,4.32350583 C22.0246024,5.17085286 22.023969,6.40891566 21.9772657,7.24844151 C21.9570003,7.61272831 21.8793147,8.09632806 21.7442091,8.69924075 L21.7211599,8.80083095 L18.2013537,8.80083095 L18.2746535,10.011563 C18.5836124,15.2174637 18.7013273,17.8305416 18.5943247,18.8936248 C18.5866652,18.9697226 18.5775603,19.0444226 18.5670659,19.1176924 C17.8850298,19.9237418 16.9869462,20.1991053 15.8728302,19.9440274 C14.7148532,19.6789076 14.2204539,18.2230907 14.3896323,15.5765769 L14.3960362,15.4804013 L4.67951375,15.5634886 L4.66277705,4.86867169 C4.66277705,3.32206078 6.25511231,2.02518518 7.54187887,2.00774929 L8.14609968,2.00305054 C10.0877752,1.9940802 16.1239431,2.00774929 17.8618518,2.00774929 Z M17.2683416,5.50084999 C14.9402374,8.64927735 15.7566298,10.1165185 15.7034542,13.6803108 L15.5250534,13.0271393 C15.0222556,11.1981291 14.5755881,9.75162181 13.7211162,8.92327961 C14.6382183,6.85741441 15.7566298,6.20298703 17.2683416,5.50084999 Z M12.698108,8.72504381 C13.7084471,10.2756163 14.2690137,11.8030827 14.3798075,13.3081928 L14.3882026,13.4371475 L10.964884,13.4435349 C11.3027113,11.8005496 10.9611785,10.257012 10.3210242,9.09104037 C9.36079283,7.3410835 8.36026422,6.46893972 5.76180839,5.82688015 C8.89449285,5.43340128 11.139299,6.33051072 12.698108,8.72504381 Z M5.76180839,7.78185974 C7.54931782,7.78213266 9.14027252,9.12500334 9.70819953,10.28274 C10.0732955,11.0267478 10.3095107,12.0315539 10.4168452,13.2972335 L10.4282409,13.4389382 L7.96462451,13.4435349 C8.27243572,12.4409955 8.29959861,11.5875443 8.04611316,10.8829207 L7.99630756,10.7479362 C7.59710416,9.69228613 6.80084665,8.18164126 5.76180839,7.78185974 Z M16.8533664,3.95286471 C14.00688,5.68507842 13.5700794,7.16267248 13.3517727,8.12289906 C13.1187653,7.4472935 12.3648282,6.7274209 11.6016326,6.53919117 C12.8285757,4.74017975 14.9954699,4.09595007 16.8533664,3.95286471 Z M18.8704097,4.43575779 C19.4955299,3.73709962 20.7271246,3.73709962 21.2006999,4.83023291 C21.5164167,5.55898844 21.5164167,6.64554596 21.2006999,8.08990547 L21.2006999,8.08990547 L18.1398391,8.08990547 C18.1049032,7.37541993 18.1049032,6.84385312 18.1398391,6.49520504 L18.1398391,6.49520504 L18.1678204,6.21788416 C18.2244909,5.7041679 18.3466604,5.02112005 18.8704097,4.43575779 Z" id="Shape" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Gems/LandscapeCanvas/Code/Source/EditorLandscapeCanvasComponent.cpp b/Gems/LandscapeCanvas/Code/Source/EditorLandscapeCanvasComponent.cpp
index 5212863c07..58f44356ff 100644
--- a/Gems/LandscapeCanvas/Code/Source/EditorLandscapeCanvasComponent.cpp
+++ b/Gems/LandscapeCanvas/Code/Source/EditorLandscapeCanvasComponent.cpp
@@ -47,7 +47,7 @@ namespace LandscapeCanvas
                 editContext->Class<EditorLandscapeCanvasComponent>("Landscape Canvas", "The Landscape Canvas component provides a node-based Editor for authoring Dynamic Vegetation")
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                         ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/LandscapeCanvas.svg")
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Viewport/LandscapeCanvas.png")
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Viewport/LandscapeCanvas.svg")
                         ->Attribute(AZ::Edit::Attributes::Category, "Vegetation")
                         ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                         ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
diff --git a/Gems/LmbrCentral/Code/Source/Ai/EditorNavigationAreaComponent.cpp b/Gems/LmbrCentral/Code/Source/Ai/EditorNavigationAreaComponent.cpp
index 0cb9d2d9d0..4a290443d0 100644
--- a/Gems/LmbrCentral/Code/Source/Ai/EditorNavigationAreaComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Ai/EditorNavigationAreaComponent.cpp
@@ -49,7 +49,7 @@ namespace LmbrCentral
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                         ->Attribute(AZ::Edit::Attributes::Category, "AI")
                         ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/NavigationArea.svg")
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/NavigationArea.png")
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/NavigationArea.svg")
                         ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                         ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://o3de.org/docs/user-guide/components/reference/nav-area/")
                         ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
diff --git a/Gems/LmbrCentral/Code/Source/Ai/EditorNavigationSeedComponent.cpp b/Gems/LmbrCentral/Code/Source/Ai/EditorNavigationSeedComponent.cpp
index 018ddbb9db..975eb17da1 100644
--- a/Gems/LmbrCentral/Code/Source/Ai/EditorNavigationSeedComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Ai/EditorNavigationSeedComponent.cpp
@@ -34,7 +34,7 @@ namespace LmbrCentral
                         ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                         ->Attribute(AZ::Edit::Attributes::Category, "AI")
                         ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/NavigationSeed.svg")
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/NavigationSeed.png")
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/NavigationSeed.svg")
                         ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                         ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://o3de.org/docs/user-guide/components/reference/nav-seed/")
                     ->DataElement(AZ::Edit::UIHandlers::ComboBox, &EditorNavigationSeedComponent::m_agentType, "Agent Type", "Describes the type of the Entity for navigation purposes.")
diff --git a/Gems/LmbrCentral/Code/Source/Ai/NavigationComponent.cpp b/Gems/LmbrCentral/Code/Source/Ai/NavigationComponent.cpp
index 69f75ec826..fbeb26706e 100644
--- a/Gems/LmbrCentral/Code/Source/Ai/NavigationComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Ai/NavigationComponent.cpp
@@ -123,7 +123,7 @@ namespace LmbrCentral
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                     ->Attribute(AZ::Edit::Attributes::Category, "AI")
                     ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Navigation.svg")
-                    ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Navigation.png")
+                    ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Navigation.svg")
                     ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                     ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                     ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://o3de.org/docs/user-guide/components/reference/navigation/")
diff --git a/Gems/LmbrCentral/Code/Source/Audio/AudioProxyComponent.cpp b/Gems/LmbrCentral/Code/Source/Audio/AudioProxyComponent.cpp
index 030b126653..8be8aa042e 100644
--- a/Gems/LmbrCentral/Code/Source/Audio/AudioProxyComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Audio/AudioProxyComponent.cpp
@@ -36,6 +36,7 @@ namespace LmbrCentral
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                         ->Attribute(AZ::Edit::Attributes::Category, "Audio")
                         ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/AudioProxy.svg")
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/AudioProxy.svg")
                         ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                         ->Attribute(AZ::Edit::Attributes::AddableByUser, true)
                         ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://o3de.org/docs/user-guide/components/reference/audio-proxy/")
diff --git a/Gems/LmbrCentral/Code/Source/Audio/EditorAudioAreaEnvironmentComponent.cpp b/Gems/LmbrCentral/Code/Source/Audio/EditorAudioAreaEnvironmentComponent.cpp
index e7e2a27d7e..2b4741331f 100644
--- a/Gems/LmbrCentral/Code/Source/Audio/EditorAudioAreaEnvironmentComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Audio/EditorAudioAreaEnvironmentComponent.cpp
@@ -37,7 +37,7 @@ namespace LmbrCentral
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                         ->Attribute(AZ::Edit::Attributes::Category, "Audio")
                         ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/AudioAreaEnvironment.svg")
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/AudioAreaEnvironment.png")
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/AudioAreaEnvironment.svg")
                         ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                         ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                         ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://o3de.org/docs/user-guide/components/reference/audio-area-environment/")
diff --git a/Gems/LmbrCentral/Code/Source/Audio/EditorAudioListenerComponent.cpp b/Gems/LmbrCentral/Code/Source/Audio/EditorAudioListenerComponent.cpp
index 43497ac104..205267db73 100644
--- a/Gems/LmbrCentral/Code/Source/Audio/EditorAudioListenerComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Audio/EditorAudioListenerComponent.cpp
@@ -33,7 +33,7 @@ namespace LmbrCentral
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                         ->Attribute(AZ::Edit::Attributes::Category, "Audio")
                         ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/AudioListener.svg")
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/AudioListener.png")
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/AudioListener.svg")
                         ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                         ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                         ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://o3de.org/docs/user-guide/components/reference/audio-listener/")
diff --git a/Gems/LmbrCentral/Code/Source/Audio/EditorAudioMultiPositionComponent.cpp b/Gems/LmbrCentral/Code/Source/Audio/EditorAudioMultiPositionComponent.cpp
index 3a5f0d0a92..987fa6e0e4 100644
--- a/Gems/LmbrCentral/Code/Source/Audio/EditorAudioMultiPositionComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Audio/EditorAudioMultiPositionComponent.cpp
@@ -34,8 +34,8 @@ namespace LmbrCentral
                 editContext->Class<EditorAudioMultiPositionComponent>("Multi-Position Audio", "The Multi-Position Audio component provides the ability to broadcast sounds through multiple positions")
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                         ->Attribute(AZ::Edit::Attributes::Category, "Audio")
-                        ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/AudioMultiPosition.png")
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/AudioMultiPosition.png")
+                        ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/AudioMultiPosition.svg")
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/AudioMultiPosition.svg")
                         ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                         ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                         // Followup: Need Help URL
diff --git a/Gems/LmbrCentral/Code/Source/Audio/EditorAudioPreloadComponent.cpp b/Gems/LmbrCentral/Code/Source/Audio/EditorAudioPreloadComponent.cpp
index 4d2943166b..a5d137c1b2 100644
--- a/Gems/LmbrCentral/Code/Source/Audio/EditorAudioPreloadComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Audio/EditorAudioPreloadComponent.cpp
@@ -36,6 +36,7 @@ namespace LmbrCentral
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                         ->Attribute(AZ::Edit::Attributes::Category, "Audio")
                         ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/AudioPreload.svg")
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/AudioPreload.svg")
                         ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                         ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
 
diff --git a/Gems/LmbrCentral/Code/Source/Audio/EditorAudioRtpcComponent.cpp b/Gems/LmbrCentral/Code/Source/Audio/EditorAudioRtpcComponent.cpp
index 16638cde85..ab98692a50 100644
--- a/Gems/LmbrCentral/Code/Source/Audio/EditorAudioRtpcComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Audio/EditorAudioRtpcComponent.cpp
@@ -31,7 +31,7 @@ namespace LmbrCentral
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                         ->Attribute(AZ::Edit::Attributes::Category, "Audio")
                         ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/AudioRtpc.svg")
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/AudioRtpc.png")
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/AudioRtpc.svg")
                         ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                         ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                         ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://o3de.org/docs/user-guide/components/reference/audio-rtpc/")
diff --git a/Gems/LmbrCentral/Code/Source/Audio/EditorAudioSwitchComponent.cpp b/Gems/LmbrCentral/Code/Source/Audio/EditorAudioSwitchComponent.cpp
index ce08ddbf46..6ea89ee31e 100644
--- a/Gems/LmbrCentral/Code/Source/Audio/EditorAudioSwitchComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Audio/EditorAudioSwitchComponent.cpp
@@ -31,7 +31,7 @@ namespace LmbrCentral
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                         ->Attribute(AZ::Edit::Attributes::Category, "Audio")
                         ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/AudioSwitch.svg")
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/AudioSwitch.png")
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/AudioSwitch.svg")
                         ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                         ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                         ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://o3de.org/docs/user-guide/components/reference/audio-switch/")
diff --git a/Gems/LmbrCentral/Code/Source/Audio/EditorAudioTriggerComponent.cpp b/Gems/LmbrCentral/Code/Source/Audio/EditorAudioTriggerComponent.cpp
index efafda9b77..e38caf303b 100644
--- a/Gems/LmbrCentral/Code/Source/Audio/EditorAudioTriggerComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Audio/EditorAudioTriggerComponent.cpp
@@ -40,7 +40,7 @@ namespace LmbrCentral
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                         ->Attribute(AZ::Edit::Attributes::Category, "Audio")
                         ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/AudioTrigger.svg")
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/AudioTrigger.png")
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/AudioTrigger.svg")
                         ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                         ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                         ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://o3de.org/docs/user-guide/components/reference/audio-trigger/")
diff --git a/Gems/LmbrCentral/Code/Source/Scripting/EditorLookAtComponent.cpp b/Gems/LmbrCentral/Code/Source/Scripting/EditorLookAtComponent.cpp
index 75789ded1f..54a56cd2a6 100644
--- a/Gems/LmbrCentral/Code/Source/Scripting/EditorLookAtComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Scripting/EditorLookAtComponent.cpp
@@ -31,8 +31,8 @@ namespace LmbrCentral
 
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                         ->Attribute(AZ::Edit::Attributes::Category, "Gameplay")
-                        ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/LookAt.png")
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/LookAt.png")
+                        ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/LookAt.svg")
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/LookAt.svg")
                         ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                         ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
 
diff --git a/Gems/LmbrCentral/Code/Source/Scripting/EditorRandomTimedSpawnerComponent.cpp b/Gems/LmbrCentral/Code/Source/Scripting/EditorRandomTimedSpawnerComponent.cpp
index 7fa6c1043d..cd45c88a8a 100644
--- a/Gems/LmbrCentral/Code/Source/Scripting/EditorRandomTimedSpawnerComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Scripting/EditorRandomTimedSpawnerComponent.cpp
@@ -56,7 +56,7 @@ namespace LmbrCentral
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                     ->Attribute(AZ::Edit::Attributes::Category, "Gameplay")
                     ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/RandomTimedSpawner.svg")
-                    ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/RandomTimedSpawner.png")
+                    ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/RandomTimedSpawner.svg")
                     ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                     ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                     ->Attribute(AZ::Edit::Attributes::HelpPageURL, "http://docs.aws.amazon.com/console/lumberyard/userguide/random-timed-spawner-component")
diff --git a/Gems/LmbrCentral/Code/Source/Scripting/EditorSpawnerComponent.cpp b/Gems/LmbrCentral/Code/Source/Scripting/EditorSpawnerComponent.cpp
index 45e690c9e8..315480c869 100644
--- a/Gems/LmbrCentral/Code/Source/Scripting/EditorSpawnerComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Scripting/EditorSpawnerComponent.cpp
@@ -37,7 +37,7 @@ namespace LmbrCentral
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                     ->Attribute(AZ::Edit::Attributes::Category, "Gameplay")
                     ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Spawner.svg")
-                    ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Spawner.png")
+                    ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Spawner.svg")
                     ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                     ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                     ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://o3de.org/docs/user-guide/components/reference/spawner/")
diff --git a/Gems/LmbrCentral/Code/Source/Scripting/EditorTagComponent.cpp b/Gems/LmbrCentral/Code/Source/Scripting/EditorTagComponent.cpp
index 08f0cacfaa..251f0203b4 100644
--- a/Gems/LmbrCentral/Code/Source/Scripting/EditorTagComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Scripting/EditorTagComponent.cpp
@@ -35,7 +35,7 @@ namespace LmbrCentral
                         ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                         ->Attribute(AZ::Edit::Attributes::Category, "Gameplay")
                         ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Tag.svg")
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Tag.png")
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Tag.svg")
                         ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                         ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://o3de.org/docs/user-guide/components/reference/tag/")
                     ->DataElement(AZ::Edit::UIHandlers::Default, &EditorTagComponent::m_tags, "Tags", "The tags that will be on this entity by default")
diff --git a/Gems/LmbrCentral/Code/Source/Scripting/SimpleStateComponent.cpp b/Gems/LmbrCentral/Code/Source/Scripting/SimpleStateComponent.cpp
index f75a48054b..ad60e86834 100644
--- a/Gems/LmbrCentral/Code/Source/Scripting/SimpleStateComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Scripting/SimpleStateComponent.cpp
@@ -203,7 +203,7 @@ namespace LmbrCentral
                         ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                         ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                         ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/SimpleState.svg")
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/SimpleState.png")
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/SimpleState.svg")
                         ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://o3de.org/docs/user-guide/components/reference/simple-state/")
                     ->DataElement(AZ::Edit::UIHandlers::ComboBox, &SimpleStateComponent::m_initialStateName, "Initial state", "The initial active state")
                         ->Attribute(AZ::Edit::Attributes::ChangeNotify, AZ_CRC("RefreshAttributesAndValues", 0xcbc2147c))
diff --git a/Gems/LmbrCentral/Code/Source/Shape/EditorBoxShapeComponent.cpp b/Gems/LmbrCentral/Code/Source/Shape/EditorBoxShapeComponent.cpp
index 40e2860e95..f645c54610 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/EditorBoxShapeComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Shape/EditorBoxShapeComponent.cpp
@@ -44,7 +44,7 @@ namespace LmbrCentral
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                         ->Attribute(AZ::Edit::Attributes::Category, "Shape")
                         ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Box_Shape.svg")
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Box_Shape.png")
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Box_Shape.svg")
                         ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                         ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                         ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://o3de.org/docs/user-guide/components/reference/shape/box-shape/")
diff --git a/Gems/LmbrCentral/Code/Source/Shape/EditorCapsuleShapeComponent.cpp b/Gems/LmbrCentral/Code/Source/Shape/EditorCapsuleShapeComponent.cpp
index 25dee65695..66c92d751a 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/EditorCapsuleShapeComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Shape/EditorCapsuleShapeComponent.cpp
@@ -38,7 +38,7 @@ namespace LmbrCentral
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                         ->Attribute(AZ::Edit::Attributes::Category, "Shape")
                         ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Capsule_Shape.svg")
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Capsule_Shape.png")
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Capsule_Shape.svg")
                         ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                         ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                         ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://o3de.org/docs/user-guide/components/reference/shape/capsule-shape/")
diff --git a/Gems/LmbrCentral/Code/Source/Shape/EditorCompoundShapeComponent.cpp b/Gems/LmbrCentral/Code/Source/Shape/EditorCompoundShapeComponent.cpp
index 2ae833066e..6eb0ce1ffd 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/EditorCompoundShapeComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Shape/EditorCompoundShapeComponent.cpp
@@ -33,7 +33,7 @@ namespace LmbrCentral
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                         ->Attribute(AZ::Edit::Attributes::Category, "Shape")
                         ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Compound_Shape.svg")
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Sphere.png")
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Compound_Shape.svg")
                         ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                         ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                         ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://o3de.org/docs/user-guide/components/reference/shape/compound-shape/")
diff --git a/Gems/LmbrCentral/Code/Source/Shape/EditorCylinderShapeComponent.cpp b/Gems/LmbrCentral/Code/Source/Shape/EditorCylinderShapeComponent.cpp
index 16cdf9f710..4b1497f8f3 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/EditorCylinderShapeComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Shape/EditorCylinderShapeComponent.cpp
@@ -38,7 +38,7 @@ namespace LmbrCentral
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                         ->Attribute(AZ::Edit::Attributes::Category, "Shape")
                         ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Cylinder_Shape.svg")
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Cylinder_Shape.png")
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Cylinder_Shape.svg")
                         ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                         ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                         ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://o3de.org/docs/user-guide/components/reference/shape/cylinder-shape/")
diff --git a/Gems/LmbrCentral/Code/Source/Shape/EditorDiskShapeComponent.cpp b/Gems/LmbrCentral/Code/Source/Shape/EditorDiskShapeComponent.cpp
index d021d9a140..706253b40b 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/EditorDiskShapeComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Shape/EditorDiskShapeComponent.cpp
@@ -31,7 +31,7 @@ namespace LmbrCentral
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                     ->Attribute(AZ::Edit::Attributes::Category, "Shape")
                     ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Disk_Shape.svg")
-                    ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Disk_Shape.png")
+                    ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Disk_Shape.svg")
                     ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                     ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                     ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://o3de.org/docs/user-guide/components/reference/shape/disk-shape/")
diff --git a/Gems/LmbrCentral/Code/Source/Shape/EditorPolygonPrismShapeComponent.cpp b/Gems/LmbrCentral/Code/Source/Shape/EditorPolygonPrismShapeComponent.cpp
index 1979345083..088a8b4b91 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/EditorPolygonPrismShapeComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Shape/EditorPolygonPrismShapeComponent.cpp
@@ -161,7 +161,7 @@ namespace LmbrCentral
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                         ->Attribute(AZ::Edit::Attributes::Category, "Shape")
                         ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/PolygonPrism.svg")
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/PolygonPrism.png")
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/PolygonPrism.svg")
                         ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                         ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://o3de.org/docs/user-guide/components/reference/shape/polygon-prism-shape/")
                         ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
diff --git a/Gems/LmbrCentral/Code/Source/Shape/EditorQuadShapeComponent.cpp b/Gems/LmbrCentral/Code/Source/Shape/EditorQuadShapeComponent.cpp
index a6a7941926..42be01b536 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/EditorQuadShapeComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Shape/EditorQuadShapeComponent.cpp
@@ -31,7 +31,7 @@ namespace LmbrCentral
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                         ->Attribute(AZ::Edit::Attributes::Category, "Shape")
                         ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Quad_Shape.svg")
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Component_Placeholder.png")
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Component_Placeholder.svg")
                         ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                         ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                     ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://o3de.org/docs/user-guide/components/reference/shape/quad-shape/")
diff --git a/Gems/LmbrCentral/Code/Source/Shape/EditorSphereShapeComponent.cpp b/Gems/LmbrCentral/Code/Source/Shape/EditorSphereShapeComponent.cpp
index 7bcc59a721..bc3c1ade24 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/EditorSphereShapeComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Shape/EditorSphereShapeComponent.cpp
@@ -42,7 +42,7 @@ namespace LmbrCentral
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                         ->Attribute(AZ::Edit::Attributes::Category, "Shape")
                         ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Sphere_Shape.svg")
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Sphere_Shape.png")
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Sphere_Shape.svg")
                         ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                         ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                         ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://o3de.org/docs/user-guide/components/reference/shape/sphere-shape/")
diff --git a/Gems/LmbrCentral/Code/Source/Shape/EditorSplineComponent.cpp b/Gems/LmbrCentral/Code/Source/Shape/EditorSplineComponent.cpp
index 61519abf15..0875f237b3 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/EditorSplineComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Shape/EditorSplineComponent.cpp
@@ -60,7 +60,7 @@ namespace LmbrCentral
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                         ->Attribute(AZ::Edit::Attributes::Category, "Shape")
                         ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Spline.svg")
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Spline.png")
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Spline.svg")
                         ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                         ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://o3de.org/docs/user-guide/components/reference/shape/spline/")
                         ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
diff --git a/Gems/LmbrCentral/Code/Source/Shape/EditorTubeShapeComponent.cpp b/Gems/LmbrCentral/Code/Source/Shape/EditorTubeShapeComponent.cpp
index 7e4343a1da..f576419a22 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/EditorTubeShapeComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Shape/EditorTubeShapeComponent.cpp
@@ -39,7 +39,7 @@ namespace LmbrCentral
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                         ->Attribute(AZ::Edit::Attributes::Category, "Shape")
                         ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Tube_Shape.svg")
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Tube_Shape.png")
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Tube_Shape.svg")
                         ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                         ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                         ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://o3de.org/docs/user-guide/components/reference/shape/tube-shape/")
diff --git a/Gems/LyShine/Code/Source/UiFlipbookAnimationComponent.cpp b/Gems/LyShine/Code/Source/UiFlipbookAnimationComponent.cpp
index f0423c93a3..9b09630957 100644
--- a/Gems/LyShine/Code/Source/UiFlipbookAnimationComponent.cpp
+++ b/Gems/LyShine/Code/Source/UiFlipbookAnimationComponent.cpp
@@ -184,7 +184,7 @@ void UiFlipbookAnimationComponent::Reflect(AZ::ReflectContext* context)
             editInfo->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                 ->Attribute(AZ::Edit::Attributes::Category, "UI")
                 ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Flipbook.png")
-                ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Flipbook.png")
+                ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Flipbook.svg")
                 ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("UI"))
                 ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
             ;
diff --git a/Gems/LyShine/Code/Source/UiSpawnerComponent.cpp b/Gems/LyShine/Code/Source/UiSpawnerComponent.cpp
index d78cbda5b1..e9e4e4539f 100644
--- a/Gems/LyShine/Code/Source/UiSpawnerComponent.cpp
+++ b/Gems/LyShine/Code/Source/UiSpawnerComponent.cpp
@@ -77,7 +77,7 @@ void UiSpawnerComponent::Reflect(AZ::ReflectContext* context)
             editInfo->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                 ->Attribute(AZ::Edit::Attributes::Category, "UI")
                 ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Spawner.svg")
-                ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Spawner.png")
+                ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Spawner.svg")
                 ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("UI", 0x27ff46b0))
                 ->Attribute(AZ::Edit::Attributes::AutoExpand, true);
 
diff --git a/Gems/LyShine/Code/Source/World/UiCanvasAssetRefComponent.cpp b/Gems/LyShine/Code/Source/World/UiCanvasAssetRefComponent.cpp
index 0cefaf16e8..d2a307ecaf 100644
--- a/Gems/LyShine/Code/Source/World/UiCanvasAssetRefComponent.cpp
+++ b/Gems/LyShine/Code/Source/World/UiCanvasAssetRefComponent.cpp
@@ -168,7 +168,7 @@ void UiCanvasAssetRefComponent::Reflect(AZ::ReflectContext* context)
             editInfo->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                 ->Attribute(AZ::Edit::Attributes::Category, "UI")
                 ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/UiCanvasAssetRef.svg")
-                ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/UiCanvasRef.png")
+                ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/UiCanvasAssetRef.svg")
                 ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://o3de.org/docs/user-guide/components/reference/ui-canvas-asset-ref/")
                 ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c));
 
diff --git a/Gems/LyShine/Code/Source/World/UiCanvasOnMeshComponent.cpp b/Gems/LyShine/Code/Source/World/UiCanvasOnMeshComponent.cpp
index e23b3b7668..81a68a5a9e 100644
--- a/Gems/LyShine/Code/Source/World/UiCanvasOnMeshComponent.cpp
+++ b/Gems/LyShine/Code/Source/World/UiCanvasOnMeshComponent.cpp
@@ -343,7 +343,7 @@ void UiCanvasOnMeshComponent::Reflect(AZ::ReflectContext* context)
             editInfo->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                 ->Attribute(AZ::Edit::Attributes::Category, "UI")
                 ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/UiCanvasOnMesh.svg")
-                ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/UiCanvasOnMesh.png")
+                ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/UiCanvasOnMesh.svg")
                 ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://o3de.org/docs/user-guide/components/reference/ui-canvas-on-mesh/")
                 ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c));
 
diff --git a/Gems/LyShine/Code/Source/World/UiCanvasProxyRefComponent.cpp b/Gems/LyShine/Code/Source/World/UiCanvasProxyRefComponent.cpp
index c81dfa5f7c..22e4207825 100644
--- a/Gems/LyShine/Code/Source/World/UiCanvasProxyRefComponent.cpp
+++ b/Gems/LyShine/Code/Source/World/UiCanvasProxyRefComponent.cpp
@@ -71,7 +71,7 @@ void UiCanvasProxyRefComponent::Reflect(AZ::ReflectContext* context)
             editInfo->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                 ->Attribute(AZ::Edit::Attributes::Category, "UI")
                 ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/UiCanvasProxyRef.svg")
-                ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/UiCanvasRef.png")
+                ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/UiCanvasProxyRef.svg")
                 ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://o3de.org/docs/user-guide/components/reference/ui-canvas-proxy-ref/")
                 ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c));
 
diff --git a/Gems/Multiplayer/Code/Source/AutoGen/AutoComponent_Header.jinja b/Gems/Multiplayer/Code/Source/AutoGen/AutoComponent_Header.jinja
index fdf1587990..2eb57498aa 100644
--- a/Gems/Multiplayer/Code/Source/AutoGen/AutoComponent_Header.jinja
+++ b/Gems/Multiplayer/Code/Source/AutoGen/AutoComponent_Header.jinja
@@ -8,22 +8,22 @@
 {% set PropertyName = UpperFirst(Property.attrib['Name']) %}
 {%     if Property.attrib['Container'] == 'Array' %}
 {% if Property.attrib['IsRewindable']|booleanTrue %}
-const RewindableArray<{{ Property.attrib['Type'] }}, {{ Property.attrib['Count'] }}> &Get{{ PropertyName }}Array() const;
+const RewindableArray<{{ Property.attrib['Type'] }}, {{ Property.attrib['Count'] }}>& Get{{ PropertyName }}Array() const;
 {% else %}
-const AZStd::array<{{ Property.attrib['Type'] }}, {{ Property.attrib['Count'] }}> &Get{{ PropertyName }}Array() const;
+const AZStd::array<{{ Property.attrib['Type'] }}, {{ Property.attrib['Count'] }}>& Get{{ PropertyName }}Array() const;
 {% endif %}
-const {{ Property.attrib['Type'] }} &Get{{ PropertyName }}(int32_t index) const;
+const {{ Property.attrib['Type'] }}& Get{{ PropertyName }}(int32_t index) const;
 {%          if Property.attrib['GenerateEventBindings']|booleanTrue %}
 void {{ PropertyName }}AddEvent(AZ::Event<int32_t, {{ Property.attrib['Type'] }}>::Handler& handler);
 {%          endif %}
 {%     elif Property.attrib['Container'] == 'Vector' %}
 {% if Property.attrib['IsRewindable']|booleanTrue %}
-const RewindableFixedVector<{{ Property.attrib['Type'] }}, {{ Property.attrib['Count'] }}> &Get{{ PropertyName }}Vector() const;
+const RewindableFixedVector<{{ Property.attrib['Type'] }}, {{ Property.attrib['Count'] }}>& Get{{ PropertyName }}Vector() const;
 {% else %}
-const AZStd::fixed_vector<{{ Property.attrib['Type'] }}, {{ Property.attrib['Count'] }}> &Get{{ PropertyName }}Vector() const;
+const AZStd::fixed_vector<{{ Property.attrib['Type'] }}, {{ Property.attrib['Count'] }}>& Get{{ PropertyName }}Vector() const;
 {% endif %}
-const {{ Property.attrib['Type'] }} &Get{{ PropertyName }}(int32_t index) const;
-const {{ Property.attrib['Type'] }} &{{ PropertyName }}GetBack() const;
+const {{ Property.attrib['Type'] }}& Get{{ PropertyName }}(int32_t index) const;
+const {{ Property.attrib['Type'] }}& {{ PropertyName }}GetBack() const;
 uint32_t {{ PropertyName }}GetSize() const;
 {%          if Property.attrib['GenerateEventBindings']|booleanTrue %}
 void {{ PropertyName }}AddEvent(AZ::Event<int32_t, {{ Property.attrib['Type'] }}>::Handler& handler);
@@ -63,7 +63,7 @@ void Set{{ PropertyName }}(const {{ Property.attrib['Type'] }}& value);
 {% macro DeclareNetworkPropertyGetters(Component, ReplicateFrom, ReplicateTo, IsProtected) %}
 {% call(Property) AutoComponentMacros.ParseNetworkProperties(Component, ReplicateFrom, ReplicateTo) %}
 {% set PropertyName = UpperFirst(Property.attrib['Name']) %}
-{% if Property.attrib['IsPublic'] | booleanTrue != IsProtected %}
+{% if Property.attrib['IsPublic']|booleanTrue != IsProtected %}
 //! {{ PropertyName }} Accessors
 //! {{ Property.attrib['Description'] }}.
 {{ DeclareNetworkPropertyGetter(Property) }}
@@ -105,7 +105,7 @@ const {{ Property.attrib['Type'] }}& Get{{ PropertyName }}() const;
 {% macro DeclareNetworkPropertyAccessors(Component, ReplicateFrom, ReplicateTo, IsProtected) %}
 {% call(Property) AutoComponentMacros.ParseNetworkProperties(Component, ReplicateFrom, ReplicateTo) %}
 {% set PropertyName = UpperFirst(Property.attrib['Name']) %}
-{% if Property.attrib['IsPublic'] | booleanTrue != IsProtected %}
+{% if Property.attrib['IsPublic']|booleanTrue != IsProtected %}
 //! {{ PropertyName }} Accessors
 //! {{ Property.attrib['Description'] }}.
 {{ DeclareNetworkPropertyGetter(Property) -}}
diff --git a/Gems/Multiplayer/Code/Source/AutoGen/AutoComponent_Source.jinja b/Gems/Multiplayer/Code/Source/AutoGen/AutoComponent_Source.jinja
index 5c1a9fed3e..c0d4fe0dac 100644
--- a/Gems/Multiplayer/Code/Source/AutoGen/AutoComponent_Source.jinja
+++ b/Gems/Multiplayer/Code/Source/AutoGen/AutoComponent_Source.jinja
@@ -507,7 +507,7 @@ case {{ UpperFirst(Component.attrib['Name']) }}Internal::RemoteProcedure::{{ Upp
 {% endif %}
             }
 {% else %}
-            Handle{{ UpperFirst(Property.attrib['Name']) }}({{ ', '.join(rpcParamList) }});
+            Handle{{ UpperFirst(Property.attrib['Name']) }}(invokingConnection, {{ ', '.join(rpcParamList) }});
 {% endif %}
         }
         else if (paramsSerialized)
@@ -712,11 +712,7 @@ void {{ ClassName }}::NotifyChanges{{ AutoComponentMacros.GetNetPropertiesSetNam
 {% macro DefineArchetypePropertyGet(Property, ClassType, ClassName, Prefix = '') %}
 {% if ClassType == '' or Property.attrib['ExportTo'] == ClassType or Property.attrib['ExportTo'] == "Common" %}
 {%     if Property.attrib['Container'] == 'Array' %}
-{% if Property.attrib['IsRewindable']|booleanTrue %}
-const RewindableArray<{{ Property.attrib['Type'] }}, {{ Property.attrib['Count'] }}>& {{ ClassName }}::Get{{ UpperFirst(Property.attrib['Name']) }}Array() const
-{% else %}
 const AZStd::array<{{ Property.attrib['Type'] }}, {{ Property.attrib['Count'] }}>& {{ ClassName }}::Get{{ UpperFirst(Property.attrib['Name']) }}Array() const
-{% endif %}
 {
     return {{ Prefix }}m_{{ LowerFirst(Property.attrib['Name']) }};
 }
@@ -727,11 +723,7 @@ const {{ Property.attrib['Type'] }}& {{ ClassName }}::Get{{ UpperFirst(Property.
 }
 
 {%     elif Property.attrib['Container'] == 'Vector' %}
-{% if Property.attrib['IsRewindable']|booleanTrue %}
-const RewindableFixedVector<{{ Property.attrib['Type'] }}, {{ Property.attrib['Count'] }}>& {{ ClassName }}::Get{{ UpperFirst(Property.attrib['Name']) }}Vector() const
-{% else %}
 const AZStd::fixed_vector<{{ Property.attrib['Type'] }}, {{ Property.attrib['Count'] }}>& {{ ClassName }}::Get{{ UpperFirst(Property.attrib['Name']) }}Vector() const
-{% endif %}
 {
     return {{ Prefix }}m_{{ LowerFirst(Property.attrib['Name']) }};
 }
diff --git a/Gems/Multiplayer/Code/Source/AutoGen/NetworkTransformComponent.AutoComponent.xml b/Gems/Multiplayer/Code/Source/AutoGen/NetworkTransformComponent.AutoComponent.xml
index 8abc874aa6..cec005cc26 100644
--- a/Gems/Multiplayer/Code/Source/AutoGen/NetworkTransformComponent.AutoComponent.xml
+++ b/Gems/Multiplayer/Code/Source/AutoGen/NetworkTransformComponent.AutoComponent.xml
@@ -18,9 +18,4 @@
     <NetworkProperty Type="uint8_t"     Name="resetCount" Init="0" ReplicateFrom="Authority" ReplicateTo="Client" IsRewindable="false" IsPredictable="true" IsPublic="true" Container="Object" ExposeToEditor="false" ExposeToScript="false" GenerateEventBindings="true" />
     <NetworkProperty Type="NetEntityId" Name="parentEntityId" Init="InvalidNetEntityId" ReplicateFrom="Authority" ReplicateTo="Client" IsRewindable="true" IsPredictable="true" IsPublic="true" Container="Object" ExposeToEditor="false" ExposeToScript="false" GenerateEventBindings="true" />
     <NetworkProperty Type="int32_t"     Name="parentAttachmentBoneId" Init="-1" ReplicateFrom="Authority" ReplicateTo="Client" IsRewindable="true" IsPredictable="true" IsPublic="true" Container="Object" ExposeToEditor="false" ExposeToScript="false" GenerateEventBindings="true" />
-
-    <!--
-    <ArchetypeProperty Type="bool" Name="snapToGround"    Init="false" ExposeToEditor="true" />
-    <ArchetypeProperty Type="bool" Name="useGroundNormal" Init="false" ExposeToEditor="true" />
-    -->
 </Component>
diff --git a/Gems/Multiplayer/Code/Source/Components/NetworkTransformComponent.cpp b/Gems/Multiplayer/Code/Source/Components/NetworkTransformComponent.cpp
index c52880c199..1038ec48ef 100644
--- a/Gems/Multiplayer/Code/Source/Components/NetworkTransformComponent.cpp
+++ b/Gems/Multiplayer/Code/Source/Components/NetworkTransformComponent.cpp
@@ -91,7 +91,11 @@ namespace Multiplayer
             blendTransform.SetRotation(m_previousTransform.GetRotation().Slerp(m_targetTransform.GetRotation(), blendFactor));
             blendTransform.SetTranslation(m_previousTransform.GetTranslation().Lerp(m_targetTransform.GetTranslation(), blendFactor));
             blendTransform.SetUniformScale(AZ::Lerp(m_previousTransform.GetUniformScale(), m_targetTransform.GetUniformScale(), blendFactor));
-            GetTransformComponent()->SetWorldTM(blendTransform);
+
+            if (!GetTransformComponent()->GetWorldTM().IsClose(blendTransform))
+            {
+                GetTransformComponent()->SetWorldTM(blendTransform);
+            }
         }
     }
 
diff --git a/Gems/Multiplayer/Code/Source/MultiplayerSystemComponent.cpp b/Gems/Multiplayer/Code/Source/MultiplayerSystemComponent.cpp
index 5fce900215..9a46bb10de 100644
--- a/Gems/Multiplayer/Code/Source/MultiplayerSystemComponent.cpp
+++ b/Gems/Multiplayer/Code/Source/MultiplayerSystemComponent.cpp
@@ -849,12 +849,10 @@ namespace Multiplayer
 
     void MultiplayerSystemComponent::TickVisibleNetworkEntities(float deltaTime, float serverRateSeconds)
     {
-        const float targetAdjustBlend = AZStd::clamp(deltaTime / serverRateSeconds, 0.0f, 1.0f);
-        m_renderBlendFactor += targetAdjustBlend;
-
         // Linear close to the origin, but asymptote at y = 1
-        const float adjustedBlendFactor = 1.0f - (std::pow(0.2f, m_renderBlendFactor));
-        AZLOG(NET_Blending, "Computed blend factor of %f", adjustedBlendFactor);
+        const float targetAdjustBlend = AZStd::clamp(deltaTime / serverRateSeconds, 0.0f, 1.0f);
+        m_renderBlendFactor = 1.0f - (std::pow(0.2f, m_renderBlendFactor + targetAdjustBlend));
+        AZLOG(NET_Blending, "Computed blend factor of %0.2f using a frametime of %0.2f and a serverTickRate of %0.2f", m_renderBlendFactor, deltaTime, serverRateSeconds);
 
         if (Camera::ActiveCameraRequestBus::HasHandlers())
         {
@@ -897,7 +895,7 @@ namespace Multiplayer
 
             for (NetBindComponent* netBindComponent : gatheredEntities)
             {
-                netBindComponent->NotifyPreRender(deltaTime, adjustedBlendFactor);
+                netBindComponent->NotifyPreRender(deltaTime, m_renderBlendFactor);
             }
         }
         else
@@ -909,7 +907,7 @@ namespace Multiplayer
                 NetBindComponent* netBindComponent = entity->FindComponent<NetBindComponent>();
                 if (netBindComponent != nullptr)
                 {
-                    netBindComponent->NotifyPreRender(deltaTime, adjustedBlendFactor);
+                    netBindComponent->NotifyPreRender(deltaTime, m_renderBlendFactor);
                 }
             }
         }
diff --git a/Gems/NvCloth/Code/Source/Components/EditorClothComponent.cpp b/Gems/NvCloth/Code/Source/Components/EditorClothComponent.cpp
index a2eb03939a..f57cc0d171 100644
--- a/Gems/NvCloth/Code/Source/Components/EditorClothComponent.cpp
+++ b/Gems/NvCloth/Code/Source/Components/EditorClothComponent.cpp
@@ -46,7 +46,7 @@ namespace NvCloth
                      ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                         ->Attribute(AZ::Edit::Attributes::Category, "PhysX")
                         ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Cloth.svg")
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Cloth.svg")
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Cloth.svg")
                         ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                         ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://o3de.org/docs/user-guide/components/reference/cloth/")
                         ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
diff --git a/Gems/PhysX/Code/Source/EditorColliderComponent.cpp b/Gems/PhysX/Code/Source/EditorColliderComponent.cpp
index 8c6e6772e1..1409760742 100644
--- a/Gems/PhysX/Code/Source/EditorColliderComponent.cpp
+++ b/Gems/PhysX/Code/Source/EditorColliderComponent.cpp
@@ -186,7 +186,7 @@ namespace PhysX
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                     ->Attribute(AZ::Edit::Attributes::Category, "PhysX")
                     ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/PhysXCollider.svg")
-                    ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/PhysXCollider.svg")
+                    ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/PhysXCollider.svg")
                     ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                     ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://o3de.org/docs/user-guide/components/reference/physx-collider/")
                     ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
diff --git a/Gems/PhysX/Code/Source/EditorForceRegionComponent.cpp b/Gems/PhysX/Code/Source/EditorForceRegionComponent.cpp
index b9a544f649..d2c6e64633 100644
--- a/Gems/PhysX/Code/Source/EditorForceRegionComponent.cpp
+++ b/Gems/PhysX/Code/Source/EditorForceRegionComponent.cpp
@@ -167,8 +167,8 @@ namespace PhysX
                     "PhysX Force Region", "The force region component is used to apply a physical force on objects within the region")
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                     ->Attribute(AZ::Edit::Attributes::Category, "PhysX")
-                    ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/ForceRegion.png")
-                    ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/ForceRegion.png")
+                    ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/ForceVolume.svg")
+                    ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/ForceVolume.svg")
                     ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                     ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://o3de.org/docs/user-guide/components/reference/physx-force-region/")
                     ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
diff --git a/Gems/PhysX/Code/Source/EditorRigidBodyComponent.cpp b/Gems/PhysX/Code/Source/EditorRigidBodyComponent.cpp
index 02f035ed37..d27874f030 100644
--- a/Gems/PhysX/Code/Source/EditorRigidBodyComponent.cpp
+++ b/Gems/PhysX/Code/Source/EditorRigidBodyComponent.cpp
@@ -300,7 +300,7 @@ namespace PhysX
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                         ->Attribute(AZ::Edit::Attributes::Category, "PhysX")
                         ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/PhysXRigidBody.svg")
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/PhysXRigidBody.svg")
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/PhysXRigidBody.svg")
                         ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                         ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                         ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://o3de.org/docs/user-guide/components/reference/physx-rigid-body-physics/")
diff --git a/Gems/PhysX/Code/Source/EditorShapeColliderComponent.cpp b/Gems/PhysX/Code/Source/EditorShapeColliderComponent.cpp
index 0c0bc86500..0e9a1ab8ee 100644
--- a/Gems/PhysX/Code/Source/EditorShapeColliderComponent.cpp
+++ b/Gems/PhysX/Code/Source/EditorShapeColliderComponent.cpp
@@ -83,7 +83,7 @@ namespace PhysX
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                         ->Attribute(AZ::Edit::Attributes::Category, "PhysX")
                         ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/PhysXCollider.svg")
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/PhysXCollider.svg")
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/PhysXCollider.svg")
                         ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                         ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                     ->DataElement(AZ::Edit::UIHandlers::Default, &EditorShapeColliderComponent::m_colliderConfig,
diff --git a/Gems/PhysX/Code/Source/PhysXCharacters/Components/EditorCharacterControllerComponent.cpp b/Gems/PhysX/Code/Source/PhysXCharacters/Components/EditorCharacterControllerComponent.cpp
index 3edf6c4eec..d58952858d 100644
--- a/Gems/PhysX/Code/Source/PhysXCharacters/Components/EditorCharacterControllerComponent.cpp
+++ b/Gems/PhysX/Code/Source/PhysXCharacters/Components/EditorCharacterControllerComponent.cpp
@@ -97,7 +97,7 @@ namespace PhysX
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                     ->Attribute(AZ::Edit::Attributes::Category, "PhysX")
                     ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/PhysXCharacter.svg")
-                    ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/PhysXCharacter.svg")
+                    ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/PhysXCharacter.svg")
                     ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                     ->DataElement(AZ::Edit::UIHandlers::Default, &EditorCharacterControllerComponent::m_configuration,
                         "Configuration", "Configuration for the character controller")
diff --git a/Gems/PhysX/Code/Source/PhysXCharacters/Components/EditorCharacterGameplayComponent.cpp b/Gems/PhysX/Code/Source/PhysXCharacters/Components/EditorCharacterGameplayComponent.cpp
index 937b7c167f..3bc2b39ebf 100644
--- a/Gems/PhysX/Code/Source/PhysXCharacters/Components/EditorCharacterGameplayComponent.cpp
+++ b/Gems/PhysX/Code/Source/PhysXCharacters/Components/EditorCharacterGameplayComponent.cpp
@@ -47,7 +47,7 @@ namespace PhysX
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                     ->Attribute(AZ::Edit::Attributes::Category, "PhysX")
                     ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/PhysXCharacter.svg")
-                    ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/PhysXCharacter.svg")
+                    ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/PhysXCharacter.svg")
                     ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                     ->DataElement(AZ::Edit::UIHandlers::Default, &EditorCharacterGameplayComponent::m_gameplayConfig,
                         "Gameplay Configuration", "Gameplay Configuration")
diff --git a/Gems/PhysX/Code/Source/PhysXCharacters/Components/RagdollComponent.cpp b/Gems/PhysX/Code/Source/PhysXCharacters/Components/RagdollComponent.cpp
index b7834d511e..844cf65707 100644
--- a/Gems/PhysX/Code/Source/PhysXCharacters/Components/RagdollComponent.cpp
+++ b/Gems/PhysX/Code/Source/PhysXCharacters/Components/RagdollComponent.cpp
@@ -86,7 +86,7 @@ namespace PhysX
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                     ->Attribute(AZ::Edit::Attributes::Category, "PhysX")
                     ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/PhysXRagdoll.svg")
-                    ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/PhysXRagdoll.svg")
+                    ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/PhysXRagdoll.svg")
                     ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                     ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                     ->DataElement(AZ::Edit::UIHandlers::Default, &RagdollComponent::m_positionIterations, "Position Iteration Count",
diff --git a/Gems/SceneProcessing/Code/Source/Generation/Components/TangentGenerator/TangentGenerateComponent.cpp b/Gems/SceneProcessing/Code/Source/Generation/Components/TangentGenerator/TangentGenerateComponent.cpp
index e5faf610b3..c1c47e1955 100644
--- a/Gems/SceneProcessing/Code/Source/Generation/Components/TangentGenerator/TangentGenerateComponent.cpp
+++ b/Gems/SceneProcessing/Code/Source/Generation/Components/TangentGenerator/TangentGenerateComponent.cpp
@@ -52,11 +52,8 @@ namespace AZ::SceneGenerationComponents
         }
     }
 
-
-    AZStd::vector<AZ::SceneAPI::DataTypes::TangentSpace> TangentGenerateComponent::CollectRequiredTangentSpaces(const AZ::SceneAPI::Containers::Scene& scene) const
+    AZ::SceneAPI::DataTypes::TangentSpace TangentGenerateComponent::GetTangentSpaceFromRule(const AZ::SceneAPI::Containers::Scene& scene) const
     {
-        AZStd::vector<AZ::SceneAPI::DataTypes::TangentSpace> result;
-
         for (const auto& object : scene.GetManifest().GetValueStorage())
         {
             if (object->RTTI_IsTypeOf(AZ::SceneAPI::DataTypes::IGroup::TYPEINFO_Uuid()))
@@ -65,18 +62,14 @@ namespace AZ::SceneGenerationComponents
                 const AZ::SceneAPI::SceneData::TangentsRule* rule = group->GetRuleContainerConst().FindFirstByType<AZ::SceneAPI::SceneData::TangentsRule>().get();
                 if (rule)
                 {
-                    if (AZStd::find(result.begin(), result.end(), rule->GetTangentSpace()) == result.end())
-                    {
-                        result.emplace_back(rule->GetTangentSpace());
-                    }
+                    return rule->GetTangentSpace();
                 }
             }
         }
 
-        return result;
+        return AZ::SceneAPI::DataTypes::TangentSpace::FromSourceScene;
     }
 
-
     AZ::SceneAPI::Events::ProcessingResult TangentGenerateComponent::GenerateTangentData(TangentGenerateContext& context)
     {
         // Iterate over all graph content and filter out all meshes.
@@ -115,17 +108,15 @@ namespace AZ::SceneGenerationComponents
         return AZ::SceneAPI::Events::ProcessingResult::Success;
     }
 
-
     void TangentGenerateComponent::UpdateFbxTangentWValues(AZ::SceneAPI::Containers::SceneGraph& graph, const AZ::SceneAPI::Containers::SceneGraph::NodeIndex& nodeIndex, const AZ::SceneAPI::DataTypes::IMeshData* meshData)
     {
         // Iterate over all UV sets.
-        AZ::SceneAPI::DataTypes::IMeshVertexUVData* uvData = AZ::SceneAPI::SceneData::TangentsRule::FindUVData(graph, nodeIndex, 0);
+        AZ::SceneAPI::DataTypes::IMeshVertexUVData* uvData = FindUvData(graph, nodeIndex, 0);
         size_t uvSetIndex = 0;
         while (uvData)
         {
-            // Get the tangents and bitangents from the source scene.
-            AZ::SceneAPI::DataTypes::IMeshVertexTangentData*    fbxTangentData   = AZ::SceneAPI::SceneData::TangentsRule::FindTangentData(graph, nodeIndex, uvSetIndex, AZ::SceneAPI::DataTypes::TangentSpace::FromSourceScene);
-            AZ::SceneAPI::DataTypes::IMeshVertexBitangentData*  fbxBitangentData = AZ::SceneAPI::SceneData::TangentsRule::FindBitangentData(graph, nodeIndex, uvSetIndex, AZ::SceneAPI::DataTypes::TangentSpace::FromSourceScene);
+            AZ::SceneAPI::DataTypes::IMeshVertexTangentData* fbxTangentData = FindTangentData(graph, nodeIndex, uvSetIndex);
+            AZ::SceneAPI::DataTypes::IMeshVertexBitangentData* fbxBitangentData = FindBitangentData(graph, nodeIndex, uvSetIndex);
 
             if (fbxTangentData && fbxBitangentData)
             {
@@ -163,7 +154,7 @@ namespace AZ::SceneGenerationComponents
             }
 
             // Find the next UV set.
-            uvData = AZ::SceneAPI::SceneData::TangentsRule::FindUVData(graph, nodeIndex, ++uvSetIndex);
+            uvData = FindUvData(graph, nodeIndex, ++uvSetIndex);
         }
     }
 
@@ -191,148 +182,249 @@ namespace AZ::SceneGenerationComponents
         AZ::SceneAPI::Containers::SceneGraph& graph = scene.GetGraph();
 
         // Check if we have any UV data, if not, we cannot possibly generate the tangents.
-        AZ::SceneAPI::DataTypes::IMeshVertexUVData* uvData = AZ::SceneAPI::SceneData::TangentsRule::FindUVData(graph, nodeIndex, 0);
-        if (!uvData)
+        const size_t uvSetCount = CalcUvSetCount(graph, nodeIndex);
+        if (uvSetCount == 0)
         {
-            AZ_TracePrintf(AZ::SceneAPI::Utilities::WarningWindow, "We cannot generate tangents for this mesh, as it has no UV coordinates!\n");
+            AZ_Warning(AZ::SceneAPI::Utilities::WarningWindow, false, "Cannot generate tangents for this mesh, as it has no UV coordinates.\n");
             return true; // No fatal error
         }
 
-        // Check if we had tangents inside the source scene file.
-        AZ::SceneAPI::DataTypes::IMeshVertexTangentData*    fbxTangentData   = AZ::SceneAPI::SceneData::TangentsRule::FindTangentData(graph, nodeIndex, 0, AZ::SceneAPI::DataTypes::TangentSpace::FromSourceScene);
-        AZ::SceneAPI::DataTypes::IMeshVertexBitangentData*  fbxBitangentData = AZ::SceneAPI::SceneData::TangentsRule::FindBitangentData(graph, nodeIndex, 0, AZ::SceneAPI::DataTypes::TangentSpace::FromSourceScene);
-
         // Check what tangent spaces we need.
-        AZStd::vector<AZ::SceneAPI::DataTypes::TangentSpace> requiredSpaces = CollectRequiredTangentSpaces(scene);
-
-        // If we have no tangent rules, so if the required spaces is empty.
-        if (requiredSpaces.empty())
-        {
-            AZ_TracePrintf(AZ::SceneAPI::Utilities::LogWindow, "Mesh '%s' has no tangents rule, assuming MikkT tangent space on UV set 0, using normalized tangents and orthogonal bitangents!\n", scene.GetGraph().GetNodeName(nodeIndex).GetName());
-            requiredSpaces.emplace_back(AZ::SceneAPI::DataTypes::TangentSpace::MikkT);
-        }
-
-        // If all we need is import from the source scene, and we have tangent data from the source scene already, then skip generating.
-        if ((requiredSpaces.size() == 1 && requiredSpaces[0] == AZ::SceneAPI::DataTypes::TangentSpace::FromSourceScene) && fbxTangentData && fbxBitangentData)
-        {
-            return true;
-        }
+        const AZ::SceneAPI::DataTypes::TangentSpace ruleTangentSpace = GetTangentSpaceFromRule(scene);
 
         // Find all blend shape data under the mesh. We need to generate the tangent and bitangent for blend shape as well.
         AZStd::vector<AZ::SceneData::GraphData::BlendShapeData*> blendShapes;
         FindBlendShapes(graph, nodeIndex, blendShapes);
 
-        // Generate all the tangent spaces we need.
-        // Do this for every UV set.
+        // Generate tangents/bitangents for all uv sets.
         bool allSuccess = true;
-        size_t uvSetIndex = 0;
-        while (uvData)
+        for (size_t uvSetIndex = 0; uvSetIndex < uvSetCount; ++uvSetIndex)
         {
-            for (AZ::SceneAPI::DataTypes::TangentSpace space : requiredSpaces)
+            AZ::SceneAPI::DataTypes::IMeshVertexUVData* uvData = FindUvData(graph, nodeIndex, uvSetIndex);
+            if (!uvData)
             {
-                switch (space)
-                {
-                // If we want Fbx tangents, we don't need to do anything for that.
-                case AZ::SceneAPI::DataTypes::TangentSpace::FromSourceScene:
-                {
-                    allSuccess &= true;
-                }
-                break;
+                AZ_Error(AZ::SceneAPI::Utilities::ErrorWindow, false, "Cannot generate tangents for uv set %zu as it cannot be retrieved.\n", uvSetIndex);
+                continue;
+            }
 
-                // Generate using MikkT space.
-                case AZ::SceneAPI::DataTypes::TangentSpace::MikkT:
-                {
-                    allSuccess &= AZ::TangentGeneration::Mesh::MikkT::GenerateTangents(
-                        scene.GetManifest(), graph, nodeIndex, const_cast<AZ::SceneAPI::DataTypes::IMeshData*>(meshData), uvSetIndex);
-                    for (AZ::SceneData::GraphData::BlendShapeData* blendShape : blendShapes)
-                    {
-                        allSuccess &= AZ::TangentGeneration::BlendShape::MikkT::GenerateTangents(blendShape, uvSetIndex);
-                    }
-                }
-                break;
+            // Check if we had tangents inside the source scene file.
+            AZ::SceneAPI::DataTypes::TangentSpace tangentSpace = ruleTangentSpace;
+            AZ::SceneAPI::DataTypes::IMeshVertexTangentData* tangentData = FindTangentData(graph, nodeIndex, uvSetIndex);
+            AZ::SceneAPI::DataTypes::IMeshVertexBitangentData* bitangentData = FindBitangentData(graph, nodeIndex, uvSetIndex);
 
-                // If we use EMotion FX calculated tangents, we don't need to generate this here.
-                case AZ::SceneAPI::DataTypes::TangentSpace::EMotionFX:
-                    allSuccess &= true;
-                    break;
-
-                default:
+            // If all we need is import from the source scene, and we have tangent data from the source scene already, then skip generating.
+            if ((tangentSpace == AZ::SceneAPI::DataTypes::TangentSpace::FromSourceScene))
+            {
+                if (tangentData && bitangentData)
                 {
-                    AZ_Assert(false, "Unknown tangent space selected (spaceID=%d) for UV set %d, cannot generate tangents!\n", static_cast<AZ::u32>(space), uvSetIndex);
-                    allSuccess = false;
+                    AZ_TracePrintf(AZ::SceneAPI::Utilities::LogWindow, "Using source scene tangents and bitangents for uv set %zu for mesh '%s'.\n",
+                        uvSetIndex, scene.GetGraph().GetNodeName(nodeIndex).GetName());
+                    continue;
                 }
+                else
+                {
+                    // In case there are no tangents/bitangents while the user selected to use the source ones, default to MikkT.
+                    AZ_Warning(AZ::SceneAPI::Utilities::WarningWindow, false, "Cannot use source scene tangents as there are none in the asset for mesh '%s' for uv set %zu. Defaulting to generating tangents using MikkT.\n",
+                        scene.GetGraph().GetNodeName(nodeIndex).GetName(), uvSetIndex);
+                    tangentSpace = AZ::SceneAPI::DataTypes::TangentSpace::MikkT;
                 }
             }
 
-            // Try to find the next UV set.
-            uvData = AZ::SceneAPI::SceneData::TangentsRule::FindUVData(graph, nodeIndex, ++uvSetIndex);
+            if (!tangentData)
+            {
+                if (!AZ::SceneGenerationComponents::TangentGenerateComponent::CreateTangentLayer(scene.GetManifest(), nodeIndex, meshData->GetVertexCount(), uvSetIndex,
+                    tangentSpace, graph, &tangentData))
+                {
+                    AZ_Error(AZ::SceneAPI::Utilities::ErrorWindow, false, "Failed to create tangents data set for mesh %s for uv set %zu.\n",
+                        scene.GetGraph().GetNodeName(nodeIndex).GetName(), uvSetIndex);
+                    continue;
+                }
+            }
+            if (!bitangentData)
+            {
+                if (!AZ::SceneGenerationComponents::TangentGenerateComponent::CreateBitangentLayer(scene.GetManifest(), nodeIndex, meshData->GetVertexCount(), uvSetIndex,
+                    tangentSpace, graph, &bitangentData))
+                {
+                    AZ_Error(AZ::SceneAPI::Utilities::ErrorWindow, false, "Failed to create bitangents data set for mesh %s for uv set %zu.\n",
+                        scene.GetGraph().GetNodeName(nodeIndex).GetName(), uvSetIndex);
+                    continue;
+                }
+            }
+            tangentData->SetTangentSpace(tangentSpace);
+            bitangentData->SetTangentSpace(tangentSpace);
+
+            switch (tangentSpace)
+            {
+            // Generate using MikkT space.
+            case AZ::SceneAPI::DataTypes::TangentSpace::MikkT:
+            {
+                allSuccess &= AZ::TangentGeneration::Mesh::MikkT::GenerateTangents(meshData, uvData, tangentData, bitangentData);
+
+                for (AZ::SceneData::GraphData::BlendShapeData* blendShape : blendShapes)
+                {
+                    allSuccess &= AZ::TangentGeneration::BlendShape::MikkT::GenerateTangents(blendShape, uvSetIndex);
+                }
+            }
+            break;
+
+            default:
+            {
+                AZ_Assert(false, "Unknown tangent space selected (spaceID=%d) for UV set %d, cannot generate tangents!\n", static_cast<AZ::u32>(tangentSpace), uvSetIndex);
+                allSuccess = false;
+            }
+            }
         }
 
         return allSuccess;
     }
 
-
-    bool TangentGenerateComponent::CreateTangentBitangentLayers(AZ::SceneAPI::Containers::SceneManifest& manifest, const AZ::SceneAPI::Containers::SceneGraph::NodeIndex& nodeIndex, size_t numVerts, size_t uvSetIndex, AZ::SceneAPI::DataTypes::TangentSpace tangentSpace, const char* spaceName, AZ::SceneAPI::Containers::SceneGraph& graph, AZ::SceneAPI::DataTypes::IMeshVertexTangentData** outTangentData, AZ::SceneAPI::DataTypes::IMeshVertexBitangentData** outBitangentData)
+    size_t TangentGenerateComponent::CalcUvSetCount(AZ::SceneAPI::Containers::SceneGraph& graph, const AZ::SceneAPI::Containers::SceneGraph::NodeIndex& nodeIndex) const
     {
-        *outTangentData     = nullptr;
-        *outBitangentData   = nullptr;
+        const auto nameContentView = AZ::SceneAPI::Containers::Views::MakePairView(graph.GetNameStorage(), graph.GetContentStorage());
+
+        size_t result = 0;
+        auto meshChildView = AZ::SceneAPI::Containers::Views::MakeSceneGraphChildView<AZ::SceneAPI::Containers::Views::AcceptEndPointsOnly>(graph, nodeIndex, nameContentView.begin(), true);
+        for (auto child = meshChildView.begin(); child != meshChildView.end(); ++child)
+        {
+            AZ::SceneAPI::DataTypes::IMeshVertexUVData* data = azrtti_cast<AZ::SceneAPI::DataTypes::IMeshVertexUVData*>(child->second.get());
+            if (data)
+            {
+                result++;
+            }
+        }
+
+        return result;
+    }
+
+    AZ::SceneAPI::DataTypes::IMeshVertexUVData* TangentGenerateComponent::FindUvData(AZ::SceneAPI::Containers::SceneGraph& graph, const AZ::SceneAPI::Containers::SceneGraph::NodeIndex& nodeIndex, AZ::u64 uvSet) const
+    {
+        const auto nameContentView = AZ::SceneAPI::Containers::Views::MakePairView(graph.GetNameStorage(), graph.GetContentStorage());
+
+        AZ::u64 uvSetIndex = 0;
+        auto meshChildView = AZ::SceneAPI::Containers::Views::MakeSceneGraphChildView<AZ::SceneAPI::Containers::Views::AcceptEndPointsOnly>(graph, nodeIndex, nameContentView.begin(), true);
+        for (auto child = meshChildView.begin(); child != meshChildView.end(); ++child)
+        {
+            AZ::SceneAPI::DataTypes::IMeshVertexUVData* data = azrtti_cast<AZ::SceneAPI::DataTypes::IMeshVertexUVData*>(child->second.get());
+            if (data)
+            {
+                if (uvSetIndex == uvSet)
+                {
+                    return data;
+                }
+                uvSetIndex++;
+            }
+        }
+
+        return nullptr;
+    }
+
+    AZ::SceneAPI::DataTypes::IMeshVertexTangentData* TangentGenerateComponent::FindTangentData(AZ::SceneAPI::Containers::SceneGraph& graph, const AZ::SceneAPI::Containers::SceneGraph::NodeIndex& nodeIndex, AZ::u64 setIndex) const
+    {
+        const auto nameContentView = AZ::SceneAPI::Containers::Views::MakePairView(graph.GetNameStorage(), graph.GetContentStorage());
+
+        auto meshChildView = AZ::SceneAPI::Containers::Views::MakeSceneGraphChildView<AZ::SceneAPI::Containers::Views::AcceptEndPointsOnly>(graph, nodeIndex, nameContentView.begin(), true);
+        for (auto child = meshChildView.begin(); child != meshChildView.end(); ++child)
+        {
+            AZ::SceneAPI::DataTypes::IMeshVertexTangentData* data = azrtti_cast<AZ::SceneAPI::DataTypes::IMeshVertexTangentData*>(child->second.get());
+            if (data && setIndex == data->GetTangentSetIndex())
+            {
+                return data;
+            }
+        }
+
+        return nullptr;
+    }
+
+    bool TangentGenerateComponent::CreateTangentLayer(AZ::SceneAPI::Containers::SceneManifest& manifest,
+        const AZ::SceneAPI::Containers::SceneGraph::NodeIndex& nodeIndex,
+        size_t numVerts,
+        size_t uvSetIndex,
+        AZ::SceneAPI::DataTypes::TangentSpace tangentSpace,
+        AZ::SceneAPI::Containers::SceneGraph& graph,
+        AZ::SceneAPI::DataTypes::IMeshVertexTangentData** outTangentData)
+    {
+        *outTangentData = nullptr;
 
-        //-------------------------------------------------------------
-        // Create tangent layer.
-        //-------------------------------------------------------------
         AZStd::shared_ptr<SceneData::GraphData::MeshVertexTangentData> tangentData = AZStd::make_shared<AZ::SceneData::GraphData::MeshVertexTangentData>();
         tangentData->Resize(numVerts);
 
         AZ_Assert(tangentData, "Failed to allocate tangent data for scene graph.");
         if (!tangentData)
         {
-            AZ_TracePrintf(AZ::SceneAPI::Utilities::ErrorWindow, "Failed to allocate tangent data.\n");
+            AZ_Error(AZ::SceneAPI::Utilities::ErrorWindow, false, "Failed to allocate tangent data.\n");
             return false;
         }
 
         tangentData->SetTangentSetIndex(uvSetIndex);
         tangentData->SetTangentSpace(tangentSpace);
 
-        const AZStd::string tangentGeneratedName = AZStd::string::format("TangentSet_%s_%zu", spaceName, uvSetIndex);
+        const AZStd::string tangentGeneratedName = AZStd::string::format("TangentSet_%zu", uvSetIndex);
         const AZStd::string tangentSetName = AZ::SceneAPI::DataTypes::Utilities::CreateUniqueName<SceneData::GraphData::MeshVertexBitangentData>(tangentGeneratedName, manifest);
         AZ::SceneAPI::Containers::SceneGraph::NodeIndex newIndex = graph.AddChild(nodeIndex, tangentSetName.c_str(), tangentData);
         AZ_Assert(newIndex.IsValid(), "Failed to create SceneGraph node for tangent attribute.");
         if (!newIndex.IsValid())
         {
-            AZ_TracePrintf(AZ::SceneAPI::Utilities::ErrorWindow, "Failed to create node in scene graph that stores tangent data.\n");
+            AZ_Error(AZ::SceneAPI::Utilities::ErrorWindow, false, "Failed to create node in scene graph that stores tangent data.\n");
             return false;
         }
         graph.MakeEndPoint(newIndex);
 
-        //-------------------------------------------------------------
-        // Create bitangent layer.
-        //-------------------------------------------------------------
+        *outTangentData = tangentData.get();
+        return true;
+    }
+
+    AZ::SceneAPI::DataTypes::IMeshVertexBitangentData* TangentGenerateComponent::FindBitangentData(AZ::SceneAPI::Containers::SceneGraph& graph, const AZ::SceneAPI::Containers::SceneGraph::NodeIndex& nodeIndex, AZ::u64 setIndex) const
+    {
+        const auto nameContentView = AZ::SceneAPI::Containers::Views::MakePairView(graph.GetNameStorage(), graph.GetContentStorage());
+
+        auto meshChildView = AZ::SceneAPI::Containers::Views::MakeSceneGraphChildView<AZ::SceneAPI::Containers::Views::AcceptEndPointsOnly>(graph, nodeIndex, nameContentView.begin(), true);
+        for (auto child = meshChildView.begin(); child != meshChildView.end(); ++child)
+        {
+            AZ::SceneAPI::DataTypes::IMeshVertexBitangentData* data = azrtti_cast<AZ::SceneAPI::DataTypes::IMeshVertexBitangentData*>(child->second.get());
+            if (data && setIndex == data->GetBitangentSetIndex())
+            {
+                return data;
+            }
+        }
+
+        return nullptr;
+    }
+
+    bool TangentGenerateComponent::CreateBitangentLayer(AZ::SceneAPI::Containers::SceneManifest& manifest,
+        const AZ::SceneAPI::Containers::SceneGraph::NodeIndex& nodeIndex,
+        size_t numVerts,
+        size_t uvSetIndex,
+        AZ::SceneAPI::DataTypes::TangentSpace tangentSpace,
+        AZ::SceneAPI::Containers::SceneGraph& graph,
+        AZ::SceneAPI::DataTypes::IMeshVertexBitangentData** outBitangentData)
+    {
+        *outBitangentData = nullptr;
+
         AZStd::shared_ptr<AZ::SceneData::GraphData::MeshVertexBitangentData> bitangentData = AZStd::make_shared<AZ::SceneData::GraphData::MeshVertexBitangentData>();
         bitangentData->Resize(numVerts);
 
         AZ_Assert(bitangentData, "Failed to allocate bitangent data for scene graph.");
         if (!bitangentData)
         {
-            AZ_TracePrintf(AZ::SceneAPI::Utilities::ErrorWindow, "Failed to allocate bitangent data.\n");
+            AZ_Error(AZ::SceneAPI::Utilities::ErrorWindow, false, "Failed to allocate bitangent data.\n");
             return false;
         }
 
         bitangentData->SetBitangentSetIndex(uvSetIndex);
         bitangentData->SetTangentSpace(tangentSpace);
 
-        const AZStd::string bitangentGeneratedName = AZStd::string::format("BitangentSet_%s_%zu", spaceName, uvSetIndex);
+        const AZStd::string bitangentGeneratedName = AZStd::string::format("BitangentSet_%zu", uvSetIndex);
         const AZStd::string bitangentSetName = AZ::SceneAPI::DataTypes::Utilities::CreateUniqueName<SceneData::GraphData::MeshVertexBitangentData>(bitangentGeneratedName, manifest);
-        newIndex = graph.AddChild(nodeIndex, bitangentSetName.c_str(), bitangentData);
+        AZ::SceneAPI::Containers::SceneGraph::NodeIndex newIndex = graph.AddChild(nodeIndex, bitangentSetName.c_str(), bitangentData);
         AZ_Assert(newIndex.IsValid(), "Failed to create SceneGraph node for bitangent attribute.");
         if (!newIndex.IsValid())
         {
-            AZ_TracePrintf(AZ::SceneAPI::Utilities::ErrorWindow, "Failed to create node in scene graph that stores bitangent data.\n");
+            AZ_Error(AZ::SceneAPI::Utilities::ErrorWindow, false, "Failed to create node in scene graph that stores bitangent data.\n");
             return false;
         }
         graph.MakeEndPoint(newIndex);
 
-        *outTangentData     = tangentData.get();
-        *outBitangentData   = bitangentData.get();
+        *outBitangentData = bitangentData.get();
         return true;
     }
 } // namespace AZ::SceneGenerationComponents
diff --git a/Gems/SceneProcessing/Code/Source/Generation/Components/TangentGenerator/TangentGenerateComponent.h b/Gems/SceneProcessing/Code/Source/Generation/Components/TangentGenerator/TangentGenerateComponent.h
index a720c3a191..06d9aded11 100644
--- a/Gems/SceneProcessing/Code/Source/Generation/Components/TangentGenerator/TangentGenerateComponent.h
+++ b/Gems/SceneProcessing/Code/Source/Generation/Components/TangentGenerator/TangentGenerateComponent.h
@@ -50,8 +50,6 @@ namespace AZ::SceneGenerationComponents
         TangentGenerateComponent();
 
         static void Reflect(AZ::ReflectContext* context);
-        static bool CreateTangentBitangentLayers(AZ::SceneAPI::Containers::SceneManifest& manifest, const AZ::SceneAPI::Containers::SceneGraph::NodeIndex& nodeIndex, size_t numVerts, size_t uvSetIndex, AZ::SceneAPI::DataTypes::TangentSpace tangentSpace,
-            const char* spaceName, AZ::SceneAPI::Containers::SceneGraph& graph, AZ::SceneAPI::DataTypes::IMeshVertexTangentData** outTangentData, AZ::SceneAPI::DataTypes::IMeshVertexBitangentData** outBitangentData);
 
         AZ::SceneAPI::Events::ProcessingResult GenerateTangentData(TangentGenerateContext& context);
 
@@ -61,6 +59,27 @@ namespace AZ::SceneGenerationComponents
             AZStd::vector<AZ::SceneData::GraphData::BlendShapeData*>& outBlendShapes) const;
         bool GenerateTangentsForMesh(AZ::SceneAPI::Containers::Scene& scene, const AZ::SceneAPI::Containers::SceneGraph::NodeIndex& nodeIndex, AZ::SceneAPI::DataTypes::IMeshData* meshData);
         void UpdateFbxTangentWValues(AZ::SceneAPI::Containers::SceneGraph& graph, const AZ::SceneAPI::Containers::SceneGraph::NodeIndex& nodeIndex, const AZ::SceneAPI::DataTypes::IMeshData* meshData);
-        AZStd::vector<AZ::SceneAPI::DataTypes::TangentSpace> CollectRequiredTangentSpaces(const AZ::SceneAPI::Containers::Scene& scene) const;
+        AZ::SceneAPI::DataTypes::TangentSpace GetTangentSpaceFromRule(const AZ::SceneAPI::Containers::Scene& scene) const;
+
+        size_t CalcUvSetCount(AZ::SceneAPI::Containers::SceneGraph& graph, const AZ::SceneAPI::Containers::SceneGraph::NodeIndex& nodeIndex) const;
+        AZ::SceneAPI::DataTypes::IMeshVertexUVData* FindUvData(AZ::SceneAPI::Containers::SceneGraph& graph, const AZ::SceneAPI::Containers::SceneGraph::NodeIndex& nodeIndex, AZ::u64 uvSet) const;
+
+        AZ::SceneAPI::DataTypes::IMeshVertexTangentData* FindTangentData(AZ::SceneAPI::Containers::SceneGraph& graph, const AZ::SceneAPI::Containers::SceneGraph::NodeIndex& nodeIndex, AZ::u64 setIndex) const;
+        bool CreateTangentLayer(AZ::SceneAPI::Containers::SceneManifest& manifest,
+            const AZ::SceneAPI::Containers::SceneGraph::NodeIndex& nodeIndex,
+            size_t numVerts,
+            size_t uvSetIndex,
+            AZ::SceneAPI::DataTypes::TangentSpace tangentSpace,
+            AZ::SceneAPI::Containers::SceneGraph& graph,
+            AZ::SceneAPI::DataTypes::IMeshVertexTangentData** outTangentData);
+
+        AZ::SceneAPI::DataTypes::IMeshVertexBitangentData* FindBitangentData(AZ::SceneAPI::Containers::SceneGraph& graph, const AZ::SceneAPI::Containers::SceneGraph::NodeIndex& nodeIndex, AZ::u64 setIndex) const;
+        bool CreateBitangentLayer(AZ::SceneAPI::Containers::SceneManifest& manifest,
+            const AZ::SceneAPI::Containers::SceneGraph::NodeIndex& nodeIndex,
+            size_t numVerts,
+            size_t uvSetIndex,
+            AZ::SceneAPI::DataTypes::TangentSpace tangentSpace,
+            AZ::SceneAPI::Containers::SceneGraph& graph,
+            AZ::SceneAPI::DataTypes::IMeshVertexBitangentData** outBitangentData);
     };
 } // namespace AZ::SceneGenerationComponents
diff --git a/Gems/SceneProcessing/Code/Source/Generation/Components/TangentGenerator/TangentGenerators/MikkTGenerator.cpp b/Gems/SceneProcessing/Code/Source/Generation/Components/TangentGenerator/TangentGenerators/MikkTGenerator.cpp
index a6191e3b36..3f736815e5 100644
--- a/Gems/SceneProcessing/Code/Source/Generation/Components/TangentGenerator/TangentGenerators/MikkTGenerator.cpp
+++ b/Gems/SceneProcessing/Code/Source/Generation/Components/TangentGenerator/TangentGenerators/MikkTGenerator.cpp
@@ -32,7 +32,6 @@ namespace AZ::TangentGeneration::Mesh::MikkT
         return customData->m_meshData->GetFaceCount();
     }
 
-
     int GetNumVerticesOfFace(const SMikkTSpaceContext* context, const int face)
     {
         AZ_UNUSED(context);
@@ -40,7 +39,6 @@ namespace AZ::TangentGeneration::Mesh::MikkT
         return 3;
     }
 
-
     void GetPosition(const SMikkTSpaceContext* context, float posOut[], const int face, const int vert)
     {
         MikktCustomData* customData = static_cast<MikktCustomData*>(context->m_pUserData);
@@ -51,7 +49,6 @@ namespace AZ::TangentGeneration::Mesh::MikkT
         posOut[2] = pos.GetZ();
     }
 
-
     void GetNormal(const SMikkTSpaceContext* context, float normOut[], const int face, const int vert)
     {
         MikktCustomData* customData = static_cast<MikktCustomData*>(context->m_pUserData);
@@ -62,7 +59,6 @@ namespace AZ::TangentGeneration::Mesh::MikkT
         normOut[2] = normal.GetZ();
     }
 
-
     void GetTexCoord(const SMikkTSpaceContext* context, float texOut[], const int face, const int vert)
     {
         MikktCustomData* customData = static_cast<MikktCustomData*>(context->m_pUserData);
@@ -72,7 +68,6 @@ namespace AZ::TangentGeneration::Mesh::MikkT
         texOut[1] = uv.GetY();
     }
 
-
     // This function is used to return the tangent and signValue to the application.
     // tangent is a unit length vector.
     // For normal maps it is sufficient to use the following simplified version of the bitangent which is generated at pixel/vertex level.
@@ -91,7 +86,6 @@ namespace AZ::TangentGeneration::Mesh::MikkT
         customData->m_bitangentData->SetBitangent(vertexIndex, bitangent);
     }
 
-
     // This function is used to return tangent space results to the application.
     // tangent and bitangent are unit length vectors and magS and magT are their
     // true magnitudes which can be used for relief mapping effects.
@@ -111,27 +105,11 @@ namespace AZ::TangentGeneration::Mesh::MikkT
         customData->m_bitangentData->SetBitangent(vertexIndex, bitangentVec);
     }
 
-
-    bool GenerateTangents(AZ::SceneAPI::Containers::SceneManifest& manifest, AZ::SceneAPI::Containers::SceneGraph& graph, const AZ::SceneAPI::Containers::SceneGraph::NodeIndex& nodeIndex, AZ::SceneAPI::DataTypes::IMeshData* meshData, size_t uvSet)
+    bool GenerateTangents(const AZ::SceneAPI::DataTypes::IMeshData* meshData,
+        const AZ::SceneAPI::DataTypes::IMeshVertexUVData* uvData,
+        AZ::SceneAPI::DataTypes::IMeshVertexTangentData* outTangentData,
+        AZ::SceneAPI::DataTypes::IMeshVertexBitangentData* outBitangentData)
     {
-        // Create tangent and bitangent data sets and relate them to the given UV set.
-        AZ::SceneAPI::DataTypes::IMeshVertexUVData*         uvData          = AZ::SceneAPI::SceneData::TangentsRule::FindUVData(graph, nodeIndex, uvSet);
-        AZ::SceneAPI::DataTypes::IMeshVertexTangentData*    tangentData     = nullptr;
-        AZ::SceneAPI::DataTypes::IMeshVertexBitangentData*  bitangentData   = nullptr;
-        if (!uvData)
-        {
-            AZ_TracePrintf(AZ::SceneAPI::Utilities::ErrorWindow, "Cannot find UV data (set index=%d) to generate tangents and bitangents from in MikkT generator!\n", uvSet);
-            return false;
-        }
-
-        if (!AZ::SceneGenerationComponents::TangentGenerateComponent::CreateTangentBitangentLayers(manifest, nodeIndex, meshData->GetVertexCount(), uvSet, AZ::SceneAPI::DataTypes::TangentSpace::MikkT, "MikkT", graph, &tangentData, &bitangentData))
-        {
-            AZ_TracePrintf(AZ::SceneAPI::Utilities::ErrorWindow, "Failed to create tangents and bitangents data sets inside MikkT generator!\n");
-            return false;
-        }
-
-        //----------------------------------
-
         // Provide the MikkT interface.
         SMikkTSpaceInterface mikkInterface;
         mikkInterface.m_getNumFaces         = GetNumFaces;
@@ -146,8 +124,8 @@ namespace AZ::TangentGeneration::Mesh::MikkT
         MikktCustomData customData;
         customData.m_meshData       = meshData;
         customData.m_uvData         = uvData;
-        customData.m_tangentData    = tangentData;
-        customData.m_bitangentData  = bitangentData;
+        customData.m_tangentData    = outTangentData;
+        customData.m_bitangentData  = outBitangentData;
 
         // Generate the tangents.
         SMikkTSpaceContext mikkContext;
@@ -155,7 +133,7 @@ namespace AZ::TangentGeneration::Mesh::MikkT
         mikkContext.m_pUserData     = &customData;
         if (genTangSpaceDefault(&mikkContext) == 0)
         {
-            AZ_TracePrintf(AZ::SceneAPI::Utilities::ErrorWindow, "Failed to generate tangents and bitangents using MikkT, because MikkT reported failure!\n");
+            AZ_TracePrintf(AZ::SceneAPI::Utilities::ErrorWindow, "Failed to generate tangents and bitangents using MikkT.\n");
             return false;
         }
 
diff --git a/Gems/SceneProcessing/Code/Source/Generation/Components/TangentGenerator/TangentGenerators/MikkTGenerator.h b/Gems/SceneProcessing/Code/Source/Generation/Components/TangentGenerator/TangentGenerators/MikkTGenerator.h
index 98451d3c46..4b1d8ebd72 100644
--- a/Gems/SceneProcessing/Code/Source/Generation/Components/TangentGenerator/TangentGenerators/MikkTGenerator.h
+++ b/Gems/SceneProcessing/Code/Source/Generation/Components/TangentGenerator/TangentGenerators/MikkTGenerator.h
@@ -19,12 +19,14 @@ namespace AZ::TangentGeneration::Mesh::MikkT
 {
     struct MikktCustomData
     {
-        AZ::SceneAPI::DataTypes::IMeshData*                 m_meshData;
-        AZ::SceneAPI::DataTypes::IMeshVertexUVData*         m_uvData;
-        AZ::SceneAPI::DataTypes::IMeshVertexTangentData*    m_tangentData;
-        AZ::SceneAPI::DataTypes::IMeshVertexBitangentData*  m_bitangentData;
+        const AZ::SceneAPI::DataTypes::IMeshData* m_meshData;
+        const AZ::SceneAPI::DataTypes::IMeshVertexUVData* m_uvData;
+        AZ::SceneAPI::DataTypes::IMeshVertexTangentData* m_tangentData;
+        AZ::SceneAPI::DataTypes::IMeshVertexBitangentData* m_bitangentData;
     };
 
-    // The main generation method.
-    bool GenerateTangents(AZ::SceneAPI::Containers::SceneManifest& manifest, AZ::SceneAPI::Containers::SceneGraph& graph, const AZ::SceneAPI::Containers::SceneGraph::NodeIndex& nodeIndex, AZ::SceneAPI::DataTypes::IMeshData* meshData, size_t uvSet);
+    bool GenerateTangents(const AZ::SceneAPI::DataTypes::IMeshData* meshData,
+        const AZ::SceneAPI::DataTypes::IMeshVertexUVData* uvData,
+        AZ::SceneAPI::DataTypes::IMeshVertexTangentData* outTangentData,
+        AZ::SceneAPI::DataTypes::IMeshVertexBitangentData* outBitangentData);
 } // namespace AZ::TangentGeneration::MikkT
diff --git a/Gems/ScriptCanvas/Code/Editor/Components/EditorScriptCanvasComponent.cpp b/Gems/ScriptCanvas/Code/Editor/Components/EditorScriptCanvasComponent.cpp
index 9cc23c78a5..9135f348b3 100644
--- a/Gems/ScriptCanvas/Code/Editor/Components/EditorScriptCanvasComponent.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/Components/EditorScriptCanvasComponent.cpp
@@ -164,7 +164,7 @@ namespace ScriptCanvasEditor
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                     ->Attribute(AZ::Edit::Attributes::Category, "Scripting")
                     ->Attribute(AZ::Edit::Attributes::Icon, "Icons/ScriptCanvas/ScriptCanvas.svg")
-                    ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/ScriptCanvas/Viewport/ScriptCanvas.png")
+                    ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/ScriptCanvas/Viewport/ScriptCanvas.svg")
                     ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                     ->Attribute(AZ::Edit::Attributes::PrimaryAssetType, ScriptCanvasAssetHandler::GetAssetTypeStatic())
                     ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Connection.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Connection.cpp
index 830562ebcd..4dc4acda1e 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Connection.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Connection.cpp
@@ -23,6 +23,11 @@ namespace ScriptCanvas
         AZStd::string failedContract;
         AZStd::all_of(firstSlot.GetContracts().begin(), firstSlot.GetContracts().end(), [&firstSlot, &secondSlot, &outcome](const AZStd::unique_ptr<Contract>& contract)
         {
+            if (!contract)
+            {
+                return false;
+            }
+
             outcome = contract->Evaluate(firstSlot, secondSlot);
             if (outcome.IsSuccess())
             {
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Slot.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Slot.cpp
index 8ab20a3f54..44d2367156 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Slot.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Slot.cpp
@@ -828,10 +828,13 @@ namespace ScriptCanvas
 
         for (const auto& contract : m_contracts)
         {
-            failureReason = contract->EvaluateForType(dataType);
-            if (!failureReason)
+            if (contract)
             {
-                return failureReason;
+                failureReason = contract->EvaluateForType(dataType);
+                if (!failureReason)
+                {
+                    return failureReason;
+                }
             }
         }
 
diff --git a/Gems/StartingPointInput/Assets/Editor/Icons/Components/InputConfig.svg b/Gems/StartingPointInput/Assets/Editor/Icons/Components/InputConfig.svg
index 4bed49745e..23ac770a0f 100644
--- a/Gems/StartingPointInput/Assets/Editor/Icons/Components/InputConfig.svg
+++ b/Gems/StartingPointInput/Assets/Editor/Icons/Components/InputConfig.svg
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
     <title>icon / Gameplay / Input</title>
-    <desc>Created with Sketch.</desc>
     <defs>
         <path d="M15.1638448,14.711867 C14.4135616,14.711867 13.8079113,15.3175173 13.8079113,16.0678005 C13.8079113,16.8180837 14.4135616,17.423734 15.1638448,17.423734 C15.914128,17.423734 16.5197783,16.8180837 16.5197783,16.0678005 C16.5197783,15.3175173 15.914128,14.711867 15.1638448,14.711867 M16.9717561,10.1920887 C16.2214729,10.1920887 15.6158226,10.797739 15.6158226,11.5480222 C15.6158226,12.2983054 16.2214729,12.9039557 16.9717561,12.9039557 C17.7220393,12.9039557 18.3276896,12.2983054 18.3276896,11.5480222 C18.3276896,10.797739 17.7220393,10.1920887 16.9717561,10.1920887 M12,20.1356009 C7.51186014,20.1356009 3.86439905,16.4836201 3.86439905,12 C3.86439905,7.51637992 7.51186014,3.86439905 12,3.86439905 C16.4881399,3.86439905 20.1356009,7.51637992 20.1356009,12 C20.1356009,16.4836201 16.4881399,20.1356009 12,20.1356009 M12,2.05648773 C6.51750892,2.05648773 2.05648773,6.51750892 2.05648773,12 C2.05648773,17.4824911 6.51750892,21.9435123 12,21.9435123 C17.4824911,21.9435123 21.9435123,17.4824911 21.9435123,12 C21.9435123,6.51750892 17.4824911,2.05648773 12,2.05648773 M8.83615519,14.711867 C8.08587199,14.711867 7.4802217,15.3175173 7.4802217,16.0678005 C7.4802217,16.8180837 8.08587199,17.423734 8.83615519,17.423734 C9.58643839,17.423734 10.1920887,16.8180837 10.1920887,16.0678005 C10.1920887,15.3175173 9.58643839,14.711867 8.83615519,14.711867 M14.711867,7.02824387 C14.711867,6.27796067 14.1062167,5.67231037 13.3559335,5.67231037 L10.6440665,5.67231037 C9.89378331,5.67231037 9.28813302,6.27796067 9.28813302,7.02824387 C9.28813302,7.77852706 9.89378331,8.38417736 10.6440665,8.38417736 L13.3559335,8.38417736 C14.1062167,8.38417736 14.711867,7.77852706 14.711867,7.02824387 M8.38417736,11.5480222 C8.38417736,10.797739 7.77852706,10.1920887 7.02824387,10.1920887 C6.27796067,10.1920887 5.67231037,10.797739 5.67231037,11.5480222 C5.67231037,12.2983054 6.27796067,12.9039557 7.02824387,12.9039557 C7.77852706,12.9039557 8.38417736,12.2983054 8.38417736,11.5480222" id="path-1"></path>
     </defs>
@@ -12,4 +10,4 @@
         </mask>
         <use id="Page-1" fill="#65C98C" xlink:href="#path-1"></use>
     </g>
-</svg>
+</svg>
\ No newline at end of file
diff --git a/Gems/StartingPointInput/Assets/Editor/Icons/Components/Viewport/InputConfig.png b/Gems/StartingPointInput/Assets/Editor/Icons/Components/Viewport/InputConfig.png
deleted file mode 100644
index c9326e1b1c..0000000000
--- a/Gems/StartingPointInput/Assets/Editor/Icons/Components/Viewport/InputConfig.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:813eadfb69fc34cc3e837fd7739c326f2a6d19a8ea869e6063ecb944d68346df
-size 4885
diff --git a/Gems/StartingPointInput/Assets/Editor/Icons/Components/Viewport/InputConfig.svg b/Gems/StartingPointInput/Assets/Editor/Icons/Components/Viewport/InputConfig.svg
new file mode 100644
index 0000000000..8d428d288c
--- /dev/null
+++ b/Gems/StartingPointInput/Assets/Editor/Icons/Components/Viewport/InputConfig.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Gameplay / Input - box</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
+            <stop stop-color="#9D9D9D" offset="100%"></stop>
+        </linearGradient>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
+    </defs>
+    <g id="icon-/-Gameplay-/-Input---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/general/color/-box-template">
+            <mask id="mask-3" fill="white">
+                <use xlink:href="#path-2"></use>
+            </mask>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#65C98C">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="Rectangle-2" x="0" y="0" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+        <path d="M15.1638448,14.711867 C14.4135616,14.711867 13.8079113,15.3175173 13.8079113,16.0678005 C13.8079113,16.8180837 14.4135616,17.423734 15.1638448,17.423734 C15.914128,17.423734 16.5197783,16.8180837 16.5197783,16.0678005 C16.5197783,15.3175173 15.914128,14.711867 15.1638448,14.711867 M16.9717561,10.1920887 C16.2214729,10.1920887 15.6158226,10.797739 15.6158226,11.5480222 C15.6158226,12.2983054 16.2214729,12.9039557 16.9717561,12.9039557 C17.7220393,12.9039557 18.3276896,12.2983054 18.3276896,11.5480222 C18.3276896,10.797739 17.7220393,10.1920887 16.9717561,10.1920887 M12,20.1356009 C7.51186014,20.1356009 3.86439905,16.4836201 3.86439905,12 C3.86439905,7.51637992 7.51186014,3.86439905 12,3.86439905 C16.4881399,3.86439905 20.1356009,7.51637992 20.1356009,12 C20.1356009,16.4836201 16.4881399,20.1356009 12,20.1356009 M12,2.05648773 C6.51750892,2.05648773 2.05648773,6.51750892 2.05648773,12 C2.05648773,17.4824911 6.51750892,21.9435123 12,21.9435123 C17.4824911,21.9435123 21.9435123,17.4824911 21.9435123,12 C21.9435123,6.51750892 17.4824911,2.05648773 12,2.05648773 M8.83615519,14.711867 C8.08587199,14.711867 7.4802217,15.3175173 7.4802217,16.0678005 C7.4802217,16.8180837 8.08587199,17.423734 8.83615519,17.423734 C9.58643839,17.423734 10.1920887,16.8180837 10.1920887,16.0678005 C10.1920887,15.3175173 9.58643839,14.711867 8.83615519,14.711867 M14.711867,7.02824387 C14.711867,6.27796067 14.1062167,5.67231037 13.3559335,5.67231037 L10.6440665,5.67231037 C9.89378331,5.67231037 9.28813302,6.27796067 9.28813302,7.02824387 C9.28813302,7.77852706 9.89378331,8.38417736 10.6440665,8.38417736 L13.3559335,8.38417736 C14.1062167,8.38417736 14.711867,7.77852706 14.711867,7.02824387 M8.38417736,11.5480222 C8.38417736,10.797739 7.77852706,10.1920887 7.02824387,10.1920887 C6.27796067,10.1920887 5.67231037,10.797739 5.67231037,11.5480222 C5.67231037,12.2983054 6.27796067,12.9039557 7.02824387,12.9039557 C7.77852706,12.9039557 8.38417736,12.2983054 8.38417736,11.5480222" id="Page-1" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Gems/StartingPointInput/Code/Source/InputConfigurationComponent.cpp b/Gems/StartingPointInput/Code/Source/InputConfigurationComponent.cpp
index 36373c849d..6739a54ddd 100644
--- a/Gems/StartingPointInput/Code/Source/InputConfigurationComponent.cpp
+++ b/Gems/StartingPointInput/Code/Source/InputConfigurationComponent.cpp
@@ -52,7 +52,7 @@ namespace StartingPointInput
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                         ->Attribute(AZ::Edit::Attributes::Category, "Gameplay")
                         ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/InputConfig.svg")
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Viewport/InputConfig.png")
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Viewport/InputConfig.svg")
                         ->Attribute(AZ::Edit::Attributes::PrimaryAssetType, AZ::AzTypeInfo<InputEventBindingsAsset>::Uuid())
                         ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game"))
                         ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://o3de.org/docs/user-guide/components/reference/input/")
diff --git a/Gems/SurfaceData/Assets/Editor/Icons/Components/SurfaceData.svg b/Gems/SurfaceData/Assets/Editor/Icons/Components/SurfaceData.svg
index 090bacd5c1..6a24f9ce47 100644
--- a/Gems/SurfaceData/Assets/Editor/Icons/Components/SurfaceData.svg
+++ b/Gems/SurfaceData/Assets/Editor/Icons/Components/SurfaceData.svg
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
     <title>icon / Environmental / Surface Data</title>
-    <desc>Created with Sketch.</desc>
     <g id="icon-/-Environmental-/-Surface-Data" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <path d="M21.1504022,17.0250283 L22.9351306,22.0770469 L16.4632938,22.0770469 L16.1316327,20.0578353 L19.698235,20.0578353 L18.7976296,17.0250283 L21.1504022,17.0250283 Z M3.16484007,17.001392 L5.51761265,17.001392 L4.7567612,20.1085151 L8.56424139,20.1085151 L7.87245518,22.0770469 L1.06486942,22.0770469 L3.16484007,17.001392 Z M10.4834055,14.0030191 L10.7637653,14.6480401 C9.67541949,14.8495321 8.933732,15.2501196 8.933732,15.7114 C8.933732,16.3751943 10.4696146,16.9133059 12.3642218,16.9133059 C14.258829,16.9133059 15.7947116,16.3751943 15.7947116,15.7114 C15.7947116,15.2594563 15.0827451,14.8657735 14.0303362,14.6605187 L14.2964069,14.0030191 L16.1776104,14.0030191 L17.8709488,18.97694 L6.59798017,18.97694 L8.43727058,14.0030191 L10.4834055,14.0030191 Z M20.7168545,14.9545929 L18.2970728,14.9545929 L17.4743641,13.0514453 L20.0296152,13.0514453 L20.7168545,14.9545929 Z M3.72206852,14.9545929 L4.83035055,13.0514453 L7.38560161,13.0514453 L6.14185022,14.9545929 L3.72206852,14.9545929 Z M4.2856351,7.15493845 L5.12956162,7.4959069 L3.01588623,9.36165503 L2.79149296,6.55126584 L3.72665459,6.92909567 C4.39921197,5.40846002 5.44793029,3.60960289 6.39905176,3.10967934 C7.81993244,2.36284336 9.53420368,2.5839193 10.5186736,3.77314285 C11.254953,4.66255634 11.6422812,6.13536824 12.2022328,7.87218297 C12.2022328,5.90802867 12.2778036,3.87076362 13.6958635,2.53160517 C15.2015649,1.10968164 17.4613298,1.24808271 19.0776668,2.23852946 L19.8082418,1.33634448 L20.9744868,3.90315426 L18.221292,3.29606434 L18.8145883,2.56340443 C17.3271124,1.97349977 15.9573931,2.32981632 14.8192094,3.77314285 C13.8679242,4.97946412 13.5218004,7.25683912 13.4144313,9.43732972 C14.2672555,7.29959901 15.329817,6.20527797 16.1166241,5.85432911 C17.9533306,5.0350813 19.7229549,6.77109418 20.1616243,8.88013833 L21.460831,8.74358621 L20.3068849,11.8193051 L18.5386774,9.05071692 L19.6566524,8.93321302 C18.9375592,7.65276929 17.6234316,7.39000755 16.7252772,7.7061777 C14.3292213,8.54964228 14.0552947,11.0169601 12.9878205,15.3062633 C12.9878205,15.3103183 12.1359876,15.3103183 11.9036786,15.3062633 L11.9069618,15.2887223 C11.679267,15.2892791 11.4660593,15.2951261 11.3753538,15.3062633 C11.3753538,14.4823645 11.4929889,14.6752979 11.1704344,13.418079 C10.84788,12.1608601 10.239422,10.5052322 8.69987023,11.4550865 L8.69987023,10.7464725 C10.0026807,9.83397556 10.7272318,10.8221221 11.3753538,11.9728705 C10.9863971,9.83397556 10.2980196,9.27588785 9.64305323,8.47611675 C8.88748351,7.55350014 8.19517876,7.11360366 7.48766824,7.63988233 L8.18215464,8.33436872 L5.50750032,9.22592016 L6.39905176,6.55126584 L7.08548907,7.23770316 C7.68411556,6.46361352 8.53546795,6.23491918 9.57450971,7.06572569 C10.0757529,7.46651433 10.489265,7.84488785 10.8750712,8.36621315 C10.5206001,7.04193732 10.144264,6.12548665 9.74606291,5.61686114 C8.99472791,4.65717488 8.08338892,3.78707723 6.32118079,4.5725635 C5.34730044,5.00666072 4.75549362,6.14014111 4.2856351,7.15493845 L4.2856351,7.15493845 Z" id="Shape" fill="#8BDD15"></path>
+        <g id="Group" transform="translate(1.500000, 1.990017)" fill="#8BDD15">
+            <path d="M10.5,-5.15143483e-14 C16.2989899,-5.15143483e-14 21,4.70101013 21,10.5 C21,13.7748874 19.5007322,16.699602 17.1511297,18.6252106 L15.9940292,16.986035 C17.8328833,15.4268708 19,13.0997327 19,10.5 C19,5.80557963 15.1944204,2 10.5,2 C5.80557963,2 2,5.80557963 2,10.5 C2,12.9824731 3.06420667,15.2163875 4.76129436,16.7704174 L3.46540276,18.2952699 C1.33737194,16.3736819 0,13.5930209 0,10.5 C0,4.70101013 4.70101013,-5.15143483e-14 10.5,-5.15143483e-14 Z M10.5,3.7175731 C14.2458309,3.7175731 17.2824269,6.75416906 17.2824269,10.5 C17.2824269,12.520143 16.3992354,14.3340056 14.9979135,15.5765266 L13.8340806,13.9286355 C14.727463,13.0597393 15.2824269,11.844679 15.2824269,10.5 C15.2824269,7.85873856 13.1412614,5.7175731 10.5,5.7175731 C7.85873856,5.7175731 5.7175731,7.85873856 5.7175731,10.5 C5.7175731,11.8472104 6.27462839,13.0643136 7.17096846,13.933539 L5.87386423,15.459892 C4.5471039,14.2218762 3.7175731,12.4578117 3.7175731,10.5 C3.7175731,6.75416906 6.75416906,3.7175731 10.5,3.7175731 Z" id="Combined-Shape" fill-rule="nonzero"></path>
+            <polygon id="Path-67" points="10.2735749 7.1256624 9.85989288 9.81700405 14.2768767 9.81700405 10.7000826 13.8743376 11.1611878 10.9879995 6.72312335 10.9879995"></polygon>
+        </g>
     </g>
-</svg>
+</svg>
\ No newline at end of file
diff --git a/Gems/SurfaceData/Assets/Editor/Icons/Components/Viewport/SurfaceData.png b/Gems/SurfaceData/Assets/Editor/Icons/Components/Viewport/SurfaceData.png
deleted file mode 100644
index f1c6b4d5bf..0000000000
--- a/Gems/SurfaceData/Assets/Editor/Icons/Components/Viewport/SurfaceData.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:66dd1391fc262120cf8f065c86ccdb4444fad93976152635b8091862e3334d5a
-size 1474
diff --git a/Gems/SurfaceData/Assets/Editor/Icons/Components/Viewport/SurfaceData.svg b/Gems/SurfaceData/Assets/Editor/Icons/Components/Viewport/SurfaceData.svg
index 6771b1254d..94596eec1f 100644
--- a/Gems/SurfaceData/Assets/Editor/Icons/Components/Viewport/SurfaceData.svg
+++ b/Gems/SurfaceData/Assets/Editor/Icons/Components/Viewport/SurfaceData.svg
@@ -1,25 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
-    <title>icon / Environmental / Surface Data Copy</title>
-    <desc>Created with Sketch.</desc>
+    <title>icon / Environmental / Surface Data - box</title>
     <defs>
         <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
             <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
             <stop stop-color="#9D9D9D" offset="100%"></stop>
         </linearGradient>
-        <path d="M20.924815,-3.10055012e-14 C23.1021676,-1.21881628e-13 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 1.16706519e-13,22.5147712 6.91022832e-14,21.1586662 C2.15231996e-14,19.8025612 2.19806118e-14,4.03532882 6.91022832e-14,2.67255351 C1.16426365e-13,1.3097782 1.36539793,-3.10055012e-14 2.60955829,-3.10055012e-14 C3.85371865,-3.10055012e-14 18.9601214,5.12500292e-14 20.924815,-3.10055012e-14 Z" id="path-2"></path>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
     </defs>
-    <g id="icon-/-Environmental-/-Surface-Data-Copy" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+    <g id="icon-/-Environmental-/-Surface-Data---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="icon/general/color/-box-template">
             <mask id="mask-3" fill="white">
                 <use xlink:href="#path-2"></use>
             </mask>
-            <use id="Path-3" fill="url(#linearGradient-1)" fill-rule="evenodd" xlink:href="#path-2"></use>
-            <g id="icon/general/color/Environmental" style="mix-blend-mode: multiply;" mask="url(#mask-3)" fill="#8BDD15" fill-rule="evenodd">
-                <rect id="Rectangle-2" x="0" y="0" width="24" height="24"></rect>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#8BDD15">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="Rectangle-2" x="0" y="0" width="24" height="24"></rect>
+                </g>
             </g>
         </g>
-        <path d="M21.1504022,17.0250283 L22.9351306,22.0770469 L16.4632938,22.0770469 L16.1316327,20.0578353 L19.698235,20.0578353 L18.7976296,17.0250283 L21.1504022,17.0250283 Z M3.16484007,17.001392 L5.51761265,17.001392 L4.7567612,20.1085151 L8.56424139,20.1085151 L7.87245518,22.0770469 L1.06486942,22.0770469 L3.16484007,17.001392 Z M10.4834055,14.0030191 L10.7637653,14.6480401 C9.67541949,14.8495321 8.933732,15.2501196 8.933732,15.7114 C8.933732,16.3751943 10.4696146,16.9133059 12.3642218,16.9133059 C14.258829,16.9133059 15.7947116,16.3751943 15.7947116,15.7114 C15.7947116,15.2594563 15.0827451,14.8657735 14.0303362,14.6605187 L14.2964069,14.0030191 L16.1776104,14.0030191 L17.8709488,18.97694 L6.59798017,18.97694 L8.43727058,14.0030191 L10.4834055,14.0030191 Z M20.7168545,14.9545929 L18.2970728,14.9545929 L17.4743641,13.0514453 L20.0296152,13.0514453 L20.7168545,14.9545929 Z M3.72206852,14.9545929 L4.83035055,13.0514453 L7.38560161,13.0514453 L6.14185022,14.9545929 L3.72206852,14.9545929 Z M4.2856351,7.15493845 L5.12956162,7.4959069 L3.01588623,9.36165503 L2.79149296,6.55126584 L3.72665459,6.92909567 C4.39921197,5.40846002 5.44793029,3.60960289 6.39905176,3.10967934 C7.81993244,2.36284336 9.53420368,2.5839193 10.5186736,3.77314285 C11.254953,4.66255634 11.6422812,6.13536824 12.2022328,7.87218297 C12.2022328,5.90802867 12.2778036,3.87076362 13.6958635,2.53160517 C15.2015649,1.10968164 17.4613298,1.24808271 19.0776668,2.23852946 L19.8082418,1.33634448 L20.9744868,3.90315426 L18.221292,3.29606434 L18.8145883,2.56340443 C17.3271124,1.97349977 15.9573931,2.32981632 14.8192094,3.77314285 C13.8679242,4.97946412 13.5218004,7.25683912 13.4144313,9.43732972 C14.2672555,7.29959901 15.329817,6.20527797 16.1166241,5.85432911 C17.9533306,5.0350813 19.7229549,6.77109418 20.1616243,8.88013833 L21.460831,8.74358621 L20.3068849,11.8193051 L18.5386774,9.05071692 L19.6566524,8.93321302 C18.9375592,7.65276929 17.6234316,7.39000755 16.7252772,7.7061777 C14.3292213,8.54964228 14.0552947,11.0169601 12.9878205,15.3062633 C12.9878205,15.3103183 12.1359876,15.3103183 11.9036786,15.3062633 L11.9069618,15.2887223 C11.679267,15.2892791 11.4660593,15.2951261 11.3753538,15.3062633 C11.3753538,14.4823645 11.4929889,14.6752979 11.1704344,13.418079 C10.84788,12.1608601 10.239422,10.5052322 8.69987023,11.4550865 L8.69987023,10.7464725 C10.0026807,9.83397556 10.7272318,10.8221221 11.3753538,11.9728705 C10.9863971,9.83397556 10.2980196,9.27588785 9.64305323,8.47611675 C8.88748351,7.55350014 8.19517876,7.11360366 7.48766824,7.63988233 L8.18215464,8.33436872 L5.50750032,9.22592016 L6.39905176,6.55126584 L7.08548907,7.23770316 C7.68411556,6.46361352 8.53546795,6.23491918 9.57450971,7.06572569 C10.0757529,7.46651433 10.489265,7.84488785 10.8750712,8.36621315 C10.5206001,7.04193732 10.144264,6.12548665 9.74606291,5.61686114 C8.99472791,4.65717488 8.08338892,3.78707723 6.32118079,4.5725635 C5.34730044,5.00666072 4.75549362,6.14014111 4.2856351,7.15493845 L4.2856351,7.15493845 Z" id="Shape" fill="#FFFFFF"></path>
+        <g id="Group" transform="translate(1.500000, 1.990017)" fill="#FFFFFF">
+            <path d="M10.5,-5.15143483e-14 C16.2989899,-5.15143483e-14 21,4.70101013 21,10.5 C21,13.7748874 19.5007322,16.699602 17.1511297,18.6252106 L15.9940292,16.986035 C17.8328833,15.4268708 19,13.0997327 19,10.5 C19,5.80557963 15.1944204,2 10.5,2 C5.80557963,2 2,5.80557963 2,10.5 C2,12.9824731 3.06420667,15.2163875 4.76129436,16.7704174 L3.46540276,18.2952699 C1.33737194,16.3736819 0,13.5930209 0,10.5 C0,4.70101013 4.70101013,-5.15143483e-14 10.5,-5.15143483e-14 Z M10.5,3.7175731 C14.2458309,3.7175731 17.2824269,6.75416906 17.2824269,10.5 C17.2824269,12.520143 16.3992354,14.3340056 14.9979135,15.5765266 L13.8340806,13.9286355 C14.727463,13.0597393 15.2824269,11.844679 15.2824269,10.5 C15.2824269,7.85873856 13.1412614,5.7175731 10.5,5.7175731 C7.85873856,5.7175731 5.7175731,7.85873856 5.7175731,10.5 C5.7175731,11.8472104 6.27462839,13.0643136 7.17096846,13.933539 L5.87386423,15.459892 C4.5471039,14.2218762 3.7175731,12.4578117 3.7175731,10.5 C3.7175731,6.75416906 6.75416906,3.7175731 10.5,3.7175731 Z" id="Combined-Shape" fill-rule="nonzero"></path>
+            <polygon id="Path-67" points="10.2735749 7.1256624 9.85989288 9.81700405 14.2768767 9.81700405 10.7000826 13.8743376 11.1611878 10.9879995 6.72312335 10.9879995"></polygon>
+        </g>
     </g>
-</svg>
+</svg>
\ No newline at end of file
diff --git a/Gems/Vegetation/Assets/Editor/Icons/Components/Viewport/Vegetation.png b/Gems/Vegetation/Assets/Editor/Icons/Components/Viewport/Vegetation.png
deleted file mode 100644
index 74c1376807..0000000000
--- a/Gems/Vegetation/Assets/Editor/Icons/Components/Viewport/Vegetation.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bc4b5fcbb7fb3566735f08992c24d0b4b3d2f3b3bc32ab78b4220a9138256950
-size 1000
diff --git a/Gems/Vegetation/Assets/Editor/Icons/Components/Viewport/VegetationFilter.png b/Gems/Vegetation/Assets/Editor/Icons/Components/Viewport/VegetationFilter.png
deleted file mode 100644
index f6116c3923..0000000000
--- a/Gems/Vegetation/Assets/Editor/Icons/Components/Viewport/VegetationFilter.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6b628133c7332d34393377cd30f174c843a316be1fe945c2776e328eac6e1361
-size 1338
diff --git a/Gems/Vegetation/Assets/Editor/Icons/Components/Viewport/VegetationModifier.png b/Gems/Vegetation/Assets/Editor/Icons/Components/Viewport/VegetationModifier.png
deleted file mode 100644
index 781cd7409c..0000000000
--- a/Gems/Vegetation/Assets/Editor/Icons/Components/Viewport/VegetationModifier.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0055b274117d53422c468bc20c9c2cfa86c267420849790f21474e09ad1b2b75
-size 1272
diff --git a/Gems/Vegetation/Code/Source/Debugger/EditorAreaDebugComponent.h b/Gems/Vegetation/Code/Source/Debugger/EditorAreaDebugComponent.h
index 3517c3b6d4..1ca80fe2ab 100644
--- a/Gems/Vegetation/Code/Source/Debugger/EditorAreaDebugComponent.h
+++ b/Gems/Vegetation/Code/Source/Debugger/EditorAreaDebugComponent.h
@@ -25,7 +25,7 @@ namespace Vegetation
         static constexpr const char* const s_componentName = "Vegetation Layer Debugger";
         static constexpr const char* const s_componentDescription = "Enables debug visualizations for vegetation layers";
         static constexpr const char* const s_icon = "Editor/Icons/Components/Vegetation.svg";
-        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/Vegetation.png";
+        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/Vegetation.svg";
         static constexpr const char* const s_helpUrl = "https://o3de.org/docs/user-guide/components/reference/";
     };
 }
diff --git a/Gems/Vegetation/Code/Source/Debugger/EditorDebugComponent.h b/Gems/Vegetation/Code/Source/Debugger/EditorDebugComponent.h
index ff99a98d65..59af7abd4f 100644
--- a/Gems/Vegetation/Code/Source/Debugger/EditorDebugComponent.h
+++ b/Gems/Vegetation/Code/Source/Debugger/EditorDebugComponent.h
@@ -29,7 +29,7 @@ namespace Vegetation
         static constexpr const char* const s_componentName = "Vegetation Debugger";
         static constexpr const char* const s_componentDescription = "";
         static constexpr const char* const s_icon = "Editor/Icons/Components/Vegetation.svg";
-        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/Vegetation.png";
+        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/Vegetation.svg";
         static constexpr const char* const s_helpUrl = "https://o3de.org/docs/user-guide/components/reference/";
 
     protected:
diff --git a/Gems/Vegetation/Code/Source/Editor/EditorAreaBlenderComponent.h b/Gems/Vegetation/Code/Source/Editor/EditorAreaBlenderComponent.h
index 98568eafc0..fa3eece228 100644
--- a/Gems/Vegetation/Code/Source/Editor/EditorAreaBlenderComponent.h
+++ b/Gems/Vegetation/Code/Source/Editor/EditorAreaBlenderComponent.h
@@ -32,7 +32,7 @@ namespace Vegetation
         static constexpr const char* const s_componentName = "Vegetation Layer Blender";
         static constexpr const char* const s_componentDescription = "Combines a collection of vegetation areas and applies them in a specified order";
         static constexpr const char* const s_icon = "Editor/Icons/Components/Vegetation.svg";
-        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/Vegetation.png";
+        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/Vegetation.svg";
         static constexpr const char* const s_helpUrl = "https://o3de.org/docs/user-guide/components/reference/";
 
     private:
diff --git a/Gems/Vegetation/Code/Source/Editor/EditorBlockerComponent.h b/Gems/Vegetation/Code/Source/Editor/EditorBlockerComponent.h
index e2b4aa911d..f3c65343a3 100644
--- a/Gems/Vegetation/Code/Source/Editor/EditorBlockerComponent.h
+++ b/Gems/Vegetation/Code/Source/Editor/EditorBlockerComponent.h
@@ -27,7 +27,7 @@ namespace Vegetation
         static constexpr const char* const s_componentName = "Vegetation Layer Blocker";
         static constexpr const char* const s_componentDescription = "Defines an area in which dynamic vegetation cannot be placed";
         static constexpr const char* const s_icon = "Editor/Icons/Components/Vegetation.svg";
-        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/Vegetation.png";
+        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/Vegetation.svg";
         static constexpr const char* const s_helpUrl = "https://o3de.org/docs/user-guide/components/reference/";
     };
 }
diff --git a/Gems/Vegetation/Code/Source/Editor/EditorDescriptorListCombinerComponent.h b/Gems/Vegetation/Code/Source/Editor/EditorDescriptorListCombinerComponent.h
index 14a7681520..e69ee144ed 100644
--- a/Gems/Vegetation/Code/Source/Editor/EditorDescriptorListCombinerComponent.h
+++ b/Gems/Vegetation/Code/Source/Editor/EditorDescriptorListCombinerComponent.h
@@ -25,7 +25,7 @@ namespace Vegetation
         static constexpr const char* const s_componentName = "Vegetation Asset List Combiner";
         static constexpr const char* const s_componentDescription = "Provides a list of vegetation descriptor providers";
         static constexpr const char* const s_icon = "Editor/Icons/Components/Vegetation.svg";
-        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/Vegetation.png";
+        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/Vegetation.svg";
         static constexpr const char* const s_helpUrl = "https://o3de.org/docs/user-guide/components/reference/";
     };
 }
diff --git a/Gems/Vegetation/Code/Source/Editor/EditorDescriptorListComponent.h b/Gems/Vegetation/Code/Source/Editor/EditorDescriptorListComponent.h
index 011a974757..142cb4c0cf 100644
--- a/Gems/Vegetation/Code/Source/Editor/EditorDescriptorListComponent.h
+++ b/Gems/Vegetation/Code/Source/Editor/EditorDescriptorListComponent.h
@@ -31,7 +31,7 @@ namespace Vegetation
         static constexpr const char* const s_componentName = "Vegetation Asset List";
         static constexpr const char* const s_componentDescription = "Provides a set of vegetation descriptors";
         static constexpr const char* const s_icon = "Editor/Icons/Components/Vegetation.svg";
-        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/Vegetation.png";
+        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/Vegetation.svg";
         static constexpr const char* const s_helpUrl = "https://o3de.org/docs/user-guide/components/reference/";
 
     private:
diff --git a/Gems/Vegetation/Code/Source/Editor/EditorDescriptorWeightSelectorComponent.h b/Gems/Vegetation/Code/Source/Editor/EditorDescriptorWeightSelectorComponent.h
index 554bb7bc23..ef5084e4a4 100644
--- a/Gems/Vegetation/Code/Source/Editor/EditorDescriptorWeightSelectorComponent.h
+++ b/Gems/Vegetation/Code/Source/Editor/EditorDescriptorWeightSelectorComponent.h
@@ -25,7 +25,7 @@ namespace Vegetation
         static constexpr const char* const s_componentName = "Vegetation Asset Weight Selector";
         static constexpr const char* const s_componentDescription = "Selects vegetation assets based on their weight";
         static constexpr const char* const s_icon = "Editor/Icons/Components/Vegetation.svg";
-        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/Vegetation.png";
+        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/Vegetation.svg";
         static constexpr const char* const s_helpUrl = "https://o3de.org/docs/user-guide/components/reference/";
     };
 }
diff --git a/Gems/Vegetation/Code/Source/Editor/EditorDistanceBetweenFilterComponent.h b/Gems/Vegetation/Code/Source/Editor/EditorDistanceBetweenFilterComponent.h
index 39ef5e493c..02204d290f 100644
--- a/Gems/Vegetation/Code/Source/Editor/EditorDistanceBetweenFilterComponent.h
+++ b/Gems/Vegetation/Code/Source/Editor/EditorDistanceBetweenFilterComponent.h
@@ -25,7 +25,7 @@ namespace Vegetation
         static constexpr const char* const s_componentName = "Vegetation Distance Between Filter";
         static constexpr const char* const s_componentDescription = "Defines the minimum distance required between vegetation instances";
         static constexpr const char* const s_icon = "Editor/Icons/Components/VegetationFilter.svg";
-        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/VegetationFilter.png";
+        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/VegetationFilter.svg";
         static constexpr const char* const s_helpUrl = "https://o3de.org/docs/user-guide/components/reference/";
     };
 }
diff --git a/Gems/Vegetation/Code/Source/Editor/EditorDistributionFilterComponent.h b/Gems/Vegetation/Code/Source/Editor/EditorDistributionFilterComponent.h
index eaa703e1ab..d9d895325f 100644
--- a/Gems/Vegetation/Code/Source/Editor/EditorDistributionFilterComponent.h
+++ b/Gems/Vegetation/Code/Source/Editor/EditorDistributionFilterComponent.h
@@ -25,7 +25,7 @@ namespace Vegetation
         static constexpr const char* const s_componentName = "Vegetation Distribution Filter";
         static constexpr const char* const s_componentDescription = "Limits vegetation to only place within the specified value ranges";
         static constexpr const char* const s_icon = "Editor/Icons/Components/VegetationFilter.svg";
-        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/VegetationFilter.png";
+        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/VegetationFilter.svg";
         static constexpr const char* const s_helpUrl = "https://o3de.org/docs/user-guide/components/reference/";
     };
 }
diff --git a/Gems/Vegetation/Code/Source/Editor/EditorLevelSettingsComponent.h b/Gems/Vegetation/Code/Source/Editor/EditorLevelSettingsComponent.h
index 4c7ba4818a..db9b99b27f 100644
--- a/Gems/Vegetation/Code/Source/Editor/EditorLevelSettingsComponent.h
+++ b/Gems/Vegetation/Code/Source/Editor/EditorLevelSettingsComponent.h
@@ -24,7 +24,7 @@ namespace Vegetation
         static constexpr const char* const s_componentName = "Vegetation System Settings";
         static constexpr const char* const s_componentDescription = "The vegetation system settings for this level/map.";
         static constexpr const char* const s_icon = "Editor/Icons/Components/Vegetation.svg";
-        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/Vegetation.png";
+        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/Vegetation.svg";
         static constexpr const char* const s_helpUrl = "https://o3de.org/docs/user-guide/components/reference/";
 
     private:
diff --git a/Gems/Vegetation/Code/Source/Editor/EditorMeshBlockerComponent.h b/Gems/Vegetation/Code/Source/Editor/EditorMeshBlockerComponent.h
index af40846e1e..ad37ecaaa6 100644
--- a/Gems/Vegetation/Code/Source/Editor/EditorMeshBlockerComponent.h
+++ b/Gems/Vegetation/Code/Source/Editor/EditorMeshBlockerComponent.h
@@ -40,7 +40,7 @@ namespace Vegetation
         static constexpr const char* const s_componentName = "Vegetation Layer Blocker (Mesh)";
         static constexpr const char* const s_componentDescription = "Prevents vegetation from being placed in the mesh";
         static constexpr const char* const s_icon = "Editor/Icons/Components/Vegetation.svg";
-        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/Vegetation.png";
+        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/Vegetation.svg";
         static constexpr const char* const s_helpUrl = "https://o3de.org/docs/user-guide/components/reference/";
 
     private:
diff --git a/Gems/Vegetation/Code/Source/Editor/EditorPositionModifierComponent.h b/Gems/Vegetation/Code/Source/Editor/EditorPositionModifierComponent.h
index 3809753764..cab8ebebfe 100644
--- a/Gems/Vegetation/Code/Source/Editor/EditorPositionModifierComponent.h
+++ b/Gems/Vegetation/Code/Source/Editor/EditorPositionModifierComponent.h
@@ -29,7 +29,7 @@ namespace Vegetation
         static constexpr const char* const s_componentName = "Vegetation Position Modifier";
         static constexpr const char* const s_componentDescription = "Offsets the position of the vegetation";
         static constexpr const char* const s_icon = "Editor/Icons/Components/VegetationModifier.svg";
-        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/VegetationModifier.png";
+        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/VegetationModifier.svg";
         static constexpr const char* const s_helpUrl = "https://o3de.org/docs/user-guide/components/reference/";
     };
 }
diff --git a/Gems/Vegetation/Code/Source/Editor/EditorReferenceShapeComponent.h b/Gems/Vegetation/Code/Source/Editor/EditorReferenceShapeComponent.h
index 9eb74f25aa..d0f9bf1ea0 100644
--- a/Gems/Vegetation/Code/Source/Editor/EditorReferenceShapeComponent.h
+++ b/Gems/Vegetation/Code/Source/Editor/EditorReferenceShapeComponent.h
@@ -25,7 +25,7 @@ namespace Vegetation
         static constexpr const char* const s_componentName = "Vegetation Reference Shape";
         static constexpr const char* const s_componentDescription = "Enables the entity to reference and reuse shape entities";
         static constexpr const char* const s_icon = "Editor/Icons/Components/Vegetation.svg";
-        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/Vegetation.png";
+        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/Vegetation.svg";
         static constexpr const char* const s_helpUrl = "https://o3de.org/docs/user-guide/components/reference/";
     };
 }
diff --git a/Gems/Vegetation/Code/Source/Editor/EditorRotationModifierComponent.h b/Gems/Vegetation/Code/Source/Editor/EditorRotationModifierComponent.h
index c470d1e021..709bbbbeb0 100644
--- a/Gems/Vegetation/Code/Source/Editor/EditorRotationModifierComponent.h
+++ b/Gems/Vegetation/Code/Source/Editor/EditorRotationModifierComponent.h
@@ -30,7 +30,7 @@ namespace Vegetation
         static constexpr const char* const s_componentName = "Vegetation Rotation Modifier";
         static constexpr const char* const s_componentDescription = "Offsets the rotation of the vegetation";
         static constexpr const char* const s_icon = "Editor/Icons/Components/VegetationModifier.svg";
-        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/VegetationModifier.png";
+        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/VegetationModifier.svg";
         static constexpr const char* const s_helpUrl = "https://o3de.org/docs/user-guide/components/reference/";
     };
 }
diff --git a/Gems/Vegetation/Code/Source/Editor/EditorShapeIntersectionFilterComponent.h b/Gems/Vegetation/Code/Source/Editor/EditorShapeIntersectionFilterComponent.h
index c6f79c0b09..325594cf82 100644
--- a/Gems/Vegetation/Code/Source/Editor/EditorShapeIntersectionFilterComponent.h
+++ b/Gems/Vegetation/Code/Source/Editor/EditorShapeIntersectionFilterComponent.h
@@ -25,7 +25,7 @@ namespace Vegetation
         static constexpr const char* const s_componentName = "Vegetation Shape Intersection Filter";
         static constexpr const char* const s_componentDescription = "Enable or disable placing vegetation if the entity intersects a shape";
         static constexpr const char* const s_icon = "Editor/Icons/Components/VegetationFilter.svg";
-        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/VegetationFilter.png";
+        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/VegetationFilter.svg";
         static constexpr const char* const s_helpUrl = "https://o3de.org/docs/user-guide/components/reference/";
     };
 }
diff --git a/Gems/Vegetation/Code/Source/Editor/EditorSlopeAlignmentModifierComponent.h b/Gems/Vegetation/Code/Source/Editor/EditorSlopeAlignmentModifierComponent.h
index f565a84ce7..887e24467c 100644
--- a/Gems/Vegetation/Code/Source/Editor/EditorSlopeAlignmentModifierComponent.h
+++ b/Gems/Vegetation/Code/Source/Editor/EditorSlopeAlignmentModifierComponent.h
@@ -25,7 +25,7 @@ namespace Vegetation
         static constexpr const char* const s_componentName = "Vegetation Slope Alignment Modifier";
         static constexpr const char* const s_componentDescription = "Offsets the orientation of the vegetation relative to a surface angle";
         static constexpr const char* const s_icon = "Editor/Icons/Components/VegetationModifier.svg";
-        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/VegetationModifier.png";
+        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/VegetationModifier.svg";
         static constexpr const char* const s_helpUrl = "https://o3de.org/docs/user-guide/components/reference/";
     };
 }
diff --git a/Gems/Vegetation/Code/Source/Editor/EditorSpawnerComponent.h b/Gems/Vegetation/Code/Source/Editor/EditorSpawnerComponent.h
index 13a24d7c83..709b645ea2 100644
--- a/Gems/Vegetation/Code/Source/Editor/EditorSpawnerComponent.h
+++ b/Gems/Vegetation/Code/Source/Editor/EditorSpawnerComponent.h
@@ -28,7 +28,7 @@ namespace Vegetation
         static constexpr const char* const s_componentName = "Vegetation Layer Spawner";
         static constexpr const char* const s_componentDescription = "Creates dynamic vegetation in a specified area";
         static constexpr const char* const s_icon = "Editor/Icons/Components/Vegetation.svg";
-        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/Vegetation.png";
+        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/Vegetation.svg";
         static constexpr const char* const s_helpUrl = "https://o3de.org/docs/user-guide/components/reference/vegetation-layer-spawner/";
     };
 }
diff --git a/Gems/Vegetation/Code/Source/Editor/EditorSurfaceAltitudeFilterComponent.h b/Gems/Vegetation/Code/Source/Editor/EditorSurfaceAltitudeFilterComponent.h
index 22f60167ac..7b49b602af 100644
--- a/Gems/Vegetation/Code/Source/Editor/EditorSurfaceAltitudeFilterComponent.h
+++ b/Gems/Vegetation/Code/Source/Editor/EditorSurfaceAltitudeFilterComponent.h
@@ -26,7 +26,7 @@ namespace Vegetation
         static constexpr const char* const s_componentName = "Vegetation Altitude Filter";
         static constexpr const char* const s_componentDescription = "Limits vegetation to only place within the specified height range";
         static constexpr const char* const s_icon = "Editor/Icons/Components/VegetationFilter.svg";
-        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/VegetationFilter.png";
+        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/VegetationFilter.svg";
         static constexpr const char* const s_helpUrl = "https://o3de.org/docs/user-guide/components/reference/";
 
         AZ::u32 ConfigurationChanged() override;
diff --git a/Gems/Vegetation/Code/Source/Editor/EditorSurfaceMaskDepthFilterComponent.h b/Gems/Vegetation/Code/Source/Editor/EditorSurfaceMaskDepthFilterComponent.h
index 2599450a11..1a64203a4b 100644
--- a/Gems/Vegetation/Code/Source/Editor/EditorSurfaceMaskDepthFilterComponent.h
+++ b/Gems/Vegetation/Code/Source/Editor/EditorSurfaceMaskDepthFilterComponent.h
@@ -25,7 +25,7 @@ namespace Vegetation
         static constexpr const char* const s_componentName = "Vegetation Surface Mask Depth Filter";
         static constexpr const char* const s_componentDescription = "Limits vegetation to only place within a specified depth between two surface tags";
         static constexpr const char* const s_icon = "Editor/Icons/Components/VegetationFilter.svg";
-        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/VegetationFilter.png";
+        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/VegetationFilter.svg";
         static constexpr const char* const s_helpUrl = "https://o3de.org/docs/user-guide/components/reference/";
     };
 }
diff --git a/Gems/Vegetation/Code/Source/Editor/EditorSurfaceMaskFilterComponent.h b/Gems/Vegetation/Code/Source/Editor/EditorSurfaceMaskFilterComponent.h
index 3ba386d19b..9657ff5daf 100644
--- a/Gems/Vegetation/Code/Source/Editor/EditorSurfaceMaskFilterComponent.h
+++ b/Gems/Vegetation/Code/Source/Editor/EditorSurfaceMaskFilterComponent.h
@@ -25,7 +25,7 @@ namespace Vegetation
         static constexpr const char* const s_componentName = "Vegetation Surface Mask Filter";
         static constexpr const char* const s_componentDescription = "Filters out vegetation based on surface mask-to-tag mappings";
         static constexpr const char* const s_icon = "Editor/Icons/Components/VegetationFilter.svg";
-        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/VegetationFilter.png";
+        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/VegetationFilter.svg";
         static constexpr const char* const s_helpUrl = "https://o3de.org/docs/user-guide/components/reference/";
     };
 }
diff --git a/Gems/Vegetation/Code/Source/Editor/EditorSurfaceSlopeFilterComponent.h b/Gems/Vegetation/Code/Source/Editor/EditorSurfaceSlopeFilterComponent.h
index 4261d225ef..667c0999fb 100644
--- a/Gems/Vegetation/Code/Source/Editor/EditorSurfaceSlopeFilterComponent.h
+++ b/Gems/Vegetation/Code/Source/Editor/EditorSurfaceSlopeFilterComponent.h
@@ -25,7 +25,7 @@ namespace Vegetation
         static constexpr const char* const s_componentName = "Vegetation Slope Filter";
         static constexpr const char* const s_componentDescription = "Limits vegetation to only place within the specified surface angles";
         static constexpr const char* const s_icon = "Editor/Icons/Components/VegetationFilter.svg";
-        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/VegetationFilter.png";
+        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/VegetationFilter.svg";
         static constexpr const char* const s_helpUrl = "https://o3de.org/docs/user-guide/components/reference/";
     };
 }
diff --git a/Gems/WhiteBox/Assets/editor/icons/components/Viewport/WhiteBox.png b/Gems/WhiteBox/Assets/editor/icons/components/Viewport/WhiteBox.png
deleted file mode 100644
index 14860438d4..0000000000
--- a/Gems/WhiteBox/Assets/editor/icons/components/Viewport/WhiteBox.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:844954b55c99dd11696a5b6dc463c1fd767a0670f29d655d10ebf65e4f0262d1
-size 5361
diff --git a/Gems/WhiteBox/Assets/editor/icons/components/Viewport/WhiteBox_collider.png b/Gems/WhiteBox/Assets/editor/icons/components/Viewport/WhiteBox_collider.png
deleted file mode 100644
index e301528886..0000000000
--- a/Gems/WhiteBox/Assets/editor/icons/components/Viewport/WhiteBox_collider.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a63c1f37de351cb90510bf1447a87e0bcfc6eaf687b7495cb4e1c46f2ccb2aa3
-size 5785
diff --git a/Gems/WhiteBox/Assets/editor/icons/components/Viewport/Whitebox.svg b/Gems/WhiteBox/Assets/editor/icons/components/Viewport/Whitebox.svg
new file mode 100644
index 0000000000..28c38af5d7
--- /dev/null
+++ b/Gems/WhiteBox/Assets/editor/icons/components/Viewport/Whitebox.svg
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Shapes / Whitebox - box</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
+            <stop stop-color="#9D9D9D" offset="100%"></stop>
+        </linearGradient>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
+    </defs>
+    <g id="icon-/-Shapes-/-Whitebox---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/general/color/-box-template">
+            <mask id="mask-3" fill="white">
+                <use xlink:href="#path-2"></use>
+            </mask>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#5A69A1">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="Rectangle-2" x="0" y="0" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+        <g id="Group-3" transform="translate(1.866492, 3.320292)" fill="#FFFFFF" fill-rule="nonzero">
+            <polygon id="Path-Copy-8" points="6.4296782 -9.41469125e-14 12.9295578 2.95897635 12.9295578 4.49286168 11.5009864 5.27140192 11.5009864 3.71031593 6.39868182 1.41683662 1.74728286 3.58569772 1.74728286 5.24971398 6.29225432 7.44283342 12.9295578 4.49286168 12.9295578 6.06440182 6.29225432 8.93128186 1.86695104e-12 5.83913365 1.86695104e-12 2.96372796"></polygon>
+            <polygon id="Path" points="6.46477889 2.43024007 10.4835861 4.15969494 6.46477889 5.79802353 2.74751337 4.07823976"></polygon>
+            <polygon id="Path-Copy" points="13.8239916 9.3517133 17.8427988 11.0811682 13.8239916 12.7194968 10.1067261 10.999713"></polygon>
+            <polygon id="Path-Copy-9" points="1.74728286 6.46016758 1.74728286 8.44709582 6.29225432 10.5527281 6.29225432 12.0411765 -4.44533299e-13 9.03651549 -4.44533299e-13 5.49847522"></polygon>
+            <polygon id="Path-Copy-10" points="1.74728286 9.55325163 1.74728286 11.3813736 6.29225432 13.4870058 6.29225432 14.9754542 4.64961403e-13 11.9707932 4.64961403e-13 8.93128186"></polygon>
+            <polygon id="Path-Copy-11" points="9.08474184 13.3414665 9.08474184 15.0054828 13.6297133 17.111115 13.6297133 18.5995635 7.33745898 15.5949024 7.33745898 12.7194968"></polygon>
+            <polygon id="Path-Copy-12" transform="translate(17.120890, 15.659530) scale(-1, 1) translate(-17.120890, -15.659530) " points="15.7220453 13.3414665 15.7220453 15.0054828 20.2670168 17.111115 20.2670168 18.5995635 13.9747624 15.5949024 13.9747624 12.7194968"></polygon>
+            <polygon id="Path-Copy-13" points="13.7671372 6.95665174 20.2670168 9.83072189 20.2670168 11.1874622 18.8384453 11.9660025 18.8384453 10.5820615 13.7361408 8.37348836 9.08474184 10.4526917 9.08474184 12.1167079 13.6297133 14.2223402 20.2670168 11.1874622 20.2670168 12.7590024 13.6297133 15.7107886 7.33745898 12.7061276 7.33745898 9.83072189"></polygon>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Gems/WhiteBox/Assets/editor/icons/components/Viewport/WhiteboxCollider.svg b/Gems/WhiteBox/Assets/editor/icons/components/Viewport/WhiteboxCollider.svg
new file mode 100644
index 0000000000..89be3653ba
--- /dev/null
+++ b/Gems/WhiteBox/Assets/editor/icons/components/Viewport/WhiteboxCollider.svg
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon / Shapes / WhiteboxCollider - box</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#ADADAD" stop-opacity="0" offset="0%"></stop>
+            <stop stop-color="#9D9D9D" offset="100%"></stop>
+        </linearGradient>
+        <path d="M20.924815,0 C23.1021676,0 23.9566542,1.77846722 23.9566542,3.01865122 C23.9566542,4.25883521 23.9566542,18.7815894 23.9566542,20.6420628 C23.9566542,22.3929727 22.7281352,23.9566542 20.924815,23.9566542 C19.1214948,23.9566542 4.64929841,23.9566542 2.80929064,23.9566542 C1.38661643,23.9566542 0,22.5147712 0,21.1586662 C0,19.8025612 0,4.03532882 0,2.67255351 C0,1.3097782 1.36539793,0 2.60955829,0 C3.85371865,0 18.9601214,0 20.924815,0 Z" id="path-2"></path>
+    </defs>
+    <g id="icon-/-Shapes-/-WhiteboxCollider---box" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/general/color/-box-template">
+            <mask id="mask-3" fill="white">
+                <use xlink:href="#path-2"></use>
+            </mask>
+            <use id="Path-3" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+            <g id="Group" mask="url(#mask-3)" fill="#5A69A1">
+                <g id="icon/color/AI" style="mix-blend-mode: multiply;">
+                    <rect id="Rectangle-2" x="0" y="0" width="24" height="24"></rect>
+                </g>
+            </g>
+        </g>
+        <g id="Group-2" transform="translate(1.454110, 0.000000)" fill="#FFFFFF">
+            <polygon id="Path-Copy-2" fill-rule="nonzero" points="6.4296782 5.47554808 12.9295578 8.43452443 12.9295578 9.96840975 11.5009864 10.74695 11.5009864 9.185864 6.39868182 6.8923847 1.74728286 9.0612458 1.74728286 10.7252621 6.29225432 12.9183815 12.9295578 9.96840975 12.9295578 11.5399499 6.29225432 14.4068299 9.09494702e-13 11.3146817 9.09494702e-13 8.43927603"></polygon>
+            <polygon id="Path-Copy-4" fill-rule="nonzero" points="1.74728286 11.8455912 1.74728286 13.5096074 6.29225432 15.6152397 6.29225432 17.1036881 0 14.0990271 0 10.8838988"></polygon>
+            <polygon id="Path-Copy-5" fill-rule="nonzero" points="1.74728286 14.6157632 1.74728286 16.4438851 6.29225432 18.5495174 6.29225432 20.0379658 9.09494702e-13 17.0333048 9.09494702e-13 13.9937934"></polygon>
+            <polygon id="Path-Copy-6" fill-rule="nonzero" points="9.08474184 18.2825383 9.08474184 19.9465545 13.6297133 22.0521868 13.6297133 23.5406352 7.33745898 20.5359742 7.33745898 17.6605685"></polygon>
+            <polygon id="Path-Copy-7" fill-rule="nonzero" transform="translate(17.120890, 20.600602) scale(-1, 1) translate(-17.120890, -20.600602) " points="15.7220453 18.2825383 15.7220453 19.9465545 20.2670168 22.0521868 20.2670168 23.5406352 13.9747624 20.5359742 13.9747624 17.6605685"></polygon>
+            <polygon id="Path-Copy-3" fill-rule="nonzero" points="12.6909859 14.3162269 9.08474184 15.9282397 9.08474184 17.592256 13.6297133 19.6978882 20.2670168 16.6910599 20.2670168 18.2345504 13.6297133 21.1863367 7.33745898 18.1816757 7.33745898 15.30627 12.6400358 12.9360148"></polygon>
+            <ellipse id="Oval" cx="16.9646878" cy="13.5728413" rx="3.30232895" ry="3.23642692"></ellipse>
+            <polygon id="Path-63" fill-rule="nonzero" transform="translate(7.772281, 3.026938) rotate(-2.000000) translate(-7.772281, -3.026938) " points="8.75167656 1.20915192 9.72358797 2.35168778 6.79288582 4.84472364 5.8209744 3.70218778"></polygon>
+            <polygon id="Path-68" fill-rule="nonzero" transform="translate(12.196010, 1.967933) rotate(-3.000000) translate(-12.196010, -1.967933) " points="10.4305089 2.48653165 10.6310673 1 13.961511 1.44933346 13.7609526 2.93586511"></polygon>
+            <polygon id="Path-69" fill-rule="nonzero" transform="translate(15.772002, 3.989294) rotate(8.000000) translate(-15.772002, -3.989294) " points="14.1723773 3.58656862 15.1599202 2.45751642 17.3716267 4.39201973 16.3840837 5.52107192"></polygon>
+            <polygon id="Path-70" fill-rule="nonzero" transform="translate(17.502016, 7.895715) rotate(7.000000) translate(-17.502016, -7.895715) " points="16.3235972 6.61844483 17.757074 6.1766936 18.6804342 9.17298496 17.2469574 9.61473619"></polygon>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Gems/WhiteBox/Code/Source/EditorWhiteBoxComponent.cpp b/Gems/WhiteBox/Code/Source/EditorWhiteBoxComponent.cpp
index 4be54967e6..5448c5c123 100644
--- a/Gems/WhiteBox/Code/Source/EditorWhiteBoxComponent.cpp
+++ b/Gems/WhiteBox/Code/Source/EditorWhiteBoxComponent.cpp
@@ -193,7 +193,7 @@ namespace WhiteBox
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                     ->Attribute(AZ::Edit::Attributes::Category, "Shape")
                     ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/WhiteBox.svg")
-                    ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Viewport/WhiteBox.png")
+                    ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Viewport/WhiteBox.svg")
                     ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                     ->Attribute(
                         AZ::Edit::Attributes::HelpPageURL, "https://o3de.org/docs/user-guide/components/reference/white-box/")
diff --git a/cmake/Platform/Common/Configurations_common.cmake b/cmake/Platform/Common/Configurations_common.cmake
index 6ec788994c..15f7344958 100644
--- a/cmake/Platform/Common/Configurations_common.cmake
+++ b/cmake/Platform/Common/Configurations_common.cmake
@@ -47,3 +47,18 @@ ly_append_configurations_options(
         NDEBUG
         AZ_BUILD_CONFIGURATION_TYPE="${LY_BUILD_CONFIGURATION_TYPE_RELEASE}"
 )
+
+# Ninja: parallel compile and link pool settings
+if(CMAKE_GENERATOR MATCHES "Ninja")
+    set(LY_PARALLEL_COMPILE_JOBS "" CACHE STRING "Number of compile jobs to use (Defaults to not set)")
+    set(LY_PARALLEL_LINK_JOBS "" CACHE STRING "Number of link jobs to use (Defaults to not set)")
+
+    if(LY_PARALLEL_COMPILE_JOBS)
+        set_property(GLOBAL APPEND PROPERTY JOB_POOLS compile_job_pool=${LY_PARALLEL_COMPILE_JOBS})
+        ly_set(CMAKE_JOB_POOL_COMPILE compile_job_pool)
+    endif()
+    if(LY_PARALLEL_LINK_JOBS)
+        set_property(GLOBAL APPEND PROPERTY JOB_POOLS link_job_pool=${LY_PARALLEL_LINK_JOBS})
+        ly_set(CMAKE_JOB_POOL_LINK link_job_pool)
+    endif()
+endif()
diff --git a/cmake/Platform/Linux/Configurations_linux.cmake b/cmake/Platform/Linux/Configurations_linux.cmake
index c4a98a4bec..7da0cf188f 100644
--- a/cmake/Platform/Linux/Configurations_linux.cmake
+++ b/cmake/Platform/Linux/Configurations_linux.cmake
@@ -29,10 +29,3 @@ endif()
 ly_set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
 ly_set(CMAKE_INSTALL_RPATH_USE_LINK_PATH FALSE)
 ly_set(CMAKE_INSTALL_RPATH "$ORIGIN")
-
-if(CMAKE_GENERATOR MATCHES "Ninja")
-    if(LY_PARALLEL_LINK_JOBS)
-        set_property(GLOBAL APPEND PROPERTY JOB_POOLS link_job_pool=${LY_PARALLEL_LINK_JOBS})
-        ly_set(CMAKE_JOB_POOL_LINK link_job_pool)
-    endif()
-endif()