diff --git a/Assets/Prefabs/UI/CharacterSelectCanvas.prefab b/Assets/Prefabs/UI/CharacterSelectCanvas.prefab
index 037b9c120..9484dfc79 100644
--- a/Assets/Prefabs/UI/CharacterSelectCanvas.prefab
+++ b/Assets/Prefabs/UI/CharacterSelectCanvas.prefab
@@ -183,15 +183,17 @@ MonoBehaviour:
   m_lineSpacingMax: 0
   m_paragraphSpacing: 0
   m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
+  m_TextWrappingMode: 1
   m_wordWrappingRatios: 0.4
   m_overflowMode: 0
   m_linkedTextComponent: {fileID: 0}
   parentLinkedComponent: {fileID: 0}
   m_enableKerning: 1
+  m_ActiveFontFeatures: 6e72656b
   m_enableExtraPadding: 0
   checkPaddingRequired: 0
   m_isRichText: 1
+  m_EmojiFallbackSupport: 1
   m_parseCtrlCharacters: 1
   m_isOrthographic: 1
   m_isCullingEnabled: 0
@@ -317,15 +319,17 @@ MonoBehaviour:
   m_lineSpacingMax: 0
   m_paragraphSpacing: 0
   m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
+  m_TextWrappingMode: 1
   m_wordWrappingRatios: 0.4
   m_overflowMode: 3
   m_linkedTextComponent: {fileID: 0}
   parentLinkedComponent: {fileID: 0}
   m_enableKerning: 1
+  m_ActiveFontFeatures: 6e72656b
   m_enableExtraPadding: 0
   checkPaddingRequired: 0
   m_isRichText: 1
+  m_EmojiFallbackSupport: 1
   m_parseCtrlCharacters: 1
   m_isOrthographic: 1
   m_isCullingEnabled: 0
@@ -453,15 +457,17 @@ MonoBehaviour:
   m_lineSpacingMax: 0
   m_paragraphSpacing: 0
   m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
+  m_TextWrappingMode: 1
   m_wordWrappingRatios: 0.4
   m_overflowMode: 0
   m_linkedTextComponent: {fileID: 0}
   parentLinkedComponent: {fileID: 0}
   m_enableKerning: 1
+  m_ActiveFontFeatures: 6e72656b
   m_enableExtraPadding: 0
   checkPaddingRequired: 0
   m_isRichText: 1
+  m_EmojiFallbackSupport: 1
   m_parseCtrlCharacters: 1
   m_isOrthographic: 1
   m_isCullingEnabled: 0
@@ -592,15 +598,17 @@ MonoBehaviour:
   m_lineSpacingMax: 0
   m_paragraphSpacing: 0
   m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
+  m_TextWrappingMode: 1
   m_wordWrappingRatios: 0.4
   m_overflowMode: 0
   m_linkedTextComponent: {fileID: 0}
   parentLinkedComponent: {fileID: 0}
   m_enableKerning: 1
+  m_ActiveFontFeatures: 00000000
   m_enableExtraPadding: 0
   checkPaddingRequired: 0
   m_isRichText: 1
+  m_EmojiFallbackSupport: 1
   m_parseCtrlCharacters: 1
   m_isOrthographic: 1
   m_isCullingEnabled: 0
@@ -908,15 +916,17 @@ MonoBehaviour:
   m_lineSpacingMax: 0
   m_paragraphSpacing: 0
   m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
+  m_TextWrappingMode: 1
   m_wordWrappingRatios: 0.4
   m_overflowMode: 0
   m_linkedTextComponent: {fileID: 0}
   parentLinkedComponent: {fileID: 0}
   m_enableKerning: 1
+  m_ActiveFontFeatures: 6e72656b
   m_enableExtraPadding: 0
   checkPaddingRequired: 0
   m_isRichText: 1
+  m_EmojiFallbackSupport: 1
   m_parseCtrlCharacters: 1
   m_isOrthographic: 1
   m_isCullingEnabled: 0
@@ -1042,15 +1052,17 @@ MonoBehaviour:
   m_lineSpacingMax: 0
   m_paragraphSpacing: 0
   m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
+  m_TextWrappingMode: 1
   m_wordWrappingRatios: 0.4
   m_overflowMode: 0
   m_linkedTextComponent: {fileID: 0}
   parentLinkedComponent: {fileID: 0}
   m_enableKerning: 1
