diff --git a/Basic/DistributedAuthoritySocialHub/Assets/Prefabs/UI/IngameUI.prefab b/Basic/DistributedAuthoritySocialHub/Assets/Prefabs/UI/IngameUI.prefab
index ba90c20d2..be052a596 100644
--- a/Basic/DistributedAuthoritySocialHub/Assets/Prefabs/UI/IngameUI.prefab
+++ b/Basic/DistributedAuthoritySocialHub/Assets/Prefabs/UI/IngameUI.prefab
@@ -11,6 +11,7 @@ GameObject:
   - component: {fileID: 8260601768609746557}
   - component: {fileID: 2624134516453966882}
   - component: {fileID: 7977430163742817466}
+  - component: {fileID: 6103793809426782772}
   m_Layer: 0
   m_Name: WorldspaceUIContainer
   m_TagString: Untagged
@@ -96,6 +97,20 @@ UIRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
+--- !u!114 &6103793809426782772
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3209112381140291289}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: c3f1e8062945c4f4d846b5dd47a10b49, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Stylesheet:
+  - {fileID: 7433441132597879392, guid: ea9efe379dfd4506ad59f7fe609e1c85, type: 3}
 --- !u!1 &3760817242580890973
 GameObject:
   m_ObjectHideFlags: 0
@@ -227,8 +242,8 @@ Transform:
   - {fileID: 2256034313796960807}
   - {fileID: 7559383771208540613}
   - {fileID: 8481058004063830698}
-  - {fileID: 6866794867799222920}
   - {fileID: 7817311818480281289}
+  - {fileID: 6866794867799222920}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &5231826839060252271
@@ -241,6 +256,7 @@ GameObject:
   m_Component:
   - component: {fileID: 3336661237540986728}
   - component: {fileID: 436460152536684898}
+  - component: {fileID: 7317808533901021140}
   m_Layer: 0
   m_Name: ScreenspaceUIContainer
   m_TagString: Untagged
@@ -282,6 +298,20 @@ MonoBehaviour:
   m_WorldSpaceSizeMode: 1
   m_WorldSpaceWidth: 1920
   m_WorldSpaceHeight: 1080
+--- !u!114 &7317808533901021140
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5231826839060252271}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: c3f1e8062945c4f4d846b5dd47a10b49, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Stylesheet:
+  - {fileID: 7433441132597879392, guid: ea9efe379dfd4506ad59f7fe609e1c85, type: 3}
 --- !u!1 &6990578997068127384
 GameObject:
   m_ObjectHideFlags: 0
@@ -339,7 +369,6 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 7817311818480281289}
-  - component: {fileID: 2936985890301440173}
   - component: {fileID: 6707317209091797481}
   m_Layer: 0
   m_Name: TouchUI
@@ -363,25 +392,6 @@ Transform:
   m_Children: []
   m_Father: {fileID: 8617889547341104717}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &2936985890301440173
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7432143492640579472}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 19102, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_PanelSettings: {fileID: 11400000, guid: f87c14ce92c804cf2a078e05e3ee2019, type: 2}
-  m_ParentUI: {fileID: 0}
-  sourceAsset: {fileID: 9197481963319205126, guid: ccd45339dc8ff154fbbe578856089eaf, type: 3}
-  m_SortingOrder: 0
-  m_WorldSpaceSizeMode: 1
-  m_WorldSpaceWidth: 1920
-  m_WorldSpaceHeight: 1080
 --- !u!114 &6707317209091797481
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -394,6 +404,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 6d7e4e4868ed5df4b928c22423c690a0, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  m_Document: {fileID: 436460152536684898}
+  m_TouchscreenUI: {fileID: 9197481963319205126, guid: ccd45339dc8ff154fbbe578856089eaf, type: 3}
 --- !u!1 &7898239706649082948
 GameObject:
   m_ObjectHideFlags: 0
diff --git a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/MainMenu.unity b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/MainMenu.unity
index c6fe04f46..b173e31de 100644
--- a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/MainMenu.unity
+++ b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/MainMenu.unity
@@ -343,6 +343,7 @@ GameObject:
   - component: {fileID: 378839173}
   - component: {fileID: 378839172}
   - component: {fileID: 378839174}
+  - component: {fileID: 378839175}
   m_Layer: 0
   m_Name: MainMenuUI
   m_TagString: Untagged
@@ -399,6 +400,20 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   IsModal: 0
   m_HomeView: {fileID: 2105351336}
+--- !u!114 &378839175
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 378839171}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: c3f1e8062945c4f4d846b5dd47a10b49, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Stylesheet:
+  - {fileID: 7433441132597879392, guid: ea9efe379dfd4506ad59f7fe609e1c85, type: 3}
 --- !u!1 &1088131142
 GameObject:
   m_ObjectHideFlags: 0
diff --git a/Basic/DistributedAuthoritySocialHub/Assets/Scripts/GameManagement/GameplayEventHandler.cs b/Basic/DistributedAuthoritySocialHub/Assets/Scripts/GameManagement/GameplayEventHandler.cs
index e7a2989b7..b682101bd 100644
--- a/Basic/DistributedAuthoritySocialHub/Assets/Scripts/GameManagement/GameplayEventHandler.cs
+++ b/Basic/DistributedAuthoritySocialHub/Assets/Scripts/GameManagement/GameplayEventHandler.cs
@@ -2,6 +2,7 @@
 using System;
 using System.Threading.Tasks;
 using Unity.Services.Vivox;
+using UnityEngine;
 using UnityEngine.SceneManagement;
 
 namespace Unity.Multiplayer.Samples.SocialHub.GameManagement
@@ -21,6 +22,8 @@ static class GameplayEventHandler
         internal static event Action<VivoxParticipant> OnParticipantJoinedVoiceChat;
         internal static event Action<VivoxParticipant> OnParticipantLeftVoiceChat;
 
+        internal static event Action<PickupState, Transform> OnPickupStateChanged;
+
         internal static void NetworkObjectDespawned(NetworkObject networkObject)
         {
             OnNetworkObjectDespawned?.Invoke(networkObject);
@@ -90,5 +93,17 @@ public static void ParticipantLeftVoiceChat(VivoxParticipant vivoxParticipant)
         {
             OnParticipantLeftVoiceChat?.Invoke(vivoxParticipant);
         }
+
+        internal static void SetAvatarPickupState(PickupState state, Transform pickup)
+        {
+            OnPickupStateChanged?.Invoke(state, pickup);
+        }
+    }
+
+    internal enum PickupState
+    {
+        Inactive,
+        PickupInRange,
+        Carry
     }
 }
diff --git a/Basic/DistributedAuthoritySocialHub/Assets/Scripts/Player/AvatarInteractions.cs b/Basic/DistributedAuthoritySocialHub/Assets/Scripts/Player/AvatarInteractions.cs
index 1f32650de..9f5b3a87e 100644
--- a/Basic/DistributedAuthoritySocialHub/Assets/Scripts/Player/AvatarInteractions.cs
+++ b/Basic/DistributedAuthoritySocialHub/Assets/Scripts/Player/AvatarInteractions.cs
@@ -49,10 +49,6 @@ class AvatarInteractions : NetworkBehaviour, INetworkUpdateSystem
 
         TransferableObject m_TransferableObject;
 
-        PickUpIndicator m_PickUpIndicator;
-
-        CarryBoxIndicator m_CarryBoxIndicator;
-
         const float k_MinDurationHeld = 0f;
         const float k_MaxDurationHeld = 2f;
 
@@ -92,9 +88,6 @@ public override void OnNetworkSpawn()
 
             this.RegisterNetworkUpdate(updateStage: NetworkUpdateStage.FixedUpdate);
 
-            m_PickUpIndicator = FindFirstObjectByType<PickUpIndicator>();
-            m_CarryBoxIndicator = FindFirstObjectByType<CarryBoxIndicator>();
-
             GameInput.Actions.Player.Interact.performed += OnInteractPerformed;
             GameInput.Actions.Player.Interact.canceled += OnInteractCanceled;
 
@@ -284,8 +277,7 @@ void StartPickup(TransferableObject other)
             // Rotate the player to face the item smoothly
             StartCoroutine(SmoothLookAt(other.transform));
             m_AvatarNetworkAnimator.SetTrigger(k_PickupId);
-            m_PickUpIndicator.ClearPickup();
-            m_CarryBoxIndicator.ShowCarry(m_TransferableObject.transform);
+            GameplayEventHandler.SetAvatarPickupState(PickupState.Carry, m_TransferableObject.transform);
         }
 
         IEnumerator SmoothLookAt(Transform target)
@@ -383,7 +375,7 @@ void DropAction()
             SetTransferableObjectAsTransferableDistributable();
             OnDropAction();
             m_CurrentTransferableObject.Value = new NetworkBehaviourReference();
-            m_CarryBoxIndicator.HideCarry();
+            GameplayEventHandler.SetAvatarPickupState(PickupState.Inactive, null);
         }
 
         // invoked on all clients
@@ -419,7 +411,7 @@ void ThrowAction(double holdDuration)
 
             OnThrowAction();
             m_CurrentTransferableObject.Value = new NetworkBehaviourReference();
-            m_CarryBoxIndicator.HideCarry();
+            GameplayEventHandler.SetAvatarPickupState(PickupState.Inactive, null);
         }
 
         // invoked on all clients
@@ -493,13 +485,12 @@ void CheckForPickupsInRange()
                         m_PotentialPickupCollider = resultCollider;
                     }
                 }
-
-                m_PickUpIndicator.ShowPickup(m_PotentialPickupCollider.transform);
+                GameplayEventHandler.SetAvatarPickupState(PickupState.PickupInRange, m_PotentialPickupCollider.transform);
             }
             else
             {
                 m_PotentialPickupCollider = null;
-                m_PickUpIndicator.ClearPickup();
+                GameplayEventHandler.SetAvatarPickupState(PickupState.Inactive, null);
             }
         }
 
diff --git a/Basic/DistributedAuthoritySocialHub/Assets/Scripts/Services/VivoxManager.cs b/Basic/DistributedAuthoritySocialHub/Assets/Scripts/Services/VivoxManager.cs
index b0da11109..f432a9f00 100644
--- a/Basic/DistributedAuthoritySocialHub/Assets/Scripts/Services/VivoxManager.cs
+++ b/Basic/DistributedAuthoritySocialHub/Assets/Scripts/Services/VivoxManager.cs
@@ -12,11 +12,16 @@ namespace Unity.Multiplayer.Samples.SocialHub.Services
 {
     class VivoxManager : MonoBehaviour
     {
+        const int k_AudibleDistance = 20;
+        const int k_ConventionalDistance = 1;
+        const float k_AudioFadeByDistance = 1f;
+
         string m_TextChannelName;
         string m_VoiceChannelName;
 
 #if UNITY_STANDALONE_OSX || UNITY_IOS
         bool m_MicPermissionChecked;
+
 #endif
 
         internal static VivoxManager Instance { get; private set; }
@@ -76,7 +81,7 @@ async void OnLoggedInVivox()
 
         async Task JoinChannels()
         {
-            var positionalChannelProperties = new Channel3DProperties(10, 1, 1f, AudioFadeModel.InverseByDistance);
+            var positionalChannelProperties = new Channel3DProperties(k_AudibleDistance, k_ConventionalDistance, k_AudioFadeByDistance, AudioFadeModel.InverseByDistance);
             BindChannelEvents(true);
             await VivoxService.Instance.JoinPositionalChannelAsync(m_VoiceChannelName, ChatCapability.AudioOnly, positionalChannelProperties);
             await VivoxService.Instance.JoinGroupChannelAsync(m_TextChannelName, ChatCapability.TextOnly);
diff --git a/Basic/DistributedAuthoritySocialHub/Assets/Scripts/UI/IngameUI/CarryBoxIndicator.cs b/Basic/DistributedAuthoritySocialHub/Assets/Scripts/UI/IngameUI/CarryBoxIndicator.cs
index 76c35f71d..a744601d4 100644
--- a/Basic/DistributedAuthoritySocialHub/Assets/Scripts/UI/IngameUI/CarryBoxIndicator.cs
+++ b/Basic/DistributedAuthoritySocialHub/Assets/Scripts/UI/IngameUI/CarryBoxIndicator.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections;
+using Unity.Multiplayer.Samples.SocialHub.GameManagement;
 using UnityEngine;
 using UnityEngine.UIElements;
 
@@ -42,9 +43,21 @@ void OnEnable()
             m_CarryUI.Q<Label>("call-to-action").text = "tap - drop \nhold - throw";
             m_CarryUI.AddToClassList("carrybox");
             m_CarryUI.AddToClassList(UIUtils.s_InactiveUSSClass);
+
+            GameplayEventHandler.OnPickupStateChanged += OnPickupStateChanged;
         }
 
-        internal void ShowCarry(Transform t)
+        void OnPickupStateChanged(PickupState state, Transform pickupTransform)
+        {
+            if (state == PickupState.Carry)
+            {
+                ShowCarry(pickupTransform);
+                return;
+            }
+            HideCarry();
+        }
+
+        void ShowCarry(Transform t)
         {
             if (m_IsShown)
                 return;
@@ -57,7 +70,7 @@ internal void ShowCarry(Transform t)
             m_IsShown = true;
         }
 
-        internal void HideCarry()
+        void HideCarry()
         {
             if(m_IsShown == false)
                 return;
@@ -84,5 +97,10 @@ void Update()
             var mappedScale = Mathf.Lerp(m_PanelMaxSize, m_PanelMinSize, Mathf.InverseLerp(5, 20, distance));
             m_CarryUI.style.scale = new StyleScale(new Vector2(mappedScale, mappedScale));
         }
+
+        void OnDisable()
+        {
+            GameplayEventHandler.OnPickupStateChanged -= OnPickupStateChanged;
+        }
     }
 }
