diff --git a/com.unity.visualeffectgraph/CHANGELOG.md b/com.unity.visualeffectgraph/CHANGELOG.md
index 7380239f1be..6376919954c 100644
--- a/com.unity.visualeffectgraph/CHANGELOG.md
+++ b/com.unity.visualeffectgraph/CHANGELOG.md
@@ -31,7 +31,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Added Is Inside subgraph into VFX Graph additions package
 - The VFX editor automatically attach to the current selection if the selected gameobject uses the currently edited VFX asset
 - Two new buttons are available in the editor's tool bar. One will display a popup panel to handle attachement and one to lock/unlock the current attachement
-
+- Improved toolbar design: added icons, removed labels and grouped commands into dropdown menus
 
 ### Changed
 - Allow remaking an existing link.
diff --git a/com.unity.visualeffectgraph/Editor/GraphView/VFXComponentBoard.cs b/com.unity.visualeffectgraph/Editor/GraphView/VFXComponentBoard.cs
index c1f7cbe950c..a327e9787e9 100644
--- a/com.unity.visualeffectgraph/Editor/GraphView/VFXComponentBoard.cs
+++ b/com.unity.visualeffectgraph/Editor/GraphView/VFXComponentBoard.cs
@@ -194,10 +194,11 @@ public VFXComponentBoard(VFXView view)
             m_DebugModes = this.Query<Button>("debug-modes");
             m_DebugModes.clickable.clicked += OnDebugModes;
 
+            m_RecordIcon = VFXView.LoadImage("d_Record");
             m_RecordBoundsButton = this.Query<Button>("record");
-            m_RecordBoundsImage = this.Query<Image>("record-icon");
+            m_RecordBoundsImage = m_RecordBoundsButton.Query<Image>("record-icon");
+            m_RecordBoundsImage.style.backgroundImage = m_RecordIcon;
             m_RecordBoundsButton.clickable.clicked += OnRecordBoundsButton;
-            m_RecordIcon = VFXView.LoadImage("d_Record");
             m_BoundsActionLabel = this.Query<Label>("bounds-label");
             m_BoundsToolContainer = this.Query("bounds-tool-container");
             m_BackgroundDefaultColor = m_BoundsToolContainer.style.backgroundColor;
diff --git a/com.unity.visualeffectgraph/Editor/GraphView/VFXViewWindow.cs b/com.unity.visualeffectgraph/Editor/GraphView/VFXViewWindow.cs
index 79d9ab1c257..08f7b827a1c 100644
--- a/com.unity.visualeffectgraph/Editor/GraphView/VFXViewWindow.cs
+++ b/com.unity.visualeffectgraph/Editor/GraphView/VFXViewWindow.cs
@@ -18,7 +18,10 @@ namespace UnityEditor.VFX.UI
     [Serializable]
     class VFXViewWindow : EditorWindow
     {
+        static VisualEffect s_LastAttachedComponent;
+
         ShortcutHandler m_ShortcutHandler;
+
         protected void SetupFramingShortcutHandler(VFXView view)
         {
             m_ShortcutHandler = new ShortcutHandler(
@@ -29,7 +32,7 @@ protected void SetupFramingShortcutHandler(VFXView view)
                     {Event.KeyboardEvent("o"), view.FrameOrigin },
                     {Event.KeyboardEvent("^#>"), view.FramePrev },
                     {Event.KeyboardEvent("^>"), view.FrameNext },
-                    {Event.KeyboardEvent("F7"), view.Compile},
+                    {Event.KeyboardEvent("F7"), view.OnCompile},
                     {Event.KeyboardEvent("#d"), view.OutputToDot},
                     {Event.KeyboardEvent("^&d"), view.DuplicateSelectionWithEdges},
                     {Event.KeyboardEvent("^#d"), view.OutputToDotReduced},
@@ -41,7 +44,7 @@ protected void SetupFramingShortcutHandler(VFXView view)
                 });
         }
 
-        public static VFXViewWindow currentWindow;
+        public static VFXViewWindow currentWindow => WindowLayout.FindEditorWindowOfType(typeof(VFXViewWindow)) as VFXViewWindow;
 
         [MenuItem("Window/Visual Effects/Visual Effect Graph", false, 3011)]
         public static void ShowWindow()
@@ -80,8 +83,11 @@ public void LoadResource(VisualEffectResource resource, VisualEffect effectToAtt
             {
                 InternalLoadResource(resource);
             }
-            if (effectToAttach != null && graphView.controller != null && graphView.controller.model != null && effectToAttach.visualEffectAsset == graphView.controller.model.asset)
-                graphView.attachedComponent = effectToAttach;
+
+            if (!graphView.TryAttachTo(effectToAttach))
+            {
+                s_LastAttachedComponent = null;
+            }
         }
 
         List<VisualEffectResource> m_ResourceHistory = new List<VisualEffectResource>();
@@ -106,6 +112,12 @@ void InternalLoadResource(VisualEffectResource resource)
             graphView.controller = VFXViewController.GetController(resource, true);
             graphView.UpdateGlobalSelection();
             graphView.FrameNewController();
+            graphView.UpdateIsSubgraph();
+        }
+
+        public bool CanPopResource()
+        {
+            return m_ResourceHistory.Any();
         }
 
         public void PopResource()
@@ -174,7 +186,7 @@ protected void CreateGUI()
                 var currentAsset = GetCurrentResource();
                 if (currentAsset != null)
                 {
-                    LoadResource(currentAsset);
+                    LoadResource(currentAsset, s_LastAttachedComponent);
                 }
             };
 
@@ -188,8 +200,6 @@ protected void CreateGUI()
                 rootVisualElement.AddManipulator(m_ShortcutHandler);
             }
 
-            currentWindow = this;
-
 #if USE_EXIT_WORKAROUND_FOGBUGZ_1062258
             EditorApplication.wantsToQuit += Quitting_Workaround;
 #endif
@@ -216,11 +226,11 @@ protected void OnDestroy()
 
             if (graphView != null)
             {
+                s_LastAttachedComponent = graphView.attachedComponent;
                 graphView.UnregisterCallback<AttachToPanelEvent>(OnEnterPanel);
                 graphView.UnregisterCallback<DetachFromPanelEvent>(OnLeavePanel);
                 graphView.controller = null;
             }
-            currentWindow = null;
         }
 
         void OnEnterPanel(AttachToPanelEvent e)
@@ -309,19 +319,6 @@ void Update()
                 VFXViewModificationProcessor.assetMoved = false;
             }
             titleContent.text = filename;
-
-            if (graphView?.controller?.model?.visualEffectObject != null)
-            {
-                graphView.checkoutButton.visible = true;
-                if (!graphView.IsAssetEditable() && Provider.isActive && Provider.enabled)
-                {
-                    graphView.checkoutButton.SetEnabled(true);
-                }
-                else
-                {
-                    graphView.checkoutButton.SetEnabled(false);
-                }
-            }
         }
 
         [SerializeField]
