From 1b63ca3bc0924a143b2952cdf88cca0e8a57dc57 Mon Sep 17 00:00:00 2001
From: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>
Date: Thu, 18 Nov 2021 11:30:03 -0600
Subject: [PATCH] Terrain component icon updates. (#5722)

* Terrain component icon updates.
Refreshed using latest icons from UX.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>

* Revised icons from UX.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>
---
 .../Icons/Components/AxisAlignedBoxShape.svg  |  3 ++
 .../Viewport/AxisAlignedBoxShape.svg          | 16 +++++++
 .../EditorAxisAlignedBoxShapeComponent.cpp    |  4 +-
 .../Components/PhysXHeightfieldCollider.svg   |  3 ++
 .../Viewport/PhysXHeightfieldCollider.svg     | 16 +++++++
 .../EditorHeightfieldColliderComponent.cpp    |  4 +-
 .../Editor/Icons/Components/TerrainHeight.svg | 12 ++---
 .../Icons/Components/TerrainLayerSpawner.svg  | 12 ++---
 .../Icons/Components/TerrainMacroMaterial.svg |  3 ++
 .../Components/TerrainPhysicsCollider.svg     |  3 ++
 .../Components/TerrainSurfaceGradientList.svg |  3 ++
 .../Components/TerrainSurfaceMaterials.svg    |  3 ++
 .../Editor/Icons/Components/TerrainWorld.svg  | 13 ++---
 .../Icons/Components/TerrainWorldDebugger.svg | 13 ++---
 .../Icons/Components/TerrainWorldRenderer.svg | 13 ++---
 .../Components/Viewport/TerrainHeight.svg     | 47 +++++++++----------
 .../Viewport/TerrainLayerSpawner.svg          | 47 +++++++++----------
 .../Viewport/TerrainMacroMaterial.svg         | 16 +++++++
 .../Viewport/TerrainPhysicsCollider.svg       | 16 +++++++
 .../Viewport/TerrainSurfaceGradientList.svg   | 16 +++++++
 .../Viewport/TerrainSurfaceMaterials.svg      | 21 +++++++++
 .../Components/Viewport/TerrainWorld.svg      | 47 +++++++++----------
 .../Viewport/TerrainWorldDebugger.svg         | 47 +++++++++----------
 .../Viewport/TerrainWorldRenderer.svg         | 47 +++++++++----------
 .../EditorTerrainPhysicsColliderComponent.h   |  4 +-
 ...ditorTerrainSurfaceGradientListComponent.h |  4 +-
 .../EditorTerrainMacroMaterialComponent.h     |  4 +-
 ...itorTerrainSurfaceMaterialsListComponent.h |  4 +-
 28 files changed, 266 insertions(+), 175 deletions(-)
 create mode 100644 Gems/LmbrCentral/Assets/Editor/Icons/Components/AxisAlignedBoxShape.svg
 create mode 100644 Gems/LmbrCentral/Assets/Editor/Icons/Components/Viewport/AxisAlignedBoxShape.svg
 create mode 100644 Gems/PhysX/Assets/Editor/Icons/Components/PhysXHeightfieldCollider.svg
 create mode 100644 Gems/PhysX/Assets/Editor/Icons/Components/Viewport/PhysXHeightfieldCollider.svg
 create mode 100644 Gems/Terrain/Assets/Editor/Icons/Components/TerrainMacroMaterial.svg
 create mode 100644 Gems/Terrain/Assets/Editor/Icons/Components/TerrainPhysicsCollider.svg
 create mode 100644 Gems/Terrain/Assets/Editor/Icons/Components/TerrainSurfaceGradientList.svg
 create mode 100644 Gems/Terrain/Assets/Editor/Icons/Components/TerrainSurfaceMaterials.svg
 create mode 100644 Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainMacroMaterial.svg
 create mode 100644 Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainPhysicsCollider.svg
 create mode 100644 Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainSurfaceGradientList.svg
 create mode 100644 Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainSurfaceMaterials.svg

diff --git a/Gems/LmbrCentral/Assets/Editor/Icons/Components/AxisAlignedBoxShape.svg b/Gems/LmbrCentral/Assets/Editor/Icons/Components/AxisAlignedBoxShape.svg
new file mode 100644
index 0000000000..0f3982d713
--- /dev/null
+++ b/Gems/LmbrCentral/Assets/Editor/Icons/Components/AxisAlignedBoxShape.svg
@@ -0,0 +1,3 @@
+<svg width="25" height="24" viewBox="0 0 25 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M21.5789 22.9873L23.8723 19.9949L21.5789 17.0174H20.687V19.017H12.8866V20.9916H20.687V22.9873H21.5789ZM12.8866 13.0434V16.9992L16.8948 16.9985V8.10599H7.88818V11.0434H10.8866C11.9912 11.0434 12.8866 11.9388 12.8866 13.0434ZM3.89205 11.0434H5.88784V4.00632H7.90482V3.07213L5.00928 1.02013L1.87939 3.07213V4.00632H3.89205V11.0434ZM13.2463 3.21631L21.8135 3.21631L17.8709 6.66608L7.927 6.66607L13.2463 3.21631ZM22.2196 13.7975V4.6508L18.2206 8.15246V17.0128L22.2196 13.7975ZM3.90234 12.021H10.3722C11.2007 12.021 11.8722 12.6925 11.8722 13.521V21.0081H5.40235C4.57392 21.0081 3.90234 20.3365 3.90234 19.5081V12.021ZM8.70527 16.838C9.33748 16.5165 9.77437 15.8285 9.77437 15.0317C9.77437 13.9271 8.9349 13.0317 7.89937 13.0317C6.86383 13.0317 6.02437 13.9271 6.02437 15.0317C6.02437 15.8343 6.46768 16.5266 7.10739 16.845L6.14808 19.3089C6.02046 19.6367 6.26225 19.9903 6.61401 19.9903L9.22353 19.9903C9.57695 19.9903 9.81882 19.6337 9.68804 19.3053L8.70527 16.838Z" fill="#5A69A1"/>
+</svg>
diff --git a/Gems/LmbrCentral/Assets/Editor/Icons/Components/Viewport/AxisAlignedBoxShape.svg b/Gems/LmbrCentral/Assets/Editor/Icons/Components/Viewport/AxisAlignedBoxShape.svg
new file mode 100644
index 0000000000..51f0be0572
--- /dev/null
+++ b/Gems/LmbrCentral/Assets/Editor/Icons/Components/Viewport/AxisAlignedBoxShape.svg
@@ -0,0 +1,16 @@
+<svg width="24" height="25" viewBox="0 0 24 25" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M20.9248 0.787842C23.1022 0.787842 23.9567 2.56631 23.9567 3.80649C23.9567 5.04668 23.9567 19.5694 23.9567 21.4299C23.9567 23.1808 22.7281 24.7445 20.9248 24.7445C19.1215 24.7445 4.6493 24.7445 2.80929 24.7445C1.38662 24.7445 0 23.3026 0 21.9465C0 20.5904 0 4.82317 0 3.4604C0 2.09762 1.3654 0.787842 2.60956 0.787842C3.85372 0.787842 18.9601 0.787842 20.9248 0.787842Z" fill="url(#paint0_linear_833_47252)"/>
+<mask id="mask0_833_47252" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="0" y="0" width="24" height="25">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M20.9248 0.787842C23.1022 0.787842 23.9567 2.56631 23.9567 3.80649C23.9567 5.04668 23.9567 19.5694 23.9567 21.4299C23.9567 23.1808 22.7281 24.7445 20.9248 24.7445C19.1215 24.7445 4.6493 24.7445 2.80929 24.7445C1.38662 24.7445 0 23.3026 0 21.9465C0 20.5904 0 4.82317 0 3.4604C0 2.09762 1.3654 0.787842 2.60956 0.787842C3.85372 0.787842 18.9601 0.787842 20.9248 0.787842Z" fill="white"/>
+</mask>
+<g mask="url(#mask0_833_47252)">
+<rect y="0.787842" width="24" height="24" fill="#5A69A1"/>
+</g>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M20.6922 23.9873L22.9856 20.9949L20.6922 18.0174H19.8003V20.017H11.9999V21.9916H19.8003V23.9873H20.6922ZM11.9999 14.0434V17.9992L16.0081 17.9985V9.10599H7.00146V12.0434H9.9999C11.1045 12.0434 11.9999 12.9388 11.9999 14.0434ZM3.00533 12.0434H5.00112V5.00632H7.0181V4.07213L4.12256 2.02013L0.992676 4.07213V5.00632H3.00533V12.0434ZM12.3596 4.21631L20.9268 4.21631L16.9842 7.66608L7.04028 7.66607L12.3596 4.21631ZM21.3328 14.7975V5.6508L17.3339 9.15246V18.0128L21.3328 14.7975ZM3.01562 13.021H9.48551C10.3139 13.021 10.9855 13.6925 10.9855 14.521V22.0081H4.51563C3.6872 22.0081 3.01562 21.3365 3.01562 20.5081V13.021ZM7.81855 17.838C8.45076 17.5165 8.88765 16.8285 8.88765 16.0317C8.88765 14.9271 8.04818 14.0317 7.01265 14.0317C5.97711 14.0317 5.13765 14.9271 5.13765 16.0317C5.13765 16.8343 5.58096 17.5266 6.22067 17.845L5.26136 20.3089C5.13374 20.6367 5.37553 20.9903 5.72729 20.9903L8.33681 20.9903C8.69023 20.9903 8.9321 20.6337 8.80132 20.3053L7.81855 17.838Z" fill="white"/>
+<defs>
+<linearGradient id="paint0_linear_833_47252" x1="0" y1="0.787842" x2="0" y2="24.7445" gradientUnits="userSpaceOnUse">
+<stop stop-color="#ADADAD" stop-opacity="0.01"/>
+<stop offset="1" stop-color="#9D9D9D"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/Gems/LmbrCentral/Code/Source/Shape/EditorAxisAlignedBoxShapeComponent.cpp b/Gems/LmbrCentral/Code/Source/Shape/EditorAxisAlignedBoxShapeComponent.cpp
index c833677b1d..f78f2f048d 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/EditorAxisAlignedBoxShapeComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Shape/EditorAxisAlignedBoxShapeComponent.cpp
@@ -36,8 +36,8 @@ namespace LmbrCentral
                     "Axis Aligned Box Shape", "The Axis Aligned Box Shape component creates a box around the associated entity")
                     ->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.svg")
+                        ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/AxisAlignedBoxShape.svg")
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Viewport/AxisAlignedBoxShape.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/shape/axis-aligned-box-shape/")
diff --git a/Gems/PhysX/Assets/Editor/Icons/Components/PhysXHeightfieldCollider.svg b/Gems/PhysX/Assets/Editor/Icons/Components/PhysXHeightfieldCollider.svg
new file mode 100644
index 0000000000..f616a26381
--- /dev/null
+++ b/Gems/PhysX/Assets/Editor/Icons/Components/PhysXHeightfieldCollider.svg
@@ -0,0 +1,3 @@
+<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M23.4136 12.1206L12.978 2.21481L2.54248 12.1206L12.978 21.3836L23.4136 12.1206ZM17.5499 9.4842L20.6092 12.0824L12.978 18.1512L5.4399 12.0824L6.97886 10.8946L8.56141 10.5414L9.95877 8.15224L11.4198 9.4842L12.978 6.22736L14.7794 8.96805L15.7346 10.2098L17.5499 9.4842Z" fill="#DD7F6D"/>
+</svg>
diff --git a/Gems/PhysX/Assets/Editor/Icons/Components/Viewport/PhysXHeightfieldCollider.svg b/Gems/PhysX/Assets/Editor/Icons/Components/Viewport/PhysXHeightfieldCollider.svg
new file mode 100644
index 0000000000..fbfed18e46
--- /dev/null
+++ b/Gems/PhysX/Assets/Editor/Icons/Components/Viewport/PhysXHeightfieldCollider.svg
@@ -0,0 +1,16 @@
+<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M21.522 0.799194C23.6993 0.799194 24.5538 2.57766 24.5538 3.81785C24.5538 5.05803 24.5538 19.5808 24.5538 21.4413C24.5538 23.1922 23.3253 24.7559 21.522 24.7559C19.7187 24.7559 5.24647 24.7559 3.40646 24.7559C1.98378 24.7559 0.597168 23.314 0.597168 21.9579C0.597168 20.6018 0.597168 4.83452 0.597168 3.47175C0.597168 2.10897 1.96257 0.799194 3.20673 0.799194C4.45089 0.799194 19.5573 0.799194 21.522 0.799194Z" fill="url(#paint0_linear_826_47191)"/>
+<mask id="mask0_826_47191" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="0" y="0" width="25" height="25">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M21.522 0.799194C23.6993 0.799194 24.5538 2.57766 24.5538 3.81785C24.5538 5.05803 24.5538 19.5808 24.5538 21.4413C24.5538 23.1922 23.3253 24.7559 21.522 24.7559C19.7187 24.7559 5.24647 24.7559 3.40646 24.7559C1.98378 24.7559 0.597168 23.314 0.597168 21.9579C0.597168 20.6018 0.597168 4.83452 0.597168 3.47175C0.597168 2.10897 1.96257 0.799194 3.20673 0.799194C4.45089 0.799194 19.5573 0.799194 21.522 0.799194Z" fill="white"/>
+</mask>
+<g mask="url(#mask0_826_47191)">
+<rect x="0.597168" y="0.799194" width="24" height="24" fill="#DD7F6D"/>
+</g>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M23.0327 12.8374L12.5972 2.93161L2.16162 12.8374L12.5972 22.1004L23.0327 12.8374ZM17.169 10.201L20.2283 12.7992L12.5972 18.868L5.05904 12.7992L6.598 11.6114L8.18055 11.2582L9.57791 8.86903L11.039 10.201L12.5972 6.94416L14.3986 9.68485L15.3538 10.9266L17.169 10.201Z" fill="white"/>
+<defs>
+<linearGradient id="paint0_linear_826_47191" x1="0.597168" y1="0.799194" x2="0.597168" y2="24.7558" gradientUnits="userSpaceOnUse">
+<stop stop-color="#ADADAD" stop-opacity="0.01"/>
+<stop offset="1" stop-color="#9D9D9D"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/Gems/PhysX/Code/Source/EditorHeightfieldColliderComponent.cpp b/Gems/PhysX/Code/Source/EditorHeightfieldColliderComponent.cpp
index 0f09258524..fb0a38fa18 100644
--- a/Gems/PhysX/Code/Source/EditorHeightfieldColliderComponent.cpp
+++ b/Gems/PhysX/Code/Source/EditorHeightfieldColliderComponent.cpp
@@ -34,8 +34,8 @@ namespace PhysX
                     "PhysX Heightfield Collider", "Creates geometry in the PhysX simulation based on an attached heightfield component")
                     ->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/Viewport/PhysXCollider.svg")
+                        ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/PhysXHeightfieldCollider.svg")
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Viewport/PhysXHeightfieldCollider.svg")
                         ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC_CE("Game"))
                         ->Attribute(
                             AZ::Edit::Attributes::HelpPageURL, "https://o3de.org/docs/user-guide/components/reference/physx/heightfield-collider/")