diff --git a/Basic/DistributedAuthoritySocialHub/Assets/Scripts/UI/IngameUI/IngameMenu.cs b/Basic/DistributedAuthoritySocialHub/Assets/Scripts/UI/IngameUI/IngameMenu.cs
index 718e3c02e..bb4250efa 100644
--- a/Basic/DistributedAuthoritySocialHub/Assets/Scripts/UI/IngameUI/IngameMenu.cs
+++ b/Basic/DistributedAuthoritySocialHub/Assets/Scripts/UI/IngameUI/IngameMenu.cs
@@ -21,7 +21,7 @@ class IngameMenu : MonoBehaviour
 
         VisualElement m_Root;
         VisualElement m_Menu;
-        VisualElement m_SceenOverlay;
+        VisualElement m_ScreenOverlay;
 
         Button m_BurgerButton;
         Button m_ExitButton;
@@ -41,7 +41,7 @@ void OnEnable()
             m_Root = m_UIDocument.rootVisualElement.Q<VisualElement>("ingame-menu-container");
             m_Root.Add(m_IngameMenuAsset.CloneTree().GetFirstChild());
 
-            m_SceenOverlay = m_Root.Q<VisualElement>("sceen-overlay");
+            m_ScreenOverlay = m_Root.Q<VisualElement>("screen-overlay");
 
             m_BurgerButton = m_Root.Q<Button>("burger-button");
             m_BurgerButton.clicked += ShowMenu;
@@ -117,14 +117,14 @@ void ShowMenu()
             InputSystemManager.Instance.EnableUIInputs();
             m_Menu.RemoveFromClassList(UIUtils.s_InactiveUSSClass);
             m_Menu.AddToClassList(UIUtils.s_ActiveUSSClass);
-            m_SceenOverlay.style.display = DisplayStyle.Flex;
+            m_ScreenOverlay.style.display = DisplayStyle.Flex;
             m_Menu.SetEnabled(true);
         }
 
         void HideMenu()
         {
             InputSystemManager.Instance.EnableGameplayInputs();
-            m_SceenOverlay.style.display = DisplayStyle.None;
+            m_ScreenOverlay.style.display = DisplayStyle.None;
             m_Menu.RemoveFromClassList(UIUtils.s_ActiveUSSClass);
             m_Menu.AddToClassList(UIUtils.s_InactiveUSSClass);
             m_Menu.SetEnabled(false);
diff --git a/Basic/DistributedAuthoritySocialHub/Assets/Scripts/UI/IngameUI/MobileStylesheetAdder.cs b/Basic/DistributedAuthoritySocialHub/Assets/Scripts/UI/IngameUI/MobileStylesheetAdder.cs
new file mode 100644
index 000000000..5a97cf65d
--- /dev/null
+++ b/Basic/DistributedAuthoritySocialHub/Assets/Scripts/UI/IngameUI/MobileStylesheetAdder.cs
@@ -0,0 +1,28 @@
+using Unity.Multiplayer.Samples.SocialHub.Input;
+using UnityEngine;
+using UnityEngine.UIElements;
+
+namespace Unity.Multiplayer.Samples.SocialHub.UI
+{
+    [RequireComponent(typeof(UIDocument))]
+    class MobileStylesheetAdder : MonoBehaviour
+    {
+        [SerializeField]
+        StyleSheet[] m_Stylesheet;
+
+        async void Awake()
+        {
+            var isMobile = await InputSystemManager.IsMobile;
+            if (!isMobile)
+            {
+                return;
+            }
+
+            var uiDocument = GetComponent<UIDocument>();
+            foreach (var styleSheet in m_Stylesheet)
+            {
+                uiDocument.rootVisualElement.styleSheets.Add(styleSheet);
+            }
+        }
+    }
+}
diff --git a/Basic/DistributedAuthoritySocialHub/Assets/Scripts/UI/IngameUI/MobileStylesheetAdder.cs.meta b/Basic/DistributedAuthoritySocialHub/Assets/Scripts/UI/IngameUI/MobileStylesheetAdder.cs.meta
new file mode 100644
index 000000000..8db047b43
--- /dev/null
+++ b/Basic/DistributedAuthoritySocialHub/Assets/Scripts/UI/IngameUI/MobileStylesheetAdder.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: c3f1e8062945c4f4d846b5dd47a10b49
\ No newline at end of file
diff --git a/Basic/DistributedAuthoritySocialHub/Assets/Scripts/UI/IngameUI/PickUpIndicator.cs b/Basic/DistributedAuthoritySocialHub/Assets/Scripts/UI/IngameUI/PickUpIndicator.cs
index 233bac160..faddc2aba 100644
--- a/Basic/DistributedAuthoritySocialHub/Assets/Scripts/UI/IngameUI/PickUpIndicator.cs
+++ b/Basic/DistributedAuthoritySocialHub/Assets/Scripts/UI/IngameUI/PickUpIndicator.cs
@@ -1,4 +1,5 @@
 using System;
+using Unity.Multiplayer.Samples.SocialHub.GameManagement;
 using UnityEngine;
 using UnityEngine.UIElements;
 
@@ -53,12 +54,12 @@ bool isShown
             }
         }
 
-        internal void ShowPickup(Transform t)
+        void ShowPickup(Transform t)
         {
             m_NextPickup = t;
         }
 
-        internal void ClearPickup()
+        void ClearPickup()
         {
             m_NextPickup = null;
         }
@@ -69,6 +70,20 @@ void OnEnable()
             m_PickupUI = m_PickupAsset.CloneTree().GetFirstChild();
             m_PickupUI.AddToClassList(UIUtils.s_InactiveUSSClass);
             m_WorldspaceUI.rootVisualElement.Q<VisualElement>("Pickup").Add(m_PickupUI);
+            GameplayEventHandler.OnPickupStateChanged += OnPickupStateChanged;
+        }
+
+        void OnPickupStateChanged(PickupState state, Transform pickupTransform)
+        {
+            switch (state)
+            {
+                case PickupState.PickupInRange:
+                    ShowPickup(pickupTransform);
+                    break;
+                case PickupState.Inactive or PickupState.Carry:
+                    ClearPickup();
+                    break;
+            }
         }
 
         void Update()
@@ -95,5 +110,10 @@ void UpdatePickup()
         {
             UIUtils.TransformUIDocumentWorldspace(m_WorldspaceUI, m_Camera, m_CurrentPickup, m_VerticalOffset);
         }
+
+        void OnDisable()
+        {
+            GameplayEventHandler.OnPickupStateChanged -= OnPickupStateChanged;
+        }
     }
 }
diff --git a/Basic/DistributedAuthoritySocialHub/Assets/Scripts/UI/IngameUI/TextChatManager.cs b/Basic/DistributedAuthoritySocialHub/Assets/Scripts/UI/IngameUI/TextChatManager.cs
index 5f9e760ed..2310ea714 100644
--- a/Basic/DistributedAuthoritySocialHub/Assets/Scripts/UI/IngameUI/TextChatManager.cs
+++ b/Basic/DistributedAuthoritySocialHub/Assets/Scripts/UI/IngameUI/TextChatManager.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using Unity.Multiplayer.Samples.SocialHub.Input;
 using Unity.Properties;
 using UnityEngine;
 using UnityEngine.UIElements;
@@ -25,11 +26,11 @@ class TextChatManager : MonoBehaviour
         VisualElement m_Root;
         VisualElement m_TextChatView;
 
+        const int k_FocusDelay = 10;
         bool m_IsChatActive;
 
-        void Start()
+        void OnEnable()
         {
-
             m_Root = m_UIDocument.rootVisualElement.Q<VisualElement>("textchat-container");
             m_Asset.CloneTree(m_Root);
 
@@ -41,11 +42,11 @@ void Start()
 
             m_MessageInputField = m_Root.Q<TextField>("input-text");
 
-            m_MessageInputField.RegisterCallback<KeyDownEvent>(evt =>
-            {
-                if (evt.keyCode is KeyCode.Return or KeyCode.KeypadEnter)
-                    SendMessage();
-            }, TrickleDown.TrickleDown);
+#if !UNITY_IOS && !UNITY_ANDROID
+            m_MessageInputField.RegisterCallback<FocusInEvent>(OnTextfieldFocusIn);
+            m_MessageInputField.RegisterCallback<FocusOutEvent>(OnTextfieldFocusOut);
+            m_MessageInputField.RegisterCallback<KeyDownEvent>(OnTextEnter, TrickleDown.TrickleDown);
+#endif
 
             m_MessageView = m_Root.Q<ListView>("message-list");
             m_MessageView.dataSource = this;
@@ -63,9 +64,41 @@ void Start()
             m_Messages.Add(new ChatMessage("Sample Devs", "Hey, we hope you enjoy our sample :)"));
         }
 
-        void OnDestroy()
+        void OnTextEnter(KeyDownEvent evt)
+        {
+            if (evt.keyCode is KeyCode.Return or KeyCode.KeypadEnter)
+            {
+                SendMessage();
+                m_MessageInputField.schedule.Execute(() => m_MessageInputField.Focus()).ExecuteLater(k_FocusDelay);
+            }
+        }
+
+        void OnTextfieldFocusIn(FocusInEvent _)
+        {
+            InputSystemManager.Instance.EnableUIInputs();
+        }
+
+        void OnTextfieldFocusOut(FocusOutEvent _)
+        {
+            InputSystemManager.Instance.EnableGameplayInputs();
+        }
+
+#if UNITY_IOS || UNITY_ANDROID
+        void Update()
+        {
+            if (m_MessageInputField is { touchScreenKeyboard: { status: TouchScreenKeyboard.Status.Done } })
+            {
+                SendMessage();
+            }
+        }
+#endif
+
+        void OnDisable()
         {
             m_SendButton.clicked -= SendMessage;
+            m_MessageInputField.UnregisterCallback<FocusInEvent>(OnTextfieldFocusIn);
+            m_MessageInputField.UnregisterCallback<FocusOutEvent>(OnTextfieldFocusOut);
+            m_MessageInputField.UnregisterCallback<KeyDownEvent>(OnTextEnter, TrickleDown.TrickleDown);
             BindSessionEvents(false);
         }
 
@@ -96,8 +129,7 @@ void SendMessage()
             if (!string.IsNullOrEmpty(m_MessageInputField.text))
             {
                 SendTextMessage(m_MessageInputField.value);
-                m_MessageInputField.SetValueWithoutNotify("");
-                m_MessageInputField.schedule.Execute(() => m_MessageInputField.Focus()).ExecuteLater(10);
+                m_MessageInputField.value = "";
             }
         }
 
diff --git a/Basic/DistributedAuthoritySocialHub/Assets/Scripts/UI/Mobile/UIElements/TouchScreenBehaviour.cs b/Basic/DistributedAuthoritySocialHub/Assets/Scripts/UI/Mobile/UIElements/TouchScreenBehaviour.cs
index 1cfffde4c..88258a4aa 100644
--- a/Basic/DistributedAuthoritySocialHub/Assets/Scripts/UI/Mobile/UIElements/TouchScreenBehaviour.cs
+++ b/Basic/DistributedAuthoritySocialHub/Assets/Scripts/UI/Mobile/UIElements/TouchScreenBehaviour.cs
@@ -1,4 +1,5 @@
 using System;