diff --git a/com.unity.visualeffectgraph/Editor/GraphView/Views/DropDownButtonBase.cs b/com.unity.visualeffectgraph/Editor/GraphView/Views/DropDownButtonBase.cs
new file mode 100644
index 00000000000..2c37dd4d13f
--- /dev/null
+++ b/com.unity.visualeffectgraph/Editor/GraphView/Views/DropDownButtonBase.cs
@@ -0,0 +1,199 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+using UnityEngine;
+using UnityEngine.UIElements;
+
+namespace UnityEditor.VFX.UI
+{
+    abstract class DropDownButtonBase : VisualElement
+    {
+        private class NotifyEditorWindow : EditorWindow
+        {
+            public event Action Destroyed;
+
+            private void OnDestroy()
+            {
+                Destroyed?.Invoke();
+            }
+        }
+
+        readonly bool m_HasLeftSeparator;
+        readonly Button m_MainButton;
+
+        NotifyEditorWindow m_CurrentPopup;
+        DateTime m_PopupClosedTimestamp;
+
+        protected readonly VisualElement m_PopupContent;
+        protected readonly VFXViewWindow m_ParentWindow;
+
+        protected DropDownButtonBase(
+            VFXViewWindow parentWindow,
+            string uxmlSource,
+            string mainButtonLabel,
+            string mainButtonName,
+            string iconPath,
+            bool hasSeparatorBefore = false,
+            bool hasSeparatorAfter = false)
+        {
+            m_ParentWindow = parentWindow;
+            style.flexDirection = new StyleEnum<FlexDirection>(FlexDirection.Row);
+
+            if (hasSeparatorBefore)
+            {
+                m_HasLeftSeparator = true;
+                var divider = new VisualElement();
+                divider.AddToClassList("separator");
+                Add(divider);
+            }
+
+            m_MainButton = new Button(OnMainButton) { name = mainButtonName };
+            m_MainButton.AddToClassList("dropdown-button");
+            m_MainButton.AddToClassList("unity-toolbar-toggle");
+            if (!string.IsNullOrEmpty(iconPath))
+            {
+                var icon = new Image { image = EditorGUIUtility.LoadIcon(iconPath) };
+                m_MainButton.Add(icon);
+                m_MainButton.tooltip = mainButtonLabel;
+            }
+            else
+            {
+                m_MainButton.text = mainButtonLabel;
+            }
+            Add(m_MainButton);
+
+            var separator = new VisualElement();
+            separator.AddToClassList("dropdown-separator");
+            Add(separator);
+
+            var dropDownButton = new Button(OnTogglePopup);
+            dropDownButton.AddToClassList("dropdown-arrow");
+            dropDownButton.AddToClassList("unity-toolbar-toggle");
+            dropDownButton.Add(new VisualElement());
+            Add(dropDownButton);
+
+            if (hasSeparatorAfter)
+            {
+                var divider = new VisualElement();
+                divider.AddToClassList("separator");
+                Add(divider);
+            }
+
+            m_PopupContent = new VisualElement();
+            var tpl = VFXView.LoadUXML(uxmlSource);
+            tpl.CloneTree(m_PopupContent);
+            contentContainer.AddStyleSheetPath("VFXToolbar");
+        }
+
+        protected virtual void OnOpenPopup() { }
+        protected virtual void OnMainButton() { }
+        protected abstract Vector2 GetPopupSize();
+
+        protected void ClosePopup()
+        {
+            m_CurrentPopup?.Close();
+        }
+
+        private Vector2 GetPopupPosition() => m_ParentWindow.graphView.ViewToScreenPosition(worldBound.position);
+
+        private void OnTogglePopup()
+        {
+            // If the user click on the arrow button while the popup is opened
+            // the popup is then closed (because clicked outside) and immediately reopened
+            // To prevent this behavior we allow the popup to reopen only after a very short period of time after being closed
+            var deltaTime = DateTime.UtcNow - m_PopupClosedTimestamp;
+            if (m_CurrentPopup == null && deltaTime.TotalMilliseconds > 500)
+            {
+                m_CurrentPopup = ScriptableObject.CreateInstance<NotifyEditorWindow>();
+                m_CurrentPopup.hideFlags = HideFlags.HideAndDontSave;
+                if (m_PopupContent.parent != null)
+                {
+                    m_PopupContent.parent.Remove(m_PopupContent);
+                }
+
+                m_CurrentPopup.Destroyed += OnPopupClosed;
+                m_CurrentPopup.rootVisualElement.AddStyleSheetPath("VFXToolbar");
+                m_CurrentPopup.rootVisualElement.Add(m_PopupContent);
+                m_CurrentPopup.rootVisualElement.AddToClassList("popup");
+                m_CurrentPopup.rootVisualElement.RegisterCallback<KeyUpEvent>(OnKeyUp);
+
+                OnOpenPopup();
+                var bounds = new Rect(GetPopupPosition(), localBound.size);
+                // Offset the bounds to align the popup with the real dropdown left edge
+                if (m_HasLeftSeparator)
+                {
+                    bounds.xMin += 6;
+                }
+
+                m_CurrentPopup.ShowAsDropDown(bounds, GetPopupSize(), new[] { PopupLocation.BelowAlignLeft, PopupLocation.AboveAlignLeft });
+                m_CurrentPopup.minSize = GetPopupSize();
+                m_CurrentPopup.maxSize = m_CurrentPopup.minSize;
+                GetNextFocusable(null, m_PopupContent.Children(), false)?.Focus();
+            }
+            else if (m_CurrentPopup != null)
+            {
+                ClosePopup();
+            }
+        }
+
+        private void OnPopupClosed()
+        {
+            m_CurrentPopup.Destroyed -= OnPopupClosed;
+            m_CurrentPopup.rootVisualElement.UnregisterCallback<KeyUpEvent>(OnKeyUp);
+            m_CurrentPopup = null;
+            m_PopupClosedTimestamp = DateTime.UtcNow;
+        }
+
+        private void OnKeyUp(KeyUpEvent evt)
+        {
+            var focused = m_PopupContent.focusController.focusedElement;
+            switch (evt.keyCode)
+            {
+                case KeyCode.DownArrow:
+                    var next = GetNextFocusable(focused, m_PopupContent.Children(), false);
+                    next?.Focus();
+                    break;
+                case KeyCode.UpArrow:
+                    var prev = GetNextFocusable(focused, m_PopupContent.Children(), true);
+                    prev?.Focus();
+                    break;
+                case KeyCode.Escape:
+                    ClosePopup();
+                    break;
+            }
+        }
+
+        private VisualElement GetNextFocusable(Focusable focused, IEnumerable<VisualElement> elements, bool reverse)
+        {
+            var found = focused == null;
+            return GetNextFocusableRecursive(focused, elements, reverse, ref found);
+        }
+
+        private VisualElement GetNextFocusableRecursive(Focusable focused, IEnumerable<VisualElement> elements, bool reverse, ref bool found)
+        {
+            var collection = reverse ? elements.Reverse() : elements;
+            foreach (var child in collection)
+            {
+                if (child == focused)
+                {
+                    found = true;
+                    continue;
+                }
+
+                if (found && child != focused && child.enabledSelf && child.focusable)
+                {
+                    return child;
+                }
+
+                var next = GetNextFocusableRecursive(focused, child.Children(), reverse, ref found);
+                if (next != null)
+                {
+                    return next;
+                }
+            }
+
+            return null;
+        }
+    }
+}
diff --git a/com.unity.visualeffectgraph/Editor/GraphView/Views/DropDownButtonBase.cs.meta b/com.unity.visualeffectgraph/Editor/GraphView/Views/DropDownButtonBase.cs.meta
new file mode 100644
index 00000000000..b8098533a7a
--- /dev/null
+++ b/com.unity.visualeffectgraph/Editor/GraphView/Views/DropDownButtonBase.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 01e984c00e672724ca7a33f2de200712
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/com.unity.visualeffectgraph/Editor/GraphView/Views/VFXCompileDropdownButton.cs b/com.unity.visualeffectgraph/Editor/GraphView/Views/VFXCompileDropdownButton.cs
new file mode 100644
index 00000000000..3fd85bf3dd4
--- /dev/null
+++ b/com.unity.visualeffectgraph/Editor/GraphView/Views/VFXCompileDropdownButton.cs
@@ -0,0 +1,73 @@
+using System.IO;
+
+using UnityEngine;
+using UnityEngine.UIElements;
+
+namespace UnityEditor.VFX.UI
+{
+    class VFXCompileDropdownButton : DropDownButtonBase
+    {
+        readonly VFXView m_VFXView;
+        readonly Toggle m_AutoCompileToggle;
+        readonly Toggle m_RuntimeModeToggle;
+        readonly Toggle m_ShaderValidationToggle;
+        readonly Button m_ResyncMaterial;
+
+        public VFXCompileDropdownButton(VFXView vfxView, VFXViewWindow parentWindow)
+            : base(
+                parentWindow,
+                "VFXCompileDropdownPanel",
+                "Compile",
+                "compile-button",
+                Path.Combine(VisualEffectGraphPackageInfo.assetPackagePath, "Editor/UIResources/VFX/compile.png"))
+        {
+            m_VFXView = vfxView;
+
+            m_AutoCompileToggle = m_PopupContent.Q<Toggle>("autoCompile");
+            m_AutoCompileToggle.RegisterCallback<ChangeEvent<bool>>(OnToggleAutoCompile);
+
+            m_RuntimeModeToggle = m_PopupContent.Q<Toggle>("runtimeMode");
+            m_RuntimeModeToggle.RegisterCallback<ChangeEvent<bool>>(OnToggleRuntimeMode);
+
+            m_ShaderValidationToggle = m_PopupContent.Q<Toggle>("shaderValidation");
+            m_ShaderValidationToggle.RegisterCallback<ChangeEvent<bool>>(OnToggleShaderValidation);
+
+            m_ResyncMaterial = m_PopupContent.Q<Button>("resyncMaterial");
+            m_ResyncMaterial.clicked += OnResyncMaterial;
+        }
+
+        protected override Vector2 GetPopupSize() => new Vector2(150, 68);
+
+        protected override void OnOpenPopup()
+        {
+            m_AutoCompileToggle.value = m_ParentWindow.autoCompile;
+            m_RuntimeModeToggle.value = m_VFXView.GetIsRuntimeMode();
+            m_ShaderValidationToggle.value = m_VFXView.GetShaderValidation();
+        }
+
+        protected override void OnMainButton()
+        {
+            m_VFXView.Compile();
+        }
+
+        void OnToggleAutoCompile(ChangeEvent<bool> evt)
+        {
+            m_ParentWindow.autoCompile = evt.newValue;
+        }
+
+        void OnToggleRuntimeMode(ChangeEvent<bool> evt)
+        {
+            m_VFXView.ToggleRuntimeMode();
+        }
+
+        void OnToggleShaderValidation(ChangeEvent<bool> evt)
+        {
+            m_VFXView.ToggleShaderValidationChanged();
+        }
+
+        void OnResyncMaterial()
+        {
+            m_VFXView.controller.graph.Invalidate(VFXModel.InvalidationCause.kMaterialChanged);
+        }
+    }
+}
diff --git a/com.unity.visualeffectgraph/Editor/GraphView/Views/VFXCompileDropdownButton.cs.meta b/com.unity.visualeffectgraph/Editor/GraphView/Views/VFXCompileDropdownButton.cs.meta
new file mode 100644
index 00000000000..1e20c7c4c66
--- /dev/null
+++ b/com.unity.visualeffectgraph/Editor/GraphView/Views/VFXCompileDropdownButton.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 277a1b926c71c6a4b8cbe1363007a208
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/com.unity.visualeffectgraph/Editor/GraphView/Views/VFXHelpDropdownButton.cs b/com.unity.visualeffectgraph/Editor/GraphView/Views/VFXHelpDropdownButton.cs
new file mode 100644
index 00000000000..13a45adda20
--- /dev/null
+++ b/com.unity.visualeffectgraph/Editor/GraphView/Views/VFXHelpDropdownButton.cs
@@ -0,0 +1,99 @@
+using System.Linq;
+
+using UnityEditor.Experimental;
+using UnityEditor.PackageManager.UI;
+
+using UnityEngine;
+using UnityEngine.UIElements;
+
+namespace UnityEditor.VFX.UI
+{
+    class VFXHelpDropdownButton : DropDownButtonBase
+    {
+        const string k_PackageName = "com.unity.visualeffectgraph";
+        const string k_AdditionalSamples = "VisualEffectGraph Additions";
+        const string k_AdditionalHelpers = "OutputEvent Helpers";
+        const string k_ManualUrl = @"https://docs.unity3d.com/Packages/com.unity.visualeffectgraph@latest/index.html";
+        const string k_ForumUrl = @"https://forum.unity.com/forums/visual-effect-graph.428/";
+        const string k_SpaceShipUrl = @"https://github.com/Unity-Technologies/SpaceshipDemo";
+        const string k_SamplesUrl = @"https://github.com/Unity-Technologies/VisualEffectGraph-Samples";
+        const string k_VfxGraphUrl = @"https://unity.com/visual-effect-graph";
+
+        readonly VFXView m_VFXView;
+        readonly Button m_installSamplesButton;
+        readonly Button m_installHelpersButton;
+
+        public VFXHelpDropdownButton(VFXView vfxView, VFXViewWindow parentWindow)
+            : base(
+                parentWindow,
+                "VFXHelpDropdownPanel",
+                "Open the user manual of Visual Effect Graph",
+                "help-button",
+                EditorResources.iconsPath + "_Help.png",
+                true)
+        {
+            m_VFXView = vfxView;
+
+            m_installSamplesButton = m_PopupContent.Q<Button>("installSamples");
+            m_installSamplesButton.clicked += OnInstallSamples;
+
+            m_installHelpersButton = m_PopupContent.Q<Button>("graphAddition");
+            m_installHelpersButton.clicked += OnInstallGraphAddition;
+
+            var gotoHome = m_PopupContent.Q<Button>("gotoHome");
+            gotoHome.clicked += () => GotoUrl(k_VfxGraphUrl);
+
+            var gotoForum = m_PopupContent.Q<Button>("gotoForum");
+            gotoForum.clicked += () => GotoUrl(k_ForumUrl);
+
+            var gotoSpaceShip = m_PopupContent.Q<Button>("gotoSpaceShip");
+            gotoSpaceShip.clicked += () => GotoUrl(k_SpaceShipUrl);
+
+            var gotoSamples = m_PopupContent.Q<Button>("gotoSamples");
+            gotoSamples.clicked += () => GotoUrl(k_SamplesUrl);
+        }
+
+        protected override Vector2 GetPopupSize() => new Vector2(200, 224);
+
+        protected override void OnMainButton()
+        {
+            GotoUrl(k_ManualUrl);
+        }
+
+        void GotoUrl(string url) => Help.BrowseURL(url);
+
+        void OnInstallSamples()
+        {
+            InstallSample(k_AdditionalSamples);
+        }
+
+        void OnInstallGraphAddition()
+        {
+            InstallSample(k_AdditionalHelpers);
+        }
+
+        void InstallSample(string sampleName)
+        {
+            var sample = Sample.FindByPackage(k_PackageName, null).SingleOrDefault(x => x.displayName == sampleName);
+            if (!string.IsNullOrEmpty(sample.displayName))
+            {
+                if (!sample.isImported)
+                {
+                    sample.Import();
+                }
+                else
+                {
+                    var reinstall = EditorUtility.DisplayDialog("Warning", "This sample package is already installed.\nDo you want to reinstall it?", "Yes", "No");
+                    if (reinstall)
+                    {
+                        sample.Import(Sample.ImportOptions.OverridePreviousImports);
+                    }
+                }
+            }
+            else
+            {
+                Debug.LogWarning($"Could not find sample package {sampleName}");
+            }
+        }
+    }
+}
diff --git a/com.unity.visualeffectgraph/Editor/GraphView/Views/VFXHelpDropdownButton.cs.meta b/com.unity.visualeffectgraph/Editor/GraphView/Views/VFXHelpDropdownButton.cs.meta
new file mode 100644
index 00000000000..a424d8e9073
--- /dev/null
+++ b/com.unity.visualeffectgraph/Editor/GraphView/Views/VFXHelpDropdownButton.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: da82d39d368e9d145a1f6b8a527a723e
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/com.unity.visualeffectgraph/Editor/GraphView/Views/VFXSaveDropdownButton.cs b/com.unity.visualeffectgraph/Editor/GraphView/Views/VFXSaveDropdownButton.cs
new file mode 100644
index 00000000000..5445943ef3d
--- /dev/null
+++ b/com.unity.visualeffectgraph/Editor/GraphView/Views/VFXSaveDropdownButton.cs
@@ -0,0 +1,87 @@
+using System.IO;
+
+using UnityEditor.Experimental;
+using UnityEditor.VersionControl;
+
+using UnityEngine;
+using UnityEngine.UIElements;
+
+namespace UnityEditor.VFX.UI
+{
+    class VFXSaveDropdownButton : DropDownButtonBase
+    {
+        private readonly VFXView m_VFXView;
+        private readonly Button m_CheckoutButton;
+
+        public VFXSaveDropdownButton(VFXView vfxView, VFXViewWindow parentWindow)
+            : base(
+                parentWindow,
+                "VFXSaveDropDownPanel",
+                "Save",
+                "save-button",
+                EditorResources.iconsPath + "SaveActive.png",
+                false,
+                true)
+        {
+            m_VFXView = vfxView;
+
+            var saveAsButton = m_PopupContent.Q<Button>("saveAs");
+            saveAsButton.clicked += OnSaveAs;
+
+            m_CheckoutButton = m_PopupContent.Q<Button>("checkout");
+            m_CheckoutButton.clicked += OnCheckout;
+
+            var selectButton = m_PopupContent.Q<Button>("showInInspector");
+            selectButton.clicked += OnSelectAsset;
+        }
+
+        protected override Vector2 GetPopupSize() => new Vector2(150, CanCheckout() ? 76 : 56);
+
+        protected override void OnOpenPopup()
+        {
+            if (m_VFXView.controller?.model?.visualEffectObject != null)
+            {
+                // Hide checkout button if perforce is not available and disable it if the asset is already checked out
+                if (CanCheckout())
+                {
+                    var isAllReadyCheckedOut = m_VFXView.IsAssetEditable();
+                    m_CheckoutButton.SetEnabled(!isAllReadyCheckedOut);
+                }
+                else
+                {
+                    m_CheckoutButton.style.display = DisplayStyle.None;
+                }
+            }
+        }
+
+        protected override void OnMainButton()
+        {
+            m_VFXView.OnSave();
+        }
+
+        bool CanCheckout() => Provider.isActive && Provider.enabled;
+
+        void OnSaveAs()
+        {
+            var originalPath = AssetDatabase.GetAssetPath(m_VFXView.controller.model);
+            var extension = Path.GetExtension(originalPath).Trim('.');
+            var newFilePath = EditorUtility.SaveFilePanelInProject("Save VFX Graph As...", Path.GetFileNameWithoutExtension(originalPath), extension, "", Path.GetDirectoryName(originalPath));
+            if (!string.IsNullOrEmpty(newFilePath))
+            {
+                m_VFXView.SaveAs(newFilePath);
+            }
+
+            ClosePopup();
+        }
+
+        void OnCheckout()
+        {
+            m_VFXView.Checkout();
+        }
+
+        void OnSelectAsset()
+        {
+            m_VFXView.SelectAsset();
+        }
+    }
+}
diff --git a/com.unity.visualeffectgraph/Editor/GraphView/Views/VFXSaveDropdownButton.cs.meta b/com.unity.visualeffectgraph/Editor/GraphView/Views/VFXSaveDropdownButton.cs.meta
new file mode 100644
index 00000000000..2f365c9e7c3
--- /dev/null
+++ b/com.unity.visualeffectgraph/Editor/GraphView/Views/VFXSaveDropdownButton.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: d666216e6fbc3304082ee970b61d8cb6
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/com.unity.visualeffectgraph/Editor/GraphView/Views/VFXView.cs b/com.unity.visualeffectgraph/Editor/GraphView/Views/VFXView.cs
index c4f5efbd7ba..1a1e5a1b8eb 100644
--- a/com.unity.visualeffectgraph/Editor/GraphView/Views/VFXView.cs
+++ b/com.unity.visualeffectgraph/Editor/GraphView/Views/VFXView.cs
@@ -6,6 +6,8 @@
 using System.Linq;
 using System.Reflection;
 