diff --git a/Gems/Terrain/Assets/Editor/Icons/Components/TerrainHeight.svg b/Gems/Terrain/Assets/Editor/Icons/Components/TerrainHeight.svg
index 57835e9c20..78af20cc2d 100644
--- a/Gems/Terrain/Assets/Editor/Icons/Components/TerrainHeight.svg
+++ b/Gems/Terrain/Assets/Editor/Icons/Components/TerrainHeight.svg
@@ -1,7 +1,5 @@
-<?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 / Terrain Height</title>
-    <g id="icon-/-Environmental-/-Terrain-Height" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <path d="M15,4 L22,20 L7.9986687,19.9993631 L7.9986687,14.9993631 L10,15 L8,11 L7.9986687,11.0013631 L7.9986687,8.00136309 L8,8 L10.8,13.6 L15,4 Z M15,7 L13,12 L17,12 L15,7 Z M7.21914721,0.964363085 L7.21914721,5.50135833 L5.8081113,5.50135833 L5.8081113,6.20344432 L7.21914721,6.20344432 L7.21914721,7.31885826 L5.8081113,7.31885826 L5.8081113,7.94758992 L7.21914721,7.94758992 L7.21914721,9.12604407 L6.01490518,9.12604407 L6.01490518,9.69309095 L7.21914721,9.69309095 L7.21914721,10.8434468 L6.01490518,10.8434468 L6.01490518,11.3367478 L7.21914721,11.3367478 L7.21914721,12.561057 L6.01490518,12.561057 L6.01490518,13.2062487 L7.21914721,13.2062487 L7.21914721,14.3024381 L6.01490518,14.3024381 L6.01490518,14.9912747 L7.21914721,14.9912747 L7.21914721,16.0640829 L6.01490518,16.0640829 L6.01490518,16.762272 L7.21914721,16.762272 L7.21914721,17.9022362 L6.01490518,17.9022362 L6.01490518,18.5465186 L7.21914721,18.5465186 L7.21914721,19.5980239 L6.01490518,19.5980239 L6.01490518,20.2294467 L7.21914721,20.2294467 L7.21914721,21.2565316 L5.8081113,21.2565316 L5.8081113,21.9825184 L7.21914721,21.9825184 L7.21914721,23.0479225 L2.9026687,23.0479225 C2.35038395,23.0479225 1.9026687,22.6002072 1.9026687,22.0479225 L1.9026687,1.96436309 C1.9026687,1.41207834 2.35038395,0.964363085 2.9026687,0.964363085 L7.21914721,0.964363085 Z M4.60708525,1.76269886 C4.1792616,1.76269886 3.832442,2.10951846 3.832442,2.53734212 C3.832442,2.96516577 4.1792616,3.31198537 4.60708525,3.31198537 C5.03490891,3.31198537 5.38172851,2.96516577 5.38172851,2.53734212 C5.38172851,2.10951846 5.03490891,1.76269886 4.60708525,1.76269886 Z" id="Combined-Shape" fill="#8B572A"></path>
-    </g>
-</svg>
\ No newline at end of file
+<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Components / Terrain / Terrain Height">
+<path id="Combined Shape" fill-rule="evenodd" clip-rule="evenodd" d="M8.39932 20.9263H8.40041H14.4004H22.4004L15.4004 4.92626L11.2004 14.5263L8.40041 8.92626L8.39932 8.92844V11.9284L8.40041 11.9263L10.4004 15.9263H8.39932V20.9263ZM17.4004 12.9263L15.4004 7.92626L13.4004 12.9263H17.4004ZM7.6197 1.89062V6.01824H5.20867V7.5273H7.6197V9.50794H5.20867V11.0642H7.6197V13.0212H5.20867V14.4781H7.6197V16.5345H5.20867V18.0436H7.6197V20.0478H5.20867V21.5804H7.6197V23.9742H3.30322C2.75094 23.9742 2.30322 23.5265 2.30322 22.9742V2.89062C2.30322 2.33834 2.75094 1.89062 3.30322 1.89062H7.6197ZM5.00749 4.23825C5.43532 4.23825 5.78214 3.89143 5.78214 3.4636C5.78214 3.03578 5.43532 2.68896 5.00749 2.68896C4.57967 2.68896 4.23285 3.03578 4.23285 3.4636C4.23285 3.89143 4.57967 4.23825 5.00749 4.23825Z" fill="#BA8A68"/>
+</g>
+</svg>
diff --git a/Gems/Terrain/Assets/Editor/Icons/Components/TerrainLayerSpawner.svg b/Gems/Terrain/Assets/Editor/Icons/Components/TerrainLayerSpawner.svg
index df73d78276..ad7403d976 100644
--- a/Gems/Terrain/Assets/Editor/Icons/Components/TerrainLayerSpawner.svg
+++ b/Gems/Terrain/Assets/Editor/Icons/Components/TerrainLayerSpawner.svg
@@ -1,7 +1,5 @@
-<?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 / Generate Terrian </title>
-    <g id="icon-/-Environmental-/-Generate-Terrian-" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <path d="M16,5.23640192 L23,21.2364019 L1,21.2364019 L3.153,16.9311553 L10.7351274,16.9317461 L10.786,16.8081553 L10.867,16.9694019 L16,5.23640192 Z M10.7866981,7.88269686 C11.1462033,8.9008023 11.3517156,9.91858532 11.3517156,10.6951961 C11.3517156,13.0695588 9.43072532,14.9943601 7.06106374,14.9943601 C4.69140216,14.9943601 2.77041189,13.0695588 2.77041189,10.6951961 C2.77041189,9.98779834 2.94092524,9.08030022 3.24301589,8.15472512 L5.48573411,10.2222098 L7.16571378,8.51342542 L8.83993571,10.2222098 L10.7866981,7.88269686 Z M16,8.23640192 L14,13.2364019 L18,13.2364019 L16,8.23640192 Z M7.06106374,3.69215527 C8.35768587,3.69215527 9.51997507,5.07798918 10.306728,6.72204766 L8.83082438,8.28190713 L7.15660245,6.58611652 L5.47662277,8.28190713 L3.80919728,6.73502979 C4.59603726,5.08529116 5.76103013,3.69215527 7.06106374,3.69215527 Z" id="Combined-Shape" fill="#8B572A"></path>
-    </g>
-</svg>
\ No newline at end of file
+<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Components / Terrain / Generate Terrian ">
+<path id="Combined Shape" fill-rule="evenodd" clip-rule="evenodd" d="M10.5915 5.75867V3.78491L8.14171 5.75868L5.73579 3.78493V5.75869L8.14171 7.7209L10.5915 5.75867ZM4.6284 17.7275L2.47607 22.0322H24.4761L17.4761 6.03216L12.3431 17.7652L12.3213 17.7216L12.3189 17.7275L4.6284 17.7275ZM15.4761 14.0322L17.4761 9.03216L19.4761 14.0322H15.4761ZM13.2506 8.8115L13.2506 10.7737L8.11263 13.8174L3.19236 10.7737L3.19234 8.8115L8.11263 11.8879L13.2506 8.8115ZM12.2099 14.5311V12.4753L8.17521 14.7984L4.08817 12.4753V14.5311L8.17521 16.758L12.2099 14.5311ZM12.1813 6.18129V8.14351L8.12581 10.7259L4.20414 8.14355V6.18129L8.12581 8.69091L12.1813 6.18129Z" fill="#BA8A68"/>
+</g>
+</svg>
diff --git a/Gems/Terrain/Assets/Editor/Icons/Components/TerrainMacroMaterial.svg b/Gems/Terrain/Assets/Editor/Icons/Components/TerrainMacroMaterial.svg
new file mode 100644
index 0000000000..9a694bfbf7
--- /dev/null
+++ b/Gems/Terrain/Assets/Editor/Icons/Components/TerrainMacroMaterial.svg
@@ -0,0 +1,3 @@
+<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M19.5903 17.9785L23.5387 21.8974C24.0255 22.3839 24.0255 23.1676 23.5387 23.6271C23.2953 23.8433 22.9978 23.9785 22.6733 23.9785C22.3488 23.9785 22.0513 23.8703 21.8079 23.6271L17.8866 19.6541C16.1558 21.0325 13.9923 21.7622 11.8018 21.7622C9.1515 21.7622 6.66349 20.7352 4.79748 18.8703C2.93147 17.0055 1.90381 14.519 1.90381 11.8703C1.90381 9.2217 2.93147 6.73521 4.79748 4.87035C6.66349 3.00548 9.1515 1.97845 11.8018 1.97845C14.4521 1.97845 16.9401 3.00548 18.8061 4.87035C22.3488 8.41089 22.6733 14.0325 19.5903 17.9785ZM17.0753 17.1406C18.4816 15.7352 19.2658 13.8703 19.2658 11.8703C19.2658 9.87035 18.4816 8.00548 17.0753 6.60008C15.669 5.19467 13.803 4.41089 11.8018 4.41089C9.82759 4.41089 7.93454 5.19467 6.52827 6.60008C5.122 8.00548 4.33774 9.87035 4.33774 11.8703C4.33774 13.8433 5.122 15.7352 6.52827 17.1406C7.93454 18.546 9.82759 19.3298 11.8018 19.3298C13.776 19.3298 15.669 18.546 17.0753 17.1406ZM18.0816 11.9162C18.0816 15.3082 15.2695 18.058 11.8006 18.058C8.33165 18.058 5.51953 15.3082 5.51953 11.9162C5.51953 8.52414 8.33165 5.77435 11.8006 5.77435C15.2695 5.77435 18.0816 8.52414 18.0816 11.9162ZM8.57961 7.4831L8.19536 7.45775L7.72224 7.7861L7.0996 8.36703L6.4769 9.47836L6.50604 10.343L6.94695 11.0336L7.34856 11.1443L7.65414 11.6224L8.19536 11.7768L8.91138 11.9146L9.33482 12.2333L9.07726 12.8133L9.12092 13.5482L9.29117 13.889L9.94598 14.3937L10.1948 14.7036L10.1555 16.2708L10.7405 17.258H11.3647V16.3992L11.8537 15.9255L12.2203 15.4341L12.4081 14.9117L12.7486 14.8807L13.0367 14.6195L13.2462 13.588L12.9843 13.2383L12.622 12.9107L12.0632 12.8575L11.0024 11.7768H9.36974L9.0467 11.5206L8.79788 11.4485L8.76295 11.0696L8.96376 10.9185L9.29117 10.8423L9.44068 11.0336H9.76699L9.80192 10.6263L11.4695 9.00157H11.7183L12.0632 8.8422L12.2073 8.43933L12.0632 8.08074L11.7183 7.76199L12.3731 7.54507L12.4517 7.23075L12.2815 6.97398H10.3432L9.93724 7.31487L9.83248 7.09794L9.61857 7.03596L8.96376 7.06695L8.57961 7.4831ZM14.5894 7.45775C14.5253 7.4662 14.3836 7.49549 14.3303 7.54507V7.76199L14.2341 8.00781L14.5302 8.2255L14.8263 8.00781L14.9299 7.7861L14.7448 7.45775H14.5894ZM17.4991 10.2534L17.1956 10.4014V10.6877L17.2242 10.746L17.0173 10.6877C16.9408 10.7392 16.7819 10.8423 16.7582 10.8423C16.7346 10.8423 16.3733 10.7893 16.1957 10.7628C16.0871 10.6977 15.8596 10.5571 15.8182 10.5151C15.7767 10.473 15.5887 10.3524 15.4999 10.2974L15.1594 10.343L14.6486 10.2974L14.2045 10.6877L13.9454 11.0336L14.0342 11.6936L14.4784 12.4143L14.6486 12.3542H15.2186C15.3074 12.3542 15.6997 12.3942 15.8848 12.4143L15.9736 12.647L16.2623 13.4202L16.1957 14.0357L16.3289 14.3937L16.5362 15.2968L16.5954 15.5371L17.1209 14.8807L17.5651 13.889L17.8242 12.8575V11.6561L17.6465 10.6877L17.4991 10.2534ZM16.5954 9.29896L16.2623 9.53167L16.3289 9.79441C16.3906 9.82944 16.5184 9.8935 16.5362 9.86948C16.5539 9.84545 16.5831 9.80942 16.5954 9.79441C16.6373 9.7819 16.7582 9.74336 16.9063 9.68931C17.0543 9.63527 16.9038 9.52616 16.8101 9.47836L16.5954 9.29896ZM17.1654 9.29896L16.8101 9.2239L16.5362 9.1113C16.3585 9.14883 15.9973 9.2239 15.9736 9.2239C15.9499 9.2239 15.6479 9.39354 15.4999 9.47836L15.2852 9.86948L14.8263 10.0647L14.2341 9.86948C14.2464 9.77464 14.2711 9.57432 14.2711 9.53167C14.2711 9.48903 14.2267 9.23365 14.2045 9.1113L14.5302 8.93864L14.9299 8.73596L15.0409 8.68341L15.2186 8.51076L15.2852 8.27805L15.3296 7.93274L15.3888 7.64748L15.5517 7.45775L15.6405 7.40727C15.7663 7.51747 16.0358 7.74271 16.1068 7.76199C16.1779 7.78128 16.6694 8.41934 16.9063 8.73596L17.1654 9.29896ZM7.15022 13.9306L6.99478 14.0357V14.4261C7.07373 14.4905 7.25503 14.6123 7.34856 14.5837C7.42293 14.5609 7.47518 14.4903 7.51098 14.4418C7.53147 14.4141 7.54657 14.3937 7.55734 14.3937C7.58103 14.3937 7.46852 14.1951 7.4093 14.0958L7.15022 13.9306Z" fill="#BA8A68"/>
+</svg>
diff --git a/Gems/Terrain/Assets/Editor/Icons/Components/TerrainPhysicsCollider.svg b/Gems/Terrain/Assets/Editor/Icons/Components/TerrainPhysicsCollider.svg
new file mode 100644
index 0000000000..56ffb05464
--- /dev/null
+++ b/Gems/Terrain/Assets/Editor/Icons/Components/TerrainPhysicsCollider.svg
@@ -0,0 +1,3 @@
+<svg width="25" height="24" viewBox="0 0 25 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M14.7165 3.56718V8.58933L13.773 6.64134L12.6468 8.34583L11.338 6.21522L10.8814 9.1372L6.83329 6.21522L8.90302 10.4156L4.97661 10.6895L8.35515 12.394L5.18967 14.342L7.56378 15.4377L1.38525 15.2247L6.16391 12.5462L1.96337 10.0503L7.07684 9.35026L4.42853 3.38455L10.029 7.00659L10.8814 4.11505L12.6468 6.21522L14.7165 3.56718ZM4.8511 17.0216L2.85254 21.0187H23.2807L16.7808 6.16187L12.0146 17.0566L11.9944 17.0162L11.9923 17.0216L4.8511 17.0216ZM14.9238 13.5903L16.7809 8.94749L18.638 13.5903H14.9238ZM12.6111 11.3781L12.4661 11.0843L12.3045 10.8102C12.3533 10.7181 12.4547 10.5202 12.4701 10.4659C12.475 10.4486 12.48 10.4124 12.4861 10.3676L12.4861 10.3676L12.4861 10.3675C12.5042 10.2361 12.5325 10.0309 12.5984 10.0131C12.669 9.99395 12.8785 9.85331 12.9745 9.78538L13.4633 9.92386L13.3558 10.5048C13.2817 10.6034 13.1371 10.8162 13.1519 10.8791C13.1667 10.942 13.1486 11.1689 13.1377 11.2746C13.186 11.2961 13.2734 11.371 13.2373 11.4984C13.2012 11.6258 13.1228 11.6918 13.088 11.7089C13.0123 11.6605 12.847 11.5599 12.7925 11.5444C12.738 11.529 12.6488 11.4271 12.6111 11.3781ZM9.87069 11.9189L10.0283 11.3625L10.1196 11.0403L10.4203 10.8724L10.7424 10.9637L10.9982 11.2892L11.3462 11.7358L10.9836 12.2342L10.4686 11.9301L9.87069 11.9189ZM8.66858 14.7105L8.1912 14.3854L7.92762 14.3107L7.71721 13.7133L8.45669 13.4482L9.07512 13.2754L9.36459 13.7054L9.04931 14.8183L8.66858 14.7105ZM10.746 14.4131L10.0275 14.7158L10.3428 15.0398L10.705 15.1424L11.0954 15.3183L11.3214 15.6204L11.6558 15.5567L11.7554 15.2053L11.5538 14.8002L11.2438 14.5542L10.746 14.4131ZM10.3529 13.5671L10.2727 13.2917L10.4096 13.1348L10.9115 13.0324L11.1499 13.1978L11.1476 13.5803L10.7644 13.7897L10.3529 13.5671ZM11.731 13.3624L11.7135 13.7407L12.096 13.743L12.2625 13.4152L12.4438 13.1486L12.8589 12.8342L13.0764 12.7572L13.0726 12.5115L12.9466 12.5248L12.8363 12.3386L12.5407 12.1734L12.316 12.1097L12.0282 12.3135L11.8522 12.6468L11.7111 13.1449C11.6957 13.1992 11.718 13.3126 11.731 13.3624Z" fill="#BA8A68"/>
+</svg>
diff --git a/Gems/Terrain/Assets/Editor/Icons/Components/TerrainSurfaceGradientList.svg b/Gems/Terrain/Assets/Editor/Icons/Components/TerrainSurfaceGradientList.svg
new file mode 100644
index 0000000000..c4e8ce79d2
--- /dev/null
+++ b/Gems/Terrain/Assets/Editor/Icons/Components/TerrainSurfaceGradientList.svg
@@ -0,0 +1,3 @@
+<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M4.36963 5.82434C4.36963 6.65277 3.69806 7.32434 2.86963 7.32434C2.0412 7.32434 1.36963 6.65277 1.36963 5.82434C1.36963 4.99591 2.0412 4.32434 2.86963 4.32434C3.69806 4.32434 4.36963 4.99591 4.36963 5.82434ZM3.17354 17.2069L1.01855 21.5169H23.0186L16.0186 5.51691L10.8856 17.2499L10.8553 17.1894L10.8481 17.2069L3.17354 17.2069ZM14.0186 13.5169L16.0186 8.51691L18.0186 13.5169H14.0186ZM2.86963 11.5726C3.69806 11.5726 4.36963 10.901 4.36963 10.0726C4.36963 9.24414 3.69806 8.57257 2.86963 8.57257C2.0412 8.57257 1.36963 9.24414 1.36963 10.0726C1.36963 10.901 2.0412 11.5726 2.86963 11.5726ZM4.36963 14.3208C4.36963 15.1492 3.69806 15.8208 2.86963 15.8208C2.0412 15.8208 1.36963 15.1492 1.36963 14.3208C1.36963 13.4924 2.0412 12.8208 2.86963 12.8208C3.69806 12.8208 4.36963 13.4924 4.36963 14.3208ZM12.6904 4.81268H5.69043V6.81268H12.6904V4.81268ZM5.69043 9.01562H12.6904V11.0156H5.69043V9.01562ZM11.6664 13.2186L5.68753 13.2186V15.1799L10.7174 15.1799L11.6664 13.2186Z" fill="#BA8A68"/>
+</svg>
diff --git a/Gems/Terrain/Assets/Editor/Icons/Components/TerrainSurfaceMaterials.svg b/Gems/Terrain/Assets/Editor/Icons/Components/TerrainSurfaceMaterials.svg
new file mode 100644
index 0000000000..5a25cb3be9
--- /dev/null
+++ b/Gems/Terrain/Assets/Editor/Icons/Components/TerrainSurfaceMaterials.svg
@@ -0,0 +1,3 @@
+<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M14.2024 8.86384C14.5252 9.25573 14.8253 9.70547 15.0823 10.2077L16.7397 6.06409L18.7397 11.0641H15.4568C15.957 12.4269 16.1334 14.0867 15.6857 15.9661C15.4431 16.4279 15.2743 16.7516 15.1502 16.9897C14.9006 17.4684 14.8316 17.6007 14.7057 17.8118C14.8977 18.0184 15.3391 18.4966 15.8348 19.0641H23.7397L16.7397 3.06409L14.2024 8.86384ZM16.3592 20.5424L13.6912 17.8943C15.7744 15.2279 15.5551 11.4291 13.1612 9.03667C11.9003 7.77652 10.219 7.08252 8.42815 7.08252C6.63726 7.08252 4.95603 7.77652 3.6951 9.03667C2.43417 10.2968 1.73975 11.977 1.73975 13.7668C1.73975 15.5566 2.43417 17.2368 3.6951 18.497C4.95603 19.7571 6.63726 20.4511 8.42815 20.4511C9.90837 20.4511 11.3703 19.958 12.5399 19.0266L15.1896 21.7113C15.3541 21.8756 15.5551 21.9487 15.7744 21.9487C15.9937 21.9487 16.1947 21.8574 16.3592 21.7113C16.6881 21.4008 16.6881 20.8712 16.3592 20.5424ZM13.4719 13.7668C13.4719 15.1183 12.9419 16.3784 11.9916 17.3281C11.0414 18.2778 9.76217 18.8074 8.42815 18.8074C7.09412 18.8074 5.81492 18.2778 4.86466 17.3281C3.91439 16.3784 3.38444 15.1 3.38444 13.7668C3.38444 12.4153 3.91439 11.1552 4.86466 10.2055C5.81492 9.25583 7.09412 8.7262 8.42815 8.7262C9.78045 8.7262 11.0414 9.25583 11.9916 10.2055C12.9419 11.1552 13.4719 12.4153 13.4719 13.7668ZM7.31185 10.347L7.70199 10.1649L8.22233 10.5291V10.7372L7.88417 11.1534H7.05176V10.7372L7.31185 10.347ZM9.8418 10.861L9.4516 11.1211L9.28132 11.6934L9.65971 11.8235L10.1019 11.9733L10.5702 11.5634V11.3032V11.1211L9.8418 10.861ZM5.8877 14.1543L4.10791 14.8324C4.43285 15.4257 5.4048 16.7819 6.69314 17.4599C8.02872 18.1629 9.18941 17.8456 10.1027 17.596L10.1028 17.596C10.2907 17.5446 10.4681 17.4961 10.6344 17.4599C11.3751 17.2989 11.7976 16.0858 12.088 15.2521L12.088 15.2521C12.1798 14.9886 12.2584 14.763 12.3296 14.6205C12.5669 14.1459 12.4285 12.9536 12.3296 12.4168L11.6939 11.8235L10.1259 13.4339L9.65971 12.9677L7.92215 14.1543L6.94742 14.8324L5.8877 14.1543ZM6.69314 12.7402V12.1159H7.31204C7.36407 12.1604 7.48373 12.2829 7.54616 12.4168C7.60859 12.5506 7.82283 12.6882 7.92215 12.7402V12.9677L7.54616 13.2604L6.94742 13.4339L6.45362 13.2604L6.69314 12.7402ZM5.65997 12.954L5.49688 12.6952L5.19867 12.5466L4.9053 12.5837L4.97944 13.1704L5.30293 13.3717L5.44962 13.3532L5.65997 12.954Z" fill="#BA8A68"/>
+</svg>
diff --git a/Gems/Terrain/Assets/Editor/Icons/Components/TerrainWorld.svg b/Gems/Terrain/Assets/Editor/Icons/Components/TerrainWorld.svg
index c6388d6215..f3c17f66e4 100644
--- a/Gems/Terrain/Assets/Editor/Icons/Components/TerrainWorld.svg
+++ b/Gems/Terrain/Assets/Editor/Icons/Components/TerrainWorld.svg
@@ -1,8 +1,5 @@
-<?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 / Terrain Refactor</title>
-    <g id="icon-/-Environmental-/-Terrain-Refactor" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <rect id="Icon-Background" x="0" y="0" width="24" height="24"></rect>
-        <path d="M2,20 L8,8 L10.8,13.6 L15,4 L22,20 L2,20 Z M8,11 L6,15 L10,15 L8,11 Z M15,7 L13,12 L17,12 L15,7 Z" id="Combined-Shape" fill="#8B572A"></path>
-    </g>
-</svg>
\ No newline at end of file
+<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Components / Terrain / Terrain Refactor">
+<path id="Combined Shape" fill-rule="evenodd" clip-rule="evenodd" d="M22.9932 20.5717H14.9932H8.99316H2.99316L8.99316 8.57166L11.7932 14.1717L15.9932 4.57166L22.9932 20.5717ZM15.9932 7.57166L17.9932 12.5717H13.9932L15.9932 7.57166ZM8.99316 11.5717L10.9932 15.5717H6.99316L8.99316 11.5717Z" fill="#BA8A68"/>
+</g>
+</svg>
diff --git a/Gems/Terrain/Assets/Editor/Icons/Components/TerrainWorldDebugger.svg b/Gems/Terrain/Assets/Editor/Icons/Components/TerrainWorldDebugger.svg
index bd1512afda..b128d0f316 100644
--- a/Gems/Terrain/Assets/Editor/Icons/Components/TerrainWorldDebugger.svg
+++ b/Gems/Terrain/Assets/Editor/Icons/Components/TerrainWorldDebugger.svg
@@ -1,8 +1,5 @@
-<?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 / Terrain World Debugger</title>
-    <g id="icon-/-Environmental-/-Terrain-World-Debugger" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <rect id="Icon-Background" x="0" y="0" width="24" height="24"></rect>
-        <path d="M16,5.23640192 L23,21.2364019 L1,21.2364019 L4.034,15.1675981 L5.534,15.1675981 L5,16.2364019 L9,16.2364019 L8.466,15.1675981 L9.966,15.1675981 L10.867,16.9694019 L16,5.23640192 Z M5.7575896,2.84113022 C6.03130743,3.01216811 5.99303429,3.29144758 5.82199641,3.56516541 C5.5939459,3.93012252 5.63692265,4.11800916 5.79661523,4.47152561 C6.28699059,4.39735197 7.01109383,4.59333567 7.42167058,4.8498925 C7.55852949,4.93541144 7.6668821,5.06655002 7.80374101,5.15206897 C8.11735815,5.15774162 8.40246897,5.20903391 8.76170575,5.24321288 L9.24631309,4.46767902 C8.9379383,4.03250676 8.70982422,3.7208123 8.56197083,3.53259562 C8.34019074,3.25027061 9.17154039,2.55841555 9.4400416,2.93949264 C9.57872751,3.13632611 9.82791397,3.48184986 10.187601,3.9760639 C10.2921591,4.119728 10.3942808,4.6608066 10.3267772,4.76883491 L9.87364273,5.4940017 C10.1587536,5.54529399 10.3697384,5.61369961 10.5807233,5.68210522 C10.8373278,5.77901716 11.1395519,5.9044354 11.4132698,6.07547329 L11.7101975,5.60028961 C11.8353154,5.40005911 12.2927086,5.36754107 12.4693791,5.39797939 C13.0265899,5.49398048 13.4462261,5.56768275 13.7282877,5.61908617 C14.2855266,5.72063845 13.9217192,6.73248862 13.5801311,6.66829019 C13.3524057,6.62549124 12.9722579,6.55710151 12.4396878,6.46312102 L12.2686499,6.73683885 C12.5480881,7.10174828 13.0794962,7.47936459 13.5424736,8.2230391 C13.2332304,8.82332896 12.3709586,10.4987773 10.9556581,13.249384 C10.2300617,13.3746794 8.81376094,13.077921 8.3917912,12.9411097 L8.22075331,13.2148276 C8.50116176,13.5796109 8.72927585,13.8913054 8.90509558,14.149911 C9.16882518,14.5378194 8.27592007,15.0939625 8.02702481,14.743014 C7.89765153,14.5605944 7.64842782,14.2153849 7.2793537,13.7073854 C7.12105098,13.489495 7.07511207,13.0179769 7.14377888,12.908087 L7.42238579,12.4622227 C7.14866796,12.2911849 6.90345644,12.0745273 6.70386456,11.8863761 C6.50427268,11.6982249 6.37880675,11.4929604 6.22483451,11.3333155 L5.71101869,12.1555927 C5.66374222,12.2312508 5.39038727,12.3573847 5.30398078,12.3447359 C4.6772029,12.2529836 4.15546889,12.1592118 3.73877875,12.0634204 C3.21667547,11.8756628 3.41280304,11.0226842 3.88693529,11.0142164 C4.12232485,11.0454571 4.51197472,11.0986403 5.0558849,11.1737659 L5.54049224,10.3982321 C5.32378704,10.1359549 5.18120779,9.85656443 5.03862853,9.57717395 C4.8732633,9.53727464 4.70789807,9.49737534 4.57103915,9.4118564 C4.1604624,9.15529957 3.78986942,8.48459472 3.61306352,8.05695233 C3.17970079,8.03988668 2.99858532,8.18114181 2.77053481,8.54609893 C2.59949692,8.81981676 2.32495313,9.10238902 2.0512353,8.93135114 C1.77751746,8.76031325 1.77825895,8.55548589 1.94929684,8.28176806 C2.34838524,7.64309311 2.76327156,7.33075241 3.4931381,7.27936476 C3.53871006,6.80038239 3.65840797,6.3042867 3.94347111,5.84809031 C4.22853425,5.39189392 4.59344369,5.11245575 5.00397276,4.86152389 C4.73020724,4.18299733 4.73852278,3.70999986 5.13761117,3.07132492 C5.30864906,2.79760708 5.48387176,2.67009234 5.7575896,2.84113022 Z M16,8.23640192 L14,13.2364019 L18,13.2364019 L16,8.23640192 Z M8.03008933,6.27169476 C7.86593803,6.90855503 7.62722372,7.47571465 7.31394641,7.9731736 C7.00066911,8.47063256 6.59764439,8.93015918 6.10487226,9.35175347 C6.78174598,10.4775099 7.41236887,11.2247577 7.99674093,11.5934967 C8.5453571,11.9396737 9.08387287,12.311171 9.87590139,12.1865085 C10.2486081,11.6217646 11.911756,8.7895471 12.3207747,8.14675221 C11.6119238,7.43916872 11.2609677,7.0257827 10.6750595,6.74648915 C9.90539682,6.37960262 8.70735067,6.16885245 8.03008933,6.27169476 Z M4.85586389,6.41821659 C4.37125655,7.19375045 4.50249049,8.10037522 5.14116544,8.49946362 C5.27802436,8.58498256 5.3267053,8.57787184 5.47944458,8.48580763 C5.99590493,8.07119781 6.32940283,7.74343935 6.4799383,7.50253224 C6.63347019,7.25682987 6.79975217,6.83183484 6.97878426,6.22754717 C7.02310864,5.99705844 6.98840321,5.84780422 6.85154429,5.76228528 C6.21286935,5.36319688 5.34047123,5.64268273 4.85586389,6.41821659 Z" id="Combined-Shape" fill="#8B572A"></path>
-    </g>
-</svg>
\ No newline at end of file
+<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Components / Terrain / Terrain World Debugger">
+<path id="Combined Shape" fill-rule="evenodd" clip-rule="evenodd" d="M11.0131 14.6091C11.0131 14.6091 13.0294 10.43 13.47 9.51795C13.1593 9.04638 12.8241 8.7276 12.5478 8.4648L12.5478 8.46478C12.3954 8.31991 12.261 8.19204 12.1584 8.06496L12.3223 7.78694C12.8572 7.86721 13.2389 7.92581 13.4677 7.96275C13.8108 8.01815 14.1485 6.99729 13.5888 6.91009C13.3055 6.86594 12.8842 6.80305 12.3247 6.72139C12.1473 6.6955 11.6909 6.73976 11.5709 6.94313L11.2863 7.42579C11.0083 7.26184 10.7029 7.14422 10.4439 7.05394C10.2313 6.99097 10.0186 6.92801 9.73225 6.88406L10.1666 6.14749C10.2313 6.03776 10.1153 5.49949 10.0071 5.35855C9.63485 4.87374 9.37687 4.53473 9.23317 4.34153C8.95497 3.96747 8.14167 4.68045 8.37063 4.95699C8.52327 5.14135 8.75931 5.44708 9.07876 5.87419L8.61424 6.66191C8.48943 6.65327 8.37348 6.64233 8.26217 6.63184C8.05242 6.61207 7.85917 6.59385 7.65425 6.59541C7.58474 6.55442 7.52207 6.50185 7.45939 6.44927C7.39672 6.3967 7.33405 6.34413 7.26454 6.30314C6.84751 6.05722 6.11861 5.8799 5.6303 5.96664C5.46158 5.61735 5.41379 5.43062 5.63239 5.05993C5.79635 4.78191 5.82743 4.50174 5.54941 4.33779C5.27139 4.17384 5.0995 4.30581 4.93555 4.58383C4.553 5.23255 4.55684 5.7056 4.84794 6.37687C4.44399 6.63827 4.08638 6.92699 3.81313 7.39036C3.53988 7.85372 3.43296 8.35273 3.39971 8.83273C2.67141 8.90284 2.26468 9.22574 1.88213 9.87445C1.71818 10.1525 1.7227 10.3573 2.00072 10.5212C2.27874 10.6852 2.54593 10.3956 2.70988 10.1176C2.92849 9.74691 3.10591 9.60105 3.53957 9.60698C3.7273 10.0299 4.115 10.6909 4.53203 10.9368C4.67104 11.0188 4.83738 11.0544 5.00372 11.0901C5.15342 11.3657 5.30313 11.6413 5.5265 11.898L5.06198 12.6857C4.51632 12.6246 4.12543 12.5814 3.88932 12.5562C3.41556 12.5769 3.2414 13.4346 3.76816 13.6089C4.18717 13.6939 4.71114 13.7743 5.34007 13.8499C5.42677 13.8603 5.6968 13.7272 5.74212 13.6504L6.23464 12.8152C6.30169 12.8812 6.36383 12.9556 6.42876 13.0333L6.42879 13.0334L6.4288 13.0334C6.51687 13.1388 6.61009 13.2504 6.72772 13.3557C6.93208 13.5387 7.18277 13.749 7.46079 13.9129L7.19373 14.3658C7.12791 14.4774 7.18595 14.9476 7.34979 15.1614C7.73179 15.6597 7.9898 15.9984 8.12382 16.1775C8.38165 16.5219 9.25997 15.943 8.98637 15.562C8.80396 15.308 8.56792 15.0023 8.27823 14.6448L8.44218 14.3668C8.86752 14.4927 10.291 14.753 11.0131 14.6091ZM5.07854 10.0101C4.42982 9.62754 4.27534 8.72458 4.73987 7.93686C5.20439 7.14913 6.06932 6.84733 6.71804 7.22988C6.85705 7.31185 6.89558 7.46017 6.85719 7.69172C6.69374 8.30041 6.53843 8.72953 6.39126 8.9791C6.24696 9.22379 5.92199 9.56001 5.41635 9.98775C5.26603 10.0837 5.21755 10.0921 5.07854 10.0101ZM8.01264 13.0297L8.08964 13.0757C8.62097 13.3936 9.15418 13.7126 9.90642 13.5743C10.101 13.2623 10.6592 12.2713 11.1915 11.3265L11.1915 11.3265C11.6387 10.5325 12.0676 9.77128 12.2467 9.47307C12.1338 9.36604 12.0298 9.26589 11.9323 9.17206C11.4021 8.66175 11.0664 8.33867 10.5656 8.11554C9.78674 7.76855 8.58368 7.58864 7.90928 7.70885C7.76154 8.34971 7.53748 8.92282 7.23708 9.42816C6.93669 9.9335 6.5456 10.4032 6.06382 10.8373C6.76938 11.9453 7.41899 12.6761 8.01264 13.0297ZM1.66455 21.606L3.81953 17.296L11.4941 17.296L11.5013 17.2785L11.5316 17.339L16.6646 5.60601L23.6646 21.606H1.66455ZM16.6646 8.60601L14.6646 13.606H18.6646L16.6646 8.60601Z" fill="#BA8A68"/>
+</g>
+</svg>
diff --git a/Gems/Terrain/Assets/Editor/Icons/Components/TerrainWorldRenderer.svg b/Gems/Terrain/Assets/Editor/Icons/Components/TerrainWorldRenderer.svg
index ab3716ad5d..de97c005fc 100644
--- a/Gems/Terrain/Assets/Editor/Icons/Components/TerrainWorldRenderer.svg
+++ b/Gems/Terrain/Assets/Editor/Icons/Components/TerrainWorldRenderer.svg
@@ -1,8 +1,5 @@
-<?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 / Terrain World Renderer</title>
-    <g id="icon-/-Environmental-/-Terrain-World-Renderer" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <rect id="Icon-Background" x="0" y="0" width="24" height="24"></rect>
-        <path d="M14.128,5.993 L14.1280665,8 L16.5280665,8 L16.528,7.493 L16.75,7.999 L16.5280665,8 L16.5280665,10.4 L17.8,10.399 L18.85,12.799 L16.5280665,12.8 L16.5280665,15.2 L18.9280665,15.2 L18.928,12.978 L19.9,15.199 L18.9280665,15.2 L18.9280665,17.6 L20.95,17.599 L22,20 L14.1280665,20 L14.1280665,17.6 L11.7280665,17.6 L11.7280665,20 L2,20 L8,8 L10.8,13.6 L12.2,10.399 L14.1280665,10.4 L14.1280665,8 L13.25,7.999 L14.128,5.993 Z M18.9280665,17.6 L16.5280665,17.6 L16.5280665,20 L18.9280665,20 L18.9280665,17.6 Z M16.5280665,15.2 L14.1280665,15.2 L14.1280665,17.6 L16.5280665,17.6 L16.5280665,15.2 Z M14.1280665,12.8 L11.7280665,12.8 L11.7280665,15.2 L14.1280665,15.2 L14.1280665,12.8 Z M8,11 L6,15 L10,15 L8,11 Z M16.5280665,10.4 L14.1280665,10.4 L14.1280665,12.8 L16.5280665,12.8 L16.5280665,10.4 Z M15,4 L15.7,5.599 L14.3,5.599 L15,4 Z" id="Combined-Shape" fill="#8B572A"></path>
-    </g>
-</svg>
\ No newline at end of file
+<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Components / Terrain / Terrain World Renderer">
+<path id="Combined Shape" fill-rule="evenodd" clip-rule="evenodd" d="M22.5239 20.567L15.5239 4.56696L11.3239 14.167L8.52393 8.56696L2.52393 20.567H8.52393H14.5239H22.5239ZM8.52393 11.567L10.5239 15.567H6.52393L8.52393 11.567ZM21.0005 19.5003L16.0303 7.58151L16.0267 7.58887L15.9981 7.51718H15.548L15.5478 7.51444H15.3548L15.3546 7.51718H14.9369L14.9369 7.50107L14.9301 7.51718H14.9043L14.2861 9.06204L9.93449 19.5002H9.96093L9.93421 19.5482H20.9364L20.9105 19.5003H21.0005ZM18.9946 18.567L18.3561 16.475H16.2325L16.3923 18.567H18.9946ZM14.7918 18.567L14.8984 16.475H12.5604L11.9347 18.567H14.7918ZM14.9484 15.4938H12.8539L13.4618 13.4612H15.0519L14.9484 15.4938ZM18.0566 15.4938H16.1575L16.0022 13.4612H17.4362L18.0566 15.4938ZM14.7353 9.20371L14.441 10.1877H15.2186L15.2687 9.20371H14.7353ZM15.6769 9.20371L15.752 10.1877H16.4371L16.1368 9.20371H15.6769ZM15.8105 10.9522H16.6704L17.1367 12.48H15.9272L15.8105 10.9522ZM14.2123 10.9522H15.1797L15.1019 12.48H13.7553L14.2123 10.9522Z" fill="#BA8A68"/>
+</g>
+</svg>
diff --git a/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainHeight.svg b/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainHeight.svg
index b87a0b4d7e..87a2d199bd 100644
--- a/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainHeight.svg
+++ b/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainHeight.svg
@@ -1,25 +1,22 @@
-<?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 / Terrain Height - 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-/-Terrain-Height---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="#8B572A">
-                <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.0973313,4.03563691 L22.0973313,20.0356369 L8.096,20.035 L8.096,15.035 L10.0973313,15.0356369 L8.0973313,11.0356369 L8.096,11.037 L8.096,8.037 L8.0973313,8.03563691 L10.8973313,13.6356369 L15.0973313,4.03563691 Z M15.0973313,7.03563691 L13.0973313,12.0356369 L17.0973313,12.0356369 L15.0973313,7.03563691 Z M7.31647851,1 L7.31647851,5.53699525 L5.9054426,5.53699525 L5.9054426,6.23908123 L7.31647851,6.23908123 L7.31647851,7.35449518 L5.9054426,7.35449518 L5.9054426,7.98322684 L7.31647851,7.98322684 L7.31647851,9.16168098 L6.11223647,9.16168098 L6.11223647,9.72872786 L7.31647851,9.72872786 L7.31647851,10.8790837 L6.11223647,10.8790837 L6.11223647,11.3723847 L7.31647851,11.3723847 L7.31647851,12.5966939 L6.11223647,12.5966939 L6.11223647,13.2418856 L7.31647851,13.2418856 L7.31647851,14.338075 L6.11223647,14.338075 L6.11223647,15.0269116 L7.31647851,15.0269116 L7.31647851,16.0997198 L6.11223647,16.0997198 L6.11223647,16.7979089 L7.31647851,16.7979089 L7.31647851,17.9378731 L6.11223647,17.9378731 L6.11223647,18.5821555 L7.31647851,18.5821555 L7.31647851,19.6336608 L6.11223647,19.6336608 L6.11223647,20.2650836 L7.31647851,20.2650836 L7.31647851,21.2921685 L5.9054426,21.2921685 L5.9054426,22.0181553 L7.31647851,22.0181553 L7.31647851,23.0835594 L3,23.0835594 C2.44771525,23.0835594 2,22.6358441 2,22.0835594 L2,2 C2,1.44771525 2.44771525,1 3,1 L7.31647851,1 Z M4.70441655,1.79833578 C4.27659289,1.79833578 3.92977329,2.14515537 3.92977329,2.57297903 C3.92977329,3.00080269 4.27659289,3.34762229 4.70441655,3.34762229 C5.13224021,3.34762229 5.47905981,3.00080269 5.47905981,2.57297903 C5.47905981,2.14515537 5.13224021,1.79833578 4.70441655,1.79833578 Z" id="Combined-Shape-Copy" fill="#FFFFFF"></path>
-    </g>
-</svg>
\ No newline at end of file
+<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Components / Terrain / Terrain Height - box">
+<g id="icon/general/color/ box template">
+<path id="Path 3" fill-rule="evenodd" clip-rule="evenodd" d="M21.2769 0.932434C23.4542 0.932434 24.3087 2.7109 24.3087 3.95109C24.3087 5.19127 24.3087 19.714 24.3087 21.5745C24.3087 23.3254 23.0802 24.8891 21.2769 24.8891C19.4735 24.8891 5.00135 24.8891 3.16134 24.8891C1.73867 24.8891 0.352051 23.4472 0.352051 22.0911C0.352051 20.735 0.352051 4.96776 0.352051 3.60499C0.352051 2.24221 1.71745 0.932434 2.96161 0.932434C4.20577 0.932434 19.3122 0.932434 21.2769 0.932434Z" fill="url(#paint0_linear_651_47649)"/>
+<mask id="mask0_651_47649" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="0" y="0" width="25" height="25">
+<path id="Path 3_2" fill-rule="evenodd" clip-rule="evenodd" d="M21.2769 0.932434C23.4542 0.932434 24.3087 2.7109 24.3087 3.95109C24.3087 5.19127 24.3087 19.714 24.3087 21.5745C24.3087 23.3254 23.0802 24.8891 21.2769 24.8891C19.4735 24.8891 5.00135 24.8891 3.16134 24.8891C1.73867 24.8891 0.352051 23.4472 0.352051 22.0911C0.352051 20.735 0.352051 4.96776 0.352051 3.60499C0.352051 2.24221 1.71745 0.932434 2.96161 0.932434C4.20577 0.932434 19.3122 0.932434 21.2769 0.932434Z" fill="white"/>
+</mask>
+<g mask="url(#mask0_651_47649)">
+<g id="Components / General / color / Terrain">
+<rect id="Lights" x="0.352051" y="0.932434" width="24" height="24" fill="#BA8A68"/>
+</g>
+</g>
+</g>
+<path id="Combined Shape" fill-rule="evenodd" clip-rule="evenodd" d="M8.39932 20.9263H8.40041H14.4004H22.4004L15.4004 4.92626L11.2004 14.5263L8.40041 8.92626L8.39932 8.92844V11.9284L8.40041 11.9263L10.4004 15.9263H8.39932V20.9263ZM17.4004 12.9263L15.4004 7.92626L13.4004 12.9263H17.4004ZM7.6197 1.89062V6.01824H5.20867V7.5273H7.6197V9.50794H5.20867V11.0642H7.6197V13.0212H5.20867V14.4781H7.6197V16.5345H5.20867V18.0436H7.6197V20.0478H5.20867V21.5804H7.6197V23.9742H3.30322C2.75094 23.9742 2.30322 23.5265 2.30322 22.9742V2.89062C2.30322 2.33834 2.75094 1.89062 3.30322 1.89062H7.6197ZM5.00749 4.23825C5.43532 4.23825 5.78214 3.89143 5.78214 3.4636C5.78214 3.03578 5.43532 2.68896 5.00749 2.68896C4.57967 2.68896 4.23285 3.03578 4.23285 3.4636C4.23285 3.89143 4.57967 4.23825 5.00749 4.23825Z" fill="white"/>
+</g>
+<defs>
+<linearGradient id="paint0_linear_651_47649" x1="0.352051" y1="0.932434" x2="0.352051" y2="24.8891" gradientUnits="userSpaceOnUse">
+<stop stop-color="#ADADAD" stop-opacity="0.01"/>
+<stop offset="1" stop-color="#9D9D9D"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainLayerSpawner.svg b/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainLayerSpawner.svg
index c078d32fe5..a89186819f 100644
--- a/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainLayerSpawner.svg
+++ b/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainLayerSpawner.svg
@@ -1,25 +1,22 @@
-<?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 / Generate Terrian - 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-/-Generate-Terrian---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="#8B572A">
-                <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="M16,5.23640192 L23,21.2364019 L1,21.2364019 L3.153,16.9311553 L10.7351274,16.9317461 L10.786,16.8081553 L10.867,16.9694019 L16,5.23640192 Z M10.7866981,7.88269686 C11.1462033,8.9008023 11.3517156,9.91858532 11.3517156,10.6951961 C11.3517156,13.0695588 9.43072532,14.9943601 7.06106374,14.9943601 C4.69140216,14.9943601 2.77041189,13.0695588 2.77041189,10.6951961 C2.77041189,9.98779834 2.94092524,9.08030022 3.24301589,8.15472512 L5.48573411,10.2222098 L7.16571378,8.51342542 L8.83993571,10.2222098 L10.7866981,7.88269686 Z M16,8.23640192 L14,13.2364019 L18,13.2364019 L16,8.23640192 Z M7.06106374,3.69215527 C8.35768587,3.69215527 9.51997507,5.07798918 10.306728,6.72204766 L8.83082438,8.28190713 L7.15660245,6.58611652 L5.47662277,8.28190713 L3.80919728,6.73502979 C4.59603726,5.08529116 5.76103013,3.69215527 7.06106374,3.69215527 Z" id="Combined-Shape" fill="#FFFFFF"></path>
-    </g>
-</svg>
\ No newline at end of file
+<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Components / Terrain / Generate Terrian - box">
+<g id="icon/general/color/ box template">
+<path id="Path 3" fill-rule="evenodd" clip-rule="evenodd" d="M21.918 0.628662C24.0953 0.628662 24.9498 2.40713 24.9498 3.64731C24.9498 4.8875 24.9498 19.4103 24.9498 21.2707C24.9498 23.0216 23.7213 24.5853 21.918 24.5853C20.1147 24.5853 5.64246 24.5853 3.80245 24.5853C2.37978 24.5853 0.993164 23.1434 0.993164 21.7873C0.993164 20.4312 0.993164 4.66399 0.993164 3.30122C0.993164 1.93844 2.35856 0.628662 3.60272 0.628662C4.84688 0.628662 19.9533 0.628662 21.918 0.628662Z" fill="url(#paint0_linear_651_45842)"/>
+<mask id="mask0_651_45842" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="0" y="0" width="25" height="25">
+<path id="Path 3_2" fill-rule="evenodd" clip-rule="evenodd" d="M21.918 0.628662C24.0953 0.628662 24.9498 2.40713 24.9498 3.64731C24.9498 4.8875 24.9498 19.4103 24.9498 21.2707C24.9498 23.0216 23.7213 24.5853 21.918 24.5853C20.1147 24.5853 5.64246 24.5853 3.80245 24.5853C2.37978 24.5853 0.993164 23.1434 0.993164 21.7873C0.993164 20.4312 0.993164 4.66399 0.993164 3.30122C0.993164 1.93844 2.35856 0.628662 3.60272 0.628662C4.84688 0.628662 19.9533 0.628662 21.918 0.628662Z" fill="white"/>
+</mask>
+<g mask="url(#mask0_651_45842)">
+<g id="Components / General / color / Terrain">
+<rect id="Lights" x="0.993164" y="0.628662" width="24" height="24" fill="#BA8A68"/>
+</g>
+</g>
+</g>
+<path id="Combined Shape" fill-rule="evenodd" clip-rule="evenodd" d="M10.5915 5.75867V3.78491L8.14171 5.75868L5.73579 3.78493V5.75869L8.14171 7.7209L10.5915 5.75867ZM4.6284 17.7275L2.47607 22.0322H24.4761L17.4761 6.03216L12.3431 17.7652L12.3213 17.7216L12.3189 17.7275L4.6284 17.7275ZM15.4761 14.0322L17.4761 9.03216L19.4761 14.0322H15.4761ZM13.2506 8.8115L13.2506 10.7737L8.11263 13.8174L3.19236 10.7737L3.19234 8.8115L8.11263 11.8879L13.2506 8.8115ZM12.2099 14.5311V12.4753L8.17521 14.7984L4.08817 12.4753V14.5311L8.17521 16.758L12.2099 14.5311ZM12.1813 6.18129V8.14351L8.12581 10.7259L4.20414 8.14355V6.18129L8.12581 8.69091L12.1813 6.18129Z" fill="white"/>
+</g>
+<defs>
+<linearGradient id="paint0_linear_651_45842" x1="0.993164" y1="0.628662" x2="0.993164" y2="24.5853" gradientUnits="userSpaceOnUse">
+<stop stop-color="#ADADAD" stop-opacity="0.01"/>
+<stop offset="1" stop-color="#9D9D9D"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainMacroMaterial.svg b/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainMacroMaterial.svg
new file mode 100644
index 0000000000..177469e46e
--- /dev/null
+++ b/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainMacroMaterial.svg
@@ -0,0 +1,16 @@
+<svg width="26" height="25" viewBox="0 0 26 25" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M21.9981 0.278748C24.1754 0.278748 25.0299 2.05721 25.0299 3.2974C25.0299 4.53758 25.0299 19.0603 25.0299 20.9208C25.0299 22.6717 23.8014 24.2354 21.9981 24.2354C20.1947 24.2354 5.72254 24.2354 3.88253 24.2354C2.45986 24.2354 1.07324 22.7935 1.07324 21.4374C1.07324 20.0813 1.07324 4.31408 1.07324 2.9513C1.07324 1.58853 2.43864 0.278748 3.6828 0.278748C4.92696 0.278748 20.0334 0.278748 21.9981 0.278748Z" fill="url(#paint0_linear_826_47185)"/>
+<mask id="mask0_826_47185" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="1" y="0" width="25" height="25">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M21.9981 0.278748C24.1754 0.278748 25.0299 2.05721 25.0299 3.2974C25.0299 4.53758 25.0299 19.0603 25.0299 20.9208C25.0299 22.6717 23.8014 24.2354 21.9981 24.2354C20.1947 24.2354 5.72254 24.2354 3.88253 24.2354C2.45986 24.2354 1.07324 22.7935 1.07324 21.4374C1.07324 20.0813 1.07324 4.31408 1.07324 2.9513C1.07324 1.58853 2.43864 0.278748 3.6828 0.278748C4.92696 0.278748 20.0334 0.278748 21.9981 0.278748Z" fill="white"/>
+</mask>
+<g mask="url(#mask0_826_47185)">
+<rect x="1.07324" y="0.278748" width="24" height="24" fill="#BA8A68"/>
+</g>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M19.6289 17.2106L23.5773 21.1296C24.0641 21.616 24.0641 22.3998 23.5773 22.8593C23.3339 23.0755 23.0364 23.2106 22.7119 23.2106C22.3874 23.2106 22.0899 23.1025 21.8465 22.8593L17.9252 18.8863C16.1944 20.2647 14.0309 20.9944 11.8404 20.9944C9.19008 20.9944 6.70206 19.9674 4.83605 18.1025C2.97004 16.2377 1.94238 13.7512 1.94238 11.1025C1.94238 8.45388 2.97004 5.96739 4.83605 4.10252C6.70206 2.23766 9.19008 1.21063 11.8404 1.21063C14.4906 1.21063 16.9786 2.23766 18.8447 4.10252C22.3874 7.64307 22.7119 13.2647 19.6289 17.2106ZM17.1139 16.3728C18.5201 14.9674 19.3044 13.1025 19.3044 11.1025C19.3044 9.10253 18.5201 7.23766 17.1139 5.83225C15.7076 4.42685 13.8416 3.64306 11.8404 3.64306C9.86617 3.64306 7.97311 4.42685 6.56684 5.83225C5.16058 7.23766 4.37631 9.10253 4.37631 11.1025C4.37631 13.0755 5.16058 14.9674 6.56684 16.3728C7.97311 17.7782 9.86617 18.562 11.8404 18.562C13.8145 18.562 15.7076 17.7782 17.1139 16.3728ZM18.1202 11.1483C18.1202 14.5404 15.3081 17.2902 11.8391 17.2902C8.37022 17.2902 5.55811 14.5404 5.55811 11.1483C5.55811 7.75631 8.37022 5.00653 11.8391 5.00653C15.3081 5.00653 18.1202 7.75631 18.1202 11.1483ZM8.61818 6.71527L8.23393 6.68993L7.76082 7.01828L7.13817 7.59921L6.51547 8.71054L6.54462 9.57515L6.98552 10.2658L7.38714 10.3764L7.69272 10.8546L8.23393 11.009L8.94995 11.1468L9.37339 11.4655L9.11584 12.0454L9.15949 12.7803L9.32974 13.1212L9.98455 13.6259L10.2334 13.9358L10.1941 15.503L10.7791 16.4902H11.4033V15.6314L11.8922 15.1577L12.2589 14.6663L12.4466 14.1439L12.7871 14.1129L13.0753 13.8517L13.2848 12.8202L13.0229 12.4704L12.6605 12.1428L12.1018 12.0897L11.041 11.009H9.40832L9.08528 10.7527L8.83645 10.6806L8.80153 10.3018L9.00234 10.1507L9.32974 10.0745L9.47926 10.2658H9.80557L9.84049 9.85848L11.5081 8.23375H11.7569L12.1018 8.07437L12.2458 7.67151L12.1018 7.31292L11.7569 6.99417L12.4117 6.77724L12.4903 6.46293L12.32 6.20616H10.3818L9.97582 6.54705L9.87105 6.33012L9.65714 6.26814L9.00234 6.29913L8.61818 6.71527ZM14.628 6.68993C14.5638 6.69838 14.4222 6.72767 14.3689 6.77724V6.99417L14.2727 7.23998L14.5688 7.45768L14.8648 7.23998L14.9685 7.01828L14.7834 6.68993H14.628ZM17.5377 9.4856L17.2342 9.6336V9.91989L17.2628 9.97816L17.0559 9.91989C16.9794 9.97141 16.8205 10.0745 16.7968 10.0745C16.7731 10.0745 16.4119 10.0215 16.2342 9.99495C16.1257 9.9299 15.8982 9.78927 15.8567 9.74723C15.8153 9.70519 15.6273 9.58459 15.5384 9.52954L15.1979 9.57515L14.6872 9.52954L14.2431 9.91989L13.984 10.2658L14.0728 10.9258L14.5169 11.6464L14.6872 11.5864H15.2572C15.346 11.5864 15.7383 11.6264 15.9234 11.6464L16.0122 11.8791L16.3009 12.6523L16.2342 13.2679L16.3675 13.6259L16.5747 14.529L16.634 14.7692L17.1595 14.1129L17.6037 13.1212L17.8627 12.0897V10.8883L17.6851 9.91989L17.5377 9.4856ZM16.634 8.53114L16.3009 8.76385L16.3675 9.02659C16.4292 9.06162 16.557 9.12568 16.5747 9.10165C16.5925 9.07763 16.6216 9.0416 16.634 9.02659C16.6759 9.01407 16.7968 8.97554 16.9449 8.92149C17.0929 8.86744 16.9424 8.75834 16.8486 8.71054L16.634 8.53114ZM17.2039 8.53114L16.8486 8.45607L16.5747 8.34347C16.3971 8.38101 16.0359 8.45607 16.0122 8.45607C15.9885 8.45607 15.6865 8.62572 15.5384 8.71054L15.3238 9.10165L14.8648 9.29683L14.2727 9.10165C14.285 9.00682 14.3097 8.8065 14.3097 8.76385C14.3097 8.7212 14.2653 8.46583 14.2431 8.34347L14.5688 8.17082L14.9685 7.96814L15.0795 7.91559L15.2572 7.74294L15.3238 7.51023L15.3682 7.16492L15.4274 6.87966L15.5903 6.68993L15.6791 6.63945C15.8049 6.74965 16.0744 6.97488 16.1454 6.99417C16.2165 7.01346 16.708 7.65152 16.9449 7.96814L17.2039 8.53114ZM7.1888 13.1628L7.03335 13.2679V13.6582C7.11231 13.7227 7.2936 13.8445 7.38714 13.8159C7.4615 13.7931 7.51375 13.7224 7.54956 13.674C7.57004 13.6463 7.58514 13.6259 7.59592 13.6259C7.6196 13.6259 7.50709 13.4273 7.44787 13.3279L7.1888 13.1628Z" fill="white"/>
+<defs>
+<linearGradient id="paint0_linear_826_47185" x1="1.07324" y1="0.278748" x2="1.07324" y2="24.2354" gradientUnits="userSpaceOnUse">
+<stop stop-color="#ADADAD" stop-opacity="0.01"/>
+<stop offset="1" stop-color="#9D9D9D"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainPhysicsCollider.svg b/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainPhysicsCollider.svg
new file mode 100644
index 0000000000..302e585f6e
--- /dev/null
+++ b/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainPhysicsCollider.svg
@@ -0,0 +1,16 @@
+<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M21.0513 0.0305176C23.2286 0.0305176 24.0831 1.80898 24.0831 3.04917C24.0831 4.28935 24.0831 18.8121 24.0831 20.6726C24.0831 22.4235 22.8546 23.9872 21.0513 23.9872C19.248 23.9872 4.77576 23.9872 2.93576 23.9872C1.51308 23.9872 0.126465 22.5453 0.126465 21.1892C0.126465 19.8331 0.126465 4.06585 0.126465 2.70307C0.126465 1.3403 1.49186 0.0305176 2.73602 0.0305176C3.98018 0.0305176 19.0866 0.0305176 21.0513 0.0305176Z" fill="url(#paint0_linear_835_46270)"/>
+<mask id="mask0_835_46270" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="0" y="0" width="25" height="24">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M21.0513 0.0305176C23.2286 0.0305176 24.0831 1.80898 24.0831 3.04917C24.0831 4.28935 24.0831 18.8121 24.0831 20.6726C24.0831 22.4235 22.8546 23.9872 21.0513 23.9872C19.248 23.9872 4.77576 23.9872 2.93576 23.9872C1.51308 23.9872 0.126465 22.5453 0.126465 21.1892C0.126465 19.8331 0.126465 4.06585 0.126465 2.70307C0.126465 1.3403 1.49186 0.0305176 2.73602 0.0305176C3.98018 0.0305176 19.0866 0.0305176 21.0513 0.0305176Z" fill="white"/>
+</mask>
+<g mask="url(#mask0_835_46270)">
+<rect x="0.126465" y="0.0305176" width="24" height="24" fill="#BA8A68"/>
+</g>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M14.262 3.56718V8.58933L13.3184 6.64134L12.1922 8.34583L10.8834 6.21522L10.4268 9.1372L6.3787 6.21522L8.44843 10.4156L4.52202 10.6895L7.90056 12.394L4.73508 14.342L7.10919 15.4377L0.930664 15.2247L5.70932 12.5462L1.50879 10.0503L6.62225 9.35026L3.97394 3.38455L9.57444 7.00659L10.4268 4.11505L12.1922 6.21522L14.262 3.56718ZM4.39651 17.0216L2.39795 21.0187H22.8261L16.3262 6.16187L11.56 17.0566L11.5398 17.0162L11.5377 17.0216L4.39651 17.0216ZM14.4692 13.5903L16.3263 8.94749L18.1834 13.5903H14.4692ZM12.1565 11.3781L12.0115 11.0843L11.8499 10.8102C11.8987 10.7181 12.0001 10.5202 12.0155 10.4659C12.0204 10.4486 12.0254 10.4124 12.0315 10.3676L12.0315 10.3676L12.0315 10.3675C12.0496 10.2361 12.0779 10.0309 12.1438 10.0131C12.2144 9.99395 12.4239 9.85331 12.5199 9.78538L13.0087 9.92386L12.9012 10.5048C12.8271 10.6034 12.6825 10.8162 12.6973 10.8791C12.7121 10.942 12.694 11.1689 12.6831 11.2746C12.7314 11.2961 12.8188 11.371 12.7827 11.4984C12.7467 11.6258 12.6682 11.6918 12.6335 11.7089C12.5577 11.6605 12.3924 11.5599 12.3379 11.5444C12.2834 11.529 12.1943 11.4271 12.1565 11.3781ZM9.4161 11.9189L9.57374 11.3625L9.66501 11.0403L9.96567 10.8724L10.2878 10.9637L10.5436 11.2892L10.8916 11.7358L10.529 12.2342L10.014 11.9301L9.4161 11.9189ZM8.21399 14.7105L7.73661 14.3854L7.47303 14.3107L7.26262 13.7133L8.0021 13.4482L8.62053 13.2754L8.91 13.7054L8.59472 14.8183L8.21399 14.7105ZM10.2914 14.4131L9.57288 14.7158L9.88819 15.0398L10.2504 15.1424L10.6408 15.3183L10.8668 15.6204L11.2012 15.5567L11.3008 15.2053L11.0992 14.8002L10.7892 14.5542L10.2914 14.4131ZM9.89829 13.5671L9.81813 13.2917L9.95504 13.1348L10.4569 13.0324L10.6953 13.1978L10.693 13.5803L10.3098 13.7897L9.89829 13.5671ZM11.2764 13.3624L11.259 13.7407L11.6414 13.743L11.8079 13.4152L11.9892 13.1486L12.4043 12.8342L12.6218 12.7572L12.618 12.5115L12.492 12.5248L12.3817 12.3386L12.0861 12.1734L11.8614 12.1097L11.5736 12.3135L11.3976 12.6468L11.2565 13.1449C11.2411 13.1992 11.2634 13.3126 11.2764 13.3624Z" fill="white"/>
+<defs>
+<linearGradient id="paint0_linear_835_46270" x1="0.126465" y1="0.0305176" x2="0.126465" y2="23.9872" gradientUnits="userSpaceOnUse">
+<stop stop-color="#ADADAD" stop-opacity="0.01"/>
+<stop offset="1" stop-color="#9D9D9D"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainSurfaceGradientList.svg b/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainSurfaceGradientList.svg
new file mode 100644
index 0000000000..19cb144936
--- /dev/null
+++ b/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainSurfaceGradientList.svg
@@ -0,0 +1,16 @@
+<svg width="25" height="26" viewBox="0 0 25 26" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M21.0513 1.12738C23.2286 1.12738 24.0831 2.90585 24.0831 4.14603C24.0831 5.38622 24.0831 19.909 24.0831 21.7694C24.0831 23.5204 22.8546 25.084 21.0513 25.084C19.248 25.084 4.77576 25.084 2.93576 25.084C1.51308 25.084 0.126465 23.6422 0.126465 22.286C0.126465 20.9299 0.126465 5.16271 0.126465 3.79993C0.126465 2.43716 1.49186 1.12738 2.73602 1.12738C3.98018 1.12738 19.0866 1.12738 21.0513 1.12738Z" fill="url(#paint0_linear_826_47189)"/>
+<mask id="mask0_826_47189" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="0" y="1" width="25" height="25">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M21.0513 1.12738C23.2286 1.12738 24.0831 2.90585 24.0831 4.14603C24.0831 5.38622 24.0831 19.909 24.0831 21.7694C24.0831 23.5204 22.8546 25.084 21.0513 25.084C19.248 25.084 4.77576 25.084 2.93576 25.084C1.51308 25.084 0.126465 23.6422 0.126465 22.286C0.126465 20.9299 0.126465 5.16271 0.126465 3.79993C0.126465 2.43716 1.49186 1.12738 2.73602 1.12738C3.98018 1.12738 19.0866 1.12738 21.0513 1.12738Z" fill="white"/>
+</mask>
+<g mask="url(#mask0_826_47189)">
+<rect x="0.126465" y="1.12738" width="24" height="24" fill="#BA8A68"/>
+</g>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M4.47754 5.82434C4.47754 6.65277 3.80597 7.32434 2.97754 7.32434C2.14911 7.32434 1.47754 6.65277 1.47754 5.82434C1.47754 4.99591 2.14911 4.32434 2.97754 4.32434C3.80597 4.32434 4.47754 4.99591 4.47754 5.82434ZM3.28145 17.2069L1.12646 21.5169H23.1265L16.1265 5.51691L10.9935 17.2499L10.9632 17.1894L10.956 17.2069L3.28145 17.2069ZM14.1265 13.5169L16.1265 8.51691L18.1265 13.5169H14.1265ZM2.97754 11.5726C3.80597 11.5726 4.47754 10.901 4.47754 10.0726C4.47754 9.24414 3.80597 8.57257 2.97754 8.57257C2.14911 8.57257 1.47754 9.24414 1.47754 10.0726C1.47754 10.901 2.14911 11.5726 2.97754 11.5726ZM4.47754 14.3208C4.47754 15.1492 3.80597 15.8208 2.97754 15.8208C2.14911 15.8208 1.47754 15.1492 1.47754 14.3208C1.47754 13.4924 2.14911 12.8208 2.97754 12.8208C3.80597 12.8208 4.47754 13.4924 4.47754 14.3208ZM12.7983 4.81268H5.79834V6.81268H12.7983V4.81268ZM5.79834 9.01562H12.7983V11.0156H5.79834V9.01562ZM11.7743 13.2186L5.79544 13.2186V15.1799L10.8253 15.1799L11.7743 13.2186Z" fill="white"/>
+<defs>
+<linearGradient id="paint0_linear_826_47189" x1="0.126465" y1="1.12738" x2="0.126465" y2="25.084" gradientUnits="userSpaceOnUse">
+<stop stop-color="#ADADAD" stop-opacity="0.01"/>
+<stop offset="1" stop-color="#9D9D9D"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainSurfaceMaterials.svg b/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainSurfaceMaterials.svg
new file mode 100644
index 0000000000..5179f61867
--- /dev/null
+++ b/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainSurfaceMaterials.svg
@@ -0,0 +1,21 @@
+<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_826_47187)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M21.9556 0.614136C24.1329 0.614136 24.9874 2.3926 24.9874 3.63279C24.9874 4.87297 24.9874 19.3957 24.9874 21.2562C24.9874 23.0071 23.7589 24.5708 21.9556 24.5708C20.1523 24.5708 5.68006 24.5708 3.84005 24.5708C2.41738 24.5708 1.03076 23.1289 1.03076 21.7728C1.03076 20.4167 1.03076 4.64946 1.03076 3.28669C1.03076 1.92391 2.39616 0.614136 3.64032 0.614136C4.88448 0.614136 19.9909 0.614136 21.9556 0.614136Z" fill="url(#paint0_linear_826_47187)"/>
+<mask id="mask0_826_47187" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="1" y="0" width="24" height="25">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M21.9556 0.614136C24.1329 0.614136 24.9874 2.3926 24.9874 3.63279C24.9874 4.87297 24.9874 19.3957 24.9874 21.2562C24.9874 23.0071 23.7589 24.5708 21.9556 24.5708C20.1523 24.5708 5.68006 24.5708 3.84005 24.5708C2.41738 24.5708 1.03076 23.1289 1.03076 21.7728C1.03076 20.4167 1.03076 4.64946 1.03076 3.28669C1.03076 1.92391 2.39616 0.614136 3.64032 0.614136C4.88448 0.614136 19.9909 0.614136 21.9556 0.614136Z" fill="white"/>
+</mask>
+<g mask="url(#mask0_826_47187)">
+<rect x="1.03076" y="0.614136" width="24" height="24" fill="#BA8A68"/>
+</g>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M14.3665 8.86384C14.6892 9.25573 14.9893 9.70547 15.2463 10.2077L16.9038 6.06409L18.9038 11.0641H15.6208C16.1211 12.4269 16.2975 14.0867 15.8498 15.9661C15.6071 16.4279 15.4383 16.7516 15.3142 16.9897L15.3142 16.9898C15.0647 17.4684 14.9957 17.6007 14.8698 17.8118C15.0617 18.0184 15.5032 18.4966 15.9989 19.0641H23.9038L16.9038 3.06409L14.3665 8.86384ZM16.5233 20.5424L13.8552 17.8943C15.9385 15.2279 15.7192 11.4291 13.3253 9.03667C12.0643 7.77652 10.3831 7.08252 8.59221 7.08252C6.80133 7.08252 5.12009 7.77652 3.85916 9.03667C2.59823 10.2968 1.90381 11.977 1.90381 13.7668C1.90381 15.5566 2.59823 17.2368 3.85916 18.497C5.12009 19.7571 6.80133 20.4511 8.59221 20.4511C10.0724 20.4511 11.5344 19.958 12.7039 19.0266L15.3537 21.7113C15.5182 21.8756 15.7192 21.9487 15.9385 21.9487C16.1578 21.9487 16.3588 21.8574 16.5233 21.7113C16.8522 21.4008 16.8522 20.8712 16.5233 20.5424ZM13.6359 13.7668C13.6359 15.1183 13.106 16.3784 12.1557 17.3281C11.2054 18.2778 9.92624 18.8074 8.59221 18.8074C7.25819 18.8074 5.97898 18.2778 5.02872 17.3281C4.07845 16.3784 3.5485 15.1 3.5485 13.7668C3.5485 12.4153 4.07845 11.1552 5.02872 10.2055C5.97898 9.25583 7.25819 8.7262 8.59221 8.7262C9.94451 8.7262 11.2054 9.25583 12.1557 10.2055C13.106 11.1552 13.6359 12.4153 13.6359 13.7668ZM7.47592 10.347L7.86605 10.1649L8.3864 10.5291V10.7372L8.04823 11.1534H7.21582V10.7372L7.47592 10.347ZM10.0059 10.861L9.61567 11.1211L9.44539 11.6934L9.82377 11.8235L10.266 11.9733L10.7342 11.5634V11.3032V11.1211L10.0059 10.861ZM6.05176 14.1543L4.27197 14.8324C4.59691 15.4257 5.56886 16.7819 6.8572 17.4599C8.19278 18.1629 9.35347 17.8456 10.2667 17.596L10.2668 17.596C10.4547 17.5446 10.6322 17.4961 10.7985 17.4599C11.5391 17.2989 11.9617 16.0858 12.2521 15.2521L12.2521 15.2521C12.3439 14.9886 12.4224 14.763 12.4937 14.6205C12.731 14.1459 12.5926 12.9536 12.4937 12.4168L11.858 11.8235L10.2899 13.4339L9.82377 12.9677L8.08621 14.1543L7.11148 14.8324L6.05176 14.1543ZM6.8572 12.7402V12.1159H7.47611C7.52813 12.1604 7.64779 12.2829 7.71022 12.4168C7.77265 12.5506 7.98689 12.6882 8.08621 12.7402V12.9677L7.71022 13.2604L7.11148 13.4339L6.61768 13.2604L6.8572 12.7402ZM5.82403 12.954L5.66095 12.6952L5.36273 12.5466L5.06936 12.5837L5.1435 13.1704L5.46699 13.3717L5.61368 13.3532L5.82403 12.954Z" fill="white"/>
+</g>
+<defs>
+<linearGradient id="paint0_linear_826_47187" x1="1.03076" y1="0.614136" x2="1.03076" y2="24.5708" gradientUnits="userSpaceOnUse">
+<stop stop-color="#ADADAD" stop-opacity="0.01"/>
+<stop offset="1" stop-color="#9D9D9D"/>
+</linearGradient>
+<clipPath id="clip0_826_47187">
+<rect width="24" height="24" fill="white" transform="translate(0.903809 0.506409)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainWorld.svg b/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainWorld.svg
index 2aee65f2a8..5466395141 100644
--- a/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainWorld.svg
+++ b/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainWorld.svg
@@ -1,25 +1,22 @@
-<?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 / Terrain Refactor - 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-/-Terrain-Refactor---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="#8B572A">
-                <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="M2,20 L8,8 L10.8,13.6 L15,4 L22,20 L2,20 Z M8,11 L6,15 L10,15 L8,11 Z M15,7 L13,12 L17,12 L15,7 Z" id="Combined-Shape" fill="#FFFFFF"></path>
-    </g>
-</svg>
\ No newline at end of file
+<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Components / Terrain / Terrain Refactor - box">
+<g id="icon/general/color/ box template">
+<path id="Path 3" fill-rule="evenodd" clip-rule="evenodd" d="M21.918 0.571655C24.0953 0.571655 24.9498 2.35012 24.9498 3.59031C24.9498 4.83049 24.9498 19.3532 24.9498 21.2137C24.9498 22.9646 23.7213 24.5283 21.918 24.5283C20.1147 24.5283 5.64246 24.5283 3.80245 24.5283C2.37978 24.5283 0.993164 23.0864 0.993164 21.7303C0.993164 20.3742 0.993164 4.60698 0.993164 3.24421C0.993164 1.88143 2.35856 0.571655 3.60272 0.571655C4.84688 0.571655 19.9533 0.571655 21.918 0.571655Z" fill="url(#paint0_linear_651_55737)"/>
+<mask id="mask0_651_55737" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="0" y="0" width="25" height="25">
+<path id="Path 3_2" fill-rule="evenodd" clip-rule="evenodd" d="M21.918 0.571655C24.0953 0.571655 24.9498 2.35012 24.9498 3.59031C24.9498 4.83049 24.9498 19.3532 24.9498 21.2137C24.9498 22.9646 23.7213 24.5283 21.918 24.5283C20.1147 24.5283 5.64246 24.5283 3.80245 24.5283C2.37978 24.5283 0.993164 23.0864 0.993164 21.7303C0.993164 20.3742 0.993164 4.60698 0.993164 3.24421C0.993164 1.88143 2.35856 0.571655 3.60272 0.571655C4.84688 0.571655 19.9533 0.571655 21.918 0.571655Z" fill="white"/>
+</mask>
+<g mask="url(#mask0_651_55737)">
+<g id="Components / General / color / Terrain">
+<rect id="Lights" x="0.993164" y="0.571655" width="24" height="24" fill="#BA8A68"/>
+</g>
+</g>
+</g>
+<path id="Combined Shape" fill-rule="evenodd" clip-rule="evenodd" d="M22.9932 20.5717H14.9932H8.99316H2.99316L8.99316 8.57166L11.7932 14.1717L15.9932 4.57166L22.9932 20.5717ZM15.9932 7.57166L17.9932 12.5717H13.9932L15.9932 7.57166ZM8.99316 11.5717L10.9932 15.5717H6.99316L8.99316 11.5717Z" fill="white"/>
+</g>
+<defs>
+<linearGradient id="paint0_linear_651_55737" x1="0.993164" y1="0.571655" x2="0.993164" y2="24.5283" gradientUnits="userSpaceOnUse">
+<stop stop-color="#ADADAD" stop-opacity="0.01"/>
+<stop offset="1" stop-color="#9D9D9D"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainWorldDebugger.svg b/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainWorldDebugger.svg
index 1b729ab73f..ea9935fefb 100644
--- a/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainWorldDebugger.svg
+++ b/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainWorldDebugger.svg
@@ -1,25 +1,22 @@
-<?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 / Terrain World Debugger - 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-/-Terrain-World-Debugger---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="#8B572A">
-                <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="M16.1386919,4 L23.1386919,20 L1.13869185,20 L4.17269185,13.9311962 L5.67269185,13.9311962 L5.13869185,15 L9.13869185,15 L8.60469185,13.9311962 L10.1046919,13.9311962 L11.0056919,15.733 L16.1386919,4 Z M5.89628145,1.6047283 C6.16999928,1.77576619 6.13172615,2.05504566 5.96068826,2.32876349 C5.73263775,2.6937206 5.7756145,2.88160724 5.93530708,3.23512368 C6.42568244,3.16095005 7.14978568,3.35693375 7.56036243,3.61349058 C7.69722134,3.69900952 7.80557395,3.8301481 7.94243286,3.91566705 C8.25605,3.9213397 8.54116082,3.97263199 8.9003976,4.00681096 L9.38500494,3.2312771 C9.07663015,2.79610484 8.84851607,2.48441038 8.70066268,2.2961937 C8.47888259,2.01386869 9.31023224,1.32201362 9.57873345,1.70309072 C9.71741936,1.89992419 9.96660582,2.24544794 10.3262928,2.73966198 C10.430851,2.88332607 10.5329727,3.42440468 10.4654691,3.53243299 L10.0123346,4.25759977 C10.2974454,4.30889207 10.5084303,4.37729768 10.7194151,4.4457033 C10.9760197,4.54261523 11.2782438,4.66803348 11.5519616,4.83907137 L11.8488893,4.36388769 C11.9740073,4.16365719 12.4314004,4.13113915 12.6080709,4.16157747 C13.1652817,4.25757856 13.5849179,4.33128082 13.8669795,4.38268425 C14.4242185,4.48423653 14.0604111,5.4960867 13.718823,5.43188827 C13.4910975,5.38908932 13.1109498,5.32069959 12.5783797,5.2267191 L12.4073418,5.50043693 C12.68678,5.86534636 13.2181881,6.24296266 13.6811655,6.98663718 C13.3719223,7.58692704 12.5096505,9.26237536 11.09435,12.0129821 C10.3687536,12.1382775 8.95245279,11.8415191 8.53048305,11.7047078 L8.35944516,11.9784257 C8.63985361,12.343209 8.8679677,12.6549035 9.04378743,12.9135091 C9.30751703,13.3014174 8.41461192,13.8575606 8.16571666,13.506612 C8.03634338,13.3241925 7.78711967,12.9789829 7.41804555,12.4709835 C7.25974283,12.2530931 7.21380392,11.7815749 7.28247073,11.6716851 L7.56107764,11.2258208 C7.28735981,11.0547829 7.04214829,10.8381254 6.84255641,10.6499742 C6.64296453,10.461823 6.5174986,10.2565585 6.36352636,10.0969136 L5.84971054,10.9191908 C5.80243407,10.9948489 5.52907912,11.1209828 5.44267263,11.108334 C4.81589475,11.0165817 4.29416074,10.9228098 3.8774706,10.8270185 C3.35536732,10.6392609 3.55149489,9.78628232 4.02562714,9.77781449 C4.2610167,9.8090552 4.65066657,9.86223838 5.19457675,9.93736403 L5.67918409,9.16183016 C5.46247889,8.899553 5.31989964,8.62016251 5.17732038,8.34077202 C5.01195515,8.30087272 4.84658992,8.26097342 4.709731,8.17545447 C4.29915425,7.91889765 3.92856127,7.2481928 3.75175537,6.82055041 C3.31839264,6.80348476 3.13727717,6.94473989 2.90922666,7.309697 C2.73818877,7.58341484 2.46364498,7.8659871 2.18992715,7.69494921 C1.91620931,7.52391133 1.91695081,7.31908397 2.08798869,7.04536614 C2.48707709,6.40669119 2.90196341,6.09435049 3.63182995,6.04296284 C3.67740191,5.56398047 3.79709982,5.06788478 4.08216296,4.61168839 C4.36722611,4.155492 4.73213554,3.87605383 5.14266461,3.62512197 C4.86889909,2.9465954 4.87721463,2.47359794 5.27630303,1.834923 C5.44734091,1.56120516 5.62256361,1.43369042 5.89628145,1.6047283 Z M16.1386919,7 L14.1386919,12 L18.1386919,12 L16.1386919,7 Z M8.16878118,5.03529284 C8.00462988,5.67215311 7.76591557,6.23931272 7.45263826,6.73677168 C7.13936096,7.23423064 6.73633624,7.69375726 6.24356411,8.11535154 C6.92043783,9.241108 7.55106072,9.98835574 8.13543278,10.3570948 C8.68404895,10.7032718 9.22256472,11.0747691 10.0145932,10.9501066 C10.3872999,10.3853627 12.0504479,7.55314517 12.4594665,6.91035029 C11.7506156,6.20276679 11.3996595,5.78938078 10.8137513,5.51008723 C10.0440887,5.1432007 8.84604252,4.93245053 8.16878118,5.03529284 Z M4.99455574,5.18181467 C4.5099484,5.95734853 4.64118234,6.8639733 5.27985729,7.2630617 C5.41671621,7.34858064 5.46539716,7.34146992 5.61813643,7.24940571 C6.13459678,6.83479589 6.46809468,6.50703743 6.61863015,6.26613032 C6.77216204,6.02042794 6.93844402,5.59543292 7.11747611,4.99114525 C7.16180049,4.76065652 7.12709506,4.6114023 6.99023614,4.52588336 C6.3515612,4.12679496 5.47916308,4.40628081 4.99455574,5.18181467 Z" id="Combined-Shape" fill="#FFFFFF"></path>
-    </g>
-</svg>
\ No newline at end of file
+<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Components / Terrain / Terrain World Debugger - box">
+<g id="icon/general/color/ box template">
+<path id="Path 3" fill-rule="evenodd" clip-rule="evenodd" d="M21.5894 0.369629C23.7667 0.369629 24.6212 2.1481 24.6212 3.38828C24.6212 4.62846 24.6212 19.1512 24.6212 21.0117C24.6212 22.7626 23.3927 24.3263 21.5894 24.3263C19.786 24.3263 5.31385 24.3263 3.47384 24.3263C2.05117 24.3263 0.664551 22.8844 0.664551 21.5283C0.664551 20.1722 0.664551 4.40496 0.664551 3.04218C0.664551 1.67941 2.02995 0.369629 3.27411 0.369629C4.51827 0.369629 19.6247 0.369629 21.5894 0.369629Z" fill="url(#paint0_linear_651_55746)"/>
+<mask id="mask0_651_55746" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="0" y="0" width="25" height="25">
+<path id="Path 3_2" fill-rule="evenodd" clip-rule="evenodd" d="M21.5894 0.369629C23.7667 0.369629 24.6212 2.1481 24.6212 3.38828C24.6212 4.62846 24.6212 19.1512 24.6212 21.0117C24.6212 22.7626 23.3927 24.3263 21.5894 24.3263C19.786 24.3263 5.31385 24.3263 3.47384 24.3263C2.05117 24.3263 0.664551 22.8844 0.664551 21.5283C0.664551 20.1722 0.664551 4.40496 0.664551 3.04218C0.664551 1.67941 2.02995 0.369629 3.27411 0.369629C4.51827 0.369629 19.6247 0.369629 21.5894 0.369629Z" fill="white"/>
+</mask>
+<g mask="url(#mask0_651_55746)">
+<g id="Components / General / color / Terrain">
+<rect id="Lights" x="0.664551" y="0.369629" width="24" height="24" fill="#BA8A68"/>
+</g>
+</g>
+</g>
+<path id="Combined Shape" fill-rule="evenodd" clip-rule="evenodd" d="M11.0131 14.6091C11.0131 14.6091 13.0294 10.43 13.47 9.51795C13.1593 9.04638 12.8241 8.7276 12.5478 8.4648L12.5478 8.46478C12.3954 8.31991 12.261 8.19204 12.1584 8.06496L12.3223 7.78694C12.8572 7.86721 13.2389 7.92581 13.4677 7.96275C13.8108 8.01815 14.1485 6.99729 13.5888 6.91009C13.3055 6.86594 12.8842 6.80305 12.3247 6.72139C12.1473 6.6955 11.6909 6.73976 11.5709 6.94313L11.2863 7.42579C11.0083 7.26184 10.7029 7.14422 10.4439 7.05394C10.2313 6.99097 10.0186 6.92801 9.73225 6.88406L10.1666 6.14749C10.2313 6.03776 10.1153 5.49949 10.0071 5.35855C9.63485 4.87374 9.37687 4.53473 9.23317 4.34153C8.95497 3.96747 8.14167 4.68045 8.37063 4.95699C8.52327 5.14135 8.75931 5.44708 9.07876 5.87419L8.61424 6.66191C8.48943 6.65327 8.37348 6.64233 8.26217 6.63184C8.05242 6.61207 7.85917 6.59385 7.65425 6.59541C7.58474 6.55442 7.52207 6.50185 7.45939 6.44927C7.39672 6.3967 7.33405 6.34413 7.26454 6.30314C6.84751 6.05722 6.11861 5.8799 5.6303 5.96664C5.46158 5.61735 5.41379 5.43062 5.63239 5.05993C5.79635 4.78191 5.82743 4.50174 5.54941 4.33779C5.27139 4.17384 5.0995 4.30581 4.93555 4.58383C4.553 5.23255 4.55684 5.7056 4.84794 6.37687C4.44399 6.63827 4.08638 6.92699 3.81313 7.39036C3.53988 7.85372 3.43296 8.35273 3.39971 8.83272C2.67141 8.90284 2.26468 9.22574 1.88213 9.87445C1.71818 10.1525 1.7227 10.3573 2.00072 10.5212C2.27874 10.6852 2.54593 10.3956 2.70988 10.1176C2.92849 9.74691 3.10591 9.60105 3.53957 9.60698C3.7273 10.0299 4.115 10.6909 4.53203 10.9368C4.67104 11.0188 4.83738 11.0544 5.00372 11.0901C5.15342 11.3657 5.30313 11.6413 5.5265 11.898L5.06198 12.6857C4.51632 12.6246 4.12543 12.5814 3.88932 12.5562C3.41556 12.5769 3.2414 13.4346 3.76816 13.6089C4.18717 13.6939 4.71114 13.7743 5.34007 13.8499C5.42677 13.8603 5.6968 13.7272 5.74212 13.6504L6.23464 12.8152C6.30169 12.8812 6.36383 12.9556 6.42876 13.0333L6.42879 13.0334L6.4288 13.0334C6.51687 13.1388 6.61009 13.2504 6.72772 13.3557C6.93208 13.5387 7.18277 13.749 7.46079 13.9129L7.19373 14.3658C7.12791 14.4774 7.18595 14.9476 7.34979 15.1614C7.73179 15.6597 7.9898 15.9984 8.12382 16.1775C8.38165 16.5219 9.25997 15.943 8.98637 15.562C8.80396 15.308 8.56792 15.0023 8.27823 14.6448L8.44218 14.3668C8.86752 14.4927 10.291 14.753 11.0131 14.6091ZM5.07854 10.0101C4.42982 9.62754 4.27534 8.72458 4.73987 7.93686C5.20439 7.14913 6.06932 6.84733 6.71804 7.22988C6.85705 7.31185 6.89558 7.46017 6.85719 7.69172C6.69374 8.30041 6.53843 8.72953 6.39126 8.9791C6.24696 9.22379 5.92199 9.56001 5.41635 9.98775C5.26603 10.0837 5.21755 10.0921 5.07854 10.0101ZM8.01264 13.0297L8.08964 13.0757C8.62097 13.3936 9.15418 13.7126 9.90642 13.5743C10.101 13.2623 10.6592 12.2713 11.1915 11.3265L11.1915 11.3265C11.6387 10.5325 12.0676 9.77128 12.2467 9.47307C12.1338 9.36604 12.0298 9.26589 11.9323 9.17206C11.4021 8.66175 11.0664 8.33867 10.5656 8.11554C9.78674 7.76855 8.58368 7.58864 7.90928 7.70885C7.76154 8.34971 7.53748 8.92282 7.23708 9.42816C6.93669 9.9335 6.5456 10.4032 6.06382 10.8373C6.76938 11.9453 7.41899 12.6761 8.01264 13.0297ZM1.66455 21.606L3.81953 17.296L11.4941 17.296L11.5013 17.2785L11.5316 17.339L16.6646 5.60601L23.6646 21.606H1.66455ZM16.6646 8.60601L14.6646 13.606H18.6646L16.6646 8.60601Z" fill="white"/>
+</g>
+<defs>
+<linearGradient id="paint0_linear_651_55746" x1="0.664551" y1="0.369629" x2="0.664551" y2="24.3263" gradientUnits="userSpaceOnUse">
+<stop stop-color="#ADADAD" stop-opacity="0.01"/>
+<stop offset="1" stop-color="#9D9D9D"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainWorldRenderer.svg b/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainWorldRenderer.svg
index 4287508f10..af235047db 100644
--- a/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainWorldRenderer.svg
+++ b/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainWorldRenderer.svg
@@ -1,25 +1,22 @@
-<?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 / Terrain World Renderer - 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-/-Terrain-World-Renderer---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="#8B572A">
-                <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="M14.128,5.993 L14.1280665,8 L16.5280665,8 L16.528,7.493 L16.75,7.999 L16.5280665,8 L16.5280665,10.4 L17.8,10.399 L18.85,12.799 L16.5280665,12.8 L16.5280665,15.2 L18.9280665,15.2 L18.928,12.978 L19.9,15.199 L18.9280665,15.2 L18.9280665,17.6 L20.95,17.599 L22,20 L14.1280665,20 L14.1280665,17.6 L11.7280665,17.6 L11.7280665,20 L2,20 L8,8 L10.8,13.6 L12.2,10.399 L14.1280665,10.4 L14.1280665,8 L13.25,7.999 L14.128,5.993 Z M18.9280665,17.6 L16.5280665,17.6 L16.5280665,20 L18.9280665,20 L18.9280665,17.6 Z M16.5280665,15.2 L14.1280665,15.2 L14.1280665,17.6 L16.5280665,17.6 L16.5280665,15.2 Z M14.1280665,12.8 L11.7280665,12.8 L11.7280665,15.2 L14.1280665,15.2 L14.1280665,12.8 Z M8,11 L6,15 L10,15 L8,11 Z M16.5280665,10.4 L14.1280665,10.4 L14.1280665,12.8 L16.5280665,12.8 L16.5280665,10.4 Z M15,4 L15.7,5.599 L14.3,5.599 L15,4 Z" id="Combined-Shape-Copy" fill="#FFFFFF"></path>
-    </g>
-</svg>
\ No newline at end of file
+<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Components / Terrain / Terrain World Renderer - box">
+<g id="icon/general/color/ box template">
+<path id="Path 3" fill-rule="evenodd" clip-rule="evenodd" d="M21.4487 0.566956C23.6261 0.566956 24.4806 2.34542 24.4806 3.58561C24.4806 4.82579 24.4806 19.3485 24.4806 21.209C24.4806 22.9599 23.2521 24.5236 21.4487 24.5236C19.6454 24.5236 5.17322 24.5236 3.33322 24.5236C1.91054 24.5236 0.523926 23.0817 0.523926 21.7256C0.523926 20.3695 0.523926 4.60228 0.523926 3.23951C0.523926 1.87673 1.88932 0.566956 3.13348 0.566956C4.37764 0.566956 19.484 0.566956 21.4487 0.566956Z" fill="url(#paint0_linear_651_55759)"/>
+<mask id="mask0_651_55759" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="0" y="0" width="25" height="25">
+<path id="Path 3_2" fill-rule="evenodd" clip-rule="evenodd" d="M21.4487 0.566956C23.6261 0.566956 24.4806 2.34542 24.4806 3.58561C24.4806 4.82579 24.4806 19.3485 24.4806 21.209C24.4806 22.9599 23.2521 24.5236 21.4487 24.5236C19.6454 24.5236 5.17322 24.5236 3.33322 24.5236C1.91054 24.5236 0.523926 23.0817 0.523926 21.7256C0.523926 20.3695 0.523926 4.60228 0.523926 3.23951C0.523926 1.87673 1.88932 0.566956 3.13348 0.566956C4.37764 0.566956 19.484 0.566956 21.4487 0.566956Z" fill="white"/>
+</mask>
+<g mask="url(#mask0_651_55759)">
+<g id="Components / General / color / Terrain">
+<rect id="Lights" x="0.523926" y="0.566956" width="24" height="24" fill="#BA8A68"/>
+</g>
+</g>
+</g>
+<path id="Combined Shape" fill-rule="evenodd" clip-rule="evenodd" d="M22.5239 20.567L15.5239 4.56696L11.3239 14.167L8.52393 8.56696L2.52393 20.567H8.52393H14.5239H22.5239ZM8.52393 11.567L10.5239 15.567H6.52393L8.52393 11.567ZM21.0005 19.5003L16.0303 7.58151L16.0267 7.58887L15.9981 7.51718H15.548L15.5478 7.51444H15.3548L15.3546 7.51718H14.9369L14.9369 7.50107L14.9301 7.51718H14.9043L14.2861 9.06204L9.93449 19.5002H9.96093L9.93421 19.5482H20.9364L20.9105 19.5003H21.0005ZM18.9946 18.567L18.3561 16.475H16.2325L16.3923 18.567H18.9946ZM14.7918 18.567L14.8984 16.475H12.5604L11.9347 18.567H14.7918ZM14.9484 15.4938H12.8539L13.4618 13.4612H15.0519L14.9484 15.4938ZM18.0566 15.4938H16.1575L16.0022 13.4612H17.4362L18.0566 15.4938ZM14.7353 9.20371L14.441 10.1877H15.2186L15.2687 9.20371H14.7353ZM15.6769 9.20371L15.752 10.1877H16.4371L16.1368 9.20371H15.6769ZM15.8105 10.9522H16.6704L17.1367 12.48H15.9272L15.8105 10.9522ZM14.2123 10.9522H15.1797L15.1019 12.48H13.7553L14.2123 10.9522Z" fill="white"/>
+</g>
+<defs>
+<linearGradient id="paint0_linear_651_55759" x1="0.523926" y1="0.566956" x2="0.523926" y2="24.5236" gradientUnits="userSpaceOnUse">
+<stop stop-color="#ADADAD" stop-opacity="0.01"/>
+<stop offset="1" stop-color="#9D9D9D"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/Gems/Terrain/Code/Source/EditorComponents/EditorTerrainPhysicsColliderComponent.h b/Gems/Terrain/Code/Source/EditorComponents/EditorTerrainPhysicsColliderComponent.h
index d2254161a0..924426c262 100644
--- a/Gems/Terrain/Code/Source/EditorComponents/EditorTerrainPhysicsColliderComponent.h
+++ b/Gems/Terrain/Code/Source/EditorComponents/EditorTerrainPhysicsColliderComponent.h
@@ -25,8 +25,8 @@ namespace Terrain
         static constexpr auto s_categoryName = "Terrain";
         static constexpr auto s_componentName = "Terrain Physics Heightfield Collider";
         static constexpr auto s_componentDescription = "Provides terrain data to a physics collider in the form of a heightfield and surface->material mapping.";
-        static constexpr auto s_icon = "Editor/Icons/Components/TerrainLayerSpawner.svg";
-        static constexpr auto s_viewportIcon = "Editor/Icons/Components/Viewport/TerrainLayerSpawner.svg";
+        static constexpr auto s_icon = "Editor/Icons/Components/TerrainPhysicsCollider.svg";
+        static constexpr auto s_viewportIcon = "Editor/Icons/Components/Viewport/TerrainPhysicsCollider.svg";
         static constexpr auto s_helpUrl = "";
     };
 }
diff --git a/Gems/Terrain/Code/Source/EditorComponents/EditorTerrainSurfaceGradientListComponent.h b/Gems/Terrain/Code/Source/EditorComponents/EditorTerrainSurfaceGradientListComponent.h
index e2c5f1b280..3cf9e7fc47 100644
--- a/Gems/Terrain/Code/Source/EditorComponents/EditorTerrainSurfaceGradientListComponent.h
+++ b/Gems/Terrain/Code/Source/EditorComponents/EditorTerrainSurfaceGradientListComponent.h
@@ -25,8 +25,8 @@ namespace Terrain
         static constexpr const char* const s_categoryName = "Terrain";
         static constexpr const char* const s_componentName = "Terrain Surface Gradient List";
         static constexpr const char* const s_componentDescription = "Provides a mapping between gradients and surface tags for use by the terrain system.";
-        static constexpr const char* const s_icon = "Editor/Icons/Components/TerrainLayerSpawner.svg";
-        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/TerrainLayerSpawner.svg";
+        static constexpr const char* const s_icon = "Editor/Icons/Components/TerrainSurfaceGradientList.svg";
+        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/TerrainSurfaceGradientList.svg";
         static constexpr const char* const s_helpUrl = "";
     };
 }