+using Unity.Multiplayer.Samples.SocialHub.GameManagement;
 using Unity.Multiplayer.Samples.SocialHub.Input;
 using Unity.Properties;
 using UnityEngine;
@@ -9,7 +10,6 @@ namespace Unity.Multiplayer.Samples.SocialHub.UI
     /// <summary>
     /// This class is managing the data binding between the TouchScreen
     /// </summary>
-    [RequireComponent(typeof(UIDocument))]
     class TouchScreenBehaviour : MonoBehaviour
     {
         static class UIElementNames
@@ -20,24 +20,30 @@ static class UIElementNames
             internal const string ButtonJump = "ButtonJump";
             internal const string ButtonSprint = "ButtonSprint";
             internal const string ButtonInteract = "ButtonInteract";
-            //public const string ButtonToggleNetworkStats = "ButtonToggleNetworkStats";
             internal const string PlayerContainer = "PlayerContainer";
         }
 
+        [SerializeField]
+        UIDocument m_Document;
+
+        [SerializeField]
+        VisualTreeAsset m_TouchscreenUI;
+
         VirtualJoystick m_JoystickLeft;
         VirtualJoystick m_JoystickRight;
         MobileGamepadState m_RuntimeState;
+        PressedButton m_ButtonInteract;
 
         async void OnEnable()
         {
             var isMobile = await InputSystemManager.IsMobile;
             if (!isMobile)
             {
-                GetComponent<UIDocument>().enabled = false;
                 return;
             }
 
-            var root = GetComponent<UIDocument>().rootVisualElement;
+            var root = m_Document.rootVisualElement.Q("touch-ui-container");
+            m_TouchscreenUI.CloneTree(root);
             m_RuntimeState = MobileGamepadState.GetOrCreate;
 
             // Bindings
@@ -63,8 +69,8 @@ async void OnEnable()
                 bindingMode = BindingMode.ToSource,
             });
 
-            var buttonInteract = root.Q<PressedButton>(UIElementNames.ButtonInteract);
-            buttonInteract.SetBinding("value", new DataBinding
+            m_ButtonInteract = root.Q<PressedButton>(UIElementNames.ButtonInteract);
+            m_ButtonInteract.SetBinding("value", new DataBinding
             {
                 dataSourcePath = new PropertyPath(nameof(MobileGamepadState.ButtonInteract)),
                 bindingMode = BindingMode.ToSource,
@@ -77,13 +83,20 @@ async void OnEnable()
                 bindingMode = BindingMode.ToSource,
             });
 
-            // TODO: revisit if necessary to add button
-            /*var buttonToggleNetworkStats = root.Q<Toggle>(UIElementNames.ButtonToggleNetworkStats);
-            buttonToggleNetworkStats.SetBinding("value", new DataBinding
+            GameplayEventHandler.OnPickupStateChanged += OnPickupStateChanged;
+        }
+
+        void OnPickupStateChanged(PickupState state, Transform _)
+        {
+            m_ButtonInteract.enabledSelf = state != PickupState.Inactive;
+
+            if(state == PickupState.Carry)
             {
-                dataSourcePath = new PropertyPath(nameof(MobileGamepadState.ButtonToggleNetworkStats)),
-                bindingMode = BindingMode.ToSource,
-            });*/
+                m_ButtonInteract.AddToClassList("state-carry");
+                return;
+            }
+
+            m_ButtonInteract.RemoveFromClassList("state-carry");
         }
 
         void OnJoystickLeftMoved(Vector2 position) => m_RuntimeState.LeftJoystick = position;
@@ -95,6 +108,8 @@ void OnDisable()
             m_JoystickLeft = null;
             m_JoystickRight?.Dispose();
             m_JoystickRight = null;
+
+            GameplayEventHandler.OnPickupStateChanged -= OnPickupStateChanged;
         }
 
         /// <summary>
diff --git a/Basic/DistributedAuthoritySocialHub/Assets/UI Toolkit.meta b/Basic/DistributedAuthoritySocialHub/Assets/UI Toolkit.meta
deleted file mode 100644
index 32818541d..000000000
--- a/Basic/DistributedAuthoritySocialHub/Assets/UI Toolkit.meta	
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 345ab62a84e32714682d70b8af9d3ed1
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Basic/DistributedAuthoritySocialHub/Assets/UI Toolkit/Mobile/Images/UI_Circle_Bevel_Base.png b/Basic/DistributedAuthoritySocialHub/Assets/UI Toolkit/Mobile/Images/UI_Circle_Bevel_Base.png
deleted file mode 100644
index a3c253945..000000000
Binary files a/Basic/DistributedAuthoritySocialHub/Assets/UI Toolkit/Mobile/Images/UI_Circle_Bevel_Base.png and /dev/null differ
diff --git a/Basic/DistributedAuthoritySocialHub/Assets/UI Toolkit/Mobile/Images/UI_Circle_Faded.png b/Basic/DistributedAuthoritySocialHub/Assets/UI Toolkit/Mobile/Images/UI_Circle_Faded.png
deleted file mode 100644
index 042ea91ee..000000000
Binary files a/Basic/DistributedAuthoritySocialHub/Assets/UI Toolkit/Mobile/Images/UI_Circle_Faded.png and /dev/null differ
diff --git a/Basic/DistributedAuthoritySocialHub/Assets/UI Toolkit/Mobile/Images/UI_Icon_Aim.png b/Basic/DistributedAuthoritySocialHub/Assets/UI Toolkit/Mobile/Images/UI_Icon_Aim.png
deleted file mode 100644
index a67522e2d..000000000
Binary files a/Basic/DistributedAuthoritySocialHub/Assets/UI Toolkit/Mobile/Images/UI_Icon_Aim.png and /dev/null differ
diff --git a/Basic/DistributedAuthoritySocialHub/Assets/UI Toolkit/Mobile/Images/UI_Icon_ArrowDown.png b/Basic/DistributedAuthoritySocialHub/Assets/UI Toolkit/Mobile/Images/UI_Icon_ArrowDown.png
deleted file mode 100644
index 5d6b01fbe..000000000
Binary files a/Basic/DistributedAuthoritySocialHub/Assets/UI Toolkit/Mobile/Images/UI_Icon_ArrowDown.png and /dev/null differ
diff --git a/Basic/DistributedAuthoritySocialHub/Assets/UI Toolkit/Mobile/Images/UI_Icon_ArrowUp.png b/Basic/DistributedAuthoritySocialHub/Assets/UI Toolkit/Mobile/Images/UI_Icon_ArrowUp.png
deleted file mode 100644
index 5c0bdd01c..000000000
Binary files a/Basic/DistributedAuthoritySocialHub/Assets/UI Toolkit/Mobile/Images/UI_Icon_ArrowUp.png and /dev/null differ
diff --git a/Basic/DistributedAuthoritySocialHub/Assets/UI Toolkit/Mobile/Images/UI_Icon_Fire.png b/Basic/DistributedAuthoritySocialHub/Assets/UI Toolkit/Mobile/Images/UI_Icon_Fire.png
deleted file mode 100644
index 63d8cb8ad..000000000
Binary files a/Basic/DistributedAuthoritySocialHub/Assets/UI Toolkit/Mobile/Images/UI_Icon_Fire.png and /dev/null differ
diff --git a/Basic/DistributedAuthoritySocialHub/Assets/UI Toolkit/Mobile/Images/UI_Icon_Fire.png.meta b/Basic/DistributedAuthoritySocialHub/Assets/UI Toolkit/Mobile/Images/UI_Icon_Fire.png.meta
deleted file mode 100644
index b5f2a3717..000000000
--- a/Basic/DistributedAuthoritySocialHub/Assets/UI Toolkit/Mobile/Images/UI_Icon_Fire.png.meta	
+++ /dev/null
@@ -1,169 +0,0 @@
-fileFormatVersion: 2
-guid: f85b1168ab569b7478596dae9b4547a7
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 13
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    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
-    flipGreenChannel: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  ignoreMipmapLimit: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 0
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 0
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  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: 0
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  swizzle: 50462976
-  cookieLightType: 1
-  platformSettings:
-  - serializedVersion: 4
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 128
-    resizeAlgorithm: 0
-    textureFormat: 4
-    textureCompression: 0
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 4
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: 4
-    textureCompression: 0
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 4
-    buildTarget: Android
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: 4
-    textureCompression: 0
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 4
-    buildTarget: WebGL
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: 4
-    textureCompression: 0
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 4
-    buildTarget: Server
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: 4
-    textureCompression: 0
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 4
-    buildTarget: iOS
-    maxTextureSize: 512
-    resizeAlgorithm: 0
-    textureFormat: 4
-    textureCompression: 0
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    customData: 
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    spriteCustomMetadata:
-      entries: []
-    nameFileIdTable: {}
-  mipmapLimitGroupName: 
-  pSDRemoveMatte: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Basic/DistributedAuthoritySocialHub/Assets/UI Toolkit/Mobile/TouchScreenInputStyle.uss b/Basic/DistributedAuthoritySocialHub/Assets/UI Toolkit/Mobile/TouchScreenInputStyle.uss
deleted file mode 100644
index 342dc43dc..000000000
--- a/Basic/DistributedAuthoritySocialHub/Assets/UI Toolkit/Mobile/TouchScreenInputStyle.uss	
+++ /dev/null
@@ -1,133 +0,0 @@
-.flex-grow {
-    flex-grow: 1;
-}
-.touchscreen-button {
-    margin: 0;
-    padding: 0;
-    background-image: url('./Images/UI_Circle_Bevel_Base.png');
-}
-.touchscreen-button:checked {
-    translate: 3%;
-    -unity-background-image-tint-color: rgb(200, 200, 200);
-}
-.touchscreen-button > .unity-toggle__input {
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    width: 60%;
-    height: 60%;
-    translate: -50%;
-}
-.touchscreen-button > .unity-toggle__input > .unity-toggle__checkmark {
-    display: none;
-}
-
-.button-icon {
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    width: 60%;
-    height: 60%;
-    translate: -50%;
-}
-
-.joystick {
-    flex-grow: 1;
-    background-image: url('./Images/UI_Circle_Faded.png');
-}
-.joystick > .touchscreen-button {
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    width: 130px;
-    height: 130px;
-    translate: -50%;
-}
-.joystick:active > .touchscreen-button {
-    -unity-background-image-tint-color: rgb(200, 200, 200);
-}
-.joystick--left {
-    position: absolute;
-    left: 75px;
-    bottom: 85px;
-    width: 330px;
-    height: 330px;
-}
-.joystick--left .button-icon {
-    background-image: url('./Images/UI_Icon_Move.png');
-}
-.joystick--right {
-    position: absolute;
-    right: 85px;
-    bottom: 185px;
-    width: 240px;
-    height: 240px;
-}
-.joystick--right .button-icon {
-    background-image: url('./Images/UI_Icon_Look.png');
-}
-
-#ButtonJump {
-    position: absolute;
-    right: 380px;
-    bottom: 400px;
-    width: 110px;
-    height: 110px;
-}
-#ButtonJump > .unity-toggle__input {
-    background-image: url('./Images/UI_Icon_Jump.png');
-}
-
-#ButtonSprint {
-    position: absolute;
-    right: 400px;
-    bottom: 140px;
-    width: 130px;
-    height: 130px;
-    -unity-background-image-tint-color: rgb(255, 151, 107);
-}
-#ButtonSprint:checked {
-    -unity-background-image-tint-color: rgb(205, 101, 57);
-}
-#ButtonSprint > .unity-toggle__input {
-    -unity-background-image-tint-color: rgb(255, 137, 140);
-    background-image: url('./Images/UI_Icon_Fire.png');
-}
-
-#ButtonMenu {
-    position: absolute;
-    top: 80px;
-    left: 100px;
-    width: 80px;
-    height: 80px;
-}
-#ButtonMenu > .unity-toggle__input {
-    background-image: url('./Images/UI_Icon_Menu.png');
-}
-
-/*#ButtonToggleNetworkStats {
-    position: absolute;
-    right: 100px;
-    top: 80px;
-    width: 110px;
-    height: 110px;
-}
-#ButtonToggleNetworkStats:checked {
-    -unity-background-image-tint-color: rgb(100, 150, 100);
-    translate: 0;
-}
-#ButtonToggleNetworkStats > .unity-toggle__input {
-    background-image: url('./Images/UI_Icon_ArrowUp.png');
-}*/
-
-#ButtonInteract {
-    position: absolute;
-    right: 140px;
-    top: 420px;
-    width: 130px;
-    height: 130px;
-}
-#ButtonInteract > .unity-toggle__input {
-    -unity-background-image-tint-color: lightgrey;
-    background-image: url('./Images/UI_Icon_Aim.png');
-}
diff --git a/Basic/DistributedAuthoritySocialHub/Assets/UI Toolkit/UnityThemes.meta b/Basic/DistributedAuthoritySocialHub/Assets/UI Toolkit/UnityThemes.meta
deleted file mode 100644
index f2e38873e..000000000
--- a/Basic/DistributedAuthoritySocialHub/Assets/UI Toolkit/UnityThemes.meta	
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: ca6c032e80bb6ec49a9f672d02cc6dfc
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Basic/DistributedAuthoritySocialHub/Assets/UI Toolkit/UnityThemes/UnityDefaultRuntimeTheme.tss b/Basic/DistributedAuthoritySocialHub/Assets/UI Toolkit/UnityThemes/UnityDefaultRuntimeTheme.tss
deleted file mode 100644
index 1056e07ed..000000000
--- a/Basic/DistributedAuthoritySocialHub/Assets/UI Toolkit/UnityThemes/UnityDefaultRuntimeTheme.tss	
+++ /dev/null
@@ -1 +0,0 @@
-@import url("unity-theme://default");
\ No newline at end of file
diff --git a/Basic/DistributedAuthoritySocialHub/Assets/UI Toolkit/Mobile.meta b/Basic/DistributedAuthoritySocialHub/Assets/UI/Mobile.meta
similarity index 100%
rename from Basic/DistributedAuthoritySocialHub/Assets/UI Toolkit/Mobile.meta
rename to Basic/DistributedAuthoritySocialHub/Assets/UI/Mobile.meta
diff --git a/Basic/DistributedAuthoritySocialHub/Assets/UI Toolkit/Mobile/Images.meta b/Basic/DistributedAuthoritySocialHub/Assets/UI/Mobile/Images.meta
similarity index 100%
rename from Basic/DistributedAuthoritySocialHub/Assets/UI Toolkit/Mobile/Images.meta
rename to Basic/DistributedAuthoritySocialHub/Assets/UI/Mobile/Images.meta
diff --git a/Basic/DistributedAuthoritySocialHub/Assets/UI/Mobile/Images/UI_Circle_Faded.png b/Basic/DistributedAuthoritySocialHub/Assets/UI/Mobile/Images/UI_Circle_Faded.png
new file mode 100644
index 000000000..4c0366597
Binary files /dev/null and b/Basic/DistributedAuthoritySocialHub/Assets/UI/Mobile/Images/UI_Circle_Faded.png differ
diff --git a/Basic/DistributedAuthoritySocialHub/Assets/UI Toolkit/Mobile/Images/UI_Circle_Faded.png.meta b/Basic/DistributedAuthoritySocialHub/Assets/UI/Mobile/Images/UI_Circle_Faded.png.meta
similarity index 100%
rename from Basic/DistributedAuthoritySocialHub/Assets/UI Toolkit/Mobile/Images/UI_Circle_Faded.png.meta
rename to Basic/DistributedAuthoritySocialHub/Assets/UI/Mobile/Images/UI_Circle_Faded.png.meta
diff --git a/Basic/DistributedAuthoritySocialHub/Assets/UI/Mobile/Images/UI_Circle_Grey_Base.png b/Basic/DistributedAuthoritySocialHub/Assets/UI/Mobile/Images/UI_Circle_Grey_Base.png
new file mode 100644
index 000000000..f44f41222
Binary files /dev/null and b/Basic/DistributedAuthoritySocialHub/Assets/UI/Mobile/Images/UI_Circle_Grey_Base.png differ
diff --git a/Basic/DistributedAuthoritySocialHub/Assets/UI Toolkit/Mobile/Images/UI_Icon_Aim.png.meta b/Basic/DistributedAuthoritySocialHub/Assets/UI/Mobile/Images/UI_Circle_Grey_Base.png.meta
similarity index 71%
rename from Basic/DistributedAuthoritySocialHub/Assets/UI Toolkit/Mobile/Images/UI_Icon_Aim.png.meta
rename to Basic/DistributedAuthoritySocialHub/Assets/UI/Mobile/Images/UI_Circle_Grey_Base.png.meta
index b60744a43..e6ea810d7 100644
--- a/Basic/DistributedAuthoritySocialHub/Assets/UI Toolkit/Mobile/Images/UI_Icon_Aim.png.meta	
+++ b/Basic/DistributedAuthoritySocialHub/Assets/UI/Mobile/Images/UI_Circle_Grey_Base.png.meta
@@ -1,12 +1,12 @@
 fileFormatVersion: 2