+using UnityEditor.Experimental;
+
 using UnityEditor.Experimental.GraphView;
 using UnityEditor.Toolbars;
 using UnityEditor.VersionControl;
@@ -109,6 +111,7 @@ public void StartEdgeDragInfo(VFXDataAnchor draggedAnchor, VFXDataAnchor overAnc
         }
     }
 
+
     class VFXView : GraphView, IControlledElement<VFXViewController>, IControllerListener
     {
         private const int MaximumNameLengthInNotification = 128;
@@ -142,6 +145,7 @@ void IControllerListener.OnControllerEvent(ControllerEvent e)
 
         VisualElement m_NoAssetLabel;
         VisualElement m_LockedElement;
+        Button m_BackButton;
 
         VFXViewController m_Controller;
         Controller IControlledElement.controller
@@ -149,8 +153,6 @@ Controller IControlledElement.controller
             get { return m_Controller; }
         }
 
-        public Button checkoutButton;
-
         void DisconnectController()
         {
             if (controller.model && controller.graph)
@@ -383,9 +385,10 @@ public VFXNodeController AddNode(VFXNodeProvider.Descriptor d, Vector2 mPos)
         readonly VisualElement m_Toolbar;
         readonly ToolbarToggle m_LockToggle;
         readonly EditorToolbarDropdown m_AttachDropDownButton;
+        readonly Texture2D m_LinkedIcon;
+        readonly Texture2D m_UnlinkedIcon;
 
         VFXNodeProvider m_NodeProvider;
-        ToolbarButton m_SaveButton;
         bool m_IsRuntimeMode;
         bool m_ForceShaderValidation;
 
@@ -405,7 +408,7 @@ public static VisualTreeAsset LoadUXML(string text)
         public static Texture2D LoadImage(string text)
         {
             string path = string.Format("{0}/VFX/{1}.png", VisualEffectAssetEditorUtility.editorResourcesPath, text);
-            return AssetDatabase.LoadAssetAtPath<Texture2D>(path);
+            return EditorGUIUtility.LoadIcon(path);
         }
 
         SelectionDragger m_SelectionDragger;
@@ -451,79 +454,47 @@ public VFXView()
 
             m_Toolbar = new UnityEditor.UIElements.Toolbar();
 
-            var toggleAutoCompile = new ToolbarToggle();
-            toggleAutoCompile.text = "Auto";
-            toggleAutoCompile.style.unityTextAlign = TextAnchor.MiddleRight;
-            toggleAutoCompile.SetValueWithoutNotify(true);
-            toggleAutoCompile.RegisterCallback<ChangeEvent<bool>>(OnToggleCompile);
-            m_Toolbar.Add(toggleAutoCompile);
-
-            var compileButton = new ToolbarButton(OnCompile);
-            compileButton.style.unityTextAlign = TextAnchor.MiddleLeft;
-            compileButton.text = "Compile";
-            m_Toolbar.Add(compileButton);
-
-            var resyncMatButton = new ToolbarButton(OnResyncMaterial);
-            resyncMatButton.style.unityTextAlign = TextAnchor.MiddleLeft;
-            resyncMatButton.text = "Resync Material";
-            m_Toolbar.Add(resyncMatButton);
-
-            m_SaveButton = new ToolbarButton(OnSave);
-            m_SaveButton.style.unityTextAlign = TextAnchor.MiddleLeft;
-            m_SaveButton.text = "Save";
-            m_Toolbar.Add(m_SaveButton);
-
-            m_AttachDropDownButton = new EditorToolbarDropdown(Contents.attach.text, OnOpenAttachMenu);
+            var saveDropDownButton = new VFXSaveDropdownButton(this, VFXViewWindow.currentWindow);
+            m_Toolbar.Add(saveDropDownButton);
+
+            var compileDropDownButton = new VFXCompileDropdownButton(this, VFXViewWindow.currentWindow);
+            m_Toolbar.Add(compileDropDownButton);
+
+            m_LinkedIcon = EditorGUIUtility.LoadIcon(Path.Combine(EditorResources.iconsPath, "Linked.png"));
+            m_UnlinkedIcon = EditorGUIUtility.LoadIcon(Path.Combine(EditorResources.iconsPath, "UnLinked.png"));
+            m_AttachDropDownButton = new EditorToolbarDropdown(m_UnlinkedIcon, OnOpenAttachMenu);
             m_AttachDropDownButton.name = "attach-toolbar-button";
             m_Toolbar.Add(m_AttachDropDownButton);
-
             m_LockToggle = new ToolbarToggle();
+
             m_LockToggle.style.unityTextAlign = TextAnchor.MiddleLeft;
             m_LockToggle.tooltip = locked ? Contents.clickToUnlock.text : Contents.clickToLock.text;
             m_LockToggle.name = "lock-auto-attach";
             m_LockToggle.RegisterCallback<ChangeEvent<bool>>(OnToggleLock);
             m_Toolbar.Add(m_LockToggle);
 
-            var spacer = new ToolbarSpacer();
-            spacer.style.width = 12f;
-            m_Toolbar.Add(spacer);
-
-            var selectAssetButton = new ToolbarButton(() => { SelectAsset(); });
-            selectAssetButton.text = "Show in Project";
-            m_Toolbar.Add(selectAssetButton);
-
-            spacer = new ToolbarSpacer();
-            spacer.style.width = 10;
-            m_Toolbar.Add(spacer);
-
-            checkoutButton = new ToolbarButton(() => { Checkout(); });
-            checkoutButton.text = "Check Out";
-            checkoutButton.visible = false;
-            checkoutButton.AddToClassList("toolbarItem");
-            m_Toolbar.Add(checkoutButton);
+            m_BackButton = new Button { tooltip = "Back to parent", name = "BackButton" };
+            m_BackButton.Add(new Image { image = EditorGUIUtility.LoadIcon(Path.Combine(EditorResources.iconsPath, "back.png")) });
+            m_BackButton.clicked += OnBackToParent;
+            m_Toolbar.Add(m_BackButton);
 
             var flexSpacer = new ToolbarSpacer();
             flexSpacer.style.flexGrow = 1f;
             m_Toolbar.Add(flexSpacer);
 
-            var toggleBlackboard = new ToolbarToggle();
-            toggleBlackboard.text = "Blackboard";
+            var toggleBlackboard = new ToolbarToggle { tooltip = "Blackboard" };
+            toggleBlackboard.Add(new Image { image = EditorGUIUtility.LoadIcon(Path.Combine(VisualEffectGraphPackageInfo.assetPackagePath, "Editor/UIResources/VFX/variableswindow.png")) });
             toggleBlackboard.RegisterCallback<ChangeEvent<bool>>(ToggleBlackboard);
             m_Toolbar.Add(toggleBlackboard);
 
-            m_ToggleComponentBoard = new ToolbarToggle();
-            m_ToggleComponentBoard.text = "Control";
+            m_ToggleComponentBoard = new ToolbarToggle { tooltip = "Displays controls for the GameObject currently attached" };
+            m_ToggleComponentBoard.Add(new Image { image = EditorGUIUtility.LoadIcon(Path.Combine(VisualEffectGraphPackageInfo.assetPackagePath, "Editor/UIResources/VFX/controls.png")) });
+            m_ToggleComponentBoard.style.borderRightWidth = 1;
             m_ToggleComponentBoard.RegisterCallback<ChangeEvent<bool>>(ToggleComponentBoard);
             m_Toolbar.Add(m_ToggleComponentBoard);
 
-            var showDebugMenu = new ToolbarMenu();
-            showDebugMenu.text = "Advanced";
-            showDebugMenu.menu.AppendAction("Runtime Mode (Forced)", OnRuntimeModeChanged, RuntimeModeStatus);
-            showDebugMenu.menu.AppendAction("Shader Validation (Forced)", OnShaderValidationChanged, ShaderValidationStatus);
-            showDebugMenu.menu.AppendSeparator();
-            showDebugMenu.menu.AppendAction("Refresh UI", OnRefreshUI, DropdownMenuAction.Status.Normal);
-            m_Toolbar.Add(showDebugMenu);
-
+            var helpDropDownButton = new VFXHelpDropdownButton(this, VFXViewWindow.currentWindow);
+            m_Toolbar.Add(helpDropDownButton);
             // End Toolbar
 
             m_NoAssetLabel = new Label("\n\n\nTo begin creating Visual Effects, create a new Visual Effect Graph Asset.\n(or double-click an existing Visual Effect Graph in the project view)") { name = "no-asset" };
@@ -571,7 +542,7 @@ public VFXView()
 
             Add(m_LockedElement);
             Add(m_Toolbar);
-            m_Toolbar.SetEnabled(false);
+            SetToolbarEnabled(false);
 
             RegisterCallback<DragUpdatedEvent>(OnDragUpdated);
             RegisterCallback<DragPerformEvent>(OnDragPerform);
@@ -590,6 +561,8 @@ public VFXView()
             RegisterCallback<GeometryChangedEvent>(OnFirstResize);
         }
 