diff --git a/Gems/Terrain/Code/Source/TerrainRenderer/EditorComponents/EditorTerrainMacroMaterialComponent.h b/Gems/Terrain/Code/Source/TerrainRenderer/EditorComponents/EditorTerrainMacroMaterialComponent.h
index a2fddf5768..67897b7dec 100644
--- a/Gems/Terrain/Code/Source/TerrainRenderer/EditorComponents/EditorTerrainMacroMaterialComponent.h
+++ b/Gems/Terrain/Code/Source/TerrainRenderer/EditorComponents/EditorTerrainMacroMaterialComponent.h
@@ -25,8 +25,8 @@ namespace Terrain
         static constexpr const char* const s_categoryName = "Terrain";
         static constexpr const char* const s_componentName = "Terrain Macro Material";
         static constexpr const char* const s_componentDescription = "Provides a macro material for a region to the terrain renderer";
-        static constexpr const char* const s_icon = "Editor/Icons/Components/TerrainLayerRenderer.svg";
-        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/TerrainLayerRenderer.svg";
+        static constexpr const char* const s_icon = "Editor/Icons/Components/TerrainMacroMaterial.svg";
+        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/TerrainMacroMaterial.svg";
         static constexpr const char* const s_helpUrl = "";
     };
 }
diff --git a/Gems/Terrain/Code/Source/TerrainRenderer/EditorComponents/EditorTerrainSurfaceMaterialsListComponent.h b/Gems/Terrain/Code/Source/TerrainRenderer/EditorComponents/EditorTerrainSurfaceMaterialsListComponent.h
index f0d03a6082..7fe8c82522 100644
--- a/Gems/Terrain/Code/Source/TerrainRenderer/EditorComponents/EditorTerrainSurfaceMaterialsListComponent.h
+++ b/Gems/Terrain/Code/Source/TerrainRenderer/EditorComponents/EditorTerrainSurfaceMaterialsListComponent.h
@@ -25,8 +25,8 @@ namespace Terrain
         static constexpr const char* const s_categoryName = "Terrain";
         static constexpr const char* const s_componentName = "Terrain Surface Materials List";
         static constexpr const char* const s_componentDescription = "Provides a mapping between surface tags and render materials.";
-        static constexpr const char* const s_icon = "Editor/Icons/Components/TerrainHeight.svg";
-        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/TerrainHeight.svg";
+        static constexpr const char* const s_icon = "Editor/Icons/Components/TerrainSurfaceMaterials.svg";
+        static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/TerrainSurfaceMaterials.svg";
         static constexpr const char* const s_helpUrl = "";
     };
 }