-guid: 5c65a8be971efaa40a3ac885b42db09e
+guid: 6471efea28f9148588b3e1492044e18e
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
   serializedVersion: 13
   mipmaps:
     mipMapMode: 0
-    enableMipMap: 0
+    enableMipMap: 1
     sRGBTexture: 1
     linearTexture: 0
     fadeOut: 0
@@ -34,27 +34,27 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     serializedVersion: 2
-    filterMode: 0
+    filterMode: 1
     aniso: 1
     mipBias: 0
-    wrapU: 1
-    wrapV: 1
+    wrapU: 0
+    wrapV: 0
     wrapW: 0
-  nPOTScale: 0
+  nPOTScale: 1
   lightmap: 0
   compressionQuality: 50
-  spriteMode: 1
+  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: 0
+  spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
-  alphaIsTransparency: 1
+  alphaIsTransparency: 0
   spriteTessellationDetail: -1
-  textureType: 8
+  textureType: 0
   textureShape: 1
   singleChannelComponent: 0
   flipbookRows: 1
@@ -65,14 +65,14 @@ TextureImporter:
   ignorePngGamma: 0
   applyGammaDecoding: 0
   swizzle: 50462976
-  cookieLightType: 1
+  cookieLightType: 0
   platformSettings:
   - serializedVersion: 4
     buildTarget: DefaultTexturePlatform
-    maxTextureSize: 128
+    maxTextureSize: 2048
     resizeAlgorithm: 0
-    textureFormat: 4
-    textureCompression: 0
+    textureFormat: -1
+    textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
@@ -84,8 +84,8 @@ TextureImporter:
     buildTarget: Standalone
     maxTextureSize: 2048
     resizeAlgorithm: 0
-    textureFormat: 4
-    textureCompression: 0
+    textureFormat: -1
+    textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
@@ -97,34 +97,8 @@ TextureImporter:
     buildTarget: Android
     maxTextureSize: 2048
     resizeAlgorithm: 0
-    textureFormat: 4
-    textureCompression: 0
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 4
-    buildTarget: WebGL
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: 4
-    textureCompression: 0
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 4
-    buildTarget: Server
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: 4
-    textureCompression: 0
+    textureFormat: -1
+    textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
@@ -134,10 +108,10 @@ TextureImporter:
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 4
     buildTarget: iOS
-    maxTextureSize: 512
+    maxTextureSize: 2048
     resizeAlgorithm: 0
-    textureFormat: 4
-    textureCompression: 0
+    textureFormat: -1
+    textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
@@ -152,7 +126,7 @@ TextureImporter:
     customData: 
     physicsShape: []
     bones: []
-    spriteID: 5e97eb03825dee720800000000000000
+    spriteID: 
     internalID: 0
     vertices: []
     indices: 
diff --git a/Basic/DistributedAuthoritySocialHub/Assets/UI/Mobile/Images/UI_Circle_Yellow_Base.png b/Basic/DistributedAuthoritySocialHub/Assets/UI/Mobile/Images/UI_Circle_Yellow_Base.png
new file mode 100644
index 000000000..1564060c4
Binary files /dev/null and b/Basic/DistributedAuthoritySocialHub/Assets/UI/Mobile/Images/UI_Circle_Yellow_Base.png differ
diff --git a/Basic/DistributedAuthoritySocialHub/Assets/UI Toolkit/Mobile/Images/UI_Icon_ArrowDown.png.meta b/Basic/DistributedAuthoritySocialHub/Assets/UI/Mobile/Images/UI_Circle_Yellow_Base.png.meta
similarity index 71%
rename from Basic/DistributedAuthoritySocialHub/Assets/UI Toolkit/Mobile/Images/UI_Icon_ArrowDown.png.meta
rename to Basic/DistributedAuthoritySocialHub/Assets/UI/Mobile/Images/UI_Circle_Yellow_Base.png.meta
index 475016909..4bfeabf8b 100644
--- a/Basic/DistributedAuthoritySocialHub/Assets/UI Toolkit/Mobile/Images/UI_Icon_ArrowDown.png.meta	
+++ b/Basic/DistributedAuthoritySocialHub/Assets/UI/Mobile/Images/UI_Circle_Yellow_Base.png.meta
@@ -1,12 +1,12 @@
 fileFormatVersion: 2
-guid: c89f884c3f48859428011d758d1c0ec5
+guid: 2a2dc7bfbe5e14df5a98d127c044fbe7
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
   serializedVersion: 13
   mipmaps:
     mipMapMode: 0
-    enableMipMap: 0
+    enableMipMap: 1
     sRGBTexture: 1
     linearTexture: 0
     fadeOut: 0
@@ -34,27 +34,27 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     serializedVersion: 2
-    filterMode: 0
+    filterMode: 1
     aniso: 1
     mipBias: 0
-    wrapU: 1
-    wrapV: 1
+    wrapU: 0
+    wrapV: 0
     wrapW: 0
-  nPOTScale: 0
+  nPOTScale: 1
   lightmap: 0
   compressionQuality: 50
-  spriteMode: 1
+  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: 0
+  spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
-  alphaIsTransparency: 1
+  alphaIsTransparency: 0
   spriteTessellationDetail: -1
-  textureType: 8
+  textureType: 0
   textureShape: 1
   singleChannelComponent: 0
   flipbookRows: 1
@@ -65,14 +65,14 @@ TextureImporter:
   ignorePngGamma: 0
   applyGammaDecoding: 0
   swizzle: 50462976
-  cookieLightType: 1
+  cookieLightType: 0
   platformSettings:
   - serializedVersion: 4
     buildTarget: DefaultTexturePlatform
-    maxTextureSize: 128
+    maxTextureSize: 2048
     resizeAlgorithm: 0
-    textureFormat: 4
-    textureCompression: 0
+    textureFormat: -1
+    textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
@@ -84,8 +84,8 @@ TextureImporter:
     buildTarget: Standalone
     maxTextureSize: 2048
     resizeAlgorithm: 0
-    textureFormat: 4
-    textureCompression: 0
+    textureFormat: -1
+    textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
@@ -97,34 +97,8 @@ TextureImporter:
     buildTarget: Android
     maxTextureSize: 2048
     resizeAlgorithm: 0
-    textureFormat: 4
-    textureCompression: 0
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 4
-    buildTarget: WebGL
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: 4
-    textureCompression: 0
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 4
-    buildTarget: Server
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: 4
-    textureCompression: 0
+    textureFormat: -1
+    textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
@@ -134,10 +108,10 @@ TextureImporter:
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 4
     buildTarget: iOS
-    maxTextureSize: 512
+    maxTextureSize: 2048
     resizeAlgorithm: 0
-    textureFormat: 4
-    textureCompression: 0
+    textureFormat: -1
+    textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
@@ -152,7 +126,7 @@ TextureImporter:
     customData: 
     physicsShape: []
     bones: []
-    spriteID: 5e97eb03825dee720800000000000000
+    spriteID: 
     internalID: 0
     vertices: []
     indices: 