+  m_ActiveFontFeatures: 6e72656b
   m_enableExtraPadding: 0
   checkPaddingRequired: 0
   m_isRichText: 1
+  m_EmojiFallbackSupport: 1
   m_parseCtrlCharacters: 1
   m_isOrthographic: 1
   m_isCullingEnabled: 0
@@ -1385,15 +1397,17 @@ MonoBehaviour:
   m_lineSpacingMax: 0
   m_paragraphSpacing: 0
   m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
+  m_TextWrappingMode: 1
   m_wordWrappingRatios: 0.4
   m_overflowMode: 0
   m_linkedTextComponent: {fileID: 0}
   parentLinkedComponent: {fileID: 0}
   m_enableKerning: 1
+  m_ActiveFontFeatures: 00000000
   m_enableExtraPadding: 0
   checkPaddingRequired: 0
   m_isRichText: 1
+  m_EmojiFallbackSupport: 1
   m_parseCtrlCharacters: 1
   m_isOrthographic: 1
   m_isCullingEnabled: 0
@@ -1595,15 +1609,17 @@ MonoBehaviour:
   m_lineSpacingMax: 0
   m_paragraphSpacing: 0
   m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
+  m_TextWrappingMode: 1
   m_wordWrappingRatios: 0.4
   m_overflowMode: 3
   m_linkedTextComponent: {fileID: 0}
   parentLinkedComponent: {fileID: 0}
   m_enableKerning: 1
+  m_ActiveFontFeatures: 6e72656b
   m_enableExtraPadding: 0
   checkPaddingRequired: 0
   m_isRichText: 1
+  m_EmojiFallbackSupport: 1
   m_parseCtrlCharacters: 1
   m_isOrthographic: 1
   m_isCullingEnabled: 0
@@ -1729,15 +1745,17 @@ MonoBehaviour:
   m_lineSpacingMax: 0
   m_paragraphSpacing: 0
   m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
+  m_TextWrappingMode: 1
   m_wordWrappingRatios: 0.4
   m_overflowMode: 3
   m_linkedTextComponent: {fileID: 0}
   parentLinkedComponent: {fileID: 0}
   m_enableKerning: 1
+  m_ActiveFontFeatures: 6e72656b
   m_enableExtraPadding: 0
   checkPaddingRequired: 0
   m_isRichText: 1
+  m_EmojiFallbackSupport: 1
   m_parseCtrlCharacters: 1
   m_isOrthographic: 1
   m_isCullingEnabled: 0
@@ -1886,6 +1904,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 79e7ca3e19eb99c4f97ff06a95ef7dac, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  m_PointAction: {fileID: -1959881153152325168, guid: add476edce0d24d26bcdaf1681449ecf, type: 3}
   m_TooltipPopup: {fileID: 5940892342300009070}
   m_TooltipText: Ability 3
   m_ActivateOnClick: 1
@@ -2192,15 +2211,17 @@ MonoBehaviour:
   m_lineSpacingMax: 0
   m_paragraphSpacing: 0
   m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
+  m_TextWrappingMode: 1
   m_wordWrappingRatios: 0.4
   m_overflowMode: 0
   m_linkedTextComponent: {fileID: 0}
   parentLinkedComponent: {fileID: 0}
   m_enableKerning: 1
+  m_ActiveFontFeatures: 6e72656b
   m_enableExtraPadding: 0
   checkPaddingRequired: 0
   m_isRichText: 1
+  m_EmojiFallbackSupport: 1
   m_parseCtrlCharacters: 1
   m_isOrthographic: 1
   m_isCullingEnabled: 0
@@ -2628,6 +2649,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 79e7ca3e19eb99c4f97ff06a95ef7dac, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  m_PointAction: {fileID: -1959881153152325168, guid: add476edce0d24d26bcdaf1681449ecf, type: 3}
   m_TooltipPopup: {fileID: 5940892342300009070}
   m_TooltipText: Ability 1
   m_ActivateOnClick: 1
@@ -2720,6 +2742,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 79e7ca3e19eb99c4f97ff06a95ef7dac, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  m_PointAction: {fileID: -1959881153152325168, guid: add476edce0d24d26bcdaf1681449ecf, type: 3}
   m_TooltipPopup: {fileID: 5940892342300009070}
   m_TooltipText: Ability 2
   m_ActivateOnClick: 1