+        internal bool GetIsRuntimeMode() => m_IsRuntimeMode;
+
         private void OnOpenAttachMenu()
         {
             var attachPanel = ScriptableObject.CreateInstance<VFXAttachPanel>();
@@ -598,45 +571,35 @@ private void OnOpenAttachMenu()
             attachPanel.ShowAsDropDown(bounds, attachPanel.WindowSize, new[] { PopupLocation.BelowAlignLeft });
         }
 
-        void OnRefreshUI(DropdownMenuAction action)
-        {
-            Resync();
-        }
-
-        void OnRuntimeModeChanged(DropdownMenuAction action)
+        internal void ToggleRuntimeMode()
         {
             m_IsRuntimeMode = !m_IsRuntimeMode;
             controller.graph.SetCompilationMode(m_IsRuntimeMode ? VFXCompilationMode.Runtime : VFXCompilationMode.Edition);
         }
 
-        DropdownMenuAction.Status RuntimeModeStatus(DropdownMenuAction action)
-        {
-            if (m_IsRuntimeMode)
-                return DropdownMenuAction.Status.Checked;
-            else
-                return DropdownMenuAction.Status.Normal;
-        }
+        internal bool GetShaderValidation() => m_ForceShaderValidation;
 
-        void OnShaderValidationChanged(DropdownMenuAction action)
+        internal void ToggleShaderValidationChanged()
         {
             m_ForceShaderValidation = !m_ForceShaderValidation;
             controller.graph.SetForceShaderValidation(m_ForceShaderValidation);
         }
 