diff --git a/Basic/DistributedAuthoritySocialHub/Assets/UI Toolkit/Mobile/Images/UI_Icon_Jump.png b/Basic/DistributedAuthoritySocialHub/Assets/UI/Mobile/Images/UI_Icon_Jump.png
similarity index 100%
rename from Basic/DistributedAuthoritySocialHub/Assets/UI Toolkit/Mobile/Images/UI_Icon_Jump.png
rename to Basic/DistributedAuthoritySocialHub/Assets/UI/Mobile/Images/UI_Icon_Jump.png
diff --git a/Basic/DistributedAuthoritySocialHub/Assets/UI Toolkit/Mobile/Images/UI_Icon_Jump.png.meta b/Basic/DistributedAuthoritySocialHub/Assets/UI/Mobile/Images/UI_Icon_Jump.png.meta
similarity index 100%
rename from Basic/DistributedAuthoritySocialHub/Assets/UI Toolkit/Mobile/Images/UI_Icon_Jump.png.meta
rename to Basic/DistributedAuthoritySocialHub/Assets/UI/Mobile/Images/UI_Icon_Jump.png.meta
diff --git a/Basic/DistributedAuthoritySocialHub/Assets/UI Toolkit/Mobile/Images/UI_Icon_Look.png b/Basic/DistributedAuthoritySocialHub/Assets/UI/Mobile/Images/UI_Icon_Look.png
similarity index 100%
rename from Basic/DistributedAuthoritySocialHub/Assets/UI Toolkit/Mobile/Images/UI_Icon_Look.png
rename to Basic/DistributedAuthoritySocialHub/Assets/UI/Mobile/Images/UI_Icon_Look.png
diff --git a/Basic/DistributedAuthoritySocialHub/Assets/UI Toolkit/Mobile/Images/UI_Icon_Look.png.meta b/Basic/DistributedAuthoritySocialHub/Assets/UI/Mobile/Images/UI_Icon_Look.png.meta
similarity index 100%
rename from Basic/DistributedAuthoritySocialHub/Assets/UI Toolkit/Mobile/Images/UI_Icon_Look.png.meta
rename to Basic/DistributedAuthoritySocialHub/Assets/UI/Mobile/Images/UI_Icon_Look.png.meta
diff --git a/Basic/DistributedAuthoritySocialHub/Assets/UI Toolkit/Mobile/Images/UI_Icon_Menu.png b/Basic/DistributedAuthoritySocialHub/Assets/UI/Mobile/Images/UI_Icon_Menu.png
similarity index 100%
rename from Basic/DistributedAuthoritySocialHub/Assets/UI Toolkit/Mobile/Images/UI_Icon_Menu.png
rename to Basic/DistributedAuthoritySocialHub/Assets/UI/Mobile/Images/UI_Icon_Menu.png
diff --git a/Basic/DistributedAuthoritySocialHub/Assets/UI Toolkit/Mobile/Images/UI_Icon_Menu.png.meta b/Basic/DistributedAuthoritySocialHub/Assets/UI/Mobile/Images/UI_Icon_Menu.png.meta
similarity index 100%
rename from Basic/DistributedAuthoritySocialHub/Assets/UI Toolkit/Mobile/Images/UI_Icon_Menu.png.meta
rename to Basic/DistributedAuthoritySocialHub/Assets/UI/Mobile/Images/UI_Icon_Menu.png.meta
diff --git a/Basic/DistributedAuthoritySocialHub/Assets/UI Toolkit/Mobile/Images/UI_Icon_Move.png b/Basic/DistributedAuthoritySocialHub/Assets/UI/Mobile/Images/UI_Icon_Move.png
similarity index 100%
rename from Basic/DistributedAuthoritySocialHub/Assets/UI Toolkit/Mobile/Images/UI_Icon_Move.png
rename to Basic/DistributedAuthoritySocialHub/Assets/UI/Mobile/Images/UI_Icon_Move.png
diff --git a/Basic/DistributedAuthoritySocialHub/Assets/UI Toolkit/Mobile/Images/UI_Icon_Move.png.meta b/Basic/DistributedAuthoritySocialHub/Assets/UI/Mobile/Images/UI_Icon_Move.png.meta
similarity index 100%
rename from Basic/DistributedAuthoritySocialHub/Assets/UI Toolkit/Mobile/Images/UI_Icon_Move.png.meta
rename to Basic/DistributedAuthoritySocialHub/Assets/UI/Mobile/Images/UI_Icon_Move.png.meta
diff --git a/Basic/DistributedAuthoritySocialHub/Assets/UI/Mobile/Images/UI_Icon_Pickup.png b/Basic/DistributedAuthoritySocialHub/Assets/UI/Mobile/Images/UI_Icon_Pickup.png
new file mode 100644
index 000000000..956064951
Binary files /dev/null and b/Basic/DistributedAuthoritySocialHub/Assets/UI/Mobile/Images/UI_Icon_Pickup.png differ
diff --git a/Basic/DistributedAuthoritySocialHub/Assets/UI Toolkit/Mobile/Images/UI_Circle_Bevel_Base.png.meta b/Basic/DistributedAuthoritySocialHub/Assets/UI/Mobile/Images/UI_Icon_Pickup.png.meta
similarity index 63%
rename from Basic/DistributedAuthoritySocialHub/Assets/UI Toolkit/Mobile/Images/UI_Circle_Bevel_Base.png.meta
rename to Basic/DistributedAuthoritySocialHub/Assets/UI/Mobile/Images/UI_Icon_Pickup.png.meta
index 407cc37e2..c75590f38 100644
--- a/Basic/DistributedAuthoritySocialHub/Assets/UI Toolkit/Mobile/Images/UI_Circle_Bevel_Base.png.meta	
+++ b/Basic/DistributedAuthoritySocialHub/Assets/UI/Mobile/Images/UI_Icon_Pickup.png.meta
@@ -1,12 +1,12 @@
 fileFormatVersion: 2
-guid: b74c31d447d2f5d41a61081bdf5e7126
+guid: 9c35a306c5b6f45f3924517141faa229
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
   serializedVersion: 13
   mipmaps:
     mipMapMode: 0
-    enableMipMap: 0
+    enableMipMap: 1
     sRGBTexture: 1
     linearTexture: 0
     fadeOut: 0
@@ -34,27 +34,27 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     serializedVersion: 2
-    filterMode: 0
+    filterMode: 1
     aniso: 1
     mipBias: 0
-    wrapU: 1
-    wrapV: 1
+    wrapU: 0
+    wrapV: 0
     wrapW: 0
-  nPOTScale: 0
+  nPOTScale: 1
   lightmap: 0
   compressionQuality: 50
-  spriteMode: 1
+  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: 0
+  spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
-  alphaIsTransparency: 1
+  alphaIsTransparency: 0
   spriteTessellationDetail: -1
-  textureType: 8
+  textureType: 0
   textureShape: 1
   singleChannelComponent: 0
   flipbookRows: 1
@@ -65,53 +65,14 @@ TextureImporter:
   ignorePngGamma: 0
   applyGammaDecoding: 0
   swizzle: 50462976
-  cookieLightType: 1
+  cookieLightType: 0
   platformSettings:
   - serializedVersion: 4
     buildTarget: DefaultTexturePlatform
-    maxTextureSize: 128
-    resizeAlgorithm: 0
-    textureFormat: 4
-    textureCompression: 0
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 4
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: 4
-    textureCompression: 0
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 4
-    buildTarget: Android
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: 4
-    textureCompression: 0
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 4
-    buildTarget: WebGL
     maxTextureSize: 2048
     resizeAlgorithm: 0
-    textureFormat: 4
-    textureCompression: 0
+    textureFormat: -1
+    textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
@@ -120,11 +81,11 @@ TextureImporter:
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 4
-    buildTarget: Server
+    buildTarget: Standalone
     maxTextureSize: 2048
     resizeAlgorithm: 0
-    textureFormat: 4
-    textureCompression: 0
+    textureFormat: -1
+    textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
@@ -134,10 +95,10 @@ TextureImporter:
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 4
     buildTarget: iOS
-    maxTextureSize: 512
+    maxTextureSize: 2048
     resizeAlgorithm: 0
-    textureFormat: 4
-    textureCompression: 0
+    textureFormat: -1
+    textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
@@ -152,7 +113,7 @@ TextureImporter:
     customData: 
     physicsShape: []
     bones: []
-    spriteID: 5e97eb03825dee720800000000000000
+    spriteID: 
     internalID: 0
     vertices: []
     indices: 
diff --git a/Experimental/DedicatedGameServer/Assets/StarterAssets/Mobile/UI/UI_Icon_Sprint.png b/Basic/DistributedAuthoritySocialHub/Assets/UI/Mobile/Images/UI_Icon_Sprint.png
similarity index 100%
rename from Experimental/DedicatedGameServer/Assets/StarterAssets/Mobile/UI/UI_Icon_Sprint.png
rename to Basic/DistributedAuthoritySocialHub/Assets/UI/Mobile/Images/UI_Icon_Sprint.png
diff --git a/Basic/DistributedAuthoritySocialHub/Assets/UI Toolkit/Mobile/Images/UI_Icon_ArrowUp.png.meta b/Basic/DistributedAuthoritySocialHub/Assets/UI/Mobile/Images/UI_Icon_Sprint.png.meta
similarity index 63%
rename from Basic/DistributedAuthoritySocialHub/Assets/UI Toolkit/Mobile/Images/UI_Icon_ArrowUp.png.meta
rename to Basic/DistributedAuthoritySocialHub/Assets/UI/Mobile/Images/UI_Icon_Sprint.png.meta
index 38238a472..7d6223482 100644
--- a/Basic/DistributedAuthoritySocialHub/Assets/UI Toolkit/Mobile/Images/UI_Icon_ArrowUp.png.meta	
+++ b/Basic/DistributedAuthoritySocialHub/Assets/UI/Mobile/Images/UI_Icon_Sprint.png.meta
@@ -1,12 +1,12 @@
 fileFormatVersion: 2
-guid: 419161f336d268f4aba94298090b5c73
+guid: 56cfe655155ed480ebbb4381cab94e76
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
   serializedVersion: 13
   mipmaps:
     mipMapMode: 0
-    enableMipMap: 0
+    enableMipMap: 1
     sRGBTexture: 1
     linearTexture: 0
     fadeOut: 0
@@ -34,27 +34,27 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     serializedVersion: 2
-    filterMode: 0
+    filterMode: 1
     aniso: 1
     mipBias: 0
-    wrapU: 1
-    wrapV: 1
+    wrapU: 0
+    wrapV: 0
     wrapW: 0
-  nPOTScale: 0
+  nPOTScale: 1
   lightmap: 0
   compressionQuality: 50
-  spriteMode: 1
+  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: 0
+  spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
-  alphaIsTransparency: 1
+  alphaIsTransparency: 0
   spriteTessellationDetail: -1
-  textureType: 8
+  textureType: 0
   textureShape: 1
   singleChannelComponent: 0
   flipbookRows: 1
@@ -65,53 +65,14 @@ TextureImporter:
   ignorePngGamma: 0
   applyGammaDecoding: 0
   swizzle: 50462976
-  cookieLightType: 1
+  cookieLightType: 0
   platformSettings:
   - serializedVersion: 4
     buildTarget: DefaultTexturePlatform
-    maxTextureSize: 128
-    resizeAlgorithm: 0
-    textureFormat: 4
-    textureCompression: 0
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 4
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: 4
-    textureCompression: 0
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 4
-    buildTarget: Android
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: 4
-    textureCompression: 0
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 4
-    buildTarget: WebGL
     maxTextureSize: 2048
     resizeAlgorithm: 0
-    textureFormat: 4
-    textureCompression: 0
+    textureFormat: -1
+    textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
@@ -120,11 +81,11 @@ TextureImporter:
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 4
-    buildTarget: Server
+    buildTarget: Standalone
     maxTextureSize: 2048
     resizeAlgorithm: 0
-    textureFormat: 4
-    textureCompression: 0
+    textureFormat: -1
+    textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
@@ -134,10 +95,10 @@ TextureImporter:
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 4
     buildTarget: iOS
-    maxTextureSize: 512
+    maxTextureSize: 2048
     resizeAlgorithm: 0
-    textureFormat: 4
-    textureCompression: 0
+    textureFormat: -1
+    textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
@@ -152,7 +113,7 @@ TextureImporter:
     customData: 
     physicsShape: []
     bones: []
-    spriteID: 5e97eb03825dee720800000000000000
+    spriteID: 
     internalID: 0
     vertices: []
     indices: 
