diff --git a/build/workflow/templates/dotnet6-install-windows.yml b/build/workflow/templates/dotnet6-install-windows.yml
index a30532e94..d6f872db1 100644
--- a/build/workflow/templates/dotnet6-install-windows.yml
+++ b/build/workflow/templates/dotnet6-install-windows.yml
@@ -32,3 +32,23 @@ steps:
     errorActionPreference: continue
     ignoreLASTEXITCODE: true
     retryCountOnTaskFailure: 3
+
+  # https://github.com/actions/runner-images/issues/6082#issuecomment-1215100175
+  - powershell: |
+      Set-Location "C:\Program Files (x86)\Microsoft Visual Studio\Installer\"
+      $InstallPath = "C:\Program Files\Microsoft Visual Studio\2022\Enterprise"
+      $componentsToAdd = @(
+        "Component.Xamarin"
+      )
+      [string]$workloadArgs = $componentsToAdd | ForEach-Object {" --add " +  $_}
+      $Arguments = ('/c', "vs_installer.exe", 'modify', '--installPath', "`"$InstallPath`"",$workloadArgs, '--quiet', '--norestart', '--nocache')
+      $process = Start-Process -FilePath cmd.exe -ArgumentList $Arguments -Wait -PassThru -WindowStyle Hidden
+      if ($process.ExitCode -eq 0)
+      {
+          Write-Host "components have been successfully added"
+      }
+      else
+      {
+          Write-Host "components were not installed"
+          exit 1
+      }
diff --git a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Droid/Uno.Toolkit.Samples.Droid.csproj b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Droid/Uno.Toolkit.Samples.Droid.csproj
index a5df57e90..60c487c32 100644
--- a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Droid/Uno.Toolkit.Samples.Droid.csproj
+++ b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Droid/Uno.Toolkit.Samples.Droid.csproj
@@ -66,13 +66,13 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Uno.Cupertino">
-      <Version>2.2.0</Version>
+      <Version>2.3.0-dev.4</Version>
     </PackageReference>
     <PackageReference Include="Uno.Material">
-      <Version>2.2.0</Version>
+      <Version>2.3.0-dev.4</Version>
     </PackageReference>
-    <PackageReference Include="Uno.UI" Version="4.3.6" />
-    <PackageReference Include="Uno.UI.RemoteControl" Version="4.3.6" Condition="'$(Configuration)'=='Debug'" />
+    <PackageReference Include="Uno.UI" Version="4.5.0-dev.453" />
+    <PackageReference Include="Uno.UI.RemoteControl" Version="4.5.0-dev.453" Condition="'$(Configuration)'=='Debug'" />
     <PackageReference Include="Uno.UniversalImageLoader" Version="1.9.35" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
@@ -82,7 +82,7 @@
     <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData">
       <Version>2.3.1.1</Version>
     </PackageReference>
-    <PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.3.6" />
+    <PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.5.0-dev.453" />
     <PackageReference Include="Uno.Core.Extensions.Compatibility" Version="4.0.1" />
     <PackageReference Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />
   </ItemGroup>
@@ -135,4 +135,4 @@
       <Compile Remove="$(_AndroidResourceDesignerFile)" />
     </ItemGroup>
   </Target>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Skia.Gtk/Uno.Toolkit.Samples.Skia.Gtk.csproj b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Skia.Gtk/Uno.Toolkit.Samples.Skia.Gtk.csproj
index c5ed846c2..3d15dfcfc 100644
--- a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Skia.Gtk/Uno.Toolkit.Samples.Skia.Gtk.csproj
+++ b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Skia.Gtk/Uno.Toolkit.Samples.Skia.Gtk.csproj
@@ -29,11 +29,11 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
-    <PackageReference Include="Uno.Cupertino" Version="2.2.0" />
-    <PackageReference Include="Uno.Material" Version="2.2.0" />
-    <PackageReference Include="Uno.UI.Skia.Gtk" Version="4.3.6" />
-    <PackageReference Include="Uno.UI.RemoteControl" Version="4.3.6" Condition="'$(Configuration)'=='Debug'" />
-		<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.3.6" />
+    <PackageReference Include="Uno.Cupertino" Version="2.3.0-dev.4" />
+    <PackageReference Include="Uno.Material" Version="2.3.0-dev.4" />
+    <PackageReference Include="Uno.UI.Skia.Gtk" Version="4.5.0-dev.453" />
+    <PackageReference Include="Uno.UI.RemoteControl" Version="4.5.0-dev.453" Condition="'$(Configuration)'=='Debug'" />
+		<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.5.0-dev.453" />
 		<PackageReference Include="Uno.Core.Extensions.Compatibility" Version="4.0.1" />
 		<PackageReference Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />
 	</ItemGroup>
diff --git a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.UWP/Uno.Toolkit.Samples.UWP.csproj b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.UWP/Uno.Toolkit.Samples.UWP.csproj
index f5df6f113..3623693a0 100644
--- a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.UWP/Uno.Toolkit.Samples.UWP.csproj
+++ b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.UWP/Uno.Toolkit.Samples.UWP.csproj
@@ -12,12 +12,12 @@
     </PackageReference>
     <PackageReference Include="Microsoft.UI.Xaml" Version="2.6.0-prerelease.210623001" />
     <PackageReference Include="Uno.Cupertino">
-      <Version>2.2.0</Version>
+      <Version>2.3.0-dev.4</Version>
     </PackageReference>
     <PackageReference Include="Uno.Material">
-      <Version>2.2.0</Version>
+      <Version>2.3.0-dev.4</Version>
     </PackageReference>
-    <PackageReference Include="Uno.UI" Version="4.3.6" />
+    <PackageReference Include="Uno.UI" Version="4.5.0-dev.453" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="5.0.0" />
     <PackageReference Include="Uno.Core.Extensions.Compatibility" Version="4.0.1" />
@@ -189,4 +189,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
\ No newline at end of file
diff --git a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Wasm/Uno.Toolkit.Samples.Wasm.csproj b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Wasm/Uno.Toolkit.Samples.Wasm.csproj
index 2a1dcb941..90847fdb6 100644
--- a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Wasm/Uno.Toolkit.Samples.Wasm.csproj
+++ b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Wasm/Uno.Toolkit.Samples.Wasm.csproj
@@ -42,15 +42,15 @@
 	</ItemGroup>
 	<ItemGroup>
 		<PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
-		<PackageReference Include="Uno.Cupertino" Version="2.2.0" />
+		<PackageReference Include="Uno.Cupertino" Version="2.3.0-dev.4" />
 		<PackageReference Include="Uno.Extensions.Logging.WebAssembly.Console" Version="1.3.0-dev.1" />
-		<PackageReference Include="Uno.Material" Version="2.2.0" />
-		<PackageReference Include="Uno.UI.WebAssembly" Version="4.3.6" />
-		<PackageReference Include="Uno.UI.RemoteControl" Version="4.3.6" Condition="'$(Configuration)'=='Debug'" />
-		<PackageReference Include="Uno.Wasm.Bootstrap" Version="3.2.0" />
-		<PackageReference Include="Uno.Wasm.Bootstrap.DevServer" Version="3.2.0" />
+		<PackageReference Include="Uno.Material" Version="2.3.0-dev.4" />
+		<PackageReference Include="Uno.UI.WebAssembly" Version="4.5.0-dev.453" />
+		<PackageReference Include="Uno.UI.RemoteControl" Version="4.5.0-dev.453" Condition="'$(Configuration)'=='Debug'" />
+		<PackageReference Include="Uno.Wasm.Bootstrap" Version="4.0.0-dev.174" />
+		<PackageReference Include="Uno.Wasm.Bootstrap.DevServer" Version="4.0.0-dev.174" />
 		<PackageReference Include="Microsoft.Windows.Compatibility" Version="5.0.1" />
-		<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.3.6" />
+		<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.5.0-dev.453" />
 		<PackageReference Include="Uno.Core.Extensions.Compatibility" Version="4.0.1" />
 		<PackageReference Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />
 	</ItemGroup>
diff --git a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.iOS/Uno.Toolkit.Samples.iOS.csproj b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.iOS/Uno.Toolkit.Samples.iOS.csproj
index 4127ce938..1edec4ed4 100644
--- a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.iOS/Uno.Toolkit.Samples.iOS.csproj
+++ b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.iOS/Uno.Toolkit.Samples.iOS.csproj
@@ -191,16 +191,16 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="Uno.Cupertino">
-      <Version>2.2.0</Version>
+      <Version>2.3.0-dev.4</Version>
     </PackageReference>
     <PackageReference Include="Uno.Material">
-      <Version>2.2.0</Version>
+      <Version>2.3.0-dev.4</Version>
     </PackageReference>
-    <PackageReference Include="Uno.UI" Version="4.3.6" />
-    <PackageReference Include="Uno.UI.RemoteControl" Version="4.3.6" Condition="'$(Configuration)'=='Debug'" />
+    <PackageReference Include="Uno.UI" Version="4.5.0-dev.453" />
+    <PackageReference Include="Uno.UI.RemoteControl" Version="4.5.0-dev.453" Condition="'$(Configuration)'=='Debug'" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
     <PackageReference Include="Uno.Extensions.Logging.OSLog " Version="1.3.0-dev.1" />
-    <PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.3.6" />
+    <PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.5.0-dev.453" />
     <PackageReference Include="Uno.Core.Extensions.Compatibility" Version="4.0.1" />
     <PackageReference Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />
     <PackageReference Include="Xamarin.TestCloud.Agent">
@@ -224,4 +224,4 @@
   <ItemGroup />
   <Import Project="..\Uno.Toolkit.Samples.Shared\Uno.Toolkit.Samples.Shared.projitems" Label="Shared" />
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
-</Project>
+</Project>
\ No newline at end of file
diff --git a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.macOS/Uno.Toolkit.Samples.macOS.csproj b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.macOS/Uno.Toolkit.Samples.macOS.csproj
index 88d7557e6..86ef9cc49 100644
--- a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.macOS/Uno.Toolkit.Samples.macOS.csproj
+++ b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.macOS/Uno.Toolkit.Samples.macOS.csproj
@@ -75,16 +75,16 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Uno.Cupertino">
-      <Version>2.2.0</Version>
+      <Version>2.3.0-dev.4</Version>
     </PackageReference>
     <PackageReference Include="Uno.Material">
-      <Version>2.2.0</Version>
+      <Version>2.3.0-dev.4</Version>
     </PackageReference>
-    <PackageReference Include="Uno.UI" Version="4.3.6" />
-    <PackageReference Include="Uno.UI.RemoteControl" Version="4.3.6" Condition="'$(Configuration)'=='Debug'" />
+    <PackageReference Include="Uno.UI" Version="4.5.0-dev.453" />
+    <PackageReference Include="Uno.UI.RemoteControl" Version="4.5.0-dev.453" Condition="'$(Configuration)'=='Debug'" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
-    <PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.3.6" />
+    <PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.5.0-dev.453" />
     <PackageReference Include="Uno.Core.Extensions.Compatibility" Version="4.0.1" />
     <PackageReference Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />
   </ItemGroup>
@@ -157,4 +157,4 @@
       <ReferencePath Remove="@(_ReferencePathToRemove)" />
     </ItemGroup>
   </Target>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.Droid/Uno.Toolkit.WinUI.Samples.Droid.csproj b/samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.Droid/Uno.Toolkit.WinUI.Samples.Droid.csproj
index 6f907b66f..bcd5dc036 100644
--- a/samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.Droid/Uno.Toolkit.WinUI.Samples.Droid.csproj
+++ b/samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.Droid/Uno.Toolkit.WinUI.Samples.Droid.csproj
@@ -71,10 +71,10 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Uno.Material.WinUI">
-      <Version>2.2.0</Version>
+      <Version>2.3.0-dev.4</Version>
     </PackageReference>
-    <PackageReference Include="Uno.WinUI" Version="4.3.6" />
-    <PackageReference Include="Uno.WinUI.RemoteControl" Version="4.3.6" Condition="'$(Configuration)'=='Debug'" />
+    <PackageReference Include="Uno.WinUI" Version="4.5.0-dev.453" />
+    <PackageReference Include="Uno.WinUI.RemoteControl" Version="4.5.0-dev.453" Condition="'$(Configuration)'=='Debug'" />
     <PackageReference Include="Uno.UniversalImageLoader" Version="1.9.35" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
@@ -84,7 +84,7 @@
     <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData">
       <Version>2.3.1.1</Version>
     </PackageReference>
-    <PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.3.6" />
+    <PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.5.0-dev.453" />
     <PackageReference Include="Uno.Core.Extensions.Compatibility" Version="4.0.1" />
     <PackageReference Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />
   </ItemGroup>
@@ -136,4 +136,4 @@
       <Compile Remove="$(_AndroidResourceDesignerFile)" />
     </ItemGroup>
   </Target>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.Skia.Gtk/Uno.Toolkit.WinUI.Samples.Skia.Gtk.csproj b/samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.Skia.Gtk/Uno.Toolkit.WinUI.Samples.Skia.Gtk.csproj
index d1c2d84cd..cb6368859 100644
--- a/samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.Skia.Gtk/Uno.Toolkit.WinUI.Samples.Skia.Gtk.csproj
+++ b/samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.Skia.Gtk/Uno.Toolkit.WinUI.Samples.Skia.Gtk.csproj
@@ -34,10 +34,10 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
-    <PackageReference Include="Uno.Material.WinUI" Version="2.2.0" />
-    <PackageReference Include="Uno.WinUI.Skia.Gtk" Version="4.3.6" />
-    <PackageReference Include="Uno.WinUI.RemoteControl" Version="4.3.6" Condition="'$(Configuration)'=='Debug'" />
-		<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.3.6" />
+    <PackageReference Include="Uno.Material.WinUI" Version="2.3.0-dev.4" />
+    <PackageReference Include="Uno.WinUI.Skia.Gtk" Version="4.5.0-dev.453" />
+    <PackageReference Include="Uno.WinUI.RemoteControl" Version="4.5.0-dev.453" Condition="'$(Configuration)'=='Debug'" />
+		<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.5.0-dev.453" />
 		<PackageReference Include="Uno.Core.Extensions.Compatibility" Version="4.0.1" />
 		<PackageReference Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />
 	</ItemGroup>
diff --git a/samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.Wasm/Uno.Toolkit.WinUI.Samples.Wasm.csproj b/samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.Wasm/Uno.Toolkit.WinUI.Samples.Wasm.csproj
index 750e90d52..6c81f4e84 100644
--- a/samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.Wasm/Uno.Toolkit.WinUI.Samples.Wasm.csproj
+++ b/samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.Wasm/Uno.Toolkit.WinUI.Samples.Wasm.csproj
@@ -42,13 +42,13 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
     <PackageReference Include="Uno.Extensions.Logging.WebAssembly.Console" Version="1.3.0-dev.1" />
-    <PackageReference Include="Uno.Material.WinUI" Version="2.2.0" />
-    <PackageReference Include="Uno.WinUI.WebAssembly" Version="4.3.6" />
-    <PackageReference Include="Uno.WinUI.RemoteControl" Version="4.3.6" Condition="'$(Configuration)'=='Debug'" />
-	  <PackageReference Include="Uno.Wasm.Bootstrap" Version="3.2.0" />
-	  <PackageReference Include="Uno.Wasm.Bootstrap.DevServer" Version="3.2.0" />
+    <PackageReference Include="Uno.Material.WinUI" Version="2.3.0-dev.4" />
+    <PackageReference Include="Uno.WinUI.WebAssembly" Version="4.5.0-dev.453" />
+    <PackageReference Include="Uno.WinUI.RemoteControl" Version="4.5.0-dev.453" Condition="'$(Configuration)'=='Debug'" />
+	  <PackageReference Include="Uno.Wasm.Bootstrap" Version="4.0.0-dev.174" />
+	  <PackageReference Include="Uno.Wasm.Bootstrap.DevServer" Version="4.0.0-dev.174" />
 	  <PackageReference Include="Microsoft.Windows.Compatibility" Version="5.0.1" />
-		<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.3.6" />
+		<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.5.0-dev.453" />
 		<PackageReference Include="Uno.Core.Extensions.Compatibility" Version="4.0.1" />
 		<PackageReference Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />
 	</ItemGroup>
diff --git a/samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.Windows.Desktop/Uno.Toolkit.WinUI.Samples.Windows.Desktop.csproj b/samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.Windows.Desktop/Uno.Toolkit.WinUI.Samples.Windows.Desktop.csproj
index 6966a1d34..8f6c2e04a 100644
--- a/samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.Windows.Desktop/Uno.Toolkit.WinUI.Samples.Windows.Desktop.csproj
+++ b/samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.Windows.Desktop/Uno.Toolkit.WinUI.Samples.Windows.Desktop.csproj
@@ -13,12 +13,12 @@
 		<DefineConstants>$(DefineConstants);IS_WINUI</DefineConstants>
 	</PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.0" />
+		<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.1.0" />
 		<Manifest Include="$(ApplicationManifest)" />
 		<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
 		<PackageReference Include="Uno.Core.Extensions.Compatibility" Version="4.0.1" />
 		<PackageReference Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />
-		<PackageReference Include="Uno.Material.WinUI" Version="2.2.0" />
+		<PackageReference Include="Uno.Material.WinUI" Version="2.3.0-dev.4" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.Windows.Package/Uno.Toolkit.WinUI.Samples.Windows.Package.wapproj b/samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.Windows.Package/Uno.Toolkit.WinUI.Samples.Windows.Package.wapproj
index 8fa55715e..c8b16cbc7 100644
--- a/samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.Windows.Package/Uno.Toolkit.WinUI.Samples.Windows.Package.wapproj
+++ b/samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.Windows.Package/Uno.Toolkit.WinUI.Samples.Windows.Package.wapproj
@@ -71,7 +71,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.0">
+    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.1.0">
       <IncludeAssets>build</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22000.196">
diff --git a/samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.iOS/Uno.Toolkit.WinUI.Samples.iOS.csproj b/samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.iOS/Uno.Toolkit.WinUI.Samples.iOS.csproj
index 9421df4fa..c3427f77e 100644
--- a/samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.iOS/Uno.Toolkit.WinUI.Samples.iOS.csproj
+++ b/samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.iOS/Uno.Toolkit.WinUI.Samples.iOS.csproj
@@ -124,13 +124,13 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Uno.Material.WinUI">
-      <Version>2.2.0</Version>
+      <Version>2.3.0-dev.4</Version>
     </PackageReference>
-    <PackageReference Include="Uno.WinUI" Version="4.3.6" />
-    <PackageReference Include="Uno.WinUI.RemoteControl" Version="4.3.6" Condition="'$(Configuration)'=='Debug'" />
+    <PackageReference Include="Uno.WinUI" Version="4.5.0-dev.453" />
+    <PackageReference Include="Uno.WinUI.RemoteControl" Version="4.5.0-dev.453" Condition="'$(Configuration)'=='Debug'" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
     <PackageReference Include="Uno.Extensions.Logging.OSLog " Version="1.3.0-dev.1" />
-    <PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.3.6" />
+    <PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.5.0-dev.453" />
     <PackageReference Include="Uno.Core.Extensions.Compatibility" Version="4.0.1" />
     <PackageReference Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />
   </ItemGroup>
@@ -179,4 +179,4 @@
   </ItemGroup>
   <Import Project="..\..\Uno.Toolkit.Samples\Uno.Toolkit.Samples.Shared\Uno.Toolkit.Samples.Shared.projitems" Label="Shared" />
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
-</Project>
+</Project>
\ No newline at end of file
diff --git a/samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.macOS/Uno.Toolkit.WinUI.Samples.macOS.csproj b/samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.macOS/Uno.Toolkit.WinUI.Samples.macOS.csproj
index df5449197..cd6de0bea 100644
--- a/samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.macOS/Uno.Toolkit.WinUI.Samples.macOS.csproj
+++ b/samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.macOS/Uno.Toolkit.WinUI.Samples.macOS.csproj
@@ -74,13 +74,13 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Uno.Material.WinUI">
-      <Version>2.2.0</Version>
+      <Version>2.3.0-dev.4</Version>
     </PackageReference>
-    <PackageReference Include="Uno.WinUI" Version="4.3.6" />
-    <PackageReference Include="Uno.WinUI.RemoteControl" Version="4.3.6" Condition="'$(Configuration)'=='Debug'" />
+    <PackageReference Include="Uno.WinUI" Version="4.5.0-dev.453" />
+    <PackageReference Include="Uno.WinUI.RemoteControl" Version="4.5.0-dev.453" Condition="'$(Configuration)'=='Debug'" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
-    <PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.3.6" />
+    <PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.5.0-dev.453" />
     <PackageReference Include="Uno.Core.Extensions.Compatibility" Version="4.0.1" />
     <PackageReference Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />
   </ItemGroup>
@@ -150,4 +150,4 @@
       <ReferencePath Remove="@(_ReferencePathToRemove)" />
     </ItemGroup>
   </Target>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/src/Uno.Toolkit.UI/Uno.Toolkit.UI.csproj b/src/Uno.Toolkit.UI/Uno.Toolkit.UI.csproj
index 2e7cfae6a..e47c5684d 100644
--- a/src/Uno.Toolkit.UI/Uno.Toolkit.UI.csproj
+++ b/src/Uno.Toolkit.UI/Uno.Toolkit.UI.csproj
@@ -15,7 +15,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Uno.UI" Version="4.3.6" />
+		<PackageReference Include="Uno.UI" Version="4.5.0-dev.453" />
 		<PackageReference Include="Uno.Core.Extensions.Collections" Version="4.0.1" />
 		<PackageReference Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />
 		<PackageReference Include="Uno.Core.Extensions.Logging" Version="4.0.1" />
diff --git a/src/Uno.Toolkit.UI/Uno.Toolkit.WinUI.csproj b/src/Uno.Toolkit.UI/Uno.Toolkit.WinUI.csproj
index 33be28494..d12d19a54 100644
--- a/src/Uno.Toolkit.UI/Uno.Toolkit.WinUI.csproj
+++ b/src/Uno.Toolkit.UI/Uno.Toolkit.WinUI.csproj
@@ -12,10 +12,11 @@
 		<DefineConstants>$(DefineConstants);IS_WINUI</DefineConstants>
 		<AssemblyName>Uno.Toolkit.WinUI</AssemblyName>
 		<RootNamespace>Uno.Toolkit.UI</RootNamespace>
+		<LangVersion>9.0</LangVersion>
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Uno.WinUI" Version="4.3.6" />
+		<PackageReference Include="Uno.WinUI" Version="4.5.0-dev.453" />
 		<PackageReference Include="Uno.Core.Extensions.Collections" Version="4.0.1" />
 		<PackageReference Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />
 		<PackageReference Include="Uno.Core.Extensions.Logging" Version="4.0.1" />
@@ -25,7 +26,7 @@
 		<When Condition="'$(TargetFramework)'=='net5.0-windows10.0.18362'">
 
 			<ItemGroup>
-				<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.0" />
+				<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.1.0" />
 			</ItemGroup>
 
 		</When>
diff --git a/src/library/Uno.Toolkit.Cupertino/Uno.Toolkit.UI.Cupertino.csproj b/src/library/Uno.Toolkit.Cupertino/Uno.Toolkit.UI.Cupertino.csproj
index b90f68419..37735d6a3 100644
--- a/src/library/Uno.Toolkit.Cupertino/Uno.Toolkit.UI.Cupertino.csproj
+++ b/src/library/Uno.Toolkit.Cupertino/Uno.Toolkit.UI.Cupertino.csproj
@@ -15,8 +15,8 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Uno.Cupertino" Version="2.2.0" />
-		<PackageReference Include="Uno.UI" Version="4.3.6" />
+		<PackageReference Include="Uno.Cupertino" Version="2.3.0-dev.4" />
+		<PackageReference Include="Uno.UI" Version="4.5.0-dev.453" />
 	</ItemGroup>
 
 	<PropertyGroup>
diff --git a/src/library/Uno.Toolkit.Cupertino/Uno.Toolkit.WinUI.Cupertino.csproj b/src/library/Uno.Toolkit.Cupertino/Uno.Toolkit.WinUI.Cupertino.csproj
index 24f336fa3..c97b1ed79 100644
--- a/src/library/Uno.Toolkit.Cupertino/Uno.Toolkit.WinUI.Cupertino.csproj
+++ b/src/library/Uno.Toolkit.Cupertino/Uno.Toolkit.WinUI.Cupertino.csproj
@@ -17,8 +17,8 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Uno.Cupertino.WinUI" Version="2.2.0" />
-		<PackageReference Include="Uno.WinUI" Version="4.3.6" />
+		<PackageReference Include="Uno.Cupertino.WinUI" Version="2.3.0-dev.4" />
+		<PackageReference Include="Uno.WinUI" Version="4.5.0-dev.453" />
 	</ItemGroup>
 
 	<Choose>
@@ -44,7 +44,7 @@
 		<When Condition="'$(TargetFramework)'=='net5.0-windows10.0.18362'">
 
 			<ItemGroup>
-				<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.0" />
+				<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.1.0" />
 				<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" RuntimeFrameworkVersion="10.0.22000.24" Condition="'$(TargetFramework)'=='net5.0-windows10.0.18362'" />
 				<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" TargetingPackVersion="10.0.22000.24" Condition="'$(TargetFramework)'=='net5.0-windows10.0.18362'" />
 			</ItemGroup>
diff --git a/src/library/Uno.Toolkit.Material/Generated/mergedpages.uwp.v1.xaml b/src/library/Uno.Toolkit.Material/Generated/mergedpages.uwp.v1.xaml
index c72c584eb..37e3189db 100644
--- a/src/library/Uno.Toolkit.Material/Generated/mergedpages.uwp.v1.xaml
+++ b/src/library/Uno.Toolkit.Material/Generated/mergedpages.uwp.v1.xaml
@@ -28,7 +28,6 @@
   <x:Double x:Key="MaterialBottomTabBarItemIconWidth">22</x:Double>
   <Thickness x:Key="MaterialBottomTabBarItemContentMargin">0,0,0,6</Thickness>
   <Thickness x:Key="MaterialBottomTabBarItemContentOnlyMargin">12,0</Thickness>
-  <x:Double x:Key="AjustedMaterialBottomTabBarHeight">92</x:Double>
   <mobile:Style x:Key="MaterialBottomTabBarStyle" TargetType="utu:TabBar">
     <Setter Property="Background" Value="{ThemeResource MaterialBottomTabBarBackground}" />
     <Setter Property="IsTabStop" Value="False" />
@@ -47,25 +46,8 @@
     <Setter Property="Template">
       <Setter.Value>
         <ControlTemplate TargetType="utu:TabBar">
-          <!-- Code can be uncommented when this issue is fixed in Uno: -->
-          <!-- https://github.com/unoplatform/uno/issues/7393 -->
-          <!--<Grid x:Name="TabBarGrid"
-						  Background="{TemplateBinding Background}"
-						  BorderBrush="{TemplateBinding BorderBrush}"
-						  BorderThickness="{TemplateBinding BorderThickness}"
-						  Padding="{TemplateBinding Padding}">
-						<ItemsPresenter Height="{StaticResource MaterialBottomTabBarHeight}" />
-					</Grid>-->
-          <!-- Workaround until the above issue is fixed, can be removed after -->
-          <Grid x:Name="TabBarGrid">
-            <Grid.RowDefinitions>
-              <RowDefinition Height="Auto" />
-              <RowDefinition Height="{StaticResource MaterialBottomTabBarGridLengthHeight}" />
-              <RowDefinition Height="Auto" />
-            </Grid.RowDefinitions>
-            <Border Grid.Row="1" x:Name="BackgroundBorder" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Background="{TemplateBinding Background}" Height="{StaticResource MaterialBottomTabBarHeight}" />
-            <ItemsPresenter Grid.RowSpan="2" Height="{StaticResource AjustedMaterialBottomTabBarHeight}" />
-            <Border Grid.Row="2" x:Name="VisibleBoundsBorder" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" />
+          <Grid x:Name="TabBarGrid" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Padding="{TemplateBinding Padding}">
+            <ItemsPresenter Height="{StaticResource MaterialBottomTabBarHeight}" />
           </Grid>
         </ControlTemplate>
       </Setter.Value>
@@ -84,20 +66,18 @@
     <Setter Property="HorizontalContentAlignment" Value="Center" />
     <Setter Property="CornerRadius" Value="{StaticResource MaterialFabLargeCorderRadius}" />
     <Setter Property="Padding" Value="{StaticResource MaterialFabLargePadding}" />
-    <!-- Code can be uncommented when this issue is fixed in Uno: -->
-    <!-- https://github.com/unoplatform/uno/issues/7393 -->
-    <!--<Setter Property="RenderTransform">
-			<Setter.Value>
-				<TranslateTransform Y="{StaticResource FabItemVerticalOffset}" />
-			</Setter.Value>
-		</Setter>-->
-    <!-- Workaround until the above issue is fixed, can be removed after -->
-    <Setter Property="VerticalAlignment" Value="Top" />
+    <!--  KNOWN ISSUE: The part of the FAB that is translated outside of the TabBar bounds is not clickable  -->
+    <!--  https://github.com/unoplatform/uno/issues/7393  -->
+    <Setter Property="RenderTransform">
+      <Setter.Value>
+        <TranslateTransform Y="{StaticResource FabItemVerticalOffset}" />
+      </Setter.Value>
+    </Setter>
     <Setter Property="Template">
       <Setter.Value>
         <ControlTemplate TargetType="utu:TabBarItem">
           <Grid VerticalAlignment="{TemplateBinding VerticalAlignment}">
-            <toolkit:ElevatedView x:Name="ElevatedView" Margin="0,0,6,6" Elevation="6" HorizontalAlignment="Center" CornerRadius="{TemplateBinding CornerRadius}" Background="Transparent">
+            <toolkit:ElevatedView x:Name="ElevatedView" Elevation="6" HorizontalAlignment="Center" VerticalAlignment="Center" CornerRadius="{TemplateBinding CornerRadius}" Background="Transparent">
               <um:Ripple x:Name="Ripple" CornerRadius="{TemplateBinding CornerRadius}" Feedback="{TemplateBinding Foreground}" FeedbackOpacity="{StaticResource MaterialPressedOpacity}">
                 <Grid x:Name="Root" Background="{TemplateBinding Background}" CornerRadius="{TemplateBinding CornerRadius}">
                   <StackPanel x:Name="ContentPanel" Orientation="Horizontal" Margin="{TemplateBinding Padding}">
@@ -294,55 +274,53 @@
     <Setter Property="Template">
       <Setter.Value>
         <ControlTemplate TargetType="utu:TabBarItem">
-          <Grid VerticalAlignment="{TemplateBinding VerticalAlignment}">
-            <toolkit:ElevatedView x:Name="ElevatedView" Margin="0,0,6,6" Elevation="6" HorizontalAlignment="Center" CornerRadius="{TemplateBinding CornerRadius}" Background="Transparent">
-              <um:Ripple x:Name="Ripple" CornerRadius="{TemplateBinding CornerRadius}" Feedback="{TemplateBinding Foreground}" FeedbackOpacity="{StaticResource MaterialPressedOpacity}">
-                <Grid x:Name="Root" Background="{TemplateBinding Background}" CornerRadius="{TemplateBinding CornerRadius}">
-                  <StackPanel x:Name="ContentPanel" Orientation="Horizontal" Margin="{TemplateBinding Padding}">
-                    <!-- Icon -->
-                    <Viewbox Height="{StaticResource MaterialFabContentWidthOrHeight}" Width="{StaticResource MaterialFabContentWidthOrHeight}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Visibility="{Binding Path=Icon, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource MaterialNullToCollapsedConverter}, FallbackValue=Collapsed, TargetNullValue=Collapsed}">
-                      <ContentPresenter Content="{TemplateBinding Icon}" Foreground="{Binding Path=Foreground, RelativeSource={RelativeSource TemplatedParent}}" />
-                    </Viewbox>
-                    <!-- Icon/Content spacing -->
-                    <Border Visibility="{Binding Path=Content, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource MaterialEmptyToCollapsed}, FallbackValue=Collapsed, TargetNullValue=Collapsed}">
-                      <Border Width="{StaticResource MaterialFabIconTextPadding}" Visibility="{Binding Path=Icon, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource MaterialNullToCollapsedConverter}, FallbackValue=Collapsed, TargetNullValue=Collapsed}" />
-                    </Border>
-                    <!-- Content -->
-                    <ContentPresenter x:Name="ContentPresenter" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" ContentTransitions="{TemplateBinding ContentTransitions}" CornerRadius="{StaticResource MaterialButtonCornerRadius}" FontFamily="{TemplateBinding FontFamily}" FontSize="{TemplateBinding FontSize}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-                  </StackPanel>
-                  <Border x:Name="FabFocusBorder" />
-                </Grid>
-              </um:Ripple>
-            </toolkit:ElevatedView>
-            <VisualStateManager.VisualStateGroups>
-              <VisualStateGroup x:Name="CommonStates">
-                <VisualState x:Name="Normal" />
-                <VisualState x:Name="PointerOver">
-                  <VisualState.Setters>
-                    <Setter Target="FabFocusBorder.Background" Value="{StaticResource MaterialOnSurfaceHoverBrush}" />
-                  </VisualState.Setters>
-                </VisualState>
-                <VisualState x:Name="Disabled">
-                  <VisualState.Setters>
-                    <Setter Target="Root.Background" Value="{StaticResource ButtonFabLowFabBackgroundColorBrush}" />
-                  </VisualState.Setters>
-                </VisualState>
-              </VisualStateGroup>
-              <VisualStateGroup x:Name="FocusStates">
-                <VisualState x:Name="Focused">
-                  <VisualState.Setters>
-                    <Setter Target="FabFocusBorder.Background" Value="{StaticResource MaterialOnSurfaceFocusedBrush}" />
-                  </VisualState.Setters>
-                </VisualState>
-                <VisualState x:Name="PointerFocused">
-                  <VisualState.Setters>
-                    <Setter Target="FabFocusBorder.Background" Value="{StaticResource MaterialOnSurfaceFocusedBrush}" />
-                  </VisualState.Setters>
-                </VisualState>
-                <VisualState x:Name="Unfocused" />
-              </VisualStateGroup>
-            </VisualStateManager.VisualStateGroups>
-          </Grid>
+          <toolkit:ElevatedView x:Name="ElevatedView" Margin="0,0,6,6" Elevation="6" HorizontalAlignment="Center" CornerRadius="{TemplateBinding CornerRadius}" Background="Transparent">
+            <um:Ripple x:Name="Ripple" CornerRadius="{TemplateBinding CornerRadius}" Feedback="{TemplateBinding Foreground}" FeedbackOpacity="{StaticResource MaterialPressedOpacity}">
+              <Grid x:Name="Root" Background="{TemplateBinding Background}" CornerRadius="{TemplateBinding CornerRadius}">
+                <StackPanel x:Name="ContentPanel" Orientation="Horizontal" Margin="{TemplateBinding Padding}">
+                  <!-- Icon -->
+                  <Viewbox Height="{StaticResource MaterialFabContentWidthOrHeight}" Width="{StaticResource MaterialFabContentWidthOrHeight}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Visibility="{Binding Path=Icon, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource MaterialNullToCollapsedConverter}, FallbackValue=Collapsed, TargetNullValue=Collapsed}">
+                    <ContentPresenter Content="{TemplateBinding Icon}" Foreground="{Binding Path=Foreground, RelativeSource={RelativeSource TemplatedParent}}" />
+                  </Viewbox>
+                  <!-- Icon/Content spacing -->
+                  <Border Visibility="{Binding Path=Content, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource MaterialEmptyToCollapsed}, FallbackValue=Collapsed, TargetNullValue=Collapsed}">
+                    <Border Width="{StaticResource MaterialFabIconTextPadding}" Visibility="{Binding Path=Icon, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource MaterialNullToCollapsedConverter}, FallbackValue=Collapsed, TargetNullValue=Collapsed}" />
+                  </Border>
+                  <!-- Content -->
+                  <ContentPresenter x:Name="ContentPresenter" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" ContentTransitions="{TemplateBinding ContentTransitions}" CornerRadius="{StaticResource MaterialButtonCornerRadius}" FontFamily="{TemplateBinding FontFamily}" FontSize="{TemplateBinding FontSize}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+                </StackPanel>
+                <Border x:Name="FabFocusBorder" />
+              </Grid>
+            </um:Ripple>
+          </toolkit:ElevatedView>
+          <VisualStateManager.VisualStateGroups>
+            <VisualStateGroup x:Name="CommonStates">
+              <VisualState x:Name="Normal" />
+              <VisualState x:Name="PointerOver">
+                <VisualState.Setters>
+                  <Setter Target="FabFocusBorder.Background" Value="{StaticResource MaterialOnSurfaceHoverBrush}" />
+                </VisualState.Setters>
+              </VisualState>
+              <VisualState x:Name="Disabled">
+                <VisualState.Setters>
+                  <Setter Target="Root.Background" Value="{StaticResource ButtonFabLowFabBackgroundColorBrush}" />
+                </VisualState.Setters>
+              </VisualState>
+            </VisualStateGroup>
+            <VisualStateGroup x:Name="FocusStates">
+              <VisualState x:Name="Focused">
+                <VisualState.Setters>
+                  <Setter Target="FabFocusBorder.Background" Value="{StaticResource MaterialOnSurfaceFocusedBrush}" />
+                </VisualState.Setters>
+              </VisualState>
+              <VisualState x:Name="PointerFocused">
+                <VisualState.Setters>
+                  <Setter Target="FabFocusBorder.Background" Value="{StaticResource MaterialOnSurfaceFocusedBrush}" />
+                </VisualState.Setters>
+              </VisualState>
+              <VisualState x:Name="Unfocused" />
+            </VisualStateGroup>
+          </VisualStateManager.VisualStateGroups>
         </ControlTemplate>
       </Setter.Value>
     </Setter>
diff --git a/src/library/Uno.Toolkit.Material/Generated/mergedpages.uwp.v2.xaml b/src/library/Uno.Toolkit.Material/Generated/mergedpages.uwp.v2.xaml
index 12b780aee..317f9a1e5 100644
--- a/src/library/Uno.Toolkit.Material/Generated/mergedpages.uwp.v2.xaml
+++ b/src/library/Uno.Toolkit.Material/Generated/mergedpages.uwp.v2.xaml
@@ -43,7 +43,6 @@
   <Thickness x:Key="MaterialBottomTabBarItemContentOnlyMargin">12,0</Thickness>
   <CornerRadius x:Key="MaterialBottomTabBarItemActiveIndicatorCornerRadius">16</CornerRadius>
   <Thickness x:Key="MaterialBottomTabBarItemActiveIndicatorPadding">22,7</Thickness>
-  <x:Double x:Key="AjustedMaterialBottomTabBarHeight">108</x:Double>
   <Thickness x:Key="MaterialBottomFabTabBarItemPadding">20</Thickness>
   <x:Double x:Key="MaterialBottomFabTabBarItemContentWidthOrHeight">16</x:Double>
   <CornerRadius x:Key="MaterialBottomFabTabBarItemCornerRadius">16</CornerRadius>
@@ -60,27 +59,11 @@
       </Setter.Value>
     </Setter>
     <Setter Property="ItemContainerStyle" Value="{StaticResource MaterialBottomTabBarItemStyle}" />
-    <!--  Workaround until this issue is fixed, can be removed after  -->
-    <!--  https://github.com/unoplatform/uno/issues/7393  -->
-    <Setter Property="VerticalContentAlignment" Value="Bottom" />
     <Setter Property="Template">
       <Setter.Value>
         <ControlTemplate TargetType="utu:TabBar">
-          <!--  Code can be used when this issue is fixed in Uno:  -->
-          <!--  https://github.com/unoplatform/uno/issues/7393  -->
-          <todo:Grid x:Name="TabBarGrid" Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
+          <Grid x:Name="TabBarGrid" Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
             <ItemsPresenter Height="{StaticResource MaterialBottomTabBarHeight}" />
-          </todo:Grid>
-          <!--  Workaround until the above issue is fixed, can be removed after  -->
-          <Grid x:Name="TabBarGrid">
-            <Grid.RowDefinitions>
-              <RowDefinition Height="Auto" />
-              <RowDefinition Height="{StaticResource MaterialBottomTabBarGridLengthHeight}" />
-              <RowDefinition Height="Auto" />
-            </Grid.RowDefinitions>
-            <Border x:Name="BackgroundBorder" Grid.Row="1" Height="{StaticResource MaterialBottomTabBarHeight}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Background="{TemplateBinding Background}" />
-            <ItemsPresenter Grid.RowSpan="2" Height="{StaticResource AjustedMaterialBottomTabBarHeight}" />
-            <Border x:Name="VisibleBoundsBorder" Grid.Row="2" Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" />
           </Grid>
         </ControlTemplate>
       </Setter.Value>
@@ -98,20 +81,18 @@
     <Setter Property="HorizontalContentAlignment" Value="Center" />
     <Setter Property="CornerRadius" Value="{StaticResource MaterialBottomFabTabBarItemCornerRadius}" />
     <Setter Property="Padding" Value="{StaticResource MaterialBottomFabTabBarItemPadding}" />
-    <!--  Code can be uncommented when this issue is fixed in Uno:  -->
+    <!--  KNOWN ISSUE: The part of the FAB that is translated outside of the TabBar bounds is not clickable  -->
     <!--  https://github.com/unoplatform/uno/issues/7393  -->
-    <!--<Setter Property="RenderTransform">	
-			<Setter.Value>	
-				<TranslateTransform Y="{StaticResource FabItemVerticalOffset}" />	
-			</Setter.Value>	
-		</Setter>-->
-    <!--  Workaround until the above issue is fixed, can be removed after  -->
-    <Setter Property="VerticalAlignment" Value="Top" />
+    <Setter Property="RenderTransform">
+      <Setter.Value>
+        <TranslateTransform Y="{StaticResource FabItemVerticalOffset}" />
+      </Setter.Value>
+    </Setter>
     <Setter Property="Template">
       <Setter.Value>
         <ControlTemplate TargetType="utu:TabBarItem">
           <Grid VerticalAlignment="{TemplateBinding VerticalAlignment}">
-            <toolkit:ElevatedView x:Name="ElevatedView" Margin="0,0,6,6" HorizontalAlignment="Center" Background="Transparent" CornerRadius="{TemplateBinding CornerRadius}" Elevation="6">
+            <toolkit:ElevatedView x:Name="ElevatedView" HorizontalAlignment="Center" VerticalAlignment="Center" Background="Transparent" CornerRadius="{TemplateBinding CornerRadius}" Elevation="6">
               <um:Ripple x:Name="Ripple" CornerRadius="{TemplateBinding CornerRadius}" Feedback="{TemplateBinding Foreground}" FeedbackOpacity="{StaticResource PressedOpacity}">
                 <Grid CornerRadius="{TemplateBinding CornerRadius}">
                   <Grid x:Name="Root" Background="{TemplateBinding Background}">
diff --git a/src/library/Uno.Toolkit.Material/Generated/mergedpages.winui.v1.xaml b/src/library/Uno.Toolkit.Material/Generated/mergedpages.winui.v1.xaml
index c72c584eb..37e3189db 100644
--- a/src/library/Uno.Toolkit.Material/Generated/mergedpages.winui.v1.xaml
+++ b/src/library/Uno.Toolkit.Material/Generated/mergedpages.winui.v1.xaml
@@ -28,7 +28,6 @@
   <x:Double x:Key="MaterialBottomTabBarItemIconWidth">22</x:Double>
   <Thickness x:Key="MaterialBottomTabBarItemContentMargin">0,0,0,6</Thickness>
   <Thickness x:Key="MaterialBottomTabBarItemContentOnlyMargin">12,0</Thickness>
-  <x:Double x:Key="AjustedMaterialBottomTabBarHeight">92</x:Double>
   <mobile:Style x:Key="MaterialBottomTabBarStyle" TargetType="utu:TabBar">
     <Setter Property="Background" Value="{ThemeResource MaterialBottomTabBarBackground}" />
     <Setter Property="IsTabStop" Value="False" />
@@ -47,25 +46,8 @@
     <Setter Property="Template">
       <Setter.Value>
         <ControlTemplate TargetType="utu:TabBar">
-          <!-- Code can be uncommented when this issue is fixed in Uno: -->
-          <!-- https://github.com/unoplatform/uno/issues/7393 -->
-          <!--<Grid x:Name="TabBarGrid"
-						  Background="{TemplateBinding Background}"
-						  BorderBrush="{TemplateBinding BorderBrush}"
-						  BorderThickness="{TemplateBinding BorderThickness}"
-						  Padding="{TemplateBinding Padding}">
-						<ItemsPresenter Height="{StaticResource MaterialBottomTabBarHeight}" />
-					</Grid>-->
-          <!-- Workaround until the above issue is fixed, can be removed after -->
-          <Grid x:Name="TabBarGrid">
-            <Grid.RowDefinitions>
-              <RowDefinition Height="Auto" />
-              <RowDefinition Height="{StaticResource MaterialBottomTabBarGridLengthHeight}" />
-              <RowDefinition Height="Auto" />
-            </Grid.RowDefinitions>
-            <Border Grid.Row="1" x:Name="BackgroundBorder" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Background="{TemplateBinding Background}" Height="{StaticResource MaterialBottomTabBarHeight}" />
-            <ItemsPresenter Grid.RowSpan="2" Height="{StaticResource AjustedMaterialBottomTabBarHeight}" />
-            <Border Grid.Row="2" x:Name="VisibleBoundsBorder" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" />
+          <Grid x:Name="TabBarGrid" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Padding="{TemplateBinding Padding}">
+            <ItemsPresenter Height="{StaticResource MaterialBottomTabBarHeight}" />
           </Grid>
         </ControlTemplate>
       </Setter.Value>
@@ -84,20 +66,18 @@
     <Setter Property="HorizontalContentAlignment" Value="Center" />
     <Setter Property="CornerRadius" Value="{StaticResource MaterialFabLargeCorderRadius}" />
     <Setter Property="Padding" Value="{StaticResource MaterialFabLargePadding}" />
-    <!-- Code can be uncommented when this issue is fixed in Uno: -->
-    <!-- https://github.com/unoplatform/uno/issues/7393 -->
-    <!--<Setter Property="RenderTransform">
-			<Setter.Value>
-				<TranslateTransform Y="{StaticResource FabItemVerticalOffset}" />
-			</Setter.Value>
-		</Setter>-->
-    <!-- Workaround until the above issue is fixed, can be removed after -->
-    <Setter Property="VerticalAlignment" Value="Top" />
+    <!--  KNOWN ISSUE: The part of the FAB that is translated outside of the TabBar bounds is not clickable  -->
+    <!--  https://github.com/unoplatform/uno/issues/7393  -->
+    <Setter Property="RenderTransform">
+      <Setter.Value>
+        <TranslateTransform Y="{StaticResource FabItemVerticalOffset}" />
+      </Setter.Value>
+    </Setter>
     <Setter Property="Template">
       <Setter.Value>
         <ControlTemplate TargetType="utu:TabBarItem">
           <Grid VerticalAlignment="{TemplateBinding VerticalAlignment}">
-            <toolkit:ElevatedView x:Name="ElevatedView" Margin="0,0,6,6" Elevation="6" HorizontalAlignment="Center" CornerRadius="{TemplateBinding CornerRadius}" Background="Transparent">
+            <toolkit:ElevatedView x:Name="ElevatedView" Elevation="6" HorizontalAlignment="Center" VerticalAlignment="Center" CornerRadius="{TemplateBinding CornerRadius}" Background="Transparent">
               <um:Ripple x:Name="Ripple" CornerRadius="{TemplateBinding CornerRadius}" Feedback="{TemplateBinding Foreground}" FeedbackOpacity="{StaticResource MaterialPressedOpacity}">
                 <Grid x:Name="Root" Background="{TemplateBinding Background}" CornerRadius="{TemplateBinding CornerRadius}">
                   <StackPanel x:Name="ContentPanel" Orientation="Horizontal" Margin="{TemplateBinding Padding}">
@@ -294,55 +274,53 @@
     <Setter Property="Template">
       <Setter.Value>
         <ControlTemplate TargetType="utu:TabBarItem">
-          <Grid VerticalAlignment="{TemplateBinding VerticalAlignment}">
-            <toolkit:ElevatedView x:Name="ElevatedView" Margin="0,0,6,6" Elevation="6" HorizontalAlignment="Center" CornerRadius="{TemplateBinding CornerRadius}" Background="Transparent">
-              <um:Ripple x:Name="Ripple" CornerRadius="{TemplateBinding CornerRadius}" Feedback="{TemplateBinding Foreground}" FeedbackOpacity="{StaticResource MaterialPressedOpacity}">
-                <Grid x:Name="Root" Background="{TemplateBinding Background}" CornerRadius="{TemplateBinding CornerRadius}">
-                  <StackPanel x:Name="ContentPanel" Orientation="Horizontal" Margin="{TemplateBinding Padding}">
-                    <!-- Icon -->
-                    <Viewbox Height="{StaticResource MaterialFabContentWidthOrHeight}" Width="{StaticResource MaterialFabContentWidthOrHeight}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Visibility="{Binding Path=Icon, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource MaterialNullToCollapsedConverter}, FallbackValue=Collapsed, TargetNullValue=Collapsed}">
-                      <ContentPresenter Content="{TemplateBinding Icon}" Foreground="{Binding Path=Foreground, RelativeSource={RelativeSource TemplatedParent}}" />
-                    </Viewbox>
-                    <!-- Icon/Content spacing -->
-                    <Border Visibility="{Binding Path=Content, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource MaterialEmptyToCollapsed}, FallbackValue=Collapsed, TargetNullValue=Collapsed}">
-                      <Border Width="{StaticResource MaterialFabIconTextPadding}" Visibility="{Binding Path=Icon, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource MaterialNullToCollapsedConverter}, FallbackValue=Collapsed, TargetNullValue=Collapsed}" />
-                    </Border>
-                    <!-- Content -->
-                    <ContentPresenter x:Name="ContentPresenter" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" ContentTransitions="{TemplateBinding ContentTransitions}" CornerRadius="{StaticResource MaterialButtonCornerRadius}" FontFamily="{TemplateBinding FontFamily}" FontSize="{TemplateBinding FontSize}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-                  </StackPanel>
-                  <Border x:Name="FabFocusBorder" />
-                </Grid>
-              </um:Ripple>
-            </toolkit:ElevatedView>
-            <VisualStateManager.VisualStateGroups>
-              <VisualStateGroup x:Name="CommonStates">
-                <VisualState x:Name="Normal" />
-                <VisualState x:Name="PointerOver">
-                  <VisualState.Setters>
-                    <Setter Target="FabFocusBorder.Background" Value="{StaticResource MaterialOnSurfaceHoverBrush}" />
-                  </VisualState.Setters>
-                </VisualState>
-                <VisualState x:Name="Disabled">
-                  <VisualState.Setters>
-                    <Setter Target="Root.Background" Value="{StaticResource ButtonFabLowFabBackgroundColorBrush}" />
-                  </VisualState.Setters>
-                </VisualState>
-              </VisualStateGroup>
-              <VisualStateGroup x:Name="FocusStates">
-                <VisualState x:Name="Focused">
-                  <VisualState.Setters>
-                    <Setter Target="FabFocusBorder.Background" Value="{StaticResource MaterialOnSurfaceFocusedBrush}" />
-                  </VisualState.Setters>
-                </VisualState>
-                <VisualState x:Name="PointerFocused">
-                  <VisualState.Setters>
-                    <Setter Target="FabFocusBorder.Background" Value="{StaticResource MaterialOnSurfaceFocusedBrush}" />
-                  </VisualState.Setters>
-                </VisualState>
-                <VisualState x:Name="Unfocused" />
-              </VisualStateGroup>
-            </VisualStateManager.VisualStateGroups>
-          </Grid>
+          <toolkit:ElevatedView x:Name="ElevatedView" Margin="0,0,6,6" Elevation="6" HorizontalAlignment="Center" CornerRadius="{TemplateBinding CornerRadius}" Background="Transparent">
+            <um:Ripple x:Name="Ripple" CornerRadius="{TemplateBinding CornerRadius}" Feedback="{TemplateBinding Foreground}" FeedbackOpacity="{StaticResource MaterialPressedOpacity}">
+              <Grid x:Name="Root" Background="{TemplateBinding Background}" CornerRadius="{TemplateBinding CornerRadius}">
+                <StackPanel x:Name="ContentPanel" Orientation="Horizontal" Margin="{TemplateBinding Padding}">
+                  <!-- Icon -->
+                  <Viewbox Height="{StaticResource MaterialFabContentWidthOrHeight}" Width="{StaticResource MaterialFabContentWidthOrHeight}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Visibility="{Binding Path=Icon, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource MaterialNullToCollapsedConverter}, FallbackValue=Collapsed, TargetNullValue=Collapsed}">
+                    <ContentPresenter Content="{TemplateBinding Icon}" Foreground="{Binding Path=Foreground, RelativeSource={RelativeSource TemplatedParent}}" />
+                  </Viewbox>
+                  <!-- Icon/Content spacing -->
+                  <Border Visibility="{Binding Path=Content, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource MaterialEmptyToCollapsed}, FallbackValue=Collapsed, TargetNullValue=Collapsed}">
+                    <Border Width="{StaticResource MaterialFabIconTextPadding}" Visibility="{Binding Path=Icon, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource MaterialNullToCollapsedConverter}, FallbackValue=Collapsed, TargetNullValue=Collapsed}" />
+                  </Border>
+                  <!-- Content -->
+                  <ContentPresenter x:Name="ContentPresenter" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" ContentTransitions="{TemplateBinding ContentTransitions}" CornerRadius="{StaticResource MaterialButtonCornerRadius}" FontFamily="{TemplateBinding FontFamily}" FontSize="{TemplateBinding FontSize}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+                </StackPanel>
+                <Border x:Name="FabFocusBorder" />
+              </Grid>
+            </um:Ripple>
+          </toolkit:ElevatedView>
+          <VisualStateManager.VisualStateGroups>
+            <VisualStateGroup x:Name="CommonStates">
+              <VisualState x:Name="Normal" />
+              <VisualState x:Name="PointerOver">
+                <VisualState.Setters>
+                  <Setter Target="FabFocusBorder.Background" Value="{StaticResource MaterialOnSurfaceHoverBrush}" />
+                </VisualState.Setters>
+              </VisualState>
+              <VisualState x:Name="Disabled">
+                <VisualState.Setters>
+                  <Setter Target="Root.Background" Value="{StaticResource ButtonFabLowFabBackgroundColorBrush}" />
+                </VisualState.Setters>
+              </VisualState>
+            </VisualStateGroup>
+            <VisualStateGroup x:Name="FocusStates">
+              <VisualState x:Name="Focused">
+                <VisualState.Setters>
+                  <Setter Target="FabFocusBorder.Background" Value="{StaticResource MaterialOnSurfaceFocusedBrush}" />
+                </VisualState.Setters>
+              </VisualState>
+              <VisualState x:Name="PointerFocused">
+                <VisualState.Setters>
+                  <Setter Target="FabFocusBorder.Background" Value="{StaticResource MaterialOnSurfaceFocusedBrush}" />
+                </VisualState.Setters>
+              </VisualState>
+              <VisualState x:Name="Unfocused" />
+            </VisualStateGroup>
+          </VisualStateManager.VisualStateGroups>
         </ControlTemplate>
       </Setter.Value>
     </Setter>
diff --git a/src/library/Uno.Toolkit.Material/Generated/mergedpages.winui.v2.xaml b/src/library/Uno.Toolkit.Material/Generated/mergedpages.winui.v2.xaml
index 12b780aee..317f9a1e5 100644
--- a/src/library/Uno.Toolkit.Material/Generated/mergedpages.winui.v2.xaml
+++ b/src/library/Uno.Toolkit.Material/Generated/mergedpages.winui.v2.xaml
@@ -43,7 +43,6 @@
   <Thickness x:Key="MaterialBottomTabBarItemContentOnlyMargin">12,0</Thickness>
   <CornerRadius x:Key="MaterialBottomTabBarItemActiveIndicatorCornerRadius">16</CornerRadius>
   <Thickness x:Key="MaterialBottomTabBarItemActiveIndicatorPadding">22,7</Thickness>
-  <x:Double x:Key="AjustedMaterialBottomTabBarHeight">108</x:Double>
   <Thickness x:Key="MaterialBottomFabTabBarItemPadding">20</Thickness>
   <x:Double x:Key="MaterialBottomFabTabBarItemContentWidthOrHeight">16</x:Double>
   <CornerRadius x:Key="MaterialBottomFabTabBarItemCornerRadius">16</CornerRadius>
@@ -60,27 +59,11 @@
       </Setter.Value>
     </Setter>
     <Setter Property="ItemContainerStyle" Value="{StaticResource MaterialBottomTabBarItemStyle}" />
-    <!--  Workaround until this issue is fixed, can be removed after  -->
-    <!--  https://github.com/unoplatform/uno/issues/7393  -->
-    <Setter Property="VerticalContentAlignment" Value="Bottom" />
     <Setter Property="Template">
       <Setter.Value>
         <ControlTemplate TargetType="utu:TabBar">
-          <!--  Code can be used when this issue is fixed in Uno:  -->
-          <!--  https://github.com/unoplatform/uno/issues/7393  -->
-          <todo:Grid x:Name="TabBarGrid" Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
+          <Grid x:Name="TabBarGrid" Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
             <ItemsPresenter Height="{StaticResource MaterialBottomTabBarHeight}" />
-          </todo:Grid>
-          <!--  Workaround until the above issue is fixed, can be removed after  -->
-          <Grid x:Name="TabBarGrid">
-            <Grid.RowDefinitions>
-              <RowDefinition Height="Auto" />
-              <RowDefinition Height="{StaticResource MaterialBottomTabBarGridLengthHeight}" />
-              <RowDefinition Height="Auto" />
-            </Grid.RowDefinitions>
-            <Border x:Name="BackgroundBorder" Grid.Row="1" Height="{StaticResource MaterialBottomTabBarHeight}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Background="{TemplateBinding Background}" />
-            <ItemsPresenter Grid.RowSpan="2" Height="{StaticResource AjustedMaterialBottomTabBarHeight}" />
-            <Border x:Name="VisibleBoundsBorder" Grid.Row="2" Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" />
           </Grid>
         </ControlTemplate>
       </Setter.Value>
@@ -98,20 +81,18 @@
     <Setter Property="HorizontalContentAlignment" Value="Center" />
     <Setter Property="CornerRadius" Value="{StaticResource MaterialBottomFabTabBarItemCornerRadius}" />
     <Setter Property="Padding" Value="{StaticResource MaterialBottomFabTabBarItemPadding}" />
-    <!--  Code can be uncommented when this issue is fixed in Uno:  -->
+    <!--  KNOWN ISSUE: The part of the FAB that is translated outside of the TabBar bounds is not clickable  -->
     <!--  https://github.com/unoplatform/uno/issues/7393  -->
-    <!--<Setter Property="RenderTransform">	
-			<Setter.Value>	
-				<TranslateTransform Y="{StaticResource FabItemVerticalOffset}" />	
-			</Setter.Value>	
-		</Setter>-->
-    <!--  Workaround until the above issue is fixed, can be removed after  -->
-    <Setter Property="VerticalAlignment" Value="Top" />
+    <Setter Property="RenderTransform">
+      <Setter.Value>
+        <TranslateTransform Y="{StaticResource FabItemVerticalOffset}" />
+      </Setter.Value>
+    </Setter>
     <Setter Property="Template">
       <Setter.Value>
         <ControlTemplate TargetType="utu:TabBarItem">
           <Grid VerticalAlignment="{TemplateBinding VerticalAlignment}">
-            <toolkit:ElevatedView x:Name="ElevatedView" Margin="0,0,6,6" HorizontalAlignment="Center" Background="Transparent" CornerRadius="{TemplateBinding CornerRadius}" Elevation="6">
+            <toolkit:ElevatedView x:Name="ElevatedView" HorizontalAlignment="Center" VerticalAlignment="Center" Background="Transparent" CornerRadius="{TemplateBinding CornerRadius}" Elevation="6">
               <um:Ripple x:Name="Ripple" CornerRadius="{TemplateBinding CornerRadius}" Feedback="{TemplateBinding Foreground}" FeedbackOpacity="{StaticResource PressedOpacity}">
                 <Grid CornerRadius="{TemplateBinding CornerRadius}">
                   <Grid x:Name="Root" Background="{TemplateBinding Background}">
diff --git a/src/library/Uno.Toolkit.Material/Styles/Controls/v1/BottomTabBar.xaml b/src/library/Uno.Toolkit.Material/Styles/Controls/v1/BottomTabBar.xaml
index 238a2dae2..0f74d304b 100644
--- a/src/library/Uno.Toolkit.Material/Styles/Controls/v1/BottomTabBar.xaml
+++ b/src/library/Uno.Toolkit.Material/Styles/Controls/v1/BottomTabBar.xaml
@@ -49,14 +49,9 @@
     <x:Double x:Key="MaterialBottomTabBarItemIconHeight">22</x:Double>
     <x:Double x:Key="MaterialBottomTabBarItemIconWidth">22</x:Double>
     <Thickness x:Key="MaterialBottomTabBarItemContentMargin">0,0,0,6</Thickness>
-    <Thickness x:Key="MaterialBottomTabBarItemContentOnlyMargin">12,0</Thickness>
+	<Thickness x:Key="MaterialBottomTabBarItemContentOnlyMargin">12,0</Thickness>
 
-    <!-- Code can be removed when this issue is fixed in Uno: -->
-    <!-- https://github.com/unoplatform/uno/issues/7393 -->
-    <!-- AjustedMaterialBottomTabBarHeight = MaterialBottomTabBarHeight + Half size of the Fab TabBarItem (including ElevatedView margin) -->
-    <x:Double x:Key="AjustedMaterialBottomTabBarHeight">92</x:Double>
-
-    <!-- Material Bottom TabBar -->
+	<!-- Material Bottom TabBar -->
     <mobile:Style x:Key="MaterialBottomTabBarStyle"
 		   TargetType="utu:TabBar">
         <Setter Property="Background"
@@ -80,39 +75,14 @@
 				Value="Bottom" />
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="utu:TabBar">
-                    <!-- Code can be uncommented when this issue is fixed in Uno: -->
-                    <!-- https://github.com/unoplatform/uno/issues/7393 -->
-                    <!--<Grid x:Name="TabBarGrid"
+				<ControlTemplate TargetType="utu:TabBar">
+					<Grid x:Name="TabBarGrid"
 						  Background="{TemplateBinding Background}"
 						  BorderBrush="{TemplateBinding BorderBrush}"
 						  BorderThickness="{TemplateBinding BorderThickness}"
 						  Padding="{TemplateBinding Padding}">
 						<ItemsPresenter Height="{StaticResource MaterialBottomTabBarHeight}" />
-					</Grid>-->
-
-                    <!-- Workaround until the above issue is fixed, can be removed after -->
-                    <Grid x:Name="TabBarGrid">
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="{StaticResource MaterialBottomTabBarGridLengthHeight}" />
-                            <RowDefinition Height="Auto" />
-                        </Grid.RowDefinitions>
-
-                        <Border Grid.Row="1"
-								x:Name="BackgroundBorder"
-								VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-								Background="{TemplateBinding Background}"
-								Height="{StaticResource MaterialBottomTabBarHeight}" />
-
-                        <ItemsPresenter Grid.RowSpan="2"
-										Height="{StaticResource AjustedMaterialBottomTabBarHeight}" />
-
-                        <Border Grid.Row="2"
-								x:Name="VisibleBoundsBorder"
-								Background="{TemplateBinding Background}"
-								Padding="{TemplateBinding Padding}" />
-                    </Grid>
+					</Grid>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
@@ -144,24 +114,21 @@
 				Value="{StaticResource MaterialFabLargeCorderRadius}" />
         <Setter Property="Padding"
 				Value="{StaticResource MaterialFabLargePadding}" />
-        <!-- Code can be uncommented when this issue is fixed in Uno: -->
-        <!-- https://github.com/unoplatform/uno/issues/7393 -->
-        <!--<Setter Property="RenderTransform">
+		<!--  KNOWN ISSUE: The part of the FAB that is translated outside of the TabBar bounds is not clickable  -->
+		<!--  https://github.com/unoplatform/uno/issues/7393  -->
+		<Setter Property="RenderTransform">
 			<Setter.Value>
 				<TranslateTransform Y="{StaticResource FabItemVerticalOffset}" />
 			</Setter.Value>
-		</Setter>-->
-        <!-- Workaround until the above issue is fixed, can be removed after -->
-        <Setter Property="VerticalAlignment"
-				Value="Top" />
-        <Setter Property="Template">
+		</Setter>
+		<Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="utu:TabBarItem">
                     <Grid VerticalAlignment="{TemplateBinding VerticalAlignment}">
                         <toolkit:ElevatedView x:Name="ElevatedView"
-											  Margin="0,0,6,6"
 											  Elevation="6"
 											  HorizontalAlignment="Center"
+											  VerticalAlignment="Center"
 											  CornerRadius="{TemplateBinding CornerRadius}"
 											  Background="Transparent">
 
@@ -487,7 +454,7 @@
         <Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="utu:TabBarItem">
-                    <Grid VerticalAlignment="{TemplateBinding VerticalAlignment}">
+                    
 						<toolkit:ElevatedView x:Name="ElevatedView"
 											  Margin="0,0,6,6"
 											  Elevation="6"
@@ -540,47 +507,46 @@
 							</um:Ripple>
 						</toolkit:ElevatedView>
 
-						<VisualStateManager.VisualStateGroups>
-							<VisualStateGroup x:Name="CommonStates">
+					<VisualStateManager.VisualStateGroups>
+						<VisualStateGroup x:Name="CommonStates">
 
-								<VisualState x:Name="Normal" />
+							<VisualState x:Name="Normal" />
 
-								<VisualState x:Name="PointerOver">
-									<VisualState.Setters>
-										<Setter Target="FabFocusBorder.Background"
+							<VisualState x:Name="PointerOver">
+								<VisualState.Setters>
+									<Setter Target="FabFocusBorder.Background"
 												Value="{StaticResource MaterialOnSurfaceHoverBrush}" />
-									</VisualState.Setters>
-								</VisualState>
+								</VisualState.Setters>
+							</VisualState>
 
-								<VisualState x:Name="Disabled">
-									<VisualState.Setters>
+							<VisualState x:Name="Disabled">
+								<VisualState.Setters>
 
-										<Setter Target="Root.Background"
+									<Setter Target="Root.Background"
 												Value="{StaticResource ButtonFabLowFabBackgroundColorBrush}" />
-									</VisualState.Setters>
-								</VisualState>
-							</VisualStateGroup>
+								</VisualState.Setters>
+							</VisualState>
+						</VisualStateGroup>
 
-							<VisualStateGroup x:Name="FocusStates">
+						<VisualStateGroup x:Name="FocusStates">
 
-								<VisualState x:Name="Focused">
-									<VisualState.Setters>
-										<Setter Target="FabFocusBorder.Background"
+							<VisualState x:Name="Focused">
+								<VisualState.Setters>
+									<Setter Target="FabFocusBorder.Background"
 												Value="{StaticResource MaterialOnSurfaceFocusedBrush}" />
-									</VisualState.Setters>
-								</VisualState>
+								</VisualState.Setters>
+							</VisualState>
 
-								<VisualState x:Name="PointerFocused">
-									<VisualState.Setters>
-										<Setter Target="FabFocusBorder.Background"
+							<VisualState x:Name="PointerFocused">
+								<VisualState.Setters>
+									<Setter Target="FabFocusBorder.Background"
 												Value="{StaticResource MaterialOnSurfaceFocusedBrush}" />
-									</VisualState.Setters>
-								</VisualState>
+								</VisualState.Setters>
+							</VisualState>
 
-								<VisualState x:Name="Unfocused" />
-							</VisualStateGroup>
-						</VisualStateManager.VisualStateGroups>
-					</Grid>
+							<VisualState x:Name="Unfocused" />
+						</VisualStateGroup>
+					</VisualStateManager.VisualStateGroups>
 				</ControlTemplate>
 			</Setter.Value>
 		</Setter>
diff --git a/src/library/Uno.Toolkit.Material/Styles/Controls/v2/BottomTabBar.xaml b/src/library/Uno.Toolkit.Material/Styles/Controls/v2/BottomTabBar.xaml
index addeecf70..b607d498f 100644
--- a/src/library/Uno.Toolkit.Material/Styles/Controls/v2/BottomTabBar.xaml
+++ b/src/library/Uno.Toolkit.Material/Styles/Controls/v2/BottomTabBar.xaml
@@ -81,10 +81,6 @@
 	<Thickness x:Key="MaterialBottomTabBarItemContentOnlyMargin">12,0</Thickness>
 	<CornerRadius x:Key="MaterialBottomTabBarItemActiveIndicatorCornerRadius">16</CornerRadius>
 	<Thickness x:Key="MaterialBottomTabBarItemActiveIndicatorPadding">22,7</Thickness>
-	<!--  Code can be removed when this issue is fixed in Uno:  -->
-	<!--  https://github.com/unoplatform/uno/issues/7393  -->
-	<!--  AjustedMaterialBottomTabBarHeight = MaterialBottomTabBarHeight + Half size of the Fab TabBarItem (including ElevatedView margin)  -->
-	<x:Double x:Key="AjustedMaterialBottomTabBarHeight">108</x:Double>
 	<Thickness x:Key="MaterialBottomFabTabBarItemPadding">20</Thickness>
 	<x:Double x:Key="MaterialBottomFabTabBarItemContentWidthOrHeight">16</x:Double>
 	<CornerRadius x:Key="MaterialBottomFabTabBarItemCornerRadius">16</CornerRadius>
@@ -100,6 +96,7 @@
 		        Value="Bottom" />
 		<Setter Property="ItemsPanel">
 			<Setter.Value>
+
 				<ItemsPanelTemplate>
 					<utu:TabBarListPanel />
 				</ItemsPanelTemplate>
@@ -107,44 +104,16 @@
 		</Setter>
 		<Setter Property="ItemContainerStyle"
 		        Value="{StaticResource MaterialBottomTabBarItemStyle}" />
-		<!--  Workaround until this issue is fixed, can be removed after  -->
-		<!--  https://github.com/unoplatform/uno/issues/7393  -->
-		<Setter Property="VerticalContentAlignment"
-		        Value="Bottom" />
+
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="utu:TabBar">
-					<!--  Code can be used when this issue is fixed in Uno:  -->
-					<!--  https://github.com/unoplatform/uno/issues/7393  -->
-					<todo:Grid x:Name="TabBarGrid"
+					<Grid x:Name="TabBarGrid"
 					           Padding="{TemplateBinding Padding}"
 					           Background="{TemplateBinding Background}"
 					           BorderBrush="{TemplateBinding BorderBrush}"
 					           BorderThickness="{TemplateBinding BorderThickness}">
 						<ItemsPresenter Height="{StaticResource MaterialBottomTabBarHeight}" />
-					</todo:Grid>
-					<!--  Workaround until the above issue is fixed, can be removed after  -->
-					<Grid x:Name="TabBarGrid">
-						<Grid.RowDefinitions>
-							<RowDefinition Height="Auto" />
-							<RowDefinition Height="{StaticResource MaterialBottomTabBarGridLengthHeight}" />
-							<RowDefinition Height="Auto" />
-						</Grid.RowDefinitions>
-						<Border x:Name="BackgroundBorder"
-						        Grid.Row="1"
-						        Height="{StaticResource MaterialBottomTabBarHeight}"
-						        VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-						        Background="{TemplateBinding Background}" />
-
-
-						<ItemsPresenter Grid.RowSpan="2"
-						                Height="{StaticResource AjustedMaterialBottomTabBarHeight}" />
-
-						<Border x:Name="VisibleBoundsBorder"
-						        Grid.Row="2"
-						        Padding="{TemplateBinding Padding}"
-						        Background="{TemplateBinding Background}" />
-
 					</Grid>
 				</ControlTemplate>
 			</Setter.Value>
@@ -175,23 +144,20 @@
 		        Value="{StaticResource MaterialBottomFabTabBarItemCornerRadius}" />
 		<Setter Property="Padding"
 		        Value="{StaticResource MaterialBottomFabTabBarItemPadding}" />
-		<!--  Code can be uncommented when this issue is fixed in Uno:  -->
+		<!--  KNOWN ISSUE: The part of the FAB that is translated outside of the TabBar bounds is not clickable  -->
 		<!--  https://github.com/unoplatform/uno/issues/7393  -->
-		<!--<Setter Property="RenderTransform">	
-			<Setter.Value>	
-				<TranslateTransform Y="{StaticResource FabItemVerticalOffset}" />	
-			</Setter.Value>	
-		</Setter>-->
-		<!--  Workaround until the above issue is fixed, can be removed after  -->
-		<Setter Property="VerticalAlignment"
-		        Value="Top" />
+		<Setter Property="RenderTransform">
+			<Setter.Value>
+				<TranslateTransform Y="{StaticResource FabItemVerticalOffset}" />
+			</Setter.Value>
+		</Setter>
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="utu:TabBarItem">
 					<Grid VerticalAlignment="{TemplateBinding VerticalAlignment}">
 						<toolkit:ElevatedView x:Name="ElevatedView"
-						                      Margin="0,0,6,6"
 						                      HorizontalAlignment="Center"
+						                      VerticalAlignment="Center"
 						                      Background="Transparent"
 						                      CornerRadius="{TemplateBinding CornerRadius}"
 						                      Elevation="6">
diff --git a/src/library/Uno.Toolkit.Material/Uno.Toolkit.UI.Material.csproj b/src/library/Uno.Toolkit.Material/Uno.Toolkit.UI.Material.csproj
index 9a1a37304..bf339dccf 100644
--- a/src/library/Uno.Toolkit.Material/Uno.Toolkit.UI.Material.csproj
+++ b/src/library/Uno.Toolkit.Material/Uno.Toolkit.UI.Material.csproj
@@ -39,8 +39,8 @@
 	</Choose>
 
 	<ItemGroup>
-		<PackageReference Include="Uno.Material" Version="2.2.0" />
-		<PackageReference Include="Uno.UI" Version="4.3.6" />
+		<PackageReference Include="Uno.Material" Version="2.3.0-dev.4" />
+		<PackageReference Include="Uno.UI" Version="4.5.0-dev.453" />
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)'=='uap10.0.18362'">
diff --git a/src/library/Uno.Toolkit.Material/Uno.Toolkit.WinUI.Material.csproj b/src/library/Uno.Toolkit.Material/Uno.Toolkit.WinUI.Material.csproj
index fe32c78c4..5d64246ae 100644
--- a/src/library/Uno.Toolkit.Material/Uno.Toolkit.WinUI.Material.csproj
+++ b/src/library/Uno.Toolkit.Material/Uno.Toolkit.WinUI.Material.csproj
@@ -17,8 +17,8 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Uno.Material.WinUI" Version="2.2.0" />
-		<PackageReference Include="Uno.WinUI" Version="4.3.6" />
+		<PackageReference Include="Uno.Material.WinUI" Version="2.3.0-dev.4" />
+		<PackageReference Include="Uno.WinUI" Version="4.5.0-dev.453" />
 		<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" RuntimeFrameworkVersion="10.0.22000.24" Condition="'$(TargetFramework)'=='net5.0-windows10.0.18362'" />
 		<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" TargetingPackVersion="10.0.22000.24" Condition="'$(TargetFramework)'=='net5.0-windows10.0.18362'" />
 	</ItemGroup>
@@ -50,7 +50,7 @@
 		<When Condition="'$(TargetFramework)'=='net5.0-windows10.0.18362'">
 
 			<ItemGroup>
-				<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.0" />
+				<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.1.0" />
 			</ItemGroup>
 
 			<ItemGroup>