-        DropdownMenuAction.Status ShaderValidationStatus(DropdownMenuAction action)
-        {
-            if (m_ForceShaderValidation)
-                return DropdownMenuAction.Status.Checked;
-            else
-                return DropdownMenuAction.Status.Normal;
-        }
-
         [NonSerialized]
         Dictionary<VFXModel, List<IconBadge>> m_InvalidateBadges = new Dictionary<VFXModel, List<IconBadge>>();
 
         [NonSerialized]
         List<IconBadge> m_CompileBadges = new List<IconBadge>();
 
+        private void SetToolbarEnabled(bool enabled)
+        {
+            m_Toolbar
+                .Children()
+                .Where(x => x is not VFXHelpDropdownButton)
+                .ToList()
+                .ForEach(x => x.SetEnabled(enabled));
+        }
+
         private void RegisterError(VFXModel model, VFXErrorOrigin errorOrigin, string error, VFXErrorType type, string description)
         {
             VisualElement target = null;
@@ -811,10 +774,12 @@ private void UpdateToolbarButtons()
             if (attachedComponent != null)
             {
                 m_AttachDropDownButton.AddToClassList("checked");
+                m_AttachDropDownButton.icon = m_LinkedIcon;
             }
             else
             {
                 m_AttachDropDownButton.RemoveFromClassList("checked");
+                m_AttachDropDownButton.icon = m_UnlinkedIcon;
             }
 
             m_LockToggle.tooltip = locked ? Contents.clickToUnlock.text : Contents.clickToLock.text;
@@ -841,6 +806,11 @@ void OnUndoPerformed()
             this.m_Blackboard.ForceUpdate();
         }
 
+        void OnBackToParent()
+        {
+            VFXViewWindow.currentWindow.PopResource();
+        }
+
         void OnToggleLock(ChangeEvent<bool> evt)
         {
             locked = !locked;
@@ -1038,7 +1008,7 @@ void NewControllerSet()
             if (controller != null)
             {
                 m_NoAssetLabel.RemoveFromHierarchy();
-                m_Toolbar.SetEnabled(true);
+                SetToolbarEnabled(true);
 
                 m_AttachDropDownButton.SetEnabled(this.controller.graph.visualEffectResource.subgraph == null);
                 m_LockToggle.SetEnabled(this.controller.graph.visualEffectResource.subgraph == null);
@@ -1059,7 +1029,7 @@ void NewControllerSet()
                 if (m_NoAssetLabel.parent == null)
                 {
                     Add(m_NoAssetLabel);
-                    m_Toolbar.SetEnabled(false);
+                    SetToolbarEnabled(false);
                 }
             }
         }
@@ -1524,17 +1494,12 @@ public void CreateTemplateSystem(string path, Vector2 tPos, VFXGroupNode groupNo
             }
         }
 
-        void OnToggleCompile(ChangeEvent<bool> e)
-        {
-            VFXViewWindow.currentWindow.autoCompile = !VFXViewWindow.currentWindow.autoCompile;
-        }
-
         void OnResyncMaterial()
         {
             controller.graph.Invalidate(VFXModel.InvalidationCause.kMaterialChanged);
         }
 
-        void OnCompile()
+        internal void Compile()
         {
             VFXLibrary.LogUnsupportedSRP();
 
@@ -1553,7 +1518,7 @@ void OnCompile()
             }
         }
 
-        void OnSave()
+        internal void OnSave()
         {
             m_ComponentBoard?.DeactivateBoundsRecordingIfNeeded(); //Avoids saving the graph with unnecessary bounds computations
 
@@ -1569,6 +1534,19 @@ void OnSave()
             }
         }
 