diff --git a/Basic/DistributedAuthoritySocialHub/Assets/UI/Mobile/Images/UI_Icon_Throw.png b/Basic/DistributedAuthoritySocialHub/Assets/UI/Mobile/Images/UI_Icon_Throw.png
new file mode 100644
index 000000000..c8f8173e2
Binary files /dev/null and b/Basic/DistributedAuthoritySocialHub/Assets/UI/Mobile/Images/UI_Icon_Throw.png differ
diff --git a/Basic/DistributedAuthoritySocialHub/Assets/UI/Mobile/Images/UI_Icon_Throw.png.meta b/Basic/DistributedAuthoritySocialHub/Assets/UI/Mobile/Images/UI_Icon_Throw.png.meta
new file mode 100644
index 000000000..ae5fcc355
--- /dev/null
+++ b/Basic/DistributedAuthoritySocialHub/Assets/UI/Mobile/Images/UI_Icon_Throw.png.meta
@@ -0,0 +1,130 @@
+fileFormatVersion: 2
+guid: 798694af43ba34d55bd37cf071869600
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  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
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 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
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 4
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: iOS
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    customData: 
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Basic/DistributedAuthoritySocialHub/Assets/UI/Mobile/MobileOverrides.uss b/Basic/DistributedAuthoritySocialHub/Assets/UI/Mobile/MobileOverrides.uss
new file mode 100644
index 000000000..8ec1c6e40
--- /dev/null
+++ b/Basic/DistributedAuthoritySocialHub/Assets/UI/Mobile/MobileOverrides.uss
@@ -0,0 +1,116 @@
+* {
+    --menu-button-size: 80px;
+    --menu-button-font-size: 32px;
+    --regular-font-size: 26px;
+}
+
+.pickup-indicator__keycode{
+    display: none;
+}
+
+
+#burger-button{
+    display: none;
+}
+
+.menu-button {
+    margin-bottom: 20px;
+}
+
+.textfield{
+    min-height: 60px;
+    margin-bottom: 20px;
+}
+
+.textfield > .unity-base-field__label {
+    min-width: 220px;
+    overflow: visible;
+}
+
+.text-chat {
+    position: absolute;
+    top: -80%;
+    left: 50%;
+    height: 80%;
+    width: 60%;
+    translate: -50% 0;
+    transition: top 0.2s ease-in-out;
+}
+
+.text-chat__collapsebutton{
+    -unity-font-style: bold;
+    position: absolute;
+    padding-left: 10px;
+    bottom: -100px;
+    width: 120px;
+    height: 90px;
+    rotate: -270deg;
+    left: 50%;
+    translate: -50% 0;
+    background-position-x: left 22px;
+}
+
+
+.text-chat--visible > .text-chat_background-overlay {
+    opacity: 1;
+    display: flex;
+}
+
+.text-chat--visible > .text-chat__collapsebutton {
+    background-position-x: left 0px;
+}
+
+.text-chat__ui{
+    border-radius: var(--border-radius);
+}
+.text-chat__submit {
+    min-width: 120px;
+}
+
+.text-chat--visible {
+    top: 0px;
+}
+
+.ingame-panel {
+    min-width: 600px;
+    padding: 48px;
+}
+
+.slider {
+}
+
+.slider .unity-base-slider__tracker {
+    border-radius: 9px;
+    height: 18px;
+    opacity: 0.5;
+    border-color: transparent;
+}
+
+.slider .unity-base-slider__dragger {
+    width: 36px;
+    height: 36px;
+    background-color: var(--highlight-color);
+    border-radius: var(--border-radius--small);
+    border-width: 0;
+}
+
+.unity-toggle__checkmark{
+    width: 36px;
+    height: 36px;
+}
+
+.unity-base-field{
+    margin-bottom: 16px;
+}
+
+.setting--section{
+    font-size: var(--regular-font-size);
+}
+
+.unity-base-field__label, .unity-base-field__input {
+    font-size: var(--menu-button-font-size);
+}
+
+
+
+
diff --git a/Basic/DistributedAuthoritySocialHub/Assets/UI/Mobile/MobileOverrides.uss.meta b/Basic/DistributedAuthoritySocialHub/Assets/UI/Mobile/MobileOverrides.uss.meta
new file mode 100644
index 000000000..447fc61e2
--- /dev/null
+++ b/Basic/DistributedAuthoritySocialHub/Assets/UI/Mobile/MobileOverrides.uss.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: ea9efe379dfd4506ad59f7fe609e1c85
+timeCreated: 1732804800
\ No newline at end of file
diff --git a/Basic/DistributedAuthoritySocialHub/Assets/UI/Mobile/TouchScreenInputStyle.uss b/Basic/DistributedAuthoritySocialHub/Assets/UI/Mobile/TouchScreenInputStyle.uss
new file mode 100644
index 000000000..8af3245cb
--- /dev/null
+++ b/Basic/DistributedAuthoritySocialHub/Assets/UI/Mobile/TouchScreenInputStyle.uss
@@ -0,0 +1,148 @@
+* {
+    --joystick-size: 330px;
+    --base-button-size: 110px;
+}
+
+.flex-grow {
+    flex-grow: 1;
+}
+
+.touchscreen-button {
+    margin: 0;
+    padding: 0;
+    background-image: url("project://database/Assets/UI/Mobile/Images/UI_Circle_Grey_Base.png");
+}
+
+.touchscreen-button:checked {
+    translate: 3%;
+    -unity-background-image-tint-color: rgb(200, 200, 200);
+}
+
+.touchscreen-button > .unity-toggle__input {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    width: 60%;
+    height: 60%;
+    translate: -50%;
+}
+
+.touchscreen-button > .unity-toggle__input > .unity-toggle__checkmark {
+    display: none;
+}
+
+.button-icon {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    width: 60%;
+    height: 60%;
+    translate: -50%;
+}
+
+.joystick {
+    flex-grow: 1;
+    background-image: url("project://database/Assets/UI/Mobile/Images/UI_Circle_Faded.png?fileID=21300000&guid=90ded0611e490aa4ba6961afbfc2280d&type=3#UI_Circle_Faded");
+    width: var(--joystick-size);
+    height: var(--joystick-size);
+}
+
+.joystick > .touchscreen-button {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    width: 130px;
+    height: 130px;
+    translate: -50%;
+}
+
+.joystick:active > .touchscreen-button {
+    -unity-background-image-tint-color: rgb(200, 200, 200);
+}
+
+.joystick--left {
+    position: absolute;
+    left: 100px;
+    bottom: 80px;
+}
+
+.joystick--left .button-icon {
+    background-image: url("project://database/Assets/UI/Mobile/Images/UI_Icon_Move.png?fileID=21300000&guid=ff7bfa7addf40784d86f62b8e4a034a6&type=3#UI_Icon_Move");
+}
+
+.joystick--right {
+    position: absolute;
+    right: 100px;
+    bottom: 180px;
+}
+
+.joystick--right .button-icon {
+    background-image: url("project://database/Assets/UI/Mobile/Images/UI_Icon_Look.png?fileID=21300000&guid=af0ae2dbf3d1efb4f82af377950704a2&type=3#UI_Icon_Look");
+}
+
+#PlayerContainer {
+    position: absolute;
+    bottom: 180px;
+    right: 100px;
+    width: var(--joystick-size);
+    height: var(--joystick-size);
+}
+
+#ButtonJump {
+    position: absolute;
+    width: var(--base-button-size);
+    height: var(--base-button-size);
+    left: -100px;
+    top: -80px;
+}
+
+#ButtonJump > .unity-toggle__input {
+    background-image: url("project://database/Assets/UI/Mobile/Images/UI_Icon_Jump.png?fileID=21300000&guid=751aa1b6637101946b2fdbb7aa27d6ad&type=3#UI_Icon_Jump");
+}
+
+#ButtonInteract {
+    position: absolute;
+    left: -190px;
+    top: 50%;
+    width: var(--base-button-size);
+    height: var(--base-button-size);
+    translate: 0 -50%;
+}
+
+#ButtonInteract > .unity-toggle__input {
+    background-image: url("project://database/Assets/UI/Mobile/Images/UI_Icon_Pickup.png?fileID=2800000&guid=9c35a306c5b6f45f3924517141faa229&type=3#UI_Icon_Pickup");
+}
+
+#ButtonInteract.state-carry > .unity-toggle__input {
+    background-image: url("project://database/Assets/UI/Mobile/Images/UI_Icon_Throw.png?fileID=2800000&guid=798694af43ba34d55bd37cf071869600&type=3#UI_Icon_Throw");
+}
+
+#ButtonMenu {
+    position: absolute;
+    top: 80px;
+    left: 80px;
+    width: var(--base-button-size);
+    height: var(--base-button-size);
+    background-image: url("project://database/Assets/UI/Mobile/Images/UI_Circle_Yellow_Base.png");
+}
+
+#ButtonMenu > .unity-toggle__input {
+    background-image: url("project://database/Assets/UI/Mobile/Images/UI_Icon_Menu.png?fileID=21300000&guid=19b39eab737618246a838095105404bc&type=3#UI_Icon_Menu");
+}
+
+#ButtonSprint {
+    position: absolute;
+    left: -100px;
+    width: var(--base-button-size);
+    height: var(--base-button-size);
+    bottom: -80px;
+}
+
+#ButtonSprint:checked {
+    -unity-background-image-tint-color: rgb(100, 150, 100);
+    translate: 0;
+}
+
+#ButtonSprint > .unity-toggle__input {
+    background-image: url("project://database/Assets/UI/Mobile/Images/UI_Icon_Sprint.png?fileID=2800000&guid=56cfe655155ed480ebbb4381cab94e76&type=3#UI_Icon_Sprint");
+}
diff --git a/Basic/DistributedAuthoritySocialHub/Assets/UI Toolkit/Mobile/TouchScreenInputStyle.uss.meta b/Basic/DistributedAuthoritySocialHub/Assets/UI/Mobile/TouchScreenInputStyle.uss.meta
similarity index 100%
rename from Basic/DistributedAuthoritySocialHub/Assets/UI Toolkit/Mobile/TouchScreenInputStyle.uss.meta
rename to Basic/DistributedAuthoritySocialHub/Assets/UI/Mobile/TouchScreenInputStyle.uss.meta
diff --git a/Basic/DistributedAuthoritySocialHub/Assets/UI Toolkit/Mobile/TouchScreenInputUI.uxml b/Basic/DistributedAuthoritySocialHub/Assets/UI/Mobile/TouchScreenInputUI.uxml
similarity index 85%
rename from Basic/DistributedAuthoritySocialHub/Assets/UI Toolkit/Mobile/TouchScreenInputUI.uxml
rename to Basic/DistributedAuthoritySocialHub/Assets/UI/Mobile/TouchScreenInputUI.uxml
index 88c006ae8..918b9ee40 100644
--- a/Basic/DistributedAuthoritySocialHub/Assets/UI Toolkit/Mobile/TouchScreenInputUI.uxml	
+++ b/Basic/DistributedAuthoritySocialHub/Assets/UI/Mobile/TouchScreenInputUI.uxml
@@ -1,5 +1,5 @@
 <ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../../../UIElementsSchema/UIElements.xsd" editor-extension-mode="False">
-    <Style src="project://database/Assets/UI%20Toolkit/Mobile/TouchScreenInputStyle.uss?fileID=7433441132597879392&amp;guid=65f131e357a5ced4b9f5d34f036bd440&amp;type=3#TouchScreenInputStyle" />
+    <Style src="project://database/Assets/UI/Mobile/TouchScreenInputStyle.uss?fileID=7433441132597879392&amp;guid=65f131e357a5ced4b9f5d34f036bd440&amp;type=3#TouchScreenInputStyle" />
     <ui:VisualElement picking-mode="Ignore" class="flex-grow">
         <ui:VisualElement name="JoystickMove" class="joystick joystick--left">
             <ui:VisualElement picking-mode="Ignore" usage-hints="DynamicTransform" name="Stick" class="touchscreen-button">
@@ -14,7 +14,6 @@
         <ui:VisualElement picking-mode="Ignore" name="PlayerContainer" class="flex-grow">
             <Unity.Multiplayer.Samples.SocialHub.UI.PressedButton name="ButtonJump" class="touchscreen-button" />
             <Unity.Multiplayer.Samples.SocialHub.UI.PressedButton name="ButtonSprint" class="touchscreen-button" />