@@ -2927,15 +2950,17 @@ MonoBehaviour:
   m_lineSpacingMax: 0
   m_paragraphSpacing: 0
   m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
+  m_TextWrappingMode: 1
   m_wordWrappingRatios: 0.4
   m_overflowMode: 0
   m_linkedTextComponent: {fileID: 0}
   parentLinkedComponent: {fileID: 0}
   m_enableKerning: 1
+  m_ActiveFontFeatures: 00000000
   m_enableExtraPadding: 0
   checkPaddingRequired: 0
   m_isRichText: 1
+  m_EmojiFallbackSupport: 1
   m_parseCtrlCharacters: 1
   m_isOrthographic: 1
   m_isCullingEnabled: 0
@@ -3061,15 +3086,17 @@ MonoBehaviour:
   m_lineSpacingMax: 0
   m_paragraphSpacing: 0
   m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
+  m_TextWrappingMode: 1
   m_wordWrappingRatios: 0.4
   m_overflowMode: 0
   m_linkedTextComponent: {fileID: 0}
   parentLinkedComponent: {fileID: 0}
   m_enableKerning: 1
+  m_ActiveFontFeatures: 6e72656b
   m_enableExtraPadding: 0
   checkPaddingRequired: 0
   m_isRichText: 1
+  m_EmojiFallbackSupport: 1
   m_parseCtrlCharacters: 1
   m_isOrthographic: 1
   m_isCullingEnabled: 0
@@ -3600,6 +3627,10 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 5940892341490189322}
     m_Modifications:
+    - target: {fileID: 463572819075978806, guid: ff848390065bf914fb60582f4d872815, type: 3}
+      propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
+      value: 1801810542
+      objectReference: {fileID: 0}
     - target: {fileID: 857184778587777497, guid: ff848390065bf914fb60582f4d872815, type: 3}
       propertyPath: m_SizeDelta.x
       value: -128.157
@@ -3898,6 +3929,10 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 5940892341490189322}
     m_Modifications:
+    - target: {fileID: 463572819075978806, guid: ff848390065bf914fb60582f4d872815, type: 3}
+      propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
+      value: 1801810542
+      objectReference: {fileID: 0}
     - target: {fileID: 857184778587777497, guid: ff848390065bf914fb60582f4d872815, type: 3}
       propertyPath: m_SizeDelta.x
       value: -56.959
@@ -4076,6 +4111,10 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 5940892341490189322}
     m_Modifications:
+    - target: {fileID: 463572819075978806, guid: ff848390065bf914fb60582f4d872815, type: 3}
+      propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
+      value: 1801810542
+      objectReference: {fileID: 0}
     - target: {fileID: 857184778587777497, guid: ff848390065bf914fb60582f4d872815, type: 3}
       propertyPath: m_SizeDelta.x
       value: -56.959
@@ -4382,6 +4421,10 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 5940892341490189322}
     m_Modifications:
+    - target: {fileID: 463572819075978806, guid: ff848390065bf914fb60582f4d872815, type: 3}
+      propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
+      value: 1801810542
+      objectReference: {fileID: 0}
     - target: {fileID: 857184778587777497, guid: ff848390065bf914fb60582f4d872815, type: 3}
       propertyPath: m_SizeDelta.x
       value: -64.078
@@ -4560,6 +4603,10 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 5940892341490189322}
     m_Modifications:
+    - target: {fileID: 463572819075978806, guid: ff848390065bf914fb60582f4d872815, type: 3}
+      propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
+      value: 1801810542
+      objectReference: {fileID: 0}
     - target: {fileID: 857184778587777497, guid: ff848390065bf914fb60582f4d872815, type: 3}
       propertyPath: m_SizeDelta.x
       value: -64.079
@@ -4870,6 +4917,10 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 5940892341490189322}
     m_Modifications:
+    - target: {fileID: 463572819075978806, guid: ff848390065bf914fb60582f4d872815, type: 3}
+      propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
+      value: 1801810542
+      objectReference: {fileID: 0}
     - target: {fileID: 857184778587777497, guid: ff848390065bf914fb60582f4d872815, type: 3}
       propertyPath: m_SizeDelta.x
       value: -64.078
@@ -5110,6 +5161,10 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 5940892341490189322}
     m_Modifications:
+    - target: {fileID: 463572819075978806, guid: ff848390065bf914fb60582f4d872815, type: 3}
+      propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
+      value: 1801810542
+      objectReference: {fileID: 0}
     - target: {fileID: 857184778587777497, guid: ff848390065bf914fb60582f4d872815, type: 3}
       propertyPath: m_SizeDelta.x
       value: -62.37
@@ -5296,6 +5351,10 @@ PrefabInstance:
       propertyPath: m_Enabled
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 463572819075978806, guid: ff848390065bf914fb60582f4d872815, type: 3}
+      propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
+      value: 1801810542
+      objectReference: {fileID: 0}
     - target: {fileID: 857184778587777497, guid: ff848390065bf914fb60582f4d872815, type: 3}
       propertyPath: m_SizeDelta.x
       value: -83.065
diff --git a/Assets/Prefabs/UI/Hero Action Bar.prefab b/Assets/Prefabs/UI/Hero Action Bar.prefab
index f704047a9..89c284d68 100644
--- a/Assets/Prefabs/UI/Hero Action Bar.prefab	
+++ b/Assets/Prefabs/UI/Hero Action Bar.prefab	
@@ -28,9 +28,9 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 9059929381734582209}
-  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 0}
@@ -107,9 +107,9 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 9059929380243764539}
-  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 0}
@@ -186,9 +186,9 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 9059929381413149715}
-  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 0}
@@ -265,9 +265,9 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 9059929380544550687}
-  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 0}
@@ -344,9 +344,9 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 9059929381734582209}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -425,11 +425,11 @@ RectTransform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 9059929380362573694}
   - {fileID: 6756708193988222877}
   m_Father: {fileID: 9059929381720062002}
-  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -530,9 +530,11 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 79e7ca3e19eb99c4f97ff06a95ef7dac, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  m_PointAction: {fileID: -1959881153152325168, guid: add476edce0d24d26bcdaf1681449ecf, type: 3}
   m_TooltipPopup: {fileID: 0}
   m_TooltipText: 
   m_ActivateOnClick: 1
+  m_TooltipDelay: 0.5
 --- !u!1 &9059929380362573693
 GameObject:
   m_ObjectHideFlags: 0
@@ -561,9 +563,9 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 9059929380243764539}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -642,11 +644,11 @@ RectTransform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 9059929380831878973}
   - {fileID: 6487434095397898390}
   m_Father: {fileID: 9059929381720062002}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -747,9 +749,11 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 79e7ca3e19eb99c4f97ff06a95ef7dac, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  m_PointAction: {fileID: -1959881153152325168, guid: add476edce0d24d26bcdaf1681449ecf, type: 3}
   m_TooltipPopup: {fileID: 0}
   m_TooltipText: 
   m_ActivateOnClick: 1
+  m_TooltipDelay: 0.5
 --- !u!1 &9059929380831878972
 GameObject:
   m_ObjectHideFlags: 0
@@ -778,9 +782,9 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 9059929380544550687}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -859,11 +863,11 @@ RectTransform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 9059929381991440441}
   - {fileID: 7648382187687077328}
   m_Father: {fileID: 9059929381720062002}
-  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -964,9 +968,11 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 79e7ca3e19eb99c4f97ff06a95ef7dac, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  m_PointAction: {fileID: -1959881153152325168, guid: add476edce0d24d26bcdaf1681449ecf, type: 3}
   m_TooltipPopup: {fileID: 0}
   m_TooltipText: 
   m_ActivateOnClick: 1
+  m_TooltipDelay: 0.5
 --- !u!1 &9059929381720062001
 GameObject:
   m_ObjectHideFlags: 0
@@ -997,13 +1003,13 @@ RectTransform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 9059929380544550687}
   - {fileID: 9059929381734582209}
   - {fileID: 9059929380243764539}
   - {fileID: 9059929381413149715}
   m_Father: {fileID: 0}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0}
   m_AnchorMax: {x: 1, y: 0}
@@ -1089,6 +1095,7 @@ MonoBehaviour:
   m_SpecialAction2Button: {fileID: 9059929380243764532}
   m_EmoteBarButton: {fileID: 9059929381413149708}
   m_EmotePanel: {fileID: 0}
+  m_ToggleEmoteBarAction: {fileID: 0}
 --- !u!1 &9059929381734582208
 GameObject:
   m_ObjectHideFlags: 0