+        internal void SaveAs(string newPath)
+        {
+            m_ComponentBoard?.DeactivateBoundsRecordingIfNeeded(); //Avoids saving the graph with unnecessary bounds computations
+
+            var resource = controller.graph.visualEffectResource;
+
+            var oldFilePath = AssetDatabase.GetAssetPath(resource);
+            if (!AssetDatabase.CopyAsset(oldFilePath, newPath))
+            {
+                Debug.Log($"Could not save VFX Graph at {newPath}");
+            }
+        }
+
         void GetGraphsRecursively(VFXGraph start, HashSet<VFXGraph> graphs)
         {
             if (graphs.Contains(start))
@@ -1609,9 +1587,9 @@ void GetGraphsRecursively(VFXGraph start, HashSet<VFXGraph> graphs)
             }
         }
 
-        public EventPropagation Compile()
+        public EventPropagation OnCompile()
         {
-            OnCompile();
+            Compile();
 
             return EventPropagation.Stop;
         }
@@ -1623,31 +1601,6 @@ void AddVFXParameter(Vector2 pos, VFXParameterController parameterController, VF
             controller.AddVFXParameter(pos, parameterController, groupNode != null ? groupNode.controller : null);
         }
 
-        public EventPropagation Resync()
-        {
-            foreach (var node in rootNodes.Values)
-                node.RemoveFromHierarchy();
-
-            rootNodes.Clear();
-            foreach (var node in nodes.ToList())
-                node.RemoveFromHierarchy();
-
-            foreach (var edge in dataEdges.Values)
-                edge.RemoveFromHierarchy();
-            dataEdges.Clear();
-
-            foreach (var edge in flowEdges.Values)
-                edge.RemoveFromHierarchy();
-            flowEdges.Clear();
-
-            foreach (var edge in edges.ToList())
-                edge.RemoveFromHierarchy();
-
-            if (controller != null)
-                controller.ForceReload();
-            return EventPropagation.Stop;
-        }
-
         public EventPropagation OutputToDot()
         {
             if (controller == null) return EventPropagation.Stop;
@@ -1914,7 +1867,7 @@ public void UpdateGlobalSelection()
             }
         }
 
-        void SelectAsset()
+        internal void SelectAsset()
         {
             if (Selection.activeObject != controller.model)
             {
@@ -1923,7 +1876,7 @@ void SelectAsset()
             }
         }
 
-        void Checkout()
+        internal void Checkout()
         {
             Task task = Provider.Checkout(controller.model.visualEffectObject, CheckoutMode.Both);
             task.Wait();
@@ -2534,6 +2487,13 @@ public void UpdateSystems()
             }
         }
 