-            <ui:Toggle name="ButtonToggleNetworkStats" class="touchscreen-button" />
             <Unity.Multiplayer.Samples.SocialHub.UI.PressedButton name="ButtonInteract" class="touchscreen-button" />
         </ui:VisualElement>
         <Unity.Multiplayer.Samples.SocialHub.UI.PressedButton name="ButtonMenu" class="touchscreen-button" />
diff --git a/Basic/DistributedAuthoritySocialHub/Assets/UI Toolkit/Mobile/TouchScreenInputUI.uxml.meta b/Basic/DistributedAuthoritySocialHub/Assets/UI/Mobile/TouchScreenInputUI.uxml.meta
similarity index 100%
rename from Basic/DistributedAuthoritySocialHub/Assets/UI Toolkit/Mobile/TouchScreenInputUI.uxml.meta
rename to Basic/DistributedAuthoritySocialHub/Assets/UI/Mobile/TouchScreenInputUI.uxml.meta
diff --git a/Basic/DistributedAuthoritySocialHub/Assets/UI/ScreenspacePanelSettings.asset b/Basic/DistributedAuthoritySocialHub/Assets/UI/ScreenspacePanelSettings.asset
index 3bd207985..1ef537238 100644
--- a/Basic/DistributedAuthoritySocialHub/Assets/UI/ScreenspacePanelSettings.asset
+++ b/Basic/DistributedAuthoritySocialHub/Assets/UI/ScreenspacePanelSettings.asset
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 19101, guid: 0000000000000000e000000000000000, type: 0}
   m_Name: ScreenspacePanelSettings
   m_EditorClassIdentifier: 
-  themeUss: {fileID: -4733365628477956816, guid: 16179bdf163bda5448611f1be545e640, type: 3}
+  themeUss: {fileID: -4733365628477956816, guid: 89ae0dd3081b94d4da461cab61352ab3, type: 3}
   m_DisableNoThemeWarning: 0
   m_TargetTexture: {fileID: 0}
   m_RenderMode: 0
diff --git a/Basic/DistributedAuthoritySocialHub/Assets/UI/Textures/icon_arrow.png b/Basic/DistributedAuthoritySocialHub/Assets/UI/Textures/icon_arrow.png
new file mode 100644
index 000000000..104a11059
Binary files /dev/null and b/Basic/DistributedAuthoritySocialHub/Assets/UI/Textures/icon_arrow.png differ
diff --git a/Basic/DistributedAuthoritySocialHub/Assets/UI/Textures/icon_arrow.png.meta b/Basic/DistributedAuthoritySocialHub/Assets/UI/Textures/icon_arrow.png.meta
new file mode 100644
index 000000000..b1620d413
--- /dev/null
+++ b/Basic/DistributedAuthoritySocialHub/Assets/UI/Textures/icon_arrow.png.meta
@@ -0,0 +1,130 @@
+fileFormatVersion: 2
+guid: 26de36c45382b4176ac53bc7a2e74e90
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  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
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 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
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 4
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: iOS
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    customData: 
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Basic/DistributedAuthoritySocialHub/Assets/UI/Textures/icon_send.png b/Basic/DistributedAuthoritySocialHub/Assets/UI/Textures/icon_send.png
new file mode 100644
index 000000000..eba587d2c
Binary files /dev/null and b/Basic/DistributedAuthoritySocialHub/Assets/UI/Textures/icon_send.png differ
diff --git a/Basic/DistributedAuthoritySocialHub/Assets/UI/Textures/icon_send.png.meta b/Basic/DistributedAuthoritySocialHub/Assets/UI/Textures/icon_send.png.meta
new file mode 100644
index 000000000..f8e7a0af3
--- /dev/null
+++ b/Basic/DistributedAuthoritySocialHub/Assets/UI/Textures/icon_send.png.meta
@@ -0,0 +1,130 @@
+fileFormatVersion: 2
+guid: 72b7d5348da81408099819d725e06390
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  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
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 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
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 4
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: iOS
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    customData: 
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Basic/DistributedAuthoritySocialHub/Assets/UI/Textures/menu_button_selection_indicator.png b/Basic/DistributedAuthoritySocialHub/Assets/UI/Textures/menu_button_selection_indicator.png
index 2443c02d0..572f26739 100644
Binary files a/Basic/DistributedAuthoritySocialHub/Assets/UI/Textures/menu_button_selection_indicator.png and b/Basic/DistributedAuthoritySocialHub/Assets/UI/Textures/menu_button_selection_indicator.png differ
diff --git a/Basic/DistributedAuthoritySocialHub/Assets/UI/Uss/Global.uss b/Basic/DistributedAuthoritySocialHub/Assets/UI/Uss/Global.uss
index 7a2110217..4efb404fc 100644
--- a/Basic/DistributedAuthoritySocialHub/Assets/UI/Uss/Global.uss
+++ b/Basic/DistributedAuthoritySocialHub/Assets/UI/Uss/Global.uss
@@ -14,6 +14,7 @@
     --mic-icon-size: 36px;
     --menu-button-size: 60px;
     --menu-button-font-size: 30px;
+    --regular-font-size: 20px;
     -unity-font-definition: var(--script-font);
 }
 
@@ -88,9 +89,11 @@
 }
 
 .menu-button--round:focus {
+    border-width: 5px;
+    border-color:  var(--secondary-color);
     -unity-text-outline-color: var(--main-color);
     -unity-text-outline-width: 2px;
-    scale: 1.2 1.2;
+    scale: 1.1 1.1;
 }
 
 .menu-button--ingame {
@@ -99,13 +102,15 @@
 }
 
 .menu-button--ingame:focus {
+    border-width: 5px;
+    border-color:  var(--secondary-color);
     -unity-text-outline-color: var(--main-color);
     -unity-text-outline-width: 2px;
-    scale: 1.2 1.2;
+    scale: 1.1 1.1;
 }
 
 .textfield {
-    font-size: 20px;
+    font-size: var(--regular-font-size);
     -unity-text-align: middle-left;
     min-height: 40px;
     margin-bottom: 10px;
@@ -122,10 +127,23 @@
 }
 
 .textfield:focus .unity-base-text-field__input {
-    border-color: var(--secondary-color);
+    border-color: var(--highlight-color);
+    scale: 1.005 1.005;
 }
 
-.slider {
+.slider{
+    margin: 0;
+    padding: 4px;
+    border-width: var(--border-width);
+    border-radius: var(--border-radius);
+    border-color: transparent;
+}
+
+.slider:focus {
+    border-width: var(--border-width);
+    border-radius: var(--border-radius);
+    border-color: var(--highlight-color);
+    scale: 1.005 1.005;
 }
 
 .slider .unity-base-slider__tracker {
@@ -145,6 +163,11 @@
     margin: 0;
 }
 
+.dropdown:focus .unity-popup-field__input{
+    border-color: var(--highlight-color);
+    scale: 1.005 1.005;
+}
+
 .dropdown .unity-popup-field__input {
     margin: 0;
     border-radius: var(--border-radius);
@@ -157,11 +180,28 @@
     border-radius: var(--border-radius--small);
 }
 
+.setting--section--headline{
+    font-size: var(--regular-font-size);
+}
+
 .setting--section {
     padding: 10px;
     background-color: rgba(255, 255, 255, 0.2);
 }
 
+.setting--section .unity-toggle{
+    margin: 0;
+    padding: 4px;
+    border-radius: var(--border-radius);
+    border-color: transparent;
+    border-width: var(--border-width);
+    scale: 1.005 1.005;
+}
+
+.setting--section .unity-toggle:focus {
+    border-color: var(--highlight-color);
+}
+
 .unity-scroller__slider .unity-base-slider__tracker {
     background-color: var(--secondary-color);
     opacity: 0.5;
@@ -190,8 +230,11 @@
     border-color: var(--dark-text-color);
 }
 
-.text-big {
-    font-size: 20px;
-    margin: 0;
+.unity-base-field__label, .unity-base-field__input {
+    font-size: var(--regular-font-size);
+}
+
+.fullscreen-container{
+    position: absolute; width: 100%; height: 100%;
 }
 
diff --git a/Basic/DistributedAuthoritySocialHub/Assets/UI/Uss/HomeScreen.uss b/Basic/DistributedAuthoritySocialHub/Assets/UI/Uss/HomeScreen.uss
index 92ec3179d..8663bd8e9 100644
--- a/Basic/DistributedAuthoritySocialHub/Assets/UI/Uss/HomeScreen.uss
+++ b/Basic/DistributedAuthoritySocialHub/Assets/UI/Uss/HomeScreen.uss
@@ -18,9 +18,9 @@
 }
 
 #container_menu {
-    margin-top: 22%;
-    padding-left: 15%;
-    padding-right: 15%;
+    margin-top: 100px;
+    padding-left: 12%;
+    padding-right: 12%;
 }
 
 #container_buttons {
diff --git a/Basic/DistributedAuthoritySocialHub/Assets/UI/Uss/Ingame.uss b/Basic/DistributedAuthoritySocialHub/Assets/UI/Uss/Ingame.uss
index 52d7e1ad1..27f0925ff 100644
--- a/Basic/DistributedAuthoritySocialHub/Assets/UI/Uss/Ingame.uss
+++ b/Basic/DistributedAuthoritySocialHub/Assets/UI/Uss/Ingame.uss
@@ -120,22 +120,11 @@
 #burger-button {
     position: absolute;
     -unity-font-style: bold;
-    font-size: 18px;
+    font-size: var(--regular-font-size);
     left: 20px;
     top: 20px;
 }
 