@@ -1119,11 +1126,11 @@ RectTransform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 9059929380136398067}
   - {fileID: 6467281658954913184}
   m_Father: {fileID: 9059929381720062002}
-  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -1224,9 +1231,11 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 79e7ca3e19eb99c4f97ff06a95ef7dac, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  m_PointAction: {fileID: -1959881153152325168, guid: add476edce0d24d26bcdaf1681449ecf, type: 3}
   m_TooltipPopup: {fileID: 0}
   m_TooltipText: 
   m_ActivateOnClick: 1
+  m_TooltipDelay: 0.5
 --- !u!1 &9059929381991440440
 GameObject:
   m_ObjectHideFlags: 0
@@ -1255,9 +1264,9 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 9059929381413149715}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
diff --git a/Assets/Prefabs/UI/MainMenu UI Canvas.prefab b/Assets/Prefabs/UI/MainMenu UI Canvas.prefab
index 76ffd5a41..5750330c1 100644
--- a/Assets/Prefabs/UI/MainMenu UI Canvas.prefab	
+++ b/Assets/Prefabs/UI/MainMenu UI Canvas.prefab	
@@ -1269,6 +1269,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 79e7ca3e19eb99c4f97ff06a95ef7dac, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  m_PointAction: {fileID: -1959881153152325168, guid: add476edce0d24d26bcdaf1681449ecf, type: 3}
   m_TooltipPopup: {fileID: 5331930138599208077}
   m_TooltipText: Unity Gaming Services ProjectID not set up. Click the Readme file
     in the Assets Folder within the Project window in-editor to follow "How to set
diff --git a/Assets/Scenes/CharSelect.unity b/Assets/Scenes/CharSelect.unity
index 9f0ebf2c9..ed6534642 100644
--- a/Assets/Scenes/CharSelect.unity
+++ b/Assets/Scenes/CharSelect.unity
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c6a5265bf0ca09c6b28dcae65872484dff2863485796af00bd8b072c14867c07
-size 50272
+oid sha256:b0a1012444ca7683272cb5372585c2c7917395ef9691159dd85bce962b36e772
+size 50035
diff --git a/Assets/Scripts/Gameplay/UI/UIHUDButton.cs b/Assets/Scripts/Gameplay/UI/UIHUDButton.cs
index 30e1bbf0f..ff8e1c50f 100644
--- a/Assets/Scripts/Gameplay/UI/UIHUDButton.cs
+++ b/Assets/Scripts/Gameplay/UI/UIHUDButton.cs
@@ -9,7 +9,7 @@ namespace Unity.BossRoom.Gameplay.UI
     /// Provides logic for a UI HUD Button to slightly shrink scale on pointer down.
     /// Also has an optional code interface for receiving notifications about down/up events (instead of just on-click)
     /// </summary>