+        public void UpdateIsSubgraph()
+        {
+            m_BackButton.style.display = controller.graph.visualEffectResource.isSubgraph && VFXViewWindow.currentWindow.CanPopResource()
+                ? DisplayStyle.Flex
+                : DisplayStyle.None;
+        }
+
         void OnDragUpdated(DragUpdatedEvent e)
         {
             if (controller == null || !IsAssetEditable())
diff --git a/com.unity.visualeffectgraph/Editor/UIResources/VFX/compile.png b/com.unity.visualeffectgraph/Editor/UIResources/VFX/compile.png
new file mode 100644
index 00000000000..ad2609edded
Binary files /dev/null and b/com.unity.visualeffectgraph/Editor/UIResources/VFX/compile.png differ
diff --git a/com.unity.visualeffectgraph/Editor/UIResources/VFX/compile.png.meta b/com.unity.visualeffectgraph/Editor/UIResources/VFX/compile.png.meta
new file mode 100644
index 00000000000..9384bc206c9
--- /dev/null
+++ b/com.unity.visualeffectgraph/Editor/UIResources/VFX/compile.png.meta
@@ -0,0 +1,98 @@
+fileFormatVersion: 2
+guid: b85cbd2821b0b4e4faca01ed6a1d7e2b
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/com.unity.visualeffectgraph/Editor/UIResources/VFX/compile@2x.png b/com.unity.visualeffectgraph/Editor/UIResources/VFX/compile@2x.png
new file mode 100644
index 00000000000..43801f2c3cf
Binary files /dev/null and b/com.unity.visualeffectgraph/Editor/UIResources/VFX/compile@2x.png differ
diff --git a/com.unity.visualeffectgraph/Editor/UIResources/VFX/compile@2x.png.meta b/com.unity.visualeffectgraph/Editor/UIResources/VFX/compile@2x.png.meta
new file mode 100644
index 00000000000..441e4720761
--- /dev/null
+++ b/com.unity.visualeffectgraph/Editor/UIResources/VFX/compile@2x.png.meta
@@ -0,0 +1,98 @@
+fileFormatVersion: 2
+guid: 354d03c57011c6940b051ed7112c471e
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/com.unity.visualeffectgraph/Editor/UIResources/VFX/controls.png b/com.unity.visualeffectgraph/Editor/UIResources/VFX/controls.png
new file mode 100644
index 00000000000..5903d5128c9
Binary files /dev/null and b/com.unity.visualeffectgraph/Editor/UIResources/VFX/controls.png differ
diff --git a/com.unity.visualeffectgraph/Editor/UIResources/VFX/controls.png.meta b/com.unity.visualeffectgraph/Editor/UIResources/VFX/controls.png.meta
new file mode 100644
index 00000000000..92101bdf35b
--- /dev/null
+++ b/com.unity.visualeffectgraph/Editor/UIResources/VFX/controls.png.meta
@@ -0,0 +1,98 @@
+fileFormatVersion: 2
+guid: 31c4bf8455a0ca140b48eb02e2786660
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/com.unity.visualeffectgraph/Editor/UIResources/VFX/controls@2x.png b/com.unity.visualeffectgraph/Editor/UIResources/VFX/controls@2x.png
new file mode 100644
index 00000000000..57543333b4a
Binary files /dev/null and b/com.unity.visualeffectgraph/Editor/UIResources/VFX/controls@2x.png differ
diff --git a/com.unity.visualeffectgraph/Editor/UIResources/VFX/controls@2x.png.meta b/com.unity.visualeffectgraph/Editor/UIResources/VFX/controls@2x.png.meta
new file mode 100644
index 00000000000..8491222d479
--- /dev/null
+++ b/com.unity.visualeffectgraph/Editor/UIResources/VFX/controls@2x.png.meta
@@ -0,0 +1,98 @@
+fileFormatVersion: 2
+guid: 685a04a898e871240a54696825b3cac3
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/com.unity.visualeffectgraph/Editor/UIResources/VFX/d_compile.png b/com.unity.visualeffectgraph/Editor/UIResources/VFX/d_compile.png
new file mode 100644
index 00000000000..e46eb129fd2
Binary files /dev/null and b/com.unity.visualeffectgraph/Editor/UIResources/VFX/d_compile.png differ
diff --git a/com.unity.visualeffectgraph/Editor/UIResources/VFX/d_compile.png.meta b/com.unity.visualeffectgraph/Editor/UIResources/VFX/d_compile.png.meta
new file mode 100644
index 00000000000..c2b295e7f12
--- /dev/null
+++ b/com.unity.visualeffectgraph/Editor/UIResources/VFX/d_compile.png.meta
@@ -0,0 +1,98 @@
+fileFormatVersion: 2
+guid: b82875323935ce448a2dac7858857072
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/com.unity.visualeffectgraph/Editor/UIResources/VFX/d_compile@2x.png b/com.unity.visualeffectgraph/Editor/UIResources/VFX/d_compile@2x.png
new file mode 100644
index 00000000000..1a25b3da9fd
Binary files /dev/null and b/com.unity.visualeffectgraph/Editor/UIResources/VFX/d_compile@2x.png differ
diff --git a/com.unity.visualeffectgraph/Editor/UIResources/VFX/d_compile@2x.png.meta b/com.unity.visualeffectgraph/Editor/UIResources/VFX/d_compile@2x.png.meta
new file mode 100644
index 00000000000..5575b88317c
--- /dev/null
+++ b/com.unity.visualeffectgraph/Editor/UIResources/VFX/d_compile@2x.png.meta
@@ -0,0 +1,98 @@
+fileFormatVersion: 2
+guid: 851a1e412cfa7be4d8f3f96f24018d6a
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/com.unity.visualeffectgraph/Editor/UIResources/VFX/d_controls.png b/com.unity.visualeffectgraph/Editor/UIResources/VFX/d_controls.png
new file mode 100644
index 00000000000..02189b580cf
Binary files /dev/null and b/com.unity.visualeffectgraph/Editor/UIResources/VFX/d_controls.png differ
diff --git a/com.unity.visualeffectgraph/Editor/UIResources/VFX/d_controls.png.meta b/com.unity.visualeffectgraph/Editor/UIResources/VFX/d_controls.png.meta
new file mode 100644
index 00000000000..442376099d3
--- /dev/null
+++ b/com.unity.visualeffectgraph/Editor/UIResources/VFX/d_controls.png.meta
@@ -0,0 +1,98 @@
+fileFormatVersion: 2
+guid: edd2bcbfdf29c804ab00c6772315a4e2
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/com.unity.visualeffectgraph/Editor/UIResources/VFX/d_controls@2x.png b/com.unity.visualeffectgraph/Editor/UIResources/VFX/d_controls@2x.png
new file mode 100644
index 00000000000..ea2d78b249a
Binary files /dev/null and b/com.unity.visualeffectgraph/Editor/UIResources/VFX/d_controls@2x.png differ
diff --git a/com.unity.visualeffectgraph/Editor/UIResources/VFX/d_controls@2x.png.meta b/com.unity.visualeffectgraph/Editor/UIResources/VFX/d_controls@2x.png.meta
new file mode 100644
index 00000000000..78d5a1ab7d4
--- /dev/null
+++ b/com.unity.visualeffectgraph/Editor/UIResources/VFX/d_controls@2x.png.meta
@@ -0,0 +1,98 @@
+fileFormatVersion: 2
+guid: 6688a50f01abcae4e8fac37d5e7f17f3
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/com.unity.visualeffectgraph/Editor/UIResources/VFX/d_variableswindow.png b/com.unity.visualeffectgraph/Editor/UIResources/VFX/d_variableswindow.png
new file mode 100644
index 00000000000..9c2f936a21c
Binary files /dev/null and b/com.unity.visualeffectgraph/Editor/UIResources/VFX/d_variableswindow.png differ
diff --git a/com.unity.visualeffectgraph/Editor/UIResources/VFX/d_variableswindow.png.meta b/com.unity.visualeffectgraph/Editor/UIResources/VFX/d_variableswindow.png.meta
new file mode 100644
index 00000000000..3fd034b2a36
--- /dev/null
+++ b/com.unity.visualeffectgraph/Editor/UIResources/VFX/d_variableswindow.png.meta
@@ -0,0 +1,98 @@
+fileFormatVersion: 2
+guid: 3dcb0b8201ccba04dab8253ff1120c9e
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/com.unity.visualeffectgraph/Editor/UIResources/VFX/d_variableswindow@2x.png b/com.unity.visualeffectgraph/Editor/UIResources/VFX/d_variableswindow@2x.png
new file mode 100644
index 00000000000..74ab077d647
Binary files /dev/null and b/com.unity.visualeffectgraph/Editor/UIResources/VFX/d_variableswindow@2x.png differ
diff --git a/com.unity.visualeffectgraph/Editor/UIResources/VFX/d_variableswindow@2x.png.meta b/com.unity.visualeffectgraph/Editor/UIResources/VFX/d_variableswindow@2x.png.meta
new file mode 100644
index 00000000000..73ae3197e37
--- /dev/null
+++ b/com.unity.visualeffectgraph/Editor/UIResources/VFX/d_variableswindow@2x.png.meta
@@ -0,0 +1,98 @@
+fileFormatVersion: 2
+guid: c2e4d889eb8c8ad47ac43a458b0de328
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/com.unity.visualeffectgraph/Editor/UIResources/VFX/variableswindow.png b/com.unity.visualeffectgraph/Editor/UIResources/VFX/variableswindow.png
new file mode 100644
index 00000000000..5ec8eda58d5
Binary files /dev/null and b/com.unity.visualeffectgraph/Editor/UIResources/VFX/variableswindow.png differ
diff --git a/com.unity.visualeffectgraph/Editor/UIResources/VFX/variableswindow.png.meta b/com.unity.visualeffectgraph/Editor/UIResources/VFX/variableswindow.png.meta
new file mode 100644
index 00000000000..f32b6816524
--- /dev/null
+++ b/com.unity.visualeffectgraph/Editor/UIResources/VFX/variableswindow.png.meta
@@ -0,0 +1,98 @@
+fileFormatVersion: 2
+guid: 43c65c4df0bf6ff4f93a010c9e7cf7b3
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/com.unity.visualeffectgraph/Editor/UIResources/VFX/variableswindow@2x.png b/com.unity.visualeffectgraph/Editor/UIResources/VFX/variableswindow@2x.png
new file mode 100644
index 00000000000..9ac3ac234d1
Binary files /dev/null and b/com.unity.visualeffectgraph/Editor/UIResources/VFX/variableswindow@2x.png differ
diff --git a/com.unity.visualeffectgraph/Editor/UIResources/VFX/variableswindow@2x.png.meta b/com.unity.visualeffectgraph/Editor/UIResources/VFX/variableswindow@2x.png.meta
new file mode 100644
index 00000000000..9a9434074a0
--- /dev/null
+++ b/com.unity.visualeffectgraph/Editor/UIResources/VFX/variableswindow@2x.png.meta
@@ -0,0 +1,98 @@
+fileFormatVersion: 2
+guid: d860cd8d626229d448d2e4979fdd6a1c
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/com.unity.visualeffectgraph/Editor/UIResources/uss/VFXComponentBoard.uss b/com.unity.visualeffectgraph/Editor/UIResources/uss/VFXComponentBoard.uss
index 4ffbc70aed2..0deaf117d27 100644
--- a/com.unity.visualeffectgraph/Editor/UIResources/uss/VFXComponentBoard.uss
+++ b/com.unity.visualeffectgraph/Editor/UIResources/uss/VFXComponentBoard.uss
@@ -346,6 +346,8 @@ VFXComponentBoardEventUI #event-name
     height: 16px;
     flex-grow: 1;
     -unity-text-align: lower-left;
+    margin-right: 4px;
+    overflow: hidden;
 }
 
 #subTitle-icon
diff --git a/com.unity.visualeffectgraph/Editor/UIResources/uss/VFXToolbar.uss b/com.unity.visualeffectgraph/Editor/UIResources/uss/VFXToolbar.uss
new file mode 100644
index 00000000000..3dc73fb5966
--- /dev/null
+++ b/com.unity.visualeffectgraph/Editor/UIResources/uss/VFXToolbar.uss
@@ -0,0 +1,115 @@
+.dropdown-button, .dropdown-arrow
+{
+    margin: 0 0 0 0;
+    border-width: 0 0 0 1px;
+    border-radius: 0;
+}
+
+.dropdown-button
+{
+    margin-right: 1px;
+    flex-direction: row !important;
+}
+
+.dropdown-arrow
+{
+    width: 16px;
+    border-width: 0 1px 0 0;
+}
+
+.dropdown-separator
+{
+    height: 10px;
+    width: 2px;
+    border-left-width: 1px;
+    border-color: var(--unity-colors-default-border);
+    opacity: 0.5;
+    align-self: center;
+}
+
+.dropdown-arrow > VisualElement
+{
+    width: 15px;
+    height: 16px;
+    align-self: center;
+    background-image: var(--unity-icons-dropdown);
+}
+
+.separator
+{
+    width: 6px;
+}
+
+.popup
+{
+    padding-top: 0px;
+    border-width: 1px;
+    border-color: var(--unity-colors-dropdown-border);
+}
+
+.indented
+{
+    padding-left: 16px;
+}
+
+.category
+{
+    margin-left: 4px;
+    margin-top: 0px;
+}
+
+.link
+{
+    align-self: Flex-Start;
+    color: var(--unity-colors-link-text);
+    border-width: 0;
+    background-color: transparent;
+    cursor: Link;
+    padding-right: 0;
+}
+
+.link:focus
+{
+    -unity-font-style: bold;
+    border-bottom-width: 1px;
+    border-radius: 0px;
+    border-color: var(--unity-colors-link-text);
+}
+
+Box.section
+{
+    padding: 8px 0px 8px 0px;
+}
+
+Box.alternate
+{
+    background-color: var(--unity-colors-alternated_rows-background);
+}
+
+Button
+{
+    border-width: 0;
+    border-radius: 0;
+    background-color: transparent;
+    -unity-text-align: middle-left;
+}
+
+Button:hover, Toggle:hover
+{
+    background-color: var(--unity-colors-highlight-background);
+}
+
+Button:disabled
+{
+    opacity: 0.5;
+}
+
+Toggle Label
+{
+    margin-left: 4px;
+}
+
+#resyncMaterial
+{
+    display: none;
+}
diff --git a/com.unity.visualeffectgraph/Editor/UIResources/uss/VFXToolbar.uss.meta b/com.unity.visualeffectgraph/Editor/UIResources/uss/VFXToolbar.uss.meta
new file mode 100644
index 00000000000..d269b5ff06a
--- /dev/null
+++ b/com.unity.visualeffectgraph/Editor/UIResources/uss/VFXToolbar.uss.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 7156bb86f40b1a043ae6dcc6e1411dd6
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0}
+  disableValidation: 0
diff --git a/com.unity.visualeffectgraph/Editor/UIResources/uss/VFXView.uss b/com.unity.visualeffectgraph/Editor/UIResources/uss/VFXView.uss
index a11b3a0de07..2363ae619d5 100644
--- a/com.unity.visualeffectgraph/Editor/UIResources/uss/VFXView.uss
+++ b/com.unity.visualeffectgraph/Editor/UIResources/uss/VFXView.uss
@@ -31,14 +31,45 @@ VFXView #no-asset *
     margin-top:128px;
 }
 