-#sceen-overlay {
-    transition-property: opacity;
-    transition-duration: 100ms;
-    transition-timing-function: ease-in-out-sine;
-    position: absolute;
-    left: 0;
-    width: 100%;
-    height: 100%;
-    background-color: rgba(0, 0, 0, 0.95);
-}
-
 .ingame-panel {
     border-radius: var(--border-radius);
     -unity-font-definition: var(--script-font);
@@ -180,10 +169,11 @@
 
 .text-chat--visible > .text-chat__collapsebutton {
     scale: -1 1;
+    background-position-x: left 0px;
 }
 
 .text-chat__ui {
-    font-size: 18px;
+    font-size: var(--regular-font-size);
     flex-grow: 1;
     background-color: var(--main-color);
     border-radius: var(--border-radius);
@@ -194,7 +184,8 @@
 .text-chat__collapsebutton {
     -unity-font-style: bold;
     position: absolute;
-    padding-left: 10px;
+    background-position-x: left 15px;
+    padding-left: 20px;
     bottom: 100px;
     width: 80px;
     right: -75px;
@@ -220,10 +211,21 @@
 }
 
 .text-chat__submit {
-    font-size: 29px;
+    font-size: var(--menu-button-font-size);
     min-width: 60px;
 }
 
+.background-overlay{
+    display: none;
+    width: 3000px;
+    height: 3000px;
+    position: absolute;
+    background-color: rgba(62, 43, 39, 0.80);
+    opacity: 1;
+    left: -50%;
+    transition: opacity 0.2s linear;
+}
+
 #input-container {
     padding: 8px;
     flex-grow: 0;
@@ -252,3 +254,13 @@
     flex-grow: 1;
     flex-shrink: 1;
 }
+
+.icon-submit{
+    background-image: url("project://database/Assets/UI/Textures/icon_send.png?fileID=2800000&amp;guid=72b7d5348da81408099819d725e06390&amp;type=3#icon_send");
+    background-size: contain;
+}
+
+.icon-arrow{
+    background-image: url("project://database/Assets/UI/Textures/icon_arrow.png?fileID=2800000&amp;guid=26de36c45382b4176ac53bc7a2e74e90&amp;type=3#icon_arrow");
+    background-size: contain;
+}
diff --git a/Basic/DistributedAuthoritySocialHub/Assets/UI/Uss/UnityDefaultRuntimeTheme.tss b/Basic/DistributedAuthoritySocialHub/Assets/UI/Uss/UnityDefaultRuntimeTheme.tss
new file mode 100644
index 000000000..79453c7fa
--- /dev/null
+++ b/Basic/DistributedAuthoritySocialHub/Assets/UI/Uss/UnityDefaultRuntimeTheme.tss
@@ -0,0 +1,2 @@
+@import url("unity-theme://default");
+VisualElement {}
\ No newline at end of file
diff --git a/Basic/DistributedAuthoritySocialHub/Assets/UI Toolkit/UnityThemes/UnityDefaultRuntimeTheme.tss.meta b/Basic/DistributedAuthoritySocialHub/Assets/UI/Uss/UnityDefaultRuntimeTheme.tss.meta
similarity index 87%
rename from Basic/DistributedAuthoritySocialHub/Assets/UI Toolkit/UnityThemes/UnityDefaultRuntimeTheme.tss.meta
rename to Basic/DistributedAuthoritySocialHub/Assets/UI/Uss/UnityDefaultRuntimeTheme.tss.meta
index 177d9a629..dadca9450 100644
--- a/Basic/DistributedAuthoritySocialHub/Assets/UI Toolkit/UnityThemes/UnityDefaultRuntimeTheme.tss.meta	
+++ b/Basic/DistributedAuthoritySocialHub/Assets/UI/Uss/UnityDefaultRuntimeTheme.tss.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 16179bdf163bda5448611f1be545e640
+guid: 89ae0dd3081b94d4da461cab61352ab3
 ScriptedImporter:
   internalIDToNameTable: []
   externalObjects: {}
diff --git a/Basic/DistributedAuthoritySocialHub/Assets/UI/Uxml/Ingame/IngameMenu.uxml b/Basic/DistributedAuthoritySocialHub/Assets/UI/Uxml/Ingame/IngameMenu.uxml
index 51b4d1dd3..919e8961a 100644
--- a/Basic/DistributedAuthoritySocialHub/Assets/UI/Uxml/Ingame/IngameMenu.uxml
+++ b/Basic/DistributedAuthoritySocialHub/Assets/UI/Uxml/Ingame/IngameMenu.uxml
@@ -3,17 +3,17 @@
     <Style src="project://database/Assets/UI/Uss/Ingame.uss?fileID=7433441132597879392&amp;guid=a4ed441e385d14fd08257a42a99ce094&amp;type=3#Ingame" />
     <ui:VisualElement name="in-game-menu" picking-mode="Ignore" style="flex-grow: 1;">
         <Unity.Multiplayer.Samples.SocialHub.UI.MenuButton text="☰" name="burger-button" focusable="false" class="menu-button--round" />
-        <ui:VisualElement name="sceen-overlay" style="background-color: rgba(0, 0, 0, 0); top: 3px; left: 0;" />
+        <ui:VisualElement name="screen-overlay" class="background-overlay" />
         <ui:VisualElement name="menu" class="ingame-panel">
             <Unity.Multiplayer.Samples.SocialHub.UI.MenuButton text="Go to Main Menu" name="btn-goto-main" />
             <Unity.Multiplayer.Samples.SocialHub.UI.MenuButton text="Exit Application" name="btn-exit" />
-            <ui:Label text="Audio Settings&#10;" name="Label" class="text-big" style="-unity-text-align: upper-center;" />
+            <ui:Label text="Audio Settings&#10;" name="Label" class="setting--section--headline" style="-unity-text-align: upper-center;" />
             <ui:VisualElement name="audio" class="border--standard setting--section">
-                <ui:Label text="Input:&#10;" name="input-label" class="text-big" />
+                <ui:Label text="Input:&#10;" name="input-label" />
                 <ui:DropdownField name="audio-input" class="dropdown" />
                 <ui:Slider value="42" high-value="100" name="input-volume" label="Volume" class="slider" />
                 <ui:Toggle label="Mute" name="mute-checkbox" />
-                <ui:Label text="Output:" name="output-label" class="text-big" />
+                <ui:Label text="Output:" name="output-label" />
                 <ui:DropdownField name="audio-output" class="dropdown" />
                 <ui:Slider value="42" high-value="100" name="output-volume" label="Volume" class="slider" />
             </ui:VisualElement>
diff --git a/Basic/DistributedAuthoritySocialHub/Assets/UI/Uxml/Ingame/ScreenspaceContainer.uxml b/Basic/DistributedAuthoritySocialHub/Assets/UI/Uxml/Ingame/ScreenspaceContainer.uxml
index 912daa91d..3d63ffb8c 100644
--- a/Basic/DistributedAuthoritySocialHub/Assets/UI/Uxml/Ingame/ScreenspaceContainer.uxml
+++ b/Basic/DistributedAuthoritySocialHub/Assets/UI/Uxml/Ingame/ScreenspaceContainer.uxml
@@ -1,8 +1,9 @@
 <engine:UXML xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:engine="UnityEngine.UIElements" xmlns:editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../../../UIElementsSchema/UIElements.xsd" editor-extension-mode="False">
     <Style src="project://database/Assets/UI/Uss/Global.uss?fileID=7433441132597879392&amp;guid=dd4dac81c4e217440a3543f354c31a02&amp;type=3#Global" />
     <Style src="project://database/Assets/UI/Uss/Ingame.uss?fileID=7433441132597879392&amp;guid=a4ed441e385d14fd08257a42a99ce094&amp;type=3#Ingame" />
-    <engine:VisualElement name="player-top-display-container" picking-mode="Ignore" style="flex-grow: 1; position: absolute; width: 100%; height: 100%;" />
-    <engine:VisualElement name="player-carry-container" picking-mode="Ignore" style="flex-grow: 1; position: absolute; width: 100%; height: 100%;" />
-    <engine:VisualElement name="textchat-container" picking-mode="Ignore" style="flex-grow: 1;" />
-    <engine:VisualElement name="ingame-menu-container" picking-mode="Ignore" style="flex-grow: 1; position: absolute; width: 100%; height: 100%;" />
+    <engine:VisualElement name="player-top-display-container" picking-mode="Ignore" class="fullscreen-container" />
+    <engine:VisualElement name="player-carry-container" picking-mode="Ignore" class="fullscreen-container" />
+    <engine:VisualElement name="touch-ui-container" picking-mode="Ignore" class="fullscreen-container" />
+    <engine:VisualElement name="ingame-menu-container" picking-mode="Ignore" class="fullscreen-container" />
+    <engine:VisualElement name="textchat-container" picking-mode="Ignore" class="fullscreen-container" />
 </engine:UXML>
diff --git a/Basic/DistributedAuthoritySocialHub/Assets/UI/Uxml/Ingame/TextChat/ChatUI.uxml b/Basic/DistributedAuthoritySocialHub/Assets/UI/Uxml/Ingame/TextChat/ChatUI.uxml
index f09dbc589..cc84a1ce4 100644
--- a/Basic/DistributedAuthoritySocialHub/Assets/UI/Uxml/Ingame/TextChat/ChatUI.uxml
+++ b/Basic/DistributedAuthoritySocialHub/Assets/UI/Uxml/Ingame/TextChat/ChatUI.uxml
@@ -1,13 +1,12 @@
 <ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" editor-extension-mode="False">
-    <Style src="project://database/Assets/UI/Uss/Global.uss?fileID=7433441132597879392&amp;guid=dd4dac81c4e217440a3543f354c31a02&amp;type=3#Global" />
-    <Style src="project://database/Assets/UI/Uss/Ingame.uss?fileID=7433441132597879392&amp;guid=a4ed441e385d14fd08257a42a99ce094&amp;type=3#Ingame" />
     <ui:VisualElement name="text-chat" class="text-chat">
-        <ui:Button text="➜" name="visibility-button" focusable="false" class="menu-button text-chat__collapsebutton menu-button--ingame" />
+        <ui:VisualElement name="background-overlay" class="background-overlay text-chat_background-overlay" />
+        <ui:Button name="visibility-button" class="menu-button text-chat__collapsebutton menu-button--ingame icon-arrow" />
         <ui:VisualElement class="text-chat__ui border--standard">
             <ui:ListView name="message-list" data-source-type="Unity.Multiplayer.Samples.SocialHub.UI.TextChatManager, Unity.Multiplayer.Samples.SocialHub.UI" binding-source-selection-mode="AutoAssign" item-template="project://database/Assets/UI/Uxml/Ingame/TextChat/MessageItem.uxml?fileID=9197481963319205126&amp;guid=074af7e65339c44568d0bea5b558d5de&amp;type=3#MessageItem" virtualization-method="DynamicHeight" horizontal-scrolling="false" class="list-view text-chat__messagelist" />
             <ui:VisualElement name="input-container">
                 <ui:TextField name="input-text" tabindex="1" class="textfield text-chat__messageinput" />
-                <ui:Button name="submit" text="✔" tabindex="2" class="menu-button text-chat__submit menu-button--ingame" />
+                <ui:Button name="submit" tabindex="2" class="menu-button text-chat__submit menu-button--ingame icon-submit" />
             </ui:VisualElement>
         </ui:VisualElement>
     </ui:VisualElement>
diff --git a/Basic/DistributedAuthoritySocialHub/Assets/UI/Uxml/Ingame/WorldspaceContainer.uxml b/Basic/DistributedAuthoritySocialHub/Assets/UI/Uxml/Ingame/WorldspaceContainer.uxml
index bfb67cd29..7ed4d35af 100644
--- a/Basic/DistributedAuthoritySocialHub/Assets/UI/Uxml/Ingame/WorldspaceContainer.uxml
+++ b/Basic/DistributedAuthoritySocialHub/Assets/UI/Uxml/Ingame/WorldspaceContainer.uxml
@@ -1,5 +1,5 @@
 <engine:UXML xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:engine="UnityEngine.UIElements" xmlns:editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../../../UIElementsSchema/UIElements.xsd" editor-extension-mode="False">
     <Style src="project://database/Assets/UI/Uss/Global.uss?fileID=7433441132597879392&amp;guid=dd4dac81c4e217440a3543f354c31a02&amp;type=3#Global" />
     <Style src="project://database/Assets/UI/Uss/Ingame.uss?fileID=7433441132597879392&amp;guid=a4ed441e385d14fd08257a42a99ce094&amp;type=3#Ingame" />
-    <engine:VisualElement name="Pickup" style="flex-grow: 1; position: absolute; width: 100%; height: 100%;" />
+    <engine:VisualElement name="Pickup" class="fullscreen-container" />
 </engine:UXML>
diff --git a/Basic/DistributedAuthoritySocialHub/Assets/UI/WorldspaceUI.asset b/Basic/DistributedAuthoritySocialHub/Assets/UI/WorldspaceUI.asset
index e2b2b9105..869d7ef7f 100644
--- a/Basic/DistributedAuthoritySocialHub/Assets/UI/WorldspaceUI.asset
+++ b/Basic/DistributedAuthoritySocialHub/Assets/UI/WorldspaceUI.asset
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 19101, guid: 0000000000000000e000000000000000, type: 0}
   m_Name: WorldspaceUI
   m_EditorClassIdentifier: 
-  themeUss: {fileID: -4733365628477956816, guid: 16179bdf163bda5448611f1be545e640, type: 3}
+  themeUss: {fileID: -4733365628477956816, guid: 89ae0dd3081b94d4da461cab61352ab3, type: 3}
   m_DisableNoThemeWarning: 0
   m_TargetTexture: {fileID: 0}
   m_RenderMode: 1
diff --git a/Basic/DistributedAuthoritySocialHub/ProjectSettings/ProjectSettings.asset b/Basic/DistributedAuthoritySocialHub/ProjectSettings/ProjectSettings.asset
index 2544109fa..855d862b0 100644
--- a/Basic/DistributedAuthoritySocialHub/ProjectSettings/ProjectSettings.asset
+++ b/Basic/DistributedAuthoritySocialHub/ProjectSettings/ProjectSettings.asset
@@ -59,8 +59,8 @@ PlayerSettings:
   iosShowActivityIndicatorOnLoading: -1
   androidShowActivityIndicatorOnLoading: -1
   iosUseCustomAppBackgroundBehavior: 0
-  allowedAutorotateToPortrait: 1
-  allowedAutorotateToPortraitUpsideDown: 1
+  allowedAutorotateToPortrait: 0
+  allowedAutorotateToPortraitUpsideDown: 0
   allowedAutorotateToLandscapeRight: 1
   allowedAutorotateToLandscapeLeft: 1
   useOSAutorotation: 1
diff --git a/CHANGELOG.md b/CHANGELOG.md
index abc4d5f84..52a9f6ae1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@
 - Textchat feature has been added. Chat is using Vivox, UI was integrated using UI Toolkit. (#258)
 - Mobile and gamepad support, with associated UI for mobile controls using UIToolkit has been integrated to the sample (#256)
 - Positional voicechat feature has been added. Chat is using Vivox, UI was integrated using UI Toolkit. See limitations in PR.(#261)
+- Improve usability on Mobile, general UI improvements. 
 
 
 #### Changed