-    public class UIHUDButton : Button/*, IPointerDownHandler, IPointerUpHandler*/
+    public class UIHUDButton : Button
     {
         // We apply a uniform 95% scale to buttons when pressed
         static readonly Vector3 k_DownScale = new Vector3(0.95f, 0.95f, 0.95f);
diff --git a/Assets/Scripts/Gameplay/UI/UITooltipDetector.cs b/Assets/Scripts/Gameplay/UI/UITooltipDetector.cs
index 094d69b27..7ef98d7ff 100644
--- a/Assets/Scripts/Gameplay/UI/UITooltipDetector.cs
+++ b/Assets/Scripts/Gameplay/UI/UITooltipDetector.cs
@@ -1,6 +1,7 @@
 using System;
 using UnityEngine;
 using UnityEngine.EventSystems;
+using UnityEngine.InputSystem;
 
 namespace Unity.BossRoom.Gameplay.UI
 {
@@ -13,27 +14,30 @@ namespace Unity.BossRoom.Gameplay.UI
     /// - the main camera in the scene has a PhysicsRaycaster component
     /// - if you're attaching this to a UI element such as an Image, make sure you check the "Raycast Target" checkbox
     /// </remarks>
-    public class UITooltipDetector : MonoBehaviour/*, IPointerEnterHandler, IPointerExitHandler, IPointerClickHandler*/
+    public class UITooltipDetector : MonoBehaviour, IPointerEnterHandler, IPointerExitHandler, IPointerClickHandler
     {
+        [SerializeField]
+        InputActionReference m_PointAction;
+        
         [SerializeField]
         [Tooltip("The actual Tooltip that should be triggered")]
-        private UITooltipPopup m_TooltipPopup;
+        UITooltipPopup m_TooltipPopup;
 
         [SerializeField]
         [Multiline]
         [Tooltip("The text of the tooltip (this is the default text; it can also be changed in code)")]
-        private string m_TooltipText;
+        string m_TooltipText;
 
         [SerializeField]
         [Tooltip("Should the tooltip appear instantly if the player clicks this UI element?")]
-        private bool m_ActivateOnClick = true;
+        bool m_ActivateOnClick = true;
 
         [SerializeField]
         [Tooltip("The length of time the mouse needs to hover over this element before the tooltip appears (in seconds)")]
-        private float m_TooltipDelay = 0.5f;
+        float m_TooltipDelay = 0.5f;
 
-        private float m_PointerEnterTime = 0;
-        private bool m_IsShowingTooltip;
+        float m_PointerEnterTime = 0;
+        bool m_IsShowingTooltip;
 
         public void SetText(string text)
         {
@@ -66,7 +70,7 @@ public void OnPointerClick(PointerEventData eventData)
             }
         }
 
-        private void Update()
+        void Update()
         {
             if (m_PointerEnterTime != 0 && (Time.time - m_PointerEnterTime) > m_TooltipDelay)
             {
@@ -74,16 +78,16 @@ private void Update()
             }
         }
 
-        private void ShowTooltip()
+        void ShowTooltip()
         {
             if (!m_IsShowingTooltip)
             {
-                m_TooltipPopup.ShowTooltip(m_TooltipText, Input.mousePosition);
+                m_TooltipPopup.ShowTooltip(m_TooltipText, m_PointAction.action.ReadValue<Vector2>());
                 m_IsShowingTooltip = true;
             }
         }
 
-        private void HideTooltip()
+        void HideTooltip()
         {
             if (m_IsShowingTooltip)
             {
@@ -93,7 +97,7 @@ private void HideTooltip()
         }
 
 #if UNITY_EDITOR
-        private void OnValidate()
+        void OnValidate()
         {
             if (gameObject.scene.rootCount > 1) // Hacky way for checking if this is a scene object or a prefab instance and not a prefab definition.
             {
diff --git a/Assets/Scripts/Gameplay/UI/UITooltipPopup.cs b/Assets/Scripts/Gameplay/UI/UITooltipPopup.cs
index a863fa2ad..8b528e72f 100644
--- a/Assets/Scripts/Gameplay/UI/UITooltipPopup.cs
+++ b/Assets/Scripts/Gameplay/UI/UITooltipPopup.cs
@@ -12,16 +12,16 @@ namespace Unity.BossRoom.Gameplay.UI
     public class UITooltipPopup : MonoBehaviour
     {
         [SerializeField]
-        private Canvas m_Canvas;
+        Canvas m_Canvas;
         [SerializeField]
         [Tooltip("This transform is shown/hidden to show/hide the popup box")]
-        private GameObject m_WindowRoot;
+        GameObject m_WindowRoot;
         [SerializeField]
-        private TextMeshProUGUI m_TextField;
+        TextMeshProUGUI m_TextField;
         [SerializeField]
-        private Vector3 m_CursorOffset;
+        Vector3 m_CursorOffset;
 
-        private void Awake()
+        void Awake()
         {
             Assert.IsNotNull(m_Canvas);
         }
@@ -48,7 +48,7 @@ public void HideTooltip()
         /// <summary>
         /// Maps screen coordinates (e.g. Input.mousePosition) to coordinates on our Canvas.
         /// </summary>
-        private Vector3 GetCanvasCoords(Vector3 screenCoords)
+        Vector3 GetCanvasCoords(Vector3 screenCoords)
         {
             Vector2 canvasCoords;
             RectTransformUtility.ScreenPointToLocalPointInRectangle(
@@ -60,7 +60,7 @@ private Vector3 GetCanvasCoords(Vector3 screenCoords)
         }
 
 #if UNITY_EDITOR
-        private void OnValidate()
+        void OnValidate()
         {
             if (gameObject.scene.rootCount > 1) // Hacky way for checking if this is a scene object or a prefab instance and not a prefab definition.
             {