+ToolbarToggle
+{
+    border-right-width: 0px;
+}
+
+EditorToolbarDropdown
+{
+    flex-direction: Row;
+}
+
+EditorToolbarDropdown:disabled, ToolbarToggle:disabled
+{
+    opacity: 0.5;
+}
+
+#BackButton
+{
+    padding-top: 3px;
+    border-width: 0;
+    border-radius: 0;
+    background-color: transparent;
+    display: none;
+}
+
+#BackButton:hover
+{
+    background-color: var(--unity-colors-app_toolbar_button-background-hover);
+}
+
 #lock-auto-attach
 {
-    width: 16px;
+    width: 20px;
     height: 17px; /* Don't know why the real height is one pixel less than specified here */
     padding:1px 0 4px 0;
     align-self: center;
     border-left-width: 0;
+    border-right-width: 1px;
     background-image: var(--unity-icons-lock);
+    -unity-background-scale-mode: scale-to-fit;
 }
 
 #lock-auto-attach:checked
@@ -49,6 +80,7 @@ VFXView #no-asset *
 
 #attach-toolbar-button
 {
+    margin-left: 6px;
     border-right-width: 0;
 }
 
diff --git a/com.unity.visualeffectgraph/Editor/UIResources/uxml/VFXCompileDropdownPanel.uxml b/com.unity.visualeffectgraph/Editor/UIResources/uxml/VFXCompileDropdownPanel.uxml
new file mode 100644
index 00000000000..ea7692d99a7
--- /dev/null
+++ b/com.unity.visualeffectgraph/Editor/UIResources/uxml/VFXCompileDropdownPanel.uxml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<UXML xmlns:ui="UnityEngine.UIElements">
+    <ui:Box>
+        <ui:Toggle name="autoCompile" text="Auto Compile" tooltip="Toggles auto-compilation" style="margin-top:4px" />
+    </ui:Box>
+    <ui:Box class="alternate">
+        <ui:Toggle name="runtimeMode" text="Runtime Mode" tooltip="Forces optimized compilation" />
+    </ui:Box>
+    <ui:Box>
+        <ui:Toggle name="shaderValidation" text="Shader Validation" tooltip="Performs a forced Shader compilation when the effect recompiles" />
+    </ui:Box>
+    <ui:Box class="alternate">
+        <ui:Button name="resyncMaterial" text="Resync Material" tooltip="Forces VFX to synchronize the underlying internal VFX material of the system with the generated shader" />
+    </ui:Box>
+</UXML>
diff --git a/com.unity.visualeffectgraph/Editor/UIResources/uxml/VFXCompileDropdownPanel.uxml.meta b/com.unity.visualeffectgraph/Editor/UIResources/uxml/VFXCompileDropdownPanel.uxml.meta
new file mode 100644
index 00000000000..75dab1da17c
--- /dev/null
+++ b/com.unity.visualeffectgraph/Editor/UIResources/uxml/VFXCompileDropdownPanel.uxml.meta
@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 1a2b3e6920786264e9677aae244b25bd
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 13804, guid: 0000000000000000e000000000000000, type: 0}
diff --git a/com.unity.visualeffectgraph/Editor/UIResources/uxml/VFXHelpDropdownPanel.uxml b/com.unity.visualeffectgraph/Editor/UIResources/uxml/VFXHelpDropdownPanel.uxml
new file mode 100644
index 00000000000..f7aa02853fb
--- /dev/null
+++ b/com.unity.visualeffectgraph/Editor/UIResources/uxml/VFXHelpDropdownPanel.uxml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<UXML xmlns:ui="UnityEngine.UIElements">
+    <ui:Box class="section">
+        <ui:Label text="Install Additional Samples" class="category" />
+        <ui:Button name="installSamples" text="VFX Graph Additions" tooltip="Installs pre built VFX examples" class="indented" />
+        <ui:Button name="graphAddition" text="Output Event Helpers" tooltip="Installs helper scripts to add behaviors on VFX events" class="indented" />
+    </ui:Box>
+    <ui:Box class="section alternate">
+        <ui:Label text="Documentation" class="category" />
+        <ui:Button name="gotoHome" text="VFX Graph Home" tooltip="Open Visual Effect Graph home page" class="indented link" />
+        <ui:Button name="gotoForum" text="Forum" tooltip="Open Visual Effect Graph sub-forum" class="indented link" />
+    </ui:Box>
+    <ui:Box class="section">
+        <ui:Label text="Examples and Resources" class="category" />
+        <ui:Button name="gotoSpaceShip" text="[Github] Spaceship Demo" tooltip="Open Spaceship Demo repository" class="indented link" />
+        <ui:Button name="gotoSamples" text="[Github] VFX Graph Samples" tooltip="Open VFX Graph Samples repository" class="indented link" />
+    </ui:Box>
+</UXML>
diff --git a/com.unity.visualeffectgraph/Editor/UIResources/uxml/VFXHelpDropdownPanel.uxml.meta b/com.unity.visualeffectgraph/Editor/UIResources/uxml/VFXHelpDropdownPanel.uxml.meta
new file mode 100644
index 00000000000..8125f254a1c
--- /dev/null
+++ b/com.unity.visualeffectgraph/Editor/UIResources/uxml/VFXHelpDropdownPanel.uxml.meta
@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: f27809e9d0dfa32419c046d9512b246f
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 13804, guid: 0000000000000000e000000000000000, type: 0}
diff --git a/com.unity.visualeffectgraph/Editor/UIResources/uxml/VFXSaveDropDownPanel.uxml b/com.unity.visualeffectgraph/Editor/UIResources/uxml/VFXSaveDropDownPanel.uxml
new file mode 100644
index 00000000000..ef801fde157
--- /dev/null
+++ b/com.unity.visualeffectgraph/Editor/UIResources/uxml/VFXSaveDropDownPanel.uxml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<UXML xmlns:ui="UnityEngine.UIElements">
+    <ui:Button name="saveAs" text="Save as..." tooltip="Save as..." style="margin-top:8px" />
+    <ui:Button name="checkout" text="Checkout" tooltip="Transfers file to the workspacetem" />
+    <ui:Button name="showInInspector" text="Show in Inspector" tooltip="Shows currently opened VFX asset in the Inspector" />
+</UXML>
diff --git a/com.unity.visualeffectgraph/Editor/UIResources/uxml/VFXSaveDropDownPanel.uxml.meta b/com.unity.visualeffectgraph/Editor/UIResources/uxml/VFXSaveDropDownPanel.uxml.meta
new file mode 100644
index 00000000000..d6952e93587
--- /dev/null
+++ b/com.unity.visualeffectgraph/Editor/UIResources/uxml/VFXSaveDropDownPanel.uxml.meta
@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 0814b736f6db6f34a8ab8798b3dfce66
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 13804, guid: 0000000000000000e000000000000000, type: 0}