diff --git a/.gitignore b/.gitignore
index 664680c5bf..1b63c7698a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,10 @@
.idea/
+.vs/
.vscode/
__pycache__
AssetProcessorTemp/**
[Bb]uild/**
+[Oo]ut/**
[Cc]ache/
/install/
Editor/EditorEventLog.xml
@@ -14,6 +16,8 @@ UserSettings.xml
FrameCapture/**
.DS_Store
user*.cfg
+client*.cfg
+server*.cfg
.mayaSwatches/
_savebackup/
#Output folder for test results when running Automated Tests
diff --git a/Assets/Editor/Icons/Components/AnimGraphNetSync.svg b/Assets/Editor/Icons/Components/AnimGraphNetSync.svg
new file mode 100644
index 0000000000..7bf70e69dc
--- /dev/null
+++ b/Assets/Editor/Icons/Components/AnimGraphNetSync.svg
@@ -0,0 +1,13 @@
+
+
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/Animation.svg b/Assets/Editor/Icons/Components/Animation.svg
new file mode 100644
index 0000000000..4890bb0900
--- /dev/null
+++ b/Assets/Editor/Icons/Components/Animation.svg
@@ -0,0 +1,7 @@
+
+
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/AreaLight.svg b/Assets/Editor/Icons/Components/AreaLight.svg
index 932f02dd2e..a52c5d38c3 100644
--- a/Assets/Editor/Icons/Components/AreaLight.svg
+++ b/Assets/Editor/Icons/Components/AreaLight.svg
@@ -1,12 +1,10 @@