diff --git a/api/Avalonia.nupkg.xml b/api/Avalonia.nupkg.xml
index c03d1fe6cc..b2a81dd55d 100644
--- a/api/Avalonia.nupkg.xml
+++ b/api/Avalonia.nupkg.xml
@@ -991,6 +991,18 @@
     <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
     <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
   </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>F:Avalonia.Input.GestureRecognizers.SwipeGestureRecognizer.CrossAxisCancelThresholdProperty</Target>
+    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
+    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>F:Avalonia.Input.GestureRecognizers.SwipeGestureRecognizer.EdgeSizeProperty</Target>
+    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
+    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
+  </Suppression>
   <Suppression>
     <DiagnosticId>CP0002</DiagnosticId>
     <Target>F:Avalonia.Input.HoldingState.Cancelled</Target>
@@ -1147,6 +1159,30 @@
     <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
     <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
   </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Avalonia.Input.GestureRecognizers.SwipeGestureRecognizer.get_CrossAxisCancelThreshold</Target>
+    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
+    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Avalonia.Input.GestureRecognizers.SwipeGestureRecognizer.get_EdgeSize</Target>
+    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
+    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Avalonia.Input.GestureRecognizers.SwipeGestureRecognizer.set_CrossAxisCancelThreshold(System.Double)</Target>
+    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
+    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Avalonia.Input.GestureRecognizers.SwipeGestureRecognizer.set_EdgeSize(System.Double)</Target>
+    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
+    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
+  </Suppression>
   <Suppression>
     <DiagnosticId>CP0002</DiagnosticId>
     <Target>M:Avalonia.Input.HoldingRoutedEventArgs.#ctor(Avalonia.Input.HoldingState,Avalonia.Point,Avalonia.Input.PointerType)</Target>
@@ -1411,6 +1447,18 @@
     <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
     <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
   </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Avalonia.Input.SwipeGestureEventArgs.#ctor(System.Int32,Avalonia.Input.SwipeDirection,Avalonia.Vector,Avalonia.Point)</Target>
+    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
+    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Avalonia.Input.SwipeGestureEventArgs.get_StartPoint</Target>
+    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Base.dll</Left>
+    <Right>current/Avalonia/lib/net10.0/Avalonia.Base.dll</Right>
+  </Suppression>
   <Suppression>
     <DiagnosticId>CP0002</DiagnosticId>
     <Target>M:Avalonia.Input.TextInput.TextInputMethodClient.ShowInputPanel</Target>
@@ -1801,6 +1849,12 @@
     <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
     <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
   </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>F:Avalonia.Controls.DrawerPage.DrawerBreakpointWidthProperty</Target>
+    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
+    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
+  </Suppression>
   <Suppression>
     <DiagnosticId>CP0002</DiagnosticId>
     <Target>F:Avalonia.Controls.NativeMenuBar.EnableMenuItemClickForwardingProperty</Target>
@@ -1813,6 +1867,12 @@
     <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
     <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
   </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>F:Avalonia.Controls.Primitives.FlyoutBase.IsOpenProperty</Target>
+    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
+    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
+  </Suppression>
   <Suppression>
     <DiagnosticId>CP0002</DiagnosticId>
     <Target>F:Avalonia.Controls.Primitives.Popup.PlacementModeProperty</Target>
@@ -1843,6 +1903,12 @@
     <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
     <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
   </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>F:Avalonia.Controls.TabItem.IconProperty</Target>
+    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
+    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
+  </Suppression>
   <Suppression>
     <DiagnosticId>CP0002</DiagnosticId>
     <Target>F:Avalonia.Controls.TextBlock.LetterSpacingProperty</Target>
@@ -1981,6 +2047,18 @@
     <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
     <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
   </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Avalonia.Controls.DrawerPage.get_DrawerBreakpointWidth</Target>
+    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
+    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Avalonia.Controls.DrawerPage.set_DrawerBreakpointWidth(System.Double)</Target>
+    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
+    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
+  </Suppression>
   <Suppression>
     <DiagnosticId>CP0002</DiagnosticId>
     <Target>M:Avalonia.Controls.Embedding.Offscreen.OffscreenTopLevelImplBase.get_Surfaces</Target>
@@ -2017,6 +2095,12 @@
     <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
     <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
   </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Avalonia.Controls.PageSelectionChangedEventArgs.#ctor(Avalonia.Controls.Page,Avalonia.Controls.Page)</Target>
+    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
+    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
+  </Suppression>
   <Suppression>
     <DiagnosticId>CP0002</DiagnosticId>
     <Target>M:Avalonia.Controls.Platform.DefaultMenuInteractionHandler.GotFocus(System.Object,Avalonia.Input.GotFocusEventArgs)</Target>
@@ -2221,6 +2305,12 @@
     <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
     <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
   </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Avalonia.Controls.Primitives.VisualLayerManager.get_IsPopup</Target>
+    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
+    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
+  </Suppression>
   <Suppression>
     <DiagnosticId>CP0002</DiagnosticId>
     <Target>M:Avalonia.Controls.Primitives.VisualLayerManager.get_LightDismissOverlayLayer</Target>
@@ -2239,12 +2329,30 @@
     <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
     <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
   </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Avalonia.Controls.Primitives.VisualLayerManager.set_IsPopup(System.Boolean)</Target>
+    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
+    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
+  </Suppression>
   <Suppression>
     <DiagnosticId>CP0002</DiagnosticId>
     <Target>M:Avalonia.Controls.Screens.ScreenFromWindow(Avalonia.Platform.IWindowBaseImpl)</Target>
     <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
     <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
   </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Avalonia.Controls.TabbedPage.FindNextEnabledTab(System.Int32,System.Int32)</Target>
+    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
+    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Avalonia.Controls.TabItem.get_Icon</Target>
+    <Left>baseline/Avalonia/lib/net10.0/Avalonia.Controls.dll</Left>
+    <Right>current/Avalonia/lib/net10.0/Avalonia.Controls.dll</Right>
+  </Suppression>
   <Suppression>
     <DiagnosticId>CP0002</DiagnosticId>
     <Target>M:Avalonia.Controls.TabItem.SubscribeToOwnerProperties(Avalonia.AvaloniaObject)</Target>
@@ -2545,6 +2653,18 @@
     <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
     <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
   </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>F:Avalonia.Input.GestureRecognizers.SwipeGestureRecognizer.CrossAxisCancelThresholdProperty</Target>
+    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
+    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>F:Avalonia.Input.GestureRecognizers.SwipeGestureRecognizer.EdgeSizeProperty</Target>
+    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
+    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
+  </Suppression>
   <Suppression>
     <DiagnosticId>CP0002</DiagnosticId>
     <Target>F:Avalonia.Input.HoldingState.Cancelled</Target>
@@ -2701,6 +2821,30 @@
     <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
     <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
   </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Avalonia.Input.GestureRecognizers.SwipeGestureRecognizer.get_CrossAxisCancelThreshold</Target>
+    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
+    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Avalonia.Input.GestureRecognizers.SwipeGestureRecognizer.get_EdgeSize</Target>
+    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
+    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Avalonia.Input.GestureRecognizers.SwipeGestureRecognizer.set_CrossAxisCancelThreshold(System.Double)</Target>
+    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
+    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Avalonia.Input.GestureRecognizers.SwipeGestureRecognizer.set_EdgeSize(System.Double)</Target>
+    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
+    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
+  </Suppression>
   <Suppression>
     <DiagnosticId>CP0002</DiagnosticId>
     <Target>M:Avalonia.Input.HoldingRoutedEventArgs.#ctor(Avalonia.Input.HoldingState,Avalonia.Point,Avalonia.Input.PointerType)</Target>
@@ -2965,6 +3109,18 @@
     <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
     <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
   </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Avalonia.Input.SwipeGestureEventArgs.#ctor(System.Int32,Avalonia.Input.SwipeDirection,Avalonia.Vector,Avalonia.Point)</Target>
+    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
+    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Avalonia.Input.SwipeGestureEventArgs.get_StartPoint</Target>
+    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Base.dll</Left>
+    <Right>current/Avalonia/lib/net8.0/Avalonia.Base.dll</Right>
+  </Suppression>
   <Suppression>
     <DiagnosticId>CP0002</DiagnosticId>
     <Target>M:Avalonia.Input.TextInput.TextInputMethodClient.ShowInputPanel</Target>
@@ -3355,6 +3511,12 @@
     <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
     <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
   </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>F:Avalonia.Controls.DrawerPage.DrawerBreakpointWidthProperty</Target>
+    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
+    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
+  </Suppression>
   <Suppression>
     <DiagnosticId>CP0002</DiagnosticId>
     <Target>F:Avalonia.Controls.NativeMenuBar.EnableMenuItemClickForwardingProperty</Target>
@@ -3367,6 +3529,12 @@
     <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
     <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
   </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>F:Avalonia.Controls.Primitives.FlyoutBase.IsOpenProperty</Target>
+    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
+    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
+  </Suppression>
   <Suppression>
     <DiagnosticId>CP0002</DiagnosticId>
     <Target>F:Avalonia.Controls.Primitives.Popup.PlacementModeProperty</Target>
@@ -3397,6 +3565,12 @@
     <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
     <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
   </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>F:Avalonia.Controls.TabItem.IconProperty</Target>
+    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
+    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
+  </Suppression>
   <Suppression>
     <DiagnosticId>CP0002</DiagnosticId>
     <Target>F:Avalonia.Controls.TextBlock.LetterSpacingProperty</Target>
@@ -3535,6 +3709,18 @@
     <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
     <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
   </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Avalonia.Controls.DrawerPage.get_DrawerBreakpointWidth</Target>
+    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
+    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Avalonia.Controls.DrawerPage.set_DrawerBreakpointWidth(System.Double)</Target>
+    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
+    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
+  </Suppression>
   <Suppression>
     <DiagnosticId>CP0002</DiagnosticId>
     <Target>M:Avalonia.Controls.Embedding.Offscreen.OffscreenTopLevelImplBase.get_Surfaces</Target>
@@ -3571,6 +3757,12 @@
     <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
     <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
   </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Avalonia.Controls.PageSelectionChangedEventArgs.#ctor(Avalonia.Controls.Page,Avalonia.Controls.Page)</Target>
+    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
+    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
+  </Suppression>
   <Suppression>
     <DiagnosticId>CP0002</DiagnosticId>
     <Target>M:Avalonia.Controls.Platform.DefaultMenuInteractionHandler.GotFocus(System.Object,Avalonia.Input.GotFocusEventArgs)</Target>
@@ -3775,6 +3967,12 @@
     <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
     <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
   </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Avalonia.Controls.Primitives.VisualLayerManager.get_IsPopup</Target>
+    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
+    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
+  </Suppression>
   <Suppression>
     <DiagnosticId>CP0002</DiagnosticId>
     <Target>M:Avalonia.Controls.Primitives.VisualLayerManager.get_LightDismissOverlayLayer</Target>
@@ -3793,12 +3991,30 @@
     <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
     <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
   </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Avalonia.Controls.Primitives.VisualLayerManager.set_IsPopup(System.Boolean)</Target>
+    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
+    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
+  </Suppression>
   <Suppression>
     <DiagnosticId>CP0002</DiagnosticId>
     <Target>M:Avalonia.Controls.Screens.ScreenFromWindow(Avalonia.Platform.IWindowBaseImpl)</Target>
     <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
     <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
   </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Avalonia.Controls.TabbedPage.FindNextEnabledTab(System.Int32,System.Int32)</Target>
+    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
+    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Avalonia.Controls.TabItem.get_Icon</Target>
+    <Left>baseline/Avalonia/lib/net8.0/Avalonia.Controls.dll</Left>
+    <Right>current/Avalonia/lib/net8.0/Avalonia.Controls.dll</Right>
+  </Suppression>
   <Suppression>
     <DiagnosticId>CP0002</DiagnosticId>
     <Target>M:Avalonia.Controls.TabItem.SubscribeToOwnerProperties(Avalonia.AvaloniaObject)</Target>
diff --git a/native/Avalonia.Native/src/OSX/WindowImpl.mm b/native/Avalonia.Native/src/OSX/WindowImpl.mm
index 1d77d3ce44..f42b7c27cb 100644
--- a/native/Avalonia.Native/src/OSX/WindowImpl.mm
+++ b/native/Avalonia.Native/src/OSX/WindowImpl.mm
@@ -563,6 +563,10 @@ NSWindowStyleMask WindowImpl::CalculateStyleMask() {
 
         case SystemDecorationsBorderOnly:
             s = s | NSWindowStyleMaskTitled | NSWindowStyleMaskFullSizeContentView;
+            
+            if (_canResize && _isEnabled) {
+                s = s | NSWindowStyleMaskResizable;
+            }
             break;
 
         case SystemDecorationsFull:
diff --git a/samples/ControlCatalog/Assets/Sanctuary/city_bg.jpg b/samples/ControlCatalog/Assets/Sanctuary/city_bg.jpg
new file mode 100644
index 0000000000..9a8a4b374f
Binary files /dev/null and b/samples/ControlCatalog/Assets/Sanctuary/city_bg.jpg differ
diff --git a/samples/ControlCatalog/Assets/Sanctuary/forest_bg.jpg b/samples/ControlCatalog/Assets/Sanctuary/forest_bg.jpg
new file mode 100644
index 0000000000..32a360431d
Binary files /dev/null and b/samples/ControlCatalog/Assets/Sanctuary/forest_bg.jpg differ
diff --git a/samples/ControlCatalog/Assets/Sanctuary/main_arctic_silence.jpg b/samples/ControlCatalog/Assets/Sanctuary/main_arctic_silence.jpg
new file mode 100644
index 0000000000..61e7b06212
Binary files /dev/null and b/samples/ControlCatalog/Assets/Sanctuary/main_arctic_silence.jpg differ
diff --git a/samples/ControlCatalog/Assets/Sanctuary/main_deep_forest.jpg b/samples/ControlCatalog/Assets/Sanctuary/main_deep_forest.jpg
new file mode 100644
index 0000000000..d8576b626f
Binary files /dev/null and b/samples/ControlCatalog/Assets/Sanctuary/main_deep_forest.jpg differ
diff --git a/samples/ControlCatalog/Assets/Sanctuary/main_desert_sands.jpg b/samples/ControlCatalog/Assets/Sanctuary/main_desert_sands.jpg
new file mode 100644
index 0000000000..e4b44477e3
Binary files /dev/null and b/samples/ControlCatalog/Assets/Sanctuary/main_desert_sands.jpg differ
diff --git a/samples/ControlCatalog/Assets/Sanctuary/main_hero.jpg b/samples/ControlCatalog/Assets/Sanctuary/main_hero.jpg
new file mode 100644
index 0000000000..63dff3f948
Binary files /dev/null and b/samples/ControlCatalog/Assets/Sanctuary/main_hero.jpg differ
diff --git a/samples/ControlCatalog/Assets/Sanctuary/mountain_bg.jpg b/samples/ControlCatalog/Assets/Sanctuary/mountain_bg.jpg
new file mode 100644
index 0000000000..e9fdd5c0d9
Binary files /dev/null and b/samples/ControlCatalog/Assets/Sanctuary/mountain_bg.jpg differ
diff --git a/samples/ControlCatalog/ControlCatalog.csproj b/samples/ControlCatalog/ControlCatalog.csproj
index 8304e3e002..2ce24a4d20 100644
--- a/samples/ControlCatalog/ControlCatalog.csproj
+++ b/samples/ControlCatalog/ControlCatalog.csproj
@@ -11,14 +11,7 @@
     <AvaloniaXaml Include="**\*.xaml">
       <SubType>Designer</SubType>
     </AvaloniaXaml>
-    <AvaloniaResource Include="Assets\*" />
-    <AvaloniaResource Include="Assets\Fonts\*" />
-    <AvaloniaResource Include="Assets\Restaurant\*" />
-    <AvaloniaResource Include="Assets\Pulse\*" />
-    <AvaloniaResource Include="Assets\Movies\*" />
-    <AvaloniaResource Include="Assets\CurvedHeader\*" />
-    <AvaloniaResource Include="Assets\RetroGaming\*" />
-    <AvaloniaResource Include="Assets\ModernApp\*" />
+    <AvaloniaResource Include="Assets\**\*" />
   </ItemGroup>
   <ItemGroup>
     <None Remove="Assets\image1.jpg" />
diff --git a/samples/ControlCatalog/MainView.xaml b/samples/ControlCatalog/MainView.xaml
index b6249fe17f..adea1b90fc 100644
--- a/samples/ControlCatalog/MainView.xaml
+++ b/samples/ControlCatalog/MainView.xaml
@@ -54,8 +54,15 @@
                ScrollViewer.VerticalScrollBarVisibility="Disabled">
         <pages:CommandBarPage />
       </TabItem>
-      <TabItem Header="Carousel">
-        <pages:CarouselPage />
+      <TabItem Header="Carousel"
+               ScrollViewer.HorizontalScrollBarVisibility="Disabled"
+               ScrollViewer.VerticalScrollBarVisibility="Disabled">
+        <pages:CarouselDemoPage />
+      </TabItem>
+      <TabItem Header="CarouselPage"
+               ScrollViewer.HorizontalScrollBarVisibility="Disabled"
+               ScrollViewer.VerticalScrollBarVisibility="Disabled">
+        <pages:CarouselDemoPage />
       </TabItem>
 
       <TabItem Header="CheckBox">
diff --git a/samples/ControlCatalog/Pages/CarouselDemoPage.xaml b/samples/ControlCatalog/Pages/CarouselDemoPage.xaml
new file mode 100644
index 0000000000..df4317fcad
--- /dev/null
+++ b/samples/ControlCatalog/Pages/CarouselDemoPage.xaml
@@ -0,0 +1,11 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             x:Class="ControlCatalog.Pages.CarouselDemoPage">
+  <NavigationPage x:Name="SampleNav">
+    <NavigationPage.Styles>
+      <Style Selector="NavigationPage#SampleNav /template/ Border#PART_NavigationBar">
+        <Setter Property="Background" Value="Transparent" />
+      </Style>
+    </NavigationPage.Styles>
+  </NavigationPage>
+</UserControl>
diff --git a/samples/ControlCatalog/Pages/CarouselDemoPage.xaml.cs b/samples/ControlCatalog/Pages/CarouselDemoPage.xaml.cs
new file mode 100644
index 0000000000..36c9961658
--- /dev/null
+++ b/samples/ControlCatalog/Pages/CarouselDemoPage.xaml.cs
@@ -0,0 +1,91 @@
+using System;
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+
+namespace ControlCatalog.Pages
+{
+    public partial class CarouselDemoPage : UserControl
+    {
+        private static readonly (string Group, string Title, string Description, Func<UserControl> Factory)[] Demos =
+        {
+            // Overview
+            ("Overview", "First Look",
+                "Basic CarouselPage with three pages and page indicator.",
+                () => new CarouselPageFirstLookPage()),
+
+            // Populate
+            ("Populate", "Data Templates",
+                "Bind CarouselPage to an ObservableCollection, add or remove pages at runtime, and switch the page template.",
+                () => new CarouselPageDataTemplatePage()),
+
+            // Appearance
+            ("Appearance", "Customization",
+                "Switch slide direction between horizontal and vertical with PageSlide. Page indicator dots update on each selection.",
+                () => new CarouselPageCustomizationPage()),
+
+            // Features
+            ("Features", "Page Transitions",
+                "Animate page switches with CrossFade or PageSlide.",
+                () => new CarouselPageTransitionsPage()),
+            ("Features", "Programmatic Selection",
+                "Jump to any page programmatically with SelectedIndex and respond to SelectionChanged events.",
+                () => new CarouselPageSelectionPage()),
+            ("Features", "Gesture & Keyboard",
+                "Swipe left/right to navigate pages. Toggle IsGestureEnabled and IsKeyboardNavigationEnabled.",
+                () => new CarouselPageGesturePage()),
+            ("Features", "Events",
+                "SelectionChanged, NavigatedTo, and NavigatedFrom events. Swipe or navigate to see the live event log.",
+                () => new CarouselPageEventsPage()),
+
+            // Performance
+            ("Performance", "Performance Monitor",
+                "Track page count, live page instances, and managed heap size. Observe how GC reclaims memory after removing pages.",
+                () => new CarouselPagePerformancePage()),
+
+            // Showcases
+            ("Showcases", "Sanctuary",
+                "Travel discovery app with 3 full-screen immersive pages. Each page has a real background photo, gradient overlay, and themed content. Built as a 1:1 replica of a Stitch design.",
+                () => new SanctuaryShowcasePage()),
+            ("Showcases", "Care Companion",
+                "Healthcare onboarding with CarouselPage (3 pages), then a TabbedPage patient dashboard. Skip or complete onboarding to navigate to the dashboard via RemovePage.",
+                () => new CareCompanionAppPage()),
+
+            // Carousel (ItemsControl) demos
+            ("Carousel", "Getting Started",
+                "Basic Carousel with image items and previous/next navigation buttons.",
+                () => new CarouselGettingStartedPage()),
+            ("Carousel", "Transitions",
+                "Configure page transitions: PageSlide, CrossFade, 3D Rotation, or None.",
+                () => new CarouselTransitionsPage()),
+            ("Carousel", "Customization",
+                "Adjust orientation and transition type to tailor the carousel layout.",
+                () => new CarouselCustomizationPage()),
+            ("Carousel", "Gestures & Keyboard",
+                "Navigate items via swipe gesture and arrow keys. Toggle each input mode on and off.",
+                () => new CarouselGesturesPage()),
+            ("Carousel", "Vertical Orientation",
+                "Carousel with Orientation set to Vertical, navigated with Up/Down keys, swipe, or buttons.",
+                () => new CarouselVerticalPage()),
+            ("Carousel", "Multi-Item Peek",
+                "Adjust ViewportFraction to show multiple items simultaneously with adjacent cards peeking.",
+                () => new CarouselMultiItemPage()),
+            ("Carousel", "Data Binding",
+                "Bind Carousel to an ObservableCollection and add, remove, or shuffle items at runtime.",
+                () => new CarouselDataBindingPage()),
+            ("Carousel", "Curated Gallery",
+                "Editorial art gallery app with DrawerPage navigation, hero Carousel with PipsPager dots, and a horizontal peek carousel for collection highlights.",
+                () => new CarouselGalleryAppPage()),
+        };
+
+        public CarouselDemoPage()
+        {
+            InitializeComponent();
+            Loaded += OnLoaded;
+        }
+
+        private async void OnLoaded(object? sender, RoutedEventArgs e)
+        {
+            await SampleNav.PushAsync(NavigationDemoHelper.CreateGalleryHomePage(SampleNav, Demos), null);
+        }
+    }
+}
diff --git a/samples/ControlCatalog/Pages/CarouselPage.xaml b/samples/ControlCatalog/Pages/CarouselPage.xaml
index 352fa32e30..c6e20fec5b 100644
--- a/samples/ControlCatalog/Pages/CarouselPage.xaml
+++ b/samples/ControlCatalog/Pages/CarouselPage.xaml
@@ -1,44 +1,117 @@
 <UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              x:Class="ControlCatalog.Pages.CarouselPage">
-  <StackPanel Orientation="Vertical" Spacing="4">
-    <TextBlock Classes="h2">An items control that displays its items as pages that fill the control.</TextBlock>
+  <StackPanel Orientation="Vertical" Spacing="4" HorizontalAlignment="Stretch">
+    <TextBlock Classes="h2">A swipeable items control that can reveal adjacent pages with ViewportFraction.</TextBlock>
 
-    <Grid ColumnDefinitions="Auto,*,Auto"
-          MaxWidth="660"
+    <Grid Name="layoutGrid" ColumnDefinitions="Auto,*,Auto" RowDefinitions="*,Auto,*"
+          MaxWidth="760"
           HorizontalAlignment="Stretch" Margin="0 16 0 0">
-      <Button Name="left" Grid.Column="0" VerticalAlignment="Center" Padding="10,20" Margin="4">
-        <Path Data="M20,11V13H8L13.5,18.5L12.08,19.92L4.16,12L12.08,4.08L13.5,5.5L8,11H20Z" Fill="Black"/>
+      <Button Name="left" Grid.Column="0" Grid.Row="1" VerticalAlignment="Center" HorizontalAlignment="Center" Padding="10,20" Margin="4">
+        <Path Name="leftArrow" Data="M20,11V13H8L13.5,18.5L12.08,19.92L4.16,12L12.08,4.08L13.5,5.5L8,11H20Z" Fill="Black"/>
       </Button>
-      <Carousel Name="carousel" Grid.Column="1">
+      <Carousel Name="carousel" Grid.Column="1" Grid.Row="1" Background="Transparent" Height="400" Focusable="True" ViewportFraction="1.0">
         <Carousel.PageTransition>
           <PageSlide Duration="0.25" Orientation="Horizontal" />
         </Carousel.PageTransition>
-        <Image Source="/Assets/delicate-arch-896885_640.jpg"/>
-        <Image Source="/Assets/hirsch-899118_640.jpg"/>
-        <Image Source="/Assets/maple-leaf-888807_640.jpg"/>
+        
+        <Border Margin="14,12" CornerRadius="18" ClipToBounds="True">
+          <Grid>
+            <Image Source="/Assets/delicate-arch-896885_640.jpg" Stretch="UniformToFill"/>
+            <Border Background="#80000000" VerticalAlignment="Bottom" Padding="12">
+              <TextBlock Text="Item 1: Delicate Arch" Foreground="White" HorizontalAlignment="Center" FontWeight="SemiBold"/>
+            </Border>
+          </Grid>
+        </Border>
+
+        <Border Margin="14,12" CornerRadius="18" ClipToBounds="True">
+          <Grid>
+            <Image Source="/Assets/hirsch-899118_640.jpg" Stretch="UniformToFill"/>
+            <Border Background="#80000000" VerticalAlignment="Bottom" Padding="12">
+              <TextBlock Text="Item 2: Hirsch" Foreground="White" HorizontalAlignment="Center" FontWeight="SemiBold"/>
+            </Border>
+          </Grid>
+        </Border>
+
+        <Border Margin="14,12" CornerRadius="18" ClipToBounds="True">
+          <Grid>
+            <Image Source="/Assets/maple-leaf-888807_640.jpg" Stretch="UniformToFill"/>
+            <Border Background="#80000000" VerticalAlignment="Bottom" Padding="12">
+              <TextBlock Text="Item 3: Maple Leaf" Foreground="White" HorizontalAlignment="Center" FontWeight="SemiBold"/>
+            </Border>
+          </Grid>
+        </Border>
       </Carousel>
-      <Button Name="right" Grid.Column="2" VerticalAlignment="Center" Padding="10,20" Margin="4">
-        <Path Data="M4,11V13H16L10.5,18.5L11.92,19.92L19.84,12L11.92,4.08L10.5,5.5L16,11H4Z" Fill="Black"/>
+      <Button Name="right" Grid.Column="2" Grid.Row="1" VerticalAlignment="Center" HorizontalAlignment="Center" Padding="10,20" Margin="4">
+        <Path Name="rightArrow" Data="M4,11V13H16L10.5,18.5L11.92,19.92L19.84,12L11.92,4.08L10.5,5.5L16,11H4Z" Fill="Black"/>
       </Button>
     </Grid>
 
-    <StackPanel Orientation="Horizontal" Spacing="4">
-      <TextBlock VerticalAlignment="Center">Transition</TextBlock>
-      <ComboBox Name="transition" SelectedIndex="1" VerticalAlignment="Center">
+    <Separator Margin="0 4"/>
+
+    <Grid ColumnDefinitions="160,420" RowDefinitions="Auto, Auto, Auto" RowSpacing="8"
+          Margin="0 4" MaxWidth="580" HorizontalAlignment="Left">
+      <TextBlock Grid.Row="0" Grid.Column="0" VerticalAlignment="Center">Transition</TextBlock>
+      <ComboBox SelectedIndex="1" Name="transition" Grid.Column="1" Grid.Row="0" HorizontalAlignment="Stretch">
         <ComboBoxItem>None</ComboBoxItem>
-        <ComboBoxItem>Slide</ComboBoxItem>
-        <ComboBoxItem>Crossfade</ComboBoxItem>
-        <ComboBoxItem>3D Rotation</ComboBoxItem>
+        <ComboBoxItem>Page Slide</ComboBoxItem>
+        <ComboBoxItem>Cross Fade</ComboBoxItem>
+        <ComboBoxItem>Rotate 3D</ComboBoxItem>
+        <ComboBoxItem>Card Stack</ComboBoxItem>
+        <ComboBoxItem>Wave Reveal</ComboBoxItem>
+        <ComboBoxItem>Composite (Slide + Fade)</ComboBoxItem>
       </ComboBox>
-    </StackPanel>
 
-    <StackPanel Orientation="Horizontal" Spacing="4">
-      <TextBlock VerticalAlignment="Center">Orientation</TextBlock>
-      <ComboBox Name="orientation" SelectedIndex="0" VerticalAlignment="Center">
+      <TextBlock Grid.Row="1" Grid.Column="0" VerticalAlignment="Center">Orientation</TextBlock>
+      <ComboBox Name="orientation" Grid.Row="1" Grid.Column="1" SelectedIndex="0" HorizontalAlignment="Stretch">
         <ComboBoxItem>Horizontal</ComboBoxItem>
         <ComboBoxItem>Vertical</ComboBoxItem>
       </ComboBox>
+
+      <TextBlock Grid.Row="2" Grid.Column="0" VerticalAlignment="Center">Viewport Fraction</TextBlock>
+      <StackPanel Grid.Row="2" Grid.Column="1" Spacing="4" HorizontalAlignment="Stretch">
+        <Grid ColumnDefinitions="*,56" ColumnSpacing="12">
+          <Slider Name="viewportFraction"
+                  Minimum="0.33"
+                  Maximum="1"
+                  Value="1.0"
+                  TickFrequency="0.01"
+                  HorizontalAlignment="Stretch" />
+          <TextBlock Name="viewportFractionIndicator"
+                     Grid.Column="1"
+                     HorizontalAlignment="Stretch"
+                     TextAlignment="Right"
+                     VerticalAlignment="Center"
+                     FontWeight="SemiBold">1.00</TextBlock>
+        </Grid>
+        <TextBlock Name="viewportFractionHint"
+                   HorizontalAlignment="Stretch"
+                   Opacity="0.75"
+                   TextWrapping="Wrap"
+                   Text="Values below 1 reveal adjacent pages." />
+      </StackPanel>
+    </Grid>
+
+    <Separator Margin="0 8"/>
+
+    <StackPanel Orientation="Horizontal" Spacing="24" Margin="0 4" MaxWidth="580" HorizontalAlignment="Left">
+      <CheckBox Name="wrapSelection">Wrap Selection</CheckBox>
+      <CheckBox Name="swipeEnabled">Swipe Enabled</CheckBox>
+    </StackPanel>
+
+    <Separator Margin="0 8"/>
+
+    <StackPanel Spacing="12" MaxWidth="580" HorizontalAlignment="Left">
+      <StackPanel Orientation="Horizontal" Spacing="24">
+        <StackPanel Orientation="Horizontal" Spacing="8">
+          <TextBlock>Total Items:</TextBlock>
+          <TextBlock Name="itemsCountIndicator" FontWeight="Bold">0</TextBlock>
+        </StackPanel>
+        <StackPanel Orientation="Horizontal" Spacing="8">
+          <TextBlock>Selected Index:</TextBlock>
+          <TextBlock Name="selectedIndexIndicator" FontWeight="Bold">0</TextBlock>
+        </StackPanel>
+      </StackPanel>
     </StackPanel>
     
   </StackPanel>
diff --git a/samples/ControlCatalog/Pages/CarouselPage.xaml.cs b/samples/ControlCatalog/Pages/CarouselPage.xaml.cs
index 713da34051..0a0c973b90 100644
--- a/samples/ControlCatalog/Pages/CarouselPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/CarouselPage.xaml.cs
@@ -1,6 +1,9 @@
 using System;
+using Avalonia;
 using Avalonia.Animation;
 using Avalonia.Controls;
+using Avalonia.Controls.Primitives;
+using ControlCatalog.Pages.Transitions;
 
 namespace ControlCatalog.Pages
 {
@@ -9,28 +12,137 @@ namespace ControlCatalog.Pages
         public CarouselPage()
         {
             InitializeComponent();
+            
             left.Click += (s, e) => carousel.Previous();
             right.Click += (s, e) => carousel.Next();
             transition.SelectionChanged += TransitionChanged;
             orientation.SelectionChanged += TransitionChanged;
+            viewportFraction.ValueChanged += ViewportFractionChanged;
+
+            wrapSelection.IsChecked = carousel.WrapSelection;
+            wrapSelection.IsCheckedChanged += (s, e) =>
+            {
+                carousel.WrapSelection = wrapSelection.IsChecked ?? false;
+                UpdateButtonState();
+            };
+
+            swipeEnabled.IsChecked = carousel.IsSwipeEnabled;
+            swipeEnabled.IsCheckedChanged += (s, e) =>
+            {
+                carousel.IsSwipeEnabled = swipeEnabled.IsChecked ?? false;
+            };
+            
+            carousel.PropertyChanged += (s, e) =>
+            {
+                if (e.Property == SelectingItemsControl.SelectedIndexProperty)
+                {
+                    UpdateButtonState();
+                }
+                else if (e.Property == Carousel.ViewportFractionProperty)
+                {
+                    UpdateViewportFractionDisplay();
+                }
+            };
+
+            carousel.ViewportFraction = viewportFraction.Value;
+            UpdateButtonState();
+            UpdateViewportFractionDisplay();
+        }
+
+        private void UpdateButtonState()
+        {
+            itemsCountIndicator.Text = carousel.ItemCount.ToString();
+            selectedIndexIndicator.Text = carousel.SelectedIndex.ToString();
+
+            var wrap = carousel.WrapSelection;
+            left.IsEnabled = wrap || carousel.SelectedIndex > 0;
+            right.IsEnabled = wrap || carousel.SelectedIndex < carousel.ItemCount - 1;
+        }
+
+        private void ViewportFractionChanged(object? sender, RangeBaseValueChangedEventArgs e)
+        {
+            carousel.ViewportFraction = Math.Round(e.NewValue, 2);
+            UpdateViewportFractionDisplay();
+        }
+
+        private void UpdateViewportFractionDisplay()
+        {
+            var value = carousel.ViewportFraction;
+            viewportFractionIndicator.Text = value.ToString("0.00");
+
+            var pagesInView = 1d / value;
+            viewportFractionHint.Text = value >= 1d
+                ? "1.00 shows a single full page."
+                : $"{pagesInView:0.##} pages fit in view. Try 0.80 for peeking or 0.33 for three full items.";
         }
 
         private void TransitionChanged(object? sender, SelectionChangedEventArgs e)
         {
+            var isVertical = orientation.SelectedIndex == 1;
+            var axis = isVertical ? PageSlide.SlideAxis.Vertical : PageSlide.SlideAxis.Horizontal;
+            
             switch (transition.SelectedIndex)
             {
                 case 0:
                     carousel.PageTransition = null;
                     break;
                 case 1:
-                    carousel.PageTransition = new PageSlide(TimeSpan.FromSeconds(0.25), orientation.SelectedIndex == 0 ? PageSlide.SlideAxis.Horizontal : PageSlide.SlideAxis.Vertical);
+                    carousel.PageTransition = new PageSlide(TimeSpan.FromSeconds(0.25), axis);
                     break;
                 case 2:
                     carousel.PageTransition = new CrossFade(TimeSpan.FromSeconds(0.25));
                     break;
                 case 3:
-                    carousel.PageTransition = new Rotate3DTransition(TimeSpan.FromSeconds(0.5), orientation.SelectedIndex == 0 ? PageSlide.SlideAxis.Horizontal : PageSlide.SlideAxis.Vertical);
+                    carousel.PageTransition = new Rotate3DTransition(TimeSpan.FromSeconds(0.5), axis);
+                    break;
+                case 4:
+                    carousel.PageTransition = new CardStackPageTransition(TimeSpan.FromSeconds(0.5), axis);
+                    break;
+                case 5:
+                    carousel.PageTransition = new WaveRevealPageTransition(TimeSpan.FromSeconds(0.8), axis);
                     break;
+                case 6:
+                    carousel.PageTransition = new CompositePageTransition
+                    {
+                        PageTransitions =
+                        {
+                            new PageSlide(TimeSpan.FromSeconds(0.25), axis),
+                            new CrossFade(TimeSpan.FromSeconds(0.25)),
+                        }
+                    };
+                    break;
+            }
+            
+            UpdateLayoutForOrientation(isVertical);
+        }
+
+        private void UpdateLayoutForOrientation(bool isVertical)
+        {
+            if (isVertical)
+            {
+                Grid.SetColumn(left, 1);
+                Grid.SetRow(left, 0);
+                Grid.SetColumn(right, 1);
+                Grid.SetRow(right, 2);
+                
+                left.Padding = new Thickness(20, 10);
+                right.Padding = new Thickness(20, 10);
+
+                leftArrow.RenderTransform = new Avalonia.Media.RotateTransform(90);
+                rightArrow.RenderTransform = new Avalonia.Media.RotateTransform(90);
+            }
+            else
+            {
+                Grid.SetColumn(left, 0);
+                Grid.SetRow(left, 1);
+                Grid.SetColumn(right, 2);
+                Grid.SetRow(right, 1);
+
+                left.Padding = new Thickness(10, 20);
+                right.Padding = new Thickness(10, 20);
+
+                leftArrow.RenderTransform = null;
+                rightArrow.RenderTransform = null;
             }
         }
     }
diff --git a/samples/ControlCatalog/Pages/CarouselPage/CareCompanionAppPage.xaml b/samples/ControlCatalog/Pages/CarouselPage/CareCompanionAppPage.xaml
new file mode 100644
index 0000000000..a11a1ea6b8
--- /dev/null
+++ b/samples/ControlCatalog/Pages/CarouselPage/CareCompanionAppPage.xaml
@@ -0,0 +1,98 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             x:Class="ControlCatalog.Pages.CareCompanionAppPage">
+  <UserControl.Styles>
+    <Style Selector="PipsPager /template/ ListBox ListBoxItem">
+      <Setter Property="Width" Value="24" />
+      <Setter Property="Height" Value="24" />
+      <Setter Property="Padding" Value="0" />
+      <Setter Property="Margin" Value="2,0" />
+      <Setter Property="MinWidth" Value="0" />
+      <Setter Property="MinHeight" Value="0" />
+      <Setter Property="ClipToBounds" Value="False" />
+      <Setter Property="VerticalAlignment" Value="Center" />
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Grid Background="Transparent">
+            <Border Name="Pip"
+                    Width="6" Height="6" CornerRadius="3"
+                    HorizontalAlignment="Center" VerticalAlignment="Center"
+                    Background="#d1d5db">
+              <Border.Transitions>
+                <Transitions>
+                  <DoubleTransition Property="Width" Duration="0:0:0.2" Easing="CubicEaseOut" />
+                  <DoubleTransition Property="Height" Duration="0:0:0.2" Easing="CubicEaseOut" />
+                  <CornerRadiusTransition Property="CornerRadius" Duration="0:0:0.2" Easing="CubicEaseOut" />
+                  <BrushTransition Property="Background" Duration="0:0:0.2" />
+                </Transitions>
+              </Border.Transitions>
+            </Border>
+          </Grid>
+        </ControlTemplate>
+      </Setter>
+    </Style>
+    <Style Selector="PipsPager /template/ ListBox ListBoxItem:pointerover /template/ Border#Pip">
+      <Setter Property="Width" Value="8" />
+      <Setter Property="Height" Value="8" />
+      <Setter Property="CornerRadius" Value="4" />
+      <Setter Property="Background" Value="#b0b0b0" />
+    </Style>
+    <Style Selector="PipsPager /template/ ListBox ListBoxItem:selected /template/ Border#Pip">
+      <Setter Property="Width" Value="20" />
+      <Setter Property="Height" Value="6" />
+      <Setter Property="CornerRadius" Value="3" />
+      <Setter Property="Background" Value="#137fec" />
+    </Style>
+    <Style Selector="PipsPager /template/ ListBox ListBoxItem:selected:pointerover /template/ Border#Pip">
+      <Setter Property="Width" Value="20" />
+      <Setter Property="Height" Value="6" />
+      <Setter Property="CornerRadius" Value="3" />
+      <Setter Property="Background" Value="#0a5bb5" />
+    </Style>
+    <Style Selector="PipsPager /template/ ListBox ListBoxItem:pressed /template/ Border#Pip">
+      <Setter Property="Width" Value="6" />
+      <Setter Property="Height" Value="6" />
+      <Setter Property="Background" Value="#909090" />
+    </Style>
+  </UserControl.Styles>
+  <DockPanel>
+    <ScrollViewer x:Name="InfoPanel" DockPanel.Dock="Right" Width="300">
+      <StackPanel Margin="16" Spacing="16">
+
+        <TextBlock Text="Care Companion" FontSize="16" FontWeight="SemiBold"
+                   Foreground="{DynamicResource SystemControlHighlightAccentBrush}" />
+
+        <TextBlock TextWrapping="Wrap" FontSize="12" Opacity="0.7"
+                   Text="A patient-focused healthcare companion app. CarouselPage handles onboarding (swipe or tap Next) with PipsPager as custom pill-shaped page indicators. Tapping Skip or Get Started pushes the TabbedPage dashboard and removes the onboarding from the navigation stack." />
+
+        <Separator />
+
+        <TextBlock Text="Navigation Flow" FontSize="13" FontWeight="SemiBold" />
+        <StackPanel Spacing="4">
+          <TextBlock FontSize="12" TextWrapping="Wrap" Text="1. CarouselPage is the NavigationPage root" />
+          <TextBlock FontSize="12" TextWrapping="Wrap" Text="2. Swipe or tap Next to advance pages" />
+          <TextBlock FontSize="12" TextWrapping="Wrap" Text="3. Skip jumps to Get Started page" />
+          <TextBlock FontSize="12" TextWrapping="Wrap" Text="4. Get Started pushes TabbedPage dashboard" />
+          <TextBlock FontSize="12" TextWrapping="Wrap" Text="5. RemovePage(carousel) cleans the stack" />
+        </StackPanel>
+
+        <Separator />
+
+        <TextBlock Text="Design" FontSize="13" FontWeight="SemiBold" />
+        <StackPanel Spacing="4">
+          <TextBlock FontSize="12" Text="Primary: #137fec (healthcare blue)" />
+          <TextBlock FontSize="12" Text="Background: #f6f7f8 (off-white)" />
+          <TextBlock FontSize="12" Text="Cards: #ffffff with border" />
+          <TextBlock FontSize="12" Text="Success: #10b981 (streak/done)" />
+          <TextBlock FontSize="12" Text="Roundness: 12-16px corners" />
+        </StackPanel>
+
+      </StackPanel>
+    </ScrollViewer>
+
+    <Border BorderBrush="{DynamicResource SystemControlForegroundBaseMediumLowBrush}"
+            BorderThickness="1" CornerRadius="8" ClipToBounds="True">
+      <NavigationPage x:Name="NavPage" />
+    </Border>
+  </DockPanel>
+</UserControl>
diff --git a/samples/ControlCatalog/Pages/CarouselPage/CareCompanionAppPage.xaml.cs b/samples/ControlCatalog/Pages/CarouselPage/CareCompanionAppPage.xaml.cs
new file mode 100644
index 0000000000..f7c87f56a3
--- /dev/null
+++ b/samples/ControlCatalog/Pages/CarouselPage/CareCompanionAppPage.xaml.cs
@@ -0,0 +1,1068 @@
+using System;
+using System.Collections.ObjectModel;
+using Avalonia;
+using Avalonia.Animation;
+using Avalonia.Controls;
+using Avalonia.Controls.Presenters;
+using Avalonia.Controls.Primitives;
+using Avalonia.Input;
+using Avalonia.Interactivity;
+using Avalonia.Layout;
+using Avalonia.Media;
+using Avalonia.Styling;
+using AvaCarouselPage = Avalonia.Controls.CarouselPage;
+
+namespace ControlCatalog.Pages;
+
+public partial class CareCompanionAppPage : UserControl
+{
+    static readonly Color Primary = Color.Parse("#137fec");
+    static readonly Color PrimaryDark = Color.Parse("#0a5bb5");
+    static readonly Color PrimaryLight = Color.Parse("#e0f0ff");
+    static readonly Color BgLight = Color.Parse("#f6f7f8");
+    static readonly Color TextDark = Color.Parse("#111827");
+    static readonly Color TextMuted = Color.Parse("#64748b");
+    static readonly Color CardBg = Colors.White;
+    static readonly Color SuccessGreen = Color.Parse("#10b981");
+    static readonly Color WarningAmber = Color.Parse("#f59e0b");
+
+    NavigationPage? _navPage;
+    AvaCarouselPage? _onboarding;
+    ScrollViewer? _infoPanel;
+
+    public CareCompanionAppPage()
+    {
+        InitializeComponent();
+    }
+
+    protected override void OnLoaded(RoutedEventArgs e)
+    {
+        base.OnLoaded(e);
+        _infoPanel = this.FindControl<ScrollViewer>("InfoPanel");
+        UpdateInfoVisibility();
+
+        _navPage = this.FindControl<NavigationPage>("NavPage");
+        if (_navPage == null) return;
+
+        _onboarding = BuildOnboardingCarousel();
+        _ = _navPage.PushAsync(_onboarding);
+    }
+
+    protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+    {
+        base.OnPropertyChanged(change);
+        if (change.Property == BoundsProperty)
+            UpdateInfoVisibility();
+    }
+
+    void UpdateInfoVisibility()
+    {
+        if (_infoPanel != null)
+            _infoPanel.IsVisible = Bounds.Width >= 650;
+    }
+
+    static TextBlock Txt(string text, double size, FontWeight weight, Color color,
+        double opacity = 1, TextAlignment align = TextAlignment.Left,
+        TextWrapping wrap = TextWrapping.NoWrap)
+        => new TextBlock
+        {
+            Text = text,
+            FontSize = size,
+            FontWeight = weight,
+            Foreground = new SolidColorBrush(color),
+            Opacity = opacity,
+            TextAlignment = align,
+            TextWrapping = wrap,
+        };
+
+    static Button StyledButton(object content, IBrush bg, IBrush fg, double height,
+        CornerRadius radius, Thickness margin = default, double fontSize = 14,
+        FontWeight fontWeight = FontWeight.SemiBold,
+        IBrush? border = null, Thickness borderThick = default)
+    {
+        var btn = new Button
+        {
+            Content = content,
+            Background = bg,
+            Foreground = fg,
+            Height = height,
+            CornerRadius = radius,
+            Margin = margin,
+            Padding = new Thickness(16, 0),
+            HorizontalContentAlignment = HorizontalAlignment.Center,
+            VerticalContentAlignment = VerticalAlignment.Center,
+            BorderBrush = border,
+            BorderThickness = borderThick,
+        };
+
+        var over = new Style(x => x.OfType<Button>().Class(":pointerover").Descendant().OfType<ContentPresenter>());
+        over.Setters.Add(new Setter(ContentPresenter.BackgroundProperty, bg));
+        over.Setters.Add(new Setter(ContentPresenter.ForegroundProperty, fg));
+        btn.Styles.Add(over);
+
+        var press = new Style(x => x.OfType<Button>().Class(":pressed").Descendant().OfType<ContentPresenter>());
+        press.Setters.Add(new Setter(ContentPresenter.BackgroundProperty, bg));
+        press.Setters.Add(new Setter(ContentPresenter.ForegroundProperty, fg));
+        btn.Styles.Add(press);
+
+        return btn;
+    }
+
+    static PathIcon SvgIcon(string data, double size, Color color)
+        => new PathIcon
+        {
+            Data = Geometry.Parse(data),
+            Width = size,
+            Height = size,
+            Foreground = new SolidColorBrush(color),
+            HorizontalAlignment = HorizontalAlignment.Center,
+            VerticalAlignment = VerticalAlignment.Center,
+        };
+
+    static PipsPager MakePipsPager(int count, AvaCarouselPage carousel)
+    {
+        var pager = new PipsPager
+        {
+            NumberOfPages = count,
+            IsPreviousButtonVisible = false,
+            IsNextButtonVisible = false,
+            HorizontalAlignment = HorizontalAlignment.Center,
+        };
+
+        pager.Bind(PipsPager.SelectedPageIndexProperty,
+            new Avalonia.Data.Binding("SelectedIndex") { Source = carousel, Mode = Avalonia.Data.BindingMode.TwoWay });
+
+        return pager;
+    }
+
+    static Border ShadowWrap(Control ctrl, Color shadowColor)
+        => new Border
+        {
+            CornerRadius = new CornerRadius(999),
+            BoxShadow = new BoxShadows(new BoxShadow
+            {
+                OffsetX = 0,
+                OffsetY = 8,
+                Blur = 24,
+                Color = Color.FromArgb(55, shadowColor.R, shadowColor.G, shadowColor.B),
+            }),
+            Child = ctrl,
+        };
+
+    AvaCarouselPage BuildOnboardingCarousel()
+    {
+        var carousel = new AvaCarouselPage
+        {
+            Background = new SolidColorBrush(BgLight),
+            PageTransition = new CrossFade(TimeSpan.FromMilliseconds(300)),
+        };
+        NavigationPage.SetHasNavigationBar(carousel, false);
+
+        var pips1 = MakePipsPager(3, carousel);
+        var pips2 = MakePipsPager(3, carousel);
+        var pips3 = MakePipsPager(3, carousel);
+
+        var p1 = BuildWelcomePage(carousel, pips1);
+        var p2 = BuildTrackPage(carousel, pips2);
+        var p3 = BuildResourcesPage(carousel, pips3);
+
+        carousel.Pages = new ObservableCollection<Page> { p1, p2, p3 };
+
+        return carousel;
+    }
+
+    ContentPage BuildWelcomePage(AvaCarouselPage carousel, PipsPager dots)
+    {
+        var page = new ContentPage { Background = new SolidColorBrush(CardBg) };
+
+        var skipBtn = StyledButton("Skip", Brushes.Transparent, new SolidColorBrush(TextMuted),
+            32, new CornerRadius(999));
+        skipBtn.HorizontalAlignment = HorizontalAlignment.Right;
+        skipBtn.Margin = new Thickness(0, 4, 8, 0);
+        skipBtn.Click += (_, _) => CompleteOnboarding();
+
+        var illGrad1 = new LinearGradientBrush
+        {
+            StartPoint = new RelativePoint(0, 0, RelativeUnit.Relative),
+            EndPoint = new RelativePoint(1, 1, RelativeUnit.Relative),
+        };
+        illGrad1.GradientStops.Add(new GradientStop(Color.Parse("#dbeafe"), 0));
+        illGrad1.GradientStops.Add(new GradientStop(Color.Parse("#93c5fd"), 0.5));
+        illGrad1.GradientStops.Add(new GradientStop(Color.Parse("#3b82f6"), 1));
+
+        var illPanel1 = new Panel { Background = illGrad1 };
+
+        illPanel1.Children.Add(new Border
+        {
+            Width = 160,
+            Height = 160,
+            CornerRadius = new CornerRadius(80),
+            Background = new SolidColorBrush(Color.FromArgb(30, 255, 255, 255)),
+            HorizontalAlignment = HorizontalAlignment.Center,
+            VerticalAlignment = VerticalAlignment.Center,
+        });
+
+        illPanel1.Children.Add(new Border
+        {
+            Width = 80,
+            Height = 80,
+            CornerRadius = new CornerRadius(20),
+            Background = Brushes.White,
+            HorizontalAlignment = HorizontalAlignment.Center,
+            VerticalAlignment = VerticalAlignment.Center,
+            BoxShadow = BoxShadows.Parse("0 8 24 0 #0000001a"),
+            Child = SvgIcon(
+                "M12 21.593c-5.63-5.539-11-10.297-11-14.402 0-3.791 3.068-5.191 5.281-5.191 1.312 0 4.151.501 5.719 4.457 1.59-3.968 4.464-4.447 5.726-4.447 2.54 0 5.274 1.621 5.274 5.181 0 4.069-5.136 8.625-11 14.402z",
+                38, Color.Parse("#3b82f6")),
+        });
+
+        illPanel1.Children.Add(new Border
+        {
+            Background = Brushes.White,
+            CornerRadius = new CornerRadius(999),
+            Padding = new Thickness(10, 6),
+            HorizontalAlignment = HorizontalAlignment.Left,
+            VerticalAlignment = VerticalAlignment.Bottom,
+            Margin = new Thickness(24, 0, 0, 24),
+            BoxShadow = BoxShadows.Parse("0 4 12 0 #0000001a"),
+            Child = new StackPanel
+            {
+                Orientation = Orientation.Horizontal,
+                Spacing = 6,
+                Children =
+                {
+                    new Border
+                    {
+                        Width = 8,
+                        Height = 8,
+                        CornerRadius = new CornerRadius(4),
+                        Background = new SolidColorBrush(SuccessGreen),
+                        VerticalAlignment = VerticalAlignment.Center,
+                    },
+                    Txt("Your health, simplified", 10, FontWeight.SemiBold, TextDark),
+                },
+            },
+        });
+
+        illPanel1.Children.Add(new Border
+        {
+            Width = 44,
+            Height = 44,
+            CornerRadius = new CornerRadius(22),
+            Background = new SolidColorBrush(Color.FromArgb(50, 255, 255, 255)),
+            HorizontalAlignment = HorizontalAlignment.Right,
+            VerticalAlignment = VerticalAlignment.Top,
+            Margin = new Thickness(0, 20, 28, 0),
+            Child = SvgIcon("M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z", 20, Colors.White),
+        });
+
+        var imgCard1 = new Border
+        {
+            Height = 210,
+            CornerRadius = new CornerRadius(20),
+            ClipToBounds = true,
+            Margin = new Thickness(20, 6, 20, 0),
+            Child = illPanel1,
+        };
+
+        var textArea = new StackPanel { Margin = new Thickness(28, 20, 28, 0), Spacing = 10 };
+        var titleStack1 = new StackPanel { Spacing = 2, HorizontalAlignment = HorizontalAlignment.Center };
+        titleStack1.Children.Add(Txt("Welcome to Your", 26, FontWeight.Bold, TextDark, align: TextAlignment.Center));
+        titleStack1.Children.Add(Txt("Care Companion", 28, FontWeight.ExtraBold, Primary, align: TextAlignment.Center));
+        textArea.Children.Add(titleStack1);
+        textArea.Children.Add(Txt(
+            "We are here to support you through every step of your treatment journey. Track symptoms, manage appointments, and stay connected.",
+            13, FontWeight.Normal, TextMuted, align: TextAlignment.Center, wrap: TextWrapping.Wrap));
+
+        var nextRow = new StackPanel
+        {
+            Orientation = Orientation.Horizontal, HorizontalAlignment = HorizontalAlignment.Center, Spacing = 6,
+        };
+        nextRow.Children.Add(Txt("Next", 15, FontWeight.SemiBold, Colors.White));
+        nextRow.Children.Add(SvgIcon("M12 4l-1.41 1.41L16.17 11H4v2h12.17l-5.58 5.59L12 20l8-8z", 12, Colors.White));
+
+        var nextBtn = StyledButton(nextRow, new SolidColorBrush(Primary), Brushes.White, 52, new CornerRadius(999));
+        nextBtn.HorizontalAlignment = HorizontalAlignment.Stretch;
+        nextBtn.Click += (_, _) => carousel.SelectedIndex = 1;
+
+        var nextBtnWrap = ShadowWrap(nextBtn, Primary);
+        nextBtnWrap.HorizontalAlignment = HorizontalAlignment.Stretch;
+
+        var bottomArea = new StackPanel { Margin = new Thickness(24, 16, 24, 36), Spacing = 20 };
+        bottomArea.Children.Add(dots);
+        bottomArea.Children.Add(nextBtnWrap);
+
+        var middleStack = new StackPanel { Spacing = 0 };
+        middleStack.Children.Add(imgCard1);
+        middleStack.Children.Add(textArea);
+
+        var middleScroll = new ScrollViewer
+        {
+            VerticalScrollBarVisibility = ScrollBarVisibility.Hidden, Content = middleStack,
+        };
+
+        var grid = new Grid();
+        grid.RowDefinitions.Add(new RowDefinition(GridLength.Auto));
+        grid.RowDefinitions.Add(new RowDefinition(GridLength.Star));
+        grid.RowDefinitions.Add(new RowDefinition(GridLength.Auto));
+        Grid.SetRow(skipBtn, 0);
+        Grid.SetRow(middleScroll, 1);
+        Grid.SetRow(bottomArea, 2);
+        grid.Children.Add(skipBtn);
+        grid.Children.Add(middleScroll);
+        grid.Children.Add(bottomArea);
+
+        page.Content = grid;
+        return page;
+    }
+
+    ContentPage BuildTrackPage(AvaCarouselPage carousel, PipsPager dots)
+    {
+        var page = new ContentPage { Background = new SolidColorBrush(CardBg) };
+
+        var skipBtn = StyledButton("Skip", Brushes.Transparent, new SolidColorBrush(TextMuted),
+            32, new CornerRadius(999));
+        skipBtn.HorizontalAlignment = HorizontalAlignment.Right;
+        skipBtn.Margin = new Thickness(0, 4, 8, 0);
+        skipBtn.Click += (_, _) => CompleteOnboarding();
+
+        var illGrad2 = new LinearGradientBrush
+        {
+            StartPoint = new RelativePoint(0, 0, RelativeUnit.Relative),
+            EndPoint = new RelativePoint(1, 1, RelativeUnit.Relative),
+        };
+        illGrad2.GradientStops.Add(new GradientStop(Color.Parse("#0ea5e9"), 0));
+        illGrad2.GradientStops.Add(new GradientStop(Color.Parse("#6366f1"), 1));
+
+        var illPanel2 = new Panel { Background = illGrad2 };
+
+        int[] barH = { 48, 72, 40, 96, 64, 80, 56 };
+        string[] barD = { "M", "T", "W", "T", "F", "S", "S" };
+        var chartInner = new StackPanel
+        {
+            Orientation = Orientation.Horizontal,
+            HorizontalAlignment = HorizontalAlignment.Center,
+            VerticalAlignment = VerticalAlignment.Bottom,
+            Spacing = 6,
+            Margin = new Thickness(0, 0, 0, 10),
+        };
+        for (int ci = 0; ci < barH.Length; ci++)
+        {
+            var barCol = new StackPanel { Spacing = 3, VerticalAlignment = VerticalAlignment.Bottom };
+            barCol.Children.Add(new Border
+            {
+                Width = 20,
+                Height = barH[ci],
+                CornerRadius = new CornerRadius(5, 5, 0, 0),
+                Background = new SolidColorBrush(ci == 3 ? Colors.White : Color.FromArgb(160, 255, 255, 255)),
+                VerticalAlignment = VerticalAlignment.Bottom,
+            });
+            barCol.Children.Add(Txt(barD[ci], 9, FontWeight.Medium, Colors.White, 0.7, align: TextAlignment.Center));
+            chartInner.Children.Add(barCol);
+        }
+
+        illPanel2.Children.Add(new Border
+        {
+            Background = new SolidColorBrush(Color.FromArgb(40, 255, 255, 255)),
+            CornerRadius = new CornerRadius(16),
+            Padding = new Thickness(14, 14, 14, 6),
+            HorizontalAlignment = HorizontalAlignment.Center,
+            VerticalAlignment = VerticalAlignment.Center,
+            Child = chartInner,
+        });
+
+        illPanel2.Children.Add(new Border
+        {
+            Background = Brushes.White,
+            CornerRadius = new CornerRadius(12),
+            Padding = new Thickness(10, 7),
+            HorizontalAlignment = HorizontalAlignment.Left,
+            VerticalAlignment = VerticalAlignment.Top,
+            Margin = new Thickness(22, 20, 0, 0),
+            BoxShadow = BoxShadows.Parse("0 4 12 0 #0000001a"),
+            Child = new StackPanel
+            {
+                Spacing = 1,
+                Children =
+                {
+                    Txt("Weekly Score", 9, FontWeight.SemiBold, TextMuted),
+                    Txt("\u2191 18%", 13, FontWeight.Bold, Color.Parse("#0ea5e9")),
+                },
+            },
+        });
+
+        illPanel2.Children.Add(new Border
+        {
+            Width = 36,
+            Height = 36,
+            CornerRadius = new CornerRadius(18),
+            Background = new SolidColorBrush(Color.FromArgb(50, 255, 255, 255)),
+            HorizontalAlignment = HorizontalAlignment.Right,
+            VerticalAlignment = VerticalAlignment.Top,
+            Margin = new Thickness(0, 22, 24, 0),
+            Child = SvgIcon(
+                "M16 6l2.29 2.29-4.88 4.88-4-4L2 16.59 3.41 18l6-6 4 4 6.3-6.29L22 12V6z",
+                16, Colors.White),
+        });
+
+        var imgCard2 = new Border
+        {
+            Height = 210,
+            CornerRadius = new CornerRadius(20),
+            ClipToBounds = true,
+            Margin = new Thickness(20, 6, 20, 0),
+            Child = illPanel2,
+        };
+
+        var iconBadge = new Border
+        {
+            Width = 52,
+            Height = 52,
+            CornerRadius = new CornerRadius(14),
+            Background = new SolidColorBrush(Color.Parse("#eff6ff")),
+            Margin = new Thickness(0, 16, 0, 0),
+            HorizontalAlignment = HorizontalAlignment.Center,
+            Child = SvgIcon(
+                "M16 6l2.29 2.29-4.88 4.88-4-4L2 16.59 3.41 18l6-6 4 4 6.3-6.29L22 12V6z",
+                24, Primary),
+        };
+
+        var textArea = new StackPanel { Margin = new Thickness(28, 10, 28, 0), Spacing = 10 };
+        textArea.Children.Add(Txt("Track and Understand", 24, FontWeight.Bold, TextDark,
+            align: TextAlignment.Center, wrap: TextWrapping.Wrap));
+        textArea.Children.Add(Txt(
+            "Easily log your symptoms and side effects to share with your medical team for better care.",
+            13, FontWeight.Normal, TextMuted, align: TextAlignment.Center, wrap: TextWrapping.Wrap));
+
+        var backRow = new StackPanel
+        {
+            Orientation = Orientation.Horizontal, HorizontalAlignment = HorizontalAlignment.Center, Spacing = 6,
+        };
+        backRow.Children.Add(SvgIcon("M20 11H7.83l5.59-5.59L12 4l-8 8 8 8 1.41-1.41L7.83 13H20v-2z", 12, TextDark));
+        backRow.Children.Add(Txt("Back", 15, FontWeight.SemiBold, TextDark));
+
+        var nextRow = new StackPanel
+        {
+            Orientation = Orientation.Horizontal, HorizontalAlignment = HorizontalAlignment.Center, Spacing = 6,
+        };
+        nextRow.Children.Add(Txt("Next", 15, FontWeight.SemiBold, Colors.White));
+        nextRow.Children.Add(SvgIcon("M12 4l-1.41 1.41L16.17 11H4v2h12.17l-5.58 5.59L12 20l8-8z", 12, Colors.White));
+
+        var backBtn = StyledButton(backRow, new SolidColorBrush(Color.Parse("#f3f4f6")),
+            new SolidColorBrush(TextDark), 52, new CornerRadius(999));
+        backBtn.HorizontalAlignment = HorizontalAlignment.Stretch;
+        backBtn.Click += (_, _) => carousel.SelectedIndex = 0;
+
+        var nextBtn = StyledButton(nextRow, new SolidColorBrush(Primary), Brushes.White, 52, new CornerRadius(999));
+        nextBtn.HorizontalAlignment = HorizontalAlignment.Stretch;
+        nextBtn.Click += (_, _) => carousel.SelectedIndex = 2;
+
+        var nextBtnWrap2 = ShadowWrap(nextBtn, Primary);
+        nextBtnWrap2.HorizontalAlignment = HorizontalAlignment.Stretch;
+
+        var navGrid = new Grid { ColumnDefinitions = new ColumnDefinitions("*,16,*") };
+        Grid.SetColumn(backBtn, 0);
+        Grid.SetColumn(nextBtnWrap2, 2);
+        navGrid.Children.Add(backBtn);
+        navGrid.Children.Add(nextBtnWrap2);
+
+        var bottomArea = new StackPanel { Margin = new Thickness(24, 16, 24, 36), Spacing = 20 };
+        bottomArea.Children.Add(dots);
+        bottomArea.Children.Add(navGrid);
+
+        var middleStack = new StackPanel { Spacing = 0 };
+        middleStack.Children.Add(imgCard2);
+        middleStack.Children.Add(iconBadge);
+        middleStack.Children.Add(textArea);
+
+        var middleScroll = new ScrollViewer
+        {
+            VerticalScrollBarVisibility = ScrollBarVisibility.Hidden, Content = middleStack,
+        };
+
+        var grid = new Grid();
+        grid.RowDefinitions.Add(new RowDefinition(GridLength.Auto));
+        grid.RowDefinitions.Add(new RowDefinition(GridLength.Star));
+        grid.RowDefinitions.Add(new RowDefinition(GridLength.Auto));
+        Grid.SetRow(skipBtn, 0);
+        Grid.SetRow(middleScroll, 1);
+        Grid.SetRow(bottomArea, 2);
+        grid.Children.Add(skipBtn);
+        grid.Children.Add(middleScroll);
+        grid.Children.Add(bottomArea);
+
+        page.Content = grid;
+        return page;
+    }
+
+    ContentPage BuildResourcesPage(AvaCarouselPage carousel, PipsPager dots)
+    {
+        var page = new ContentPage { Background = new SolidColorBrush(CardBg) };
+
+        var skipBtn = StyledButton("Skip", Brushes.Transparent, new SolidColorBrush(TextMuted),
+            32, new CornerRadius(999));
+        skipBtn.HorizontalAlignment = HorizontalAlignment.Right;
+        skipBtn.Margin = new Thickness(0, 4, 8, 0);
+        skipBtn.Click += (_, _) => CompleteOnboarding();
+
+        var illPanel = new Panel { Background = new SolidColorBrush(Color.Parse("#eef4ff")) };
+
+        illPanel.Children.Add(new Border
+        {
+            Width = 72,
+            Height = 72,
+            CornerRadius = new CornerRadius(36),
+            Background = Brushes.White,
+            HorizontalAlignment = HorizontalAlignment.Center,
+            VerticalAlignment = VerticalAlignment.Center,
+            Margin = new Thickness(0, 0, 0, 32),
+            BoxShadow = BoxShadows.Parse("0 4 16 0 #0000001a"),
+            Child = SvgIcon(
+                "M19 3H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2zm-5 14H7v-2h7v2zm3-4H7v-2h10v2zm0-4H7V7h10v2z",
+                32, Primary),
+        });
+
+        illPanel.Children.Add(new Border
+        {
+            Width = 36,
+            Height = 36,
+            CornerRadius = new CornerRadius(18),
+            Background = new SolidColorBrush(Color.Parse("#10b981")),
+            HorizontalAlignment = HorizontalAlignment.Right,
+            VerticalAlignment = VerticalAlignment.Top,
+            Margin = new Thickness(0, 22, 44, 0),
+            Child = SvgIcon("M20 2H4c-1.1 0-2 .9-2 2v18l4-4h14c1.1 0 2-.9 2-2V4c0-1.1-.9-2-2-2z", 17, Colors.White),
+        });
+
+        illPanel.Children.Add(new Border
+        {
+            Width = 30,
+            Height = 30,
+            CornerRadius = new CornerRadius(15),
+            Background = new SolidColorBrush(Color.Parse("#8b5cf6")),
+            HorizontalAlignment = HorizontalAlignment.Right,
+            VerticalAlignment = VerticalAlignment.Center,
+            Margin = new Thickness(0, 0, 20, 0),
+            Child = SvgIcon(
+                "M16 11c1.66 0 2.99-1.34 2.99-3S17.66 5 16 5c-1.66 0-3 1.34-3 3s1.34 3 3 3zm-8 0c1.66 0 2.99-1.34 2.99-3S9.66 5 8 5C6.34 5 5 6.34 5 8s1.34 3 3 3zm0 2c-2.33 0-7 1.17-7 3.5V19h14v-2.5c0-2.33-4.67-3.5-7-3.5zm8 0c-.29 0-.62.02-.97.05 1.16.84 1.97 1.97 1.97 3.45V19h6v-2.5c0-2.33-4.67-3.5-7-3.5z",
+                15, Colors.White),
+        });
+
+        var avatarGrad = new LinearGradientBrush
+        {
+            StartPoint = new RelativePoint(0, 0, RelativeUnit.Relative),
+            EndPoint = new RelativePoint(1, 1, RelativeUnit.Relative),
+        };
+        avatarGrad.GradientStops.Add(new GradientStop(Color.Parse("#93c5fd"), 0));
+        avatarGrad.GradientStops.Add(new GradientStop(Primary, 1));
+        illPanel.Children.Add(new Border
+        {
+            Width = 40,
+            Height = 40,
+            CornerRadius = new CornerRadius(20),
+            Background = avatarGrad,
+            HorizontalAlignment = HorizontalAlignment.Left,
+            VerticalAlignment = VerticalAlignment.Center,
+            Margin = new Thickness(32, -20, 0, 0),
+            Child = SvgIcon(
+                "M12 2C9.243 2 7 4.243 7 7s2.243 5 5 5 5-2.243 5-5-2.243-5-5-5zM12 14c-5.523 0-10 3.582-10 8a1 1 0 001 1h18a1 1 0 001-1c0-4.418-4.477-8-10-8z",
+                22, Colors.White),
+        });
+
+        var csIconBorder = new Border
+        {
+            Width = 28,
+            Height = 28,
+            CornerRadius = new CornerRadius(6),
+            Background = new SolidColorBrush(Color.Parse("#eff6ff")),
+            VerticalAlignment = VerticalAlignment.Center,
+            Child = SvgIcon(
+                "M16 11c1.66 0 2.99-1.34 2.99-3S17.66 5 16 5c-1.66 0-3 1.34-3 3s1.34 3 3 3zm-8 0c1.66 0 2.99-1.34 2.99-3S9.66 5 8 5C6.34 5 5 6.34 5 8s1.34 3 3 3zm0 2c-2.33 0-7 1.17-7 3.5V19h14v-2.5c0-2.33-4.67-3.5-7-3.5zm8 0c-.29 0-.62.02-.97.05 1.16.84 1.97 1.97 1.97 3.45V19h6v-2.5c0-2.33-4.67-3.5-7-3.5z",
+                14, Primary),
+        };
+        var csText = new StackPanel { Spacing = 1, VerticalAlignment = VerticalAlignment.Center };
+        csText.Children.Add(Txt("Community Support", 10, FontWeight.SemiBold, TextDark));
+        csText.Children.Add(Txt("Connect with others and experts.", 9, FontWeight.Normal, TextMuted,
+            wrap: TextWrapping.Wrap));
+        var csInner = new StackPanel { Orientation = Orientation.Horizontal, Spacing = 8 };
+        csInner.Children.Add(csIconBorder);
+        csInner.Children.Add(csText);
+        illPanel.Children.Add(new Border
+        {
+            Background = Brushes.White,
+            CornerRadius = new CornerRadius(10),
+            Padding = new Thickness(8, 7),
+            HorizontalAlignment = HorizontalAlignment.Left,
+            VerticalAlignment = VerticalAlignment.Bottom,
+            Margin = new Thickness(16, 0, 64, 14),
+            BoxShadow = BoxShadows.Parse("0 2 8 0 #0000001a"),
+            Child = csInner,
+        });
+
+        var illCard = new Border
+        {
+            Height = 210,
+            CornerRadius = new CornerRadius(20),
+            ClipToBounds = true,
+            Margin = new Thickness(20, 6, 20, 0),
+            Child = illPanel,
+        };
+
+        var textArea = new StackPanel { Margin = new Thickness(28, 20, 28, 0), Spacing = 10 };
+        textArea.Children.Add(Txt("Stay Informed and Connected", 24, FontWeight.Bold, TextDark,
+            align: TextAlignment.Center, wrap: TextWrapping.Wrap));
+        textArea.Children.Add(Txt(
+            "Access expert resources and manage your appointments all in one place.",
+            13, FontWeight.Normal, TextMuted, align: TextAlignment.Center, wrap: TextWrapping.Wrap));
+
+        var gsRow = new StackPanel
+        {
+            Orientation = Orientation.Horizontal, HorizontalAlignment = HorizontalAlignment.Center, Spacing = 6,
+        };
+        gsRow.Children.Add(Txt("Get Started", 15, FontWeight.SemiBold, Colors.White));
+        gsRow.Children.Add(SvgIcon("M12 4l-1.41 1.41L16.17 11H4v2h12.17l-5.58 5.59L12 20l8-8z", 12, Colors.White));
+
+        var getStartedBtn = StyledButton(gsRow, new SolidColorBrush(Primary), Brushes.White, 52, new CornerRadius(999));
+        getStartedBtn.HorizontalAlignment = HorizontalAlignment.Stretch;
+        getStartedBtn.Click += (_, _) => CompleteOnboarding();
+
+        var getStartedWrap = ShadowWrap(getStartedBtn, Primary);
+        getStartedWrap.HorizontalAlignment = HorizontalAlignment.Stretch;
+
+        var loginRow = new StackPanel
+        {
+            Orientation = Orientation.Horizontal,
+            HorizontalAlignment = HorizontalAlignment.Center,
+            VerticalAlignment = VerticalAlignment.Center,
+            Spacing = 0,
+        };
+        loginRow.Children.Add(new TextBlock
+        {
+            Text = "Already have an account? ",
+            FontSize = 13,
+            Foreground = new SolidColorBrush(TextMuted),
+            VerticalAlignment = VerticalAlignment.Center,
+        });
+        var loginLink = new TextBlock
+        {
+            Text = "Log In",
+            FontSize = 13,
+            FontWeight = FontWeight.SemiBold,
+            Foreground = new SolidColorBrush(Primary),
+            VerticalAlignment = VerticalAlignment.Center,
+            Cursor = new Cursor(StandardCursorType.Hand),
+        };
+        loginLink.PointerReleased += (_, _) => CompleteOnboarding();
+        loginRow.Children.Add(loginLink);
+
+        var bottomArea = new StackPanel { Margin = new Thickness(24, 16, 24, 28), Spacing = 16 };
+        bottomArea.Children.Add(dots);
+        bottomArea.Children.Add(getStartedWrap);
+        bottomArea.Children.Add(loginRow);
+
+        var middleStack = new StackPanel { Spacing = 0 };
+        middleStack.Children.Add(illCard);
+        middleStack.Children.Add(textArea);
+
+        var middleScroll = new ScrollViewer
+        {
+            VerticalScrollBarVisibility = ScrollBarVisibility.Hidden, Content = middleStack,
+        };
+
+        var grid = new Grid();
+        grid.RowDefinitions.Add(new RowDefinition(GridLength.Auto));
+        grid.RowDefinitions.Add(new RowDefinition(GridLength.Star));
+        grid.RowDefinitions.Add(new RowDefinition(GridLength.Auto));
+        Grid.SetRow(skipBtn, 0);
+        Grid.SetRow(middleScroll, 1);
+        Grid.SetRow(bottomArea, 2);
+        grid.Children.Add(skipBtn);
+        grid.Children.Add(middleScroll);
+        grid.Children.Add(bottomArea);
+
+        page.Content = grid;
+        return page;
+    }
+
+    async void CompleteOnboarding()
+    {
+        if (_navPage == null || _onboarding == null) return;
+        var dashboard = BuildDashboard();
+        await _navPage.PushAsync(dashboard);
+        _navPage.RemovePage(_onboarding);
+        _onboarding = null;
+    }
+
+    TabbedPage BuildDashboard()
+    {
+        var tp = new TabbedPage { Background = new SolidColorBrush(BgLight), TabPlacement = TabPlacement.Bottom, };
+        tp.Resources["TabbedPageTabStripBackground"] = Brushes.White;
+        tp.Resources["TabbedPageTabItemHeaderForegroundSelected"] = new SolidColorBrush(Primary);
+        tp.Resources["TabbedPageTabItemHeaderForegroundUnselected"] = new SolidColorBrush(TextMuted);
+        NavigationPage.SetHasNavigationBar(tp, false);
+
+        var home = BuildHomeTab();
+        home.Header = "Home";
+        home.Icon = Geometry.Parse("M10 20v-6h4v6h5v-8h3L12 3 2 12h3v8z");
+
+        tp.Pages = new ObservableCollection<Page>
+        {
+            home,
+            PlaceholderTab("Care Plan",
+                "M19 3H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2zm-5 14H7v-2h7v2zm3-4H7v-2h10v2zm0-4H7V7h10v2z",
+                "Your personalized care plan will appear here."),
+            PlaceholderTab("Messages",
+                "M20 2H4c-1.1 0-2 .9-2 2v18l4-4h14c1.1 0 2-.9 2-2V4c0-1.1-.9-2-2-2z",
+                "Messages from your care team will appear here."),
+            PlaceholderTab("Library",
+                "M21 5c-1.11-.35-2.33-.5-3.5-.5-1.95 0-4.05.4-5.5 1.5-1.45-1.1-3.55-1.5-5.5-1.5S2.45 4.9 1 6v14.65c0 .25.25.5.5.5.1 0 .15-.05.25-.05C3.1 20.45 5.05 20 6.5 20c1.95 0 4.05.4 5.5 1.5 1.35-.85 3.8-1.5 5.5-1.5 1.65 0 3.35.3 4.75 1.05.1.05.15.05.25.05.25 0 .5-.25.5-.5V6c-.6-.45-1.25-.75-2-1z",
+                "Educational resources and guides will appear here."),
+            PlaceholderTab("Profile",
+                "M12 2C9.243 2 7 4.243 7 7s2.243 5 5 5 5-2.243 5-5-2.243-5-5-5zM12 14c-5.523 0-10 3.582-10 8a1 1 0 001 1h18a1 1 0 001-1c0-4.418-4.477-8-10-8z",
+                "Your profile and settings will appear here."),
+        };
+
+        return tp;
+    }
+
+    static ContentPage PlaceholderTab(string header, string iconData, string message)
+        => new ContentPage
+        {
+            Header = header,
+            Icon = Geometry.Parse(iconData),
+            Background = new SolidColorBrush(BgLight),
+            Content = new StackPanel
+            {
+                VerticalAlignment = VerticalAlignment.Center,
+                HorizontalAlignment = HorizontalAlignment.Center,
+                Spacing = 12,
+                Margin = new Thickness(32),
+                Children =
+                {
+                    SvgIcon(iconData, 48, Color.Parse("#d1d5db")),
+                    Txt(header, 20, FontWeight.Bold, TextDark, align: TextAlignment.Center),
+                    Txt(message, 13, FontWeight.Normal, TextMuted,
+                        align: TextAlignment.Center, wrap: TextWrapping.Wrap),
+                },
+            },
+        };
+
+    ContentPage BuildHomeTab()
+    {
+        var page = new ContentPage { Background = new SolidColorBrush(BgLight) };
+        var scroll = new ScrollViewer { VerticalScrollBarVisibility = ScrollBarVisibility.Auto };
+        var root = new StackPanel { Spacing = 0 };
+
+        var headerBorder = new Border { Background = Brushes.White, Padding = new Thickness(16, 20, 16, 16) };
+        var hGrid = new Grid { ColumnDefinitions = new ColumnDefinitions("*,Auto") };
+
+        var greetStack = new StackPanel { Spacing = 2 };
+        greetStack.Children.Add(Txt("Tuesday, Oct 24", 12, FontWeight.Normal, TextMuted));
+        greetStack.Children.Add(Txt("Good Morning, Sarah", 20, FontWeight.Bold, TextDark));
+        hGrid.Children.Add(greetStack);
+
+        var bellContainer = new Panel { Width = 40, Height = 40, VerticalAlignment = VerticalAlignment.Center };
+        bellContainer.Children.Add(new Border
+        {
+            Width = 40,
+            Height = 40,
+            CornerRadius = new CornerRadius(20),
+            Background = new SolidColorBrush(Color.Parse("#f3f4f6")),
+            Child = SvgIcon(
+                "M12 22c1.1 0 2-.9 2-2h-4c0 1.1.89 2 2 2zm6-6v-5c0-3.07-1.64-5.64-4.5-6.32V4c0-.83-.67-1.5-1.5-1.5s-1.5.67-1.5 1.5v.68C7.63 5.36 6 7.92 6 11v5l-2 2v1h16v-1l-2-2z",
+                20, TextDark),
+        });
+        bellContainer.Children.Add(new Border
+        {
+            Width = 10,
+            Height = 10,
+            CornerRadius = new CornerRadius(5),
+            Background = Brushes.Red,
+            BorderBrush = Brushes.White,
+            BorderThickness = new Thickness(1.5),
+            HorizontalAlignment = HorizontalAlignment.Right,
+            VerticalAlignment = VerticalAlignment.Top,
+            Margin = new Thickness(0, 1, 1, 0),
+        });
+        Grid.SetColumn(bellContainer, 1);
+        hGrid.Children.Add(bellContainer);
+        headerBorder.Child = hGrid;
+        root.Children.Add(headerBorder);
+        root.Children.Add(new Border { Height = 12 });
+
+        var weeklyGrad = new LinearGradientBrush
+        {
+            StartPoint = new RelativePoint(0, 0.5, RelativeUnit.Relative),
+            EndPoint = new RelativePoint(1, 0.5, RelativeUnit.Relative),
+        };
+        weeklyGrad.GradientStops.Add(new GradientStop(Primary, 0));
+        weeklyGrad.GradientStops.Add(new GradientStop(PrimaryDark, 1));
+
+        var weeklyCard = new Border
+        {
+            Background = weeklyGrad,
+            CornerRadius = new CornerRadius(16),
+            Padding = new Thickness(16),
+            Margin = new Thickness(16, 0),
+        };
+        var weeklyInner = new StackPanel { Spacing = 14 };
+
+        var weeklyTitleRow = new Grid { ColumnDefinitions = new ColumnDefinitions("*,Auto") };
+        var weeklyTitleStack = new StackPanel { Spacing = 2 };
+        weeklyTitleStack.Children.Add(Txt("Weekly Progress", 16, FontWeight.Bold, Colors.White));
+        weeklyTitleStack.Children.Add(Txt("You're on a 5-day streak!", 12, FontWeight.Normal, Colors.White, 0.8));
+        weeklyTitleRow.Children.Add(weeklyTitleStack);
+
+        var trendBadge = new Border
+        {
+            Width = 40,
+            Height = 40,
+            CornerRadius = new CornerRadius(10),
+            Background = Brushes.White,
+            VerticalAlignment = VerticalAlignment.Center,
+            Child = SvgIcon(
+                "M16 6l2.29 2.29-4.88 4.88-4-4L2 16.59 3.41 18l6-6 4 4 6.3-6.29L22 12V6z",
+                20, Primary),
+        };
+        Grid.SetColumn(trendBadge, 1);
+        weeklyTitleRow.Children.Add(trendBadge);
+        weeklyInner.Children.Add(weeklyTitleRow);
+
+        string[] dayLabels = { "M", "T", "W", "T", "F", "S", "S" };
+        var dayGrid = new UniformGrid { Rows = 1 };
+        for (int i = 0; i < 7; i++)
+        {
+            bool isCurrent = i == 4;
+            bool isPast = i < 4;
+
+            Border innerCircle;
+            if (isCurrent)
+            {
+                innerCircle = new Border
+                {
+                    Width = 38,
+                    Height = 38,
+                    CornerRadius = new CornerRadius(19),
+                    Background = Brushes.White,
+                    Child = SvgIcon("M9 16.17L4.83 12l-1.42 1.41L9 19 21 7l-1.41-1.41z", 18, Primary),
+                };
+            }
+            else if (isPast)
+            {
+                innerCircle = new Border
+                {
+                    Width = 30,
+                    Height = 30,
+                    CornerRadius = new CornerRadius(15),
+                    Background = new SolidColorBrush(Color.FromArgb(55, 255, 255, 255)),
+                    Child = SvgIcon("M9 16.17L4.83 12l-1.42 1.41L9 19 21 7l-1.41-1.41z", 13, Colors.White),
+                };
+            }
+            else
+            {
+                innerCircle = new Border
+                {
+                    Width = 30,
+                    Height = 30,
+                    CornerRadius = new CornerRadius(15),
+                    Background = new SolidColorBrush(Color.FromArgb(25, 255, 255, 255)),
+                };
+            }
+
+            var circleWrap = new Border
+            {
+                Width = 40, Height = 40, HorizontalAlignment = HorizontalAlignment.Center, Child = innerCircle,
+            };
+            innerCircle.HorizontalAlignment = HorizontalAlignment.Center;
+            innerCircle.VerticalAlignment = VerticalAlignment.Center;
+
+            var dayCol = new StackPanel { Spacing = 4, HorizontalAlignment = HorizontalAlignment.Center };
+            dayCol.Children.Add(circleWrap);
+            dayCol.Children.Add(Txt(dayLabels[i], 10, FontWeight.Medium, Colors.White, 0.75,
+                align: TextAlignment.Center));
+            dayGrid.Children.Add(dayCol);
+        }
+
+        weeklyInner.Children.Add(dayGrid);
+        weeklyCard.Child = weeklyInner;
+        root.Children.Add(weeklyCard);
+        root.Children.Add(new Border { Height = 12 });
+
+        var symptomCard = new Border
+        {
+            Background = Brushes.White,
+            CornerRadius = new CornerRadius(16),
+            Padding = new Thickness(16),
+            Margin = new Thickness(16, 0),
+            BoxShadow = BoxShadows.Parse("0 1 4 0 #0000000a"),
+        };
+        var sInner = new StackPanel { Spacing = 12 };
+        var sTopRow = new StackPanel
+        {
+            Orientation = Orientation.Horizontal, Spacing = 12, VerticalAlignment = VerticalAlignment.Center
+        };
+        sTopRow.Children.Add(new Border
+        {
+            Width = 48,
+            Height = 48,
+            CornerRadius = new CornerRadius(12),
+            Background = new SolidColorBrush(Color.Parse("#fff7ed")),
+            Child = SvgIcon(
+                "M11.99 2C6.47 2 2 6.48 2 12s4.47 10 9.99 10C17.52 22 22 17.52 22 12S17.52 2 11.99 2zM12 20c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8zm3.5-9c.83 0 1.5-.67 1.5-1.5S16.33 8 15.5 8 14 8.67 14 9.5s.67 1.5 1.5 1.5zm-7 0c.83 0 1.5-.67 1.5-1.5S9.33 8 8.5 8 7 8.67 7 9.5 7.67 11 8.5 11zm3.5 6.5c2.33 0 4.31-1.46 5.11-3.5H6.89c.8 2.04 2.78 3.5 5.11 3.5z",
+                24, Color.Parse("#f97316")),
+        });
+        var sTextStack = new StackPanel { Spacing = 2, VerticalAlignment = VerticalAlignment.Center };
+        sTextStack.Children.Add(Txt("How are you feeling?", 15, FontWeight.Bold, TextDark));
+        sTextStack.Children.Add(Txt("Track your symptoms daily.", 12, FontWeight.Normal, TextMuted));
+        sTopRow.Children.Add(sTextStack);
+        sInner.Children.Add(sTopRow);
+
+        var logBtn = StyledButton("Log Symptoms", new SolidColorBrush(Primary), Brushes.White, 44,
+            new CornerRadius(10));
+        logBtn.HorizontalAlignment = HorizontalAlignment.Stretch;
+        sInner.Children.Add(logBtn);
+        symptomCard.Child = sInner;
+        root.Children.Add(symptomCard);
+
+        root.Children.Add(new Border { Height = 16 });
+        var schedHeader = new Grid
+        {
+            ColumnDefinitions = new ColumnDefinitions("*,Auto"), Margin = new Thickness(16, 0, 16, 8),
+        };
+        schedHeader.Children.Add(Txt("Today's Schedule", 16, FontWeight.Bold, TextDark));
+        var seeAllTxt = new TextBlock
+        {
+            Text = "See All",
+            FontSize = 13,
+            FontWeight = FontWeight.SemiBold,
+            Foreground = new SolidColorBrush(Primary),
+            VerticalAlignment = VerticalAlignment.Center,
+            Cursor = new Cursor(StandardCursorType.Hand),
+        };
+        Grid.SetColumn(seeAllTxt, 1);
+        schedHeader.Children.Add(seeAllTxt);
+        root.Children.Add(schedHeader);
+
+        root.Children.Add(BuildScheduleItem(
+            bulletColor: WarningAmber,
+            iconData:
+            "M19 3H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2zm-7 3c1.93 0 3.5 1.57 3.5 3.5S13.93 13 12 13s-3.5-1.57-3.5-3.5S10.07 6 12 6zm7 13H5v-.23c0-.62.28-1.2.76-1.58C7.47 15.82 9.64 15 12 15s4.53.82 6.24 2.19c.48.38.76.97.76 1.58V19z",
+            iconBg: Color.Parse("#fef3c7"),
+            iconFg: WarningAmber,
+            title: "Tamoxifen (20mg)",
+            time: "09:00 AM",
+            subtitle: "Take with food",
+            actionLabel: "Mark as Done",
+            isCheck: true));
+
+        root.Children.Add(new Border { Height = 8 });
+
+        root.Children.Add(BuildScheduleItem(
+            bulletColor: Primary,
+            iconData:
+            "M12 2C9.243 2 7 4.243 7 7s2.243 5 5 5 5-2.243 5-5-2.243-5-5-5zM12 14c-5.523 0-10 3.582-10 8a1 1 0 001 1h18a1 1 0 001-1c0-4.418-4.477-8-10-8z",
+            iconBg: PrimaryLight,
+            iconFg: Primary,
+            title: "Dr. Emily Chen",
+            time: "02:30 PM",
+            subtitle: "Oncologist \u2022 Video Consultation",
+            actionLabel: "Join Video Call",
+            isCheck: false));
+
+        root.Children.Add(new Border { Height = 12 });
+        root.Children.Add(new TextBlock
+        {
+            Text = "No more events for today. Rest well.",
+            FontSize = 12,
+            FontStyle = FontStyle.Italic,
+            Foreground = new SolidColorBrush(TextMuted),
+            TextAlignment = TextAlignment.Center,
+            Margin = new Thickness(16, 0, 16, 0),
+        });
+        root.Children.Add(new Border { Height = 24 });
+
+        scroll.Content = root;
+        page.Content = scroll;
+        return page;
+    }
+
+    Border BuildScheduleItem(Color bulletColor, string iconData, Color iconBg, Color iconFg,
+        string title, string time, string subtitle, string actionLabel, bool isCheck)
+    {
+        var card = new Border
+        {
+            Background = Brushes.White,
+            CornerRadius = new CornerRadius(16),
+            Padding = new Thickness(16),
+            Margin = new Thickness(16, 0),
+            BoxShadow = BoxShadows.Parse("0 1 4 0 #0000000a"),
+        };
+
+        var outerRow = new Grid { ColumnDefinitions = new ColumnDefinitions("8,*") };
+        outerRow.Children.Add(new Border
+        {
+            Width = 8,
+            Height = 8,
+            CornerRadius = new CornerRadius(4),
+            Background = new SolidColorBrush(bulletColor),
+            HorizontalAlignment = HorizontalAlignment.Center,
+            VerticalAlignment = VerticalAlignment.Top,
+            Margin = new Thickness(0, 4, 0, 0),
+        });
+
+        var rightStack = new StackPanel { Spacing = 8, Margin = new Thickness(10, 0, 0, 0) };
+        Grid.SetColumn(rightStack, 1);
+
+        var topRow = new Grid { ColumnDefinitions = new ColumnDefinitions("Auto,*,Auto") };
+        topRow.Children.Add(new Border
+        {
+            Width = 36,
+            Height = 36,
+            CornerRadius = new CornerRadius(8),
+            Background = new SolidColorBrush(iconBg),
+            VerticalAlignment = VerticalAlignment.Center,
+            Child = SvgIcon(iconData, 18, iconFg),
+        });
+
+        var titleTxt = Txt(title, 14, FontWeight.SemiBold, TextDark);
+        titleTxt.VerticalAlignment = VerticalAlignment.Center;
+        titleTxt.Margin = new Thickness(10, 0, 6, 0);
+        Grid.SetColumn(titleTxt, 1);
+        topRow.Children.Add(titleTxt);
+
+        var timeBadge = new Border
+        {
+            Background = new SolidColorBrush(Color.Parse("#f3f4f6")),
+            CornerRadius = new CornerRadius(999),
+            Padding = new Thickness(8, 3),
+            VerticalAlignment = VerticalAlignment.Center,
+            Child = Txt(time, 10, FontWeight.Medium, TextMuted),
+        };
+        Grid.SetColumn(timeBadge, 2);
+        topRow.Children.Add(timeBadge);
+        rightStack.Children.Add(topRow);
+        rightStack.Children.Add(Txt(subtitle, 12, FontWeight.Normal, TextMuted));
+
+        Button actionBtn;
+        if (isCheck)
+        {
+            actionBtn = StyledButton(actionLabel,
+                new SolidColorBrush(Color.Parse("#f0fdf4")),
+                new SolidColorBrush(SuccessGreen),
+                36, new CornerRadius(8),
+                border: new SolidColorBrush(Color.Parse("#bbf7d0")),
+                borderThick: new Thickness(1));
+        }
+        else
+        {
+            actionBtn = StyledButton(actionLabel, new SolidColorBrush(Primary), Brushes.White, 36, new CornerRadius(8));
+        }
+
+        actionBtn.HorizontalAlignment = HorizontalAlignment.Stretch;
+        rightStack.Children.Add(actionBtn);
+
+        outerRow.Children.Add(rightStack);
+        card.Child = outerRow;
+        return card;
+    }
+}
diff --git a/samples/ControlCatalog/Pages/CarouselPage/CarouselCustomizationPage.xaml b/samples/ControlCatalog/Pages/CarouselPage/CarouselCustomizationPage.xaml
new file mode 100644
index 0000000000..add442e7a1
--- /dev/null
+++ b/samples/ControlCatalog/Pages/CarouselPage/CarouselCustomizationPage.xaml
@@ -0,0 +1,119 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             x:Class="ControlCatalog.Pages.CarouselCustomizationPage">
+  <DockPanel>
+    <ScrollViewer DockPanel.Dock="Right" Width="260">
+      <StackPanel Margin="12" Spacing="8">
+        <TextBlock Text="Configuration" FontWeight="SemiBold" FontSize="16"
+                   Foreground="{DynamicResource SystemControlHighlightAccentBrush}" />
+
+        <TextBlock Text="Navigation" FontWeight="SemiBold" FontSize="13" />
+
+        <Button x:Name="PreviousButton"
+                Content="Previous"
+                HorizontalAlignment="Stretch" />
+        <Button x:Name="NextButton"
+                Content="Next"
+                HorizontalAlignment="Stretch" />
+
+        <Separator />
+
+        <TextBlock Text="Orientation" FontWeight="SemiBold" FontSize="13" />
+        <ComboBox x:Name="OrientationCombo"
+                  HorizontalAlignment="Stretch"
+                  SelectedIndex="0">
+          <ComboBoxItem>Horizontal</ComboBoxItem>
+          <ComboBoxItem>Vertical</ComboBoxItem>
+        </ComboBox>
+
+        <TextBlock Text="Viewport Fraction" FontWeight="SemiBold" FontSize="13" />
+        <Grid ColumnDefinitions="*,48" ColumnSpacing="8">
+          <Slider x:Name="ViewportSlider"
+                  Minimum="0.33"
+                  Maximum="1.0"
+                  Value="1.0"
+                  TickFrequency="0.01"
+                  HorizontalAlignment="Stretch" />
+          <TextBlock x:Name="ViewportLabel"
+                     Grid.Column="1"
+                     Text="1.00"
+                     VerticalAlignment="Center"
+                     HorizontalAlignment="Right"
+                     FontWeight="SemiBold" />
+        </Grid>
+        <TextBlock x:Name="ViewportHint"
+                   Text="1.00 shows a single full page."
+                   FontSize="11"
+                   Opacity="0.6"
+                   TextWrapping="Wrap" />
+
+        <Separator />
+
+        <TextBlock Text="Options" FontWeight="SemiBold" FontSize="14" />
+
+        <CheckBox x:Name="WrapSelectionCheck"
+                  Content="Wrap Selection"
+                  IsChecked="False"
+                  IsCheckedChanged="OnWrapSelectionChanged" />
+
+        <CheckBox x:Name="SwipeEnabledCheck"
+                  Content="Swipe Enabled"
+                  IsChecked="False"
+                  IsCheckedChanged="OnSwipeEnabledChanged" />
+
+        <Separator />
+
+        <TextBlock Text="Status" FontWeight="SemiBold" FontSize="14" />
+        <TextBlock x:Name="StatusText"
+                   Text="Orientation: Horizontal"
+                   Opacity="0.7"
+                   TextWrapping="Wrap" />
+      </StackPanel>
+    </ScrollViewer>
+
+    <Border DockPanel.Dock="Right" Width="1"
+            Background="{DynamicResource SystemControlForegroundBaseMediumLowBrush}" />
+
+    <Border Margin="12"
+            BorderBrush="{DynamicResource SystemControlForegroundBaseMediumLowBrush}"
+            BorderThickness="1"
+            CornerRadius="6"
+            ClipToBounds="True">
+      <Carousel x:Name="DemoCarousel" Height="300">
+        <Carousel.PageTransition>
+          <PageSlide Duration="0.25" Orientation="Horizontal" />
+        </Carousel.PageTransition>
+
+        <Border Margin="14,12" CornerRadius="12" ClipToBounds="True">
+          <Grid>
+            <Image Source="/Assets/delicate-arch-896885_640.jpg" Stretch="UniformToFill" />
+            <Border Background="#80000000" VerticalAlignment="Bottom" Padding="12">
+              <TextBlock Text="Item 1: Delicate Arch" Foreground="White"
+                         HorizontalAlignment="Center" FontWeight="SemiBold" />
+            </Border>
+          </Grid>
+        </Border>
+
+        <Border Margin="14,12" CornerRadius="12" ClipToBounds="True">
+          <Grid>
+            <Image Source="/Assets/hirsch-899118_640.jpg" Stretch="UniformToFill" />
+            <Border Background="#80000000" VerticalAlignment="Bottom" Padding="12">
+              <TextBlock Text="Item 2: Hirsch" Foreground="White"
+                         HorizontalAlignment="Center" FontWeight="SemiBold" />
+            </Border>
+          </Grid>
+        </Border>
+
+        <Border Margin="14,12" CornerRadius="12" ClipToBounds="True">
+          <Grid>
+            <Image Source="/Assets/maple-leaf-888807_640.jpg" Stretch="UniformToFill" />
+            <Border Background="#80000000" VerticalAlignment="Bottom" Padding="12">
+              <TextBlock Text="Item 3: Maple Leaf" Foreground="White"
+                         HorizontalAlignment="Center" FontWeight="SemiBold" />
+            </Border>
+          </Grid>
+        </Border>
+      </Carousel>
+    </Border>
+  </DockPanel>
+</UserControl>
diff --git a/samples/ControlCatalog/Pages/CarouselPage/CarouselCustomizationPage.xaml.cs b/samples/ControlCatalog/Pages/CarouselPage/CarouselCustomizationPage.xaml.cs
new file mode 100644
index 0000000000..c3b919d65d
--- /dev/null
+++ b/samples/ControlCatalog/Pages/CarouselPage/CarouselCustomizationPage.xaml.cs
@@ -0,0 +1,48 @@
+using System;
+using Avalonia.Animation;
+using Avalonia.Controls;
+using Avalonia.Controls.Primitives;
+using Avalonia.Interactivity;
+
+namespace ControlCatalog.Pages
+{
+    public partial class CarouselCustomizationPage : UserControl
+    {
+        public CarouselCustomizationPage()
+        {
+            InitializeComponent();
+            PreviousButton.Click += (_, _) => DemoCarousel.Previous();
+            NextButton.Click += (_, _) => DemoCarousel.Next();
+            OrientationCombo.SelectionChanged += (_, _) => ApplyOrientation();
+            ViewportSlider.ValueChanged += OnViewportFractionChanged;
+        }
+
+        private void ApplyOrientation()
+        {
+            var horizontal = OrientationCombo.SelectedIndex == 0;
+            var axis = horizontal ? PageSlide.SlideAxis.Horizontal : PageSlide.SlideAxis.Vertical;
+            DemoCarousel.PageTransition = new PageSlide(TimeSpan.FromSeconds(0.25), axis);
+            StatusText.Text = $"Orientation: {(horizontal ? "Horizontal" : "Vertical")}";
+        }
+
+        private void OnViewportFractionChanged(object? sender, RangeBaseValueChangedEventArgs e)
+        {
+            var value = Math.Round(e.NewValue, 2);
+            DemoCarousel.ViewportFraction = value;
+            ViewportLabel.Text = value.ToString("0.00");
+            ViewportHint.Text = value >= 1d ?
+                "1.00 shows a single full page." :
+                $"{1d / value:0.##} pages fit in view. Try 0.80 for peeking.";
+        }
+
+        private void OnWrapSelectionChanged(object? sender, RoutedEventArgs e)
+        {
+            DemoCarousel.WrapSelection = WrapSelectionCheck.IsChecked == true;
+        }
+
+        private void OnSwipeEnabledChanged(object? sender, RoutedEventArgs e)
+        {
+            DemoCarousel.IsSwipeEnabled = SwipeEnabledCheck.IsChecked == true;
+        }
+    }
+}
diff --git a/samples/ControlCatalog/Pages/CarouselPage/CarouselDataBindingPage.xaml b/samples/ControlCatalog/Pages/CarouselPage/CarouselDataBindingPage.xaml
new file mode 100644
index 0000000000..fcb7e96f52
--- /dev/null
+++ b/samples/ControlCatalog/Pages/CarouselPage/CarouselDataBindingPage.xaml
@@ -0,0 +1,60 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:pages="clr-namespace:ControlCatalog.Pages"
+             x:Class="ControlCatalog.Pages.CarouselDataBindingPage">
+  <DockPanel>
+    <ScrollViewer DockPanel.Dock="Right" Width="260">
+      <StackPanel Margin="12" Spacing="8">
+        <TextBlock Text="Collection" FontWeight="SemiBold" FontSize="16"
+                   Foreground="{DynamicResource SystemControlHighlightAccentBrush}" />
+
+        <TextBlock Text="Navigation" FontWeight="SemiBold" FontSize="13" />
+        <Button x:Name="PreviousButton" Content="Previous" HorizontalAlignment="Stretch" />
+        <Button x:Name="NextButton" Content="Next" HorizontalAlignment="Stretch" />
+
+        <Separator />
+
+        <TextBlock Text="Modify Items" FontWeight="SemiBold" FontSize="13" />
+        <TextBlock TextWrapping="Wrap" FontSize="11" Opacity="0.6"
+                   Text="The Carousel is bound to an ObservableCollection. Changes reflect immediately." />
+        <Button x:Name="AddButton" Content="Add Item" HorizontalAlignment="Stretch" />
+        <Button x:Name="RemoveButton" Content="Remove Current" HorizontalAlignment="Stretch" />
+        <Button x:Name="ShuffleButton" Content="Shuffle" HorizontalAlignment="Stretch" />
+
+        <Separator />
+
+        <TextBlock Text="Status" FontWeight="SemiBold" FontSize="14" />
+        <TextBlock x:Name="StatusText" Text="Item: 1 / 4"
+                   Opacity="0.7" TextWrapping="Wrap" />
+      </StackPanel>
+    </ScrollViewer>
+
+    <Border DockPanel.Dock="Right" Width="1"
+            Background="{DynamicResource SystemControlForegroundBaseMediumLowBrush}" />
+
+    <Border Margin="12"
+            BorderBrush="{DynamicResource SystemControlForegroundBaseMediumLowBrush}"
+            BorderThickness="1" CornerRadius="6" ClipToBounds="True">
+      <Carousel x:Name="DemoCarousel"
+                Height="280"
+                IsSwipeEnabled="True">
+        <Carousel.PageTransition>
+          <CrossFade Duration="0.3" />
+        </Carousel.PageTransition>
+        <Carousel.ItemTemplate>
+          <DataTemplate x:DataType="pages:CarouselCardItem">
+            <Border CornerRadius="14" Margin="14,12" ClipToBounds="True"
+                    Background="{Binding Background}">
+              <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center" Spacing="8">
+                <TextBlock Text="{Binding Number}" FontSize="52" FontWeight="Bold"
+                           Foreground="White" HorizontalAlignment="Center" LetterSpacing="-2" />
+                <TextBlock Text="{Binding Title}" FontSize="15" FontWeight="SemiBold"
+                           Foreground="{Binding Accent}" HorizontalAlignment="Center" />
+              </StackPanel>
+            </Border>
+          </DataTemplate>
+        </Carousel.ItemTemplate>
+      </Carousel>
+    </Border>
+  </DockPanel>
+</UserControl>
diff --git a/samples/ControlCatalog/Pages/CarouselPage/CarouselDataBindingPage.xaml.cs b/samples/ControlCatalog/Pages/CarouselPage/CarouselDataBindingPage.xaml.cs
new file mode 100644
index 0000000000..5a7b6e46da
--- /dev/null
+++ b/samples/ControlCatalog/Pages/CarouselPage/CarouselDataBindingPage.xaml.cs
@@ -0,0 +1,95 @@
+using System;
+using System.Collections.ObjectModel;
+using System.Linq;
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+using Avalonia.Media;
+
+namespace ControlCatalog.Pages
+{
+    public class CarouselCardItem
+    {
+        public string Number { get; set; } = "";
+        public string Title { get; set; } = "";
+        public IBrush Background { get; set; } = Brushes.Gray;
+        public IBrush Accent { get; set; } = Brushes.White;
+    }
+
+    public partial class CarouselDataBindingPage : UserControl
+    {
+        private static readonly (string Title, string Color, string Accent)[] Palette =
+        {
+            ("Neon Pulse", "#3525CD", "#C3C0FF"), ("Ephemeral Blue", "#0891B2", "#BAF0FA"),
+            ("Forest Forms", "#059669", "#A7F3D0"), ("Golden Hour", "#D97706", "#FDE68A"),
+            ("Crimson Wave", "#BE185D", "#FBCFE8"), ("Stone Age", "#57534E", "#D6D3D1"),
+        };
+
+        private readonly ObservableCollection<CarouselCardItem> _items = new();
+        private int _addCounter;
+
+        public CarouselDataBindingPage()
+        {
+            InitializeComponent();
+            DemoCarousel.ItemsSource = _items;
+            DemoCarousel.SelectionChanged += OnSelectionChanged;
+
+            for (var i = 0; i < 4; i++)
+                AppendItem();
+
+            PreviousButton.Click += (_, _) => DemoCarousel.Previous();
+            NextButton.Click += (_, _) => DemoCarousel.Next();
+            AddButton.Click += OnAddItem;
+            RemoveButton.Click += OnRemoveCurrent;
+            ShuffleButton.Click += OnShuffle;
+            UpdateStatus();
+        }
+
+        private void AppendItem()
+        {
+            var (title, color, accent) = Palette[_addCounter % Palette.Length];
+            _items.Add(new CarouselCardItem
+            {
+                Number = $"{_items.Count + 1:D2}",
+                Title = title,
+                Background = new SolidColorBrush(Color.Parse(color)),
+                Accent = new SolidColorBrush(Color.Parse(accent)),
+            });
+            _addCounter++;
+        }
+
+        private void OnAddItem(object? sender, RoutedEventArgs e)
+        {
+            AppendItem();
+            UpdateStatus();
+        }
+
+        private void OnRemoveCurrent(object? sender, RoutedEventArgs e)
+        {
+            if (_items.Count == 0)
+                return;
+            var idx = Math.Clamp(DemoCarousel.SelectedIndex, 0, _items.Count - 1);
+            _items.RemoveAt(idx);
+            UpdateStatus();
+        }
+
+        private void OnShuffle(object? sender, RoutedEventArgs e)
+        {
+            var rng = new Random();
+            var shuffled = _items.OrderBy(_ => rng.Next()).ToList();
+            _items.Clear();
+            foreach (var item in shuffled)
+                _items.Add(item);
+            UpdateStatus();
+        }
+
+        private void OnSelectionChanged(object? sender, SelectionChangedEventArgs e)
+        {
+            UpdateStatus();
+        }
+
+        private void UpdateStatus()
+        {
+            StatusText.Text = $"Item: {DemoCarousel.SelectedIndex + 1} / {_items.Count}";
+        }
+    }
+}
diff --git a/samples/ControlCatalog/Pages/CarouselPage/CarouselGalleryAppPage.xaml b/samples/ControlCatalog/Pages/CarouselPage/CarouselGalleryAppPage.xaml
new file mode 100644
index 0000000000..9c7c8e0eab
--- /dev/null
+++ b/samples/ControlCatalog/Pages/CarouselPage/CarouselGalleryAppPage.xaml
@@ -0,0 +1,557 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             x:Class="ControlCatalog.Pages.CarouselGalleryAppPage"
+             Background="#F8F9FB">
+  <UserControl.Resources>
+    <!-- White pip colors for the hero dark background -->
+    <SolidColorBrush x:Key="PipsPagerSelectionIndicatorForeground" Color="#7FFFFFFF" />
+    <SolidColorBrush x:Key="PipsPagerSelectionIndicatorForegroundPointerOver" Color="#BFFFFFFF" />
+    <SolidColorBrush x:Key="PipsPagerSelectionIndicatorForegroundPressed" Color="#BFFFFFFF" />
+    <SolidColorBrush x:Key="PipsPagerSelectionIndicatorForegroundSelected" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="PipsPagerSelectionIndicatorForegroundDisabled" Color="#3FFFFFFF" />
+    <SolidColorBrush x:Key="PipsPagerNavigationButtonForeground" Color="#7FFFFFFF" />
+    <SolidColorBrush x:Key="PipsPagerNavigationButtonForegroundPointerOver" Color="#BFFFFFFF" />
+    <SolidColorBrush x:Key="PipsPagerNavigationButtonForegroundPressed" Color="#BFFFFFFF" />
+  </UserControl.Resources>
+
+
+  <DockPanel>
+
+    <!-- Right info panel — visible when width >= 640px -->
+    <ScrollViewer x:Name="InfoPanel" DockPanel.Dock="Right" Width="290" IsVisible="False">
+      <StackPanel Margin="16" Spacing="16">
+
+        <TextBlock Text="Curated Gallery" FontSize="16" FontWeight="SemiBold"
+                   Foreground="{DynamicResource SystemControlHighlightAccentBrush}" />
+
+        <TextBlock TextWrapping="Wrap" FontSize="12" Opacity="0.7"
+                   Text="Art gallery editorial app showcasing a full-bleed hero Carousel synced with a pill-shaped PipsPager, a peek Collection Highlights scroll list, Curators' Choice cards, and a Join the Circle subscription section. Navigation via DrawerPage side menu." />
+
+        <Separator />
+
+        <TextBlock Text="Navigation Flow" FontSize="13" FontWeight="SemiBold" />
+        <StackPanel Spacing="4">
+          <TextBlock FontSize="12" TextWrapping="Wrap" Text="1. DrawerPage: root, side placement" />
+          <TextBlock FontSize="12" TextWrapping="Wrap" Text="2. Hamburger overlaid on hero opens the drawer pane" />
+          <TextBlock FontSize="12" TextWrapping="Wrap" Text="3. Hero: full-bleed Carousel + PipsPager (pill dots)" />
+          <TextBlock FontSize="12" TextWrapping="Wrap" Text="4. PipsPager synced bidirectionally with Carousel" />
+          <TextBlock FontSize="12" TextWrapping="Wrap" Text="5. Mouse drag on hero navigates carousel slides" />
+        </StackPanel>
+
+        <Separator />
+
+        <TextBlock Text="Key Code" FontSize="13" FontWeight="SemiBold" />
+        <Border Background="{DynamicResource SystemControlBackgroundBaseLowBrush}"
+                CornerRadius="4" Padding="8">
+          <TextBlock FontFamily="Cascadia Code,Consolas,Menlo,monospace"
+                     FontSize="10" TextWrapping="Wrap"
+                     Text="HeroCarousel.SelectionChanged&#xA;  += OnHeroSelectionChanged;&#xA;HeroPager.SelectedIndexChanged&#xA;  += OnPagerIndexChanged;&#xA;&#xA;// Bidirectional sync guard&#xA;if (_syncing) return;&#xA;_syncing = true;&#xA;HeroPager.SelectedPageIndex&#xA;  = HeroCarousel.SelectedIndex;&#xA;_syncing = false;" />
+        </Border>
+
+      </StackPanel>
+    </ScrollViewer>
+
+    <Border BorderBrush="{DynamicResource SystemControlForegroundBaseMediumLowBrush}"
+            BorderThickness="1" CornerRadius="8" ClipToBounds="True">
+
+  <DrawerPage x:Name="RootDrawer"
+              DrawerLength="260"
+              IsGestureEnabled="True">
+    <DrawerPage.Styles>
+      <!-- Hide the DrawerPage built-in top bar so only our custom hero overlay bar is shown -->
+      <Style Selector="DrawerPage#RootDrawer /template/ Border#PART_TopBar">
+        <Setter Property="IsVisible" Value="False" />
+      </Style>
+    </DrawerPage.Styles>
+
+    <!-- Drawer header -->
+    <DrawerPage.DrawerHeader>
+      <Border Background="#3525CD" Padding="20,32,20,20">
+        <StackPanel Spacing="4">
+          <TextBlock Text="CURATED"
+                     FontSize="20"
+                     FontWeight="Bold"
+                     Foreground="White"
+                     LetterSpacing="-0.4" />
+          <TextBlock Text="The Digital Gallery"
+                     FontSize="12"
+                     Foreground="#C3C0FF"
+                     Opacity="0.85" />
+        </StackPanel>
+      </Border>
+    </DrawerPage.DrawerHeader>
+
+    <!-- Drawer menu -->
+    <DrawerPage.Drawer>
+      <StackPanel Background="#F8F9FB">
+        <ListBox x:Name="DrawerMenu"
+                 Background="Transparent"
+                 SelectionChanged="OnDrawerMenuSelectionChanged">
+          <ListBoxItem Padding="20,14">
+            <StackPanel Orientation="Horizontal" Spacing="16">
+              <Path Data="M10 20v-6h4v6h5v-8h3L12 3 2 12h3v8z"
+                    Fill="#3525CD" Width="20" Height="20" Stretch="Uniform" />
+              <TextBlock Text="Discover" FontSize="15" FontWeight="SemiBold"
+                         Foreground="#191C1E" VerticalAlignment="Center" />
+            </StackPanel>
+          </ListBoxItem>
+          <ListBoxItem Padding="20,14">
+            <StackPanel Orientation="Horizontal" Spacing="16">
+              <Path Data="M4 6h16v2H4zm0 5h16v2H4zm0 5h16v2H4z"
+                    Fill="#464555" Width="20" Height="20" Stretch="Uniform" />
+              <TextBlock Text="Collection" FontSize="15"
+                         Foreground="#464555" VerticalAlignment="Center" />
+            </StackPanel>
+          </ListBoxItem>
+          <ListBoxItem Padding="20,14">
+            <StackPanel Orientation="Horizontal" Spacing="16">
+              <Path Data="M19 3H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2zm-7 14l-5-5 1.41-1.41L12 14.17l7.59-7.59L21 8l-9 9z"
+                    Fill="#464555" Width="20" Height="20" Stretch="Uniform" />
+              <TextBlock Text="Archive" FontSize="15"
+                         Foreground="#464555" VerticalAlignment="Center" />
+            </StackPanel>
+          </ListBoxItem>
+          <ListBoxItem Padding="20,14">
+            <StackPanel Orientation="Horizontal" Spacing="16">
+              <Path Data="M12 12c2.21 0 4-1.79 4-4s-1.79-4-4-4-4 1.79-4 4 1.79 4 4 4zm0 2c-2.67 0-8 1.34-8 4v2h16v-2c0-2.66-5.33-4-8-4z"
+                    Fill="#464555" Width="20" Height="20" Stretch="Uniform" />
+              <TextBlock Text="Profile" FontSize="15"
+                         Foreground="#464555" VerticalAlignment="Center" />
+            </StackPanel>
+          </ListBoxItem>
+        </ListBox>
+
+        <Separator Margin="20,8" />
+
+        <StackPanel Margin="20,8" Spacing="0">
+          <TextBlock Text="EXHIBITIONS"
+                     FontSize="11"
+                     FontWeight="Bold"
+                     Foreground="#777587"
+                     LetterSpacing="1.2"
+                     Margin="0,0,0,16" />
+
+          <Grid ColumnDefinitions="4,*" Margin="0,0,0,14">
+            <Border Grid.Column="0" Width="4" Height="38"
+                    CornerRadius="2" Background="#3525CD"
+                    VerticalAlignment="Center" Margin="0,0,14,0" />
+            <StackPanel Grid.Column="1" Spacing="2" VerticalAlignment="Center">
+              <TextBlock Text="Neon Pulse" FontSize="14" FontWeight="SemiBold"
+                         Foreground="#191C1E" />
+              <TextBlock Text="Opens March 20" FontSize="11" Foreground="#777587" />
+            </StackPanel>
+          </Grid>
+
+          <Grid ColumnDefinitions="4,*" Margin="0,0,0,14">
+            <Border Grid.Column="0" Width="4" Height="38"
+                    CornerRadius="2" Background="#4F46E5"
+                    VerticalAlignment="Center" Margin="0,0,14,0" />
+            <StackPanel Grid.Column="1" Spacing="2" VerticalAlignment="Center">
+              <TextBlock Text="Fragmented Forms" FontSize="14" FontWeight="SemiBold"
+                         Foreground="#191C1E" />
+              <TextBlock Text="Now Open" FontSize="11" Foreground="#4F46E5" />
+            </StackPanel>
+          </Grid>
+
+          <Grid ColumnDefinitions="4,*">
+            <Border Grid.Column="0" Width="4" Height="38"
+                    CornerRadius="2" Background="#B84B00"
+                    VerticalAlignment="Center" Margin="0,0,14,0" />
+            <StackPanel Grid.Column="1" Spacing="2" VerticalAlignment="Center">
+              <TextBlock Text="The Digital Horizon" FontSize="14" FontWeight="SemiBold"
+                         Foreground="#191C1E" />
+              <TextBlock Text="Closing Soon" FontSize="11" Foreground="#B84B00" />
+            </StackPanel>
+          </Grid>
+        </StackPanel>
+      </StackPanel>
+    </DrawerPage.Drawer>
+
+    <!-- Main content: hero carousel IS the header -->
+    <DrawerPage.Content>
+      <Grid RowDefinitions="Auto,*">
+
+        <!-- Row 0: Hero carousel header — also handles mouse drag for swipe navigation -->
+        <Grid Height="320"
+              PointerPressed="OnHeroPointerPressed"
+              PointerReleased="OnHeroPointerReleased"
+              PointerCaptureLost="OnHeroPointerCaptureLost">
+
+          <!-- Full-bleed hero carousel -->
+          <Carousel x:Name="HeroCarousel"
+                    IsSwipeEnabled="True">
+            <Carousel.PageTransition>
+              <PageSlide Duration="0.35" Orientation="Horizontal" />
+            </Carousel.PageTransition>
+
+            <!-- Hero 1 -->
+            <Grid>
+              <Image Source="/Assets/ModernApp/gallery_city.jpg" Stretch="UniformToFill" />
+              <Border>
+                <Border.Background>
+                  <LinearGradientBrush StartPoint="0,0" EndPoint="0,1">
+                    <GradientStop Color="#88000000" Offset="0" />
+                    <GradientStop Color="#00000000" Offset="0.35" />
+                    <GradientStop Color="#00000000" Offset="0.55" />
+                    <GradientStop Color="#CC000000" Offset="1" />
+                  </LinearGradientBrush>
+                </Border.Background>
+              </Border>
+              <StackPanel VerticalAlignment="Bottom" Margin="20,0,20,44" Spacing="4">
+                <TextBlock Text="FEATURED EXHIBITION"
+                           FontSize="11" FontWeight="Bold"
+                           Foreground="#C3C0FF" LetterSpacing="1.5" />
+                <TextBlock Text="Neon Pulse: The New Abstract"
+                           FontSize="22" FontWeight="Bold"
+                           Foreground="White" TextWrapping="Wrap" LetterSpacing="-0.4" />
+              </StackPanel>
+            </Grid>
+
+            <!-- Hero 2 -->
+            <Grid>
+              <Image Source="/Assets/ModernApp/gallery_alpine.jpg" Stretch="UniformToFill" />
+              <Border>
+                <Border.Background>
+                  <LinearGradientBrush StartPoint="0,0" EndPoint="0,1">
+                    <GradientStop Color="#88000000" Offset="0" />
+                    <GradientStop Color="#00000000" Offset="0.35" />
+                    <GradientStop Color="#00000000" Offset="0.55" />
+                    <GradientStop Color="#CC000000" Offset="1" />
+                  </LinearGradientBrush>
+                </Border.Background>
+              </Border>
+              <StackPanel VerticalAlignment="Bottom" Margin="20,0,20,44" Spacing="4">
+                <TextBlock Text="NOW OPEN"
+                           FontSize="11" FontWeight="Bold"
+                           Foreground="#C3C0FF" LetterSpacing="1.5" />
+                <TextBlock Text="Fragmented Forms: Sculpture Today"
+                           FontSize="22" FontWeight="Bold"
+                           Foreground="White" TextWrapping="Wrap" LetterSpacing="-0.4" />
+              </StackPanel>
+            </Grid>
+
+            <!-- Hero 3 -->
+            <Grid>
+              <Image Source="/Assets/ModernApp/gallery_venice.jpg" Stretch="UniformToFill" />
+              <Border>
+                <Border.Background>
+                  <LinearGradientBrush StartPoint="0,0" EndPoint="0,1">
+                    <GradientStop Color="#88000000" Offset="0" />
+                    <GradientStop Color="#00000000" Offset="0.35" />
+                    <GradientStop Color="#00000000" Offset="0.55" />
+                    <GradientStop Color="#CC000000" Offset="1" />
+                  </LinearGradientBrush>
+                </Border.Background>
+              </Border>
+              <StackPanel VerticalAlignment="Bottom" Margin="20,0,20,44" Spacing="4">
+                <TextBlock Text="CLOSING SOON"
+                           FontSize="11" FontWeight="Bold"
+                           Foreground="#FFCDD2" LetterSpacing="1.5" />
+                <TextBlock Text="The Digital Horizon: Web3 &amp; Generative Art"
+                           FontSize="22" FontWeight="Bold"
+                           Foreground="White" TextWrapping="Wrap" LetterSpacing="-0.4" />
+              </StackPanel>
+            </Grid>
+          </Carousel>
+
+          <!-- PipsPager overlaid near bottom of hero — pill-shaped, no nav arrows -->
+          <PipsPager x:Name="HeroPager"
+                     NumberOfPages="3"
+                     IsPreviousButtonVisible="False"
+                     IsNextButtonVisible="False"
+                     HorizontalAlignment="Center"
+                     VerticalAlignment="Bottom"
+                     Margin="0,0,0,18">
+            <PipsPager.Styles>
+              <Style Selector="PipsPager /template/ ListBox ListBoxItem">
+                <Setter Property="Width" Value="24" />
+                <Setter Property="Height" Value="24" />
+                <Setter Property="Padding" Value="0" />
+                <Setter Property="Margin" Value="2,0" />
+                <Setter Property="MinWidth" Value="0" />
+                <Setter Property="MinHeight" Value="0" />
+                <Setter Property="ClipToBounds" Value="False" />
+                <Setter Property="VerticalAlignment" Value="Center" />
+                <Setter Property="Template">
+                  <ControlTemplate>
+                    <Grid Background="Transparent">
+                      <Border Name="Pip"
+                              Width="6" Height="6" CornerRadius="3"
+                              HorizontalAlignment="Center" VerticalAlignment="Center"
+                              Background="#7FFFFFFF">
+                        <Border.Transitions>
+                          <Transitions>
+                            <DoubleTransition Property="Width" Duration="0:0:0.2" Easing="CubicEaseOut" />
+                            <CornerRadiusTransition Property="CornerRadius" Duration="0:0:0.2" Easing="CubicEaseOut" />
+                            <BrushTransition Property="Background" Duration="0:0:0.2" />
+                          </Transitions>
+                        </Border.Transitions>
+                      </Border>
+                    </Grid>
+                  </ControlTemplate>
+                </Setter>
+              </Style>
+              <Style Selector="PipsPager /template/ ListBox ListBoxItem:pointerover /template/ Border#Pip">
+                <Setter Property="Width" Value="8" />
+                <Setter Property="Height" Value="8" />
+                <Setter Property="CornerRadius" Value="4" />
+                <Setter Property="Background" Value="#BFFFFFFF" />
+              </Style>
+              <Style Selector="PipsPager /template/ ListBox ListBoxItem:selected /template/ Border#Pip">
+                <Setter Property="Width" Value="22" />
+                <Setter Property="Height" Value="6" />
+                <Setter Property="CornerRadius" Value="3" />
+                <Setter Property="Background" Value="#FFFFFFFF" />
+              </Style>
+              <Style Selector="PipsPager /template/ ListBox ListBoxItem:selected:pointerover /template/ Border#Pip">
+                <Setter Property="Width" Value="22" />
+                <Setter Property="Height" Value="6" />
+                <Setter Property="CornerRadius" Value="3" />
+                <Setter Property="Background" Value="#E8FFFFFF" />
+              </Style>
+            </PipsPager.Styles>
+          </PipsPager>
+
+          <!-- Top bar overlaid on hero -->
+          <Grid ColumnDefinitions="Auto,*,Auto"
+                VerticalAlignment="Top"
+                Margin="4,8,4,0">
+            <Button Grid.Column="0"
+                    Background="Transparent"
+                    BorderThickness="0"
+                    Padding="12,8"
+                    Click="OnHamburgerClick">
+              <Path Data="M3 18h18v-2H3v2zm0-5h18v-2H3v2zm0-7v2h18V6H3z"
+                    Fill="White" Width="22" Height="22" Stretch="Uniform" />
+            </Button>
+            <TextBlock Grid.Column="1"
+                       Text="Curated"
+                       FontSize="18"
+                       FontWeight="Bold"
+                       Foreground="White"
+                       VerticalAlignment="Center"
+                       HorizontalAlignment="Center"
+                       LetterSpacing="-0.3" />
+            <Button Grid.Column="2"
+                    Background="Transparent"
+                    BorderThickness="0"
+                    Padding="12,8">
+              <Path Data="M15.5 14h-.79l-.28-.27C15.41 12.59 16 11.11 16 9.5 16 5.91 13.09 3 9.5 3S3 5.91 3 9.5 5.91 16 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14z"
+                    Fill="White" Width="22" Height="22" Stretch="Uniform" />
+            </Button>
+          </Grid>
+
+        </Grid>
+
+        <!-- Row 1: Scrollable body -->
+        <ScrollViewer Grid.Row="1"
+                      VerticalScrollBarVisibility="Auto"
+                      HorizontalScrollBarVisibility="Disabled">
+          <StackPanel>
+
+            <!-- Collection Highlights -->
+            <StackPanel Margin="0,28,0,0">
+              <Grid ColumnDefinitions="*,Auto" Margin="20,0,20,16">
+                <TextBlock Text="Collection Highlights"
+                           FontSize="18" FontWeight="Bold"
+                           Foreground="#191C1E" LetterSpacing="-0.3" />
+                <TextBlock Grid.Column="1"
+                           Text="SEE ALL"
+                           FontSize="12" FontWeight="Bold"
+                           Foreground="#3525CD" LetterSpacing="0.8"
+                           VerticalAlignment="Center" />
+              </Grid>
+
+              <ScrollViewer HorizontalScrollBarVisibility="Hidden"
+                            VerticalScrollBarVisibility="Disabled"
+                            Margin="20,0,0,0">
+                <StackPanel Orientation="Horizontal" Spacing="10">
+
+                  <Border Width="180" Height="210" CornerRadius="12" ClipToBounds="True">
+                    <Grid>
+                      <Image Source="/Assets/ModernApp/gallery_paris.jpg" Stretch="UniformToFill" />
+                      <Border Background="#80000000" VerticalAlignment="Bottom" Padding="12,10">
+                        <StackPanel Spacing="2">
+                          <TextBlock Text="SCULPTURE" FontSize="10" FontWeight="Bold"
+                                     Foreground="#C3C0FF" LetterSpacing="1" />
+                          <TextBlock Text="Fragmented Grace" FontSize="13"
+                                     FontWeight="SemiBold" Foreground="White" />
+                        </StackPanel>
+                      </Border>
+                    </Grid>
+                  </Border>
+
+                  <Border Width="180" Height="210" CornerRadius="12" ClipToBounds="True">
+                    <Grid>
+                      <Image Source="/Assets/ModernApp/gallery_bay.jpg" Stretch="UniformToFill" />
+                      <Border Background="#80000000" VerticalAlignment="Bottom" Padding="12,10">
+                        <StackPanel Spacing="2">
+                          <TextBlock Text="OIL PAINTING" FontSize="10" FontWeight="Bold"
+                                     Foreground="#C3C0FF" LetterSpacing="1" />
+                          <TextBlock Text="Ephemeral Blue" FontSize="13"
+                                     FontWeight="SemiBold" Foreground="White" />
+                        </StackPanel>
+                      </Border>
+                    </Grid>
+                  </Border>
+
+                  <Border Width="180" Height="210" CornerRadius="12" ClipToBounds="True">
+                    <Grid>
+                      <Image Source="/Assets/ModernApp/gallery_tropical.jpg" Stretch="UniformToFill" />
+                      <Border Background="#80000000" VerticalAlignment="Bottom" Padding="12,10">
+                        <StackPanel Spacing="2">
+                          <TextBlock Text="TEXTILE" FontSize="10" FontWeight="Bold"
+                                     Foreground="#C3C0FF" LetterSpacing="1" />
+                          <TextBlock Text="Interwoven Lines" FontSize="13"
+                                     FontWeight="SemiBold" Foreground="White" />
+                        </StackPanel>
+                      </Border>
+                    </Grid>
+                  </Border>
+
+                  <Border Width="180" Height="210" CornerRadius="12" ClipToBounds="True">
+                    <Grid>
+                      <Image Source="/Assets/ModernApp/gallery_alpine.jpg" Stretch="UniformToFill" />
+                      <Border Background="#80000000" VerticalAlignment="Bottom" Padding="12,10">
+                        <StackPanel Spacing="2">
+                          <TextBlock Text="PHOTOGRAPHY" FontSize="10" FontWeight="Bold"
+                                     Foreground="#C3C0FF" LetterSpacing="1" />
+                          <TextBlock Text="Silent Mountains" FontSize="13"
+                                     FontWeight="SemiBold" Foreground="White" />
+                        </StackPanel>
+                      </Border>
+                    </Grid>
+                  </Border>
+
+                  <!-- Padding card to reveal peek of last item -->
+                  <Border Width="20" Height="210" />
+
+                </StackPanel>
+              </ScrollViewer>
+            </StackPanel>
+
+            <!-- Curators' Choice -->
+            <StackPanel Margin="20,32,20,0" Spacing="12">
+              <TextBlock Text="Curators' Choice"
+                         FontSize="20" FontWeight="Bold"
+                         Foreground="#191C1E" HorizontalAlignment="Center"
+                         LetterSpacing="-0.3" />
+              <TextBlock Text="Hand-picked selections from our global network of artists."
+                         FontSize="13" Foreground="#777587"
+                         HorizontalAlignment="Center" TextAlignment="Center"
+                         TextWrapping="Wrap" Margin="0,0,0,8" />
+
+              <!-- Two-column layout: large card left, two stacked badge cards right -->
+              <Grid ColumnDefinitions="*,130">
+
+                <!-- Left: main feature card -->
+                <Border Grid.Column="0" Background="White" CornerRadius="16"
+                        Padding="20" Margin="0,0,10,0"
+                        BoxShadow="0 2 16 0 #12191C1E">
+                  <StackPanel Spacing="10">
+                    <Path Data="M11.48 3.499a.562.562 0 0 1 1.04 0l2.125 5.111a.563.563 0 0 0 .475.345l5.518.442c.499.04.701.663.321.988l-4.204 3.602a.563.563 0 0 0-.182.557l1.285 5.385a.562.562 0 0 1-.84.61l-4.725-2.885a.562.562 0 0 0-.586 0L6.982 20.54a.562.562 0 0 1-.84-.61l1.285-5.386a.562.562 0 0 0-.182-.557l-4.204-3.602a.562.562 0 0 1 .321-.988l5.518-.442a.563.563 0 0 0 .475-.345L11.48 3.5z"
+                          Fill="#3525CD" Width="22" Height="22" Stretch="Uniform"
+                          HorizontalAlignment="Left" />
+                    <TextBlock Text="The Digital Horizon"
+                               FontSize="17" FontWeight="Bold"
+                               Foreground="#191C1E" TextWrapping="Wrap" />
+                    <TextBlock Text="Exploring Web3 and Generative Art"
+                               FontSize="13" Foreground="#777587" TextWrapping="Wrap" />
+                    <Button Content="EXPLORE"
+                            Margin="0,10,0,0" Padding="20,11"
+                            FontSize="11" FontWeight="Bold" LetterSpacing="0.8"
+                            CornerRadius="22" Foreground="White" HorizontalAlignment="Left">
+                      <Button.Background>
+                        <LinearGradientBrush StartPoint="0,0" EndPoint="1,0">
+                          <GradientStop Color="#3525CD" Offset="0" />
+                          <GradientStop Color="#4F46E5" Offset="1" />
+                        </LinearGradientBrush>
+                      </Button.Background>
+                    </Button>
+                  </StackPanel>
+                </Border>
+
+                <!-- Right: two stacked badge cards -->
+                <StackPanel Grid.Column="1" Spacing="10">
+
+                  <Border Background="White" CornerRadius="16"
+                          BoxShadow="0 2 16 0 #12191C1E"
+                          Padding="12">
+                    <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center"
+                                Spacing="8" Margin="0,12">
+                      <Path Data="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm-1 14H9V8h2v8zm4 0h-2V8h2v8z"
+                            Fill="#B84B00" Width="28" Height="28" Stretch="Uniform"
+                            HorizontalAlignment="Center" />
+                      <TextBlock Text="TRENDING"
+                                 FontSize="10" FontWeight="Bold"
+                                 Foreground="#B84B00" LetterSpacing="1"
+                                 HorizontalAlignment="Center" />
+                    </StackPanel>
+                  </Border>
+
+                  <Border Background="#EDEEF0" CornerRadius="16" Padding="12">
+                    <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center"
+                                Spacing="8" Margin="0,12">
+                      <Path Data="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm-1.41 14.06L6.17 11.64l1.42-1.41 2.99 3 6.01-6.01 1.42 1.41-7.42 7.43z"
+                            Fill="#464555" Width="28" Height="28" Stretch="Uniform"
+                            HorizontalAlignment="Center" />
+                      <TextBlock Text="VERIFIED"
+                                 FontSize="10" FontWeight="Bold"
+                                 Foreground="#464555" LetterSpacing="1"
+                                 HorizontalAlignment="Center" />
+                    </StackPanel>
+                  </Border>
+
+                </StackPanel>
+              </Grid>
+            </StackPanel>
+
+            <!-- Join the Circle -->
+            <Border Margin="20,32,20,32" CornerRadius="20" Padding="24" ClipToBounds="True">
+              <Border.Background>
+                <LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
+                  <GradientStop Color="#3525CD" Offset="0" />
+                  <GradientStop Color="#4F46E5" Offset="1" />
+                </LinearGradientBrush>
+              </Border.Background>
+              <StackPanel Spacing="10">
+                <TextBlock Text="Join the Circle"
+                           FontSize="20" FontWeight="Bold"
+                           Foreground="White" LetterSpacing="-0.3" />
+                <TextBlock Text="Receive exclusive invitations to private viewings and new drop alerts."
+                           FontSize="13" Foreground="#C3C0FF"
+                           TextWrapping="Wrap" Opacity="0.9" LineHeight="20" />
+                <TextBox PlaceholderText="Your email address"
+                         Margin="0,6,0,0"
+                         CornerRadius="12"
+                         BorderThickness="1"
+                         Padding="14,12"
+                         Foreground="White"
+                         PlaceholderForeground="#9896D8">
+                  <TextBox.Resources>
+                    <SolidColorBrush x:Key="TextControlBackground" Color="#3C38B5" />
+                    <SolidColorBrush x:Key="TextControlBackgroundPointerOver" Color="#4440BE" />
+                    <SolidColorBrush x:Key="TextControlBackgroundFocused" Color="#3C38B5" />
+                    <SolidColorBrush x:Key="TextControlBorderBrush" Color="#5552C8" />
+                    <SolidColorBrush x:Key="TextControlBorderBrushPointerOver" Color="#7370D8" />
+                    <SolidColorBrush x:Key="TextControlBorderBrushFocused" Color="#8B88E8" />
+                  </TextBox.Resources>
+                </TextBox>
+                <Button Content="SUBSCRIBE"
+                        Margin="0,2,0,0" Padding="24,12"
+                        FontSize="12" FontWeight="Bold" LetterSpacing="1"
+                        CornerRadius="24" Foreground="#3525CD" Background="White"
+                        HorizontalAlignment="Left" />
+              </StackPanel>
+            </Border>
+
+          </StackPanel>
+        </ScrollViewer>
+
+      </Grid>
+    </DrawerPage.Content>
+  </DrawerPage>
+
+    </Border>
+  </DockPanel>
+</UserControl>
diff --git a/samples/ControlCatalog/Pages/CarouselPage/CarouselGalleryAppPage.xaml.cs b/samples/ControlCatalog/Pages/CarouselPage/CarouselGalleryAppPage.xaml.cs
new file mode 100644
index 0000000000..5c637b5454
--- /dev/null
+++ b/samples/ControlCatalog/Pages/CarouselPage/CarouselGalleryAppPage.xaml.cs
@@ -0,0 +1,101 @@
+using System;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Input;
+using Avalonia.Interactivity;
+
+namespace ControlCatalog.Pages
+{
+    public partial class CarouselGalleryAppPage : UserControl
+    {
+        private bool _syncing;
+        private Point _dragStart;
+        private bool _isDragging;
+        private const double SwipeThreshold = 50;
+
+        private ScrollViewer? _infoPanel;
+
+        public CarouselGalleryAppPage()
+        {
+            InitializeComponent();
+            _infoPanel = this.FindControl<ScrollViewer>("InfoPanel");
+            HeroCarousel.SelectionChanged += OnHeroSelectionChanged;
+            HeroPager.SelectedIndexChanged += OnPagerIndexChanged;
+        }
+
+        protected override void OnLoaded(RoutedEventArgs e)
+        {
+            base.OnLoaded(e);
+            UpdateInfoPanelVisibility();
+        }
+
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+        {
+            base.OnPropertyChanged(change);
+            if (change.Property == BoundsProperty)
+                UpdateInfoPanelVisibility();
+        }
+
+        private void UpdateInfoPanelVisibility()
+        {
+            if (_infoPanel != null)
+                _infoPanel.IsVisible = Bounds.Width >= 640;
+        }
+
+        private void OnHamburgerClick(object? sender, RoutedEventArgs e)
+        {
+            RootDrawer.IsOpen = !RootDrawer.IsOpen;
+        }
+
+        private void OnHeroSelectionChanged(object? sender, SelectionChangedEventArgs e)
+        {
+            if (_syncing)
+                return;
+            _syncing = true;
+            HeroPager.SelectedPageIndex = HeroCarousel.SelectedIndex;
+            _syncing = false;
+        }
+
+        private void OnPagerIndexChanged(object? sender, PipsPagerSelectedIndexChangedEventArgs e)
+        {
+            if (_syncing)
+                return;
+            _syncing = true;
+            HeroCarousel.SelectedIndex = e.NewIndex;
+            _syncing = false;
+        }
+
+        private void OnDrawerMenuSelectionChanged(object? sender, SelectionChangedEventArgs e)
+        {
+            RootDrawer.IsOpen = false;
+            DrawerMenu.SelectedItem = null;
+        }
+
+        private void OnHeroPointerPressed(object? sender, PointerPressedEventArgs e)
+        {
+            if (!e.GetCurrentPoint(null).Properties.IsLeftButtonPressed)
+                return;
+            _dragStart = e.GetPosition((Visual?)sender);
+            _isDragging = true;
+        }
+
+        private void OnHeroPointerReleased(object? sender, PointerReleasedEventArgs e)
+        {
+            if (!_isDragging)
+                return;
+            _isDragging = false;
+            var delta = e.GetPosition((Visual?)sender).X - _dragStart.X;
+            if (Math.Abs(delta) < SwipeThreshold)
+                return;
+            if (delta < 0)
+                HeroCarousel.Next();
+            else
+                HeroCarousel.Previous();
+        }
+
+        private void OnHeroPointerCaptureLost(object? sender, PointerCaptureLostEventArgs e)
+        {
+            _isDragging = false;
+        }
+    }
+}
diff --git a/samples/ControlCatalog/Pages/CarouselPage/CarouselGesturesPage.xaml b/samples/ControlCatalog/Pages/CarouselPage/CarouselGesturesPage.xaml
new file mode 100644
index 0000000000..7786168d4a
--- /dev/null
+++ b/samples/ControlCatalog/Pages/CarouselPage/CarouselGesturesPage.xaml
@@ -0,0 +1,93 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             x:Class="ControlCatalog.Pages.CarouselGesturesPage">
+  <DockPanel>
+    <ScrollViewer DockPanel.Dock="Right" Width="260">
+      <StackPanel Margin="12" Spacing="8">
+        <TextBlock Text="Configuration" FontWeight="SemiBold" FontSize="16"
+                   Foreground="{DynamicResource SystemControlHighlightAccentBrush}" />
+
+        <TextBlock Text="Options" FontWeight="SemiBold" FontSize="13" />
+
+        <CheckBox x:Name="SwipeCheck"
+                  Content="Swipe Gesture"
+                  IsChecked="True"
+                  IsCheckedChanged="OnSwipeEnabledChanged" />
+
+        <CheckBox x:Name="WrapCheck"
+                  Content="Wrap Selection"
+                  IsChecked="False"
+                  IsCheckedChanged="OnWrapSelectionChanged" />
+
+        <CheckBox x:Name="KeyboardCheck"
+                  Content="Keyboard Navigation"
+                  IsChecked="True"
+                  IsCheckedChanged="OnKeyboardEnabledChanged" />
+
+        <Separator />
+
+        <TextBlock Text="Status" FontWeight="SemiBold" FontSize="14" />
+        <TextBlock x:Name="StatusText"
+                   Text="Item: 1 / 3"
+                   Opacity="0.7"
+                   TextWrapping="Wrap" />
+        <TextBlock x:Name="LastActionText"
+                   Text="Action: —"
+                   Opacity="0.7"
+                   TextWrapping="Wrap" />
+        <TextBlock Text="Swipe left/right or use arrow keys to navigate."
+                   FontSize="11"
+                   Opacity="0.5"
+                   TextWrapping="Wrap" />
+      </StackPanel>
+    </ScrollViewer>
+
+    <Border DockPanel.Dock="Right" Width="1"
+            Background="{DynamicResource SystemControlForegroundBaseMediumLowBrush}" />
+
+    <Border Margin="12"
+            BorderBrush="{DynamicResource SystemControlForegroundBaseMediumLowBrush}"
+            BorderThickness="1"
+            CornerRadius="6"
+            ClipToBounds="True">
+      <Carousel x:Name="DemoCarousel"
+                Focusable="True"
+                IsSwipeEnabled="True"
+                Height="300">
+        <Carousel.PageTransition>
+          <PageSlide Duration="0.25" Orientation="Horizontal" />
+        </Carousel.PageTransition>
+
+        <Border Margin="14,12" CornerRadius="12" ClipToBounds="True">
+          <Grid>
+            <Image Source="/Assets/delicate-arch-896885_640.jpg" Stretch="UniformToFill" />
+            <Border Background="#80000000" VerticalAlignment="Bottom" Padding="12">
+              <TextBlock Text="Item 1: Delicate Arch" Foreground="White"
+                         HorizontalAlignment="Center" FontWeight="SemiBold" />
+            </Border>
+          </Grid>
+        </Border>
+
+        <Border Margin="14,12" CornerRadius="12" ClipToBounds="True">
+          <Grid>
+            <Image Source="/Assets/hirsch-899118_640.jpg" Stretch="UniformToFill" />
+            <Border Background="#80000000" VerticalAlignment="Bottom" Padding="12">
+              <TextBlock Text="Item 2: Hirsch" Foreground="White"
+                         HorizontalAlignment="Center" FontWeight="SemiBold" />
+            </Border>
+          </Grid>
+        </Border>
+
+        <Border Margin="14,12" CornerRadius="12" ClipToBounds="True">
+          <Grid>
+            <Image Source="/Assets/maple-leaf-888807_640.jpg" Stretch="UniformToFill" />
+            <Border Background="#80000000" VerticalAlignment="Bottom" Padding="12">
+              <TextBlock Text="Item 3: Maple Leaf" Foreground="White"
+                         HorizontalAlignment="Center" FontWeight="SemiBold" />
+            </Border>
+          </Grid>
+        </Border>
+      </Carousel>
+    </Border>
+  </DockPanel>
+</UserControl>
diff --git a/samples/ControlCatalog/Pages/CarouselPage/CarouselGesturesPage.xaml.cs b/samples/ControlCatalog/Pages/CarouselPage/CarouselGesturesPage.xaml.cs
new file mode 100644
index 0000000000..097dd54966
--- /dev/null
+++ b/samples/ControlCatalog/Pages/CarouselPage/CarouselGesturesPage.xaml.cs
@@ -0,0 +1,59 @@
+using Avalonia.Controls;
+using Avalonia.Input;
+using Avalonia.Interactivity;
+
+namespace ControlCatalog.Pages
+{
+    public partial class CarouselGesturesPage : UserControl
+    {
+        private bool _keyboardEnabled = true;
+
+        public CarouselGesturesPage()
+        {
+            InitializeComponent();
+            DemoCarousel.AddHandler(InputElement.KeyDownEvent, OnKeyDown, handledEventsToo: true);
+            DemoCarousel.SelectionChanged += OnSelectionChanged;
+            DemoCarousel.Loaded += (_, _) => DemoCarousel.Focus();
+        }
+
+        private void OnKeyDown(object? sender, KeyEventArgs e)
+        {
+            if (!_keyboardEnabled)
+                return;
+
+            switch (e.Key)
+            {
+                case Key.Left:
+                case Key.Up:
+                    LastActionText.Text = $"Action: Key {e.Key} (Previous)";
+                    break;
+                case Key.Right:
+                case Key.Down:
+                    LastActionText.Text = $"Action: Key {e.Key} (Next)";
+                    break;
+            }
+        }
+
+        private void OnSelectionChanged(object? sender, SelectionChangedEventArgs e)
+        {
+            StatusText.Text = $"Item: {DemoCarousel.SelectedIndex + 1} / {DemoCarousel.ItemCount}";
+            if (DemoCarousel.IsSwiping)
+                LastActionText.Text = "Action: Swipe";
+        }
+
+        private void OnSwipeEnabledChanged(object? sender, RoutedEventArgs e)
+        {
+            DemoCarousel.IsSwipeEnabled = SwipeCheck.IsChecked == true;
+        }
+
+        private void OnWrapSelectionChanged(object? sender, RoutedEventArgs e)
+        {
+            DemoCarousel.WrapSelection = WrapCheck.IsChecked == true;
+        }
+
+        private void OnKeyboardEnabledChanged(object? sender, RoutedEventArgs e)
+        {
+            _keyboardEnabled = KeyboardCheck.IsChecked == true;
+        }
+    }
+}
diff --git a/samples/ControlCatalog/Pages/CarouselPage/CarouselGettingStartedPage.xaml b/samples/ControlCatalog/Pages/CarouselPage/CarouselGettingStartedPage.xaml
new file mode 100644
index 0000000000..680a65f204
--- /dev/null
+++ b/samples/ControlCatalog/Pages/CarouselPage/CarouselGettingStartedPage.xaml
@@ -0,0 +1,74 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             x:Class="ControlCatalog.Pages.CarouselGettingStartedPage">
+  <DockPanel>
+    <ScrollViewer DockPanel.Dock="Right" Width="260">
+      <StackPanel Margin="12" Spacing="8">
+        <TextBlock Text="Configuration" FontWeight="SemiBold" FontSize="16"
+                   Foreground="{DynamicResource SystemControlHighlightAccentBrush}" />
+
+        <TextBlock Text="Navigation" FontWeight="SemiBold" FontSize="13" />
+
+        <Button x:Name="PreviousButton"
+                Content="Previous"
+                HorizontalAlignment="Stretch" />
+        <Button x:Name="NextButton"
+                Content="Next"
+                HorizontalAlignment="Stretch" />
+
+        <Separator />
+
+        <TextBlock Text="Status" FontWeight="SemiBold" FontSize="14" />
+        <TextBlock x:Name="StatusText"
+                   Text="Item: 1 / 3"
+                   Opacity="0.7"
+                   TextWrapping="Wrap" />
+      </StackPanel>
+    </ScrollViewer>
+
+    <Border DockPanel.Dock="Right" Width="1"
+            Background="{DynamicResource SystemControlForegroundBaseMediumLowBrush}" />
+
+    <Border Margin="12"
+            BorderBrush="{DynamicResource SystemControlForegroundBaseMediumLowBrush}"
+            BorderThickness="1"
+            CornerRadius="6"
+            ClipToBounds="True">
+      <Carousel x:Name="DemoCarousel" Height="300" IsSwipeEnabled="True">
+        <Carousel.PageTransition>
+          <PageSlide Duration="0.25" Orientation="Horizontal" />
+        </Carousel.PageTransition>
+
+        <Border Margin="14,12" CornerRadius="12" ClipToBounds="True">
+          <Grid>
+            <Image Source="/Assets/delicate-arch-896885_640.jpg" Stretch="UniformToFill" />
+            <Border Background="#80000000" VerticalAlignment="Bottom" Padding="12">
+              <TextBlock Text="Item 1: Delicate Arch" Foreground="White"
+                         HorizontalAlignment="Center" FontWeight="SemiBold" />
+            </Border>
+          </Grid>
+        </Border>
+
+        <Border Margin="14,12" CornerRadius="12" ClipToBounds="True">
+          <Grid>
+            <Image Source="/Assets/hirsch-899118_640.jpg" Stretch="UniformToFill" />
+            <Border Background="#80000000" VerticalAlignment="Bottom" Padding="12">
+              <TextBlock Text="Item 2: Hirsch" Foreground="White"
+                         HorizontalAlignment="Center" FontWeight="SemiBold" />
+            </Border>
+          </Grid>
+        </Border>
+
+        <Border Margin="14,12" CornerRadius="12" ClipToBounds="True">
+          <Grid>
+            <Image Source="/Assets/maple-leaf-888807_640.jpg" Stretch="UniformToFill" />
+            <Border Background="#80000000" VerticalAlignment="Bottom" Padding="12">
+              <TextBlock Text="Item 3: Maple Leaf" Foreground="White"
+                         HorizontalAlignment="Center" FontWeight="SemiBold" />
+            </Border>
+          </Grid>
+        </Border>
+      </Carousel>
+    </Border>
+  </DockPanel>
+</UserControl>
diff --git a/samples/ControlCatalog/Pages/CarouselPage/CarouselGettingStartedPage.xaml.cs b/samples/ControlCatalog/Pages/CarouselPage/CarouselGettingStartedPage.xaml.cs
new file mode 100644
index 0000000000..61aad36df3
--- /dev/null
+++ b/samples/ControlCatalog/Pages/CarouselPage/CarouselGettingStartedPage.xaml.cs
@@ -0,0 +1,40 @@
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+
+namespace ControlCatalog.Pages
+{
+    public partial class CarouselGettingStartedPage : UserControl
+    {
+        public CarouselGettingStartedPage()
+        {
+            InitializeComponent();
+            PreviousButton.Click += OnPrevious;
+            NextButton.Click += OnNext;
+            DemoCarousel.SelectionChanged += OnSelectionChanged;
+        }
+
+        private void OnPrevious(object? sender, RoutedEventArgs e)
+        {
+            DemoCarousel.Previous();
+            UpdateStatus();
+        }
+
+        private void OnNext(object? sender, RoutedEventArgs e)
+        {
+            DemoCarousel.Next();
+            UpdateStatus();
+        }
+
+        private void OnSelectionChanged(object? sender, SelectionChangedEventArgs e)
+        {
+            UpdateStatus();
+        }
+
+        private void UpdateStatus()
+        {
+            var index = DemoCarousel.SelectedIndex + 1;
+            var count = DemoCarousel.ItemCount;
+            StatusText.Text = $"Item: {index} / {count}";
+        }
+    }
+}
diff --git a/samples/ControlCatalog/Pages/CarouselPage/CarouselMultiItemPage.xaml b/samples/ControlCatalog/Pages/CarouselPage/CarouselMultiItemPage.xaml
new file mode 100644
index 0000000000..23e60f35f2
--- /dev/null
+++ b/samples/ControlCatalog/Pages/CarouselPage/CarouselMultiItemPage.xaml
@@ -0,0 +1,140 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             x:Class="ControlCatalog.Pages.CarouselMultiItemPage">
+  <DockPanel>
+    <ScrollViewer DockPanel.Dock="Right" Width="260">
+      <StackPanel Margin="12" Spacing="8">
+        <TextBlock Text="Configuration" FontWeight="SemiBold" FontSize="16"
+                   Foreground="{DynamicResource SystemControlHighlightAccentBrush}" />
+
+        <TextBlock Text="Navigation" FontWeight="SemiBold" FontSize="13" />
+        <Button x:Name="PreviousButton" Content="Previous" HorizontalAlignment="Stretch" />
+        <Button x:Name="NextButton" Content="Next" HorizontalAlignment="Stretch" />
+
+        <Separator />
+
+        <TextBlock Text="Viewport Fraction" FontWeight="SemiBold" FontSize="13" />
+        <TextBlock TextWrapping="Wrap" FontSize="11" Opacity="0.6"
+                   Text="Values below 1.0 show adjacent items peeking into the viewport." />
+        <Grid ColumnDefinitions="*,48" ColumnSpacing="8">
+          <Slider x:Name="ViewportSlider"
+                  Minimum="0.2" Maximum="1.0" Value="0.5"
+                  TickFrequency="0.01" IsSnapToTickEnabled="True"
+                  HorizontalAlignment="Stretch"
+                  ValueChanged="OnViewportFractionChanged" />
+          <TextBlock x:Name="ViewportLabel" Grid.Column="1"
+                     Text="0.50" VerticalAlignment="Center"
+                     HorizontalAlignment="Right" FontWeight="SemiBold" />
+        </Grid>
+        <TextBlock x:Name="ViewportHint"
+                   Text="~2 items visible."
+                   FontSize="11" Opacity="0.6" TextWrapping="Wrap" />
+
+        <Separator />
+
+        <TextBlock Text="Options" FontWeight="SemiBold" FontSize="13" />
+        <CheckBox x:Name="WrapCheck" Content="Wrap Selection" IsChecked="False"
+                  IsCheckedChanged="OnWrapChanged" />
+        <CheckBox x:Name="SwipeCheck" Content="Swipe / Drag" IsChecked="True"
+                  IsCheckedChanged="OnSwipeChanged" />
+
+        <Separator />
+
+        <TextBlock Text="Status" FontWeight="SemiBold" FontSize="14" />
+        <TextBlock x:Name="StatusText" Text="Item: 1 / 5"
+                   Opacity="0.7" TextWrapping="Wrap" />
+      </StackPanel>
+    </ScrollViewer>
+
+    <Border DockPanel.Dock="Right" Width="1"
+            Background="{DynamicResource SystemControlForegroundBaseMediumLowBrush}" />
+
+    <Border Margin="12"
+            BorderBrush="{DynamicResource SystemControlForegroundBaseMediumLowBrush}"
+            BorderThickness="1" CornerRadius="6" ClipToBounds="True">
+      <Carousel x:Name="DemoCarousel"
+                Height="280"
+                ViewportFraction="0.5"
+                IsSwipeEnabled="True">
+        <Carousel.PageTransition>
+          <PageSlide Duration="0.3" Orientation="Horizontal" />
+        </Carousel.PageTransition>
+
+        <Border Margin="6,12" CornerRadius="14" ClipToBounds="True">
+          <Border.Background>
+            <LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
+              <GradientStop Color="#3525CD" Offset="0" />
+              <GradientStop Color="#6B5CE7" Offset="1" />
+            </LinearGradientBrush>
+          </Border.Background>
+          <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center" Spacing="8">
+            <TextBlock Text="01" FontSize="52" FontWeight="Bold" Foreground="White"
+                       HorizontalAlignment="Center" LetterSpacing="-2" />
+            <TextBlock Text="Neon Pulse" FontSize="15" FontWeight="SemiBold"
+                       Foreground="#C3C0FF" HorizontalAlignment="Center" />
+          </StackPanel>
+        </Border>
+
+        <Border Margin="6,12" CornerRadius="14" ClipToBounds="True">
+          <Border.Background>
+            <LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
+              <GradientStop Color="#0891B2" Offset="0" />
+              <GradientStop Color="#06B6D4" Offset="1" />
+            </LinearGradientBrush>
+          </Border.Background>
+          <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center" Spacing="8">
+            <TextBlock Text="02" FontSize="52" FontWeight="Bold" Foreground="White"
+                       HorizontalAlignment="Center" LetterSpacing="-2" />
+            <TextBlock Text="Ephemeral Blue" FontSize="15" FontWeight="SemiBold"
+                       Foreground="#BAF0FA" HorizontalAlignment="Center" />
+          </StackPanel>
+        </Border>
+
+        <Border Margin="6,12" CornerRadius="14" ClipToBounds="True">
+          <Border.Background>
+            <LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
+              <GradientStop Color="#059669" Offset="0" />
+              <GradientStop Color="#10B981" Offset="1" />
+            </LinearGradientBrush>
+          </Border.Background>
+          <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center" Spacing="8">
+            <TextBlock Text="03" FontSize="52" FontWeight="Bold" Foreground="White"
+                       HorizontalAlignment="Center" LetterSpacing="-2" />
+            <TextBlock Text="Forest Forms" FontSize="15" FontWeight="SemiBold"
+                       Foreground="#A7F3D0" HorizontalAlignment="Center" />
+          </StackPanel>
+        </Border>
+
+        <Border Margin="6,12" CornerRadius="14" ClipToBounds="True">
+          <Border.Background>
+            <LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
+              <GradientStop Color="#D97706" Offset="0" />
+              <GradientStop Color="#F59E0B" Offset="1" />
+            </LinearGradientBrush>
+          </Border.Background>
+          <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center" Spacing="8">
+            <TextBlock Text="04" FontSize="52" FontWeight="Bold" Foreground="White"
+                       HorizontalAlignment="Center" LetterSpacing="-2" />
+            <TextBlock Text="Golden Hour" FontSize="15" FontWeight="SemiBold"
+                       Foreground="#FDE68A" HorizontalAlignment="Center" />
+          </StackPanel>
+        </Border>
+
+        <Border Margin="6,12" CornerRadius="14" ClipToBounds="True">
+          <Border.Background>
+            <LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
+              <GradientStop Color="#BE185D" Offset="0" />
+              <GradientStop Color="#EC4899" Offset="1" />
+            </LinearGradientBrush>
+          </Border.Background>
+          <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center" Spacing="8">
+            <TextBlock Text="05" FontSize="52" FontWeight="Bold" Foreground="White"
+                       HorizontalAlignment="Center" LetterSpacing="-2" />
+            <TextBlock Text="Crimson Wave" FontSize="15" FontWeight="SemiBold"
+                       Foreground="#FBCFE8" HorizontalAlignment="Center" />
+          </StackPanel>
+        </Border>
+      </Carousel>
+    </Border>
+  </DockPanel>
+</UserControl>
diff --git a/samples/ControlCatalog/Pages/CarouselPage/CarouselMultiItemPage.xaml.cs b/samples/ControlCatalog/Pages/CarouselPage/CarouselMultiItemPage.xaml.cs
new file mode 100644
index 0000000000..13182e7654
--- /dev/null
+++ b/samples/ControlCatalog/Pages/CarouselPage/CarouselMultiItemPage.xaml.cs
@@ -0,0 +1,47 @@
+using System;
+using Avalonia.Controls;
+using Avalonia.Controls.Primitives;
+using Avalonia.Interactivity;
+
+namespace ControlCatalog.Pages
+{
+    public partial class CarouselMultiItemPage : UserControl
+    {
+        public CarouselMultiItemPage()
+        {
+            InitializeComponent();
+            PreviousButton.Click += (_, _) => DemoCarousel.Previous();
+            NextButton.Click += (_, _) => DemoCarousel.Next();
+            DemoCarousel.SelectionChanged += OnSelectionChanged;
+        }
+
+        private void OnViewportFractionChanged(object? sender, RangeBaseValueChangedEventArgs e)
+        {
+            if (DemoCarousel is null)
+                return;
+            var value = Math.Round(e.NewValue, 2);
+            DemoCarousel.ViewportFraction = value;
+            ViewportLabel.Text = value.ToString("0.00");
+            ViewportHint.Text = value >= 1d ? "1.00 — single full item." : $"~{1d / value:0.#} items visible.";
+        }
+
+        private void OnWrapChanged(object? sender, RoutedEventArgs e)
+        {
+            if (DemoCarousel is null)
+                return;
+            DemoCarousel.WrapSelection = WrapCheck.IsChecked == true;
+        }
+
+        private void OnSwipeChanged(object? sender, RoutedEventArgs e)
+        {
+            if (DemoCarousel is null)
+                return;
+            DemoCarousel.IsSwipeEnabled = SwipeCheck.IsChecked == true;
+        }
+
+        private void OnSelectionChanged(object? sender, SelectionChangedEventArgs e)
+        {
+            StatusText.Text = $"Item: {DemoCarousel.SelectedIndex + 1} / {DemoCarousel.ItemCount}";
+        }
+    }
+}
diff --git a/samples/ControlCatalog/Pages/CarouselPage/CarouselPageCustomizationPage.xaml b/samples/ControlCatalog/Pages/CarouselPage/CarouselPageCustomizationPage.xaml
new file mode 100644
index 0000000000..0dc46f3432
--- /dev/null
+++ b/samples/ControlCatalog/Pages/CarouselPage/CarouselPageCustomizationPage.xaml
@@ -0,0 +1,115 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             x:Class="ControlCatalog.Pages.CarouselPageCustomizationPage">
+  <DockPanel>
+    <ScrollViewer DockPanel.Dock="Right" Width="220">
+      <StackPanel Margin="12" Spacing="8">
+        <TextBlock Text="Configuration" FontWeight="SemiBold" FontSize="16"
+                   Foreground="{DynamicResource SystemControlHighlightAccentBrush}" />
+
+        <TextBlock Text="Slide Direction" FontWeight="SemiBold" FontSize="13" />
+        <ComboBox x:Name="OrientationCombo" SelectedIndex="0"
+                  SelectionChanged="OnOrientationChanged"
+                  HorizontalAlignment="Stretch">
+          <ComboBoxItem Content="Horizontal" />
+          <ComboBoxItem Content="Vertical" />
+        </ComboBox>
+
+        <Separator />
+
+        <TextBlock Text="Navigate" FontWeight="SemiBold" FontSize="13" />
+        <StackPanel Spacing="6">
+          <Button Content="Previous" Click="OnPrevious" HorizontalAlignment="Stretch" />
+          <Button Content="Next" Click="OnNext" HorizontalAlignment="Stretch" />
+        </StackPanel>
+
+        <Separator />
+
+        <TextBlock Text="Status" FontWeight="SemiBold" FontSize="13" />
+        <TextBlock x:Name="StatusText" Text="—" Opacity="0.7" TextWrapping="Wrap" />
+      </StackPanel>
+    </ScrollViewer>
+
+    <Border DockPanel.Dock="Right" Width="1"
+            Background="{DynamicResource SystemControlForegroundBaseMediumLowBrush}" />
+
+    <Border Margin="12"
+            BorderBrush="{DynamicResource SystemControlForegroundBaseMediumLowBrush}"
+            BorderThickness="1"
+            CornerRadius="6"
+            ClipToBounds="True">
+      <Panel>
+        <CarouselPage x:Name="DemoCarousel">
+          <ContentPage Header="Sunrise"
+                       Background="#FFFDE68A"
+                       HorizontalContentAlignment="Stretch"
+                       VerticalContentAlignment="Stretch">
+            <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Spacing="8">
+              <Border Width="64" Height="64" CornerRadius="32"
+                      Background="#F59E0B" />
+              <TextBlock Text="Sunrise" FontSize="28" FontWeight="Bold"
+                         Foreground="#92400E" HorizontalAlignment="Center" />
+              <TextBlock Text="A new day begins. Warm golden hues fill the horizon."
+                         FontSize="13" Foreground="#92400E" Opacity="0.8"
+                         TextWrapping="Wrap" TextAlignment="Center" MaxWidth="240" />
+            </StackPanel>
+          </ContentPage>
+          <ContentPage Header="Ocean"
+                       Background="#FFBFDBFE"
+                       HorizontalContentAlignment="Stretch"
+                       VerticalContentAlignment="Stretch">
+            <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Spacing="8">
+              <Border Width="64" Height="64" CornerRadius="32"
+                      Background="#3B82F6" />
+              <TextBlock Text="Ocean" FontSize="28" FontWeight="Bold"
+                         Foreground="#1E3A5F" HorizontalAlignment="Center" />
+              <TextBlock Text="Vast blue waters stretch beyond what the eye can see."
+                         FontSize="13" Foreground="#1E3A5F" Opacity="0.8"
+                         TextWrapping="Wrap" TextAlignment="Center" MaxWidth="240" />
+            </StackPanel>
+          </ContentPage>
+          <ContentPage Header="Forest"
+                       Background="#FFBBF7D0"
+                       HorizontalContentAlignment="Stretch"
+                       VerticalContentAlignment="Stretch">
+            <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Spacing="8">
+              <Border Width="64" Height="64" CornerRadius="32"
+                      Background="#22C55E" />
+              <TextBlock Text="Forest" FontSize="28" FontWeight="Bold"
+                         Foreground="#14532D" HorizontalAlignment="Center" />
+              <TextBlock Text="Ancient trees whisper in the quiet woodland breeze."
+                         FontSize="13" Foreground="#14532D" Opacity="0.8"
+                         TextWrapping="Wrap" TextAlignment="Center" MaxWidth="240" />
+            </StackPanel>
+          </ContentPage>
+          <ContentPage Header="Night"
+                       Background="#1E1B4B"
+                       HorizontalContentAlignment="Stretch"
+                       VerticalContentAlignment="Stretch">
+            <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Spacing="8">
+              <Border Width="64" Height="64" CornerRadius="32"
+                      Background="#6366F1" />
+              <TextBlock Text="Night" FontSize="28" FontWeight="Bold"
+                         Foreground="#C7D2FE" HorizontalAlignment="Center" />
+              <TextBlock Text="Stars emerge as the world quiets into peaceful darkness."
+                         FontSize="13" Foreground="#C7D2FE" Opacity="0.8"
+                         TextWrapping="Wrap" TextAlignment="Center" MaxWidth="240" />
+            </StackPanel>
+          </ContentPage>
+        </CarouselPage>
+
+        <!-- Page indicator dots -->
+        <Border VerticalAlignment="Bottom" HorizontalAlignment="Center"
+                Margin="0,0,0,12" CornerRadius="8" Background="#44000000"
+                Padding="10,4">
+          <StackPanel Orientation="Horizontal" Spacing="6">
+            <Ellipse x:Name="Dot0" Width="8" Height="8" Fill="White" />
+            <Ellipse x:Name="Dot1" Width="8" Height="8" Fill="White" Opacity="0.4" />
+            <Ellipse x:Name="Dot2" Width="8" Height="8" Fill="White" Opacity="0.4" />
+            <Ellipse x:Name="Dot3" Width="8" Height="8" Fill="White" Opacity="0.4" />
+          </StackPanel>
+        </Border>
+      </Panel>
+    </Border>
+  </DockPanel>
+</UserControl>
diff --git a/samples/ControlCatalog/Pages/CarouselPage/CarouselPageCustomizationPage.xaml.cs b/samples/ControlCatalog/Pages/CarouselPage/CarouselPageCustomizationPage.xaml.cs
new file mode 100644
index 0000000000..afcb51bd56
--- /dev/null
+++ b/samples/ControlCatalog/Pages/CarouselPage/CarouselPageCustomizationPage.xaml.cs
@@ -0,0 +1,79 @@
+using System;
+using System.Collections;
+using Avalonia.Animation;
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+
+namespace ControlCatalog.Pages
+{
+    public partial class CarouselPageCustomizationPage : UserControl
+    {
+        public CarouselPageCustomizationPage()
+        {
+            InitializeComponent();
+            Loaded += OnLoaded;
+            Unloaded += OnUnloaded;
+        }
+
+        private void OnLoaded(object? sender, RoutedEventArgs e)
+        {
+            DemoCarousel.PageTransition = new PageSlide(TimeSpan.FromMilliseconds(300), PageSlide.SlideAxis.Horizontal);
+            DemoCarousel.SelectionChanged += OnSelectionChanged;
+            UpdateDots(DemoCarousel.SelectedIndex);
+            UpdateStatus();
+        }
+
+        private void OnUnloaded(object? sender, RoutedEventArgs e)
+        {
+            DemoCarousel.SelectionChanged -= OnSelectionChanged;
+        }
+
+        private void OnSelectionChanged(object? sender, PageSelectionChangedEventArgs e)
+        {
+            UpdateDots(DemoCarousel.SelectedIndex);
+            UpdateStatus();
+        }
+
+        private void OnOrientationChanged(object? sender, SelectionChangedEventArgs e)
+        {
+            if (DemoCarousel == null)
+                return;
+
+            var axis = OrientationCombo.SelectedIndex == 1
+                ? PageSlide.SlideAxis.Vertical
+                : PageSlide.SlideAxis.Horizontal;
+
+            DemoCarousel.PageTransition = new PageSlide(TimeSpan.FromMilliseconds(300), axis);
+            UpdateStatus();
+        }
+
+        private void OnPrevious(object? sender, RoutedEventArgs e)
+        {
+            if (DemoCarousel.SelectedIndex > 0)
+                DemoCarousel.SelectedIndex--;
+        }
+
+        private void OnNext(object? sender, RoutedEventArgs e)
+        {
+            var pageCount = (DemoCarousel.Pages as IList)?.Count ?? 0;
+            if (DemoCarousel.SelectedIndex < pageCount - 1)
+                DemoCarousel.SelectedIndex++;
+        }
+
+        private void UpdateDots(int selectedIndex)
+        {
+            Dot0.Opacity = selectedIndex == 0 ? 1.0 : 0.4;
+            Dot1.Opacity = selectedIndex == 1 ? 1.0 : 0.4;
+            Dot2.Opacity = selectedIndex == 2 ? 1.0 : 0.4;
+            Dot3.Opacity = selectedIndex == 3 ? 1.0 : 0.4;
+        }
+
+        private void UpdateStatus()
+        {
+            if (StatusText == null) return;
+            var pageCount = (DemoCarousel.Pages as IList)?.Count ?? 0;
+            var axis = OrientationCombo?.SelectedIndex == 1 ? "Vertical" : "Horizontal";
+            StatusText.Text = $"Page {DemoCarousel.SelectedIndex + 1} of {pageCount} | {axis}";
+        }
+    }
+}
diff --git a/samples/ControlCatalog/Pages/CarouselPage/CarouselPageDataTemplatePage.xaml b/samples/ControlCatalog/Pages/CarouselPage/CarouselPageDataTemplatePage.xaml
new file mode 100644
index 0000000000..0722c9a173
--- /dev/null
+++ b/samples/ControlCatalog/Pages/CarouselPage/CarouselPageDataTemplatePage.xaml
@@ -0,0 +1,44 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             x:Class="ControlCatalog.Pages.CarouselPageDataTemplatePage">
+  <DockPanel>
+    <ScrollViewer DockPanel.Dock="Right" Width="240">
+      <StackPanel Margin="12" Spacing="8">
+        <TextBlock Text="Data Templates" FontWeight="SemiBold" FontSize="16"
+                   Foreground="{DynamicResource SystemControlHighlightAccentBrush}" />
+
+        <TextBlock FontSize="12" Opacity="0.7" TextWrapping="Wrap"
+                   Text="Bind a CarouselPage to a view-model collection, render each item with PageTemplate, and switch templates at runtime." />
+
+        <Separator />
+
+        <Button Content="Add Page" Click="OnAddPage" HorizontalAlignment="Stretch" />
+        <Button Content="Remove Last" Click="OnRemovePage" HorizontalAlignment="Stretch" />
+        <Button Content="Switch Template" Click="OnSwitchTemplate" HorizontalAlignment="Stretch" />
+
+        <Separator />
+
+        <TextBlock Text="Navigate" FontWeight="SemiBold" FontSize="13" />
+        <StackPanel Spacing="6">
+          <Button Content="Previous" Click="OnPrevious" HorizontalAlignment="Stretch" />
+          <Button Content="Next" Click="OnNext" HorizontalAlignment="Stretch" />
+        </StackPanel>
+
+        <Separator />
+
+        <TextBlock x:Name="StatusText" Text="4 pages" Opacity="0.7" />
+      </StackPanel>
+    </ScrollViewer>
+
+    <Border DockPanel.Dock="Right" Width="1"
+            Background="{DynamicResource SystemControlForegroundBaseMediumLowBrush}" />
+
+    <Border Margin="12"
+            BorderBrush="{DynamicResource SystemControlForegroundBaseMediumLowBrush}"
+            BorderThickness="1"
+            CornerRadius="6"
+            ClipToBounds="True">
+      <Panel x:Name="CarouselHost" />
+    </Border>
+  </DockPanel>
+</UserControl>
diff --git a/samples/ControlCatalog/Pages/CarouselPage/CarouselPageDataTemplatePage.xaml.cs b/samples/ControlCatalog/Pages/CarouselPage/CarouselPageDataTemplatePage.xaml.cs
new file mode 100644
index 0000000000..28d3c82f31
--- /dev/null
+++ b/samples/ControlCatalog/Pages/CarouselPage/CarouselPageDataTemplatePage.xaml.cs
@@ -0,0 +1,209 @@
+using System.Collections.ObjectModel;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Controls.Templates;
+using Avalonia.Interactivity;
+using Avalonia.Layout;
+using Avalonia.Media;
+using AvaCarouselPage = Avalonia.Controls.CarouselPage;
+
+namespace ControlCatalog.Pages
+{
+    public partial class CarouselPageDataTemplatePage : UserControl
+    {
+        private sealed class CityViewModel
+        {
+            public string Name { get; }
+            public string Color { get; }
+            public string Description { get; }
+
+            public CityViewModel(string name, string color, string description)
+            {
+                Name = name;
+                Color = color;
+                Description = description;
+            }
+        }
+
+        private static readonly CityViewModel[] InitialData =
+        {
+            new("Tokyo", "#1565C0",
+                "The neon-lit capital of Japan, where ancient temples meet futuristic skylines."),
+            new("Amsterdam", "#2E7D32", "A city of canals, bicycles, and world-class museums."),
+            new("New York", "#6A1B9A", "The city that never sleeps — a cultural and financial powerhouse."),
+            new("Sydney", "#B71C1C", "Iconic harbour, golden beaches and the world-famous Opera House."),
+        };
+
+        private static readonly CityViewModel[] AddData =
+        {
+            new("Paris", "#E65100", "The city of light, love, and the Eiffel Tower."),
+            new("Barcelona", "#00695C", "Art, architecture, and vibrant street life on the Mediterranean coast."),
+            new("Kyoto", "#880E4F", "Japan's ancient capital, a living museum of traditional culture."),
+        };
+
+        private readonly ObservableCollection<CityViewModel> _items = new();
+        private int _addCounter;
+        private bool _useCardTemplate = true;
+        private AvaCarouselPage? _carouselPage;
+
+        public CarouselPageDataTemplatePage()
+        {
+            InitializeComponent();
+            Loaded += OnLoaded;
+        }
+
+        private void OnLoaded(object? sender, RoutedEventArgs e)
+        {
+            if (_carouselPage != null)
+                return;
+
+            foreach (var vm in InitialData)
+                _items.Add(vm);
+            _addCounter = InitialData.Length;
+            _useCardTemplate = true;
+
+            _carouselPage = new AvaCarouselPage { ItemsSource = _items, PageTemplate = CreatePageTemplate() };
+
+            _carouselPage.SelectionChanged += OnSelectionChanged;
+            CarouselHost.Children.Add(_carouselPage);
+            UpdateStatus();
+        }
+
+        private void OnSelectionChanged(object? sender, PageSelectionChangedEventArgs e) => UpdateStatus();
+
+        private void OnAddPage(object? sender, RoutedEventArgs e)
+        {
+            var idx = _addCounter % AddData.Length;
+            var vm = AddData[idx];
+            var suffix = _addCounter >= AddData.Length ? $" {_addCounter / AddData.Length + 1}" : "";
+            _items.Add(new CityViewModel(vm.Name + suffix, vm.Color, vm.Description));
+            _addCounter++;
+            UpdateStatus();
+        }
+
+        private void OnRemovePage(object? sender, RoutedEventArgs e)
+        {
+            if (_items.Count > 0)
+            {
+                _items.RemoveAt(_items.Count - 1);
+                UpdateStatus();
+            }
+        }
+
+        private void OnSwitchTemplate(object? sender, RoutedEventArgs e)
+        {
+            if (_carouselPage == null)
+                return;
+
+            _useCardTemplate = !_useCardTemplate;
+            _carouselPage.PageTemplate = CreatePageTemplate();
+        }
+
+        private void OnPrevious(object? sender, RoutedEventArgs e)
+        {
+            if (_carouselPage == null)
+                return;
+            if (_carouselPage.SelectedIndex > 0)
+                _carouselPage.SelectedIndex--;
+        }
+
+        private void OnNext(object? sender, RoutedEventArgs e)
+        {
+            if (_carouselPage == null)
+                return;
+            if (_carouselPage.SelectedIndex < _items.Count - 1)
+                _carouselPage.SelectedIndex++;
+        }
+
+        private void UpdateStatus()
+        {
+            var count = _items.Count;
+            var index = _carouselPage?.SelectedIndex ?? -1;
+            StatusText.Text = count == 0 ? "No pages" : $"Page {index + 1} of {count} (index {index})";
+        }
+
+        private IDataTemplate CreatePageTemplate()
+        {
+            return new FuncDataTemplate<CityViewModel>((vm, _) => CreatePage(vm, _useCardTemplate));
+        }
+
+        private static ContentPage CreatePage(CityViewModel? vm, bool useCardTemplate)
+        {
+            if (vm is null)
+                return new ContentPage();
+
+            return new ContentPage
+            {
+                Header = vm.Name, Content = useCardTemplate ? CreateCardContent(vm) : CreateFeatureContent(vm)
+            };
+        }
+
+        private static Control CreateCardContent(CityViewModel vm)
+        {
+            return new StackPanel
+            {
+                HorizontalAlignment = HorizontalAlignment.Center,
+                VerticalAlignment = VerticalAlignment.Center,
+                Spacing = 8,
+                Children =
+                {
+                    new TextBlock
+                    {
+                        Text = vm.Name,
+                        FontSize = 28,
+                        FontWeight = FontWeight.Bold,
+                        Foreground = new SolidColorBrush(Color.Parse(vm.Color)),
+                        HorizontalAlignment = HorizontalAlignment.Center
+                    },
+                    new TextBlock
+                    {
+                        Text = vm.Description,
+                        FontSize = 13,
+                        Opacity = 0.7,
+                        TextWrapping = TextWrapping.Wrap,
+                        TextAlignment = TextAlignment.Center,
+                        MaxWidth = 280
+                    }
+                }
+            };
+        }
+
+        private static Control CreateFeatureContent(CityViewModel vm)
+        {
+            var accent = Color.Parse(vm.Color);
+
+            return new Border
+            {
+                Background = new SolidColorBrush(accent),
+                Padding = new Thickness(32),
+                Child = new StackPanel
+                {
+                    HorizontalAlignment = HorizontalAlignment.Center,
+                    VerticalAlignment = VerticalAlignment.Center,
+                    Spacing = 12,
+                    Children =
+                    {
+                        new TextBlock
+                        {
+                            Text = vm.Name.ToUpperInvariant(),
+                            FontSize = 34,
+                            FontWeight = FontWeight.Bold,
+                            Foreground = Brushes.White,
+                            HorizontalAlignment = HorizontalAlignment.Center
+                        },
+                        new TextBlock
+                        {
+                            Text = vm.Description,
+                            FontSize = 15,
+                            Foreground = Brushes.White,
+                            Opacity = 0.88,
+                            TextWrapping = TextWrapping.Wrap,
+                            TextAlignment = TextAlignment.Center,
+                            MaxWidth = 320
+                        }
+                    }
+                }
+            };
+        }
+    }
+}
diff --git a/samples/ControlCatalog/Pages/CarouselPage/CarouselPageEventsPage.xaml b/samples/ControlCatalog/Pages/CarouselPage/CarouselPageEventsPage.xaml
new file mode 100644
index 0000000000..68b7c25ded
--- /dev/null
+++ b/samples/ControlCatalog/Pages/CarouselPage/CarouselPageEventsPage.xaml
@@ -0,0 +1,37 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             x:Class="ControlCatalog.Pages.CarouselPageEventsPage">
+  <DockPanel>
+    <StackPanel DockPanel.Dock="Right" Width="240" Margin="0,0,0,0">
+      <StackPanel Margin="12" Spacing="8">
+        <TextBlock Text="Event Log" FontWeight="SemiBold" FontSize="16"
+                   Foreground="{DynamicResource SystemControlHighlightAccentBrush}" />
+
+        <TextBlock Text="Navigate" FontWeight="SemiBold" FontSize="13" />
+        <StackPanel Spacing="6">
+          <Button Content="Previous" Click="OnPrevious" HorizontalAlignment="Stretch" />
+          <Button Content="Next" Click="OnNext" HorizontalAlignment="Stretch" />
+        </StackPanel>
+
+        <Separator />
+
+        <Button Content="Clear Log" Click="OnClearLog" HorizontalAlignment="Stretch" />
+      </StackPanel>
+      <Border Height="1" Background="{DynamicResource SystemControlForegroundBaseMediumLowBrush}" />
+      <ScrollViewer x:Name="LogScrollViewer" VerticalScrollBarVisibility="Auto">
+        <TextBlock x:Name="EventLog" Margin="12" FontSize="11"
+                   FontFamily="Courier New, Consolas, monospace"
+                   TextWrapping="Wrap" Opacity="0.85" />
+      </ScrollViewer>
+    </StackPanel>
+
+    <Border DockPanel.Dock="Right" Width="1"
+            Background="{DynamicResource SystemControlForegroundBaseMediumLowBrush}" />
+
+    <Border Margin="12"
+            BorderBrush="{DynamicResource SystemControlForegroundBaseMediumLowBrush}"
+            BorderThickness="1" CornerRadius="6" ClipToBounds="True">
+      <CarouselPage x:Name="DemoCarousel" />
+    </Border>
+  </DockPanel>
+</UserControl>
diff --git a/samples/ControlCatalog/Pages/CarouselPage/CarouselPageEventsPage.xaml.cs b/samples/ControlCatalog/Pages/CarouselPage/CarouselPageEventsPage.xaml.cs
new file mode 100644
index 0000000000..34887d5a26
--- /dev/null
+++ b/samples/ControlCatalog/Pages/CarouselPage/CarouselPageEventsPage.xaml.cs
@@ -0,0 +1,92 @@
+using System;
+using System.Collections.Generic;
+using Avalonia.Collections;
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+
+namespace ControlCatalog.Pages
+{
+    public partial class CarouselPageEventsPage : UserControl
+    {
+        private readonly List<string> _log = new();
+
+        public CarouselPageEventsPage()
+        {
+            InitializeComponent();
+            Loaded += OnLoaded;
+            Unloaded += OnUnloaded;
+        }
+
+        private void OnLoaded(object? sender, RoutedEventArgs e)
+        {
+            var pageNames = new[] { "Home", "Explore", "Library", "Profile" };
+            for (int i = 0; i < pageNames.Length; i++)
+            {
+                var name = pageNames[i];
+                var page = new ContentPage
+                {
+                    Header = name,
+                    Background = NavigationDemoHelper.GetPageBrush(i),
+                    Content = new TextBlock
+                    {
+                        Text = $"{name}",
+                        FontSize = 28,
+                        FontWeight = Avalonia.Media.FontWeight.Bold,
+                        HorizontalAlignment = Avalonia.Layout.HorizontalAlignment.Center,
+                        VerticalAlignment = Avalonia.Layout.VerticalAlignment.Center
+                    },
+                    HorizontalContentAlignment = Avalonia.Layout.HorizontalAlignment.Stretch,
+                    VerticalContentAlignment = Avalonia.Layout.VerticalAlignment.Stretch
+                };
+
+                page.NavigatedTo += (_, args) =>
+                    AppendLog($"NavigatedTo: {name} (from {(args.PreviousPage as ContentPage)?.Header ?? "—"})");
+                page.NavigatedFrom += (_, args) =>
+                    AppendLog($"NavigatedFrom: {name} (to {(args.DestinationPage as ContentPage)?.Header ?? "—"})");
+
+                ((Avalonia.Collections.AvaloniaList<Page>)DemoCarousel.Pages!).Add(page);
+            }
+
+            DemoCarousel.SelectionChanged += OnSelectionChanged;
+        }
+
+        private void OnSelectionChanged(object? sender, PageSelectionChangedEventArgs e)
+        {
+            AppendLog($"SelectionChanged: {(e.PreviousPage as ContentPage)?.Header ?? "—"} → {(e.CurrentPage as ContentPage)?.Header ?? "—"}");
+        }
+
+        private void OnPrevious(object? sender, RoutedEventArgs e)
+        {
+            if (DemoCarousel.SelectedIndex > 0)
+                DemoCarousel.SelectedIndex--;
+        }
+
+        private void OnNext(object? sender, RoutedEventArgs e)
+        {
+            var pageCount = ((AvaloniaList<Page>)DemoCarousel.Pages!).Count;
+            if (DemoCarousel.SelectedIndex < pageCount - 1)
+                DemoCarousel.SelectedIndex++;
+        }
+
+        private void OnUnloaded(object? sender, RoutedEventArgs e)
+        {
+            DemoCarousel.SelectionChanged -= OnSelectionChanged;
+        }
+
+        private void OnClearLog(object? sender, RoutedEventArgs e)
+        {
+            _log.Clear();
+            EventLog.Text = string.Empty;
+        }
+
+        private void AppendLog(string message)
+        {
+            var timestamp = DateTime.Now.ToString("HH:mm:ss.fff");
+            _log.Add($"[{timestamp}] {message}");
+            if (_log.Count > 50)
+                _log.RemoveAt(0);
+            EventLog.Text = string.Join(Environment.NewLine, _log);
+            LogScrollViewer.ScrollToEnd();
+        }
+    }
+}
diff --git a/samples/ControlCatalog/Pages/CarouselPage/CarouselPageFirstLookPage.xaml b/samples/ControlCatalog/Pages/CarouselPage/CarouselPageFirstLookPage.xaml
new file mode 100644
index 0000000000..564cdb78db
--- /dev/null
+++ b/samples/ControlCatalog/Pages/CarouselPage/CarouselPageFirstLookPage.xaml
@@ -0,0 +1,61 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             x:Class="ControlCatalog.Pages.CarouselPageFirstLookPage">
+  <DockPanel>
+    <ScrollViewer DockPanel.Dock="Right" Width="220">
+      <StackPanel Margin="12" Spacing="8">
+        <TextBlock Text="Configuration" FontWeight="SemiBold" FontSize="16"
+                   Foreground="{DynamicResource SystemControlHighlightAccentBrush}" />
+
+        <TextBlock Text="Navigation" FontWeight="SemiBold" FontSize="13" />
+        <StackPanel Spacing="6">
+          <Button Content="Previous" Click="OnPrevious" HorizontalAlignment="Stretch" />
+          <Button Content="Next" Click="OnNext" HorizontalAlignment="Stretch" />
+        </StackPanel>
+
+        <Separator />
+
+        <TextBlock Text="Status" FontWeight="SemiBold" FontSize="13" />
+        <TextBlock x:Name="StatusText" Text="Page 1 of 3" Opacity="0.7" TextWrapping="Wrap" />
+      </StackPanel>
+    </ScrollViewer>
+
+    <Border DockPanel.Dock="Right" Width="1"
+            Background="{DynamicResource SystemControlForegroundBaseMediumLowBrush}" />
+
+    <Border Margin="12"
+            BorderBrush="{DynamicResource SystemControlForegroundBaseMediumLowBrush}"
+            BorderThickness="1" CornerRadius="6" ClipToBounds="True">
+      <CarouselPage x:Name="DemoCarousel"
+                    SelectionChanged="OnSelectionChanged">
+        <ContentPage Header="Welcome">
+          <StackPanel Margin="24" Spacing="12"
+                      HorizontalAlignment="Center" VerticalAlignment="Center">
+            <TextBlock Text="Welcome" FontSize="28" FontWeight="Bold"
+                       HorizontalAlignment="Center" />
+            <TextBlock Text="Swipe left or use the buttons to navigate."
+                       TextWrapping="Wrap" Opacity="0.7" TextAlignment="Center" MaxWidth="280" />
+          </StackPanel>
+        </ContentPage>
+        <ContentPage Header="Explore">
+          <StackPanel Margin="24" Spacing="12"
+                      HorizontalAlignment="Center" VerticalAlignment="Center">
+            <TextBlock Text="Explore" FontSize="28" FontWeight="Bold"
+                       HorizontalAlignment="Center" />
+            <TextBlock Text="CarouselPage supports scroll-based and transition-based navigation modes."
+                       TextWrapping="Wrap" Opacity="0.7" TextAlignment="Center" MaxWidth="280" />
+          </StackPanel>
+        </ContentPage>
+        <ContentPage Header="Get Started">
+          <StackPanel Margin="24" Spacing="12"
+                      HorizontalAlignment="Center" VerticalAlignment="Center">
+            <TextBlock Text="Get Started" FontSize="28" FontWeight="Bold"
+                       HorizontalAlignment="Center" />
+            <TextBlock Text="Use SelectedIndex to jump to any page, or assign a PageTransition for animated switching."
+                       TextWrapping="Wrap" Opacity="0.7" TextAlignment="Center" MaxWidth="280" />
+          </StackPanel>
+        </ContentPage>
+      </CarouselPage>
+    </Border>
+  </DockPanel>
+</UserControl>
diff --git a/samples/ControlCatalog/Pages/CarouselPage/CarouselPageFirstLookPage.xaml.cs b/samples/ControlCatalog/Pages/CarouselPage/CarouselPageFirstLookPage.xaml.cs
new file mode 100644
index 0000000000..341d4b3dbb
--- /dev/null
+++ b/samples/ControlCatalog/Pages/CarouselPage/CarouselPageFirstLookPage.xaml.cs
@@ -0,0 +1,35 @@
+using System.Collections;
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+
+namespace ControlCatalog.Pages
+{
+    public partial class CarouselPageFirstLookPage : UserControl
+    {
+        public CarouselPageFirstLookPage()
+        {
+            InitializeComponent();
+        }
+
+        private void OnPrevious(object? sender, RoutedEventArgs e)
+        {
+            if (DemoCarousel.SelectedIndex > 0)
+                DemoCarousel.SelectedIndex--;
+        }
+
+        private void OnNext(object? sender, RoutedEventArgs e)
+        {
+            var pageCount = (DemoCarousel.Pages as IList)?.Count ?? 0;
+            if (DemoCarousel.SelectedIndex < pageCount - 1)
+                DemoCarousel.SelectedIndex++;
+        }
+
+        private void OnSelectionChanged(object? sender, PageSelectionChangedEventArgs e)
+        {
+            if (StatusText == null)
+                return;
+            var pageCount = (DemoCarousel.Pages as IList)?.Count ?? 0;
+            StatusText.Text = $"Page {DemoCarousel.SelectedIndex + 1} of {pageCount}";
+        }
+    }
+}
diff --git a/samples/ControlCatalog/Pages/CarouselPage/CarouselPageGesturePage.xaml b/samples/ControlCatalog/Pages/CarouselPage/CarouselPageGesturePage.xaml
new file mode 100644
index 0000000000..440655b8cc
--- /dev/null
+++ b/samples/ControlCatalog/Pages/CarouselPage/CarouselPageGesturePage.xaml
@@ -0,0 +1,64 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             x:Class="ControlCatalog.Pages.CarouselPageGesturePage">
+  <DockPanel>
+    <ScrollViewer DockPanel.Dock="Right" Width="220">
+      <StackPanel Margin="12" Spacing="8">
+        <TextBlock Text="Configuration" FontWeight="SemiBold" FontSize="16"
+                   Foreground="{DynamicResource SystemControlHighlightAccentBrush}" />
+
+        <TextBlock Text="Gesture Navigation" FontWeight="SemiBold" FontSize="13" />
+        <CheckBox x:Name="GestureCheck" Content="IsGestureEnabled"
+                  IsChecked="True" IsCheckedChanged="OnGestureChanged" />
+
+        <Separator />
+
+        <TextBlock Text="Keyboard Navigation" FontWeight="SemiBold" FontSize="13" />
+        <CheckBox x:Name="KeyboardCheck" Content="IsKeyboardNavigationEnabled"
+                  IsChecked="True" IsCheckedChanged="OnKeyboardChanged" />
+
+        <Separator />
+
+        <TextBlock Text="Hints" FontWeight="SemiBold" FontSize="13" />
+        <TextBlock Text="• Swipe left/right to navigate (touch)" FontSize="11" Opacity="0.7" TextWrapping="Wrap" />
+        <TextBlock Text="• Mouse drag (left button) to navigate" FontSize="11" Opacity="0.7" TextWrapping="Wrap" />
+        <TextBlock Text="• Arrow keys / Home / End when focused" FontSize="11" Opacity="0.7" TextWrapping="Wrap" />
+        <TextBlock Text="• Mouse wheel scrolls pages" FontSize="11" Opacity="0.7" TextWrapping="Wrap" />
+
+        <Separator />
+
+        <TextBlock Text="Status" FontWeight="SemiBold" FontSize="13" />
+        <TextBlock x:Name="StatusText" Text="—" Opacity="0.7" TextWrapping="Wrap" />
+      </StackPanel>
+    </ScrollViewer>
+
+    <Border DockPanel.Dock="Right" Width="1"
+            Background="{DynamicResource SystemControlForegroundBaseMediumLowBrush}" />
+
+    <Border Margin="12"
+            BorderBrush="{DynamicResource SystemControlForegroundBaseMediumLowBrush}"
+            BorderThickness="1" CornerRadius="6" ClipToBounds="True">
+      <CarouselPage x:Name="DemoCarousel"
+                    SelectionChanged="OnSelectionChanged">
+        <CarouselPage.PageTransition>
+          <PageSlide Duration="0:0:0.3" Orientation="Horizontal" />
+        </CarouselPage.PageTransition>
+        <ContentPage Header="Page 1" Background="#BBDEFB">
+          <TextBlock Text="Page 1 — Swipe or drag to navigate"
+                     HorizontalAlignment="Center" VerticalAlignment="Center"
+                     TextWrapping="Wrap" TextAlignment="Center" MaxWidth="200" FontSize="16" />
+        </ContentPage>
+        <ContentPage Header="Page 2" Background="#C8E6C9">
+          <TextBlock Text="Page 2 — Arrow keys also work when focused"
+                     HorizontalAlignment="Center" VerticalAlignment="Center"
+                     TextWrapping="Wrap" TextAlignment="Center" MaxWidth="200" FontSize="16" />
+        </ContentPage>
+        <ContentPage Header="Page 3" Background="#FFE0B2">
+          <TextBlock Text="Page 3 — Disable gestures using the panel"
+                     HorizontalAlignment="Center" VerticalAlignment="Center"
+                     TextWrapping="Wrap" TextAlignment="Center" MaxWidth="200" FontSize="16" />
+        </ContentPage>
+      </CarouselPage>
+    </Border>
+  </DockPanel>
+</UserControl>
diff --git a/samples/ControlCatalog/Pages/CarouselPage/CarouselPageGesturePage.xaml.cs b/samples/ControlCatalog/Pages/CarouselPage/CarouselPageGesturePage.xaml.cs
new file mode 100644
index 0000000000..2184031c2f
--- /dev/null
+++ b/samples/ControlCatalog/Pages/CarouselPage/CarouselPageGesturePage.xaml.cs
@@ -0,0 +1,44 @@
+using System.Collections;
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+
+namespace ControlCatalog.Pages
+{
+    public partial class CarouselPageGesturePage : UserControl
+    {
+        public CarouselPageGesturePage()
+        {
+            InitializeComponent();
+            Loaded += OnLoaded;
+        }
+
+        private void OnLoaded(object? sender, RoutedEventArgs e) => UpdateStatus();
+
+        private void OnGestureChanged(object? sender, RoutedEventArgs e)
+        {
+            if (DemoCarousel == null)
+                return;
+            DemoCarousel.IsGestureEnabled = GestureCheck.IsChecked == true;
+        }
+
+        private void OnKeyboardChanged(object? sender, RoutedEventArgs e)
+        {
+            if (DemoCarousel == null)
+                return;
+            DemoCarousel.IsKeyboardNavigationEnabled = KeyboardCheck.IsChecked == true;
+        }
+
+        private void OnSelectionChanged(object? sender, PageSelectionChangedEventArgs e)
+        {
+            UpdateStatus();
+        }
+
+        private void UpdateStatus()
+        {
+            if (StatusText == null)
+                return;
+            var pageCount = (DemoCarousel.Pages as IList)?.Count ?? 0;
+            StatusText.Text = $"Page {DemoCarousel.SelectedIndex + 1} of {pageCount}";
+        }
+    }
+}
diff --git a/samples/ControlCatalog/Pages/CarouselPage/CarouselPagePerformancePage.xaml b/samples/ControlCatalog/Pages/CarouselPage/CarouselPagePerformancePage.xaml
new file mode 100644
index 0000000000..eda4ee0209
--- /dev/null
+++ b/samples/ControlCatalog/Pages/CarouselPage/CarouselPagePerformancePage.xaml
@@ -0,0 +1,45 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             x:Class="ControlCatalog.Pages.CarouselPagePerformancePage">
+  <Grid ColumnDefinitions="*,240">
+
+    <Border Grid.Column="0" Margin="12"
+            BorderBrush="{DynamicResource SystemControlForegroundBaseMediumLowBrush}"
+            BorderThickness="1"
+            CornerRadius="6"
+            ClipToBounds="True">
+      <CarouselPage x:Name="DemoCarousel" />
+    </Border>
+
+    <Border Grid.Column="1"
+            BorderBrush="{DynamicResource SystemControlForegroundBaseMediumLowBrush}"
+            BorderThickness="1,0,0,0" Padding="12">
+      <ScrollViewer>
+        <StackPanel Spacing="8">
+
+          <TextBlock Text="Actions" FontWeight="SemiBold" />
+          <Button Content="Add 5 Pages"    HorizontalAlignment="Stretch" Click="OnAdd5" />
+          <Button Content="Add 20 Pages"   HorizontalAlignment="Stretch" Click="OnAdd20" />
+          <Button Content="Remove Last 5"  HorizontalAlignment="Stretch" Click="OnRemove5" />
+          <Button Content="Clear All"      HorizontalAlignment="Stretch" Click="OnClearAll" />
+
+          <Separator />
+
+          <Button Content="Force GC"       HorizontalAlignment="Stretch" Click="OnForceGC" />
+          <Button Content="Refresh Stats"  HorizontalAlignment="Stretch" Click="OnRefresh" />
+
+          <Separator />
+
+          <TextBlock Text="Statistics" FontWeight="SemiBold" />
+          <TextBlock x:Name="PageCountText"  Text="Page count: 0"          FontSize="12" />
+          <TextBlock x:Name="LiveCountText"  Text="Live instances: 0"      FontSize="12" />
+          <TextBlock x:Name="HeapText"       Text="Heap: 0 KB"             FontSize="12" />
+          <TextBlock x:Name="AllocText"      Text="Total allocated: 0 KB"  FontSize="12" />
+          <TextBlock x:Name="LastOpTimeText" Text="Last Op: "              FontSize="12" />
+
+        </StackPanel>
+      </ScrollViewer>
+    </Border>
+
+  </Grid>
+</UserControl>
diff --git a/samples/ControlCatalog/Pages/CarouselPage/CarouselPagePerformancePage.xaml.cs b/samples/ControlCatalog/Pages/CarouselPage/CarouselPagePerformancePage.xaml.cs
new file mode 100644
index 0000000000..720d2645dc
--- /dev/null
+++ b/samples/ControlCatalog/Pages/CarouselPage/CarouselPagePerformancePage.xaml.cs
@@ -0,0 +1,103 @@
+using System;
+using System.Collections;
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+using Avalonia.Layout;
+
+namespace ControlCatalog.Pages
+{
+    public partial class CarouselPagePerformancePage : UserControl
+    {
+        private readonly NavigationPerformanceMonitorHelper _perf = new();
+        private int _counter;
+
+        public CarouselPagePerformancePage()
+        {
+            InitializeComponent();
+            Loaded += OnLoaded;
+            Unloaded += OnUnloaded;
+        }
+
+        private void OnLoaded(object? sender, RoutedEventArgs e)
+        {
+            AddPages(5);
+            DemoCarousel.SelectionChanged += OnSelectionChanged;
+        }
+
+        private void OnUnloaded(object? sender, RoutedEventArgs e)
+        {
+            DemoCarousel.SelectionChanged -= OnSelectionChanged;
+        }
+
+        private void OnSelectionChanged(object? sender, PageSelectionChangedEventArgs e) => RefreshStats();
+
+        private void AddPages(int count)
+        {
+            var pages = (IList)DemoCarousel.Pages!;
+            _perf.OpStopwatch.Restart();
+            for (int i = 0; i < count; i++)
+            {
+                var idx = ++_counter;
+                var page = new ContentPage
+                {
+                    Header = $"P{idx}",
+                    Content = new TextBlock
+                    {
+                        Text = $"Page {idx}",
+                        HorizontalAlignment = HorizontalAlignment.Center,
+                        VerticalAlignment = VerticalAlignment.Center,
+                        FontSize = 18,
+                        Opacity = 0.7
+                    },
+                    Tag = new byte[51200],
+                };
+                _perf.TrackPage(page);
+                pages.Add(page);
+            }
+
+            _perf.StopMetrics(LastOpTimeText);
+            RefreshStats();
+        }
+
+        private void RemovePages(int count)
+        {
+            var pages = (IList)DemoCarousel.Pages!;
+            _perf.OpStopwatch.Restart();
+            for (int i = 0; i < count && pages.Count > 0; i++)
+                pages.RemoveAt(pages.Count - 1);
+
+            _perf.StopMetrics(LastOpTimeText);
+            RefreshStats();
+        }
+
+        private void OnAdd5(object? sender, RoutedEventArgs e) => AddPages(5);
+        private void OnAdd20(object? sender, RoutedEventArgs e) => AddPages(20);
+        private void OnRemove5(object? sender, RoutedEventArgs e) => RemovePages(5);
+
+        private void OnClearAll(object? sender, RoutedEventArgs e)
+        {
+            var pages = (IList)DemoCarousel.Pages!;
+            _perf.OpStopwatch.Restart();
+            while (pages.Count > 0)
+                pages.RemoveAt(pages.Count - 1);
+            _perf.StopMetrics(LastOpTimeText);
+            RefreshStats();
+        }
+
+        private void OnForceGC(object? sender, RoutedEventArgs e)
+        {
+            _perf.ForceGC(RefreshStats);
+        }
+
+        private void OnRefresh(object? sender, RoutedEventArgs e) => RefreshStats();
+
+        private void RefreshStats()
+        {
+            var pages = (IList)DemoCarousel.Pages!;
+            PageCountText.Text = $"Page count: {pages.Count}";
+            LiveCountText.Text = $"Live instances: {_perf.CountLiveInstances()} / {_perf.TotalCreated} tracked";
+            HeapText.Text = $"Heap: {GC.GetTotalMemory(false) / 1024:N0} KB";
+            AllocText.Text = $"Total allocated: {GC.GetTotalAllocatedBytes() / 1024:N0} KB";
+        }
+    }
+}
diff --git a/samples/ControlCatalog/Pages/CarouselPage/CarouselPageSelectionPage.xaml b/samples/ControlCatalog/Pages/CarouselPage/CarouselPageSelectionPage.xaml
new file mode 100644
index 0000000000..2460db5c45
--- /dev/null
+++ b/samples/ControlCatalog/Pages/CarouselPage/CarouselPageSelectionPage.xaml
@@ -0,0 +1,90 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             x:Class="ControlCatalog.Pages.CarouselPageSelectionPage">
+  <DockPanel>
+    <ScrollViewer DockPanel.Dock="Right" Width="220">
+      <StackPanel Margin="12" Spacing="8">
+        <TextBlock Text="Configuration" FontWeight="SemiBold" FontSize="16"
+                   Foreground="{DynamicResource SystemControlHighlightAccentBrush}" />
+
+        <TextBlock Text="Jump to Page" FontWeight="SemiBold" FontSize="13" />
+        <StackPanel Spacing="6">
+          <Button Content="Go to Page 1" Click="OnGoTo0" HorizontalAlignment="Stretch" />
+          <Button Content="Go to Page 2" Click="OnGoTo1" HorizontalAlignment="Stretch" />
+          <Button Content="Go to Page 3" Click="OnGoTo2" HorizontalAlignment="Stretch" />
+          <Button Content="Go to Page 4" Click="OnGoTo3" HorizontalAlignment="Stretch" />
+        </StackPanel>
+
+        <Separator />
+
+        <TextBlock Text="Navigate" FontWeight="SemiBold" FontSize="13" />
+        <StackPanel Spacing="6">
+          <Button Content="First" Click="OnFirst" HorizontalAlignment="Stretch" />
+          <Button Content="Previous" Click="OnPrevious" HorizontalAlignment="Stretch" />
+          <Button Content="Next" Click="OnNext" HorizontalAlignment="Stretch" />
+          <Button Content="Last" Click="OnLast" HorizontalAlignment="Stretch" />
+        </StackPanel>
+
+        <Separator />
+
+        <TextBlock Text="Status" FontWeight="SemiBold" FontSize="13" />
+        <TextBlock x:Name="StatusText" Text="—" Opacity="0.7" TextWrapping="Wrap" />
+      </StackPanel>
+    </ScrollViewer>
+
+    <Border DockPanel.Dock="Right" Width="1"
+            Background="{DynamicResource SystemControlForegroundBaseMediumLowBrush}" />
+
+    <Border Margin="12"
+            BorderBrush="{DynamicResource SystemControlForegroundBaseMediumLowBrush}"
+            BorderThickness="1" CornerRadius="6" ClipToBounds="True">
+      <CarouselPage x:Name="DemoCarousel"
+                    SelectionChanged="OnSelectionChanged">
+        <ContentPage Header="Onboarding" Background="#BBDEFB">
+          <StackPanel Margin="24" Spacing="8"
+                      HorizontalAlignment="Center" VerticalAlignment="Center">
+            <TextBlock Text="Step 1 of 4" FontSize="14" Opacity="0.6"
+                       HorizontalAlignment="Center" />
+            <TextBlock Text="Onboarding" FontSize="28" FontWeight="Bold"
+                       HorizontalAlignment="Center" />
+            <TextBlock Text="Set SelectedIndex to jump directly to any page."
+                       TextWrapping="Wrap" Opacity="0.7" TextAlignment="Center" MaxWidth="260" />
+          </StackPanel>
+        </ContentPage>
+        <ContentPage Header="Features" Background="#C8E6C9">
+          <StackPanel Margin="24" Spacing="8"
+                      HorizontalAlignment="Center" VerticalAlignment="Center">
+            <TextBlock Text="Step 2 of 4" FontSize="14" Opacity="0.6"
+                       HorizontalAlignment="Center" />
+            <TextBlock Text="Features" FontSize="28" FontWeight="Bold"
+                       HorizontalAlignment="Center" />
+            <TextBlock Text="Supports scroll, transition, swipe gesture and keyboard navigation."
+                       TextWrapping="Wrap" Opacity="0.7" TextAlignment="Center" MaxWidth="260" />
+          </StackPanel>
+        </ContentPage>
+        <ContentPage Header="Customize" Background="#FFE0B2">
+          <StackPanel Margin="24" Spacing="8"
+                      HorizontalAlignment="Center" VerticalAlignment="Center">
+            <TextBlock Text="Step 3 of 4" FontSize="14" Opacity="0.6"
+                       HorizontalAlignment="Center" />
+            <TextBlock Text="Customize" FontSize="28" FontWeight="Bold"
+                       HorizontalAlignment="Center" />
+            <TextBlock Text="Override the ItemsPanel, add any Avalonia Page as a child."
+                       TextWrapping="Wrap" Opacity="0.7" TextAlignment="Center" MaxWidth="260" />
+          </StackPanel>
+        </ContentPage>
+        <ContentPage Header="Ready" Background="#E1BEE7">
+          <StackPanel Margin="24" Spacing="8"
+                      HorizontalAlignment="Center" VerticalAlignment="Center">
+            <TextBlock Text="Step 4 of 4" FontSize="14" Opacity="0.6"
+                       HorizontalAlignment="Center" />
+            <TextBlock Text="Ready!" FontSize="28" FontWeight="Bold"
+                       HorizontalAlignment="Center" />
+            <TextBlock Text="You are all set. Use SelectionChanged to react to navigation."
+                       TextWrapping="Wrap" Opacity="0.7" TextAlignment="Center" MaxWidth="260" />
+          </StackPanel>
+        </ContentPage>
+      </CarouselPage>
+    </Border>
+  </DockPanel>
+</UserControl>
diff --git a/samples/ControlCatalog/Pages/CarouselPage/CarouselPageSelectionPage.xaml.cs b/samples/ControlCatalog/Pages/CarouselPage/CarouselPageSelectionPage.xaml.cs
new file mode 100644
index 0000000000..42ec706435
--- /dev/null
+++ b/samples/ControlCatalog/Pages/CarouselPage/CarouselPageSelectionPage.xaml.cs
@@ -0,0 +1,56 @@
+using System.Collections;
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+
+namespace ControlCatalog.Pages
+{
+    public partial class CarouselPageSelectionPage : UserControl
+    {
+        public CarouselPageSelectionPage()
+        {
+            InitializeComponent();
+            Loaded += (_, _) => UpdateStatus();
+        }
+
+        private void OnGoTo0(object? sender, RoutedEventArgs e) => DemoCarousel.SelectedIndex = 0;
+        private void OnGoTo1(object? sender, RoutedEventArgs e) => DemoCarousel.SelectedIndex = 1;
+        private void OnGoTo2(object? sender, RoutedEventArgs e) => DemoCarousel.SelectedIndex = 2;
+        private void OnGoTo3(object? sender, RoutedEventArgs e) => DemoCarousel.SelectedIndex = 3;
+
+        private void OnFirst(object? sender, RoutedEventArgs e) => DemoCarousel.SelectedIndex = 0;
+
+        private void OnPrevious(object? sender, RoutedEventArgs e)
+        {
+            if (DemoCarousel.SelectedIndex > 0)
+                DemoCarousel.SelectedIndex--;
+        }
+
+        private void OnNext(object? sender, RoutedEventArgs e)
+        {
+            var pageCount = (DemoCarousel.Pages as IList)?.Count ?? 0;
+            if (DemoCarousel.SelectedIndex < pageCount - 1)
+                DemoCarousel.SelectedIndex++;
+        }
+
+        private void OnLast(object? sender, RoutedEventArgs e)
+        {
+            var pageCount = (DemoCarousel.Pages as IList)?.Count ?? 0;
+            if (pageCount > 0)
+                DemoCarousel.SelectedIndex = pageCount - 1;
+        }
+
+        private void OnSelectionChanged(object? sender, PageSelectionChangedEventArgs e)
+        {
+            UpdateStatus();
+        }
+
+        private void UpdateStatus()
+        {
+            if (StatusText == null)
+                return;
+            var pageCount = (DemoCarousel.Pages as IList)?.Count ?? 0;
+            var header = (DemoCarousel.SelectedPage as ContentPage)?.Header?.ToString() ?? "—";
+            StatusText.Text = $"Page {DemoCarousel.SelectedIndex + 1} of {pageCount}: {header}";
+        }
+    }
+}
diff --git a/samples/ControlCatalog/Pages/CarouselPage/CarouselPageTransitionsPage.xaml b/samples/ControlCatalog/Pages/CarouselPage/CarouselPageTransitionsPage.xaml
new file mode 100644
index 0000000000..564519915d
--- /dev/null
+++ b/samples/ControlCatalog/Pages/CarouselPage/CarouselPageTransitionsPage.xaml
@@ -0,0 +1,65 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             x:Class="ControlCatalog.Pages.CarouselPageTransitionsPage">
+  <DockPanel>
+    <ScrollViewer DockPanel.Dock="Right" Width="220">
+      <StackPanel Margin="12" Spacing="8">
+        <TextBlock Text="Configuration" FontWeight="SemiBold" FontSize="16"
+                   Foreground="{DynamicResource SystemControlHighlightAccentBrush}" />
+
+        <TextBlock Text="Page Transition" FontWeight="SemiBold" FontSize="13" />
+        <ComboBox x:Name="TransitionCombo" SelectedIndex="0"
+                  SelectionChanged="OnTransitionChanged"
+                  HorizontalAlignment="Stretch">
+          <ComboBoxItem Content="None" />
+          <ComboBoxItem Content="CrossFade" />
+          <ComboBoxItem Content="Slide Horizontal" />
+          <ComboBoxItem Content="Slide Vertical" />
+          <ComboBoxItem Content="Card Stack" />
+          <ComboBoxItem Content="Wave Reveal" />
+        </ComboBox>
+
+        <Separator />
+
+        <TextBlock Text="Navigate" FontWeight="SemiBold" FontSize="13" />
+        <StackPanel Spacing="6">
+          <Button Content="Previous" Click="OnPrevious" HorizontalAlignment="Stretch" />
+          <Button Content="Next" Click="OnNext" HorizontalAlignment="Stretch" />
+        </StackPanel>
+
+        <Separator />
+
+        <TextBlock Text="Status" FontWeight="SemiBold" FontSize="13" />
+        <TextBlock x:Name="StatusText" Text="Page 1 of 4 | Transition: None"
+                   Opacity="0.7" TextWrapping="Wrap" />
+      </StackPanel>
+    </ScrollViewer>
+
+    <Border DockPanel.Dock="Right" Width="1"
+            Background="{DynamicResource SystemControlForegroundBaseMediumLowBrush}" />
+
+    <Border Margin="12"
+            BorderBrush="{DynamicResource SystemControlForegroundBaseMediumLowBrush}"
+            BorderThickness="1" CornerRadius="6" ClipToBounds="True">
+      <CarouselPage x:Name="DemoCarousel"
+                    SelectionChanged="OnSelectionChanged">
+        <ContentPage Header="Page 1" Background="#BBDEFB">
+          <TextBlock Text="Page 1" FontSize="32" FontWeight="Bold"
+                     HorizontalAlignment="Center" VerticalAlignment="Center" />
+        </ContentPage>
+        <ContentPage Header="Page 2" Background="#C8E6C9">
+          <TextBlock Text="Page 2" FontSize="32" FontWeight="Bold"
+                     HorizontalAlignment="Center" VerticalAlignment="Center" />
+        </ContentPage>
+        <ContentPage Header="Page 3" Background="#FFE0B2">
+          <TextBlock Text="Page 3" FontSize="32" FontWeight="Bold"
+                     HorizontalAlignment="Center" VerticalAlignment="Center" />
+        </ContentPage>
+        <ContentPage Header="Page 4" Background="#E1BEE7">
+          <TextBlock Text="Page 4" FontSize="32" FontWeight="Bold"
+                     HorizontalAlignment="Center" VerticalAlignment="Center" />
+        </ContentPage>
+      </CarouselPage>
+    </Border>
+  </DockPanel>
+</UserControl>
diff --git a/samples/ControlCatalog/Pages/CarouselPage/CarouselPageTransitionsPage.xaml.cs b/samples/ControlCatalog/Pages/CarouselPage/CarouselPageTransitionsPage.xaml.cs
new file mode 100644
index 0000000000..ee976cedbb
--- /dev/null
+++ b/samples/ControlCatalog/Pages/CarouselPage/CarouselPageTransitionsPage.xaml.cs
@@ -0,0 +1,69 @@
+using System;
+using System.Collections;
+using Avalonia.Animation;
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+using ControlCatalog.Pages.Transitions;
+
+namespace ControlCatalog.Pages
+{
+    public partial class CarouselPageTransitionsPage : UserControl
+    {
+        public CarouselPageTransitionsPage()
+        {
+            InitializeComponent();
+        }
+
+        private void OnTransitionChanged(object? sender, SelectionChangedEventArgs e)
+        {
+            if (DemoCarousel == null)
+                return;
+
+            DemoCarousel.PageTransition = TransitionCombo?.SelectedIndex switch
+            {
+                0 => null,
+                1 => new CrossFade(TimeSpan.FromMilliseconds(300)),
+                2 => new PageSlide(TimeSpan.FromMilliseconds(300), PageSlide.SlideAxis.Horizontal),
+                3 => new PageSlide(TimeSpan.FromMilliseconds(300), PageSlide.SlideAxis.Vertical),
+                4 => new CardStackPageTransition(TimeSpan.FromMilliseconds(400)),
+                5 => new WaveRevealPageTransition(TimeSpan.FromMilliseconds(600)),
+                _ => null
+            };
+
+            UpdateStatus();
+        }
+
+        private void OnPrevious(object? sender, RoutedEventArgs e)
+        {
+            if (DemoCarousel.SelectedIndex > 0)
+                DemoCarousel.SelectedIndex--;
+        }
+
+        private void OnNext(object? sender, RoutedEventArgs e)
+        {
+            var pageCount = (DemoCarousel.Pages as IList)?.Count ?? 0;
+            if (DemoCarousel.SelectedIndex < pageCount - 1)
+                DemoCarousel.SelectedIndex++;
+        }
+
+        private void OnSelectionChanged(object? sender, PageSelectionChangedEventArgs e)
+        {
+            UpdateStatus();
+        }
+
+        private void UpdateStatus()
+        {
+            if (StatusText == null)
+                return;
+            var pageCount = (DemoCarousel.Pages as IList)?.Count ?? 0;
+            var modeName = DemoCarousel.PageTransition switch
+            {
+                null => "None",
+                CardStackPageTransition => "Card Stack",
+                WaveRevealPageTransition => "Wave Reveal",
+                { } t => t.GetType().Name
+            };
+            StatusText.Text = $"Page {DemoCarousel.SelectedIndex + 1} of {pageCount} | Transition: {modeName}";
+        }
+    }
+}
diff --git a/samples/ControlCatalog/Pages/CarouselPage/CarouselTransitionsPage.xaml b/samples/ControlCatalog/Pages/CarouselPage/CarouselTransitionsPage.xaml
new file mode 100644
index 0000000000..b04ea78ed2
--- /dev/null
+++ b/samples/ControlCatalog/Pages/CarouselPage/CarouselTransitionsPage.xaml
@@ -0,0 +1,97 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             x:Class="ControlCatalog.Pages.CarouselTransitionsPage">
+  <DockPanel>
+    <ScrollViewer DockPanel.Dock="Right" Width="260">
+      <StackPanel Margin="12" Spacing="8">
+        <TextBlock Text="Configuration" FontWeight="SemiBold" FontSize="16"
+                   Foreground="{DynamicResource SystemControlHighlightAccentBrush}" />
+
+        <TextBlock Text="Navigation" FontWeight="SemiBold" FontSize="13" />
+
+        <Button x:Name="PreviousButton"
+                Content="Previous"
+                HorizontalAlignment="Stretch" />
+        <Button x:Name="NextButton"
+                Content="Next"
+                HorizontalAlignment="Stretch" />
+
+        <Separator />
+
+        <TextBlock Text="Transition" FontWeight="SemiBold" FontSize="13" />
+        <ComboBox x:Name="TransitionCombo"
+                  HorizontalAlignment="Stretch"
+                  SelectedIndex="1">
+          <ComboBoxItem>None</ComboBoxItem>
+          <ComboBoxItem>Page Slide</ComboBoxItem>
+          <ComboBoxItem>Cross Fade</ComboBoxItem>
+          <ComboBoxItem>Rotate 3D</ComboBoxItem>
+          <ComboBoxItem>Card Stack</ComboBoxItem>
+          <ComboBoxItem>Wave Reveal</ComboBoxItem>
+          <ComboBoxItem>Composite (Slide + Fade)</ComboBoxItem>
+        </ComboBox>
+
+        <TextBlock Text="Orientation" FontWeight="SemiBold" FontSize="13" />
+        <ComboBox x:Name="OrientationCombo"
+                  HorizontalAlignment="Stretch"
+                  SelectedIndex="0">
+          <ComboBoxItem>Horizontal</ComboBoxItem>
+          <ComboBoxItem>Vertical</ComboBoxItem>
+        </ComboBox>
+
+        <Separator />
+
+        <TextBlock Text="Status" FontWeight="SemiBold" FontSize="14" />
+        <TextBlock x:Name="StatusText"
+                   Text="Transition: Page Slide"
+                   Opacity="0.7"
+                   TextWrapping="Wrap" />
+      </StackPanel>
+    </ScrollViewer>
+
+    <Border DockPanel.Dock="Right" Width="1"
+            Background="{DynamicResource SystemControlForegroundBaseMediumLowBrush}" />
+
+    <Border Margin="12"
+            BorderBrush="{DynamicResource SystemControlForegroundBaseMediumLowBrush}"
+            BorderThickness="1"
+            CornerRadius="6"
+            ClipToBounds="True">
+      <Carousel x:Name="DemoCarousel" Height="300">
+        <Carousel.PageTransition>
+          <PageSlide Duration="0.25" Orientation="Horizontal" />
+        </Carousel.PageTransition>
+
+        <Border Margin="14,12" CornerRadius="12" ClipToBounds="True">
+          <Grid>
+            <Image Source="/Assets/delicate-arch-896885_640.jpg" Stretch="UniformToFill" />
+            <Border Background="#80000000" VerticalAlignment="Bottom" Padding="12">
+              <TextBlock Text="Item 1: Delicate Arch" Foreground="White"
+                         HorizontalAlignment="Center" FontWeight="SemiBold" />
+            </Border>
+          </Grid>
+        </Border>
+
+        <Border Margin="14,12" CornerRadius="12" ClipToBounds="True">
+          <Grid>
+            <Image Source="/Assets/hirsch-899118_640.jpg" Stretch="UniformToFill" />
+            <Border Background="#80000000" VerticalAlignment="Bottom" Padding="12">
+              <TextBlock Text="Item 2: Hirsch" Foreground="White"
+                         HorizontalAlignment="Center" FontWeight="SemiBold" />
+            </Border>
+          </Grid>
+        </Border>
+
+        <Border Margin="14,12" CornerRadius="12" ClipToBounds="True">
+          <Grid>
+            <Image Source="/Assets/maple-leaf-888807_640.jpg" Stretch="UniformToFill" />
+            <Border Background="#80000000" VerticalAlignment="Bottom" Padding="12">
+              <TextBlock Text="Item 3: Maple Leaf" Foreground="White"
+                         HorizontalAlignment="Center" FontWeight="SemiBold" />
+            </Border>
+          </Grid>
+        </Border>
+      </Carousel>
+    </Border>
+  </DockPanel>
+</UserControl>
diff --git a/samples/ControlCatalog/Pages/CarouselPage/CarouselTransitionsPage.xaml.cs b/samples/ControlCatalog/Pages/CarouselPage/CarouselTransitionsPage.xaml.cs
new file mode 100644
index 0000000000..2d69ecd4af
--- /dev/null
+++ b/samples/ControlCatalog/Pages/CarouselPage/CarouselTransitionsPage.xaml.cs
@@ -0,0 +1,66 @@
+using System;
+using Avalonia.Animation;
+using Avalonia.Controls;
+using ControlCatalog.Pages.Transitions;
+
+namespace ControlCatalog.Pages
+{
+    public partial class CarouselTransitionsPage : UserControl
+    {
+        public CarouselTransitionsPage()
+        {
+            InitializeComponent();
+            PreviousButton.Click += (_, _) => DemoCarousel.Previous();
+            NextButton.Click += (_, _) => DemoCarousel.Next();
+            TransitionCombo.SelectionChanged += (_, _) => ApplyTransition();
+            OrientationCombo.SelectionChanged += (_, _) => ApplyTransition();
+        }
+
+        private void ApplyTransition()
+        {
+            var axis = OrientationCombo.SelectedIndex == 0 ?
+                PageSlide.SlideAxis.Horizontal :
+                PageSlide.SlideAxis.Vertical;
+            var label = axis == PageSlide.SlideAxis.Horizontal ? "Horizontal" : "Vertical";
+
+            switch (TransitionCombo.SelectedIndex)
+            {
+                case 0:
+                    DemoCarousel.PageTransition = null;
+                    StatusText.Text = "Transition: None";
+                    break;
+                case 1:
+                    DemoCarousel.PageTransition = new PageSlide(TimeSpan.FromSeconds(0.25), axis);
+                    StatusText.Text = $"Transition: Page Slide ({label})";
+                    break;
+                case 2:
+                    DemoCarousel.PageTransition = new CrossFade(TimeSpan.FromSeconds(0.25));
+                    StatusText.Text = "Transition: Cross Fade";
+                    break;
+                case 3:
+                    DemoCarousel.PageTransition = new Rotate3DTransition(TimeSpan.FromSeconds(0.5), axis);
+                    StatusText.Text = $"Transition: Rotate 3D ({label})";
+                    break;
+                case 4:
+                    DemoCarousel.PageTransition = new CardStackPageTransition(TimeSpan.FromSeconds(0.5), axis);
+                    StatusText.Text = $"Transition: Card Stack ({label})";
+                    break;
+                case 5:
+                    DemoCarousel.PageTransition = new WaveRevealPageTransition(TimeSpan.FromSeconds(0.8), axis);
+                    StatusText.Text = $"Transition: Wave Reveal ({label})";
+                    break;
+                case 6:
+                    DemoCarousel.PageTransition = new CompositePageTransition
+                    {
+                        PageTransitions =
+                        {
+                            new PageSlide(TimeSpan.FromSeconds(0.25), axis),
+                            new CrossFade(TimeSpan.FromSeconds(0.25)),
+                        }
+                    };
+                    StatusText.Text = "Transition: Composite (Slide + Fade)";
+                    break;
+            }
+        }
+    }
+}
diff --git a/samples/ControlCatalog/Pages/CarouselPage/CarouselVerticalPage.xaml b/samples/ControlCatalog/Pages/CarouselPage/CarouselVerticalPage.xaml
new file mode 100644
index 0000000000..f916e4f526
--- /dev/null
+++ b/samples/ControlCatalog/Pages/CarouselPage/CarouselVerticalPage.xaml
@@ -0,0 +1,132 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             x:Class="ControlCatalog.Pages.CarouselVerticalPage">
+  <DockPanel>
+    <ScrollViewer DockPanel.Dock="Right" Width="260">
+      <StackPanel Margin="12" Spacing="8">
+        <TextBlock Text="Configuration" FontWeight="SemiBold" FontSize="16"
+                   Foreground="{DynamicResource SystemControlHighlightAccentBrush}" />
+
+        <TextBlock Text="Navigation" FontWeight="SemiBold" FontSize="13" />
+        <Button x:Name="PreviousButton" Content="Up" HorizontalAlignment="Stretch" />
+        <Button x:Name="NextButton" Content="Down" HorizontalAlignment="Stretch" />
+
+        <Separator />
+
+        <TextBlock Text="Transition" FontWeight="SemiBold" FontSize="13" />
+        <ComboBox x:Name="TransitionCombo"
+                  HorizontalAlignment="Stretch"
+                  SelectedIndex="0">
+          <ComboBoxItem>PageSlide</ComboBoxItem>
+          <ComboBoxItem>CrossFade</ComboBoxItem>
+          <ComboBoxItem>None</ComboBoxItem>
+        </ComboBox>
+
+        <Separator />
+
+        <TextBlock Text="Options" FontWeight="SemiBold" FontSize="13" />
+        <CheckBox x:Name="WrapCheck"
+                  Content="Wrap Selection"
+                  IsChecked="False"
+                  IsCheckedChanged="OnWrapSelectionChanged" />
+
+        <Separator />
+
+        <TextBlock Text="Status" FontWeight="SemiBold" FontSize="14" />
+        <TextBlock x:Name="StatusText"
+                   Text="Item: 1 / 4"
+                   Opacity="0.7"
+                   TextWrapping="Wrap" />
+        <TextBlock Text="Use Up/Down arrow keys or buttons to navigate."
+                   FontSize="11"
+                   Opacity="0.5"
+                   TextWrapping="Wrap" />
+      </StackPanel>
+    </ScrollViewer>
+
+    <Border DockPanel.Dock="Right" Width="1"
+            Background="{DynamicResource SystemControlForegroundBaseMediumLowBrush}" />
+
+    <Border Margin="12"
+            BorderBrush="{DynamicResource SystemControlForegroundBaseMediumLowBrush}"
+            BorderThickness="1"
+            CornerRadius="6"
+            ClipToBounds="True">
+      <Carousel x:Name="DemoCarousel"
+                Focusable="True"
+                IsSwipeEnabled="True">
+        <Carousel.PageTransition>
+          <PageSlide Duration="0.3" Orientation="Vertical" />
+        </Carousel.PageTransition>
+
+        <Border Margin="14,12" CornerRadius="12">
+          <Border.Background>
+            <LinearGradientBrush StartPoint="0%,0%" EndPoint="100%,100%">
+              <GradientStop Color="#1A1A2E" Offset="0" />
+              <GradientStop Color="#3525CD" Offset="1" />
+            </LinearGradientBrush>
+          </Border.Background>
+          <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center" Spacing="10">
+            <TextBlock Text="01" FontSize="64" FontWeight="Bold"
+                       Foreground="White" HorizontalAlignment="Center" LetterSpacing="-2" />
+            <TextBlock Text="Neon Pulse" FontSize="18" FontWeight="SemiBold"
+                       Foreground="#C3C0FF" HorizontalAlignment="Center" />
+            <TextBlock Text="Slide down to explore" FontSize="12"
+                       Foreground="#80FFFFFF" HorizontalAlignment="Center" />
+          </StackPanel>
+        </Border>
+
+        <Border Margin="14,12" CornerRadius="12">
+          <Border.Background>
+            <LinearGradientBrush StartPoint="0%,0%" EndPoint="100%,100%">
+              <GradientStop Color="#0C1A1F" Offset="0" />
+              <GradientStop Color="#0891B2" Offset="1" />
+            </LinearGradientBrush>
+          </Border.Background>
+          <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center" Spacing="10">
+            <TextBlock Text="02" FontSize="64" FontWeight="Bold"
+                       Foreground="White" HorizontalAlignment="Center" LetterSpacing="-2" />
+            <TextBlock Text="Ephemeral Blue" FontSize="18" FontWeight="SemiBold"
+                       Foreground="#BAF0FA" HorizontalAlignment="Center" />
+            <TextBlock Text="Vertical PageSlide in action" FontSize="12"
+                       Foreground="#80FFFFFF" HorizontalAlignment="Center" />
+          </StackPanel>
+        </Border>
+
+        <Border Margin="14,12" CornerRadius="12">
+          <Border.Background>
+            <LinearGradientBrush StartPoint="0%,0%" EndPoint="100%,100%">
+              <GradientStop Color="#0A1F18" Offset="0" />
+              <GradientStop Color="#059669" Offset="1" />
+            </LinearGradientBrush>
+          </Border.Background>
+          <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center" Spacing="10">
+            <TextBlock Text="03" FontSize="64" FontWeight="Bold"
+                       Foreground="White" HorizontalAlignment="Center" LetterSpacing="-2" />
+            <TextBlock Text="Forest Forms" FontSize="18" FontWeight="SemiBold"
+                       Foreground="#A7F3D0" HorizontalAlignment="Center" />
+            <TextBlock Text="Swipe up or down on touch screens" FontSize="12"
+                       Foreground="#80FFFFFF" HorizontalAlignment="Center" />
+          </StackPanel>
+        </Border>
+
+        <Border Margin="14,12" CornerRadius="12">
+          <Border.Background>
+            <LinearGradientBrush StartPoint="0%,0%" EndPoint="100%,100%">
+              <GradientStop Color="#1F1208" Offset="0" />
+              <GradientStop Color="#D97706" Offset="1" />
+            </LinearGradientBrush>
+          </Border.Background>
+          <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center" Spacing="10">
+            <TextBlock Text="04" FontSize="64" FontWeight="Bold"
+                       Foreground="White" HorizontalAlignment="Center" LetterSpacing="-2" />
+            <TextBlock Text="Golden Hour" FontSize="18" FontWeight="SemiBold"
+                       Foreground="#FDE68A" HorizontalAlignment="Center" />
+            <TextBlock Text="Switch transitions in the panel" FontSize="12"
+                       Foreground="#80FFFFFF" HorizontalAlignment="Center" />
+          </StackPanel>
+        </Border>
+      </Carousel>
+    </Border>
+  </DockPanel>
+</UserControl>
diff --git a/samples/ControlCatalog/Pages/CarouselPage/CarouselVerticalPage.xaml.cs b/samples/ControlCatalog/Pages/CarouselPage/CarouselVerticalPage.xaml.cs
new file mode 100644
index 0000000000..ac964047c0
--- /dev/null
+++ b/samples/ControlCatalog/Pages/CarouselPage/CarouselVerticalPage.xaml.cs
@@ -0,0 +1,39 @@
+using Avalonia.Animation;
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+
+namespace ControlCatalog.Pages
+{
+    public partial class CarouselVerticalPage : UserControl
+    {
+        public CarouselVerticalPage()
+        {
+            InitializeComponent();
+            PreviousButton.Click += (_, _) => DemoCarousel.Previous();
+            NextButton.Click += (_, _) => DemoCarousel.Next();
+            DemoCarousel.SelectionChanged += OnSelectionChanged;
+            TransitionCombo.SelectionChanged += OnTransitionChanged;
+            DemoCarousel.Loaded += (_, _) => DemoCarousel.Focus();
+        }
+
+        private void OnSelectionChanged(object? sender, SelectionChangedEventArgs e)
+        {
+            StatusText.Text = $"Item: {DemoCarousel.SelectedIndex + 1} / {DemoCarousel.ItemCount}";
+        }
+
+        private void OnTransitionChanged(object? sender, SelectionChangedEventArgs e)
+        {
+            DemoCarousel.PageTransition = TransitionCombo.SelectedIndex switch
+            {
+                1 => new CrossFade(System.TimeSpan.FromSeconds(0.3)),
+                2 => null,
+                _ => new PageSlide(System.TimeSpan.FromSeconds(0.3), PageSlide.SlideAxis.Vertical),
+            };
+        }
+
+        private void OnWrapSelectionChanged(object? sender, RoutedEventArgs e)
+        {
+            DemoCarousel.WrapSelection = WrapCheck.IsChecked == true;
+        }
+    }
+}
diff --git a/samples/ControlCatalog/Pages/CarouselPage/SanctuaryMainPage.xaml b/samples/ControlCatalog/Pages/CarouselPage/SanctuaryMainPage.xaml
new file mode 100644
index 0000000000..b701ab89ba
--- /dev/null
+++ b/samples/ControlCatalog/Pages/CarouselPage/SanctuaryMainPage.xaml
@@ -0,0 +1,298 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             x:Class="ControlCatalog.Pages.SanctuaryMainPage">
+  <UserControl.Styles>
+    <Style Selector="Button.primary /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Background" Value="#f47b25" />
+      <Setter Property="CornerRadius" Value="{TemplateBinding CornerRadius}" />
+    </Style>
+    <Style Selector="Button.primary:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Background" Value="#e0701f" />
+    </Style>
+    <Style Selector="Button.primary:pressed /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Background" Value="#c9611a" />
+    </Style>
+    <Style Selector="Button.glass /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Background" Value="#18FFFFFF" />
+      <Setter Property="CornerRadius" Value="{TemplateBinding CornerRadius}" />
+    </Style>
+    <Style Selector="Button.glass:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Background" Value="#2AFFFFFF" />
+    </Style>
+    <Style Selector="Button.glass:pressed /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Background" Value="#10FFFFFF" />
+    </Style>
+  </UserControl.Styles>
+
+  <DockPanel>
+
+    <ScrollViewer DockPanel.Dock="Right" Width="220">
+      <StackPanel Margin="12" Spacing="8">
+        <TextBlock Text="Sanctuary" FontSize="16" FontWeight="SemiBold"
+                   Foreground="{DynamicResource SystemControlHighlightAccentBrush}" />
+        <TextBlock TextWrapping="Wrap" FontSize="12" Opacity="0.7"
+                   Text="Main landing page with a full-screen hero card, Featured Escapes section, and a bottom TabbedPage navigation. Navigated to from the onboarding carousel." />
+        <Separator />
+        <TextBlock Text="Design" FontSize="13" FontWeight="SemiBold" />
+        <TextBlock FontSize="12" Text="Theme: Dark (#221710)" />
+        <TextBlock FontSize="12" Text="Primary: #f47b25 (warm orange)" />
+        <Separator />
+        <TextBlock Text="Tabs" FontSize="13" FontWeight="SemiBold" />
+        <TextBlock FontSize="12" TextWrapping="Wrap" Text="Home — hero + Featured Escapes cards" />
+        <TextBlock FontSize="12" TextWrapping="Wrap" Text="Explore — destination discovery" />
+        <TextBlock FontSize="12" TextWrapping="Wrap" Text="Saved — bookmarked destinations" />
+        <TextBlock FontSize="12" TextWrapping="Wrap" Text="Profile — account and settings" />
+        <Separator />
+        <TextBlock Text="Navigation" FontSize="13" FontWeight="SemiBold" />
+        <TextBlock FontSize="12" TextWrapping="Wrap" Text="Reached via 'Get Started' on the Urban Adventures carousel page. Back stack is cleared on arrival." />
+      </StackPanel>
+    </ScrollViewer>
+
+    <Border DockPanel.Dock="Right" Width="1"
+            Background="{DynamicResource SystemControlForegroundBaseMediumLowBrush}" />
+
+    <Grid RowDefinitions="Auto,*" Background="#221710">
+
+    <!-- Top Nav Bar -->
+    <Border Grid.Row="0" Background="#DD221710" Padding="16,10,16,10">
+      <Grid ColumnDefinitions="*,Auto">
+        <StackPanel Grid.Column="0" Orientation="Horizontal" Spacing="8" VerticalAlignment="Center">
+          <Panel Width="30" Height="30">
+            <Ellipse Fill="#f47b25" />
+            <TextBlock Text="▲" Foreground="White" FontSize="13" FontWeight="Bold"
+                       HorizontalAlignment="Center" VerticalAlignment="Center" />
+          </Panel>
+          <TextBlock Text="Sanctuary" FontSize="18" FontWeight="Bold"
+                     Foreground="White" VerticalAlignment="Center" />
+        </StackPanel>
+        <StackPanel Grid.Column="1" Orientation="Horizontal" Spacing="6" VerticalAlignment="Center">
+          <Border Width="48" Height="48" CornerRadius="24" Background="#18FFFFFF">
+            <TextBlock Text="⌕" FontSize="20" Foreground="#80FFFFFF"
+                       HorizontalAlignment="Center" VerticalAlignment="Center" />
+          </Border>
+          <Border Width="48" Height="48" CornerRadius="24" Background="#33f47b25">
+            <TextBlock Text="◉" FontSize="19" Foreground="#f47b25"
+                       HorizontalAlignment="Center" VerticalAlignment="Center" />
+          </Border>
+        </StackPanel>
+      </Grid>
+    </Border>
+
+    <!-- Tabbed content -->
+    <TabbedPage Grid.Row="1"
+                TabPlacement="Bottom"
+                SelectedIndex="0">
+      <TabbedPage.Resources>
+        <SolidColorBrush x:Key="TabbedPageTabStripBackground">#221710</SolidColorBrush>
+        <SolidColorBrush x:Key="TabbedPageTabItemHeaderForegroundSelected">#f47b25</SolidColorBrush>
+        <SolidColorBrush x:Key="TabbedPageTabItemHeaderForegroundUnselected">#50FFFFFF</SolidColorBrush>
+        <Thickness x:Key="TabbedPageTabItemHeaderPadding">8,10,8,4</Thickness>
+      </TabbedPage.Resources>
+
+      <!-- Home Tab -->
+      <ContentPage Header="Home"
+                   Background="#221710">
+        <ContentPage.Icon>
+          <StreamGeometry>M10 20v-6h4v6h5v-8h3L12 3 2 12h3v8z</StreamGeometry>
+        </ContentPage.Icon>
+        <ScrollViewer HorizontalScrollBarVisibility="Disabled"
+                      VerticalScrollBarVisibility="Hidden">
+          <StackPanel>
+
+            <!-- Hero Card -->
+            <Border Margin="12,12,12,8" CornerRadius="16" ClipToBounds="True" Height="380">
+              <Border.Background>
+                <ImageBrush Source="avares://ControlCatalog/Assets/Sanctuary/main_hero.jpg"
+                            Stretch="UniformToFill" />
+              </Border.Background>
+              <Grid>
+                <Border ClipToBounds="True" Margin="-1">
+                  <Border.Background>
+                    <LinearGradientBrush StartPoint="0,0" EndPoint="0,1">
+                      <GradientStop Offset="0" Color="Transparent" />
+                      <GradientStop Offset="0.45" Color="#55221710" />
+                      <GradientStop Offset="1" Color="#EE221710" />
+                    </LinearGradientBrush>
+                  </Border.Background>
+                </Border>
+                <StackPanel HorizontalAlignment="Center" VerticalAlignment="Bottom"
+                            Margin="28,0,28,32" Spacing="14">
+                  <StackPanel HorizontalAlignment="Center" Spacing="2">
+                    <TextBlock Text="Find Your" FontSize="40" FontWeight="ExtraBold"
+                               Foreground="White" TextAlignment="Center" />
+                    <TextBlock Text="Sanctuary" FontSize="40" FontWeight="ExtraBold"
+                               Foreground="#f47b25" TextAlignment="Center" />
+                  </StackPanel>
+                  <TextBlock Text="Embark on a curated journey through the world's most serene and breathtaking natural wonders. Escape the noise and rediscover peace."
+                             FontSize="13" Foreground="#CAffffff"
+                             TextAlignment="Center" TextWrapping="Wrap" MaxWidth="280" />
+                  <StackPanel Spacing="10" HorizontalAlignment="Center">
+                    <Button Classes="primary"
+                            Foreground="#221710" FontWeight="Bold" FontSize="14"
+                            CornerRadius="24" Padding="28,14"
+                            HorizontalAlignment="Stretch"
+                            HorizontalContentAlignment="Center">
+                      <TextBlock Text="Explore the Collection" Foreground="#221710" FontWeight="Bold" />
+                    </Button>
+                    <Button Classes="glass"
+                            Foreground="White" FontWeight="Bold" FontSize="14"
+                            CornerRadius="24" Padding="28,14"
+                            HorizontalAlignment="Stretch"
+                            HorizontalContentAlignment="Center">
+                      <StackPanel Orientation="Horizontal" Spacing="8" HorizontalAlignment="Center">
+                        <TextBlock Text="⊕" Foreground="White" VerticalAlignment="Center" />
+                        <TextBlock Text="View Map" Foreground="White" FontWeight="Bold" VerticalAlignment="Center" />
+                      </StackPanel>
+                    </Button>
+                  </StackPanel>
+                </StackPanel>
+              </Grid>
+            </Border>
+
+            <!-- Featured Escapes Header -->
+            <Grid Margin="16,8,16,12" ColumnDefinitions="*,Auto">
+              <StackPanel Grid.Column="0" Spacing="3">
+                <TextBlock Text="Featured Escapes" FontSize="20" FontWeight="Bold" Foreground="White" />
+                <TextBlock Text="Hand-picked destinations for your next retreat"
+                           FontSize="12" Foreground="#80FFFFFF" />
+              </StackPanel>
+              <TextBlock Grid.Column="1" Text="See All" FontSize="12" FontWeight="Bold"
+                         Foreground="#f47b25" VerticalAlignment="Bottom" />
+            </Grid>
+
+            <!-- Card 1: Deep Forest -->
+            <Border Margin="16,0,16,12" CornerRadius="16" ClipToBounds="True" Height="240">
+              <Border.Background>
+                <ImageBrush Source="avares://ControlCatalog/Assets/Sanctuary/main_deep_forest.jpg"
+                            Stretch="UniformToFill" />
+              </Border.Background>
+              <Grid>
+                <Border ClipToBounds="True" Margin="-1">
+                  <Border.Background>
+                    <LinearGradientBrush StartPoint="0,1" EndPoint="0,0">
+                      <GradientStop Offset="0" Color="#66000000" />
+                      <GradientStop Offset="0.5" Color="Transparent" />
+                    </LinearGradientBrush>
+                  </Border.Background>
+                </Border>
+                <StackPanel VerticalAlignment="Bottom" Margin="16,0,16,16" Spacing="4">
+                  <Border CornerRadius="12" Background="#33f47b25" Padding="8,4" HorizontalAlignment="Left">
+                    <TextBlock Text="FOREST" FontSize="10" FontWeight="Bold" Foreground="#f47b25" />
+                  </Border>
+                  <TextBlock Text="Deep Forest" FontSize="22" FontWeight="Bold" Foreground="White" />
+                  <TextBlock Text="Quiet trails in Oregon, USA" FontSize="12" Foreground="#CCffffff" />
+                </StackPanel>
+              </Grid>
+            </Border>
+
+            <!-- Card 2: Arctic Silence -->
+            <Border Margin="16,0,16,12" CornerRadius="16" ClipToBounds="True" Height="240">
+              <Border.Background>
+                <ImageBrush Source="avares://ControlCatalog/Assets/Sanctuary/main_arctic_silence.jpg"
+                            Stretch="UniformToFill" />
+              </Border.Background>
+              <Grid>
+                <Border ClipToBounds="True" Margin="-1">
+                  <Border.Background>
+                    <LinearGradientBrush StartPoint="0,1" EndPoint="0,0">
+                      <GradientStop Offset="0" Color="#66000000" />
+                      <GradientStop Offset="0.5" Color="Transparent" />
+                    </LinearGradientBrush>
+                  </Border.Background>
+                </Border>
+                <StackPanel VerticalAlignment="Bottom" Margin="16,0,16,16" Spacing="4">
+                  <Border CornerRadius="12" Background="#33f47b25" Padding="8,4" HorizontalAlignment="Left">
+                    <TextBlock Text="ALPINE" FontSize="10" FontWeight="Bold" Foreground="#f47b25" />
+                  </Border>
+                  <TextBlock Text="Arctic Silence" FontSize="22" FontWeight="Bold" Foreground="White" />
+                  <TextBlock Text="Remote retreats in Svalbard" FontSize="12" Foreground="#CCffffff" />
+                </StackPanel>
+              </Grid>
+            </Border>
+
+            <!-- Card 3: Desert Sands -->
+            <Border Margin="16,0,16,20" CornerRadius="16" ClipToBounds="True" Height="240">
+              <Border.Background>
+                <ImageBrush Source="avares://ControlCatalog/Assets/Sanctuary/main_desert_sands.jpg"
+                            Stretch="UniformToFill" />
+              </Border.Background>
+              <Grid>
+                <Border ClipToBounds="True" Margin="-1">
+                  <Border.Background>
+                    <LinearGradientBrush StartPoint="0,1" EndPoint="0,0">
+                      <GradientStop Offset="0" Color="#66000000" />
+                      <GradientStop Offset="0.5" Color="Transparent" />
+                    </LinearGradientBrush>
+                  </Border.Background>
+                </Border>
+                <StackPanel VerticalAlignment="Bottom" Margin="16,0,16,16" Spacing="4">
+                  <Border CornerRadius="12" Background="#33f47b25" Padding="8,4" HorizontalAlignment="Left">
+                    <TextBlock Text="DESERT" FontSize="10" FontWeight="Bold" Foreground="#f47b25" />
+                  </Border>
+                  <TextBlock Text="Desert Sands" FontSize="22" FontWeight="Bold" Foreground="White" />
+                  <TextBlock Text="Star gazing in Wadi Rum" FontSize="12" Foreground="#CCffffff" />
+                </StackPanel>
+              </Grid>
+            </Border>
+
+          </StackPanel>
+        </ScrollViewer>
+      </ContentPage>
+
+      <!-- Explore Tab -->
+      <ContentPage Header="Explore"
+                   Background="#221710">
+        <ContentPage.Icon>
+          <StreamGeometry>M12 10.9c-.61 0-1.1.49-1.1 1.1s.49 1.1 1.1 1.1c.61 0 1.1-.49 1.1-1.1s-.49-1.1-1.1-1.1zM12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm2.19 12.19L6 18l3.81-8.19L18 6l-3.81 8.19z</StreamGeometry>
+        </ContentPage.Icon>
+        <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center"
+                    Spacing="12" Margin="32">
+          <TextBlock Text="✦" FontSize="48" Foreground="#33FFFFFF" HorizontalAlignment="Center" />
+          <TextBlock Text="Explore" FontSize="20" FontWeight="Bold" Foreground="White"
+                     HorizontalAlignment="Center" />
+          <TextBlock Text="Discover new destinations around the world."
+                     FontSize="13" Foreground="#80FFFFFF"
+                     TextAlignment="Center" TextWrapping="Wrap" />
+        </StackPanel>
+      </ContentPage>
+
+      <!-- Saved Tab -->
+      <ContentPage Header="Saved"
+                   Background="#221710">
+        <ContentPage.Icon>
+          <StreamGeometry>M12 21.35l-1.45-1.32C5.4 15.36 2 12.28 2 8.5 2 5.42 4.42 3 7.5 3c1.74 0 3.41.81 4.5 2.09C13.09 3.81 14.76 3 16.5 3 19.58 3 22 5.42 22 8.5c0 3.78-3.4 6.86-8.55 11.54L12 21.35z</StreamGeometry>
+        </ContentPage.Icon>
+        <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center"
+                    Spacing="12" Margin="32">
+          <TextBlock Text="♡" FontSize="48" Foreground="#33FFFFFF" HorizontalAlignment="Center" />
+          <TextBlock Text="Saved" FontSize="20" FontWeight="Bold" Foreground="White"
+                     HorizontalAlignment="Center" />
+          <TextBlock Text="Your saved destinations will appear here."
+                     FontSize="13" Foreground="#80FFFFFF"
+                     TextAlignment="Center" TextWrapping="Wrap" />
+        </StackPanel>
+      </ContentPage>
+
+      <!-- Profile Tab -->
+      <ContentPage Header="Profile"
+                   Background="#221710">
+        <ContentPage.Icon>
+          <StreamGeometry>M12 12c2.21 0 4-1.79 4-4s-1.79-4-4-4-4 1.79-4 4 1.79 4 4 4zm0 2c-2.67 0-8 1.34-8 4v2h16v-2c0-2.66-5.33-4-8-4z</StreamGeometry>
+        </ContentPage.Icon>
+        <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center"
+                    Spacing="12" Margin="32">
+          <TextBlock Text="◉" FontSize="48" Foreground="#33FFFFFF" HorizontalAlignment="Center" />
+          <TextBlock Text="Profile" FontSize="20" FontWeight="Bold" Foreground="White"
+                     HorizontalAlignment="Center" />
+          <TextBlock Text="Your profile and settings will appear here."
+                     FontSize="13" Foreground="#80FFFFFF"
+                     TextAlignment="Center" TextWrapping="Wrap" />
+        </StackPanel>
+      </ContentPage>
+
+    </TabbedPage>
+
+    </Grid>
+
+  </DockPanel>
+</UserControl>
diff --git a/samples/ControlCatalog/Pages/CarouselPage/SanctuaryMainPage.xaml.cs b/samples/ControlCatalog/Pages/CarouselPage/SanctuaryMainPage.xaml.cs
new file mode 100644
index 0000000000..05a4097a46
--- /dev/null
+++ b/samples/ControlCatalog/Pages/CarouselPage/SanctuaryMainPage.xaml.cs
@@ -0,0 +1,11 @@
+using Avalonia.Controls;
+
+namespace ControlCatalog.Pages;
+
+public partial class SanctuaryMainPage : UserControl
+{
+    public SanctuaryMainPage()
+    {
+        InitializeComponent();
+    }
+}
diff --git a/samples/ControlCatalog/Pages/CarouselPage/SanctuaryShowcasePage.xaml b/samples/ControlCatalog/Pages/CarouselPage/SanctuaryShowcasePage.xaml
new file mode 100644
index 0000000000..50864e5e57
--- /dev/null
+++ b/samples/ControlCatalog/Pages/CarouselPage/SanctuaryShowcasePage.xaml
@@ -0,0 +1,335 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             x:Class="ControlCatalog.Pages.SanctuaryShowcasePage">
+  <UserControl.Styles>
+    <!-- Orange primary button -->
+    <Style Selector="Button.primary /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Background" Value="#f47b25" />
+      <Setter Property="CornerRadius" Value="{TemplateBinding CornerRadius}" />
+    </Style>
+    <Style Selector="Button.primary:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Background" Value="#e0701f" />
+    </Style>
+    <Style Selector="Button.primary:pressed /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Background" Value="#c9611a" />
+    </Style>
+
+    <!-- Glass button (semi-transparent white) -->
+    <Style Selector="Button.glass /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Background" Value="#18FFFFFF" />
+      <Setter Property="CornerRadius" Value="{TemplateBinding CornerRadius}" />
+    </Style>
+    <Style Selector="Button.glass:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Background" Value="#2AFFFFFF" />
+    </Style>
+    <Style Selector="Button.glass:pressed /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Background" Value="#10FFFFFF" />
+    </Style>
+
+  </UserControl.Styles>
+
+  <DockPanel>
+
+    <ScrollViewer DockPanel.Dock="Right" Width="220">
+      <StackPanel Margin="12" Spacing="8">
+        <TextBlock Text="Sanctuary" FontSize="16" FontWeight="SemiBold"
+                   Foreground="{DynamicResource SystemControlHighlightAccentBrush}" />
+        <TextBlock TextWrapping="Wrap" FontSize="12" Opacity="0.7"
+                   Text="A travel discovery app with 3 full-screen immersive pages. Uses PipsPager with custom pill-shaped indicators. Swipe, use arrow keys, tap the CTA buttons, or click the pip indicators to navigate." />
+        <Separator />
+        <TextBlock Text="Design" FontSize="13" FontWeight="SemiBold" />
+        <TextBlock FontSize="12" Text="Theme: Dark (#221710)" />
+        <TextBlock FontSize="12" Text="Primary: #f47b25 (warm orange)" />
+        <Separator />
+        <TextBlock Text="Pages" FontSize="13" FontWeight="SemiBold" />
+        <TextBlock FontSize="12" TextWrapping="Wrap" Text="1. Explore the Unknown — mountain backdrop" />
+        <TextBlock FontSize="12" TextWrapping="Wrap" Text="2. Hidden Sanctuaries — forest scene" />
+        <TextBlock FontSize="12" TextWrapping="Wrap" Text="3. Urban Adventures — neon city" />
+      </StackPanel>
+    </ScrollViewer>
+
+    <Border DockPanel.Dock="Right" Width="1"
+            Background="{DynamicResource SystemControlForegroundBaseMediumLowBrush}" />
+
+    <Border BorderBrush="{DynamicResource SystemControlForegroundBaseMediumLowBrush}"
+            BorderThickness="1" CornerRadius="8" ClipToBounds="True" Margin="12">
+      <Grid>
+      <CarouselPage x:Name="DemoCarousel" IsGestureEnabled="True">
+
+        <!-- Page 1: Explore the Unknown -->
+        <ContentPage HorizontalContentAlignment="Stretch"
+                     VerticalContentAlignment="Stretch">
+          <ContentPage.Background>
+            <ImageBrush Source="avares://ControlCatalog/Assets/Sanctuary/mountain_bg.jpg"
+                        Stretch="UniformToFill" />
+          </ContentPage.Background>
+          <Grid>
+            <Border>
+              <Border.Background>
+                <LinearGradientBrush StartPoint="0,0" EndPoint="0,1">
+                  <GradientStop Offset="0" Color="Transparent" />
+                  <GradientStop Offset="0.35" Color="#55221710" />
+                  <GradientStop Offset="1" Color="#EE221710" />
+                </LinearGradientBrush>
+              </Border.Background>
+            </Border>
+            <Grid RowDefinitions="*,Auto">
+              <StackPanel Grid.Row="1" Margin="28,0,28,44" Spacing="0"
+                          HorizontalAlignment="Center">
+
+                <TextBlock Text="Explore the Unknown"
+                           FontSize="36" FontWeight="Bold" Foreground="White"
+                           TextAlignment="Center" TextWrapping="Wrap"
+                           MaxWidth="300" Margin="0,0,0,14" />
+
+                <TextBlock Text="Embark on an unforgettable adventure through pristine wilderness and discover the hidden wonders of the world's most majestic peaks."
+                           FontSize="14" Foreground="#CAffffff"
+                           TextAlignment="Center" TextWrapping="Wrap"
+                           MaxWidth="300" Margin="0,0,0,24" />
+
+                <Button Classes="primary"
+                        Foreground="White" FontWeight="Bold" FontSize="16"
+                        CornerRadius="24" Padding="24,16"
+                        HorizontalAlignment="Stretch"
+                        HorizontalContentAlignment="Center"
+                        Click="OnPage1CTA" Margin="0,0,0,48">
+                  <StackPanel Orientation="Horizontal" Spacing="10" HorizontalAlignment="Center">
+                    <TextBlock Text="Start Journey" Foreground="White"
+                               FontWeight="Bold" VerticalAlignment="Center" />
+                    <TextBlock Text="→" Foreground="White" VerticalAlignment="Center" />
+                  </StackPanel>
+                </Button>
+
+              </StackPanel>
+            </Grid>
+          </Grid>
+        </ContentPage>
+
+        <!-- Page 2: Hidden Sanctuaries -->
+        <ContentPage HorizontalContentAlignment="Stretch"
+                     VerticalContentAlignment="Stretch">
+          <ContentPage.Background>
+            <ImageBrush Source="avares://ControlCatalog/Assets/Sanctuary/forest_bg.jpg"
+                        Stretch="UniformToFill" />
+          </ContentPage.Background>
+          <Grid>
+            <Border>
+              <Border.Background>
+                <LinearGradientBrush StartPoint="0,0" EndPoint="0,1">
+                  <GradientStop Offset="0" Color="#88221710" />
+                  <GradientStop Offset="0.3" Color="Transparent" />
+                  <GradientStop Offset="0.75" Color="#55221710" />
+                  <GradientStop Offset="1" Color="#CC221710" />
+                </LinearGradientBrush>
+              </Border.Background>
+            </Border>
+
+            <Grid RowDefinitions="Auto,*,Auto">
+
+              <!-- Logo bar -->
+              <StackPanel Grid.Row="0" Orientation="Horizontal" Spacing="8"
+                          Margin="20,22,20,0">
+                <Panel Width="28" Height="28">
+                  <Ellipse Fill="#f47b25" />
+                  <TextBlock Text="▲" Foreground="White" FontSize="12" FontWeight="Bold"
+                             HorizontalAlignment="Center" VerticalAlignment="Center" />
+                </Panel>
+                <TextBlock Text="SANCTUARY" Foreground="White" FontWeight="Bold"
+                           FontSize="15" VerticalAlignment="Center" />
+              </StackPanel>
+
+              <!-- Center content -->
+              <StackPanel Grid.Row="1" Margin="24,0,24,0" Spacing="18"
+                          HorizontalAlignment="Center" VerticalAlignment="Center">
+
+                <Border CornerRadius="20" BorderBrush="#50f47b25" BorderThickness="1"
+                        Background="#1Af47b25" HorizontalAlignment="Center" Padding="14,6">
+                  <StackPanel Orientation="Horizontal" Spacing="6">
+                    <TextBlock Text="◎" Foreground="#f47b25" FontSize="11" VerticalAlignment="Center" />
+                    <TextBlock Text="VOLUME II: SECLUSION" Foreground="#f47b25"
+                               FontSize="11" FontWeight="Bold" />
+                  </StackPanel>
+                </Border>
+
+                <StackPanel Spacing="0" HorizontalAlignment="Center">
+                  <TextBlock Text="Hidden" Foreground="White"
+                             FontSize="54" FontWeight="Bold" TextAlignment="Center" />
+                  <TextBlock Text="Sanctuaries" Foreground="White"
+                             FontSize="54" FontStyle="Italic" FontWeight="Light"
+                             TextAlignment="Center" />
+                </StackPanel>
+
+                <TextBlock Text="Find your peace in the world's most secluded natural wonders. From misty forest groves to still mountain lakes, discover the quiet beauty of nature's best-kept secrets."
+                           Foreground="#CCffffff" FontSize="14"
+                           TextAlignment="Center" TextWrapping="Wrap" MaxWidth="310" />
+
+                <StackPanel Spacing="10" HorizontalAlignment="Center">
+                  <Button Classes="primary"
+                          Foreground="#221710" FontWeight="Bold" FontSize="15"
+                          CornerRadius="24" Padding="32,16"
+                          HorizontalContentAlignment="Center" MinWidth="220"
+                          Click="OnPage2CTA">
+                    <StackPanel Orientation="Horizontal" Spacing="8">
+                      <TextBlock Text="Discover More" Foreground="#221710"
+                                 FontWeight="Bold" VerticalAlignment="Center" />
+                      <TextBlock Text="→" Foreground="#221710" VerticalAlignment="Center" />
+                    </StackPanel>
+                  </Button>
+                  <Button Classes="glass"
+                          Foreground="White" FontWeight="Bold" FontSize="15"
+                          CornerRadius="24" Padding="32,16"
+                          HorizontalContentAlignment="Center" MinWidth="220"
+                          Click="OnPage2CTA">
+                    <StackPanel Orientation="Horizontal" Spacing="8">
+                      <TextBlock Text="▷" Foreground="White" VerticalAlignment="Center" />
+                      <TextBlock Text="Experience" Foreground="White"
+                                 FontWeight="Bold" VerticalAlignment="Center" />
+                    </StackPanel>
+                  </Button>
+                </StackPanel>
+
+              </StackPanel>
+
+              <!-- Footer: location + social -->
+              <StackPanel Grid.Row="2" Spacing="14" Margin="0,0,0,44">
+
+                <Grid ColumnDefinitions="*,Auto" Margin="20,0,20,0">
+                  <StackPanel Grid.Column="0" Orientation="Horizontal" Spacing="5"
+                              VerticalAlignment="Center">
+                    <TextBlock Text="⊙" Foreground="#80FFFFFF" FontSize="11"
+                               VerticalAlignment="Center" />
+                    <TextBlock Text="NORDIC HIGHLANDS" Foreground="#80FFFFFF"
+                               FontSize="10" FontWeight="SemiBold" />
+                  </StackPanel>
+                  <StackPanel Grid.Column="1" Orientation="Horizontal" Spacing="14">
+                    <TextBlock Text="Instagram" Foreground="#80FFFFFF"
+                               FontSize="10" FontWeight="SemiBold" />
+                    <TextBlock Text="Pinterest" Foreground="#80FFFFFF"
+                               FontSize="10" FontWeight="SemiBold" />
+                  </StackPanel>
+                </Grid>
+
+              </StackPanel>
+            </Grid>
+          </Grid>
+        </ContentPage>
+
+        <!-- Page 3: Urban Adventures -->
+        <ContentPage HorizontalContentAlignment="Stretch"
+                     VerticalContentAlignment="Stretch">
+          <ContentPage.Background>
+            <ImageBrush Source="avares://ControlCatalog/Assets/Sanctuary/city_bg.jpg"
+                        Stretch="UniformToFill" />
+          </ContentPage.Background>
+          <Grid>
+            <Border>
+              <Border.Background>
+                <LinearGradientBrush StartPoint="0,0" EndPoint="0,1">
+                  <GradientStop Offset="0" Color="Transparent" />
+                  <GradientStop Offset="0.35" Color="#55221710" />
+                  <GradientStop Offset="0.6" Color="#99221710" />
+                  <GradientStop Offset="1" Color="#EE221710" />
+                </LinearGradientBrush>
+              </Border.Background>
+            </Border>
+
+            <Grid RowDefinitions="*,Auto">
+              <StackPanel Grid.Row="1" Margin="28,0,28,44" Spacing="0"
+                          HorizontalAlignment="Center">
+
+                <TextBlock Text="Urban Adventures"
+                           FontSize="44" FontWeight="Bold" Foreground="White"
+                           TextAlignment="Center" TextWrapping="Wrap"
+                           MaxWidth="320" Margin="0,0,0,14" />
+
+                <Border Height="5" Width="88" CornerRadius="3"
+                        Background="#f47b25" HorizontalAlignment="Center"
+                        Margin="0,0,0,18" />
+
+                <TextBlock Text="Experience the electric pulse of the city that never sleeps. Explore hidden gems and neon-lit wonders around every corner."
+                           FontSize="14" Foreground="#CAffffff"
+                           TextAlignment="Center" TextWrapping="Wrap"
+                           MaxWidth="300" Margin="0,0,0,24" />
+
+                <Button Classes="primary"
+                        Foreground="White" FontWeight="Bold" FontSize="16"
+                        CornerRadius="24" Padding="24,16"
+                        HorizontalAlignment="Stretch"
+                        HorizontalContentAlignment="Center"
+                        Click="OnPage3CTA" Margin="0,0,0,48">
+                  <TextBlock Text="Get Started" Foreground="White" FontWeight="Bold" />
+                </Button>
+
+              </StackPanel>
+            </Grid>
+          </Grid>
+        </ContentPage>
+
+      </CarouselPage>
+
+      <PipsPager HorizontalAlignment="Center"
+                 VerticalAlignment="Bottom" Margin="0,0,0,20"
+                 NumberOfPages="3"
+                 SelectedPageIndex="{Binding #DemoCarousel.SelectedIndex}"
+                 IsPreviousButtonVisible="False"
+                 IsNextButtonVisible="False">
+        <PipsPager.Styles>
+          <Style Selector="PipsPager /template/ ListBox ListBoxItem">
+            <Setter Property="Width" Value="38" />
+            <Setter Property="Height" Value="24" />
+            <Setter Property="Padding" Value="0" />
+            <Setter Property="Margin" Value="2,0" />
+            <Setter Property="MinWidth" Value="0" />
+            <Setter Property="MinHeight" Value="0" />
+            <Setter Property="ClipToBounds" Value="False" />
+            <Setter Property="VerticalAlignment" Value="Center" />
+            <Setter Property="Template">
+              <ControlTemplate>
+                <Grid Background="Transparent">
+                  <Border Name="Pip"
+                          Width="8" Height="8" CornerRadius="4"
+                          HorizontalAlignment="Center" VerticalAlignment="Center"
+                          Background="#4DFFFFFF">
+                    <Border.Transitions>
+                      <Transitions>
+                        <DoubleTransition Property="Width" Duration="0:0:0.25" Easing="CubicEaseOut" />
+                        <DoubleTransition Property="Height" Duration="0:0:0.25" Easing="CubicEaseOut" />
+                        <CornerRadiusTransition Property="CornerRadius" Duration="0:0:0.25" Easing="CubicEaseOut" />
+                        <BrushTransition Property="Background" Duration="0:0:0.25" />
+                      </Transitions>
+                    </Border.Transitions>
+                  </Border>
+                </Grid>
+              </ControlTemplate>
+            </Setter>
+          </Style>
+          <Style Selector="PipsPager /template/ ListBox ListBoxItem:pointerover /template/ Border#Pip">
+            <Setter Property="Width" Value="10" />
+            <Setter Property="Height" Value="10" />
+            <Setter Property="CornerRadius" Value="5" />
+            <Setter Property="Background" Value="#80FFFFFF" />
+          </Style>
+          <Style Selector="PipsPager /template/ ListBox ListBoxItem:selected /template/ Border#Pip">
+            <Setter Property="Width" Value="32" />
+            <Setter Property="Height" Value="8" />
+            <Setter Property="CornerRadius" Value="4" />
+            <Setter Property="Background" Value="#f47b25" />
+          </Style>
+          <Style Selector="PipsPager /template/ ListBox ListBoxItem:selected:pointerover /template/ Border#Pip">
+            <Setter Property="Width" Value="32" />
+            <Setter Property="Height" Value="8" />
+            <Setter Property="CornerRadius" Value="4" />
+            <Setter Property="Background" Value="#e0701f" />
+          </Style>
+          <Style Selector="PipsPager /template/ ListBox ListBoxItem:pressed /template/ Border#Pip">
+            <Setter Property="Width" Value="8" />
+            <Setter Property="Height" Value="8" />
+            <Setter Property="Background" Value="#f47b25" />
+          </Style>
+        </PipsPager.Styles>
+      </PipsPager>
+
+      </Grid>
+    </Border>
+  </DockPanel>
+</UserControl>
diff --git a/samples/ControlCatalog/Pages/CarouselPage/SanctuaryShowcasePage.xaml.cs b/samples/ControlCatalog/Pages/CarouselPage/SanctuaryShowcasePage.xaml.cs
new file mode 100644
index 0000000000..be91370691
--- /dev/null
+++ b/samples/ControlCatalog/Pages/CarouselPage/SanctuaryShowcasePage.xaml.cs
@@ -0,0 +1,70 @@
+using System.Linq;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+using Avalonia.Layout;
+using Avalonia.Media;
+using Avalonia.VisualTree;
+
+namespace ControlCatalog.Pages;
+
+public partial class SanctuaryShowcasePage : UserControl
+{
+    public SanctuaryShowcasePage()
+    {
+        InitializeComponent();
+    }
+
+    private void OnPage1CTA(object? sender, RoutedEventArgs e)
+    {
+        DemoCarousel.SelectedIndex = 1;
+    }
+
+    private void OnPage2CTA(object? sender, RoutedEventArgs e)
+    {
+        DemoCarousel.SelectedIndex = 2;
+    }
+
+    private async void OnPage3CTA(object? sender, RoutedEventArgs e)
+    {
+        var nav = this.FindAncestorOfType<NavigationPage>();
+        if (nav == null)
+            return;
+
+        var carouselWrapper = nav.NavigationStack.LastOrDefault();
+
+        var headerGrid = new Grid { ColumnDefinitions = new ColumnDefinitions("*, Auto") };
+        headerGrid.Children.Add(new TextBlock
+        {
+            Text = "Sanctuary",
+            VerticalAlignment = VerticalAlignment.Center
+        });
+        var closeIcon = Geometry.Parse(
+            "M4.397 4.397a1 1 0 0 1 1.414 0L12 10.585l6.19-6.188a1 1 0 0 1 1.414 1.414L13.413 12l6.19 6.189a1 1 0 0 1-1.414 1.414L12 13.413l-6.189 6.19a1 1 0 0 1-1.414-1.414L10.585 12 4.397 5.811a1 1 0 0 1 0-1.414z");
+        var closeBtn = new Button
+        {
+            Content = new PathIcon { Data = closeIcon },
+            Background = Brushes.Transparent,
+            BorderThickness = new Thickness(0),
+            Padding = new Thickness(8, 4),
+            VerticalAlignment = VerticalAlignment.Center
+        };
+        Grid.SetColumn(closeBtn, 1);
+        headerGrid.Children.Add(closeBtn);
+        closeBtn.Click += async (_, _) => await nav.PopAsync(null);
+
+        var mainPage = new ContentPage
+        {
+            Header = headerGrid,
+            Content = new SanctuaryMainPage()
+        };
+        NavigationPage.SetHasBackButton(mainPage, false);
+
+        await nav.PushAsync(mainPage);
+
+        if (carouselWrapper != null)
+        {
+            nav.RemovePage(carouselWrapper);
+        }
+    }
+}
diff --git a/samples/ControlCatalog/Pages/CommandBar/CommandBarEventsPage.xaml b/samples/ControlCatalog/Pages/CommandBar/CommandBarEventsPage.xaml
new file mode 100644
index 0000000000..8dbc44e19b
--- /dev/null
+++ b/samples/ControlCatalog/Pages/CommandBar/CommandBarEventsPage.xaml
@@ -0,0 +1,95 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             x:Class="ControlCatalog.Pages.CommandBarEventsPage">
+  <UserControl.Resources>
+    <StreamGeometry x:Key="AddIcon">M19,13H13V19H11V13H5V11H11V5H13V11H19V13Z</StreamGeometry>
+    <StreamGeometry x:Key="SaveIcon">M15,9H5V5H15M12,19A3,3 0 0,1 9,16A3,3 0 0,1 12,13A3,3 0 0,1 15,16A3,3 0 0,1 12,19M17,3H5C3.89,3 3,3.9 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V7L17,3Z</StreamGeometry>
+    <StreamGeometry x:Key="ShareIcon">M18,16.08C17.24,16.08 16.56,16.38 16.04,16.85L8.91,12.7C8.96,12.47 9,12.24 9,12C9,11.76 8.96,11.53 8.91,11.3L15.96,7.19C16.5,7.69 17.21,8 18,8A3,3 0 0,0 21,5A3,3 0 0,0 18,2A3,3 0 0,0 15,5C15,5.24 15.04,5.47 15.09,5.7L8.04,9.81C7.5,9.31 6.79,9 6,9A3,3 0 0,0 3,12A3,3 0 0,0 6,15C6.79,15 7.5,14.69 8.04,14.19L15.16,18.34C15.11,18.55 15.08,18.77 15.08,19C15.08,20.61 16.39,21.91 18,21.91C19.61,21.91 20.92,20.61 20.92,19C20.92,17.39 19.61,16.08 18,16.08Z</StreamGeometry>
+    <StreamGeometry x:Key="ExportIcon">M14,2H6A2,2 0 0,0 4,4V20A2,2 0 0,0 6,22H18A2,2 0 0,0 20,20V8L14,2M18,20H6V4H13V9H18V20M16,11V18.1L13.9,16L11.1,18.8L8.3,16L11.1,13.2L9,11.1L16,11Z</StreamGeometry>
+    <StreamGeometry x:Key="DeleteIcon">M19,4H15.5L14.5,3H9.5L8.5,4H5V6H19M6,19A2,2 0 0,0 8,21H16A2,2 0 0,0 18,19V7H6V19Z</StreamGeometry>
+  </UserControl.Resources>
+
+  <DockPanel>
+    <ScrollViewer DockPanel.Dock="Right" Width="280">
+      <StackPanel Margin="12" Spacing="8">
+        <TextBlock Text="Actions" FontWeight="SemiBold" FontSize="16"
+                   Foreground="{DynamicResource SystemControlHighlightAccentBrush}" />
+
+        <CheckBox x:Name="IsOpenCheck"
+                  Content="IsOpen"
+                  IsCheckedChanged="OnIsOpenChanged" />
+
+        <Button Content="+ Add Primary"
+                HorizontalAlignment="Stretch"
+                Click="OnAddPrimary" />
+
+        <Button Content="- Remove Primary"
+                HorizontalAlignment="Stretch"
+                Click="OnRemovePrimary" />
+
+        <Button Content="+ Add Secondary"
+                HorizontalAlignment="Stretch"
+                Click="OnAddSecondary" />
+
+        <Button Content="- Remove Secondary"
+                HorizontalAlignment="Stretch"
+                Click="OnRemoveSecondary" />
+
+        <Button Content="Clear Log"
+                HorizontalAlignment="Stretch"
+                Click="OnClearLog" />
+
+        <Separator />
+
+        <TextBlock Text="State" FontWeight="SemiBold" />
+        <TextBlock x:Name="StateText"
+                   FontSize="12"
+                   Opacity="0.7"
+                   TextWrapping="Wrap" />
+
+        <Separator />
+
+        <TextBlock Text="About" FontWeight="SemiBold" />
+        <TextBlock FontSize="12" Opacity="0.7" TextWrapping="Wrap"
+                   Text="Opening/Opened fire when the overflow opens. Closing/Closed fire when it closes. The log also records item clicks and command execution while the state panel reflects IsOpen, HasSecondaryCommands, and IsOverflowButtonVisible in real time." />
+      </StackPanel>
+    </ScrollViewer>
+
+    <Border DockPanel.Dock="Right" Width="1" Background="{DynamicResource SystemControlForegroundBaseMediumLowBrush}" />
+
+    <ScrollViewer>
+      <StackPanel Spacing="12" Margin="12,12,12,0">
+        <TextBlock Classes="h2">Observe CommandBar overflow events, item invocation, and state changes while opening, closing, and editing the primary and secondary command sets.</TextBlock>
+
+        <CommandBar x:Name="DemoBar"
+                    OverflowButtonVisibility="Auto">
+          <CommandBar.PrimaryCommands>
+            <AppBarButton Label="New"><AppBarButton.Icon><PathIcon Data="{StaticResource AddIcon}" /></AppBarButton.Icon></AppBarButton>
+            <AppBarButton Label="Save"><AppBarButton.Icon><PathIcon Data="{StaticResource SaveIcon}" /></AppBarButton.Icon></AppBarButton>
+            <AppBarButton Label="Share"><AppBarButton.Icon><PathIcon Data="{StaticResource ShareIcon}" /></AppBarButton.Icon></AppBarButton>
+          </CommandBar.PrimaryCommands>
+          <CommandBar.SecondaryCommands>
+            <AppBarButton Label="Export"><AppBarButton.Icon><PathIcon Data="{StaticResource ExportIcon}" /></AppBarButton.Icon></AppBarButton>
+            <AppBarButton Label="Delete"><AppBarButton.Icon><PathIcon Data="{StaticResource DeleteIcon}" /></AppBarButton.Icon></AppBarButton>
+          </CommandBar.SecondaryCommands>
+        </CommandBar>
+
+        <Border BorderBrush="{DynamicResource SystemControlForegroundBaseMediumLowBrush}"
+                BorderThickness="1"
+                CornerRadius="6"
+                Padding="10">
+          <StackPanel Spacing="6">
+            <TextBlock Text="Event Log" FontWeight="SemiBold" />
+            <TextBlock x:Name="EventLogText"
+                       FontFamily="Consolas, Menlo, monospace"
+                       FontSize="12"
+                       TextWrapping="Wrap"
+                       MinHeight="140"
+                       Opacity="0.8"
+                       Text="Ready" />
+          </StackPanel>
+        </Border>
+      </StackPanel>
+    </ScrollViewer>
+  </DockPanel>
+</UserControl>
diff --git a/samples/ControlCatalog/Pages/CommandBar/CommandBarEventsPage.xaml.cs b/samples/ControlCatalog/Pages/CommandBar/CommandBarEventsPage.xaml.cs
new file mode 100644
index 0000000000..c2f0b439f0
--- /dev/null
+++ b/samples/ControlCatalog/Pages/CommandBar/CommandBarEventsPage.xaml.cs
@@ -0,0 +1,220 @@
+using System.Collections.Generic;
+using System.Linq;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+using Avalonia.Media;
+using MiniMvvm;
+
+namespace ControlCatalog.Pages
+{
+    public partial class CommandBarEventsPage : UserControl
+    {
+        private readonly List<string> _log = new();
+        private int _primaryCount = 3;
+        private int _secondaryCount = 2;
+
+        public CommandBarEventsPage()
+        {
+            InitializeComponent();
+            Loaded += OnLoaded;
+            Unloaded += OnUnloaded;
+        }
+
+        private void OnLoaded(object? sender, RoutedEventArgs e)
+        {
+            DemoBar.Opening += OnOpening;
+            DemoBar.Opened += OnOpened;
+            DemoBar.Closing += OnClosing;
+            DemoBar.Closed += OnClosed;
+            DemoBar.PropertyChanged += OnBarPropertyChanged;
+
+            AttachItemHandlers(DemoBar.PrimaryCommands);
+            AttachItemHandlers(DemoBar.SecondaryCommands);
+
+            AppendLog("Ready");
+            RefreshState();
+        }
+
+        private void OnUnloaded(object? sender, RoutedEventArgs e)
+        {
+            DemoBar.Opening -= OnOpening;
+            DemoBar.Opened -= OnOpened;
+            DemoBar.Closing -= OnClosing;
+            DemoBar.Closed -= OnClosed;
+            DemoBar.PropertyChanged -= OnBarPropertyChanged;
+
+            DetachItemHandlers(DemoBar.PrimaryCommands);
+            DetachItemHandlers(DemoBar.SecondaryCommands);
+        }
+
+        private void OnIsOpenChanged(object? sender, RoutedEventArgs e)
+        {
+            DemoBar.IsOpen = IsOpenCheck.IsChecked == true;
+            RefreshState();
+        }
+
+        private void OnAddPrimary(object? sender, RoutedEventArgs e)
+        {
+            _primaryCount++;
+
+            var button = CreateButton($"Primary {_primaryCount}");
+            DemoBar.PrimaryCommands.Add(button);
+
+            AppendLog($"Primary +, {DemoBar.PrimaryCommands.Count}");
+            RefreshState();
+        }
+
+        private void OnRemovePrimary(object? sender, RoutedEventArgs e)
+        {
+            RemoveLastCommand(DemoBar.PrimaryCommands, "Primary");
+        }
+
+        private void OnAddSecondary(object? sender, RoutedEventArgs e)
+        {
+            _secondaryCount++;
+
+            var button = CreateButton($"Secondary {_secondaryCount}");
+            DemoBar.SecondaryCommands.Add(button);
+
+            AppendLog($"Secondary +, {DemoBar.SecondaryCommands.Count}");
+            RefreshState();
+        }
+
+        private void OnRemoveSecondary(object? sender, RoutedEventArgs e)
+        {
+            RemoveLastCommand(DemoBar.SecondaryCommands, "Secondary");
+        }
+
+        private void OnClearLog(object? sender, RoutedEventArgs e)
+        {
+            _log.Clear();
+            EventLogText.Text = "Log cleared";
+        }
+
+        private void OnOpening(object? sender, RoutedEventArgs e)
+        {
+            AppendLog("Opening");
+            RefreshState();
+        }
+
+        private void OnOpened(object? sender, RoutedEventArgs e)
+        {
+            AppendLog("Opened");
+            RefreshState();
+        }
+
+        private void OnClosing(object? sender, RoutedEventArgs e)
+        {
+            AppendLog("Closing");
+            RefreshState();
+        }
+
+        private void OnClosed(object? sender, RoutedEventArgs e)
+        {
+            AppendLog("Closed");
+            RefreshState();
+        }
+
+        private void OnBarPropertyChanged(object? sender, AvaloniaPropertyChangedEventArgs e)
+        {
+            if (e.Property == CommandBar.IsOpenProperty
+                || e.Property == CommandBar.HasSecondaryCommandsProperty
+                || e.Property == CommandBar.IsOverflowButtonVisibleProperty)
+            {
+                RefreshState();
+            }
+        }
+
+        private void RefreshState()
+        {
+            StateText.Text =
+                $"IsOpen: {DemoBar.IsOpen}\n" +
+                $"HasSecondaryCommands: {DemoBar.HasSecondaryCommands}\n" +
+                $"IsOverflowButtonVisible: {DemoBar.IsOverflowButtonVisible}\n" +
+                $"Primary: {DemoBar.PrimaryCommands.Count}\n" +
+                $"Secondary: {DemoBar.SecondaryCommands.Count}\n" +
+                $"OverflowItems: {DemoBar.OverflowItems.Count}";
+
+            IsOpenCheck.IsChecked = DemoBar.IsOpen;
+        }
+
+        private void OnCommandItemClick(object? sender, RoutedEventArgs e)
+        {
+            if (sender is AppBarButton button)
+                AppendLog($"Click, {button.Label}, {DescribePlacement(button)}");
+        }
+
+        private AppBarButton CreateButton(string label)
+        {
+            var button = new AppBarButton
+            {
+                Label = label,
+                Icon = new PathIcon
+                {
+                    Data = StreamGeometry.Parse("M19,13H13V19H11V13H5V11H11V5H13V11H19V13Z")
+                }
+            };
+
+            AttachItemHandler(button);
+            return button;
+        }
+
+        private void AttachItemHandlers(IEnumerable<ICommandBarElement> items)
+        {
+            foreach (var item in items)
+                AttachItemHandler(item);
+        }
+
+        private void DetachItemHandlers(IEnumerable<ICommandBarElement> items)
+        {
+            foreach (var item in items)
+            {
+                if (item is AppBarButton button)
+                    button.Click -= OnCommandItemClick;
+            }
+        }
+
+        private void AttachItemHandler(ICommandBarElement item)
+        {
+            if (item is not AppBarButton button)
+                return;
+
+            button.Click -= OnCommandItemClick;
+            button.Click += OnCommandItemClick;
+            button.Command = MiniCommand.Create(() => AppendLog($"Command, {button.Label}, {DescribePlacement(button)}"));
+        }
+
+        private void RemoveLastCommand(IList<ICommandBarElement> items, string bucketName)
+        {
+            if (items.Count == 0)
+                return;
+
+            var item = items[^1];
+            var label = item is AppBarButton button ? button.Label ?? "(unnamed)" : item.GetType().Name;
+
+            if (item is AppBarButton appBarButton)
+                appBarButton.Click -= OnCommandItemClick;
+
+            items.RemoveAt(items.Count - 1);
+
+            AppendLog($"{bucketName} -, {label}, {items.Count}");
+            RefreshState();
+        }
+
+        private static string DescribePlacement(AppBarButton button)
+        {
+            return button.IsInOverflow ? "overflow" : "primary";
+        }
+
+        private void AppendLog(string message)
+        {
+            _log.Add(message);
+
+            if (_log.Count > 12)
+                _log.RemoveAt(0);
+
+            EventLogText.Text = string.Join("\n", _log.Select((entry, index) => $"{index + 1,2}. {entry}"));
+        }
+    }
+}
diff --git a/samples/ControlCatalog/Pages/CommandBarPage.xaml.cs b/samples/ControlCatalog/Pages/CommandBarPage.xaml.cs
index b1e353dd38..7aaf6d22be 100644
--- a/samples/ControlCatalog/Pages/CommandBarPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/CommandBarPage.xaml.cs
@@ -22,6 +22,7 @@ namespace ControlCatalog.Pages
             // Features
             ("Features", "Overflow Menu",    "Secondary commands appear in an overflow popup. Configure visibility and sticky behavior.", () => new CommandBarOverflowPage()),
             ("Features", "Dynamic Overflow", "IsDynamicOverflowEnabled moves primary commands to overflow as space shrinks.",             () => new CommandBarDynamicOverflowPage()),
+            ("Features", "Events & State",  "Observe Opening, Opened, Closing, and Closed while tracking IsOpen, HasSecondaryCommands, and IsOverflowButtonVisible.", () => new CommandBarEventsPage()),
         };
 
         public CommandBarPage()
diff --git a/samples/ControlCatalog/Pages/ContentPage/ContentPageCommandBarPage.xaml b/samples/ControlCatalog/Pages/ContentPage/ContentPageCommandBarPage.xaml
index b5fed22feb..0a753d25ae 100644
--- a/samples/ControlCatalog/Pages/ContentPage/ContentPageCommandBarPage.xaml
+++ b/samples/ControlCatalog/Pages/ContentPage/ContentPageCommandBarPage.xaml
@@ -34,12 +34,32 @@
         <Separator />
 
         <TextBlock Text="About" FontWeight="SemiBold" />
-        <TextBlock Text="• NavigationPage.SetTopCommandBar(page, bar): places a CommandBar inside the navigation bar area at the top."
-                   FontSize="12" Opacity="0.7" TextWrapping="Wrap" />
-        <TextBlock Text="• NavigationPage.SetBottomCommandBar(page, bar): places a CommandBar below the page content at the bottom."
-                   FontSize="12" Opacity="0.7" TextWrapping="Wrap" />
-        <TextBlock Text="• Each ContentPage has its own CommandBar. It is replaced when navigating between pages."
-                   FontSize="12" Opacity="0.7" TextWrapping="Wrap" />
+        <StackPanel Spacing="6">
+          <Grid ColumnDefinitions="Auto,*">
+            <TextBlock Text="•" FontSize="12" Opacity="0.7" Margin="0,0,6,0" />
+            <TextBlock Grid.Column="1"
+                       Text="NavigationPage.SetTopCommandBar(page, bar): places a CommandBar inside the navigation bar area at the top."
+                       FontSize="12"
+                       Opacity="0.7"
+                       TextWrapping="Wrap" />
+          </Grid>
+          <Grid ColumnDefinitions="Auto,*">
+            <TextBlock Text="•" FontSize="12" Opacity="0.7" Margin="0,0,6,0" />
+            <TextBlock Grid.Column="1"
+                       Text="NavigationPage.SetBottomCommandBar(page, bar): places a CommandBar below the page content at the bottom."
+                       FontSize="12"
+                       Opacity="0.7"
+                       TextWrapping="Wrap" />
+          </Grid>
+          <Grid ColumnDefinitions="Auto,*">
+            <TextBlock Text="•" FontSize="12" Opacity="0.7" Margin="0,0,6,0" />
+            <TextBlock Grid.Column="1"
+                       Text="Each ContentPage has its own CommandBar. It is replaced when navigating between pages."
+                       FontSize="12"
+                       Opacity="0.7"
+                       TextWrapping="Wrap" />
+          </Grid>
+        </StackPanel>
       </StackPanel>
     </ScrollViewer>
 
diff --git a/samples/ControlCatalog/Pages/DrawerDemoPage.xaml.cs b/samples/ControlCatalog/Pages/DrawerDemoPage.xaml.cs
index d0c484cd2b..cd8aa9cd5b 100644
--- a/samples/ControlCatalog/Pages/DrawerDemoPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/DrawerDemoPage.xaml.cs
@@ -19,6 +19,9 @@ namespace ControlCatalog.Pages
             ("Features", "Compact Rail",
                 "CompactOverlay and CompactInline layout modes: a narrow icon rail is always visible and expands on open. Adjust rail width and open pane width.",
                 () => new DrawerPageCompactPage()),
+            ("Features", "Breakpoint",
+                "DrawerBreakpointLength: below the threshold the drawer switches to Overlay mode automatically. Resize the window or adjust the slider to see the layout switch in real time.",
+                () => new DrawerPageBreakpointPage()),
             ("Features", "Events",
                 "Opened, Closing, and Closed drawer events plus NavigatedTo and NavigatedFrom page lifecycle events. Enable 'Cancel next close' to prevent the drawer from closing.",
                 () => new DrawerPageEventsPage()),
diff --git a/samples/ControlCatalog/Pages/DrawerPage/DrawerPageBreakpointPage.xaml b/samples/ControlCatalog/Pages/DrawerPage/DrawerPageBreakpointPage.xaml
new file mode 100644
index 0000000000..0d1ccede79
--- /dev/null
+++ b/samples/ControlCatalog/Pages/DrawerPage/DrawerPageBreakpointPage.xaml
@@ -0,0 +1,113 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             x:Class="ControlCatalog.Pages.DrawerPageBreakpointPage">
+  <DockPanel>
+    <ScrollViewer DockPanel.Dock="Right" Width="240">
+      <StackPanel Margin="12" Spacing="8">
+        <TextBlock Text="Configuration" FontWeight="SemiBold" FontSize="16"
+                   Foreground="{DynamicResource SystemControlHighlightAccentBrush}" />
+
+        <TextBlock Text="DrawerBreakpointLength" FontSize="13" FontWeight="SemiBold" />
+        <TextBlock TextWrapping="Wrap" FontSize="12" Opacity="0.7"
+                   Text="When set, the drawer automatically switches layout based on the available size (width for Left/Right, height for Top/Bottom)." />
+
+        <Border Background="{DynamicResource SystemControlBackgroundBaseLowBrush}"
+                CornerRadius="4" Padding="8">
+          <StackPanel Spacing="4">
+            <Grid ColumnDefinitions="18,*">
+              <PathIcon Grid.Column="0" Width="12" Height="12" Opacity="0.7" VerticalAlignment="Top" Margin="0,1,0,0"
+                        Data="M19,11H7.83L12.42,6.41L11,5L4,12L11,19L12.41,17.59L7.83,13H19V11Z" />
+              <TextBlock Grid.Column="1" FontSize="11" TextWrapping="Wrap"
+                         Text="Below breakpoint → Overlay (hamburger button, drawer closes)" />
+            </Grid>
+            <Grid ColumnDefinitions="18,*">
+              <PathIcon Grid.Column="0" Width="12" Height="12" Opacity="0.7" VerticalAlignment="Top" Margin="0,1,0,0"
+                        Data="M5,13H16.17L11.58,17.59L13,19L20,12L13,5L11.59,6.41L16.17,11H5V13Z" />
+              <TextBlock Grid.Column="1" FontSize="11" TextWrapping="Wrap"
+                         Text="Above breakpoint → configured layout, drawer opens automatically" />
+            </Grid>
+          </StackPanel>
+        </Border>
+
+        <TextBlock Text="Breakpoint value" FontSize="12" Opacity="0.7" />
+        <StackPanel Orientation="Horizontal" Spacing="8">
+          <Slider x:Name="BreakpointSlider" Minimum="100" Maximum="900" Value="500"
+                  Width="150" ValueChanged="OnBreakpointChanged" />
+          <TextBlock x:Name="BreakpointText" Text="500" VerticalAlignment="Center" />
+        </StackPanel>
+
+        <Separator />
+
+        <TextBlock Text="Layout above breakpoint" FontSize="13" FontWeight="SemiBold" />
+        <TextBlock TextWrapping="Wrap" FontSize="12" Opacity="0.7"
+                   Text="The DrawerLayoutBehavior used when width exceeds the breakpoint." />
+        <ComboBox x:Name="LayoutCombo" SelectedIndex="0"
+                  SelectionChanged="OnLayoutChanged" HorizontalAlignment="Stretch">
+          <ComboBoxItem Content="Split" />
+          <ComboBoxItem Content="CompactInline" />
+          <ComboBoxItem Content="CompactOverlay" />
+        </ComboBox>
+
+        <Separator />
+
+        <TextBlock Text="Status" FontWeight="SemiBold" FontSize="13" />
+        <TextBlock x:Name="WidthText" Text="Width: —" Opacity="0.7" />
+        <TextBlock x:Name="ModeText" Text="Mode: Overlay" Opacity="0.7" TextWrapping="Wrap" />
+        <TextBlock TextWrapping="Wrap" FontSize="11" Opacity="0.6"
+                   Text="Resize the window to see the layout switch automatically." />
+      </StackPanel>
+    </ScrollViewer>
+
+    <Border DockPanel.Dock="Right" Width="1" Background="{DynamicResource SystemControlForegroundBaseMediumLowBrush}" />
+
+    <Border Margin="12"
+            BorderBrush="{DynamicResource SystemControlForegroundBaseMediumLowBrush}"
+            BorderThickness="1"
+            CornerRadius="6"
+            ClipToBounds="True">
+      <DrawerPage x:Name="DemoDrawer"
+                  DrawerLayoutBehavior="Split"
+                  DrawerBreakpointLength="500"
+                  DrawerLength="200">
+        <DrawerPage.Drawer>
+          <StackPanel Margin="8" Spacing="4">
+            <Button HorizontalAlignment="Stretch" Background="Transparent"
+                    Click="OnMenuItemClick" Tag="Home">
+              <StackPanel Orientation="Horizontal" Spacing="8">
+                <PathIcon Width="16" Height="16"
+                          Data="M10,20V14H14V20H19V12H22L12,3L2,12H5V20H10Z" />
+                <TextBlock Text="Home" VerticalAlignment="Center" />
+              </StackPanel>
+            </Button>
+            <Button HorizontalAlignment="Stretch" Background="Transparent"
+                    Click="OnMenuItemClick" Tag="Profile">
+              <StackPanel Orientation="Horizontal" Spacing="8">
+                <PathIcon Width="16" Height="16"
+                          Data="M12,4A4,4 0 0,1 16,8A4,4 0 0,1 12,12A4,4 0 0,1 8,8A4,4 0 0,1 12,4M12,14C16.42,14 20,15.79 20,18V20H4V18C4,15.79 7.58,14 12,14Z" />
+                <TextBlock Text="Profile" VerticalAlignment="Center" />
+              </StackPanel>
+            </Button>
+            <Button HorizontalAlignment="Stretch" Background="Transparent"
+                    Click="OnMenuItemClick" Tag="Settings">
+              <StackPanel Orientation="Horizontal" Spacing="8">
+                <PathIcon Width="16" Height="16"
+                          Data="M12,15.5A3.5,3.5 0 0,1 8.5,12A3.5,3.5 0 0,1 12,8.5A3.5,3.5 0 0,1 15.5,12A3.5,3.5 0 0,1 12,15.5M19.43,12.97C19.47,12.65 19.5,12.33 19.5,12C19.5,11.67 19.47,11.34 19.43,11L21.54,9.37C21.73,9.22 21.78,8.95 21.66,8.73L19.66,5.27C19.54,5.05 19.27,4.96 19.05,5.05L16.56,6.05C16.04,5.66 15.5,5.32 14.87,5.07L14.5,2.42C14.46,2.18 14.25,2 14,2H10C9.75,2 9.54,2.18 9.5,2.42L9.13,5.07C8.5,5.32 7.96,5.66 7.44,6.05L4.95,5.05C4.73,4.96 4.46,5.05 4.34,5.27L2.34,8.73C2.21,8.95 2.27,9.22 2.46,9.37L4.57,11C4.53,11.34 4.5,11.67 4.57,12.97L2.46,14.63C2.27,14.78 2.21,15.05 2.34,15.27L4.34,18.73C4.46,18.95 4.73,19.04 4.95,18.95L7.44,17.94C7.96,18.34 8.5,18.68 9.13,18.93L9.5,21.58C9.54,21.82 9.75,22 10,22H14C14.25,22 14.46,21.82 14.5,21.58L14.87,18.93C15.5,18.68 16.04,18.34 16.56,17.94L19.05,18.95C19.27,19.04 19.54,18.95 19.66,18.73L21.66,15.27C21.78,15.05 21.73,14.78 21.54,14.63L19.43,12.97Z" />
+                <TextBlock Text="Settings" VerticalAlignment="Center" />
+              </StackPanel>
+            </Button>
+          </StackPanel>
+        </DrawerPage.Drawer>
+        <DrawerPage.Content>
+          <ContentPage x:Name="DetailPage" Header="Home">
+            <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Spacing="8">
+              <TextBlock x:Name="DetailTitleText" Text="Home" FontSize="24" FontWeight="Bold"
+                         HorizontalAlignment="Center" />
+              <TextBlock Text="Select an item from the drawer." FontSize="13" Opacity="0.7"
+                         TextWrapping="Wrap" TextAlignment="Center" MaxWidth="260" />
+            </StackPanel>
+          </ContentPage>
+        </DrawerPage.Content>
+      </DrawerPage>
+    </Border>
+  </DockPanel>
+</UserControl>
diff --git a/samples/ControlCatalog/Pages/DrawerPage/DrawerPageBreakpointPage.xaml.cs b/samples/ControlCatalog/Pages/DrawerPage/DrawerPageBreakpointPage.xaml.cs
new file mode 100644
index 0000000000..0da2eb2ed7
--- /dev/null
+++ b/samples/ControlCatalog/Pages/DrawerPage/DrawerPageBreakpointPage.xaml.cs
@@ -0,0 +1,84 @@
+using Avalonia.Controls;
+using Avalonia.Controls.Primitives;
+using Avalonia.Interactivity;
+
+namespace ControlCatalog.Pages
+{
+    public partial class DrawerPageBreakpointPage : UserControl
+    {
+        private bool _isLoaded;
+
+        public DrawerPageBreakpointPage()
+        {
+            InitializeComponent();
+        }
+
+        protected override void OnLoaded(RoutedEventArgs e)
+        {
+            base.OnLoaded(e);
+            _isLoaded = true;
+            DemoDrawer.PropertyChanged += OnDrawerPropertyChanged;
+            UpdateStatus();
+        }
+
+        protected override void OnUnloaded(RoutedEventArgs e)
+        {
+            base.OnUnloaded(e);
+            DemoDrawer.PropertyChanged -= OnDrawerPropertyChanged;
+        }
+
+        private void OnDrawerPropertyChanged(object? sender, Avalonia.AvaloniaPropertyChangedEventArgs e)
+        {
+            if (e.Property == DrawerPage.BoundsProperty)
+                UpdateStatus();
+        }
+
+        private void OnBreakpointChanged(object? sender, RangeBaseValueChangedEventArgs e)
+        {
+            if (!_isLoaded)
+                return;
+            var value = (int)e.NewValue;
+            DemoDrawer.DrawerBreakpointLength = value;
+            BreakpointText.Text = value.ToString();
+            UpdateStatus();
+        }
+
+        private void OnLayoutChanged(object? sender, SelectionChangedEventArgs e)
+        {
+            if (!_isLoaded)
+                return;
+            DemoDrawer.DrawerLayoutBehavior = LayoutCombo.SelectedIndex switch
+            {
+                0 => DrawerLayoutBehavior.Split,
+                1 => DrawerLayoutBehavior.CompactInline,
+                2 => DrawerLayoutBehavior.CompactOverlay,
+                _ => DrawerLayoutBehavior.Split
+            };
+            UpdateStatus();
+        }
+
+        private void OnMenuItemClick(object? sender, RoutedEventArgs e)
+        {
+            if (!_isLoaded || sender is not Button button)
+                return;
+            var item = button.Tag?.ToString() ?? "Home";
+            DetailTitleText.Text = item;
+            DetailPage.Header = item;
+            if (DemoDrawer.DrawerLayoutBehavior != DrawerLayoutBehavior.Split)
+                DemoDrawer.IsOpen = false;
+        }
+
+        private void UpdateStatus()
+        {
+            var isVertical = DemoDrawer.DrawerPlacement == DrawerPlacement.Top ||
+                             DemoDrawer.DrawerPlacement == DrawerPlacement.Bottom;
+            var length = isVertical ? DemoDrawer.Bounds.Height : DemoDrawer.Bounds.Width;
+            var breakpoint = DemoDrawer.DrawerBreakpointLength;
+            WidthText.Text = $"{(isVertical ? "Height" : "Width")}: {(int)length} px";
+            var isOverlay = breakpoint > 0 && length > 0 && length < breakpoint;
+            ModeText.Text = isOverlay ?
+                "Mode: Overlay (below breakpoint)" :
+                $"Mode: {DemoDrawer.DrawerLayoutBehavior} (above breakpoint)";
+        }
+    }
+}
diff --git a/samples/ControlCatalog/Pages/DrawerPage/DrawerPageCustomizationPage.xaml b/samples/ControlCatalog/Pages/DrawerPage/DrawerPageCustomizationPage.xaml
index cba7837314..4987e8979e 100644
--- a/samples/ControlCatalog/Pages/DrawerPage/DrawerPageCustomizationPage.xaml
+++ b/samples/ControlCatalog/Pages/DrawerPage/DrawerPageCustomizationPage.xaml
@@ -118,6 +118,11 @@
                   Header="Customization"
                   DrawerLength="260"
                   DrawerHeaderBackground="{DynamicResource SystemControlHighlightAccentBrush}">
+        <DrawerPage.DrawerIconTemplate>
+          <DataTemplate DataType="Geometry">
+            <PathIcon Data="{Binding}" />
+          </DataTemplate>
+        </DrawerPage.DrawerIconTemplate>
         <DrawerPage.DrawerHeader>
           <Border x:Name="DrawerHeaderBorder" Padding="16">
             <StackPanel Spacing="4">
diff --git a/samples/ControlCatalog/Pages/DrawerPage/DrawerPageCustomizationPage.xaml.cs b/samples/ControlCatalog/Pages/DrawerPage/DrawerPageCustomizationPage.xaml.cs
index 697e67f0f4..243bc5868b 100644
--- a/samples/ControlCatalog/Pages/DrawerPage/DrawerPageCustomizationPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/DrawerPage/DrawerPageCustomizationPage.xaml.cs
@@ -1,5 +1,7 @@
+using System.Linq;
 using Avalonia.Controls;
 using Avalonia.Controls.Primitives;
+using Avalonia.Input.GestureRecognizers;
 using Avalonia.Interactivity;
 using Avalonia.Media;
 
@@ -22,6 +24,7 @@ namespace ControlCatalog.Pages
         public DrawerPageCustomizationPage()
         {
             InitializeComponent();
+            EnableMouseSwipeGesture(DemoDrawer);
         }
 
         protected override void OnLoaded(RoutedEventArgs e)
@@ -188,5 +191,15 @@ namespace ControlCatalog.Pages
             if (DemoDrawer.DrawerBehavior != DrawerBehavior.Locked)
                 DemoDrawer.IsOpen = false;
         }
+
+        private static void EnableMouseSwipeGesture(Control control)
+        {
+            var recognizer = control.GestureRecognizers
+                .OfType<SwipeGestureRecognizer>()
+                .FirstOrDefault();
+
+            if (recognizer is not null)
+                recognizer.IsMouseEnabled = true;
+        }
     }
 }
diff --git a/samples/ControlCatalog/Pages/DrawerPage/DrawerPageFirstLookPage.xaml.cs b/samples/ControlCatalog/Pages/DrawerPage/DrawerPageFirstLookPage.xaml.cs
index 58a981f640..de72957d73 100644
--- a/samples/ControlCatalog/Pages/DrawerPage/DrawerPageFirstLookPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/DrawerPage/DrawerPageFirstLookPage.xaml.cs
@@ -1,4 +1,6 @@
+using System.Linq;
 using Avalonia.Controls;
+using Avalonia.Input.GestureRecognizers;
 using Avalonia.Interactivity;
 
 namespace ControlCatalog.Pages
@@ -8,6 +10,7 @@ namespace ControlCatalog.Pages
         public DrawerPageFirstLookPage()
         {
             InitializeComponent();
+            EnableMouseSwipeGesture(DemoDrawer);
         }
 
         protected override void OnLoaded(RoutedEventArgs e)
@@ -61,5 +64,15 @@ namespace ControlCatalog.Pages
         {
             StatusText.Text = $"Drawer: {(DemoDrawer.IsOpen ? "Open" : "Closed")}";
         }
+
+        private static void EnableMouseSwipeGesture(Control control)
+        {
+            var recognizer = control.GestureRecognizers
+                .OfType<SwipeGestureRecognizer>()
+                .FirstOrDefault();
+
+            if (recognizer is not null)
+                recognizer.IsMouseEnabled = true;
+        }
     }
 }
diff --git a/samples/ControlCatalog/Pages/DrawerPage/EcoTrackerAppPage.xaml b/samples/ControlCatalog/Pages/DrawerPage/EcoTrackerAppPage.xaml
index 22320fbc8d..1e9106ccfe 100644
--- a/samples/ControlCatalog/Pages/DrawerPage/EcoTrackerAppPage.xaml
+++ b/samples/ControlCatalog/Pages/DrawerPage/EcoTrackerAppPage.xaml
@@ -52,9 +52,13 @@
         </DrawerPage.Resources>
 
         <DrawerPage.DrawerIcon>
-          <PathIcon Width="22" Height="22"
-                    Data="M12 3C9 6 6 9 6 13C6 17.4 8.7 21 12 22C15.3 21 18 17.4 18 13C18 9 15 6 12 3Z" />
+          <StreamGeometry>M12 3C9 6 6 9 6 13C6 17.4 8.7 21 12 22C15.3 21 18 17.4 18 13C18 9 15 6 12 3Z</StreamGeometry>
         </DrawerPage.DrawerIcon>
+        <DrawerPage.DrawerIconTemplate>
+          <DataTemplate DataType="Geometry">
+            <PathIcon Width="22" Height="22" Data="{Binding}" />
+          </DataTemplate>
+        </DrawerPage.DrawerIconTemplate>
 
         <DrawerPage.DrawerHeader>
           <StackPanel Background="{StaticResource EcoDrawerBg}" Margin="0,0,0,8">
diff --git a/samples/ControlCatalog/Pages/NavigationDemoPage.xaml.cs b/samples/ControlCatalog/Pages/NavigationDemoPage.xaml.cs
index b4ec1503bd..d65a43a6ad 100644
--- a/samples/ControlCatalog/Pages/NavigationDemoPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/NavigationDemoPage.xaml.cs
@@ -28,6 +28,9 @@ namespace ControlCatalog.Pages
             // Data
             ("Data", "Pass Data", "Pass data during navigation via constructor arguments or DataContext.",
                 () => new NavigationPagePassDataPage()),
+            ("Data", "MVVM Navigation",
+                "Keep navigation decisions in view models by routing NavigationPage push and pop operations through a small INavigationService.",
+                () => new NavigationPageMvvmPage()),
 
             // Features
             ("Features", "Attached Methods",
diff --git a/samples/ControlCatalog/Pages/NavigationPage/LAvenirAppPage.xaml.cs b/samples/ControlCatalog/Pages/NavigationPage/LAvenirAppPage.xaml.cs
index 6c4a67a473..beb0b2dccb 100644
--- a/samples/ControlCatalog/Pages/NavigationPage/LAvenirAppPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/NavigationPage/LAvenirAppPage.xaml.cs
@@ -59,6 +59,26 @@ public partial class LAvenirAppPage : UserControl
             _infoPanel.IsVisible = Bounds.Width >= 650;
     }
 
+    void ApplyRootNavigationBarAppearance()
+    {
+        if (_navPage == null)
+            return;
+
+        _navPage.Background = new SolidColorBrush(BgLight);
+        _navPage.Resources["NavigationBarBackground"] = new SolidColorBrush(BgLight);
+        _navPage.Resources["NavigationBarForeground"] = new SolidColorBrush(TextDark);
+    }
+
+    void ApplyDetailNavigationBarAppearance()
+    {
+        if (_navPage == null)
+            return;
+
+        _navPage.Background = new SolidColorBrush(BgDark);
+        _navPage.Resources["NavigationBarBackground"] = new SolidColorBrush(BgDark);
+        _navPage.Resources["NavigationBarForeground"] = Brushes.White;
+    }
+
     TabbedPage BuildMenuTabbedPage()
     {
         var tp = new TabbedPage
@@ -92,6 +112,7 @@ public partial class LAvenirAppPage : UserControl
             VerticalAlignment = VerticalAlignment.Center,
             TextAlignment     = TextAlignment.Center,
         };
+        ApplyRootNavigationBarAppearance();
 
         NavigationPage.SetTopCommandBar(tp, new Button
         {
@@ -119,7 +140,7 @@ public partial class LAvenirAppPage : UserControl
             Content    = menuView,
             Background = new SolidColorBrush(BgLight),
             Header     = "Menu",
-            Icon       = "M11 9H9V2H7v7H5V2H3v7c0 2.12 1.66 3.84 3.75 3.97V22h2.5v-9.03C11.34 12.84 13 11.12 13 9V2h-2v7zm5-3v8h2.5v8H21V2c-2.76 0-5 2.24-5 4z",
+            Icon       = Geometry.Parse("M11 9H9V2H7v7H5V2H3v7c0 2.12 1.66 3.84 3.75 3.97V22h2.5v-9.03C11.34 12.84 13 11.12 13 9V2h-2v7zm5-3v8h2.5v8H21V2c-2.76 0-5 2.24-5 4z"),
         };
 
         var reservationsPage = new ContentPage
@@ -127,7 +148,7 @@ public partial class LAvenirAppPage : UserControl
             Content    = new LAvenirReservationsView(),
             Background = new SolidColorBrush(BgLight),
             Header     = "Reservations",
-            Icon       = "M19 3h-1V1h-2v2H8V1H6v2H5c-1.11 0-2 .9-2 2v14c0 1.1.89 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2zm0 16H5V8h14v11zM9 10H7v2h2v-2zm4 0h-2v2h2v-2zm4 0h-2v2h2v-2z",
+            Icon       = Geometry.Parse("M19 3h-1V1h-2v2H8V1H6v2H5c-1.11 0-2 .9-2 2v14c0 1.1.89 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2zm0 16H5V8h14v11zM9 10H7v2h2v-2zm4 0h-2v2h2v-2zm4 0h-2v2h2v-2z"),
         };
 
         var profilePage = new ContentPage
@@ -135,7 +156,7 @@ public partial class LAvenirAppPage : UserControl
             Content    = new LAvenirProfileView(),
             Background = new SolidColorBrush(BgLight),
             Header     = "Profile",
-            Icon       = "M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 3c1.66 0 3 1.34 3 3s-1.34 3-3 3-3-1.34-3-3 1.34-3 3-3zm0 14.2c-2.5 0-4.71-1.28-6-3.22.03-1.99 4-3.08 6-3.08 1.99 0 5.97 1.09 6 3.08-1.29 1.94-3.5 3.22-6 3.22z",
+            Icon       = Geometry.Parse("M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 3c1.66 0 3 1.34 3 3s-1.34 3-3 3-3-1.34-3-3 1.34-3 3-3zm0 14.2c-2.5 0-4.71-1.28-6-3.22.03-1.99 4-3.08 6-3.08 1.99 0 5.97 1.09 6 3.08-1.29 1.94-3.5 3.22-6 3.22z"),
         };
 
         tp.Pages = new ObservableCollection<Page> { menuPage, reservationsPage, profilePage };
@@ -144,7 +165,8 @@ public partial class LAvenirAppPage : UserControl
 
     async void PushDishDetail(string name, string price, string description, string imageFile)
     {
-        if (_navPage == null) return;
+        if (_navPage == null)
+            return;
 
         var detail = new ContentPage
         {
@@ -153,22 +175,19 @@ public partial class LAvenirAppPage : UserControl
             Header     = name,
         };
         NavigationPage.SetBottomCommandBar(detail, BuildFloatingBar(price));
-
-        _navPage.Background = new SolidColorBrush(BgDark);
-        _navPage.Resources["NavigationBarBackground"] = new SolidColorBrush(BgDark);
-        _navPage.Resources["NavigationBarForeground"] = Brushes.White;
-
-        detail.NavigatedFrom += (_, _) =>
+        detail.Navigating += args =>
         {
-            if (_navPage != null)
-            {
-                _navPage.Background = new SolidColorBrush(BgLight);
-                _navPage.Resources["NavigationBarBackground"] = new SolidColorBrush(BgLight);
-                _navPage.Resources["NavigationBarForeground"] = new SolidColorBrush(TextDark);
-            }
+            if (args.NavigationType == NavigationType.Pop)
+                ApplyRootNavigationBarAppearance();
+
+            return Task.CompletedTask;
         };
 
+        ApplyDetailNavigationBarAppearance();
         await _navPage.PushAsync(detail);
+
+        if (!ReferenceEquals(_navPage.CurrentPage, detail))
+            ApplyRootNavigationBarAppearance();
     }
 
     Border BuildFloatingBar(string price)
diff --git a/samples/ControlCatalog/Pages/NavigationPage/NavigationPageAppearancePage.xaml.cs b/samples/ControlCatalog/Pages/NavigationPage/NavigationPageAppearancePage.xaml.cs
index 52e667b0bf..147dbe1f75 100644
--- a/samples/ControlCatalog/Pages/NavigationPage/NavigationPageAppearancePage.xaml.cs
+++ b/samples/ControlCatalog/Pages/NavigationPage/NavigationPageAppearancePage.xaml.cs
@@ -8,6 +8,7 @@ namespace ControlCatalog.Pages
 {
     public partial class NavigationPageAppearancePage : UserControl
     {
+        private bool _initialized;
         private int _pageCount;
         private int _backButtonStyle;
 
@@ -19,6 +20,10 @@ namespace ControlCatalog.Pages
 
         private async void OnLoaded(object? sender, RoutedEventArgs e)
         {
+            if (_initialized)
+                return;
+
+            _initialized = true;
             await DemoNav.PushAsync(NavigationDemoHelper.MakePage("Appearance", "Change bar properties using the options panel.", 0), null);
         }
 
diff --git a/samples/ControlCatalog/Pages/NavigationPage/NavigationPageAttachedMethodsPage.xaml.cs b/samples/ControlCatalog/Pages/NavigationPage/NavigationPageAttachedMethodsPage.xaml.cs
index 5a868046f3..01aef5385b 100644
--- a/samples/ControlCatalog/Pages/NavigationPage/NavigationPageAttachedMethodsPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/NavigationPage/NavigationPageAttachedMethodsPage.xaml.cs
@@ -8,6 +8,7 @@ namespace ControlCatalog.Pages
 {
     public partial class NavigationPageAttachedMethodsPage : UserControl
     {
+        private bool _initialized;
         private int _pageCount;
 
         public NavigationPageAttachedMethodsPage()
@@ -18,6 +19,10 @@ namespace ControlCatalog.Pages
 
         private async void OnLoaded(object? sender, RoutedEventArgs e)
         {
+            if (_initialized)
+                return;
+
+            _initialized = true;
             await DemoNav.PushAsync(new ContentPage
             {
                 Header = "Root Page",
diff --git a/samples/ControlCatalog/Pages/NavigationPage/NavigationPageBackButtonPage.xaml.cs b/samples/ControlCatalog/Pages/NavigationPage/NavigationPageBackButtonPage.xaml.cs
index 347b8e8010..5dd438750f 100644
--- a/samples/ControlCatalog/Pages/NavigationPage/NavigationPageBackButtonPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/NavigationPage/NavigationPageBackButtonPage.xaml.cs
@@ -8,6 +8,7 @@ namespace ControlCatalog.Pages
 {
     public partial class NavigationPageBackButtonPage : UserControl
     {
+        private bool _initialized;
         private int _pushCount;
 
         public NavigationPageBackButtonPage()
@@ -18,6 +19,10 @@ namespace ControlCatalog.Pages
 
         private async void OnLoaded(object? sender, RoutedEventArgs e)
         {
+            if (_initialized)
+                return;
+
+            _initialized = true;
             DemoNav.Pushed += (s, ev) => AddLog($"Pushed: \"{ev.Page?.Header}\"");
             DemoNav.Popped += (s, ev) => AddLog($"Popped: \"{ev.Page?.Header}\"");
 
diff --git a/samples/ControlCatalog/Pages/NavigationPage/NavigationPageEventsPage.xaml b/samples/ControlCatalog/Pages/NavigationPage/NavigationPageEventsPage.xaml
index 74d0e58371..904d4310cc 100644
--- a/samples/ControlCatalog/Pages/NavigationPage/NavigationPageEventsPage.xaml
+++ b/samples/ControlCatalog/Pages/NavigationPage/NavigationPageEventsPage.xaml
@@ -51,6 +51,13 @@
           </ScrollViewer>
         </Border>
 
+        <Separator />
+
+        <!-- IsNavigating indicator -->
+        <TextBlock Text="Status" FontSize="13" FontWeight="SemiBold" />
+        <TextBlock Text="{Binding IsNavigating, ElementName=DemoNav, StringFormat='IsNavigating: {0}'}"
+                   FontSize="12" />
+
         <Separator />
         <TextBlock Text="NavigationPage exposes events for push, pop, insert, remove, and modal operations. Pages also fire NavigatedTo and NavigatedFrom on each navigation."
                    TextWrapping="Wrap" FontSize="12" Opacity="0.7" />
diff --git a/samples/ControlCatalog/Pages/NavigationPage/NavigationPageEventsPage.xaml.cs b/samples/ControlCatalog/Pages/NavigationPage/NavigationPageEventsPage.xaml.cs
index faa47f6eda..c1c439f6a4 100644
--- a/samples/ControlCatalog/Pages/NavigationPage/NavigationPageEventsPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/NavigationPage/NavigationPageEventsPage.xaml.cs
@@ -7,6 +7,7 @@ namespace ControlCatalog.Pages
 {
     public partial class NavigationPageEventsPage : UserControl
     {
+        private bool _initialized;
         private int _pageCount;
 
         public NavigationPageEventsPage()
@@ -17,6 +18,10 @@ namespace ControlCatalog.Pages
 
         private async void OnLoaded(object? sender, RoutedEventArgs e)
         {
+            if (_initialized)
+                return;
+
+            _initialized = true;
             DemoNav.Pushed       += (s, ev) => AddLog($"Pushed → {ev.Page?.Header}");
             DemoNav.Popped       += (s, ev) => AddLog($"Popped ← {ev.Page?.Header}");
             DemoNav.PoppedToRoot += (s, ev) => AddLog("PoppedToRoot");
diff --git a/samples/ControlCatalog/Pages/NavigationPage/NavigationPageFirstLookPage.xaml.cs b/samples/ControlCatalog/Pages/NavigationPage/NavigationPageFirstLookPage.xaml.cs
index 32b2e8927d..f9a6f9aa41 100644
--- a/samples/ControlCatalog/Pages/NavigationPage/NavigationPageFirstLookPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/NavigationPage/NavigationPageFirstLookPage.xaml.cs
@@ -6,6 +6,7 @@ namespace ControlCatalog.Pages
 {
     public partial class NavigationPageFirstLookPage : UserControl
     {
+        private bool _initialized;
         private int _pageCount;
 
         public NavigationPageFirstLookPage()
@@ -16,6 +17,10 @@ namespace ControlCatalog.Pages
 
         private async void OnLoaded(object? sender, RoutedEventArgs e)
         {
+            if (_initialized)
+                return;
+
+            _initialized = true;
             await DemoNav.PushAsync(NavigationDemoHelper.MakePage("Home", "Welcome!\nUse the buttons to push and pop pages.", 0), null);
             UpdateStatus();
         }
diff --git a/samples/ControlCatalog/Pages/NavigationPage/NavigationPageGesturePage.xaml.cs b/samples/ControlCatalog/Pages/NavigationPage/NavigationPageGesturePage.xaml.cs
index ff711f3a63..e185208119 100644
--- a/samples/ControlCatalog/Pages/NavigationPage/NavigationPageGesturePage.xaml.cs
+++ b/samples/ControlCatalog/Pages/NavigationPage/NavigationPageGesturePage.xaml.cs
@@ -1,18 +1,27 @@
+using System.Linq;
 using Avalonia.Controls;
+using Avalonia.Input.GestureRecognizers;
 using Avalonia.Interactivity;
 
 namespace ControlCatalog.Pages
 {
     public partial class NavigationPageGesturePage : UserControl
     {
+        private bool _initialized;
+
         public NavigationPageGesturePage()
         {
             InitializeComponent();
+            EnableMouseSwipeGesture(DemoNav);
             Loaded += OnLoaded;
         }
 
         private async void OnLoaded(object? sender, RoutedEventArgs e)
         {
+            if (_initialized)
+                return;
+
+            _initialized = true;
             await DemoNav.PushAsync(NavigationDemoHelper.MakePage("Page 1", "← Drag from the left edge to go back", 0), null);
             await DemoNav.PushAsync(NavigationDemoHelper.MakePage("Page 2", "← Drag from the left edge to go back", 1), null);
             await DemoNav.PushAsync(NavigationDemoHelper.MakePage("Page 3", "← Drag from the left edge to go back", 2), null);
@@ -43,5 +52,15 @@ namespace ControlCatalog.Pages
         {
             StatusText.Text = $"Depth: {DemoNav.StackDepth}";
         }
+
+        private static void EnableMouseSwipeGesture(Control control)
+        {
+            var recognizer = control.GestureRecognizers
+                .OfType<SwipeGestureRecognizer>()
+                .FirstOrDefault();
+
+            if (recognizer is not null)
+                recognizer.IsMouseEnabled = true;
+        }
     }
 }
diff --git a/samples/ControlCatalog/Pages/NavigationPage/NavigationPageInteractiveHeaderPage.xaml.cs b/samples/ControlCatalog/Pages/NavigationPage/NavigationPageInteractiveHeaderPage.xaml.cs
index 1dc724128b..6a56beabe4 100644
--- a/samples/ControlCatalog/Pages/NavigationPage/NavigationPageInteractiveHeaderPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/NavigationPage/NavigationPageInteractiveHeaderPage.xaml.cs
@@ -37,6 +37,7 @@ namespace ControlCatalog.Pages
         ];
 
         private readonly ObservableCollection<ContactItem> _filteredItems = new(AllContacts);
+        private bool _initialized;
         private string _searchText = "";
 
         public NavigationPageInteractiveHeaderPage()
@@ -47,6 +48,10 @@ namespace ControlCatalog.Pages
 
         private async void OnLoaded(object? sender, RoutedEventArgs e)
         {
+            if (_initialized)
+                return;
+
+            _initialized = true;
             var headerGrid = new Grid
             {
                 ColumnDefinitions = new ColumnDefinitions("*, Auto"),
diff --git a/samples/ControlCatalog/Pages/NavigationPage/NavigationPageModalPage.xaml.cs b/samples/ControlCatalog/Pages/NavigationPage/NavigationPageModalPage.xaml.cs
index 1dd717234e..81ed6d5c1f 100644
--- a/samples/ControlCatalog/Pages/NavigationPage/NavigationPageModalPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/NavigationPage/NavigationPageModalPage.xaml.cs
@@ -7,6 +7,7 @@ namespace ControlCatalog.Pages
 {
     public partial class NavigationPageModalPage : UserControl
     {
+        private bool _initialized;
         private int _modalCount;
 
         public NavigationPageModalPage()
@@ -17,6 +18,10 @@ namespace ControlCatalog.Pages
 
         private async void OnLoaded(object? sender, RoutedEventArgs e)
         {
+            if (_initialized)
+                return;
+
+            _initialized = true;
             await DemoNav.PushAsync(NavigationDemoHelper.MakePage("Home", "Use Push Modal to show a modal on top.", 0), null);
         }
 
diff --git a/samples/ControlCatalog/Pages/NavigationPage/NavigationPageModalTransitionsPage.xaml.cs b/samples/ControlCatalog/Pages/NavigationPage/NavigationPageModalTransitionsPage.xaml.cs
index ac4e8c985d..2c77798570 100644
--- a/samples/ControlCatalog/Pages/NavigationPage/NavigationPageModalTransitionsPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/NavigationPage/NavigationPageModalTransitionsPage.xaml.cs
@@ -20,6 +20,7 @@ namespace ControlCatalog.Pages
         ];
 
         private int _modalCount;
+        private bool _initialized;
 
         public NavigationPageModalTransitionsPage()
         {
@@ -29,6 +30,13 @@ namespace ControlCatalog.Pages
 
         private async void OnLoaded(object? sender, RoutedEventArgs e)
         {
+            if (_initialized)
+            {
+                UpdateTransition();
+                return;
+            }
+
+            _initialized = true;
             await DemoNav.PushAsync(new ContentPage
             {
                 Header = "Modal Transitions",
diff --git a/samples/ControlCatalog/Pages/NavigationPage/NavigationPageMvvmNavigation.cs b/samples/ControlCatalog/Pages/NavigationPage/NavigationPageMvvmNavigation.cs
new file mode 100644
index 0000000000..c6262ca9f4
--- /dev/null
+++ b/samples/ControlCatalog/Pages/NavigationPage/NavigationPageMvvmNavigation.cs
@@ -0,0 +1,95 @@
+using System;
+using System.Threading.Tasks;
+using Avalonia.Controls;
+using MiniMvvm;
+
+namespace ControlCatalog.Pages
+{
+    internal interface ISampleNavigationService
+    {
+        event EventHandler<NavigationStateChangedEventArgs>? StateChanged;
+
+        Task NavigateToAsync(ViewModelBase viewModel);
+
+        Task GoBackAsync();
+
+        Task PopToRootAsync();
+    }
+
+    internal interface ISamplePageFactory
+    {
+        ContentPage CreatePage(ViewModelBase viewModel);
+    }
+
+    internal sealed class NavigationStateChangedEventArgs : EventArgs
+    {
+        public NavigationStateChangedEventArgs(string currentPageHeader, int navigationDepth, string lastAction)
+        {
+            CurrentPageHeader = currentPageHeader;
+            NavigationDepth = navigationDepth;
+            LastAction = lastAction;
+        }
+
+        public string CurrentPageHeader { get; }
+
+        public int NavigationDepth { get; }
+
+        public string LastAction { get; }
+    }
+
+    internal sealed class SampleNavigationService : ISampleNavigationService
+    {
+        private readonly NavigationPage _navigationPage;
+        private readonly ISamplePageFactory _pageFactory;
+
+        public SampleNavigationService(NavigationPage navigationPage, ISamplePageFactory pageFactory)
+        {
+            _navigationPage = navigationPage;
+            _pageFactory = pageFactory;
+
+            _navigationPage.Pushed += (_, e) => PublishState($"Pushed {e.Page?.Header}");
+            _navigationPage.Popped += (_, e) => PublishState($"Popped {e.Page?.Header}");
+            _navigationPage.PoppedToRoot += (_, _) => PublishState("Popped to root");
+        }
+
+        public event EventHandler<NavigationStateChangedEventArgs>? StateChanged;
+
+        public async Task NavigateToAsync(ViewModelBase viewModel)
+        {
+            var page = _pageFactory.CreatePage(viewModel);
+            await _navigationPage.PushAsync(page);
+        }
+
+        public async Task GoBackAsync()
+        {
+            if (_navigationPage.NavigationStack.Count <= 1)
+            {
+                PublishState("Already at the root page");
+                return;
+            }
+
+            await _navigationPage.PopAsync();
+        }
+
+        public async Task PopToRootAsync()
+        {
+            if (_navigationPage.NavigationStack.Count <= 1)
+            {
+                PublishState("Already at the root page");
+                return;
+            }
+
+            await _navigationPage.PopToRootAsync();
+        }
+
+        private void PublishState(string lastAction)
+        {
+            var header = _navigationPage.CurrentPage?.Header?.ToString() ?? "None";
+
+            StateChanged?.Invoke(this, new NavigationStateChangedEventArgs(
+                header,
+                _navigationPage.NavigationStack.Count,
+                lastAction));
+        }
+    }
+}
diff --git a/samples/ControlCatalog/Pages/NavigationPage/NavigationPageMvvmPage.xaml b/samples/ControlCatalog/Pages/NavigationPage/NavigationPageMvvmPage.xaml
new file mode 100644
index 0000000000..7204b78a4d
--- /dev/null
+++ b/samples/ControlCatalog/Pages/NavigationPage/NavigationPageMvvmPage.xaml
@@ -0,0 +1,86 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:pages="using:ControlCatalog.Pages"
+             x:Class="ControlCatalog.Pages.NavigationPageMvvmPage"
+             x:DataType="pages:NavigationPageMvvmShellViewModel">
+  <DockPanel>
+    <ScrollViewer DockPanel.Dock="Right" Width="300">
+      <StackPanel Margin="12" Spacing="12">
+        <TextBlock Text="MVVM Pattern"
+                   FontSize="16"
+                   FontWeight="SemiBold"
+                   Foreground="{DynamicResource SystemControlHighlightAccentBrush}" />
+
+        <TextBlock TextWrapping="Wrap"
+                   FontSize="12"
+                   Opacity="0.75"
+                   Text="This sample keeps NavigationPage in the view, sends commands from view models, routes push or pop operations through ISampleNavigationService, and resolves pages in a separate SamplePageFactory." />
+
+        <Separator />
+
+        <TextBlock Text="Selected Project"
+                   FontSize="13"
+                   FontWeight="SemiBold" />
+
+        <ListBox ItemsSource="{Binding Projects}"
+                 SelectedItem="{Binding SelectedProject, Mode=TwoWay}"
+                 MaxHeight="180">
+          <ListBox.ItemTemplate>
+            <DataTemplate x:DataType="pages:ProjectCardViewModel">
+              <StackPanel Margin="0,2" Spacing="2">
+                <TextBlock Text="{Binding Name}"
+                           FontWeight="SemiBold" />
+                <TextBlock Text="{Binding Owner}"
+                           FontSize="11"
+                           Opacity="0.65" />
+              </StackPanel>
+            </DataTemplate>
+          </ListBox.ItemTemplate>
+        </ListBox>
+
+        <Button Content="Open Selected Project"
+                Command="{Binding OpenSelectedProjectCommand}" />
+        <Button Content="Back"
+                Command="{Binding GoBackCommand}" />
+        <Button Content="Pop To Root"
+                Command="{Binding PopToRootCommand}" />
+
+        <Separator />
+
+        <TextBlock Text="Navigation State"
+                   FontSize="13"
+                   FontWeight="SemiBold" />
+        <TextBlock Text="{Binding CurrentPageHeader, StringFormat=Current page: {0}}"
+                   Opacity="0.75" />
+        <TextBlock Text="{Binding NavigationDepth, StringFormat=Stack depth: {0}}"
+                   Opacity="0.75" />
+        <TextBlock Text="{Binding LastAction, StringFormat=Last action: {0}}"
+                   Opacity="0.75"
+                   TextWrapping="Wrap" />
+
+        <Separator />
+
+        <TextBlock Text="Selected Details"
+                   FontSize="13"
+                   FontWeight="SemiBold" />
+        <TextBlock Text="{Binding SelectedProject.Status, StringFormat=Status: {0}}"
+                   Opacity="0.75" />
+        <TextBlock Text="{Binding SelectedProject.NextMilestone, StringFormat=Next milestone: {0}}"
+                   Opacity="0.75"
+                   TextWrapping="Wrap" />
+      </StackPanel>
+    </ScrollViewer>
+
+    <Border DockPanel.Dock="Right"
+            Width="1"
+            Background="{DynamicResource SystemControlForegroundBaseMediumLowBrush}" />
+
+    <Border Margin="12"
+            BorderBrush="{DynamicResource SystemControlForegroundBaseMediumLowBrush}"
+            BorderThickness="1"
+            CornerRadius="6"
+            ClipToBounds="True">
+      <NavigationPage x:Name="DemoNav" />
+    </Border>
+  </DockPanel>
+</UserControl>
diff --git a/samples/ControlCatalog/Pages/NavigationPage/NavigationPageMvvmPage.xaml.cs b/samples/ControlCatalog/Pages/NavigationPage/NavigationPageMvvmPage.xaml.cs
new file mode 100644
index 0000000000..6d6c18bbd6
--- /dev/null
+++ b/samples/ControlCatalog/Pages/NavigationPage/NavigationPageMvvmPage.xaml.cs
@@ -0,0 +1,32 @@
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+
+namespace ControlCatalog.Pages
+{
+    public partial class NavigationPageMvvmPage : UserControl
+    {
+        private readonly NavigationPageMvvmShellViewModel _viewModel;
+        private bool _initialized;
+
+        public NavigationPageMvvmPage()
+        {
+            InitializeComponent();
+
+            ISamplePageFactory pageFactory = new SamplePageFactory();
+            ISampleNavigationService navigationService = new SampleNavigationService(DemoNav, pageFactory);
+            _viewModel = new NavigationPageMvvmShellViewModel(navigationService);
+            DataContext = _viewModel;
+
+            Loaded += OnLoaded;
+        }
+
+        private async void OnLoaded(object? sender, RoutedEventArgs e)
+        {
+            if (_initialized)
+                return;
+
+            _initialized = true;
+            await _viewModel.InitializeAsync();
+        }
+    }
+}
diff --git a/samples/ControlCatalog/Pages/NavigationPage/NavigationPageMvvmPageFactory.cs b/samples/ControlCatalog/Pages/NavigationPage/NavigationPageMvvmPageFactory.cs
new file mode 100644
index 0000000000..f9a688d95c
--- /dev/null
+++ b/samples/ControlCatalog/Pages/NavigationPage/NavigationPageMvvmPageFactory.cs
@@ -0,0 +1,252 @@
+using System;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Controls.Templates;
+using Avalonia.Layout;
+using Avalonia.Media;
+using MiniMvvm;
+
+namespace ControlCatalog.Pages
+{
+    internal sealed class SamplePageFactory : ISamplePageFactory
+    {
+        public ContentPage CreatePage(ViewModelBase viewModel) =>
+            viewModel switch
+            {
+                WorkspaceViewModel workspace => CreateWorkspacePage(workspace),
+                ProjectDetailViewModel detail => CreateProjectDetailPage(detail),
+                ProjectActivityViewModel activity => CreateProjectActivityPage(activity),
+                _ => throw new InvalidOperationException($"Unsupported view model: {viewModel.GetType().Name}")
+            };
+
+        private static ContentPage CreateWorkspacePage(WorkspaceViewModel viewModel)
+        {
+            var stack = new StackPanel
+            {
+                Margin = new Thickness(20),
+                Spacing = 14,
+            };
+
+            stack.Children.Add(new TextBlock
+            {
+                Text = viewModel.Title,
+                FontSize = 24,
+                FontWeight = FontWeight.Bold,
+            });
+            stack.Children.Add(new TextBlock
+            {
+                Text = viewModel.Description,
+                FontSize = 13,
+                Opacity = 0.75,
+                TextWrapping = TextWrapping.Wrap,
+            });
+
+            stack.Children.Add(new ItemsControl
+            {
+                ItemsSource = viewModel.Projects,
+                ItemTemplate = new FuncDataTemplate<ProjectCardViewModel>((item, _) =>
+                {
+                    if (item == null)
+                        return new TextBlock();
+
+                    var accentBrush = new SolidColorBrush(item.AccentColor);
+                    var statusBadge = new Border
+                    {
+                        Background = accentBrush,
+                        CornerRadius = new CornerRadius(999),
+                        Padding = new Thickness(10, 4),
+                        Child = new TextBlock
+                        {
+                            Text = item.Status,
+                            Foreground = Brushes.White,
+                            FontSize = 11,
+                            FontWeight = FontWeight.SemiBold,
+                        }
+                    };
+                    DockPanel.SetDock(statusBadge, Dock.Right);
+
+                    var header = new DockPanel();
+                    header.Children.Add(statusBadge);
+                    header.Children.Add(new TextBlock
+                    {
+                        Text = item.Name,
+                        FontSize = 17,
+                        FontWeight = FontWeight.SemiBold,
+                    });
+
+                    return new Border
+                    {
+                        Background = new SolidColorBrush(Color.FromArgb(20, item.AccentColor.R, item.AccentColor.G, item.AccentColor.B)),
+                        BorderBrush = accentBrush,
+                        BorderThickness = new Thickness(1),
+                        CornerRadius = new CornerRadius(8),
+                        Padding = new Thickness(14),
+                        Margin = new Thickness(0, 0, 0, 8),
+                        Child = new StackPanel
+                        {
+                            Spacing = 8,
+                            Children =
+                            {
+                                header,
+                                new TextBlock
+                                {
+                                    Text = item.Summary,
+                                    FontSize = 13,
+                                    Opacity = 0.72,
+                                    TextWrapping = TextWrapping.Wrap,
+                                },
+                                new TextBlock
+                                {
+                                    Text = $"Owner: {item.Owner}  •  Next: {item.NextMilestone}",
+                                    FontSize = 12,
+                                    Opacity = 0.6,
+                                    TextWrapping = TextWrapping.Wrap,
+                                },
+                                new Button
+                                {
+                                    Content = "Open Project",
+                                    HorizontalAlignment = HorizontalAlignment.Left,
+                                    Command = item.OpenCommand,
+                                }
+                            }
+                        }
+                    };
+                })
+            });
+
+            var page = new ContentPage
+            {
+                Header = "Workspace",
+                Content = new ScrollViewer { Content = stack },
+                HorizontalContentAlignment = HorizontalAlignment.Stretch,
+                VerticalContentAlignment = VerticalAlignment.Stretch,
+            };
+
+            NavigationPage.SetHasBackButton(page, false);
+            return page;
+        }
+
+        private static ContentPage CreateProjectDetailPage(ProjectDetailViewModel viewModel)
+        {
+            var accentBrush = new SolidColorBrush(viewModel.AccentColor);
+            var panel = new StackPanel
+            {
+                Margin = new Thickness(24, 20),
+                Spacing = 12,
+            };
+
+            panel.Children.Add(new Border
+            {
+                Background = accentBrush,
+                CornerRadius = new CornerRadius(999),
+                Padding = new Thickness(12, 5),
+                HorizontalAlignment = HorizontalAlignment.Left,
+                Child = new TextBlock
+                {
+                    Text = viewModel.Status,
+                    Foreground = Brushes.White,
+                    FontSize = 11,
+                    FontWeight = FontWeight.SemiBold,
+                }
+            });
+            panel.Children.Add(new TextBlock
+            {
+                Text = viewModel.Name,
+                FontSize = 26,
+                FontWeight = FontWeight.Bold,
+            });
+            panel.Children.Add(new TextBlock
+            {
+                Text = viewModel.Summary,
+                FontSize = 14,
+                Opacity = 0.78,
+                TextWrapping = TextWrapping.Wrap,
+            });
+            panel.Children.Add(new TextBlock
+            {
+                Text = $"Owner: {viewModel.Owner}",
+                FontSize = 13,
+                Opacity = 0.68,
+            });
+            panel.Children.Add(new TextBlock
+            {
+                Text = $"Next milestone: {viewModel.NextMilestone}",
+                FontSize = 13,
+                Opacity = 0.68,
+                TextWrapping = TextWrapping.Wrap,
+            });
+            panel.Children.Add(new Separator { Margin = new Thickness(0, 4) });
+            panel.Children.Add(new TextBlock
+            {
+                Text = "This page is resolved by SamplePageFactory from a ProjectDetailViewModel. The view model only requests navigation through ISampleNavigationService.",
+                FontSize = 12,
+                Opacity = 0.7,
+                TextWrapping = TextWrapping.Wrap,
+            });
+            panel.Children.Add(new Button
+            {
+                Content = "Open Activity",
+                HorizontalAlignment = HorizontalAlignment.Left,
+                Command = viewModel.OpenActivityCommand,
+            });
+
+            return new ContentPage
+            {
+                Header = viewModel.Name,
+                Background = new SolidColorBrush(Color.FromArgb(18, viewModel.AccentColor.R, viewModel.AccentColor.G, viewModel.AccentColor.B)),
+                Content = new ScrollViewer { Content = panel },
+                HorizontalContentAlignment = HorizontalAlignment.Stretch,
+                VerticalContentAlignment = VerticalAlignment.Stretch,
+            };
+        }
+
+        private static ContentPage CreateProjectActivityPage(ProjectActivityViewModel viewModel)
+        {
+            var panel = new StackPanel
+            {
+                Margin = new Thickness(24, 20),
+                Spacing = 10,
+            };
+
+            panel.Children.Add(new TextBlock
+            {
+                Text = "Activity Timeline",
+                FontSize = 24,
+                FontWeight = FontWeight.Bold,
+            });
+            panel.Children.Add(new TextBlock
+            {
+                Text = $"Recent updates for {viewModel.Name}. This page was opened from a command on the detail view model.",
+                FontSize = 13,
+                Opacity = 0.74,
+                TextWrapping = TextWrapping.Wrap,
+            });
+
+            foreach (var item in viewModel.Items)
+            {
+                panel.Children.Add(new Border
+                {
+                    Background = new SolidColorBrush(Color.FromArgb(14, viewModel.AccentColor.R, viewModel.AccentColor.G, viewModel.AccentColor.B)),
+                    BorderBrush = new SolidColorBrush(Color.FromArgb(80, viewModel.AccentColor.R, viewModel.AccentColor.G, viewModel.AccentColor.B)),
+                    BorderThickness = new Thickness(1),
+                    CornerRadius = new CornerRadius(6),
+                    Padding = new Thickness(12, 10),
+                    Child = new TextBlock
+                    {
+                        Text = item,
+                        FontSize = 13,
+                        TextWrapping = TextWrapping.Wrap,
+                    }
+                });
+            }
+
+            return new ContentPage
+            {
+                Header = "Activity",
+                Content = new ScrollViewer { Content = panel },
+                HorizontalContentAlignment = HorizontalAlignment.Stretch,
+                VerticalContentAlignment = VerticalAlignment.Stretch,
+            };
+        }
+    }
+}
diff --git a/samples/ControlCatalog/Pages/NavigationPage/NavigationPageMvvmViewModels.cs b/samples/ControlCatalog/Pages/NavigationPage/NavigationPageMvvmViewModels.cs
new file mode 100644
index 0000000000..b2e8f5623f
--- /dev/null
+++ b/samples/ControlCatalog/Pages/NavigationPage/NavigationPageMvvmViewModels.cs
@@ -0,0 +1,238 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Avalonia.Media;
+using MiniMvvm;
+
+namespace ControlCatalog.Pages
+{
+    public sealed class NavigationPageMvvmShellViewModel : ViewModelBase
+    {
+        private readonly ISampleNavigationService _navigationService;
+        private string _currentPageHeader = "Not initialized";
+        private string _lastAction = "Waiting for first load";
+        private int _navigationDepth;
+        private ProjectCardViewModel? _selectedProject;
+
+        internal NavigationPageMvvmShellViewModel(ISampleNavigationService navigationService)
+        {
+            _navigationService = navigationService;
+            _navigationService.StateChanged += OnStateChanged;
+
+            Workspace = new WorkspaceViewModel(CreateProjects(navigationService));
+            SelectedProject = Workspace.Projects[0];
+
+            OpenSelectedProjectCommand = MiniCommand.CreateFromTask(OpenSelectedProjectAsync);
+            GoBackCommand = MiniCommand.CreateFromTask(_navigationService.GoBackAsync);
+            PopToRootCommand = MiniCommand.CreateFromTask(_navigationService.PopToRootAsync);
+        }
+
+        internal WorkspaceViewModel Workspace { get; }
+
+        public IReadOnlyList<ProjectCardViewModel> Projects => Workspace.Projects;
+
+        public MiniCommand OpenSelectedProjectCommand { get; }
+
+        public MiniCommand GoBackCommand { get; }
+
+        public MiniCommand PopToRootCommand { get; }
+
+        public string CurrentPageHeader
+        {
+            get => _currentPageHeader;
+            set => this.RaiseAndSetIfChanged(ref _currentPageHeader, value);
+        }
+
+        public int NavigationDepth
+        {
+            get => _navigationDepth;
+            set => this.RaiseAndSetIfChanged(ref _navigationDepth, value);
+        }
+
+        public string LastAction
+        {
+            get => _lastAction;
+            set => this.RaiseAndSetIfChanged(ref _lastAction, value);
+        }
+
+        public ProjectCardViewModel? SelectedProject
+        {
+            get => _selectedProject;
+            set => this.RaiseAndSetIfChanged(ref _selectedProject, value);
+        }
+
+        public Task InitializeAsync() => _navigationService.NavigateToAsync(Workspace);
+
+        private async Task OpenSelectedProjectAsync()
+        {
+            if (SelectedProject == null)
+                return;
+
+            await SelectedProject.OpenCommandAsync();
+        }
+
+        private void OnStateChanged(object? sender, NavigationStateChangedEventArgs e)
+        {
+            CurrentPageHeader = e.CurrentPageHeader;
+            NavigationDepth = e.NavigationDepth;
+            LastAction = e.LastAction;
+        }
+
+        private static IReadOnlyList<ProjectCardViewModel> CreateProjects(ISampleNavigationService navigationService) =>
+            new[]
+            {
+                new ProjectCardViewModel(
+                    "Release Radar",
+                    "Marta Collins",
+                    "Ready for QA",
+                    "Coordinate the 11.0 release checklist and lock down the final regression window.",
+                    "Freeze build on Friday",
+                    Color.Parse("#0063B1"),
+                    navigationService,
+                    new[]
+                    {
+                        "Release notes draft updated with accessibility fixes.",
+                        "Package validation finished for desktop artifacts.",
+                        "Remaining task, confirm browser smoke test coverage."
+                    }),
+                new ProjectCardViewModel(
+                    "Support Console",
+                    "Jae Kim",
+                    "Active Sprint",
+                    "Consolidate customer incidents into a triage board and route them to platform owners.",
+                    "Triage review in 2 hours",
+                    Color.Parse("#0F7B0F"),
+                    navigationService,
+                    new[]
+                    {
+                        "Five customer reports grouped under input routing.",
+                        "Hotfix candidate approved for preview branch.",
+                        "Awaiting macOS verification on native embed scenarios."
+                    }),
+                new ProjectCardViewModel(
+                    "Docs Refresh",
+                    "Anika Patel",
+                    "Needs Review",
+                    "Refresh navigation samples and walkthrough docs so the gallery matches the current API.",
+                    "Sample review tomorrow",
+                    Color.Parse("#8E562E"),
+                    navigationService,
+                    new[]
+                    {
+                        "NavigationPage sample matrix reviewed with design.",
+                        "MVVM walkthrough draft linked from the docs backlog.",
+                        "Outstanding task, capture one more screenshot for drawer navigation."
+                    }),
+            };
+    }
+
+    internal sealed class WorkspaceViewModel : ViewModelBase
+    {
+        public WorkspaceViewModel(IReadOnlyList<ProjectCardViewModel> projects)
+        {
+            Projects = projects;
+        }
+
+        public string Title => "Team Workspace";
+
+        public string Description =>
+            "Each card is a project view model with its own command. The command asks ISampleNavigationService to navigate with the next view model, and SamplePageFactory resolves the matching ContentPage.";
+
+        public IReadOnlyList<ProjectCardViewModel> Projects { get; }
+    }
+
+    public sealed class ProjectCardViewModel : ViewModelBase
+    {
+        private readonly ISampleNavigationService _navigationService;
+
+        internal ProjectCardViewModel(
+            string name,
+            string owner,
+            string status,
+            string summary,
+            string nextMilestone,
+            Color accentColor,
+            ISampleNavigationService navigationService,
+            IReadOnlyList<string> activityItems)
+        {
+            Name = name;
+            Owner = owner;
+            Status = status;
+            Summary = summary;
+            NextMilestone = nextMilestone;
+            AccentColor = accentColor;
+            ActivityItems = activityItems;
+            _navigationService = navigationService;
+
+            OpenCommand = MiniCommand.CreateFromTask(OpenCommandAsync);
+        }
+
+        public string Name { get; }
+
+        public string Owner { get; }
+
+        public string Status { get; }
+
+        public string Summary { get; }
+
+        public string NextMilestone { get; }
+
+        public Color AccentColor { get; }
+
+        public IReadOnlyList<string> ActivityItems { get; }
+
+        public MiniCommand OpenCommand { get; }
+
+        public Task OpenCommandAsync()
+        {
+            return _navigationService.NavigateToAsync(new ProjectDetailViewModel(this, _navigationService));
+        }
+    }
+
+    internal sealed class ProjectDetailViewModel : ViewModelBase
+    {
+        private readonly ProjectCardViewModel _project;
+        private readonly ISampleNavigationService _navigationService;
+
+        public ProjectDetailViewModel(ProjectCardViewModel project, ISampleNavigationService navigationService)
+        {
+            _project = project;
+            _navigationService = navigationService;
+            OpenActivityCommand = MiniCommand.CreateFromTask(OpenActivityAsync);
+        }
+
+        public string Name => _project.Name;
+
+        public string Owner => _project.Owner;
+
+        public string Status => _project.Status;
+
+        public string Summary => _project.Summary;
+
+        public string NextMilestone => _project.NextMilestone;
+
+        public Color AccentColor => _project.AccentColor;
+
+        public MiniCommand OpenActivityCommand { get; }
+
+        private Task OpenActivityAsync()
+        {
+            return _navigationService.NavigateToAsync(new ProjectActivityViewModel(_project));
+        }
+    }
+
+    internal sealed class ProjectActivityViewModel : ViewModelBase
+    {
+        public ProjectActivityViewModel(ProjectCardViewModel project)
+        {
+            Name = project.Name;
+            AccentColor = project.AccentColor;
+            Items = project.ActivityItems;
+        }
+
+        public string Name { get; }
+
+        public Color AccentColor { get; }
+
+        public IReadOnlyList<string> Items { get; }
+    }
+}
diff --git a/samples/ControlCatalog/Pages/NavigationPage/NavigationPagePassDataPage.xaml.cs b/samples/ControlCatalog/Pages/NavigationPage/NavigationPagePassDataPage.xaml.cs
index 316de594eb..2d486c29f8 100644
--- a/samples/ControlCatalog/Pages/NavigationPage/NavigationPagePassDataPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/NavigationPage/NavigationPagePassDataPage.xaml.cs
@@ -19,6 +19,7 @@ namespace ControlCatalog.Pages
             new("Emma Brown", "UX Researcher", "Germany", Color.Parse("#F44336")),
         };
 
+        private bool _initialized;
         private bool _isLoaded;
 
         public NavigationPagePassDataPage()
@@ -31,6 +32,11 @@ namespace ControlCatalog.Pages
         {
             _isLoaded = true;
 
+            if (_initialized)
+                return;
+
+            _initialized = true;
+
             DemoNav.Pushed += (s, ev) => AppendNavigationLog($"Pushed → {ev.Page?.Header}");
             DemoNav.Popped += (s, ev) => AppendNavigationLog($"Popped ← {ev.Page?.Header}");
 
diff --git a/samples/ControlCatalog/Pages/NavigationPage/NavigationPageScrollAwarePage.xaml.cs b/samples/ControlCatalog/Pages/NavigationPage/NavigationPageScrollAwarePage.xaml.cs
index 2aeb1052bf..f4c550acd3 100644
--- a/samples/ControlCatalog/Pages/NavigationPage/NavigationPageScrollAwarePage.xaml.cs
+++ b/samples/ControlCatalog/Pages/NavigationPage/NavigationPageScrollAwarePage.xaml.cs
@@ -21,8 +21,10 @@ namespace ControlCatalog.Pages
         }
 
         private IDisposable? _scrollSubscription;
+        private ScrollViewer? _scrollViewer;
         private double _lastScrollY;
         private double _currentTranslateY;
+        private bool _initialized;
 
         public NavigationPageScrollAwarePage()
         {
@@ -33,12 +35,21 @@ namespace ControlCatalog.Pages
 
         private async void OnLoaded(object? sender, RoutedEventArgs e)
         {
-            var scrollViewer = new ScrollViewer { Content = BuildLongContent() };
+            if (_initialized)
+            {
+                if (_scrollViewer != null)
+                    Dispatcher.UIThread.Post(() => AttachScrollWatcher(_scrollViewer), DispatcherPriority.Loaded);
+                return;
+            }
+
+            _initialized = true;
+
+            _scrollViewer = new ScrollViewer { Content = BuildLongContent() };
 
             var rootPage = new ContentPage
             {
                 Header = "Scroll to Hide Bar",
-                Content = scrollViewer,
+                Content = _scrollViewer,
                 HorizontalContentAlignment = HorizontalAlignment.Stretch,
                 VerticalContentAlignment = VerticalAlignment.Stretch,
             };
@@ -46,13 +57,18 @@ namespace ControlCatalog.Pages
             NavigationPage.SetBarLayoutBehavior(rootPage, BarLayoutBehavior.Overlay);
             await DemoNav.PushAsync(rootPage, null);
 
-            Dispatcher.UIThread.Post(() => AttachScrollWatcher(scrollViewer), DispatcherPriority.Loaded);
+            Dispatcher.UIThread.Post(() => AttachScrollWatcher(_scrollViewer), DispatcherPriority.Loaded);
         }
 
         private void OnUnloaded(object? sender, RoutedEventArgs e) => DetachScrollWatcher();
 
-        private void AttachScrollWatcher(ScrollViewer sv)
+        private void AttachScrollWatcher(ScrollViewer? sv)
         {
+            if (sv == null)
+                return;
+
+            DetachScrollWatcher();
+
             var navBar = DemoNav.GetVisualDescendants().OfType<Border>()
                 .FirstOrDefault(b => b.Name == "PART_NavigationBar");
             if (navBar == null)
diff --git a/samples/ControlCatalog/Pages/NavigationPage/NavigationPageStackPage.xaml.cs b/samples/ControlCatalog/Pages/NavigationPage/NavigationPageStackPage.xaml.cs
index 1aa64e996a..a7c78d9e48 100644
--- a/samples/ControlCatalog/Pages/NavigationPage/NavigationPageStackPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/NavigationPage/NavigationPageStackPage.xaml.cs
@@ -9,6 +9,7 @@ namespace ControlCatalog.Pages
 {
     public partial class NavigationPageStackPage : UserControl
     {
+        private bool _initialized;
         private int _pageCount;
 
         public NavigationPageStackPage()
@@ -19,6 +20,10 @@ namespace ControlCatalog.Pages
 
         private async void OnLoaded(object? sender, RoutedEventArgs e)
         {
+            if (_initialized)
+                return;
+
+            _initialized = true;
             DemoNav.Pushed       += (s, ev) => RefreshStack();
             DemoNav.Popped       += (s, ev) => RefreshStack();
             DemoNav.PoppedToRoot += (s, ev) => RefreshStack();
diff --git a/samples/ControlCatalog/Pages/NavigationPage/NavigationPageTitlePage.xaml.cs b/samples/ControlCatalog/Pages/NavigationPage/NavigationPageTitlePage.xaml.cs
index d533929b13..521cf55f04 100644
--- a/samples/ControlCatalog/Pages/NavigationPage/NavigationPageTitlePage.xaml.cs
+++ b/samples/ControlCatalog/Pages/NavigationPage/NavigationPageTitlePage.xaml.cs
@@ -8,6 +8,7 @@ namespace ControlCatalog.Pages
 {
     public partial class NavigationPageTitlePage : UserControl
     {
+        private bool _initialized;
         private int _pageCount;
 
         public NavigationPageTitlePage()
@@ -18,6 +19,10 @@ namespace ControlCatalog.Pages
 
         private async void OnLoaded(object? sender, RoutedEventArgs e)
         {
+            if (_initialized)
+                return;
+
+            _initialized = true;
             await DemoNav.PushAsync(NavigationDemoHelper.MakePage("Home", "Choose a header type and tap 'Push'.", 0), null);
             StatusText.Text = "Current: Home";
         }
diff --git a/samples/ControlCatalog/Pages/NavigationPage/NavigationPageToolbarPage.xaml.cs b/samples/ControlCatalog/Pages/NavigationPage/NavigationPageToolbarPage.xaml.cs
index 48501c5205..c141f47781 100644
--- a/samples/ControlCatalog/Pages/NavigationPage/NavigationPageToolbarPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/NavigationPage/NavigationPageToolbarPage.xaml.cs
@@ -7,6 +7,7 @@ namespace ControlCatalog.Pages
 {
     public partial class NavigationPageToolbarPage : UserControl
     {
+        private bool _initialized;
         private int _pageCount;
         private int _itemCount;
         private ContentPage? _rootPage;
@@ -20,6 +21,10 @@ namespace ControlCatalog.Pages
 
         private async void OnLoaded(object? sender, RoutedEventArgs e)
         {
+            if (_initialized)
+                return;
+
+            _initialized = true;
             _rootPage = NavigationDemoHelper.MakePage("CommandBar Demo",
                 "Use the panel to add CommandBar items.\nTop items appear inside the navigation bar.\nBottom items appear as a separate bar.", 0);
             ApplyPosition();
diff --git a/samples/ControlCatalog/Pages/NavigationPage/NavigationPageTransitionsPage.xaml.cs b/samples/ControlCatalog/Pages/NavigationPage/NavigationPageTransitionsPage.xaml.cs
index 6ce3b9992d..ae556cff57 100644
--- a/samples/ControlCatalog/Pages/NavigationPage/NavigationPageTransitionsPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/NavigationPage/NavigationPageTransitionsPage.xaml.cs
@@ -8,6 +8,7 @@ namespace ControlCatalog.Pages
 {
     public partial class NavigationPageTransitionsPage : UserControl
     {
+        private bool _initialized;
         private int _pageCount;
 
         public NavigationPageTransitionsPage()
@@ -18,6 +19,13 @@ namespace ControlCatalog.Pages
 
         private async void OnLoaded(object? sender, RoutedEventArgs e)
         {
+            if (_initialized)
+            {
+                UpdateTransition();
+                return;
+            }
+
+            _initialized = true;
             await DemoNav.PushAsync(NavigationDemoHelper.MakePage("Transitions", "Choose a transition type and push pages.", 0), null);
             UpdateTransition();
         }
diff --git a/samples/ControlCatalog/Pages/NavigationPage/PulseAppPage.xaml.cs b/samples/ControlCatalog/Pages/NavigationPage/PulseAppPage.xaml.cs
index 04e146d84b..f50d40f151 100644
--- a/samples/ControlCatalog/Pages/NavigationPage/PulseAppPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/NavigationPage/PulseAppPage.xaml.cs
@@ -99,7 +99,7 @@ public partial class PulseAppPage : UserControl
             Content    = homeView,
             Background = new SolidColorBrush(BgDashboard),
             Header     = "Home",
-            Icon       = "M10 20v-6h4v6h5v-8h3L12 3 2 12h3v8z",
+            Icon       = Geometry.Parse("M10 20v-6h4v6h5v-8h3L12 3 2 12h3v8z"),
         };
 
         var workoutsPage = new ContentPage
@@ -107,7 +107,7 @@ public partial class PulseAppPage : UserControl
             Content    = new PulseWorkoutsView(),
             Background = new SolidColorBrush(BgDashboard),
             Header     = "Workouts",
-            Icon       = "M20.57 14.86L22 13.43 20.57 12 17 15.57 8.43 7 12 3.43 10.57 2 9.14 3.43 7.71 2 5.57 4.14 4.14 2.71 2.71 4.14l1.43 1.43L2 7.71l1.43 1.43L2 10.57 3.43 12 7 8.43 15.57 17 12 20.57 13.43 22l1.43-1.43L16.29 22l2.14-2.14 1.43 1.43 1.43-1.43-1.43-1.43L22 16.29z",
+            Icon       = Geometry.Parse("M20.57 14.86L22 13.43 20.57 12 17 15.57 8.43 7 12 3.43 10.57 2 9.14 3.43 7.71 2 5.57 4.14 4.14 2.71 2.71 4.14l1.43 1.43L2 7.71l1.43 1.43L2 10.57 3.43 12 7 8.43 15.57 17 12 20.57 13.43 22l1.43-1.43L16.29 22l2.14-2.14 1.43 1.43 1.43-1.43-1.43-1.43L22 16.29z"),
         };
 
         var profilePage = new ContentPage
@@ -115,7 +115,7 @@ public partial class PulseAppPage : UserControl
             Content    = new PulseProfileView(),
             Background = new SolidColorBrush(BgDashboard),
             Header     = "Profile",
-            Icon       = "M12 2C9.243 2 7 4.243 7 7s2.243 5 5 5 5-2.243 5-5-2.243-5-5-5zM12 14c-5.523 0-10 3.582-10 8a1 1 0 001 1h18a1 1 0 001-1c0-4.418-4.477-8-10-8z",
+            Icon       = Geometry.Parse("M12 2C9.243 2 7 4.243 7 7s2.243 5 5 5 5-2.243 5-5-2.243-5-5-5zM12 14c-5.523 0-10 3.582-10 8a1 1 0 001 1h18a1 1 0 001-1c0-4.418-4.477-8-10-8z"),
         };
 
         tp.Pages = new ObservableCollection<Page> { homePage, workoutsPage, profilePage };
diff --git a/samples/ControlCatalog/Pages/NavigationPage/RetroGamingAppPage.xaml b/samples/ControlCatalog/Pages/NavigationPage/RetroGamingAppPage.xaml
index 7cd254b415..23278161df 100644
--- a/samples/ControlCatalog/Pages/NavigationPage/RetroGamingAppPage.xaml
+++ b/samples/ControlCatalog/Pages/NavigationPage/RetroGamingAppPage.xaml
@@ -48,6 +48,7 @@
   <UserControl.Styles>
     <!-- Nav back button: square bordered box -->
     <Style Selector="NavigationPage /template/ Button#PART_BackButton">
+      <Setter Property="Margin" Value="4,0,0,0"/>
       <Setter Property="Width" Value="32"/>
       <Setter Property="Height" Value="32"/>
       <Setter Property="Padding" Value="0"/>
@@ -55,22 +56,43 @@
       <Setter Property="BorderBrush" Value="{StaticResource RetroCyan}"/>
       <Setter Property="CornerRadius" Value="0"/>
       <Setter Property="Background" Value="{StaticResource RetroSurface}"/>
+      <Setter Property="Foreground" Value="{StaticResource RetroCyan}"/>
     </Style>
-    <Style Selector="NavigationPage /template/ Button#PART_BackButton PathIcon">
+    <Style Selector="NavigationPage /template/ Button#PART_BackButton:pointerover">
+      <Setter Property="Background" Value="#3d2b6e"/>
+      <Setter Property="BorderBrush" Value="{StaticResource RetroCyan}"/>
       <Setter Property="Foreground" Value="{StaticResource RetroCyan}"/>
+    </Style>
+    <Style Selector="NavigationPage /template/ Button#PART_BackButton:pressed">
+      <Setter Property="Background" Value="#1e1035"/>
+      <Setter Property="BorderBrush" Value="{StaticResource RetroCyan}"/>
+      <Setter Property="Foreground" Value="{StaticResource RetroCyan}"/>
+    </Style>
+    <Style Selector="NavigationPage /template/ Path#PART_BackButtonDefaultIcon">
+      <Setter Property="Fill" Value="{StaticResource RetroCyan}"/>
       <Setter Property="Width" Value="16"/>
       <Setter Property="Height" Value="16"/>
     </Style>
+    <Style Selector="NavigationPage /template/ Button#PART_BackButton:pointerover Path#PART_BackButtonDefaultIcon">
+      <Setter Property="Fill" Value="{StaticResource RetroCyan}"/>
+    </Style>
+    <Style Selector="NavigationPage /template/ Button#PART_BackButton:pressed Path#PART_BackButtonDefaultIcon">
+      <Setter Property="Fill" Value="{StaticResource RetroCyan}"/>
+    </Style>
     <Style Selector="NavigationPage /template/ Button#PART_BackButton /template/ ContentPresenter#PART_ContentPresenter">
-      <Setter Property="Background" Value="#cc2d1b4e"/>
+      <Setter Property="Background" Value="Transparent"/>
+      <Setter Property="BorderBrush" Value="{StaticResource RetroCyan}"/>
+      <Setter Property="BorderThickness" Value="1"/>
       <Setter Property="CornerRadius" Value="0"/>
       <Setter Property="Padding" Value="0"/>
     </Style>
     <Style Selector="NavigationPage /template/ Button#PART_BackButton:pointerover /template/ ContentPresenter#PART_ContentPresenter">
-      <Setter Property="Background" Value="#cc3d2b6e"/>
+      <Setter Property="Background" Value="Transparent"/>
+      <Setter Property="BorderBrush" Value="{StaticResource RetroCyan}"/>
     </Style>
     <Style Selector="NavigationPage /template/ Button#PART_BackButton:pressed /template/ ContentPresenter#PART_ContentPresenter">
-      <Setter Property="Background" Value="#cc1e1035"/>
+      <Setter Property="Background" Value="Transparent"/>
+      <Setter Property="BorderBrush" Value="{StaticResource RetroCyan}"/>
     </Style>
 
     <!-- Primary purple button (INSERT COIN TO PLAY) -->
@@ -153,10 +175,5 @@
     <Style Selector="Button.retro-fab:pressed /template/ ContentPresenter#PART_ContentPresenter">
       <Setter Property="Background" Value="#cccc00"/>
     </Style>
-
-    <!-- Nav bar back button: left margin so it doesn't hug the edge -->
-    <Style Selector="NavigationPage /template/ Button#PART_BackButton">
-      <Setter Property="Margin" Value="4,0,0,0"/>
-    </Style>
   </UserControl.Styles>
 </UserControl>
diff --git a/samples/ControlCatalog/Pages/NavigationPage/RetroGamingAppPage.xaml.cs b/samples/ControlCatalog/Pages/NavigationPage/RetroGamingAppPage.xaml.cs
index 46951950b7..25091493ea 100644
--- a/samples/ControlCatalog/Pages/NavigationPage/RetroGamingAppPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/NavigationPage/RetroGamingAppPage.xaml.cs
@@ -51,11 +51,30 @@ public partial class RetroGamingAppPage : UserControl
             _infoPanel.IsVisible = Bounds.Width >= 650;
     }
 
+    void ApplyHomeNavigationBarAppearance()
+    {
+        if (_nav == null)
+            return;
+
+        _nav.Resources["NavigationBarBackground"] = new SolidColorBrush(SurfaceColor);
+        _nav.Resources["NavigationBarForeground"] = new SolidColorBrush(CyanColor);
+    }
+
+    void ApplyDetailNavigationBarAppearance()
+    {
+        if (_nav == null)
+            return;
+
+        _nav.Resources["NavigationBarBackground"] = Brushes.Transparent;
+        _nav.Resources["NavigationBarForeground"] = new SolidColorBrush(CyanColor);
+    }
+
     ContentPage BuildHomePage()
     {
         var page = new ContentPage { Background = new SolidColorBrush(BgColor) };
         page.Header = BuildPixelArcadeLogo();
         NavigationPage.SetTopCommandBar(page, BuildNavBarRight());
+        ApplyHomeNavigationBarAppearance();
 
         var panel = new Panel();
         panel.Children.Add(BuildHomeTabbedPage());
@@ -174,7 +193,7 @@ public partial class RetroGamingAppPage : UserControl
         var homeTab = new ContentPage
         {
             Header     = "Home",
-            Icon       = "M10,20V14H14V20H19V12H22L12,3L2,12H5V20H10Z",
+            Icon       = Geometry.Parse("M10,20V14H14V20H19V12H22L12,3L2,12H5V20H10Z"),
             Background = new SolidColorBrush(BgColor),
             Content    = homeView,
         };
@@ -185,7 +204,7 @@ public partial class RetroGamingAppPage : UserControl
         var gamesTab = new ContentPage
         {
             Header     = "Games",
-            Icon       = "M7.97,16L5,19C4.67,19.3 4.23,19.5 3.75,19.5A1.75,1.75 0 0,1 2,17.75V17.5L3,10.12C3.21,7.81 5.14,6 7.5,6H16.5C18.86,6 20.79,7.81 21,10.12L22,17.5V17.75A1.75,1.75 0 0,1 20.25,19.5C19.77,19.5 19.33,19.3 19,19L16.03,16H7.97M7,9V11H5V13H7V15H9V13H11V11H9V9H7M14.5,12A1.5,1.5 0 0,0 13,13.5A1.5,1.5 0 0,0 14.5,15A1.5,1.5 0 0,0 16,13.5A1.5,1.5 0 0,0 14.5,12M17.5,9A1.5,1.5 0 0,0 16,10.5A1.5,1.5 0 0,0 17.5,12A1.5,1.5 0 0,0 19,10.5A1.5,1.5 0 0,0 17.5,9Z",
+            Icon       = Geometry.Parse("M7.97,16L5,19C4.67,19.3 4.23,19.5 3.75,19.5A1.75,1.75 0 0,1 2,17.75V17.5L3,10.12C3.21,7.81 5.14,6 7.5,6H16.5C18.86,6 20.79,7.81 21,10.12L22,17.5V17.75A1.75,1.75 0 0,1 20.25,19.5C19.77,19.5 19.33,19.3 19,19L16.03,16H7.97M7,9V11H5V13H7V15H9V13H11V11H9V9H7M14.5,12A1.5,1.5 0 0,0 13,13.5A1.5,1.5 0 0,0 14.5,15A1.5,1.5 0 0,0 16,13.5A1.5,1.5 0 0,0 14.5,12M17.5,9A1.5,1.5 0 0,0 16,10.5A1.5,1.5 0 0,0 17.5,12A1.5,1.5 0 0,0 19,10.5A1.5,1.5 0 0,0 17.5,9Z"),
             Background = new SolidColorBrush(BgColor),
             Content    = gamesView,
         };
@@ -193,7 +212,7 @@ public partial class RetroGamingAppPage : UserControl
         var favTab = new ContentPage
         {
             Header     = "Favorites",
-            Icon       = "M12,21.35L10.55,20.03C5.4,15.36 2,12.27 2,8.5C2,5.41 4.42,3 7.5,3C9.24,3 10.91,3.81 12,5.08C13.09,3.81 14.76,3 16.5,3C19.58,3 22,5.41 22,8.5C22,12.27 18.6,15.36 13.45,20.03L12,21.35Z",
+            Icon       = Geometry.Parse("M12,21.35L10.55,20.03C5.4,15.36 2,12.27 2,8.5C2,5.41 4.42,3 7.5,3C9.24,3 10.91,3.81 12,5.08C13.09,3.81 14.76,3 16.5,3C19.58,3 22,5.41 22,8.5C22,12.27 18.6,15.36 13.45,20.03L12,21.35Z"),
             Background = new SolidColorBrush(BgColor),
             Content    = new RetroGamingFavoritesView(),
         };
@@ -201,7 +220,7 @@ public partial class RetroGamingAppPage : UserControl
         var profileTab = new ContentPage
         {
             Header     = "Profile",
-            Icon       = "M12,4A4,4 0 0,1 16,8A4,4 0 0,1 12,12A4,4 0 0,1 8,8A4,4 0 0,1 12,4M12,14C16.42,14 20,15.79 20,18V20H4V18C4,15.79 7.58,14 12,14Z",
+            Icon       = Geometry.Parse("M12,4A4,4 0 0,1 16,8A4,4 0 0,1 12,12A4,4 0 0,1 8,8A4,4 0 0,1 12,4M12,14C16.42,14 20,15.79 20,18V20H4V18C4,15.79 7.58,14 12,14Z"),
             Background = new SolidColorBrush(BgColor),
             Content    = new RetroGamingProfileView(),
         };
@@ -260,7 +279,8 @@ public partial class RetroGamingAppPage : UserControl
 
     async void PushDetailPage(string gameTitle)
     {
-        if (_nav == null) return;
+        if (_nav == null)
+            return;
 
         var detailView = new RetroGamingDetailView(gameTitle);
 
@@ -271,8 +291,13 @@ public partial class RetroGamingAppPage : UserControl
         };
 
         NavigationPage.SetBarLayoutBehavior(page, BarLayoutBehavior.Overlay);
-        page.NavigatedTo   += (_, _) => { if (_nav != null) _nav.Resources["NavigationBarBackground"] = Brushes.Transparent; };
-        page.NavigatedFrom += (_, _) => { if (_nav != null) _nav.Resources["NavigationBarBackground"] = new SolidColorBrush(SurfaceColor); };
+        page.Navigating += args =>
+        {
+            if (args.NavigationType == NavigationType.Pop)
+                ApplyHomeNavigationBarAppearance();
+
+            return Task.CompletedTask;
+        };
 
         var cmdBar = new StackPanel
         {
@@ -301,6 +326,10 @@ public partial class RetroGamingAppPage : UserControl
         cmdBar.Children.Add(shareBtn);
         NavigationPage.SetTopCommandBar(page, cmdBar);
 
+        ApplyDetailNavigationBarAppearance();
         await _nav.PushAsync(page);
+
+        if (!ReferenceEquals(_nav.CurrentPage, page))
+            ApplyHomeNavigationBarAppearance();
     }
 }
diff --git a/samples/ControlCatalog/Pages/PipsPagerPage.xaml.cs b/samples/ControlCatalog/Pages/PipsPagerPage.xaml.cs
index 8f27cc61f8..33cc6d0fdf 100644
--- a/samples/ControlCatalog/Pages/PipsPagerPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/PipsPagerPage.xaml.cs
@@ -31,6 +31,13 @@ namespace ControlCatalog.Pages
             ("Appearance", "Custom Templates",
                 "Override pip item templates to create squares, pills, numbers, or any custom shape.",
                 () => new PipsPagerCustomTemplatesPage()),
+
+            ("Showcases", "Care Companion",
+                "A health care onboarding flow using PipsPager as the page indicator for a CarouselPage.",
+                () => new CareCompanionAppPage()),
+            ("Showcases", "Sanctuary",
+                "A travel discovery app using PipsPager as the page indicator for a CarouselPage.",
+                () => new SanctuaryShowcasePage()),
         };
 
         public PipsPagerPage()
diff --git a/samples/ControlCatalog/Pages/TabbedDemoPage.xaml.cs b/samples/ControlCatalog/Pages/TabbedDemoPage.xaml.cs
index f4e65249ce..51da6330a1 100644
--- a/samples/ControlCatalog/Pages/TabbedDemoPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/TabbedDemoPage.xaml.cs
@@ -18,7 +18,7 @@ namespace ControlCatalog.Pages
                 "Populate a TabbedPage by adding ContentPage objects directly to the Pages collection.",
                 () => new TabbedPageCollectionPage()),
             ("Populate", "Data Templates",
-                "Populate a TabbedPage with a data collection and a custom PageTemplate to render each item.",
+                "Bind TabbedPage to an ObservableCollection, add or remove tabs at runtime, and switch the page template.",
                 () => new TabbedPageDataTemplatePage()),
 
             // Appearance
diff --git a/samples/ControlCatalog/Pages/TabbedPage/TabbedPageCustomTabBarPage.xaml.cs b/samples/ControlCatalog/Pages/TabbedPage/TabbedPageCustomTabBarPage.xaml.cs
index bb7302c1cd..b1a692b85a 100644
--- a/samples/ControlCatalog/Pages/TabbedPage/TabbedPageCustomTabBarPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/TabbedPage/TabbedPageCustomTabBarPage.xaml.cs
@@ -5,7 +5,6 @@ namespace ControlCatalog.Pages
 {
     public partial class TabbedPageCustomTabBarPage : UserControl
     {
-        // Fluent UI icon geometries (24x24 viewbox)
         private static readonly StreamGeometry HomeGeometry =
             StreamGeometry.Parse("M12.9942 2.79444C12.4118 2.30208 11.5882 2.30208 11.0058 2.79444L3.50582 9.39444C3.18607 9.66478 3 10.0634 3 10.4828V20.25C3 20.9404 3.55964 21.5 4.25 21.5H8.25C8.94036 21.5 9.5 20.9404 9.5 20.25V14.75C9.5 14.6119 9.61193 14.5 9.75 14.5H14.25C14.3881 14.5 14.5 14.6119 14.5 14.75V20.25C14.5 20.9404 15.0596 21.5 15.75 21.5H19.75C20.4404 21.5 21 20.9404 21 20.25V10.4828C21 10.0634 20.8139 9.66478 20.4942 9.39444L12.9942 2.79444Z");
         private static readonly StreamGeometry WalletGeometry =
@@ -25,16 +24,11 @@ namespace ControlCatalog.Pages
 
         private void SetupIcons()
         {
-            SetIcon(HomePage, HomeGeometry);
-            SetIcon(WalletPage, WalletGeometry);
-            SetIcon(SendPage, SendGeometry);
-            SetIcon(ActivityPage, ActivityGeometry);
-            SetIcon(ProfilePage, ProfileGeometry);
-        }
-
-        private static void SetIcon(ContentPage page, StreamGeometry geometry)
-        {
-            page.Icon = geometry;
+            HomePage.Icon = new PathIcon { Data = HomeGeometry };
+            WalletPage.Icon = new PathIcon { Data = WalletGeometry };
+            SendPage.Icon = new PathIcon { Data = SendGeometry };
+            ActivityPage.Icon = new PathIcon { Data = ActivityGeometry };
+            ProfilePage.Icon = new PathIcon { Data = ProfileGeometry };
         }
     }
 }
diff --git a/samples/ControlCatalog/Pages/TabbedPage/TabbedPageCustomizationPage.xaml.cs b/samples/ControlCatalog/Pages/TabbedPage/TabbedPageCustomizationPage.xaml.cs
index dc72759c5e..b4eb6d9b49 100644
--- a/samples/ControlCatalog/Pages/TabbedPage/TabbedPageCustomizationPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/TabbedPage/TabbedPageCustomizationPage.xaml.cs
@@ -109,14 +109,9 @@ namespace ControlCatalog.Pages
         private void OnShowIconsChanged(object? sender, RoutedEventArgs e)
         {
             bool show = ShowIconsCheck.IsChecked == true;
-            SetIcon(HomePage, show ? HomeGeometry : null);
-            SetIcon(SearchPage, show ? SearchGeometry : null);
-            SetIcon(SettingsPage, show ? SettingsGeometry : null);
-        }
-
-        private static void SetIcon(ContentPage page, StreamGeometry? geometry)
-        {
-            page.Icon = geometry;
+            HomePage.Icon = show ? new PathIcon { Data = HomeGeometry } : null;
+            SearchPage.Icon = show ? new PathIcon { Data = SearchGeometry } : null;
+            SettingsPage.Icon = show ? new PathIcon { Data = SettingsGeometry } : null;
         }
 
         private void OnTabEnabledChanged(object? sender, RoutedEventArgs e)
diff --git a/samples/ControlCatalog/Pages/TabbedPage/TabbedPageDataTemplatePage.xaml b/samples/ControlCatalog/Pages/TabbedPage/TabbedPageDataTemplatePage.xaml
index e2f5771028..dcb16a99a5 100644
--- a/samples/ControlCatalog/Pages/TabbedPage/TabbedPageDataTemplatePage.xaml
+++ b/samples/ControlCatalog/Pages/TabbedPage/TabbedPageDataTemplatePage.xaml
@@ -8,16 +8,25 @@
                    Foreground="{DynamicResource SystemControlHighlightAccentBrush}" />
 
         <TextBlock FontSize="12" Opacity="0.7" TextWrapping="Wrap"
-                   Text="Bind a TabbedPage to a data collection and use PageTemplate to render each item as a ContentPage." />
+                   Text="Bind a TabbedPage to a data collection, render each item with PageTemplate, and switch templates at runtime." />
 
         <Separator />
 
         <Button Content="Add Category" Click="OnAddCategory" HorizontalAlignment="Stretch" />
         <Button Content="Remove Last" Click="OnRemoveCategory" HorizontalAlignment="Stretch" />
+        <Button Content="Switch Template" Click="OnSwitchTemplate" HorizontalAlignment="Stretch" />
 
         <Separator />
 
-        <TextBlock x:Name="StatusText" Text="3 categories" Opacity="0.7" />
+        <TextBlock Text="Navigate" FontWeight="SemiBold" FontSize="13" />
+        <StackPanel Spacing="6">
+          <Button Content="Previous" Click="OnPrevious" HorizontalAlignment="Stretch" />
+          <Button Content="Next" Click="OnNext" HorizontalAlignment="Stretch" />
+        </StackPanel>
+
+        <Separator />
+
+        <TextBlock x:Name="StatusText" Text="3 tabs" Opacity="0.7" />
       </StackPanel>
     </ScrollViewer>
 
diff --git a/samples/ControlCatalog/Pages/TabbedPage/TabbedPageDataTemplatePage.xaml.cs b/samples/ControlCatalog/Pages/TabbedPage/TabbedPageDataTemplatePage.xaml.cs
index 44f5179247..169735ce65 100644
--- a/samples/ControlCatalog/Pages/TabbedPage/TabbedPageDataTemplatePage.xaml.cs
+++ b/samples/ControlCatalog/Pages/TabbedPage/TabbedPageDataTemplatePage.xaml.cs
@@ -1,5 +1,7 @@
 using System.Collections.ObjectModel;
+using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Controls.Templates;
 using Avalonia.Interactivity;
 using Avalonia.Layout;
 using Avalonia.Media;
@@ -8,18 +10,32 @@ namespace ControlCatalog.Pages
 {
     public partial class TabbedPageDataTemplatePage : UserControl
     {
-        private static readonly (string Name, string Color)[] CategoryData =
+        private sealed class CategoryViewModel
         {
-            ("Electronics", "#1565C0"),
-            ("Books",       "#2E7D32"),
-            ("Clothing",    "#6A1B9A"),
+            public string Name { get; }
+            public string Color { get; }
+
+            public CategoryViewModel(string name, string color)
+            {
+                Name = name;
+                Color = color;
+            }
+        }
+
+        private static readonly CategoryViewModel[] InitialData =
+        {
+            new("Electronics", "#1565C0"), new("Books", "#2E7D32"), new("Clothing", "#6A1B9A"),
         };
 
-        private static readonly string[] AddNames   = { "Sports", "Music", "Garden", "Toys", "Food" };
-        private static readonly string[] AddColors  = { "#E53935", "#F57C00", "#00796B", "#E91E63", "#3F51B5" };
+        private static readonly CategoryViewModel[] AddData =
+        {
+            new("Sports", "#E53935"), new("Music", "#F57C00"), new("Garden", "#00796B"), new("Toys", "#E91E63"),
+            new("Food", "#3F51B5")
+        };
 
-        private readonly ObservableCollection<Page> _pages = new();
+        private readonly ObservableCollection<CategoryViewModel> _items = new();
         private int _addCounter;
+        private bool _useDetailTemplate = true;
         private TabbedPage? _tabbedPage;
 
         public TabbedPageDataTemplatePage()
@@ -30,48 +46,99 @@ namespace ControlCatalog.Pages
 
         private void OnLoaded(object? sender, RoutedEventArgs e)
         {
-            foreach (var (name, color) in CategoryData)
-                _pages.Add(CreatePage(name, color));
+            if (_tabbedPage != null)
+                return;
 
-            _addCounter = CategoryData.Length;
+            foreach (var vm in InitialData)
+                _items.Add(vm);
+            _addCounter = InitialData.Length;
+            _useDetailTemplate = true;
 
             _tabbedPage = new TabbedPage
             {
-                TabPlacement = TabPlacement.Top,
-                Pages = _pages
+                TabPlacement = TabPlacement.Top, ItemsSource = _items, PageTemplate = CreatePageTemplate()
             };
 
+            _tabbedPage.SelectionChanged += OnSelectionChanged;
             TabbedPageHost.Children.Add(_tabbedPage);
             UpdateStatus();
         }
 
         private void OnAddCategory(object? sender, RoutedEventArgs e)
         {
-            var idx = _addCounter % AddNames.Length;
-            var name = AddNames[idx] + (_addCounter >= AddNames.Length ? $" {_addCounter / AddNames.Length + 1}" : "");
-            _pages.Add(CreatePage(name, AddColors[idx]));
+            var idx = _addCounter % AddData.Length;
+            var vm = AddData[idx];
+            var suffix = _addCounter >= AddData.Length ? $" {_addCounter / AddData.Length + 1}" : "";
+            _items.Add(new CategoryViewModel(vm.Name + suffix, vm.Color));
             _addCounter++;
             UpdateStatus();
         }
 
         private void OnRemoveCategory(object? sender, RoutedEventArgs e)
         {
-            if (_pages.Count > 0)
+            if (_items.Count > 0)
             {
-                _pages.RemoveAt(_pages.Count - 1);
+                _items.RemoveAt(_items.Count - 1);
                 UpdateStatus();
             }
         }
 
+        private void OnSelectionChanged(object? sender, PageSelectionChangedEventArgs e) => UpdateStatus();
+
+        private void OnSwitchTemplate(object? sender, RoutedEventArgs e)
+        {
+            if (_tabbedPage == null)
+                return;
+
+            _useDetailTemplate = !_useDetailTemplate;
+            _tabbedPage.PageTemplate = CreatePageTemplate();
+            UpdateStatus();
+        }
+
+        private void OnPrevious(object? sender, RoutedEventArgs e)
+        {
+            if (_tabbedPage == null)
+                return;
+
+            if (_tabbedPage.SelectedIndex > 0)
+                _tabbedPage.SelectedIndex--;
+        }
+
+        private void OnNext(object? sender, RoutedEventArgs e)
+        {
+            if (_tabbedPage == null)
+                return;
+
+            if (_tabbedPage.SelectedIndex < _items.Count - 1)
+                _tabbedPage.SelectedIndex++;
+        }
+
         private void UpdateStatus()
         {
-            StatusText.Text = $"{_pages.Count} categor{(_pages.Count == 1 ? "y" : "ies")}";
+            var count = _items.Count;
+            var index = _tabbedPage?.SelectedIndex ?? -1;
+            StatusText.Text = count == 0 ? "No tabs" : $"Tab {index + 1} of {count} (index {index})";
         }
 
-        private static ContentPage CreatePage(string name, string color) => new()
+        private IDataTemplate CreatePageTemplate()
         {
-            Header = name,
-            Content = new StackPanel
+            return new FuncDataTemplate<CategoryViewModel>((vm, _) => CreatePage(vm, _useDetailTemplate));
+        }
+
+        private static ContentPage CreatePage(CategoryViewModel? vm, bool useDetailTemplate)
+        {
+            if (vm is null)
+                return new ContentPage();
+
+            return new ContentPage
+            {
+                Header = vm.Name, Content = useDetailTemplate ? CreateDetailContent(vm) : CreateShowcaseContent(vm)
+            };
+        }
+
+        private static Control CreateDetailContent(CategoryViewModel vm)
+        {
+            return new StackPanel
             {
                 HorizontalAlignment = HorizontalAlignment.Center,
                 VerticalAlignment = VerticalAlignment.Center,
@@ -80,15 +147,15 @@ namespace ControlCatalog.Pages
                 {
                     new TextBlock
                     {
-                        Text = name,
+                        Text = vm.Name,
                         FontSize = 24,
                         FontWeight = FontWeight.SemiBold,
-                        Foreground = new SolidColorBrush(Color.Parse(color)),
+                        Foreground = new SolidColorBrush(Color.Parse(vm.Color)),
                         HorizontalAlignment = HorizontalAlignment.Center
                     },
                     new TextBlock
                     {
-                        Text = $"Tab for category: {name}",
+                        Text = $"Tab for category: {vm.Name}",
                         FontSize = 13,
                         Opacity = 0.7,
                         TextWrapping = TextWrapping.Wrap,
@@ -96,7 +163,45 @@ namespace ControlCatalog.Pages
                         MaxWidth = 280
                     }
                 }
-            }
-        };
+            };
+        }
+
+        private static Control CreateShowcaseContent(CategoryViewModel vm)
+        {
+            var accent = Color.Parse(vm.Color);
+
+            return new Border
+            {
+                Margin = new Thickness(24),
+                CornerRadius = new CornerRadius(18),
+                Background = new SolidColorBrush(accent),
+                Padding = new Thickness(28),
+                Child = new StackPanel
+                {
+                    HorizontalAlignment = HorizontalAlignment.Center,
+                    VerticalAlignment = VerticalAlignment.Center,
+                    Spacing = 10,
+                    Children =
+                    {
+                        new TextBlock
+                        {
+                            Text = vm.Name,
+                            FontSize = 28,
+                            FontWeight = FontWeight.Bold,
+                            Foreground = Brushes.White,
+                            HorizontalAlignment = HorizontalAlignment.Center
+                        },
+                        new TextBlock
+                        {
+                            Text = "Template switched at runtime",
+                            FontSize = 14,
+                            Foreground = Brushes.White,
+                            Opacity = 0.9,
+                            HorizontalAlignment = HorizontalAlignment.Center
+                        }
+                    }
+                }
+            };
+        }
     }
 }
diff --git a/samples/ControlCatalog/Pages/TabbedPage/TabbedPageFabPage.xaml.cs b/samples/ControlCatalog/Pages/TabbedPage/TabbedPageFabPage.xaml.cs
index 5c10a50df7..b52bfd4d8a 100644
--- a/samples/ControlCatalog/Pages/TabbedPage/TabbedPageFabPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/TabbedPage/TabbedPageFabPage.xaml.cs
@@ -28,10 +28,10 @@ namespace ControlCatalog.Pages
 
         private void SetupIcons()
         {
-            FeedPage.Icon = FeedGeometry;
-            DiscoverPage.Icon = DiscoverGeometry;
-            AlertsPage.Icon = AlertsGeometry;
-            ProfilePage.Icon = ProfileGeometry;
+            FeedPage.Icon = new PathIcon { Data = FeedGeometry };
+            DiscoverPage.Icon = new PathIcon { Data = DiscoverGeometry };
+            AlertsPage.Icon = new PathIcon { Data = AlertsGeometry };
+            ProfilePage.Icon = new PathIcon { Data = ProfileGeometry };
         }
 
         private void OnFabClicked(object? sender, RoutedEventArgs e)
diff --git a/samples/ControlCatalog/Pages/TabbedPage/TabbedPageGesturePage.xaml.cs b/samples/ControlCatalog/Pages/TabbedPage/TabbedPageGesturePage.xaml.cs
index bee2c43efd..e17ebc5ed8 100644
--- a/samples/ControlCatalog/Pages/TabbedPage/TabbedPageGesturePage.xaml.cs
+++ b/samples/ControlCatalog/Pages/TabbedPage/TabbedPageGesturePage.xaml.cs
@@ -1,4 +1,6 @@
+using System.Linq;
 using Avalonia.Controls;
+using Avalonia.Input.GestureRecognizers;
 
 namespace ControlCatalog.Pages
 {
@@ -7,6 +9,7 @@ namespace ControlCatalog.Pages
         public TabbedPageGesturePage()
         {
             InitializeComponent();
+            EnableMouseSwipeGesture(DemoTabs);
         }
 
         private void OnGestureEnabledChanged(object? sender, Avalonia.Interactivity.RoutedEventArgs e)
@@ -26,5 +29,15 @@ namespace ControlCatalog.Pages
                 _ => TabPlacement.Top
             };
         }
+
+        private static void EnableMouseSwipeGesture(Control control)
+        {
+            var recognizer = control.GestureRecognizers
+                .OfType<SwipeGestureRecognizer>()
+                .FirstOrDefault();
+
+            if (recognizer is not null)
+                recognizer.IsMouseEnabled = true;
+        }
     }
 }
diff --git a/samples/ControlCatalog/Pages/TabbedPage/TabbedPageWithNavigationPage.xaml b/samples/ControlCatalog/Pages/TabbedPage/TabbedPageWithNavigationPage.xaml
index 1c2c51ae2a..22878ec3c4 100644
--- a/samples/ControlCatalog/Pages/TabbedPage/TabbedPageWithNavigationPage.xaml
+++ b/samples/ControlCatalog/Pages/TabbedPage/TabbedPageWithNavigationPage.xaml
@@ -29,27 +29,21 @@
             CornerRadius="6"
             ClipToBounds="True">
       <TabbedPage x:Name="DemoTabs" TabPlacement="Bottom">
-        <ContentPage Header="Browse">
-          <NavigationPage x:Name="BrowseNav">
-            <NavigationPage.Resources>
-              <SolidColorBrush x:Key="NavigationBarBackground" Color="Transparent" />
-            </NavigationPage.Resources>
-          </NavigationPage>
-        </ContentPage>
-        <ContentPage Header="Search">
-          <NavigationPage x:Name="SearchNav">
-            <NavigationPage.Resources>
-              <SolidColorBrush x:Key="NavigationBarBackground" Color="Transparent" />
-            </NavigationPage.Resources>
-          </NavigationPage>
-        </ContentPage>
-        <ContentPage Header="Account">
-          <NavigationPage x:Name="AccountNav">
-            <NavigationPage.Resources>
-              <SolidColorBrush x:Key="NavigationBarBackground" Color="Transparent" />
-            </NavigationPage.Resources>
-          </NavigationPage>
-        </ContentPage>
+        <NavigationPage x:Name="BrowseNav" Header="Browse">
+          <NavigationPage.Resources>
+            <SolidColorBrush x:Key="NavigationBarBackground" Color="Transparent" />
+          </NavigationPage.Resources>
+        </NavigationPage>
+        <NavigationPage x:Name="SearchNav" Header="Search">
+          <NavigationPage.Resources>
+            <SolidColorBrush x:Key="NavigationBarBackground" Color="Transparent" />
+          </NavigationPage.Resources>
+        </NavigationPage>
+        <NavigationPage x:Name="AccountNav" Header="Account">
+          <NavigationPage.Resources>
+            <SolidColorBrush x:Key="NavigationBarBackground" Color="Transparent" />
+          </NavigationPage.Resources>
+        </NavigationPage>
       </TabbedPage>
     </Border>
   </DockPanel>
diff --git a/samples/ControlCatalog/Pages/TabbedPage/TabbedPageWithNavigationPage.xaml.cs b/samples/ControlCatalog/Pages/TabbedPage/TabbedPageWithNavigationPage.xaml.cs
index e4efec576a..2b7a5a3a41 100644
--- a/samples/ControlCatalog/Pages/TabbedPage/TabbedPageWithNavigationPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/TabbedPage/TabbedPageWithNavigationPage.xaml.cs
@@ -7,6 +7,8 @@ namespace ControlCatalog.Pages
 {
     public partial class TabbedPageWithNavigationPage : UserControl
     {
+        private bool _initialized;
+
         public TabbedPageWithNavigationPage()
         {
             InitializeComponent();
@@ -15,6 +17,10 @@ namespace ControlCatalog.Pages
 
         private async void OnLoaded(object? sender, RoutedEventArgs e)
         {
+            if (_initialized)
+                return;
+
+            _initialized = true;
             await BrowseNav.PushAsync(CreateListPage("Browse", "Items", BrowseNav), null);
             await SearchNav.PushAsync(CreateListPage("Search", "Results", SearchNav), null);
             await AccountNav.PushAsync(CreateListPage("Account", "Options", AccountNav), null);
diff --git a/samples/ControlCatalog/Pages/Transitions/CardStackPageTransition.cs b/samples/ControlCatalog/Pages/Transitions/CardStackPageTransition.cs
new file mode 100644
index 0000000000..89ae1e5e8a
--- /dev/null
+++ b/samples/ControlCatalog/Pages/Transitions/CardStackPageTransition.cs
@@ -0,0 +1,447 @@
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using Avalonia;
+using Avalonia.Animation;
+using Avalonia.Animation.Easings;
+using Avalonia.Media;
+using Avalonia.Styling;
+
+namespace ControlCatalog.Pages.Transitions;
+
+/// <summary>
+/// Transitions between two pages with a card-stack effect:
+/// the top page moves/rotates away while the next page scales up underneath.
+/// </summary>
+public class CardStackPageTransition : PageSlide
+{
+    private const double ViewportLiftScale = 0.03;
+    private const double ViewportPromotionScale = 0.02;
+    private const double ViewportDepthOpacityFalloff = 0.08;
+    private const double SidePeekAngle = 4.0;
+    private const double FarPeekAngle = 7.0;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="CardStackPageTransition"/> class.
+    /// </summary>
+    public CardStackPageTransition()
+    {
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="CardStackPageTransition"/> class.
+    /// </summary>
+    /// <param name="duration">The duration of the animation.</param>
+    /// <param name="orientation">The axis on which the animation should occur.</param>
+    public CardStackPageTransition(TimeSpan duration, PageSlide.SlideAxis orientation = PageSlide.SlideAxis.Horizontal)
+        : base(duration, orientation)
+    {
+    }
+
+    /// <summary>
+    /// Gets or sets the maximum rotation angle (degrees) applied to the top card.
+    /// </summary>
+    public double MaxSwipeAngle { get; set; } = 15.0;
+
+    /// <summary>
+    /// Gets or sets the scale reduction applied to the back card (0.05 = 5%).
+    /// </summary>
+    public double BackCardScale { get; set; } = 0.05;
+
+    /// <summary>
+    /// Gets or sets the vertical offset (pixels) applied to the back card.
+    /// </summary>
+    public double BackCardOffset { get; set; } = 0.0;
+
+    /// <inheritdoc />
+    public override async Task Start(Visual? from, Visual? to, bool forward, CancellationToken cancellationToken)
+    {
+        if (cancellationToken.IsCancellationRequested)
+        {
+            return;
+        }
+
+        var tasks = new List<Task>();
+        var parent = GetVisualParent(from, to);
+        var distance = Orientation == PageSlide.SlideAxis.Horizontal ? parent.Bounds.Width : parent.Bounds.Height;
+        var translateProperty = Orientation == PageSlide.SlideAxis.Horizontal ? TranslateTransform.XProperty : TranslateTransform.YProperty;
+        var rotationTarget = Orientation == PageSlide.SlideAxis.Horizontal ? (forward ? -MaxSwipeAngle : MaxSwipeAngle) : 0.0;
+        var startScale = 1.0 - BackCardScale;
+
+        if (from != null)
+        {
+            var (rotate, translate) = EnsureTopTransforms(from);
+            rotate.Angle = 0;
+            translate.X = 0;
+            translate.Y = 0;
+            from.Opacity = 1;
+            from.ZIndex = 1;
+
+            var animation = new Animation
+            {
+                Easing = SlideOutEasing,
+                Duration = Duration,
+                FillMode = FillMode,
+                Children =
+                {
+                    new KeyFrame
+                    {
+                        Setters =
+                        {
+                            new Setter(translateProperty, 0d),
+                            new Setter(RotateTransform.AngleProperty, 0d)
+                        },
+                        Cue = new Cue(0d)
+                    },
+                    new KeyFrame
+                    {
+                        Setters =
+                        {
+                            new Setter(translateProperty, forward ? -distance : distance),
+                            new Setter(RotateTransform.AngleProperty, rotationTarget)
+                        },
+                        Cue = new Cue(1d)
+                    }
+                }
+            };
+            tasks.Add(animation.RunAsync(from, cancellationToken));
+        }
+
+        if (to != null)
+        {
+            var (scale, translate) = EnsureBackTransforms(to);
+            scale.ScaleX = startScale;
+            scale.ScaleY = startScale;
+            translate.X = 0;
+            translate.Y = BackCardOffset;
+            to.IsVisible = true;
+            to.Opacity = 1;
+            to.ZIndex = 0;
+
+            var animation = new Animation
+            {
+                Easing = SlideInEasing,
+                Duration = Duration,
+                FillMode = FillMode,
+                Children =
+                {
+                    new KeyFrame
+                    {
+                        Setters =
+                        {
+                            new Setter(ScaleTransform.ScaleXProperty, startScale),
+                            new Setter(ScaleTransform.ScaleYProperty, startScale),
+                            new Setter(TranslateTransform.YProperty, BackCardOffset)
+                        },
+                        Cue = new Cue(0d)
+                    },
+                    new KeyFrame
+                    {
+                        Setters =
+                        {
+                            new Setter(ScaleTransform.ScaleXProperty, 1d),
+                            new Setter(ScaleTransform.ScaleYProperty, 1d),
+                            new Setter(TranslateTransform.YProperty, 0d)
+                        },
+                        Cue = new Cue(1d)
+                    }
+                }
+            };
+
+            tasks.Add(animation.RunAsync(to, cancellationToken));
+        }
+
+        await Task.WhenAll(tasks);
+
+        if (from != null && !cancellationToken.IsCancellationRequested)
+        {
+            from.IsVisible = false;
+        }
+
+        if (!cancellationToken.IsCancellationRequested && to != null)
+        {
+            var (scale, translate) = EnsureBackTransforms(to);
+            scale.ScaleX = 1;
+            scale.ScaleY = 1;
+            translate.X = 0;
+            translate.Y = 0;
+        }
+    }
+
+    /// <inheritdoc />
+    public override void Update(
+        double progress,
+        Visual? from,
+        Visual? to,
+        bool forward,
+        double pageLength,
+        IReadOnlyList<PageTransitionItem> visibleItems)
+    {
+        if (visibleItems.Count > 0)
+        {
+            UpdateVisibleItems(progress, from, to, forward, pageLength, visibleItems);
+            return;
+        }
+
+        if (from is null && to is null)
+            return;
+
+        var parent = GetVisualParent(from, to);
+        var size = parent.Bounds.Size;
+        var isHorizontal = Orientation == PageSlide.SlideAxis.Horizontal;
+        var distance = pageLength > 0
+            ? pageLength
+            : (isHorizontal ? size.Width : size.Height);
+        var rotationTarget = isHorizontal ? (forward ? -MaxSwipeAngle : MaxSwipeAngle) : 0.0;
+        var startScale = 1.0 - BackCardScale;
+
+        if (from != null)
+        {
+            var (rotate, translate) = EnsureTopTransforms(from);
+            if (isHorizontal)
+            {
+                translate.X = forward ? -distance * progress : distance * progress;
+                translate.Y = 0;
+            }
+            else
+            {
+                translate.X = 0;
+                translate.Y = forward ? -distance * progress : distance * progress;
+            }
+
+            rotate.Angle = rotationTarget * progress;
+            from.IsVisible = true;
+            from.Opacity = 1;
+            from.ZIndex = 1;
+        }
+
+        if (to != null)
+        {
+            var (scale, translate) = EnsureBackTransforms(to);
+            var currentScale = startScale + (1.0 - startScale) * progress;
+            var currentOffset = BackCardOffset * (1.0 - progress);
+
+            scale.ScaleX = currentScale;
+            scale.ScaleY = currentScale;
+            if (isHorizontal)
+            {
+                translate.X = 0;
+                translate.Y = currentOffset;
+            }
+            else
+            {
+                translate.X = currentOffset;
+                translate.Y = 0;
+            }
+
+            to.IsVisible = true;
+            to.Opacity = 1;
+            to.ZIndex = 0;
+        }
+    }
+
+    /// <inheritdoc />
+    public override void Reset(Visual visual)
+    {
+        visual.RenderTransform = null;
+        visual.RenderTransformOrigin = default;
+        visual.Opacity = 1;
+        visual.ZIndex = 0;
+    }
+
+    private void UpdateVisibleItems(
+        double progress,
+        Visual? from,
+        Visual? to,
+        bool forward,
+        double pageLength,
+        IReadOnlyList<PageTransitionItem> visibleItems)
+    {
+        var isHorizontal = Orientation == PageSlide.SlideAxis.Horizontal;
+        var rotationTarget = isHorizontal
+            ? (forward ? -MaxSwipeAngle : MaxSwipeAngle)
+            : 0.0;
+        var stackOffset = GetViewportStackOffset(pageLength);
+        var lift = Math.Sin(Math.Clamp(progress, 0.0, 1.0) * Math.PI);
+
+        foreach (var item in visibleItems)
+        {
+            var visual = item.Visual;
+            var (rotate, scale, translate) = EnsureViewportTransforms(visual);
+            var depth = GetViewportDepth(item.ViewportCenterOffset);
+            var scaleValue = Math.Max(0.84, 1.0 - (BackCardScale * depth));
+            var stackValue = stackOffset * depth;
+            var baseOpacity = Math.Max(0.8, 1.0 - (ViewportDepthOpacityFalloff * depth));
+            var restingAngle = isHorizontal ? GetViewportRestingAngle(item.ViewportCenterOffset) : 0.0;
+
+            rotate.Angle = restingAngle;
+            scale.ScaleX = scaleValue;
+            scale.ScaleY = scaleValue;
+            translate.X = 0;
+            translate.Y = 0;
+
+            if (ReferenceEquals(visual, from))
+            {
+                rotate.Angle = restingAngle + (rotationTarget * progress);
+                stackValue -= stackOffset * 0.2 * lift;
+                baseOpacity = Math.Min(1.0, baseOpacity + 0.08);
+            }
+
+            if (ReferenceEquals(visual, to))
+            {
+                var promotedScale = Math.Min(1.0, scaleValue + (ViewportLiftScale * lift) + (ViewportPromotionScale * progress));
+                scale.ScaleX = promotedScale;
+                scale.ScaleY = promotedScale;
+                rotate.Angle = restingAngle * (1.0 - progress);
+                stackValue = Math.Max(0.0, stackValue - (stackOffset * (0.45 + (0.2 * lift)) * progress));
+                baseOpacity = Math.Min(1.0, baseOpacity + (0.12 * lift));
+            }
+
+            if (isHorizontal)
+                translate.Y = stackValue;
+            else
+                translate.X = stackValue;
+
+            visual.IsVisible = true;
+            visual.Opacity = baseOpacity;
+            visual.ZIndex = GetViewportZIndex(item.ViewportCenterOffset, visual, from, to);
+        }
+    }
+
+    private static (RotateTransform rotate, TranslateTransform translate) EnsureTopTransforms(Visual visual)
+    {
+        if (visual.RenderTransform is TransformGroup group &&
+            group.Children.Count == 2 &&
+            group.Children[0] is RotateTransform rotateTransform &&
+            group.Children[1] is TranslateTransform translateTransform)
+        {
+            visual.RenderTransformOrigin = new RelativePoint(0.5, 0.5, RelativeUnit.Relative);
+            return (rotateTransform, translateTransform);
+        }
+
+        var rotate = new RotateTransform();
+        var translate = new TranslateTransform();
+        visual.RenderTransform = new TransformGroup
+        {
+            Children =
+            {
+                rotate,
+                translate
+            }
+        };
+        visual.RenderTransformOrigin = new RelativePoint(0.5, 0.5, RelativeUnit.Relative);
+        return (rotate, translate);
+    }
+
+    private static (ScaleTransform scale, TranslateTransform translate) EnsureBackTransforms(Visual visual)
+    {
+        if (visual.RenderTransform is TransformGroup group &&
+            group.Children.Count == 2 &&
+            group.Children[0] is ScaleTransform scaleTransform &&
+            group.Children[1] is TranslateTransform translateTransform)
+        {
+            visual.RenderTransformOrigin = new RelativePoint(0.5, 0.5, RelativeUnit.Relative);
+            return (scaleTransform, translateTransform);
+        }
+
+        var scale = new ScaleTransform();
+        var translate = new TranslateTransform();
+        visual.RenderTransform = new TransformGroup
+        {
+            Children =
+            {
+                scale,
+                translate
+            }
+        };
+        visual.RenderTransformOrigin = new RelativePoint(0.5, 0.5, RelativeUnit.Relative);
+        return (scale, translate);
+    }
+
+    private static (RotateTransform rotate, ScaleTransform scale, TranslateTransform translate) EnsureViewportTransforms(Visual visual)
+    {
+        if (visual.RenderTransform is TransformGroup group &&
+            group.Children.Count == 3 &&
+            group.Children[0] is RotateTransform rotateTransform &&
+            group.Children[1] is ScaleTransform scaleTransform &&
+            group.Children[2] is TranslateTransform translateTransform)
+        {
+            visual.RenderTransformOrigin = new RelativePoint(0.5, 0.5, RelativeUnit.Relative);
+            return (rotateTransform, scaleTransform, translateTransform);
+        }
+
+        var rotate = new RotateTransform();
+        var scale = new ScaleTransform(1, 1);
+        var translate = new TranslateTransform();
+        visual.RenderTransform = new TransformGroup
+        {
+            Children =
+            {
+                rotate,
+                scale,
+                translate
+            }
+        };
+        visual.RenderTransformOrigin = new RelativePoint(0.5, 0.5, RelativeUnit.Relative);
+        return (rotate, scale, translate);
+    }
+
+    private double GetViewportStackOffset(double pageLength)
+    {
+        if (BackCardOffset > 0)
+            return BackCardOffset;
+
+        return Math.Clamp(pageLength * 0.045, 10.0, 18.0);
+    }
+
+    private static double GetViewportDepth(double offsetFromCenter)
+    {
+        var distance = Math.Abs(offsetFromCenter);
+
+        if (distance <= 1.0)
+            return distance;
+
+        if (distance <= 2.0)
+            return 1.0 + ((distance - 1.0) * 0.8);
+
+        return 1.8;
+    }
+
+    private static double GetViewportRestingAngle(double offsetFromCenter)
+    {
+        var sign = Math.Sign(offsetFromCenter);
+        if (sign == 0)
+            return 0;
+
+        var distance = Math.Abs(offsetFromCenter);
+        if (distance <= 1.0)
+            return sign * Lerp(0.0, SidePeekAngle, distance);
+
+        if (distance <= 2.0)
+            return sign * Lerp(SidePeekAngle, FarPeekAngle, distance - 1.0);
+
+        return sign * FarPeekAngle;
+    }
+
+    private static double Lerp(double from, double to, double t)
+    {
+        return from + ((to - from) * Math.Clamp(t, 0.0, 1.0));
+    }
+
+    private static int GetViewportZIndex(double offsetFromCenter, Visual visual, Visual? from, Visual? to)
+    {
+        if (ReferenceEquals(visual, from))
+            return 5;
+
+        if (ReferenceEquals(visual, to))
+            return 4;
+
+        var distance = Math.Abs(offsetFromCenter);
+        if (distance < 0.5)
+            return 4;
+        if (distance < 1.5)
+            return 3;
+        return 2;
+    }
+}
diff --git a/samples/ControlCatalog/Pages/Transitions/WaveRevealPageTransition.cs b/samples/ControlCatalog/Pages/Transitions/WaveRevealPageTransition.cs
new file mode 100644
index 0000000000..9d8e80bf9c
--- /dev/null
+++ b/samples/ControlCatalog/Pages/Transitions/WaveRevealPageTransition.cs
@@ -0,0 +1,380 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Threading;
+using System.Threading.Tasks;
+using Avalonia;
+using Avalonia.Animation;
+using Avalonia.Animation.Easings;
+using Avalonia.Media;
+
+namespace ControlCatalog.Pages.Transitions;
+
+/// <summary>
+/// Transitions between two pages using a wave clip that reveals the next page.
+/// </summary>
+public class WaveRevealPageTransition : PageSlide
+{
+    /// <summary>
+    /// Initializes a new instance of the <see cref="WaveRevealPageTransition"/> class.
+    /// </summary>
+    public WaveRevealPageTransition()
+    {
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="WaveRevealPageTransition"/> class.
+    /// </summary>
+    /// <param name="duration">The duration of the animation.</param>
+    /// <param name="orientation">The axis on which the animation should occur.</param>
+    public WaveRevealPageTransition(TimeSpan duration, PageSlide.SlideAxis orientation = PageSlide.SlideAxis.Horizontal)
+        : base(duration, orientation)
+    {
+    }
+
+    /// <summary>
+    /// Gets or sets the maximum wave bulge (pixels) along the movement axis.
+    /// </summary>
+    public double MaxBulge { get; set; } = 120.0;
+
+    /// <summary>
+    /// Gets or sets the bulge factor along the movement axis (0-1).
+    /// </summary>
+    public double BulgeFactor { get; set; } = 0.35;
+
+    /// <summary>
+    /// Gets or sets the bulge factor along the cross axis (0-1).
+    /// </summary>
+    public double CrossBulgeFactor { get; set; } = 0.3;
+
+    /// <summary>
+    /// Gets or sets a cross-axis offset (pixels) to shift the wave center.
+    /// </summary>
+    public double WaveCenterOffset { get; set; } = 0.0;
+
+    /// <summary>
+    /// Gets or sets how strongly the wave center follows the provided offset.
+    /// </summary>
+    public double CenterSensitivity { get; set; } = 1.0;
+
+    /// <summary>
+    /// Gets or sets the bulge exponent used to shape the wave (1.0 = linear).
+    /// Higher values tighten the bulge; lower values broaden it.
+    /// </summary>
+    public double BulgeExponent { get; set; } = 1.0;
+
+    /// <summary>
+    /// Gets or sets the easing applied to the wave progress (clip only).
+    /// </summary>
+    public Easing WaveEasing { get; set; } = new CubicEaseOut();
+
+    /// <inheritdoc />
+    public override async Task Start(Visual? from, Visual? to, bool forward, CancellationToken cancellationToken)
+    {
+        if (cancellationToken.IsCancellationRequested)
+        {
+            return;
+        }
+
+        if (to != null)
+        {
+            to.IsVisible = true;
+            to.ZIndex = 1;
+        }
+
+        if (from != null)
+        {
+            from.ZIndex = 0;
+        }
+
+        await AnimateProgress(0.0, 1.0, from, to, forward, cancellationToken);
+
+        if (to != null && !cancellationToken.IsCancellationRequested)
+        {
+            to.Clip = null;
+        }
+
+        if (from != null && !cancellationToken.IsCancellationRequested)
+        {
+            from.IsVisible = false;
+        }
+    }
+
+    /// <inheritdoc />
+    public override void Update(
+        double progress,
+        Visual? from,
+        Visual? to,
+        bool forward,
+        double pageLength,
+        IReadOnlyList<PageTransitionItem> visibleItems)
+    {
+        if (visibleItems.Count > 0)
+        {
+            UpdateVisibleItems(from, to, forward, pageLength, visibleItems);
+            return;
+        }
+
+        if (from is null && to is null)
+            return;
+        var parent = GetVisualParent(from, to);
+        var size = parent.Bounds.Size;
+        var centerOffset = WaveCenterOffset * CenterSensitivity;
+        var isHorizontal = Orientation == PageSlide.SlideAxis.Horizontal;
+
+        if (to != null)
+        {
+            to.IsVisible = progress > 0.0;
+            to.ZIndex = 1;
+            to.Opacity = 1;
+
+            if (progress >= 1.0)
+            {
+                to.Clip = null;
+            }
+            else
+            {
+                var waveProgress = WaveEasing?.Ease(progress) ?? progress;
+                var clip = LiquidSwipeClipper.CreateWavePath(
+                    waveProgress,
+                    size,
+                    centerOffset,
+                    forward,
+                    isHorizontal,
+                    MaxBulge,
+                    BulgeFactor,
+                    CrossBulgeFactor,
+                    BulgeExponent);
+                to.Clip = clip;
+            }
+        }
+
+        if (from != null)
+        {
+            from.IsVisible = true;
+            from.ZIndex = 0;
+            from.Opacity = 1;
+        }
+    }
+
+    private void UpdateVisibleItems(
+        Visual? from,
+        Visual? to,
+        bool forward,
+        double pageLength,
+        IReadOnlyList<PageTransitionItem> visibleItems)
+    {
+        if (from is null && to is null)
+            return;
+
+        var parent = GetVisualParent(from, to);
+        var size = parent.Bounds.Size;
+        var centerOffset = WaveCenterOffset * CenterSensitivity;
+        var isHorizontal = Orientation == PageSlide.SlideAxis.Horizontal;
+        var resolvedPageLength = pageLength > 0
+            ? pageLength
+            : (isHorizontal ? size.Width : size.Height);
+        foreach (var item in visibleItems)
+        {
+            var visual = item.Visual;
+            visual.IsVisible = true;
+            visual.Opacity = 1;
+            visual.Clip = null;
+            visual.ZIndex = ReferenceEquals(visual, to) ? 1 : 0;
+
+            if (!ReferenceEquals(visual, to))
+                continue;
+
+            var visibleFraction = GetVisibleFraction(item.ViewportCenterOffset, size, resolvedPageLength, isHorizontal);
+            if (visibleFraction >= 1.0)
+                continue;
+
+            visual.Clip = LiquidSwipeClipper.CreateWavePath(
+                visibleFraction,
+                size,
+                centerOffset,
+                forward,
+                isHorizontal,
+                MaxBulge,
+                BulgeFactor,
+                CrossBulgeFactor,
+                BulgeExponent);
+        }
+    }
+
+    private static double GetVisibleFraction(double offsetFromCenter, Size viewportSize, double pageLength, bool isHorizontal)
+    {
+        if (pageLength <= 0)
+            return 1.0;
+
+        var viewportLength = isHorizontal ? viewportSize.Width : viewportSize.Height;
+        if (viewportLength <= 0)
+            return 0.0;
+
+        var viewportUnits = viewportLength / pageLength;
+        var edgePeek = Math.Max(0.0, (viewportUnits - 1.0) / 2.0);
+        return Math.Clamp(1.0 + edgePeek - Math.Abs(offsetFromCenter), 0.0, 1.0);
+    }
+
+    /// <inheritdoc />
+    public override void Reset(Visual visual)
+    {
+        visual.Clip = null;
+        visual.ZIndex = 0;
+        visual.Opacity = 1;
+    }
+
+    private async Task AnimateProgress(
+        double from,
+        double to,
+        Visual? fromVisual,
+        Visual? toVisual,
+        bool forward,
+        CancellationToken cancellationToken)
+    {
+        var parent = GetVisualParent(fromVisual, toVisual);
+        var pageLength = Orientation == PageSlide.SlideAxis.Horizontal
+            ? parent.Bounds.Width
+            : parent.Bounds.Height;
+        var durationMs = Math.Max(Duration.TotalMilliseconds * Math.Abs(to - from), 50);
+        var startTicks = Stopwatch.GetTimestamp();
+        var tickFreq = Stopwatch.Frequency;
+
+        while (!cancellationToken.IsCancellationRequested)
+        {
+            var elapsedMs = (Stopwatch.GetTimestamp() - startTicks) * 1000.0 / tickFreq;
+            var t = Math.Clamp(elapsedMs / durationMs, 0.0, 1.0);
+            var eased = SlideInEasing?.Ease(t) ?? t;
+            var progress = from + (to - from) * eased;
+
+            Update(progress, fromVisual, toVisual, forward, pageLength, Array.Empty<PageTransitionItem>());
+
+            if (t >= 1.0)
+                break;
+
+            await Task.Delay(16, cancellationToken);
+        }
+
+        if (!cancellationToken.IsCancellationRequested)
+        {
+            Update(to, fromVisual, toVisual, forward, pageLength, Array.Empty<PageTransitionItem>());
+        }
+    }
+
+    private static class LiquidSwipeClipper
+    {
+        public static Geometry CreateWavePath(
+            double progress,
+            Size size,
+            double waveCenterOffset,
+            bool forward,
+            bool isHorizontal,
+            double maxBulge,
+            double bulgeFactor,
+            double crossBulgeFactor,
+            double bulgeExponent)
+        {
+            var width = size.Width;
+            var height = size.Height;
+
+            if (progress <= 0)
+                return new RectangleGeometry(new Rect(0, 0, 0, 0));
+
+            if (progress >= 1)
+                return new RectangleGeometry(new Rect(0, 0, width, height));
+
+            if (width <= 0 || height <= 0)
+                return new RectangleGeometry(new Rect(0, 0, 0, 0));
+
+            var mainLength = isHorizontal ? width : height;
+            var crossLength = isHorizontal ? height : width;
+
+            var wavePhase = Math.Sin(progress * Math.PI);
+            var bulgeProgress = bulgeExponent == 1.0 ? wavePhase : Math.Pow(wavePhase, bulgeExponent);
+            var revealedLength = mainLength * progress;
+            var bulgeMain = Math.Min(mainLength * bulgeFactor, maxBulge) * bulgeProgress;
+            bulgeMain = Math.Min(bulgeMain, revealedLength * 0.45);
+            var bulgeCross = crossLength * crossBulgeFactor;
+
+            var waveCenter = crossLength / 2 + waveCenterOffset;
+            waveCenter = Math.Clamp(waveCenter, bulgeCross, crossLength - bulgeCross);
+
+            var geometry = new StreamGeometry();
+            using (var context = geometry.Open())
+            {
+                if (isHorizontal)
+                {
+                    if (forward)
+                    {
+                        var waveX = width * (1 - progress);
+                        context.BeginFigure(new Point(width, 0), true);
+                        context.LineTo(new Point(waveX, 0));
+                        context.CubicBezierTo(
+                            new Point(waveX, waveCenter - bulgeCross),
+                            new Point(waveX - bulgeMain, waveCenter - bulgeCross * 0.5),
+                            new Point(waveX - bulgeMain, waveCenter));
+                        context.CubicBezierTo(
+                            new Point(waveX - bulgeMain, waveCenter + bulgeCross * 0.5),
+                            new Point(waveX, waveCenter + bulgeCross),
+                            new Point(waveX, height));
+                        context.LineTo(new Point(width, height));
+                        context.EndFigure(true);
+                    }
+                    else
+                    {
+                        var waveX = width * progress;
+                        context.BeginFigure(new Point(0, 0), true);
+                        context.LineTo(new Point(waveX, 0));
+                        context.CubicBezierTo(
+                            new Point(waveX, waveCenter - bulgeCross),
+                            new Point(waveX + bulgeMain, waveCenter - bulgeCross * 0.5),
+                            new Point(waveX + bulgeMain, waveCenter));
+                        context.CubicBezierTo(
+                            new Point(waveX + bulgeMain, waveCenter + bulgeCross * 0.5),
+                            new Point(waveX, waveCenter + bulgeCross),
+                            new Point(waveX, height));
+                        context.LineTo(new Point(0, height));
+                        context.EndFigure(true);
+                    }
+                }
+                else
+                {
+                    if (forward)
+                    {
+                        var waveY = height * (1 - progress);
+                        context.BeginFigure(new Point(0, height), true);
+                        context.LineTo(new Point(0, waveY));
+                        context.CubicBezierTo(
+                            new Point(waveCenter - bulgeCross, waveY),
+                            new Point(waveCenter - bulgeCross * 0.5, waveY - bulgeMain),
+                            new Point(waveCenter, waveY - bulgeMain));
+                        context.CubicBezierTo(
+                            new Point(waveCenter + bulgeCross * 0.5, waveY - bulgeMain),
+                            new Point(waveCenter + bulgeCross, waveY),
+                            new Point(width, waveY));
+                        context.LineTo(new Point(width, height));
+                        context.EndFigure(true);
+                    }
+                    else
+                    {
+                        var waveY = height * progress;
+                        context.BeginFigure(new Point(0, 0), true);
+                        context.LineTo(new Point(0, waveY));
+                        context.CubicBezierTo(
+                            new Point(waveCenter - bulgeCross, waveY),
+                            new Point(waveCenter - bulgeCross * 0.5, waveY + bulgeMain),
+                            new Point(waveCenter, waveY + bulgeMain));
+                        context.CubicBezierTo(
+                            new Point(waveCenter + bulgeCross * 0.5, waveY + bulgeMain),
+                            new Point(waveCenter + bulgeCross, waveY),
+                            new Point(width, waveY));
+                        context.LineTo(new Point(width, 0));
+                        context.EndFigure(true);
+                    }
+                }
+            }
+
+            return geometry;
+        }
+    }
+}
diff --git a/src/Android/Avalonia.Android/Platform/Storage/AndroidStorageItem.cs b/src/Android/Avalonia.Android/Platform/Storage/AndroidStorageItem.cs
index 47d95d8da1..59ec332b2d 100644
--- a/src/Android/Avalonia.Android/Platform/Storage/AndroidStorageItem.cs
+++ b/src/Android/Avalonia.Android/Platform/Storage/AndroidStorageItem.cs
@@ -12,6 +12,7 @@ using Avalonia.Logging;
 using Avalonia.Platform.Storage;
 using Avalonia.Platform.Storage.FileIO;
 using Java.Lang;
+using static Android.Provider.DocumentsContract;
 using AndroidUri = Android.Net.Uri;
 using Exception = System.Exception;
 using JavaFile = Java.IO.File;
@@ -35,10 +36,10 @@ internal abstract class AndroidStorageItem : IStorageBookmarkItem
     }
 
     internal AndroidUri Uri { get; set; }
-    
+
     protected Activity Activity => _activity ?? throw new ObjectDisposedException(nameof(AndroidStorageItem));
 
-    public virtual string Name => GetColumnValue(Activity, Uri, DocumentsContract.Document.ColumnDisplayName)
+    public virtual string Name => GetColumnValue(Activity, Uri, Document.ColumnDisplayName)
                           ?? GetColumnValue(Activity, Uri, MediaStore.IMediaColumns.DisplayName)
                           ?? Uri.PathSegments?.LastOrDefault()?.Split("/", StringSplitOptions.RemoveEmptyEntries).LastOrDefault() ?? string.Empty;
 
@@ -67,7 +68,7 @@ internal abstract class AndroidStorageItem : IStorageBookmarkItem
 
         Activity.ContentResolver?.ReleasePersistableUriPermission(Uri, ActivityFlags.GrantWriteUriPermission | ActivityFlags.GrantReadUriPermission);
     }
-    
+
     public abstract Task<StorageItemProperties> GetBasicPropertiesAsync();
 
     protected static string? GetColumnValue(Context context, AndroidUri contentUri, string column, string? selection = null, string[]? selectionArgs = null)
@@ -98,7 +99,7 @@ internal abstract class AndroidStorageItem : IStorageBookmarkItem
             return null;
         }
 
-        if(_parent != null)
+        if (_parent != null)
         {
             return _parent;
         }
@@ -106,8 +107,8 @@ internal abstract class AndroidStorageItem : IStorageBookmarkItem
         using var javaFile = new JavaFile(Uri.Path!);
 
         // Java file represents files AND directories. Don't be confused.
-        if (javaFile.ParentFile is {} parentFile
-            && AndroidUri.FromFile(parentFile) is {} androidUri)
+        if (javaFile.ParentFile is { } parentFile
+            && AndroidUri.FromFile(parentFile) is { } androidUri)
         {
             return new AndroidStorageFolder(Activity, androidUri, false);
         }
@@ -124,12 +125,12 @@ internal abstract class AndroidStorageItem : IStorageBookmarkItem
 
         return await _activity!.CheckPermission(Manifest.Permission.ReadExternalStorage);
     }
-    
+
     public void Dispose()
     {
         _activity = null;
     }
-    
+
     internal AndroidUri? PermissionRoot => _permissionRoot;
 
     public abstract Task DeleteAsync();
@@ -138,8 +139,8 @@ internal abstract class AndroidStorageItem : IStorageBookmarkItem
 
     public static IStorageItem CreateItem(Activity activity, AndroidUri uri)
     {
-        var mimeType = GetColumnValue(activity, uri, DocumentsContract.Document.ColumnMimeType);
-        if (mimeType == DocumentsContract.Document.MimeTypeDir)
+        var mimeType = GetColumnValue(activity, uri, Document.ColumnMimeType);
+        if (mimeType == Document.MimeTypeDir)
         {
             return new AndroidStorageFolder(activity, uri, false);
         }
@@ -160,8 +161,8 @@ internal class AndroidStorageFolder : AndroidStorageItem, IStorageBookmarkFolder
     {
         var mimeType = MimeTypeMap.Singleton?.GetMimeTypeFromExtension(MimeTypeMap.GetFileExtensionFromUrl(name)) ?? "application/octet-stream";
         var treeUri = GetTreeUri().treeUri;
-        var newFile = DocumentsContract.CreateDocument(Activity.ContentResolver!, treeUri!, mimeType, name);
-        if(newFile == null)
+        var newFile = CreateDocument(Activity.ContentResolver!, treeUri!, mimeType, name);
+        if (newFile == null)
         {
             return Task.FromResult<IStorageFile?>(null);
         }
@@ -172,7 +173,7 @@ internal class AndroidStorageFolder : AndroidStorageItem, IStorageBookmarkFolder
     public Task<IStorageFolder?> CreateFolderAsync(string name)
     {
         var treeUri = GetTreeUri().treeUri;
-        var newFolder = DocumentsContract.CreateDocument(Activity.ContentResolver!, treeUri!, DocumentsContract.Document.MimeTypeDir, name);
+        var newFolder = CreateDocument(Activity.ContentResolver!, treeUri!, Document.MimeTypeDir, name);
         if (newFolder == null)
         {
             return Task.FromResult<IStorageFolder?>(null);
@@ -197,24 +198,76 @@ internal class AndroidStorageFolder : AndroidStorageItem, IStorageBookmarkFolder
         {
             await foreach (var file in storageFolder.GetItemsAsync())
             {
-                if(file is AndroidStorageFolder folder)
+                if (file is AndroidStorageFolder folder)
                 {
                     await DeleteContents(folder);
                 }
-                else if(file is AndroidStorageFile storageFile)
+                else if (file is AndroidStorageFile storageFile)
                 {
                     await storageFile.DeleteAsync();
                 }
             }
 
             var treeUri = GetTreeUri().treeUri;
-            DocumentsContract.DeleteDocument(Activity.ContentResolver!, treeUri!);
+            DeleteDocument(Activity.ContentResolver!, treeUri!);
         }
     }
 
     public override Task<StorageItemProperties> GetBasicPropertiesAsync()
     {
-        return Task.FromResult(new StorageItemProperties());
+        DateTimeOffset? dateModified = null;
+
+        AndroidUri? queryUri = null;
+
+        try
+        {
+            try
+            {
+                // When Uri is a tree URI, use its document id to build a document URI.
+                var folderId = GetTreeDocumentId(Uri);
+                queryUri = BuildDocumentUriUsingTree(Uri, folderId);
+            }
+            catch (UnsupportedOperationException)
+            {
+                // For non-root items, Uri may already be a document URI; use it directly.
+                queryUri = Uri;
+            }
+
+            if (queryUri != null)
+            {
+                var projection = new[]
+                {
+                    Document.ColumnLastModified
+                };
+                using var cursor = Activity.ContentResolver!.Query(queryUri, projection, null, null, null);
+
+                if (cursor?.MoveToFirst() == true)
+                {
+                    try
+                    {
+                        var columnIndex = cursor.GetColumnIndex(Document.ColumnLastModified);
+                        if (columnIndex != -1)
+                        {
+                            var longValue = cursor.GetLong(columnIndex);
+                            dateModified = longValue > 0 ? DateTimeOffset.FromUnixTimeMilliseconds(longValue) : null;
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        Logger.TryGet(LogEventLevel.Verbose, LogArea.AndroidPlatform)?
+                            .Log(this, "Directory LastModified metadata reader failed: '{Exception}'", ex);
+                    }
+                }
+            }
+        }
+        catch (Exception ex)
+        {
+            // Data may not be available for this item or the URI may not be in the expected shape.
+            Logger.TryGet(LogEventLevel.Verbose, LogArea.AndroidPlatform)?
+                .Log(this, "Directory basic properties metadata unavailable: '{Exception}'", ex);
+        }
+
+        return Task.FromResult(new StorageItemProperties(null, null, dateModified));
     }
 
     public async IAsyncEnumerable<IStorageItem> GetItemsAsync()
@@ -234,8 +287,8 @@ internal class AndroidStorageFolder : AndroidStorageItem, IStorageBookmarkFolder
 
         var projection = new[]
         {
-            DocumentsContract.Document.ColumnDocumentId,
-            DocumentsContract.Document.ColumnMimeType
+            Document.ColumnDocumentId,
+            Document.ColumnMimeType
         };
         if (childrenUri != null)
         {
@@ -247,8 +300,8 @@ internal class AndroidStorageFolder : AndroidStorageItem, IStorageBookmarkFolder
                     var mime = cursor.GetString(1);
                     var id = cursor.GetString(0);
 
-                    bool isDirectory = mime == DocumentsContract.Document.MimeTypeDir;
-                    var uri = DocumentsContract.BuildDocumentUriUsingTree(root, id);
+                    bool isDirectory = mime == Document.MimeTypeDir;
+                    var uri = BuildDocumentUriUsingTree(root, id);
 
                     if (uri == null)
                     {
@@ -313,9 +366,9 @@ internal class AndroidStorageFolder : AndroidStorageItem, IStorageBookmarkFolder
 
         var projection = new[]
         {
-            DocumentsContract.Document.ColumnDocumentId,
-            DocumentsContract.Document.ColumnMimeType,
-            DocumentsContract.Document.ColumnDisplayName
+            Document.ColumnDocumentId,
+            Document.ColumnMimeType,
+            Document.ColumnDisplayName
         };
 
         if (childrenUri != null)
@@ -332,15 +385,15 @@ internal class AndroidStorageFolder : AndroidStorageItem, IStorageBookmarkFolder
                     if (fileName != name)
                     {
                         continue;
-                    }                   
+                    }
 
-                    bool mineDirectory = mime == DocumentsContract.Document.MimeTypeDir;
+                    bool mineDirectory = mime == Document.MimeTypeDir;
                     if (isDirectory != mineDirectory)
                     {
                         return null;
                     }
 
-                    var uri = DocumentsContract.BuildDocumentUriUsingTree(root, id);
+                    var uri = BuildDocumentUriUsingTree(root, id);
                     if (uri == null)
                     {
                         return null;
@@ -370,8 +423,8 @@ internal class AndroidStorageFolder : AndroidStorageItem, IStorageBookmarkFolder
     private (AndroidUri root, AndroidUri? treeUri) GetTreeUri()
     {
         var root = PermissionRoot ?? Uri;
-        var folderId = root != Uri ? DocumentsContract.GetDocumentId(Uri) : DocumentsContract.GetTreeDocumentId(Uri);
-        return (root, DocumentsContract.BuildChildDocumentsUriUsingTree(root, folderId));
+        var folderId = root != Uri ? GetDocumentId(Uri) : GetTreeDocumentId(Uri);
+        return (root, BuildChildDocumentsUriUsingTree(root, folderId));
     }
 }
 
@@ -419,10 +472,10 @@ internal sealed class AndroidStorageFile : AndroidStorageItem, IStorageBookmarkF
         if (!OperatingSystem.IsAndroidVersionAtLeast(24))
             return false;
 
-        if (!DocumentsContract.IsDocumentUri(context, uri))
+        if (!IsDocumentUri(context, uri))
             return false;
 
-        var value = GetColumnValue(context, uri, DocumentsContract.Document.ColumnFlags);
+        var value = GetColumnValue(context, uri, Document.ColumnFlags);
         if (!string.IsNullOrEmpty(value) && int.TryParse(value, out var flagsInt))
         {
             var flags = (DocumentContractFlags)flagsInt;
@@ -530,7 +583,7 @@ internal sealed class AndroidStorageFile : AndroidStorageItem, IStorageBookmarkF
 
         if (Activity != null)
         {
-            DocumentsContract.DeleteDocument(Activity.ContentResolver!, Uri);
+            DeleteDocument(Activity.ContentResolver!, Uri);
         }
     }
 
@@ -553,7 +606,7 @@ internal sealed class AndroidStorageFile : AndroidStorageItem, IStorageBookmarkF
                         storageFolder.Uri is { } targetParentUri &&
                         await GetParentAsync() is AndroidStorageFolder parentFolder)
                     {
-                        movedUri = DocumentsContract.MoveDocument(contentResolver, Uri, parentFolder.Uri, targetParentUri);
+                        movedUri = MoveDocument(contentResolver, Uri, parentFolder.Uri, targetParentUri);
                     }
                 }
                 catch (Exception)
diff --git a/src/Avalonia.Base/Animation/CompositePageTransition.cs b/src/Avalonia.Base/Animation/CompositePageTransition.cs
index 62119a0051..e5e3511337 100644
--- a/src/Avalonia.Base/Animation/CompositePageTransition.cs
+++ b/src/Avalonia.Base/Animation/CompositePageTransition.cs
@@ -28,7 +28,7 @@ namespace Avalonia.Animation
     /// </code>
     /// </para>
     /// </remarks>
-    public class CompositePageTransition : IPageTransition
+    public class CompositePageTransition : IPageTransition, IProgressPageTransition
     {
         /// <summary>
         /// Gets or sets the transitions to be executed. Can be defined from XAML.
@@ -44,5 +44,35 @@ namespace Avalonia.Animation
                 .ToArray();
             return Task.WhenAll(transitionTasks);
         }
+
+        /// <inheritdoc />
+        public void Update(
+            double progress,
+            Visual? from,
+            Visual? to,
+            bool forward,
+            double pageLength,
+            IReadOnlyList<PageTransitionItem> visibleItems)
+        {
+            foreach (var transition in PageTransitions)
+            {
+                if (transition is IProgressPageTransition progressive)
+                {
+                    progressive.Update(progress, from, to, forward, pageLength, visibleItems);
+                }
+            }
+        }
+
+        /// <inheritdoc />
+        public void Reset(Visual visual)
+        {
+            foreach (var transition in PageTransitions)
+            {
+                if (transition is IProgressPageTransition progressive)
+                {
+                    progressive.Reset(visual);
+                }
+            }
+        }
     }
 }
diff --git a/src/Avalonia.Base/Animation/CrossFade.cs b/src/Avalonia.Base/Animation/CrossFade.cs
index f00d835020..45a4300e5b 100644
--- a/src/Avalonia.Base/Animation/CrossFade.cs
+++ b/src/Avalonia.Base/Animation/CrossFade.cs
@@ -12,8 +12,13 @@ namespace Avalonia.Animation
     /// <summary>
     /// Defines a cross-fade animation between two <see cref="Visual"/>s.
     /// </summary>
-    public class CrossFade : IPageTransition
+    public class CrossFade : IPageTransition, IProgressPageTransition
     {
+        private const double SidePeekOpacity = 0.72;
+        private const double FarPeekOpacity = 0.42;
+        private const double OutgoingDip = 0.22;
+        private const double IncomingBoost = 0.12;
+        private const double PassiveDip = 0.05;
         private readonly Animation _fadeOutAnimation;
         private readonly Animation _fadeInAnimation;
 
@@ -182,5 +187,82 @@ namespace Avalonia.Animation
         {
             return Start(from, to, cancellationToken);
         }
+
+        /// <inheritdoc/>
+        public void Update(
+            double progress,
+            Visual? from,
+            Visual? to,
+            bool forward,
+            double pageLength,
+            IReadOnlyList<PageTransitionItem> visibleItems)
+        {
+            if (visibleItems.Count > 0)
+            {
+                UpdateVisibleItems(progress, from, to, visibleItems);
+                return;
+            }
+
+            if (from != null)
+                from.Opacity = 1 - progress;
+            if (to != null)
+            {
+                to.IsVisible = true;
+                to.Opacity = progress;
+            }
+        }
+
+        /// <inheritdoc/>
+        public void Reset(Visual visual)
+        {
+            visual.Opacity = 1;
+        }
+
+        private static void UpdateVisibleItems(
+            double progress,
+            Visual? from,
+            Visual? to,
+            IReadOnlyList<PageTransitionItem> visibleItems)
+        {
+            var emphasis = Math.Sin(Math.Clamp(progress, 0.0, 1.0) * Math.PI);
+            foreach (var item in visibleItems)
+            {
+                item.Visual.IsVisible = true;
+                var opacity = GetOpacityForOffset(item.ViewportCenterOffset);
+
+                if (ReferenceEquals(item.Visual, from))
+                {
+                    opacity = Math.Max(FarPeekOpacity, opacity - (OutgoingDip * emphasis));
+                }
+                else if (ReferenceEquals(item.Visual, to))
+                {
+                    opacity = Math.Min(1.0, opacity + (IncomingBoost * emphasis));
+                }
+                else
+                {
+                    opacity = Math.Max(FarPeekOpacity, opacity - (PassiveDip * emphasis));
+                }
+
+                item.Visual.Opacity = opacity;
+            }
+        }
+
+        private static double GetOpacityForOffset(double offsetFromCenter)
+        {
+            var distance = Math.Abs(offsetFromCenter);
+
+            if (distance <= 1.0)
+                return Lerp(1.0, SidePeekOpacity, distance);
+
+            if (distance <= 2.0)
+                return Lerp(SidePeekOpacity, FarPeekOpacity, distance - 1.0);
+
+            return FarPeekOpacity;
+        }
+
+        private static double Lerp(double from, double to, double t)
+        {
+            return from + ((to - from) * Math.Clamp(t, 0.0, 1.0));
+        }
     }
 }
diff --git a/src/Avalonia.Base/Animation/IProgressPageTransition.cs b/src/Avalonia.Base/Animation/IProgressPageTransition.cs
new file mode 100644
index 0000000000..01f892d1fd
--- /dev/null
+++ b/src/Avalonia.Base/Animation/IProgressPageTransition.cs
@@ -0,0 +1,39 @@
+using System.Collections.Generic;
+using Avalonia.VisualTree;
+
+namespace Avalonia.Animation
+{
+    /// <summary>
+    /// An <see cref="IPageTransition"/> that supports progress-driven updates.
+    /// </summary>
+    /// <remarks>
+    /// Transitions implementing this interface can be driven by a normalized progress value
+    /// (0.0 to 1.0) during swipe gestures or programmatic animations, rather than running
+    /// as a timed animation via <see cref="IPageTransition.Start"/>.
+    /// </remarks>
+    public interface IProgressPageTransition : IPageTransition
+    {
+        /// <summary>
+        /// Updates the transition to reflect the given progress.
+        /// </summary>
+        /// <param name="progress">The normalized progress value from 0.0 (start) to 1.0 (complete).</param>
+        /// <param name="from">The visual being transitioned away from. May be null.</param>
+        /// <param name="to">The visual being transitioned to. May be null.</param>
+        /// <param name="forward">Whether the transition direction is forward (next) or backward (previous).</param>
+        /// <param name="pageLength">The size of a page along the transition axis.</param>
+        /// <param name="visibleItems">The currently visible realized pages, if more than one page is visible.</param>
+        void Update(
+            double progress,
+            Visual? from,
+            Visual? to,
+            bool forward,
+            double pageLength,
+            IReadOnlyList<PageTransitionItem> visibleItems);
+
+        /// <summary>
+        /// Resets any visual state applied to the given visual by this transition.
+        /// </summary>
+        /// <param name="visual">The visual to reset.</param>
+        void Reset(Visual visual);
+    }
+}
diff --git a/src/Avalonia.Base/Animation/PageSlide.cs b/src/Avalonia.Base/Animation/PageSlide.cs
index 24797a6d80..001c64f648 100644
--- a/src/Avalonia.Base/Animation/PageSlide.cs
+++ b/src/Avalonia.Base/Animation/PageSlide.cs
@@ -12,7 +12,7 @@ namespace Avalonia.Animation
     /// <summary>
     /// Transitions between two pages by sliding them horizontally or vertically.
     /// </summary>
-    public class PageSlide : IPageTransition
+    public class PageSlide : IPageTransition, IProgressPageTransition
     {
         /// <summary>
         /// The axis on which the PageSlide should occur
@@ -50,12 +50,12 @@ namespace Avalonia.Animation
         /// Gets the orientation of the animation.
         /// </summary>
         public SlideAxis Orientation { get; set; }
-        
+
         /// <summary>
         /// Gets or sets element entrance easing.
         /// </summary>
         public Easing SlideInEasing { get; set; } = new LinearEasing();
-        
+
         /// <summary>
         /// Gets or sets element exit easing.
         /// </summary>
@@ -152,8 +152,6 @@ namespace Avalonia.Animation
 
             if (from != null)
             {
-                // Hide BEFORE resetting transform so there is no single-frame flash
-                // where the element snaps back to position 0 while still visible.
                 from.IsVisible = false;
                 if (FillMode != FillMode.None)
                     from.RenderTransform = null;
@@ -163,6 +161,56 @@ namespace Avalonia.Animation
                 to.RenderTransform = null;
         }
 
+        /// <inheritdoc/>
+        public virtual void Update(
+            double progress,
+            Visual? from,
+            Visual? to,
+            bool forward,
+            double pageLength,
+            IReadOnlyList<PageTransitionItem> visibleItems)
+        {
+            if (visibleItems.Count > 0)
+                return;
+
+            if (from is null && to is null)
+                return;
+
+            var parent = GetVisualParent(from, to);
+            var distance = pageLength > 0
+                ? pageLength
+                : (Orientation == SlideAxis.Horizontal ? parent.Bounds.Width : parent.Bounds.Height);
+            var offset = distance * progress;
+
+            if (from != null)
+            {
+                if (from.RenderTransform is not TranslateTransform ft)
+                    from.RenderTransform = ft = new TranslateTransform();
+                if (Orientation == SlideAxis.Horizontal)
+                    ft.X = forward ? -offset : offset;
+                else
+                    ft.Y = forward ? -offset : offset;
+            }
+
+            if (to != null)
+            {
+                to.IsVisible = true;
+                if (to.RenderTransform is not TranslateTransform tt)
+                    to.RenderTransform = tt = new TranslateTransform();
+                if (Orientation == SlideAxis.Horizontal)
+                    tt.X = forward ? distance - offset : -(distance - offset);
+                else
+                    tt.Y = forward ? distance - offset : -(distance - offset);
+            }
+        }
+
+        /// <inheritdoc/>
+        public virtual void Reset(Visual visual)
+        {
+            visual.RenderTransform = null;
+        }
+
+
         /// <summary>
         /// Gets the common visual parent of the two control.
         /// </summary>
diff --git a/src/Avalonia.Base/Animation/PageTransitionItem.cs b/src/Avalonia.Base/Animation/PageTransitionItem.cs
new file mode 100644
index 0000000000..fed0145a2a
--- /dev/null
+++ b/src/Avalonia.Base/Animation/PageTransitionItem.cs
@@ -0,0 +1,12 @@
+using Avalonia.VisualTree;
+
+namespace Avalonia.Animation
+{
+    /// <summary>
+    /// Describes a single visible page within a carousel viewport.
+    /// </summary>
+    public readonly record struct PageTransitionItem(
+        int Index,
+        Visual Visual,
+        double ViewportCenterOffset);
+}
diff --git a/src/Avalonia.Base/Animation/Transitions/Rotate3DTransition.cs b/src/Avalonia.Base/Animation/Transitions/Rotate3DTransition.cs
index 239f3aea08..41aa205547 100644
--- a/src/Avalonia.Base/Animation/Transitions/Rotate3DTransition.cs
+++ b/src/Avalonia.Base/Animation/Transitions/Rotate3DTransition.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 using Avalonia.Media;
@@ -6,8 +7,10 @@ using Avalonia.Styling;
 
 namespace Avalonia.Animation;
 
-public class Rotate3DTransition: PageSlide
+public class Rotate3DTransition : PageSlide
 {
+    private const double SidePeekAngle = 24.0;
+    private const double FarPeekAngle = 38.0;
 
     /// <summary>
     ///  Creates a new instance of the <see cref="Rotate3DTransition"/>
@@ -20,7 +23,7 @@ public class Rotate3DTransition: PageSlide
     {
         Depth = depth;
     }
-    
+
     /// <summary>
     ///  Defines the depth of the 3D Effect. If null, depth will be calculated automatically from the width or height
     ///  of the common parent of the visual being rotated.
@@ -28,12 +31,12 @@ public class Rotate3DTransition: PageSlide
     public double? Depth { get; set; }
 
     /// <summary>
-    ///  Creates a new instance of the <see cref="Rotate3DTransition"/>
+    /// Initializes a new instance of the <see cref="Rotate3DTransition"/> class.
     /// </summary>
     public Rotate3DTransition() { }
 
     /// <inheritdoc />
-    public override async Task Start(Visual? @from, Visual? to, bool forward, CancellationToken cancellationToken)
+    public override async Task Start(Visual? from, Visual? to, bool forward, CancellationToken cancellationToken)
     {
         if (cancellationToken.IsCancellationRequested)
         {
@@ -49,11 +52,12 @@ public class Rotate3DTransition: PageSlide
             _ => throw new ArgumentOutOfRangeException()
         };
 
-        var depthSetter = new Setter {Property = Rotate3DTransform.DepthProperty, Value = Depth ?? center};
-        var centerZSetter = new Setter {Property = Rotate3DTransform.CenterZProperty, Value = -center / 2};
+        var depthSetter = new Setter { Property = Rotate3DTransform.DepthProperty, Value = Depth ?? center };
+        var centerZSetter = new Setter { Property = Rotate3DTransform.CenterZProperty, Value = -center / 2 };
 
-        KeyFrame CreateKeyFrame(double cue, double rotation, int zIndex, bool isVisible = true) => 
-            new() {
+        KeyFrame CreateKeyFrame(double cue, double rotation, int zIndex, bool isVisible = true) =>
+            new()
+            {
                 Setters =
                 {
                     new Setter { Property = rotateProperty, Value = rotation },
@@ -71,7 +75,7 @@ public class Rotate3DTransition: PageSlide
             {
                 Easing = SlideOutEasing,
                 Duration = Duration,
-                FillMode = FillMode.Forward,
+                FillMode = FillMode,
                 Children =
                 {
                     CreateKeyFrame(0d, 0d, 2),
@@ -90,7 +94,7 @@ public class Rotate3DTransition: PageSlide
             {
                 Easing = SlideInEasing,
                 Duration = Duration,
-                FillMode = FillMode.Forward,
+                FillMode = FillMode,
                 Children =
                 {
                     CreateKeyFrame(0d, 90d * (forward ? 1 : -1), 1),
@@ -107,10 +111,8 @@ public class Rotate3DTransition: PageSlide
         if (!cancellationToken.IsCancellationRequested)
         {
             if (to != null)
-            {
                 to.ZIndex = 2;
-            }
-            
+
             if (from != null)
             {
                 from.IsVisible = false;
@@ -118,4 +120,139 @@ public class Rotate3DTransition: PageSlide
             }
         }
     }
+
+    /// <inheritdoc/>
+    public override void Update(
+        double progress,
+        Visual? from,
+        Visual? to,
+        bool forward,
+        double pageLength,
+        IReadOnlyList<PageTransitionItem> visibleItems)
+    {
+        if (visibleItems.Count > 0)
+        {
+            UpdateVisibleItems(progress, from, to, pageLength, visibleItems);
+            return;
+        }
+
+        if (from is null && to is null)
+            return;
+
+        var parent = GetVisualParent(from, to);
+        var center = pageLength > 0
+            ? pageLength
+            : (Orientation == SlideAxis.Vertical ? parent.Bounds.Height : parent.Bounds.Width);
+        var depth = Depth ?? center;
+        var sign = forward ? 1.0 : -1.0;
+
+        if (from != null)
+        {
+            if (from.RenderTransform is not Rotate3DTransform ft)
+                from.RenderTransform = ft = new Rotate3DTransform();
+            ft.Depth = depth;
+            ft.CenterZ = -center / 2;
+            from.ZIndex = progress < 0.5 ? 2 : 1;
+            if (Orientation == SlideAxis.Horizontal)
+                ft.AngleY = -sign * 90.0 * progress;
+            else
+                ft.AngleX = -sign * 90.0 * progress;
+        }
+
+        if (to != null)
+        {
+            to.IsVisible = true;
+            if (to.RenderTransform is not Rotate3DTransform tt)
+                to.RenderTransform = tt = new Rotate3DTransform();
+            tt.Depth = depth;
+            tt.CenterZ = -center / 2;
+            to.ZIndex = progress < 0.5 ? 1 : 2;
+            if (Orientation == SlideAxis.Horizontal)
+                tt.AngleY = sign * 90.0 * (1.0 - progress);
+            else
+                tt.AngleX = sign * 90.0 * (1.0 - progress);
+        }
+    }
+
+    private void UpdateVisibleItems(
+        double progress,
+        Visual? from,
+        Visual? to,
+        double pageLength,
+        IReadOnlyList<PageTransitionItem> visibleItems)
+    {
+        var anchor = from ?? to ?? visibleItems[0].Visual;
+        if (anchor.VisualParent is not Visual parent)
+            return;
+
+        var center = pageLength > 0
+            ? pageLength
+            : (Orientation == SlideAxis.Vertical ? parent.Bounds.Height : parent.Bounds.Width);
+        var depth = Depth ?? center;
+        var angleStrength = Math.Sin(Math.Clamp(progress, 0.0, 1.0) * Math.PI);
+
+        foreach (var item in visibleItems)
+        {
+            var visual = item.Visual;
+            visual.IsVisible = true;
+            visual.ZIndex = GetZIndex(item.ViewportCenterOffset);
+
+            if (visual.RenderTransform is not Rotate3DTransform transform)
+                visual.RenderTransform = transform = new Rotate3DTransform();
+
+            transform.Depth = depth;
+            transform.CenterZ = -center / 2;
+
+            var angle = GetAngleForOffset(item.ViewportCenterOffset) * angleStrength;
+            if (Orientation == SlideAxis.Horizontal)
+            {
+                transform.AngleY = angle;
+                transform.AngleX = 0;
+            }
+            else
+            {
+                transform.AngleX = angle;
+                transform.AngleY = 0;
+            }
+        }
+    }
+
+    private static double GetAngleForOffset(double offsetFromCenter)
+    {
+        var sign = Math.Sign(offsetFromCenter);
+        if (sign == 0)
+            return 0;
+
+        var distance = Math.Abs(offsetFromCenter);
+        if (distance <= 1.0)
+            return sign * Lerp(0.0, SidePeekAngle, distance);
+
+        if (distance <= 2.0)
+            return sign * Lerp(SidePeekAngle, FarPeekAngle, distance - 1.0);
+
+        return sign * FarPeekAngle;
+    }
+
+    private static int GetZIndex(double offsetFromCenter)
+    {
+        var distance = Math.Abs(offsetFromCenter);
+
+        if (distance < 0.5)
+            return 3;
+        if (distance < 1.5)
+            return 2;
+        return 1;
+    }
+
+    private static double Lerp(double from, double to, double t)
+    {
+        return from + ((to - from) * Math.Clamp(t, 0.0, 1.0));
+    }
+
+    /// <inheritdoc/>
+    public override void Reset(Visual visual)
+    {
+        visual.RenderTransform = null;
+        visual.ZIndex = 0;
+    }
 }
diff --git a/src/Avalonia.Base/Input/DragEventArgs.cs b/src/Avalonia.Base/Input/DragEventArgs.cs
index e68a6138e0..8609235b2a 100644
--- a/src/Avalonia.Base/Input/DragEventArgs.cs
+++ b/src/Avalonia.Base/Input/DragEventArgs.cs
@@ -27,7 +27,7 @@ namespace Avalonia.Input
 
         [Unstable("This constructor might be removed in 12.0. For unit testing, consider using DragDrop.DoDragDrop or IHeadlessWindow.DragDrop.")]
         public DragEventArgs(
-            RoutedEvent<DragEventArgs> routedEvent,
+            RoutedEvent<DragEventArgs>? routedEvent,
             IDataTransfer dataTransfer,
             Interactive target,
             Point targetLocation,
diff --git a/src/Avalonia.Base/Input/FindNextElementOptions.cs b/src/Avalonia.Base/Input/FindNextElementOptions.cs
index 72d83ec419..ee9c2e6fef 100644
--- a/src/Avalonia.Base/Input/FindNextElementOptions.cs
+++ b/src/Avalonia.Base/Input/FindNextElementOptions.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Avalonia.Input
+namespace Avalonia.Input
 {
     /// <summary>
     /// Provides options to customize the behavior when identifying the next element to focus
@@ -12,14 +6,28 @@ namespace Avalonia.Input
     /// </summary>
     public sealed class FindNextElementOptions
     {
+        /// <summary>
+        /// Gets or sets the element that will be treated as the starting point of the search
+        /// for the next focusable element. This does not need to be the element that is
+        /// currently focused. If null, <see cref="FocusManager.GetFocusedElement()"/> is used.
+        /// </summary>
+        public IInputElement? FocusedElement { get; init; }
+
         /// <summary>
         /// Gets or sets the root <see cref="InputElement"/> within which the search for the next
         /// focusable element will be conducted.
         /// </summary>
         /// <remarks>
+        /// <para>
         /// This property defines the boundary for focus navigation operations. It determines the root element
         /// in the visual tree under which the focusable item search is performed. If not specified, the search
         /// will default to the current scope.
+        /// </para>
+        /// <para>
+        /// This option is only used with <see cref="NavigationDirection.Up"/>, <see cref="NavigationDirection.Down"/>,
+        /// <see cref="NavigationDirection.Left"/>, and <see cref="NavigationDirection.Right"/>. It is ignored for other
+        /// directions.
+        /// </para>
         /// </remarks>
         public InputElement? SearchRoot { get; init; }
 
@@ -27,6 +35,11 @@ namespace Avalonia.Input
         /// Gets or sets the rectangular region within the visual hierarchy that will be excluded
         /// from consideration during focus navigation.
         /// </summary>
+        /// <remarks>
+        /// This option is only used with <see cref="NavigationDirection.Up"/>, <see cref="NavigationDirection.Down"/>,
+        /// <see cref="NavigationDirection.Left"/>, and <see cref="NavigationDirection.Right"/>. It is ignored for other
+        /// directions.
+        /// </remarks>
         public Rect ExclusionRect { get; init; }
 
         /// <summary>
@@ -35,12 +48,22 @@ namespace Avalonia.Input
         /// which can be used as a preferred or prioritized target when navigating focus.
         /// It can be null if no specific hint region is provided.
         /// </summary>
+        /// <remarks>
+        /// This option is only used with <see cref="NavigationDirection.Up"/>, <see cref="NavigationDirection.Down"/>,
+        /// <see cref="NavigationDirection.Left"/>, and <see cref="NavigationDirection.Right"/>. It is ignored for other
+        /// directions.
+        /// </remarks>
         public Rect? FocusHintRectangle { get; init; }
 
         /// <summary>
         /// Specifies an optional override for the navigation strategy used in XY focus navigation.
         /// This property allows customizing the focus movement behavior when navigating between UI elements.
         /// </summary>
+        /// <remarks>
+        /// This option is only used with <see cref="NavigationDirection.Up"/>, <see cref="NavigationDirection.Down"/>,
+        /// <see cref="NavigationDirection.Left"/>, and <see cref="NavigationDirection.Right"/>. It is ignored for other
+        /// directions.
+        /// </remarks>
         public XYFocusNavigationStrategy? NavigationStrategyOverride { get; init; }
 
         /// <summary>
@@ -49,6 +72,11 @@ namespace Avalonia.Input
         /// the navigation logic disregards obstructions that may block a potential
         /// focus target, allowing elements behind such obstructions to be considered.
         /// </summary>
+        /// <remarks>
+        /// This option is only used with <see cref="NavigationDirection.Up"/>, <see cref="NavigationDirection.Down"/>,
+        /// <see cref="NavigationDirection.Left"/>, and <see cref="NavigationDirection.Right"/>. It is ignored for other
+        /// directions.
+        /// </remarks>
         public bool IgnoreOcclusivity { get; init; }
     }
 }
diff --git a/src/Avalonia.Base/Input/FocusChangedEventArgs.cs b/src/Avalonia.Base/Input/FocusChangedEventArgs.cs
index ade599ee08..ecca7750ed 100644
--- a/src/Avalonia.Base/Input/FocusChangedEventArgs.cs
+++ b/src/Avalonia.Base/Input/FocusChangedEventArgs.cs
@@ -11,7 +11,7 @@ namespace Avalonia.Input
         /// Initializes a new instance of <see cref="FocusChangedEventArgs"/>.
         /// </summary>
         /// <param name="routedEvent">The routed event associated with these event args.</param>
-        public FocusChangedEventArgs(RoutedEvent routedEvent)
+        public FocusChangedEventArgs(RoutedEvent? routedEvent)
             : base(routedEvent)
         {
         }
diff --git a/src/Avalonia.Base/Input/FocusChangingEventArgs.cs b/src/Avalonia.Base/Input/FocusChangingEventArgs.cs
index 372ddf38b6..ed237265a6 100644
--- a/src/Avalonia.Base/Input/FocusChangingEventArgs.cs
+++ b/src/Avalonia.Base/Input/FocusChangingEventArgs.cs
@@ -12,7 +12,7 @@ namespace Avalonia.Input
         /// <summary>
         /// Provides data for focus changing.
         /// </summary>
-        internal FocusChangingEventArgs(RoutedEvent routedEvent) : base(routedEvent)
+        public FocusChangingEventArgs(RoutedEvent? routedEvent) : base(routedEvent)
         {
         }
 
diff --git a/src/Avalonia.Base/Input/FocusManager.cs b/src/Avalonia.Base/Input/FocusManager.cs
index dc62171f48..a273ff6d89 100644
--- a/src/Avalonia.Base/Input/FocusManager.cs
+++ b/src/Avalonia.Base/Input/FocusManager.cs
@@ -172,7 +172,7 @@ namespace Avalonia.Input
             ValidateDirection(direction);
 
             var focusOptions = ToFocusOptions(options, true);
-            var result = FindAndSetNextFocus(direction, focusOptions);
+            var result = FindAndSetNextFocus(options?.FocusedElement ?? Current, direction, focusOptions);
             _reusableFocusOptions = focusOptions;
             return result;
         }
@@ -319,7 +319,7 @@ namespace Avalonia.Input
             ValidateDirection(direction);
 
             var focusOptions = ToFocusOptions(options, false);
-            var result = FindNextFocus(direction, focusOptions);
+            var result = FindNextFocus(options?.FocusedElement ?? Current, direction, focusOptions);
             _reusableFocusOptions = focusOptions;
             return result;
         }
@@ -368,27 +368,29 @@ namespace Avalonia.Input
             return focusOptions;
         }
 
-        internal IInputElement? FindNextFocus(NavigationDirection direction, XYFocusOptions focusOptions, bool updateManifolds = true)
+        private IInputElement? FindNextFocus(
+            IInputElement? focusedElement,
+            NavigationDirection direction,
+            XYFocusOptions focusOptions,
+            bool updateManifolds = true)
         {
-            IInputElement? nextFocusedElement = null;
+            IInputElement? nextFocusedElement;
 
-            var currentlyFocusedElement = Current;
-
-            if (direction is NavigationDirection.Previous or NavigationDirection.Next || currentlyFocusedElement == null)
+            if (direction is NavigationDirection.Previous or NavigationDirection.Next || focusedElement == null)
             {
                 var isReverse = direction == NavigationDirection.Previous;
-                nextFocusedElement = ProcessTabStopInternal(isReverse, true);
+                nextFocusedElement = ProcessTabStopInternal(focusedElement, isReverse, true);
             }
             else
             {
-                if (currentlyFocusedElement is InputElement inputElement &&
+                if (focusedElement is InputElement inputElement &&
                     XYFocus.GetBoundsForRanking(inputElement, focusOptions.IgnoreClipping) is { } bounds)
                 {
                     focusOptions.FocusedElementBounds = bounds;
                 }
 
                 nextFocusedElement = _xyFocus.GetNextFocusableElement(direction,
-                    currentlyFocusedElement as InputElement,
+                    focusedElement as InputElement,
                     null,
                     updateManifolds,
                     focusOptions);
@@ -509,14 +511,14 @@ namespace Avalonia.Input
             return lastFocus;
         }
 
-        private IInputElement? ProcessTabStopInternal(bool isReverse, bool queryOnly)
+        private IInputElement? ProcessTabStopInternal(IInputElement? focusedElement, bool isReverse, bool queryOnly)
         {
             IInputElement? newTabStop = null;
 
-            var defaultCandidateTabStop = GetTabStopCandidateElement(isReverse, queryOnly, out var didCycleFocusAtRootVisualScope);
+            var defaultCandidateTabStop = GetTabStopCandidateElement(focusedElement, isReverse, queryOnly, out var didCycleFocusAtRootVisualScope);
 
             var isTabStopOverriden = InputElement.ProcessTabStop(_contentRoot,
-                Current,
+                focusedElement,
                 defaultCandidateTabStop,
                 isReverse,
                 didCycleFocusAtRootVisualScope,
@@ -535,24 +537,27 @@ namespace Avalonia.Input
             return newTabStop;
         }
 
-        private IInputElement? GetTabStopCandidateElement(bool isReverse, bool queryOnly, out bool didCycleFocusAtRootVisualScope)
+        private IInputElement? GetTabStopCandidateElement(
+            IInputElement? focusedElement,
+            bool isReverse,
+            bool queryOnly,
+            out bool didCycleFocusAtRootVisualScope)
         {
             didCycleFocusAtRootVisualScope = false;
-            var currentFocus = Current;
-            IInputElement? newTabStop = null;
-            var root = this._contentRoot as IInputElement;
+            IInputElement? newTabStop;
+            var root = _contentRoot;
 
             if (root == null)
                 return null;
 
             bool internalCycleWorkaround = false;
 
-            if (Current != null)
+            if (focusedElement != null)
             {
-                internalCycleWorkaround = CanProcessTabStop(isReverse);
+                internalCycleWorkaround = CanProcessTabStop(focusedElement, isReverse);
             }
 
-            if (currentFocus == null)
+            if (focusedElement == null)
             {
                 if (!isReverse)
                 {
@@ -567,7 +572,7 @@ namespace Avalonia.Input
             }
             else if (!isReverse)
             {
-                newTabStop = GetNextTabStop();
+                newTabStop = GetNextTabStop(focusedElement);
 
                 if (newTabStop == null && (internalCycleWorkaround || queryOnly))
                 {
@@ -578,7 +583,7 @@ namespace Avalonia.Input
             }
             else
             {
-                newTabStop = GetPreviousTabStop();
+                newTabStop = GetPreviousTabStop(focusedElement);
 
                 if (newTabStop == null && (internalCycleWorkaround || queryOnly))
                 {
@@ -590,9 +595,9 @@ namespace Avalonia.Input
             return newTabStop;
         }
 
-        private IInputElement? GetNextTabStop(IInputElement? currentTabStop = null, bool ignoreCurrentTabStop = false)
+        private IInputElement? GetNextTabStop(IInputElement? currentTabStop, bool ignoreCurrentTabStop = false)
         {
-            var focused = currentTabStop ?? Current;
+            var focused = currentTabStop;
             if (focused == null || _contentRoot == null)
             {
                 return null;
@@ -698,9 +703,9 @@ namespace Avalonia.Input
             return newTabStop;
         }
 
-        private IInputElement? GetPreviousTabStop(IInputElement? currentTabStop = null, bool ignoreCurrentTabStop = false)
+        private IInputElement? GetPreviousTabStop(IInputElement? currentTabStop, bool ignoreCurrentTabStop = false)
         {
-            var focused = currentTabStop ?? Current;
+            var focused = currentTabStop;
             if (focused == null || _contentRoot == null)
             {
                 return null;
@@ -930,23 +935,23 @@ namespace Avalonia.Input
             return int.MaxValue;
         }
 
-        private bool CanProcessTabStop(bool isReverse)
+        private bool CanProcessTabStop(IInputElement? focusedElement, bool isReverse)
         {
             bool isFocusOnFirst = false;
             bool isFocusOnLast = false;
             bool canProcessTab = true;
-            if (IsFocusedElementInPopup())
+            if (IsFocusedElementInPopup(focusedElement))
             {
                 return true;
             }
 
             if (isReverse)
             {
-                isFocusOnFirst = IsFocusOnFirstTabStop();
+                isFocusOnFirst = IsFocusOnFirstTabStop(focusedElement);
             }
             else
             {
-                isFocusOnLast = IsFocusOnLastTabStop();
+                isFocusOnLast = IsFocusOnLastTabStop(focusedElement);
             }
 
             if (isFocusOnFirst || isFocusOnLast)
@@ -961,7 +966,7 @@ namespace Avalonia.Input
                 if (edge != null)
                 {
                     var edgeParent = GetParentTabStopElement(edge);
-                    if (edgeParent is InputElement inputElement && KeyboardNavigation.GetTabNavigation(inputElement) == KeyboardNavigationMode.Once && edgeParent == GetParentTabStopElement(Current))
+                    if (edgeParent is InputElement inputElement && KeyboardNavigation.GetTabNavigation(inputElement) == KeyboardNavigationMode.Once && edgeParent == GetParentTabStopElement(focusedElement))
                     {
                         canProcessTab = false;
                     }
@@ -975,13 +980,13 @@ namespace Avalonia.Input
             {
                 if (isFocusOnLast || isFocusOnFirst)
                 {
-                    if (Current is InputElement inputElement && KeyboardNavigation.GetTabNavigation(inputElement) == KeyboardNavigationMode.Cycle)
+                    if (focusedElement is InputElement inputElement && KeyboardNavigation.GetTabNavigation(inputElement) == KeyboardNavigationMode.Cycle)
                     {
                         canProcessTab = true;
                     }
                     else
                     {
-                        var focusedParent = GetParentTabStopElement(Current);
+                        var focusedParent = GetParentTabStopElement(focusedElement);
                         while (focusedParent != null)
                         {
                             if (focusedParent is InputElement iE && KeyboardNavigation.GetTabNavigation(iE) == KeyboardNavigationMode.Cycle)
@@ -1041,9 +1046,9 @@ namespace Avalonia.Input
             return null;
         }
 
-        private bool IsFocusOnLastTabStop()
+        private bool IsFocusOnLastTabStop(IInputElement? focusedElement)
         {
-            if (Current == null || _contentRoot is not Visual visual)
+            if (focusedElement == null || _contentRoot is not Visual visual)
                 return false;
             var root = visual.VisualRoot as IInputElement;
 
@@ -1051,12 +1056,12 @@ namespace Avalonia.Input
 
             var lastFocus = GetLastFocusableElement(root, null);
 
-            return lastFocus == Current;
+            return lastFocus == focusedElement;
         }
 
-        private bool IsFocusOnFirstTabStop()
+        private bool IsFocusOnFirstTabStop(IInputElement? focusedElement)
         {
-            if (Current == null || _contentRoot is not Visual visual)
+            if (focusedElement == null || _contentRoot is not Visual visual)
                 return false;
             var root = visual.VisualRoot as IInputElement;
 
@@ -1064,7 +1069,7 @@ namespace Avalonia.Input
 
             var firstFocus = GetFirstFocusableElement(root, null);
 
-            return firstFocus == Current;
+            return firstFocus == focusedElement;
         }
 
         private static IInputElement? GetFirstFocusableElement(IInputElement searchStart, IInputElement? firstFocus = null)
@@ -1091,7 +1096,7 @@ namespace Avalonia.Input
             return lastFocus;
         }
 
-        private bool IsFocusedElementInPopup() => Current != null && GetRootOfPopupSubTree(Current) != null;
+        private bool IsFocusedElementInPopup(IInputElement? focusedElement) => focusedElement != null && GetRootOfPopupSubTree(focusedElement) != null;
 
         private Visual? GetRootOfPopupSubTree(IInputElement? current)
         {
@@ -1099,7 +1104,7 @@ namespace Avalonia.Input
             return null;
         }
 
-        private bool FindAndSetNextFocus(NavigationDirection direction, XYFocusOptions xYFocusOptions)
+        private bool FindAndSetNextFocus(IInputElement? focusedElement, NavigationDirection direction, XYFocusOptions xYFocusOptions)
         {
             var focusChanged = false;
             if (xYFocusOptions.UpdateManifoldsFromFocusHintRect && xYFocusOptions.FocusHintRectangle != null)
@@ -1107,7 +1112,7 @@ namespace Avalonia.Input
                 _xyFocus.SetManifoldsFromBounds(xYFocusOptions.FocusHintRectangle ?? default);
             }
 
-            if (FindNextFocus(direction, xYFocusOptions, false) is { } nextFocusedElement)
+            if (FindNextFocus(focusedElement, direction, xYFocusOptions, false) is { } nextFocusedElement)
             {
                 focusChanged = nextFocusedElement.Focus();
 
diff --git a/src/Avalonia.Base/Input/GestureRecognizers/GestureRecognizerCollection.cs b/src/Avalonia.Base/Input/GestureRecognizers/GestureRecognizerCollection.cs
index 74e8061292..34e900c7d7 100644
--- a/src/Avalonia.Base/Input/GestureRecognizers/GestureRecognizerCollection.cs
+++ b/src/Avalonia.Base/Input/GestureRecognizers/GestureRecognizerCollection.cs
@@ -39,6 +39,24 @@ namespace Avalonia.Input.GestureRecognizers
             }
         }
 
+        public bool Remove(GestureRecognizer recognizer)
+        {
+            if (_recognizers == null)
+                return false;
+
+            var removed = _recognizers.Remove(recognizer);
+
+            if (removed)
+            {
+                recognizer.Target = null;
+
+                if (recognizer is ISetLogicalParent logical)
+                    logical.SetParent(null);
+            }
+
+            return removed;
+        }
+
         static readonly List<GestureRecognizer> s_Empty = new List<GestureRecognizer>();
 
         public IEnumerator<GestureRecognizer> GetEnumerator()
diff --git a/src/Avalonia.Base/Input/GestureRecognizers/SwipeGestureRecognizer.cs b/src/Avalonia.Base/Input/GestureRecognizers/SwipeGestureRecognizer.cs
index 5d17940c8a..2328e5e874 100644
--- a/src/Avalonia.Base/Input/GestureRecognizers/SwipeGestureRecognizer.cs
+++ b/src/Avalonia.Base/Input/GestureRecognizers/SwipeGestureRecognizer.cs
@@ -1,87 +1,102 @@
 using System;
-using Avalonia.Logging;
-using Avalonia.Media;
+using System.Diagnostics;
+using Avalonia.Platform;
 
 namespace Avalonia.Input.GestureRecognizers
 {
     /// <summary>
-    /// A gesture recognizer that detects swipe gestures and raises
-    /// <see cref="InputElement.SwipeGestureEvent"/> on the target element when a swipe is confirmed.
+    /// A gesture recognizer that detects swipe gestures for paging interactions.
     /// </summary>
+    /// <remarks>
+    /// Unlike <see cref="ScrollGestureRecognizer"/>, this recognizer is optimized for discrete
+    /// paging interactions (e.g., carousel navigation) rather than continuous scrolling.
+    /// It does not include inertia or friction physics.
+    /// </remarks>
     public class SwipeGestureRecognizer : GestureRecognizer
     {
+        private bool _swiping;
+        private Point _trackedRootPoint;
         private IPointer? _tracking;
-        private IPointer? _captured;
-        private Point _initialPosition;
-        private int _gestureId;
+        private int _id;
+
+        private Vector _velocity;
+        private long _lastTimestamp;
 
         /// <summary>
-        /// Defines the <see cref="Threshold"/> property.
+        /// Defines the <see cref="CanHorizontallySwipe"/> property.
         /// </summary>
-        public static readonly StyledProperty<double> ThresholdProperty =
-            AvaloniaProperty.Register<SwipeGestureRecognizer, double>(nameof(Threshold), 30d);
+        public static readonly StyledProperty<bool> CanHorizontallySwipeProperty =
+            AvaloniaProperty.Register<SwipeGestureRecognizer, bool>(nameof(CanHorizontallySwipe));
 
         /// <summary>
-        /// Defines the <see cref="CrossAxisCancelThreshold"/> property.
+        /// Defines the <see cref="CanVerticallySwipe"/> property.
         /// </summary>
-        public static readonly StyledProperty<double> CrossAxisCancelThresholdProperty =
-            AvaloniaProperty.Register<SwipeGestureRecognizer, double>(
-                nameof(CrossAxisCancelThreshold), 8d);
+        public static readonly StyledProperty<bool> CanVerticallySwipeProperty =
+            AvaloniaProperty.Register<SwipeGestureRecognizer, bool>(nameof(CanVerticallySwipe));
 
         /// <summary>
-        /// Defines the <see cref="EdgeSize"/> property.
-        /// Leading-edge start zone in px. 0 (default) = full area.
-        /// When &gt; 0, only starts tracking if the pointer is within this many px
-        /// of the leading edge (LTR: left; RTL: right).
+        /// Defines the <see cref="Threshold"/> property.
         /// </summary>
-        public static readonly StyledProperty<double> EdgeSizeProperty =
-            AvaloniaProperty.Register<SwipeGestureRecognizer, double>(nameof(EdgeSize), 0d);
+        /// <remarks>
+        /// A value of 0 (the default) causes the distance to be read from
+        /// <see cref="IPlatformSettings"/> at the time of the first gesture.
+        /// </remarks>
+        public static readonly StyledProperty<double> ThresholdProperty =
+            AvaloniaProperty.Register<SwipeGestureRecognizer, double>(nameof(Threshold), defaultValue: 0d);
+
+        /// <summary>
+        /// Defines the <see cref="IsMouseEnabled"/> property.
+        /// </summary>
+        public static readonly StyledProperty<bool> IsMouseEnabledProperty =
+            AvaloniaProperty.Register<SwipeGestureRecognizer, bool>(nameof(IsMouseEnabled), defaultValue: false);
 
         /// <summary>
         /// Defines the <see cref="IsEnabled"/> property.
-        /// When false, the recognizer ignores all pointer events.
-        /// Lets callers toggle the recognizer at runtime without needing to remove it from the
-        /// collection (GestureRecognizerCollection has Add but no Remove).
-        /// Default: true.
         /// </summary>
         public static readonly StyledProperty<bool> IsEnabledProperty =
-            AvaloniaProperty.Register<SwipeGestureRecognizer, bool>(nameof(IsEnabled), true);
+            AvaloniaProperty.Register<SwipeGestureRecognizer, bool>(nameof(IsEnabled), defaultValue: true);
 
         /// <summary>
-        /// Gets or sets the minimum distance in pixels the pointer must travel before a swipe
-        /// is recognized. Default is 30px.
+        /// Gets or sets a value indicating whether horizontal swipes are tracked.
         /// </summary>
-        public double Threshold
+        public bool CanHorizontallySwipe
         {
-            get => GetValue(ThresholdProperty);
-            set => SetValue(ThresholdProperty, value);
+            get => GetValue(CanHorizontallySwipeProperty);
+            set => SetValue(CanHorizontallySwipeProperty, value);
         }
 
         /// <summary>
-        /// Gets or sets the maximum cross-axis drift in pixels allowed before the gesture is
-        /// cancelled. Default is 8px.
+        /// Gets or sets a value indicating whether vertical swipes are tracked.
         /// </summary>
-        public double CrossAxisCancelThreshold
+        public bool CanVerticallySwipe
         {
-            get => GetValue(CrossAxisCancelThresholdProperty);
-            set => SetValue(CrossAxisCancelThresholdProperty, value);
+            get => GetValue(CanVerticallySwipeProperty);
+            set => SetValue(CanVerticallySwipeProperty, value);
         }
 
         /// <summary>
-        /// Gets or sets the leading-edge start zone in pixels. When greater than zero, tracking
-        /// only begins if the pointer is within this distance of the leading edge. Default is 0
-        /// (full area).
+        /// Gets or sets the minimum pointer movement in pixels before a swipe is recognized.
+        /// A value of 0 reads the threshold from <see cref="IPlatformSettings"/> at gesture time.
         /// </summary>
-        public double EdgeSize
+        public double Threshold
         {
-            get => GetValue(EdgeSizeProperty);
-            set => SetValue(EdgeSizeProperty, value);
+            get => GetValue(ThresholdProperty);
+            set => SetValue(ThresholdProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether mouse pointer events trigger swipe gestures.
+        /// Defaults to <see langword="false"/>; touch and pen are always enabled.
+        /// </summary>
+        public bool IsMouseEnabled
+        {
+            get => GetValue(IsMouseEnabledProperty);
+            set => SetValue(IsMouseEnabledProperty, value);
         }
 
         /// <summary>
-        /// Gets or sets a value indicating whether the recognizer responds to pointer events.
-        /// Setting this to false is a lightweight alternative to removing the recognizer from
-        /// the collection. Default is true.
+        /// Gets or sets a value indicating whether this recognizer responds to pointer events.
+        /// Defaults to <see langword="true"/>.
         /// </summary>
         public bool IsEnabled
         {
@@ -89,104 +104,122 @@ namespace Avalonia.Input.GestureRecognizers
             set => SetValue(IsEnabledProperty, value);
         }
 
+        /// <inheritdoc/>
         protected override void PointerPressed(PointerPressedEventArgs e)
         {
-            if (!IsEnabled) return;
-            if (!e.GetCurrentPoint(null).Properties.IsLeftButtonPressed) return;
-            if (Target is not Visual visual) return;
+            if (!IsEnabled)
+                return;
 
-            var pos = e.GetPosition(visual);
-            var edgeSize = EdgeSize;
+            var point = e.GetCurrentPoint(null);
 
-            if (edgeSize > 0)
+            if ((e.Pointer.Type is PointerType.Touch or PointerType.Pen ||
+                 (IsMouseEnabled && e.Pointer.Type == PointerType.Mouse))
+                && point.Properties.IsLeftButtonPressed)
             {
-                bool isRtl = visual.FlowDirection == FlowDirection.RightToLeft;
-                bool inEdge = isRtl
-                    ? pos.X >= visual.Bounds.Width - edgeSize
-                    : pos.X <= edgeSize;
-                if (!inEdge)
-                {
-                    Logger.TryGet(LogEventLevel.Verbose, LogArea.Control)?.Log(
-                        this, "SwipeGestureRecognizer: press at {Pos} outside edge zone ({EdgeSize}px), ignoring",
-                        pos, edgeSize);
-                    return;
-                }
+                EndGesture();
+                _tracking = e.Pointer;
+                _id = SwipeGestureEventArgs.GetNextFreeId();
+                _trackedRootPoint = point.Position;
+                _velocity = default;
+                _lastTimestamp = 0;
             }
-
-            _gestureId = SwipeGestureEventArgs.GetNextFreeId();
-            _tracking = e.Pointer;
-            _initialPosition = pos;
-
-            Logger.TryGet(LogEventLevel.Verbose, LogArea.Control)?.Log(
-                this, "SwipeGestureRecognizer: tracking started at {Pos} (pointer={PointerType})",
-                pos, e.Pointer.Type);
         }
 
+        /// <inheritdoc/>
         protected override void PointerMoved(PointerEventArgs e)
         {
-            if (_tracking != e.Pointer || Target is not Visual visual) return;
-
-            var pos = e.GetPosition(visual);
-            double dx = pos.X - _initialPosition.X;
-            double dy = pos.Y - _initialPosition.Y;
-            double absDx = Math.Abs(dx);
-            double absDy = Math.Abs(dy);
-            double threshold = Threshold;
-
-            if (absDx < threshold && absDy < threshold)
-                return;
-
-            SwipeDirection dir;
-            Vector delta;
-            if (absDx >= absDy)
+            if (e.Pointer == _tracking)
             {
-                dir = dx > 0 ? SwipeDirection.Right : SwipeDirection.Left;
-                delta = new Vector(dx, 0);
-            }
-            else
-            {
-                dir = dy > 0 ? SwipeDirection.Down : SwipeDirection.Up;
-                delta = new Vector(0, dy);
-            }
+                var rootPoint = e.GetPosition(null);
+                var threshold = GetEffectiveThreshold();
 
-            Logger.TryGet(LogEventLevel.Verbose, LogArea.Control)?.Log(
-                this, "SwipeGestureRecognizer: swipe recognized — direction={Direction}, delta={Delta}",
-                dir, delta);
+                if (!_swiping)
+                {
+                    var horizontalTriggered = CanHorizontallySwipe && Math.Abs(_trackedRootPoint.X - rootPoint.X) > threshold;
+                    var verticalTriggered = CanVerticallySwipe && Math.Abs(_trackedRootPoint.Y - rootPoint.Y) > threshold;
+
+                    if (horizontalTriggered || verticalTriggered)
+                    {
+                        _swiping = true;
+
+                        _trackedRootPoint = new Point(
+                            horizontalTriggered
+                                ? _trackedRootPoint.X - (_trackedRootPoint.X >= rootPoint.X ? threshold : -threshold)
+                                : rootPoint.X,
+                            verticalTriggered
+                                ? _trackedRootPoint.Y - (_trackedRootPoint.Y >= rootPoint.Y ? threshold : -threshold)
+                                : rootPoint.Y);
+
+                        Capture(e.Pointer);
+                    }
+                }
 
-            _tracking = null;
-            _captured = e.Pointer;
-            Capture(e.Pointer);
-            e.Handled = true;
+                if (_swiping)
+                {
+                    var delta = _trackedRootPoint - rootPoint;
+
+                    var now = Stopwatch.GetTimestamp();
+                    if (_lastTimestamp > 0)
+                    {
+                        var elapsedSeconds = (double)(now - _lastTimestamp) / Stopwatch.Frequency;
+                        if (elapsedSeconds > 0)
+                        {
+                            var instantVelocity = delta / elapsedSeconds;
+                            _velocity = _velocity * 0.5 + instantVelocity * 0.5;
+                        }
+                    }
+                    _lastTimestamp = now;
+
+                    Target!.RaiseEvent(new SwipeGestureEventArgs(_id, delta, _velocity));
+                    _trackedRootPoint = rootPoint;
+                    e.Handled = true;
+                }
+            }
+        }
 
-            var args = new SwipeGestureEventArgs(_gestureId, dir, delta, _initialPosition);
-            Target?.RaiseEvent(args);
+        /// <inheritdoc/>
+        protected override void PointerCaptureLost(IPointer pointer)
+        {
+            if (pointer == _tracking)
+                EndGesture();
         }
 
+        /// <inheritdoc/>
         protected override void PointerReleased(PointerReleasedEventArgs e)
         {
-            if (_tracking == e.Pointer)
+            if (e.Pointer == _tracking && _swiping)
             {
-                Logger.TryGet(LogEventLevel.Verbose, LogArea.Control)?.Log(
-                    this, "SwipeGestureRecognizer: pointer released without crossing threshold — gesture discarded");
-                _tracking = null;
+                e.Handled = true;
+                EndGesture();
             }
+        }
 
-            if (_captured == e.Pointer)
+        private void EndGesture()
+        {
+            _tracking = null;
+            if (_swiping)
             {
-                (e.Pointer as Pointer)?.CaptureGestureRecognizer(null);
-                _captured = null;
+                _swiping = false;
+                var endedArgs = new SwipeGestureEndedEventArgs(_id, _velocity);
+                _velocity = default;
+                _lastTimestamp = 0;
+                _id = 0;
+                Target!.RaiseEvent(endedArgs);
             }
         }
 
-        protected override void PointerCaptureLost(IPointer pointer)
+        private const double DefaultTapSize = 10;
+
+        private double GetEffectiveThreshold()
         {
-            if (_tracking == pointer)
-            {
-                Logger.TryGet(LogEventLevel.Verbose, LogArea.Control)?.Log(
-                    this, "SwipeGestureRecognizer: capture lost — gesture cancelled");
-                _tracking = null;
-            }
-            _captured = null;
+            var configured = Threshold;
+            if (configured > 0)
+                return configured;
+
+            var tapSize = AvaloniaLocator.Current?.GetService<IPlatformSettings>()
+                ?.GetTapSize(PointerType.Touch).Height ?? DefaultTapSize;
+
+            return tapSize / 2;
         }
     }
 }
diff --git a/src/Avalonia.Base/Input/Gestures.cs b/src/Avalonia.Base/Input/Gestures.cs
index 3ae504a77f..07c9ab18be 100644
--- a/src/Avalonia.Base/Input/Gestures.cs
+++ b/src/Avalonia.Base/Input/Gestures.cs
@@ -30,14 +30,12 @@ namespace Avalonia.Input
         private static readonly WeakReference<object?> s_lastPress = new WeakReference<object?>(null);
         private static Point s_lastPressPoint;
         private static CancellationTokenSource? s_holdCancellationToken;
-
         static Gestures()
         {
             InputElement.PointerPressedEvent.RouteFinished.Subscribe(PointerPressed);
             InputElement.PointerReleasedEvent.RouteFinished.Subscribe(PointerReleased);
             InputElement.PointerMovedEvent.RouteFinished.Subscribe(PointerMoved);
         }
-
         private static object? GetCaptured(RoutedEventArgs? args)
         {
             if (args is not PointerEventArgs pointerEventArgs)
diff --git a/src/Avalonia.Base/Input/IFocusManager.cs b/src/Avalonia.Base/Input/IFocusManager.cs
index 9bd1fb4239..d9e8d36f8b 100644
--- a/src/Avalonia.Base/Input/IFocusManager.cs
+++ b/src/Avalonia.Base/Input/IFocusManager.cs
@@ -41,10 +41,7 @@ namespace Avalonia.Input
         /// <see cref="NavigationDirection.Left"/>, <see cref="NavigationDirection.Right"/>,
         /// <see cref="NavigationDirection.Up"/> and <see cref="NavigationDirection.Down"/>.
         /// </param>
-        /// <param name="options">
-        /// The options to help identify the next element to receive focus.
-        /// They only apply to directional navigation.
-        /// </param>
+        /// <param name="options">The options to help identify the next element to receive focus.</param>
         /// <returns>true if focus moved; otherwise, false.</returns>
         bool TryMoveFocus(NavigationDirection direction, FindNextElementOptions? options = null);
 
@@ -69,10 +66,7 @@ namespace Avalonia.Input
         /// <see cref="NavigationDirection.Left"/>, <see cref="NavigationDirection.Right"/>,
         /// <see cref="NavigationDirection.Up"/> and <see cref="NavigationDirection.Down"/>.
         /// </param>
-        /// <param name="options">
-        /// The options to help identify the next element to receive focus.
-        /// They only apply to directional navigation.
-        /// </param>
+        /// <param name="options">The options to help identify the next element to receive focus.</param>
         /// <returns>The next element to receive focus, if any.</returns>
         IInputElement? FindNextElement(NavigationDirection direction, FindNextElementOptions? options = null);
     }
diff --git a/src/Avalonia.Base/Input/InputElement.Gestures.cs b/src/Avalonia.Base/Input/InputElement.Gestures.cs
index 83f350f0e7..1323e4d35e 100644
--- a/src/Avalonia.Base/Input/InputElement.Gestures.cs
+++ b/src/Avalonia.Base/Input/InputElement.Gestures.cs
@@ -54,6 +54,13 @@ namespace Avalonia.Input
             RoutedEvent.Register<InputElement, SwipeGestureEventArgs>(
                 nameof(SwipeGesture), RoutingStrategies.Bubble);
 
+        /// <summary>
+        /// Defines the <see cref="SwipeGestureEnded"/> event.
+        /// </summary>
+        public static readonly RoutedEvent<SwipeGestureEndedEventArgs> SwipeGestureEndedEvent =
+            RoutedEvent.Register<InputElement, SwipeGestureEndedEventArgs>(
+                nameof(SwipeGestureEnded), RoutingStrategies.Bubble);
+
         /// <summary>
         /// Defines the <see cref="ScrollGesture"/> event.
         /// </summary>
@@ -238,6 +245,15 @@ namespace Avalonia.Input
             remove { RemoveHandler(SwipeGestureEvent, value); }
         }
 
+        /// <summary>
+        /// Occurs when a swipe gesture ends on the control.
+        /// </summary>
+        public event EventHandler<SwipeGestureEndedEventArgs>? SwipeGestureEnded
+        {
+            add { AddHandler(SwipeGestureEndedEvent, value); }
+            remove { RemoveHandler(SwipeGestureEndedEvent, value); }
+        }
+
         /// <summary>
         /// Occurs when the user performs a rapid dragging motion in a single direction on a touchpad.
         /// </summary>
diff --git a/src/Avalonia.Base/Input/PointerDeltaEventArgs.cs b/src/Avalonia.Base/Input/PointerDeltaEventArgs.cs
index 3c4562edf4..6c65dd8548 100644
--- a/src/Avalonia.Base/Input/PointerDeltaEventArgs.cs
+++ b/src/Avalonia.Base/Input/PointerDeltaEventArgs.cs
@@ -10,7 +10,7 @@ namespace Avalonia.Input
         public Vector Delta { get; }
 
         [Unstable("This constructor might be removed in 12.0.")]
-        public PointerDeltaEventArgs(RoutedEvent routedEvent, object? source, 
+        public PointerDeltaEventArgs(RoutedEvent? routedEvent, object? source,
             IPointer pointer, Visual rootVisual, Point rootVisualPosition, ulong timestamp,
             PointerPointProperties properties, KeyModifiers modifiers, Vector delta) 
             : base(routedEvent, source, pointer, rootVisual, rootVisualPosition,
diff --git a/src/Avalonia.Base/Input/PointerEventArgs.cs b/src/Avalonia.Base/Input/PointerEventArgs.cs
index f4bf785c56..94c81a798d 100644
--- a/src/Avalonia.Base/Input/PointerEventArgs.cs
+++ b/src/Avalonia.Base/Input/PointerEventArgs.cs
@@ -15,7 +15,7 @@ namespace Avalonia.Input
         private readonly Lazy<IReadOnlyList<RawPointerPoint>?>? _previousPoints;
 
         [Unstable("This constructor might be removed in 12.0. For unit testing, consider using IHeadlessWindow mouse methods.")]
-        public PointerEventArgs(RoutedEvent routedEvent,
+        public PointerEventArgs(RoutedEvent? routedEvent,
             object? source,
             IPointer pointer,
             Visual? rootVisual, Point rootVisualPosition,
@@ -33,7 +33,7 @@ namespace Avalonia.Input
             KeyModifiers = modifiers;
         }
         
-        internal PointerEventArgs(RoutedEvent routedEvent,
+        internal PointerEventArgs(RoutedEvent? routedEvent,
             object? source,
             IPointer pointer,
             Visual? rootVisual, Point rootVisualPosition,
diff --git a/src/Avalonia.Base/Input/SwipeDirection.cs b/src/Avalonia.Base/Input/SwipeDirection.cs
new file mode 100644
index 0000000000..3043b443e6
--- /dev/null
+++ b/src/Avalonia.Base/Input/SwipeDirection.cs
@@ -0,0 +1,28 @@
+namespace Avalonia.Input
+{
+    /// <summary>
+    /// Specifies the direction of a swipe gesture.
+    /// </summary>
+    public enum SwipeDirection
+    {
+        /// <summary>
+        /// The swipe moved to the left.
+        /// </summary>
+        Left,
+
+        /// <summary>
+        /// The swipe moved to the right.
+        /// </summary>
+        Right,
+
+        /// <summary>
+        /// The swipe moved upward.
+        /// </summary>
+        Up,
+
+        /// <summary>
+        /// The swipe moved downward.
+        /// </summary>
+        Down
+    }
+}
diff --git a/src/Avalonia.Base/Input/SwipeGestureEventArgs.cs b/src/Avalonia.Base/Input/SwipeGestureEventArgs.cs
index 0c2a91556a..3fa9aede82 100644
--- a/src/Avalonia.Base/Input/SwipeGestureEventArgs.cs
+++ b/src/Avalonia.Base/Input/SwipeGestureEventArgs.cs
@@ -1,50 +1,81 @@
+using System;
+using System.Threading;
 using Avalonia.Interactivity;
 
 namespace Avalonia.Input
 {
     /// <summary>
-    /// Specifies the direction of a swipe gesture.
-    /// </summary>
-    public enum SwipeDirection { Left, Right, Up, Down }
-
-    /// <summary>
-    /// Provides data for the <see cref="InputElement.SwipeGestureEvent"/> routed event.
+    /// Provides data for swipe gesture events.
     /// </summary>
     public class SwipeGestureEventArgs : RoutedEventArgs
     {
-        private static int _nextId = 1;
-        internal static int GetNextFreeId() => _nextId++;
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SwipeGestureEventArgs"/> class.
+        /// </summary>
+        /// <param name="id">The unique identifier for this gesture.</param>
+        /// <param name="delta">The pixel delta since the last event.</param>
+        /// <param name="velocity">The current swipe velocity in pixels per second.</param>
+        public SwipeGestureEventArgs(int id, Vector delta, Vector velocity)
+            : base(InputElement.SwipeGestureEvent)
+        {
+            Id = id;
+            Delta = delta;
+            Velocity = velocity;
+            SwipeDirection = Math.Abs(delta.X) >= Math.Abs(delta.Y)
+                ? (delta.X <= 0 ? SwipeDirection.Right : SwipeDirection.Left)
+                : (delta.Y <= 0 ? SwipeDirection.Down : SwipeDirection.Up);
+        }
 
         /// <summary>
-        /// Gets the unique identifier for this swipe gesture instance.
+        /// Gets the unique identifier for this gesture sequence.
         /// </summary>
         public int Id { get; }
 
         /// <summary>
-        /// Gets the direction of the swipe gesture.
+        /// Gets the pixel delta since the last event.
         /// </summary>
-        public SwipeDirection SwipeDirection { get; }
+        public Vector Delta { get; }
 
         /// <summary>
-        /// Gets the total translation vector of the swipe gesture.
+        /// Gets the current swipe velocity in pixels per second.
         /// </summary>
-        public Vector Delta { get; }
+        public Vector Velocity { get; }
 
         /// <summary>
-        /// Gets the position, relative to the target element, where the swipe started.
+        /// Gets the direction of the dominant swipe axis.
         /// </summary>
-        public Point StartPoint { get; }
+        public SwipeDirection SwipeDirection { get; }
+
+        private static int s_nextId;
 
+        internal static int GetNextFreeId() => Interlocked.Increment(ref s_nextId);
+    }
+
+    /// <summary>
+    /// Provides data for the swipe gesture ended event.
+    /// </summary>
+    public class SwipeGestureEndedEventArgs : RoutedEventArgs
+    {
         /// <summary>
-        /// Initializes a new instance of <see cref="SwipeGestureEventArgs"/>.
+        /// Initializes a new instance of the <see cref="SwipeGestureEndedEventArgs"/> class.
         /// </summary>
-        public SwipeGestureEventArgs(int id, SwipeDirection direction, Vector delta, Point startPoint)
-            : base(InputElement.SwipeGestureEvent)
+        /// <param name="id">The unique identifier for this gesture.</param>
+        /// <param name="velocity">The swipe velocity at release in pixels per second.</param>
+        public SwipeGestureEndedEventArgs(int id, Vector velocity)
+            : base(InputElement.SwipeGestureEndedEvent)
         {
             Id = id;
-            SwipeDirection = direction;
-            Delta = delta;
-            StartPoint = startPoint;
+            Velocity = velocity;
         }
+
+        /// <summary>
+        /// Gets the unique identifier for this gesture sequence.
+        /// </summary>
+        public int Id { get; }
+
+        /// <summary>
+        /// Gets the swipe velocity at release in pixels per second.
+        /// </summary>
+        public Vector Velocity { get; }
     }
 }
diff --git a/src/Avalonia.Base/Input/TappedEventArgs.cs b/src/Avalonia.Base/Input/TappedEventArgs.cs
index a235d495d6..924f4be11f 100644
--- a/src/Avalonia.Base/Input/TappedEventArgs.cs
+++ b/src/Avalonia.Base/Input/TappedEventArgs.cs
@@ -6,7 +6,7 @@ namespace Avalonia.Input
     {
         private readonly PointerEventArgs lastPointerEventArgs;
 
-        public TappedEventArgs(RoutedEvent routedEvent, PointerEventArgs lastPointerEventArgs)
+        public TappedEventArgs(RoutedEvent? routedEvent, PointerEventArgs lastPointerEventArgs)
             : base(routedEvent)
         {
             this.lastPointerEventArgs = lastPointerEventArgs;
diff --git a/src/Avalonia.Base/Rect.cs b/src/Avalonia.Base/Rect.cs
index 58a8c56c8b..9c901254a6 100644
--- a/src/Avalonia.Base/Rect.cs
+++ b/src/Avalonia.Base/Rect.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Globalization;
 using System.Numerics;
-using Avalonia.Animation.Animators;
 using Avalonia.Utilities;
 
 namespace Avalonia
diff --git a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionTarget.cs b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionTarget.cs
index 81a3c09b35..e8ae84eb03 100644
--- a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionTarget.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionTarget.cs
@@ -149,12 +149,16 @@ namespace Avalonia.Rendering.Composition.Server
 
             try
             {
-                if (_renderTarget == null && !_compositor.IsReadyToCreateRenderTarget(_surfaces()))
+                if (_renderTarget == null)
                 {
-                    IsWaitingForReadyRenderTarget = IsEnabled;
-                    return;
+                    if (!_compositor.IsReadyToCreateRenderTarget(_surfaces()))
+                    {
+                        IsWaitingForReadyRenderTarget = IsEnabled;
+                        return;
+                    }
+
+                    _renderTarget = _compositor.CreateRenderTarget(_surfaces());
                 }
-                _renderTarget ??= _compositor.CreateRenderTarget(_surfaces());
             }
             catch (RenderTargetNotReadyException)
             {
diff --git a/src/Avalonia.Controls/Automation/Peers/CarouselPageAutomationPeer.cs b/src/Avalonia.Controls/Automation/Peers/CarouselPageAutomationPeer.cs
new file mode 100644
index 0000000000..0744e43125
--- /dev/null
+++ b/src/Avalonia.Controls/Automation/Peers/CarouselPageAutomationPeer.cs
@@ -0,0 +1,26 @@
+using Avalonia.Controls;
+
+namespace Avalonia.Automation.Peers;
+
+public class CarouselPageAutomationPeer : ControlAutomationPeer
+{
+    public CarouselPageAutomationPeer(CarouselPage owner)
+        : base(owner)
+    {
+    }
+
+    public new CarouselPage Owner => (CarouselPage)base.Owner;
+
+    protected override AutomationControlType GetAutomationControlTypeCore()
+        => AutomationControlType.Pane;
+
+    protected override string? GetNameCore()
+    {
+        var result = base.GetNameCore();
+
+        if (string.IsNullOrEmpty(result))
+            result = Owner.Header?.ToString();
+
+        return result;
+    }
+}
diff --git a/src/Avalonia.Controls/Automation/Peers/DrawerPageAutomationPeer.cs b/src/Avalonia.Controls/Automation/Peers/DrawerPageAutomationPeer.cs
index 35477ae7d4..39a009967e 100644
--- a/src/Avalonia.Controls/Automation/Peers/DrawerPageAutomationPeer.cs
+++ b/src/Avalonia.Controls/Automation/Peers/DrawerPageAutomationPeer.cs
@@ -1,16 +1,24 @@
+using Avalonia.Automation.Provider;
 using Avalonia.Controls;
 
 namespace Avalonia.Automation.Peers;
 
-public class DrawerPageAutomationPeer : ControlAutomationPeer
+public class DrawerPageAutomationPeer : ControlAutomationPeer,
+    IExpandCollapseProvider
 {
     public DrawerPageAutomationPeer(DrawerPage owner)
         : base(owner)
     {
+        owner.PropertyChanged += OwnerPropertyChanged;
     }
 
     public new DrawerPage Owner => (DrawerPage)base.Owner;
 
+    public ExpandCollapseState ExpandCollapseState => ToState(Owner.IsOpen);
+    public bool ShowsMenu => false;
+    public void Collapse() => Owner.IsOpen = false;
+    public void Expand() => Owner.IsOpen = true;
+
     protected override AutomationControlType GetAutomationControlTypeCore()
         => AutomationControlType.Pane;
 
@@ -23,4 +31,20 @@ public class DrawerPageAutomationPeer : ControlAutomationPeer
 
         return result;
     }
+
+    private void OwnerPropertyChanged(object? sender, AvaloniaPropertyChangedEventArgs e)
+    {
+        if (e.Property == DrawerPage.IsOpenProperty)
+        {
+            RaisePropertyChangedEvent(
+                ExpandCollapsePatternIdentifiers.ExpandCollapseStateProperty,
+                ToState(e.GetOldValue<bool>()),
+                ToState(e.GetNewValue<bool>()));
+        }
+    }
+
+    private static ExpandCollapseState ToState(bool value)
+    {
+        return value ? ExpandCollapseState.Expanded : ExpandCollapseState.Collapsed;
+    }
 }
diff --git a/src/Avalonia.Controls/Automation/Peers/TabbedPageAutomationPeer.cs b/src/Avalonia.Controls/Automation/Peers/TabbedPageAutomationPeer.cs
index 44c0b35af6..e679d7109b 100644
--- a/src/Avalonia.Controls/Automation/Peers/TabbedPageAutomationPeer.cs
+++ b/src/Avalonia.Controls/Automation/Peers/TabbedPageAutomationPeer.cs
@@ -21,6 +21,22 @@ public class TabbedPageAutomationPeer : ControlAutomationPeer
         if (string.IsNullOrEmpty(result))
             result = Owner.Header?.ToString();
 
+        var index = Owner.SelectedIndex;
+        var tabCount = GetTabCount();
+
+        if (index >= 0 && tabCount > 0)
+        {
+            var header = Owner.SelectedPage?.Header?.ToString();
+            var position = $"Tab {index + 1} of {tabCount}";
+            var tabName = string.IsNullOrEmpty(header) ? position : $"{position}: {header}";
+            return string.IsNullOrEmpty(result) ? tabName : $"{result} {tabName}";
+        }
+
         return result;
     }
+
+    private int GetTabCount()
+    {
+        return Owner.GetTabCount();
+    }
 }
diff --git a/src/Avalonia.Controls/Button.cs b/src/Avalonia.Controls/Button.cs
index ceadae432c..c094db57ec 100644
--- a/src/Avalonia.Controls/Button.cs
+++ b/src/Avalonia.Controls/Button.cs
@@ -543,10 +543,13 @@ namespace Avalonia.Controls
                     oldFlyout.Hide();
                 }
 
+                (oldFlyout as PopupFlyoutBase)?.SetDefaultPlacementTarget(null);
+
                 // Must unregister events here while a reference to the old flyout still exists
                 UnregisterFlyoutEvents(oldFlyout);
 
                 RegisterFlyoutEvents(newFlyout);
+                (newFlyout as PopupFlyoutBase)?.SetDefaultPlacementTarget(this);
                 UpdatePseudoClasses();
             }
         }
diff --git a/src/Avalonia.Controls/Carousel.cs b/src/Avalonia.Controls/Carousel.cs
index 533f7bb626..6e8ce8a287 100644
--- a/src/Avalonia.Controls/Carousel.cs
+++ b/src/Avalonia.Controls/Carousel.cs
@@ -1,11 +1,13 @@
 using Avalonia.Animation;
 using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Templates;
+using Avalonia.Input;
 
 namespace Avalonia.Controls
 {
     /// <summary>
-    /// An items control that displays its items as pages that fill the control.
+    /// An items control that displays its items as pages and can reveal adjacent pages
+    /// using <see cref="ViewportFraction"/>.
     /// </summary>
     public class Carousel : SelectingItemsControl
     {
@@ -16,13 +18,36 @@ namespace Avalonia.Controls
             AvaloniaProperty.Register<Carousel, IPageTransition?>(nameof(PageTransition));
 
         /// <summary>
-        /// The default value of <see cref="ItemsControl.ItemsPanelProperty"/> for 
+        /// Defines the <see cref="IsSwipeEnabled"/> property.
+        /// </summary>
+        public static readonly StyledProperty<bool> IsSwipeEnabledProperty =
+            AvaloniaProperty.Register<Carousel, bool>(nameof(IsSwipeEnabled), defaultValue: false);
+
+        /// <summary>
+        /// Defines the <see cref="ViewportFraction"/> property.
+        /// </summary>
+        public static readonly StyledProperty<double> ViewportFractionProperty =
+            AvaloniaProperty.Register<Carousel, double>(
+                nameof(ViewportFraction),
+                defaultValue: 1d,
+                coerce: (_, value) => double.IsFinite(value) && value > 0 ? value : 1d);
+
+        /// <summary>
+        /// Defines the <see cref="IsSwiping"/> property.
+        /// </summary>
+        public static readonly DirectProperty<Carousel, bool> IsSwipingProperty =
+            AvaloniaProperty.RegisterDirect<Carousel, bool>(nameof(IsSwiping),
+                o => o.IsSwiping);
+
+        /// <summary>
+        /// The default value of <see cref="ItemsControl.ItemsPanelProperty"/> for
         /// <see cref="Carousel"/>.
         /// </summary>
         private static readonly FuncTemplate<Panel?> DefaultPanel =
             new(() => new VirtualizingCarouselPanel());
 
         private IScrollable? _scroller;
+        private bool _isSwiping;
 
         /// <summary>
         /// Initializes static members of the <see cref="Carousel"/> class.
@@ -42,15 +67,51 @@ namespace Avalonia.Controls
             set => SetValue(PageTransitionProperty, value);
         }
 
+        /// <summary>
+        /// Gets or sets whether swipe gestures are enabled for navigating between pages.
+        /// When enabled, mouse pointer events are also accepted in addition to touch and pen.
+        /// </summary>
+        public bool IsSwipeEnabled
+        {
+            get => GetValue(IsSwipeEnabledProperty);
+            set => SetValue(IsSwipeEnabledProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the fraction of the viewport occupied by each page.
+        /// A value of 1 shows a single full page; values below 1 reveal adjacent pages.
+        /// </summary>
+        public double ViewportFraction
+        {
+            get => GetValue(ViewportFractionProperty);
+            set => SetValue(ViewportFractionProperty, value);
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether a swipe gesture is currently in progress.
+        /// </summary>
+        public bool IsSwiping
+        {
+            get => _isSwiping;
+            internal set => SetAndRaise(IsSwipingProperty, ref _isSwiping, value);
+        }
+
         /// <summary>
         /// Moves to the next item in the carousel.
         /// </summary>
         public void Next()
         {
+            if (ItemCount == 0)
+                return;
+
             if (SelectedIndex < ItemCount - 1)
             {
                 ++SelectedIndex;
             }
+            else if (WrapSelection)
+            {
+                SelectedIndex = 0;
+            }
         }
 
         /// <summary>
@@ -58,18 +119,78 @@ namespace Avalonia.Controls
         /// </summary>
         public void Previous()
         {
+            if (ItemCount == 0)
+                return;
+
             if (SelectedIndex > 0)
             {
                 --SelectedIndex;
             }
+            else if (WrapSelection)
+            {
+                SelectedIndex = ItemCount - 1;
+            }
+        }
+
+        internal PageSlide.SlideAxis? GetTransitionAxis()
+        {
+            var transition = PageTransition;
+
+            if (transition is CompositePageTransition composite)
+            {
+                foreach (var t in composite.PageTransitions)
+                {
+                    if (t is PageSlide slide)
+                        return slide.Orientation;
+                }
+
+                return null;
+            }
+
+            return transition is PageSlide ps ? ps.Orientation : null;
+        }
+
+        internal PageSlide.SlideAxis GetLayoutAxis() => GetTransitionAxis() ?? PageSlide.SlideAxis.Horizontal;
+
+        protected override void OnKeyDown(KeyEventArgs e)
+        {
+            base.OnKeyDown(e);
+
+            if (e.Handled || ItemCount == 0)
+                return;
+
+            var axis = ViewportFraction != 1d ? GetLayoutAxis() : GetTransitionAxis();
+            var isVertical = axis == PageSlide.SlideAxis.Vertical;
+            var isHorizontal = axis == PageSlide.SlideAxis.Horizontal;
+
+            switch (e.Key)
+            {
+                case Key.Left when !isVertical:
+                case Key.Up when !isHorizontal:
+                    Previous();
+                    e.Handled = true;
+                    break;
+                case Key.Right when !isVertical:
+                case Key.Down when !isHorizontal:
+                    Next();
+                    e.Handled = true;
+                    break;
+                case Key.Home:
+                    SelectedIndex = 0;
+                    e.Handled = true;
+                    break;
+                case Key.End:
+                    SelectedIndex = ItemCount - 1;
+                    e.Handled = true;
+                    break;
+            }
         }
 
         protected override Size ArrangeOverride(Size finalSize)
         {
             var result = base.ArrangeOverride(finalSize);
 
-            if (_scroller is not null)
-                _scroller.Offset = new(SelectedIndex, 0);
+            SyncScrollOffset();
 
             return result;
         }
@@ -78,17 +199,63 @@ namespace Avalonia.Controls
         {
             base.OnApplyTemplate(e);
             _scroller = e.NameScope.Find<IScrollable>("PART_ScrollViewer");
+
+            if (ItemsPanelRoot is VirtualizingCarouselPanel panel)
+                panel.RefreshGestureRecognizer();
         }
 
         protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
         {
             base.OnPropertyChanged(change);
 
-            if (change.Property == SelectedIndexProperty && _scroller is not null)
+            if (change.Property == SelectedIndexProperty)
             {
-                var value = change.GetNewValue<int>();
-                _scroller.Offset = new(value, 0);
+                SyncScrollOffset();
             }
+
+            if (change.Property == IsSwipeEnabledProperty ||
+                change.Property == PageTransitionProperty ||
+                change.Property == ViewportFractionProperty ||
+                change.Property == WrapSelectionProperty)
+            {
+                if (ItemsPanelRoot is VirtualizingCarouselPanel panel)
+                {
+                    if (change.Property == ViewportFractionProperty && !panel.IsManagingInteractionOffset)
+                        panel.SyncSelectionOffset(SelectedIndex);
+
+                    panel.RefreshGestureRecognizer();
+                    panel.InvalidateMeasure();
+                }
+
+                SyncScrollOffset();
+            }
+        }
+
+        private void SyncScrollOffset()
+        {
+            if (ItemsPanelRoot is VirtualizingCarouselPanel panel)
+            {
+                if (panel.IsManagingInteractionOffset)
+                    return;
+
+                panel.SyncSelectionOffset(SelectedIndex);
+
+                if (ViewportFraction != 1d)
+                    return;
+            }
+
+            if (_scroller is null)
+                return;
+
+            _scroller.Offset = CreateScrollOffset(SelectedIndex);
+        }
+
+        private Vector CreateScrollOffset(int index)
+        {
+            if (ViewportFraction != 1d && GetLayoutAxis() == PageSlide.SlideAxis.Vertical)
+                return new(0, index);
+
+            return new(index, 0);
         }
     }
 }
diff --git a/src/Avalonia.Controls/ComboBox.cs b/src/Avalonia.Controls/ComboBox.cs
index c977ca0a38..eb1eab5856 100644
--- a/src/Avalonia.Controls/ComboBox.cs
+++ b/src/Avalonia.Controls/ComboBox.cs
@@ -62,13 +62,13 @@ namespace Avalonia.Controls
         /// Defines the <see cref="PlaceholderText"/> property.
         /// </summary>
         public static readonly StyledProperty<string?> PlaceholderTextProperty =
-            AvaloniaProperty.Register<ComboBox, string?>(nameof(PlaceholderText));
+            TextBox.PlaceholderTextProperty.AddOwner<ComboBox>();
 
         /// <summary>
         /// Defines the <see cref="PlaceholderForeground"/> property.
         /// </summary>
         public static readonly StyledProperty<IBrush?> PlaceholderForegroundProperty =
-            AvaloniaProperty.Register<ComboBox, IBrush?>(nameof(PlaceholderForeground));
+            TextBox.PlaceholderForegroundProperty.AddOwner<ComboBox>();
 
         /// <summary>
         /// Defines the <see cref="HorizontalContentAlignment"/> property.
diff --git a/src/Avalonia.Controls/CommandBar/CommandBar.cs b/src/Avalonia.Controls/CommandBar/CommandBar.cs
index 2f068cbb9f..392ffb7ddc 100644
--- a/src/Avalonia.Controls/CommandBar/CommandBar.cs
+++ b/src/Avalonia.Controls/CommandBar/CommandBar.cs
@@ -142,11 +142,9 @@ namespace Avalonia.Controls
             OverflowItems = new ReadOnlyObservableCollection<ICommandBarElement>(_overflowItems);
 
             var primaryCommands = new ObservableCollection<ICommandBarElement>();
-            primaryCommands.CollectionChanged += OnPrimaryCommandsChanged;
             SetCurrentValue(PrimaryCommandsProperty, (IList<ICommandBarElement>)primaryCommands);
 
             var secondaryCommands = new ObservableCollection<ICommandBarElement>();
-            secondaryCommands.CollectionChanged += OnSecondaryCommandsChanged;
             SetCurrentValue(SecondaryCommandsProperty, (IList<ICommandBarElement>)secondaryCommands);
 
             SizeChanged += CommandBar_SizeChanged;
diff --git a/src/Avalonia.Controls/Converters/BorderGapMaskConverter.cs b/src/Avalonia.Controls/Converters/BorderGapMaskConverter.cs
new file mode 100644
index 0000000000..913b2f1534
--- /dev/null
+++ b/src/Avalonia.Controls/Converters/BorderGapMaskConverter.cs
@@ -0,0 +1,126 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using Avalonia.Controls.Shapes;
+using Avalonia.Data.Converters;
+using Avalonia.Media;
+
+namespace Avalonia.Controls.Converters
+{
+    // Ported from https://github.com/dotnet/wpf/blob/main/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/BorderGapMaskConverter.cs
+
+    /// <summary>
+    /// Converter that generates the visual brush for <see cref="GroupBox"/>
+    /// </summary>
+    public class BorderGapMaskConverter : IMultiValueConverter
+    {
+        /// <summary>
+        /// Convert a value.
+        /// </summary>
+        /// <param name="values">values as produced by source binding</param>
+        /// <param name="targetType">target type</param>
+        /// <param name="parameter">converter parameter</param>
+        /// <param name="culture">culture information</param>
+        /// <returns>
+        /// Converted value.
+        /// Visual Brush that is used as the opacity mask for the Border
+        /// in the style for GroupBox.
+        /// </returns>
+        public object? Convert(IList<object?> values, Type targetType, object? parameter, CultureInfo culture)
+        {
+            //
+            // Parameter Validation
+            //
+            if (parameter == null ||
+                values == null ||
+                values.Count != 3 ||
+                values[0] is not double ||
+                values[1] is not double ||
+                values[2] is not double)
+            {
+                return AvaloniaProperty.UnsetValue;
+            }
+
+            if (parameter is not double && parameter is not string)
+            {
+                return AvaloniaProperty.UnsetValue;
+            }
+
+            //
+            // Conversion
+            //
+            double? headerWidth = (double?)values[0];
+            double? borderWidth = (double?)values[1];
+            double? borderHeight = (double?)values[2];
+
+            // Doesn't make sense to have a Grid
+            // with 0 as width or height
+            if (borderWidth == 0
+                || borderHeight == 0)
+            {
+                return null;
+            }
+
+            // Width of the line to the left of the header
+            // to be used to set the width of the first column of the Grid
+            double lineWidth;
+            if (parameter is string)
+            {
+                lineWidth = Double.Parse(((string)parameter), NumberFormatInfo.InvariantInfo);
+            }
+            else
+            {
+                lineWidth = (double)parameter;
+            }
+
+            Grid grid = new Grid
+            {
+                Width = borderWidth ?? 0,
+                Height = borderHeight ?? 0
+            };
+
+            ColumnDefinition colDef1 = new ColumnDefinition();
+            ColumnDefinition colDef2 = new ColumnDefinition();
+            ColumnDefinition colDef3 = new ColumnDefinition();
+            colDef1.Width = new GridLength(lineWidth);
+            colDef2.Width = new GridLength(headerWidth ?? 0);
+            colDef3.Width = new GridLength(1, GridUnitType.Star);
+            grid.ColumnDefinitions.Add(colDef1);
+            grid.ColumnDefinitions.Add(colDef2);
+            grid.ColumnDefinitions.Add(colDef3);
+            RowDefinition rowDef1 = new RowDefinition();
+            RowDefinition rowDef2 = new RowDefinition();
+            rowDef1.Height = new GridLength((borderHeight ?? 0) / 2);
+            rowDef2.Height = new GridLength(1, GridUnitType.Star);
+            grid.RowDefinitions.Add(rowDef1);
+            grid.RowDefinitions.Add(rowDef2);
+
+            Rectangle rectColumn1 = new Rectangle();
+            Rectangle rectColumn2 = new Rectangle();
+            Rectangle rectColumn3 = new Rectangle();
+            rectColumn1.Fill = Brushes.Black;
+            rectColumn2.Fill = Brushes.Black;
+            rectColumn3.Fill = Brushes.Black;
+
+            Grid.SetRowSpan(rectColumn1, 2);
+            Grid.SetRow(rectColumn1, 0);
+            Grid.SetColumn(rectColumn1, 0);
+
+            Grid.SetRow(rectColumn2, 1);
+            Grid.SetColumn(rectColumn2, 1);
+
+            Grid.SetRowSpan(rectColumn3, 2);
+            Grid.SetRow(rectColumn3, 0);
+            Grid.SetColumn(rectColumn3, 2);
+
+            grid.Children.Add(rectColumn1);
+            grid.Children.Add(rectColumn2);
+            grid.Children.Add(rectColumn3);
+
+            return (new VisualBrush(grid));
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/Embedding/EmbeddableControlRoot.cs b/src/Avalonia.Controls/Embedding/EmbeddableControlRoot.cs
index d4e5488019..59718c3e3f 100644
--- a/src/Avalonia.Controls/Embedding/EmbeddableControlRoot.cs
+++ b/src/Avalonia.Controls/Embedding/EmbeddableControlRoot.cs
@@ -4,6 +4,7 @@ using Avalonia.Automation.Peers;
 using Avalonia.Controls.Automation;
 using Avalonia.Controls.Automation.Peers;
 using Avalonia.Controls.Platform;
+using Avalonia.Controls.Primitives;
 using Avalonia.Input;
 using Avalonia.Platform;
 
@@ -54,6 +55,12 @@ namespace Avalonia.Controls.Embedding
 
         protected override Type StyleKeyOverride => typeof(EmbeddableControlRoot);
 
+        protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
+        {
+            base.OnApplyTemplate(e);
+            EnableVisualLayerManagerLayers();
+        }
+
         protected override AutomationPeer OnCreateAutomationPeer()
         {
             return new EmbeddableControlRootAutomationPeer(this);
diff --git a/src/Avalonia.Controls/Flyouts/FlyoutBase.cs b/src/Avalonia.Controls/Flyouts/FlyoutBase.cs
index b5328ccab8..b7de300e84 100644
--- a/src/Avalonia.Controls/Flyouts/FlyoutBase.cs
+++ b/src/Avalonia.Controls/Flyouts/FlyoutBase.cs
@@ -7,9 +7,8 @@ namespace Avalonia.Controls.Primitives
         /// <summary>
         /// Defines the <see cref="IsOpen"/> property
         /// </summary>
-        public static readonly DirectProperty<FlyoutBase, bool> IsOpenProperty =
-            AvaloniaProperty.RegisterDirect<FlyoutBase, bool>(nameof(IsOpen),
-                x => x.IsOpen);
+        public static readonly StyledProperty<bool> IsOpenProperty =
+            AvaloniaProperty.Register<FlyoutBase, bool>(nameof(IsOpen));
 
         /// <summary>
         /// Defines the <see cref="Target"/> property
@@ -23,19 +22,23 @@ namespace Avalonia.Controls.Primitives
         public static readonly AttachedProperty<FlyoutBase?> AttachedFlyoutProperty =
             AvaloniaProperty.RegisterAttached<FlyoutBase, Control, FlyoutBase?>("AttachedFlyout", null);
 
-        private bool _isOpen;
         private Control? _target;
 
         public event EventHandler? Opened;
         public event EventHandler? Closed;
-        
+
         /// <summary>
-        /// Gets whether this Flyout is currently Open
+        /// Gets or sets whether this Flyout is currently open.
         /// </summary>
+        /// <remarks>
+        /// Setting this property to <c>true</c> will show the flyout at the last known
+        /// placement target. If no target has been set via <see cref="ShowAt"/>,
+        /// setting this to <c>true</c> will have no effect.
+        /// </remarks>
         public bool IsOpen
         {
-            get => _isOpen;
-            protected set => SetAndRaise(IsOpenProperty, ref _isOpen, value);
+            get => GetValue(IsOpenProperty);
+            set => SetValue(IsOpenProperty, value);
         }
 
         /// <summary>
diff --git a/src/Avalonia.Controls/Flyouts/PopupFlyoutBase.cs b/src/Avalonia.Controls/Flyouts/PopupFlyoutBase.cs
index 19d1f52850..cea69524f1 100644
--- a/src/Avalonia.Controls/Flyouts/PopupFlyoutBase.cs
+++ b/src/Avalonia.Controls/Flyouts/PopupFlyoutBase.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.ComponentModel;
 using System.Linq;
 using Avalonia.Controls.Diagnostics;
@@ -67,9 +67,14 @@ namespace Avalonia.Controls.Primitives
         private PixelRect? _enlargePopupRectScreenPixelRect;
         private IDisposable? _transientDisposable;
         private Action<IPopupHost?>? _popupHostChangedHandler;
+        private bool _isOpen;
+        private bool _ignoreIsOpenChanged;
+        private Control? _lastPlacementTarget;
 
         static PopupFlyoutBase()
         {
+            IsOpenProperty.Changed.AddClassHandler<PopupFlyoutBase>(
+                (x, e) => x.IsOpenChanged((AvaloniaPropertyChangedEventArgs<bool>)e));
             Control.ContextFlyoutProperty.Changed.Subscribe(OnContextFlyoutPropertyChanged);
         }
 
@@ -136,9 +141,9 @@ namespace Avalonia.Controls.Primitives
         /// through to the parent window.
         /// </summary>
         /// <remarks>
-        /// Clicks outside the popup cause the popup to close. When 
-        /// <see cref="OverlayDismissEventPassThrough"/> is set to false, these clicks will be 
-        /// handled by the popup and not be registered by the parent window. When set to true, 
+        /// Clicks outside the popup cause the popup to close. When
+        /// <see cref="OverlayDismissEventPassThrough"/> is set to false, these clicks will be
+        /// handled by the popup and not be registered by the parent window. When set to true,
         /// the events will be passed through to the parent window.
         /// </remarks>
         public bool OverlayDismissEventPassThrough
@@ -175,6 +180,16 @@ namespace Avalonia.Controls.Primitives
         public event EventHandler<CancelEventArgs>? Closing;
         public event EventHandler? Opening;
 
+        /// <summary>
+        /// Pre-registers a control as the default placement target for this flyout.
+        /// Used by owning controls (e.g. <see cref="Button"/>) so that setting
+        /// <see cref="FlyoutBase.IsOpen"/> to <c>true</c> works on first use.
+        /// </summary>
+        internal void SetDefaultPlacementTarget(Control? target)
+        {
+            _lastPlacementTarget = target;
+        }
+
         /// <summary>
         /// Shows the Flyout at the given Control
         /// </summary>
@@ -205,7 +220,7 @@ namespace Avalonia.Controls.Primitives
         /// <returns>True, if action was handled</returns>
         protected virtual bool HideCore(bool canCancel = true)
         {
-            if (!IsOpen)
+            if (!_isOpen)
             {
                 return false;
             }
@@ -218,7 +233,11 @@ namespace Avalonia.Controls.Primitives
                 }
             }
 
-            IsOpen = false;
+            _isOpen = false;
+            using (BeginIgnoringIsOpen())
+            {
+                SetCurrentValue(IsOpenProperty, false);
+            }
             Popup.IsOpen = false;
 
             Popup.PlacementTarget = null;
@@ -251,7 +270,9 @@ namespace Avalonia.Controls.Primitives
                 throw new ArgumentNullException(nameof(placementTarget));
             }
 
-            if (IsOpen)
+            _lastPlacementTarget = placementTarget;
+
+            if (_isOpen)
             {
                 if (placementTarget == Target)
                 {
@@ -280,7 +301,12 @@ namespace Avalonia.Controls.Primitives
             }
 
             PositionPopup(showAtPointer);
-            IsOpen = Popup.IsOpen = true;
+            _isOpen = true;
+            using (BeginIgnoringIsOpen())
+            {
+                SetCurrentValue(IsOpenProperty, true);
+            }
+            Popup.IsOpen = true;
             OnOpened();
 
             placementTarget.DetachedFromVisualTree += PlacementTarget_DetachedFromVisualTree;
@@ -310,6 +336,7 @@ namespace Avalonia.Controls.Primitives
         private void PlacementTarget_DetachedFromVisualTree(object? sender, VisualTreeAttachmentEventArgs e)
         {
             _ = HideCore(false);
+            _lastPlacementTarget = null;
         }
 
         private void HandleTransientDismiss(RawInputEventArgs args)
@@ -318,7 +345,7 @@ namespace Avalonia.Controls.Primitives
             {
                 // In ShowMode = TransientWithDismissOnPointerMoveAway, the Flyout is kept
                 // shown as long as the pointer is within a certain px distance from the
-                // flyout itself. I'm not sure what WinUI uses, but I'm defaulting to 
+                // flyout itself. I'm not sure what WinUI uses, but I'm defaulting to
                 // 100px, which seems about right
                 // enlargedPopupRect is the Flyout bounds enlarged 100px
                 // For windowed popups, enlargedPopupRect is in screen coordinates,
@@ -348,7 +375,7 @@ namespace Avalonia.Controls.Primitives
                     // As long as the pointer stays within the enlargedPopupRect
                     // the flyout stays open. If it leaves, close it
                     // Despite working in screen coordinates, leaving the TopLevel
-                    // window will not close this (as pointer events stop), which 
+                    // window will not close this (as pointer events stop), which
                     // does match UWP
                     var pt = eventRoot.PointToScreen(pArgs.Position);
                     if (!_enlargePopupRectScreenPixelRect?.Contains(pt) ?? false)
@@ -401,14 +428,18 @@ namespace Avalonia.Controls.Primitives
 
         private void OnPopupOpened(object? sender, EventArgs e)
         {
-            IsOpen = true;
+            _isOpen = true;
+            using (BeginIgnoringIsOpen())
+            {
+                SetCurrentValue(IsOpenProperty, true);
+            }
 
             _popupHostChangedHandler?.Invoke(Popup.Host);
         }
 
         private void OnPopupClosing(object? sender, CancelEventArgs e)
         {
-            if (IsOpen)
+            if (_isOpen)
             {
                 e.Cancel = CancelClosing();
             }
@@ -425,7 +456,7 @@ namespace Avalonia.Controls.Primitives
         private void OnPlacementTargetOrPopupKeyUp(object? sender, KeyEventArgs e)
         {
             if (!e.Handled
-                && IsOpen
+                && _isOpen
                 && Target?.ContextFlyout == this)
             {
                 var keymap = Application.Current!.PlatformSettings?.HotkeyConfiguration;
@@ -437,6 +468,60 @@ namespace Avalonia.Controls.Primitives
             }
         }
 
+        private void IsOpenChanged(AvaloniaPropertyChangedEventArgs<bool> e)
+        {
+            if (_ignoreIsOpenChanged)
+            {
+                return;
+            }
+
+            if (e.NewValue.Value)
+            {
+                if (_lastPlacementTarget != null && ShowAtCore(_lastPlacementTarget))
+                {
+                    return;
+                }
+
+                // No target, or opening was cancelled — revert so IsOpen stays honest
+                using (BeginIgnoringIsOpen())
+                {
+                    SetCurrentValue(IsOpenProperty, false);
+                }
+            }
+            else
+            {
+                if (!HideCore())
+                {
+                    // Closing was cancelled — revert so IsOpen stays honest
+                    using (BeginIgnoringIsOpen())
+                    {
+                        SetCurrentValue(IsOpenProperty, true);
+                    }
+                }
+            }
+        }
+
+        private IgnoreIsOpenScope BeginIgnoringIsOpen()
+        {
+            return new IgnoreIsOpenScope(this);
+        }
+
+        private readonly struct IgnoreIsOpenScope : IDisposable
+        {
+            private readonly PopupFlyoutBase _owner;
+
+            public IgnoreIsOpenScope(PopupFlyoutBase owner)
+            {
+                _owner = owner;
+                _owner._ignoreIsOpenChanged = true;
+            }
+
+            public void Dispose()
+            {
+                _owner._ignoreIsOpenChanged = false;
+            }
+        }
+
         private void PositionPopup(bool showAtPointer)
         {
             Size sz;
diff --git a/src/Avalonia.Controls/NumericUpDown/NumericUpDown.cs b/src/Avalonia.Controls/NumericUpDown/NumericUpDown.cs
index ddaa57f2f2..2f901860ba 100644
--- a/src/Avalonia.Controls/NumericUpDown/NumericUpDown.cs
+++ b/src/Avalonia.Controls/NumericUpDown/NumericUpDown.cs
@@ -112,7 +112,9 @@ namespace Avalonia.Controls
         /// Defines the <see cref="PlaceholderText"/> property.
         /// </summary>
         public static readonly StyledProperty<string?> PlaceholderTextProperty =
-            AvaloniaProperty.Register<NumericUpDown, string?>(nameof(PlaceholderText));
+#pragma warning disable AVP1013
+            TextBox.PlaceholderTextProperty.AddOwner<NumericUpDown>();
+#pragma warning restore AVP1013
 
         /// <summary>
         /// Defines the <see cref="Watermark"/> property.
diff --git a/src/Avalonia.Controls/NumericUpDown/NumericUpDownValueChangedEventArgs.cs b/src/Avalonia.Controls/NumericUpDown/NumericUpDownValueChangedEventArgs.cs
index af835541ae..a5cc9de8b1 100644
--- a/src/Avalonia.Controls/NumericUpDown/NumericUpDownValueChangedEventArgs.cs
+++ b/src/Avalonia.Controls/NumericUpDown/NumericUpDownValueChangedEventArgs.cs
@@ -4,7 +4,7 @@ namespace Avalonia.Controls
 {
     public class NumericUpDownValueChangedEventArgs : RoutedEventArgs
     {
-        public NumericUpDownValueChangedEventArgs(RoutedEvent routedEvent, decimal? oldValue, decimal? newValue) : base(routedEvent)
+        public NumericUpDownValueChangedEventArgs(RoutedEvent? routedEvent, decimal? oldValue, decimal? newValue) : base(routedEvent)
         {
             OldValue = oldValue;
             NewValue = newValue;
diff --git a/src/Avalonia.Controls/Page/CarouselPage.cs b/src/Avalonia.Controls/Page/CarouselPage.cs
new file mode 100644
index 0000000000..1b640fd528
--- /dev/null
+++ b/src/Avalonia.Controls/Page/CarouselPage.cs
@@ -0,0 +1,418 @@
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using Avalonia.Animation;
+using Avalonia.Automation;
+using Avalonia.Automation.Peers;
+using Avalonia.Collections;
+using Avalonia.Controls.Metadata;
+using Avalonia.Controls.Presenters;
+using Avalonia.Controls.Primitives;
+using Avalonia.Controls.Templates;
+using Avalonia.Input;
+using Avalonia.Interactivity;
+using Avalonia.Media;
+using Avalonia.Threading;
+
+namespace Avalonia.Controls
+{
+    /// <summary>
+    /// A page that displays its child pages in a horizontally scrollable carousel,
+    /// with optional animated page transitions.
+    /// </summary>
+    [TemplatePart("PART_Carousel", typeof(Carousel))]
+    public class CarouselPage : SelectingMultiPage
+    {
+        private Carousel? _carousel;
+
+        private static readonly FuncTemplate<Panel?> DefaultPanel =
+            new FuncTemplate<Panel?>(() => new VirtualizingCarouselPanel());
+
+        /// <summary>
+        /// Defines the <see cref="ItemsPanel"/> property.
+        /// </summary>
+        public static readonly StyledProperty<ITemplate<Panel?>> ItemsPanelProperty =
+            ItemsControl.ItemsPanelProperty.AddOwner<CarouselPage>();
+
+        /// <summary>
+        /// Defines the <see cref="PageTransition"/> property.
+        /// </summary>
+        public static readonly StyledProperty<IPageTransition?> PageTransitionProperty =
+            AvaloniaProperty.Register<CarouselPage, IPageTransition?>(nameof(PageTransition));
+
+        /// <summary>
+        /// Defines the <see cref="IsGestureEnabled"/> property.
+        /// </summary>
+        public static readonly StyledProperty<bool> IsGestureEnabledProperty =
+            AvaloniaProperty.Register<CarouselPage, bool>(nameof(IsGestureEnabled), true);
+
+        /// <summary>
+        /// Defines the <see cref="IsKeyboardNavigationEnabled"/> property.
+        /// </summary>
+        public static readonly StyledProperty<bool> IsKeyboardNavigationEnabledProperty =
+            AvaloniaProperty.Register<CarouselPage, bool>(nameof(IsKeyboardNavigationEnabled), true);
+
+        static CarouselPage()
+        {
+            ItemsPanelProperty.OverrideDefaultValue<CarouselPage>(DefaultPanel);
+            FocusableProperty.OverrideDefaultValue<CarouselPage>(true);
+        }
+
+        public CarouselPage()
+        {
+            SetCurrentValue(PagesProperty, new AvaloniaList<Page>());
+        }
+
+        protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
+        {
+            base.OnAttachedToVisualTree(e);
+            AddHandler(PointerWheelChangedEvent, OnPointerWheelChanged, RoutingStrategies.Bubble);
+        }
+
+        protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e)
+        {
+            base.OnDetachedFromVisualTree(e);
+            RemoveHandler(PointerWheelChangedEvent, OnPointerWheelChanged);
+        }
+
+        /// <summary>
+        /// Gets or sets the items panel template used to arrange page items.
+        /// </summary>
+        public ITemplate<Panel?> ItemsPanel
+        {
+            get => GetValue(ItemsPanelProperty);
+            set => SetValue(ItemsPanelProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the animated page transition used when the selected page changes.
+        /// </summary>
+        public IPageTransition? PageTransition
+        {
+            get => GetValue(PageTransitionProperty);
+            set => SetValue(PageTransitionProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets whether swipe and scroll gestures can be used to navigate between pages.
+        /// </summary>
+        public bool IsGestureEnabled
+        {
+            get => GetValue(IsGestureEnabledProperty);
+            set => SetValue(IsGestureEnabledProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets whether keyboard shortcuts (arrow keys, Home/End) can be used to navigate between pages.
+        /// </summary>
+        public bool IsKeyboardNavigationEnabled
+        {
+            get => GetValue(IsKeyboardNavigationEnabledProperty);
+            set => SetValue(IsKeyboardNavigationEnabledProperty, value);
+        }
+
+        protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
+        {
+            base.OnApplyTemplate(e);
+
+            if (_carousel != null)
+            {
+                _carousel.SelectionChanged -= OnCarouselSelectionChanged;
+                _carousel.ContainerPrepared -= OnCarouselContainerPrepared;
+            }
+
+            _carousel = e.NameScope.Find<Carousel>("PART_Carousel");
+
+            if (_carousel != null)
+            {
+                _carousel.SelectionChanged += OnCarouselSelectionChanged;
+                _carousel.ContainerPrepared += OnCarouselContainerPrepared;
+                _carousel.PageTransition = PageTransition;
+                _carousel.ItemsPanel = ItemsPanel;
+                _carousel.ItemTemplate = PageTemplate;
+                _carousel.IsSwipeEnabled = IsGestureEnabled;
+                _carousel.ItemsSource = (IEnumerable?)ItemsSource ?? Pages;
+
+                if (SelectedIndex >= 0)
+                {
+                    _carousel.SelectedIndex = SelectedIndex;
+                }
+
+                UpdateActivePage();
+            }
+        }
+
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+        {
+            base.OnPropertyChanged(change);
+
+            if (change.Property == PageTransitionProperty && _carousel != null)
+                _carousel.PageTransition = change.GetNewValue<IPageTransition?>();
+            else if (change.Property == ItemsPanelProperty && _carousel != null)
+                _carousel.ItemsPanel = change.GetNewValue<ITemplate<Panel?>>();
+            else if (change.Property == PageTemplateProperty && _carousel != null)
+            {
+                _carousel.ItemTemplate = change.GetNewValue<IDataTemplate?>();
+                if (ItemsSource != null)
+                    UpdateActivePage();
+            }
+            else if (change.Property == IsGestureEnabledProperty && _carousel != null)
+                _carousel.IsSwipeEnabled = change.GetNewValue<bool>();
+            else if (change.Property == ItemsSourceProperty && _carousel != null)
+            {
+                _carousel.ItemsSource = change.GetNewValue<IEnumerable?>() ?? Pages;
+                UpdateActivePage();
+            }
+            else if (change.Property == PagesProperty && ItemsSource == null && _carousel != null)
+                _carousel.ItemsSource = change.GetNewValue<IEnumerable<Page>?>();
+        }
+
+        protected override void UpdateActivePage(NavigationType navigationType)
+        {
+            if (_carousel != null)
+            {
+                var index = _carousel.SelectedIndex;
+                if (index >= 0)
+                {
+                    UpdateSelection(index, navigationType);
+                }
+                else if (GetPageCount() > 0)
+                {
+                    ApplySelectedIndex(0);
+                }
+            }
+            else if (GetPageCount() > 0)
+            {
+                var index = CoercePreTemplateSelectedIndex(SelectedIndex);
+                if (ItemsSource != null)
+                {
+                    StoreSelectedIndex(index);
+                }
+                else
+                {
+                    var page = ResolvePageAtIndex(index);
+
+                    if (index != SelectedIndex || !ReferenceEquals(SelectedPage, page))
+                        CommitSelection(index, page, navigationType);
+                }
+            }
+        }
+
+        protected override void ApplySelectedIndex(int index)
+        {
+            if (_carousel != null)
+            {
+                _carousel.SelectedIndex = index;
+            }
+            else
+            {
+                var pageCount = GetPageCount();
+
+                if (pageCount > 0)
+                {
+                    var coercedIndex = CoercePreTemplateSelectedIndex(index);
+                    if (ItemsSource != null)
+                    {
+                        StoreSelectedIndex(coercedIndex);
+                    }
+                    else
+                    {
+                        var newPage = ResolvePageAtIndex(coercedIndex);
+                        CommitSelection(coercedIndex, newPage);
+                    }
+                }
+                else
+                {
+                    // Preserve preselection until pages exist.
+                    StoreSelectedIndex(index);
+                }
+            }
+        }
+
+        protected override void OnKeyDown(KeyEventArgs e)
+        {
+            base.OnKeyDown(e);
+            if (e.Handled || !IsKeyboardNavigationEnabled)
+                return;
+
+            bool isRtl = IsRightToLeft;
+            bool next = isRtl ? e.Key == Key.Left : e.Key == Key.Right;
+            bool prev = isRtl ? e.Key == Key.Right : e.Key == Key.Left;
+
+            var pageCount = GetPageCount();
+            if (next || e.Key == Key.Down)
+            {
+                if (SelectedIndex < pageCount - 1)
+                {
+                    ApplySelectedIndex(SelectedIndex + 1);
+                    e.Handled = true;
+                }
+            }
+            else if (prev || e.Key == Key.Up)
+            {
+                if (SelectedIndex > 0)
+                {
+                    ApplySelectedIndex(SelectedIndex - 1);
+                    e.Handled = true;
+                }
+            }
+            else if (e.Key == Key.Home)
+            {
+                if (pageCount > 0 && SelectedIndex != 0)
+                {
+                    ApplySelectedIndex(0);
+                    e.Handled = true;
+                }
+            }
+            else if (e.Key == Key.End)
+            {
+                if (pageCount > 0 && SelectedIndex != pageCount - 1)
+                {
+                    ApplySelectedIndex(pageCount - 1);
+                    e.Handled = true;
+                }
+            }
+        }
+
+        private void OnCarouselSelectionChanged(object? sender, SelectionChangedEventArgs e)
+        {
+            if (_carousel == null)
+                return;
+
+            var newIndex = _carousel.SelectedIndex;
+            var newPage = ResolveDisplayedPageAtIndex(newIndex);
+            if (newIndex == SelectedIndex && ReferenceEquals(newPage, SelectedPage))
+                return;
+
+            UpdateSelection(newIndex, NavigationType.Replace);
+        }
+
+        private void OnCarouselContainerPrepared(object? sender, ContainerPreparedEventArgs e)
+        {
+            if (_carousel == null || e.Index != _carousel.SelectedIndex)
+                return;
+
+            Dispatcher.UIThread.Post(
+                () =>
+                {
+                    if (_carousel != null && _carousel.SelectedIndex == e.Index)
+                        UpdateSelection(e.Index, NavigationType.Replace);
+                },
+                DispatcherPriority.Loaded);
+        }
+
+        private void OnPointerWheelChanged(object? sender, PointerWheelEventArgs e)
+        {
+            if (!IsGestureEnabled)
+                return;
+
+            bool isRtl = IsRightToLeft;
+            var pageCount = GetPageCount();
+            bool goNext = e.Delta.Y < 0 || (isRtl ? e.Delta.X < 0 : e.Delta.X > 0);
+            bool goPrev = e.Delta.Y > 0 || (isRtl ? e.Delta.X > 0 : e.Delta.X < 0);
+
+            if (goNext && SelectedIndex < pageCount - 1)
+            {
+                ApplySelectedIndex(SelectedIndex + 1);
+                e.Handled = true;
+            }
+            else if (goPrev && SelectedIndex > 0)
+            {
+                ApplySelectedIndex(SelectedIndex - 1);
+                e.Handled = true;
+            }
+        }
+
+        protected override AutomationPeer OnCreateAutomationPeer() => new CarouselPageAutomationPeer(this);
+
+        private void UpdateAccessibilityName(int index, int pageCount, Page? page)
+        {
+            var header = page?.Header?.ToString();
+            var position = pageCount > 0 ? $"Page {index + 1} of {pageCount}" : string.Empty;
+            var name = string.IsNullOrEmpty(header) ? position : string.IsNullOrEmpty(position) ? header : $"{position}: {header}";
+            // CarouselPageAutomationPeer.GetNameCore reads this via base.GetNameCore(), which returns
+            // AutomationProperties.Name when set. Position and header are encoded here rather than in the
+            // peer so that the name stays current without requiring the peer to re-query the carousel state.
+            AutomationProperties.SetName(this, name);
+        }
+
+        private bool IsRightToLeft => FlowDirection == Media.FlowDirection.RightToLeft;
+
+        private int GetPageCount()
+        {
+            if (_carousel != null)
+                return _carousel.ItemCount;
+
+            var source = (IEnumerable?)ItemsSource ?? Pages;
+
+            if (source is ICollection nonGenericCol)
+                return nonGenericCol.Count;
+            if (source is ICollection<Page> col)
+                return col.Count;
+            if (source != null)
+            {
+                int count = 0;
+                foreach (var _ in source)
+                    count++;
+                return count;
+            }
+            return 0;
+        }
+
+        private int CoercePreTemplateSelectedIndex(int index)
+        {
+            var pageCount = GetPageCount();
+            if (pageCount <= 0)
+                return index;
+
+            return (uint)index < (uint)pageCount ? index : 0;
+        }
+
+        private void UpdateSelection(int index, NavigationType navigationType)
+        {
+            var page = ResolveDisplayedPageAtIndex(index);
+            var pageCount = GetPageCount();
+
+            if (page == null && ItemsSource != null)
+            {
+                StoreSelectedIndex(index);
+                UpdateAccessibilityName(index, pageCount, null);
+                return;
+            }
+
+            CommitSelection(index, page, navigationType);
+            UpdateAccessibilityName(index, pageCount, page);
+        }
+
+        private Page? ResolveDisplayedPageAtIndex(int index)
+        {
+            if (index < 0)
+                return null;
+
+            if (_carousel?.ContainerFromIndex(index) is { } container)
+                return TryGetPageFromContainer(container);
+
+            return ItemsSource == null ? ResolvePageAtIndex(index) : null;
+        }
+
+        private static Page? TryGetPageFromContainer(Control container)
+        {
+            if (container is Page page)
+                return page;
+
+            if (container is ContentPresenter presenter)
+            {
+                if (presenter.Child == null)
+                    presenter.UpdateChild();
+
+                return presenter.Child as Page;
+            }
+
+            if (container is ContentControl contentControl)
+                return contentControl.Content as Page;
+
+            return null;
+        }
+
+    }
+}
diff --git a/src/Avalonia.Controls/Page/ContentPage.cs b/src/Avalonia.Controls/Page/ContentPage.cs
index 62f6c82dad..b7523b4688 100644
--- a/src/Avalonia.Controls/Page/ContentPage.cs
+++ b/src/Avalonia.Controls/Page/ContentPage.cs
@@ -1,3 +1,4 @@
+using System;
 using Avalonia.Automation.Peers;
 using Avalonia.Controls.Metadata;
 using Avalonia.Controls.Presenters;
@@ -25,7 +26,14 @@ namespace Avalonia.Controls
         /// Defines the <see cref="Content"/> property.
         /// </summary>
         public static readonly StyledProperty<object?> ContentProperty =
-            ContentControl.ContentProperty.AddOwner<ContentPage>();
+            ContentControl.ContentProperty.AddOwner<ContentPage>(new StyledPropertyMetadata<object?>(
+                coerce: (_, val) =>
+                {
+                    if (val is Page)
+                        throw new InvalidOperationException(
+                            "A Page cannot be used as the content of a ContentPage. Use a MultiPage subclass such as NavigationPage, TabbedPage, DrawerPage, or CarouselPage to host child pages.");
+                    return val;
+                }));
 
         /// <summary>
         /// Defines the <see cref="ContentTemplate"/> property.
@@ -89,6 +97,14 @@ namespace Avalonia.Controls
         /// <summary>
         /// Gets or sets the page content.
         /// </summary>
+        /// <remarks>
+        /// The content must not be another <see cref="Page"/>. Use a <see cref="MultiPage"/>
+        /// implementation such as <see cref="NavigationPage"/>, <see cref="TabbedPage"/>,
+        /// <see cref="DrawerPage"/>, or <see cref="CarouselPage"/> to host child pages.
+        /// </remarks>
+        /// <exception cref="InvalidOperationException">
+        /// Thrown when the assigned value is a <see cref="Page"/>.
+        /// </exception>
         [Content]
         [DependsOn(nameof(ContentTemplate))]
         public object? Content
@@ -172,8 +188,6 @@ namespace Avalonia.Controls
                     : Padding;
                 _contentPresenter.InvalidateMeasure();
 
-                if (Content is Page childPage)
-                    childPage.SafeAreaPadding = Padding.GetRemainingSafeAreaPadding(SafeAreaPadding);
             }
         }
 
@@ -182,9 +196,6 @@ namespace Avalonia.Controls
             if (e.OldValue is ILogical oldChild)
                 LogicalChildren.Remove(oldChild);
 
-            if (e.OldValue is Page oldPage)
-                oldPage.SafeAreaPadding = default;
-
             if (e.NewValue is ILogical newChild)
                 LogicalChildren.Add(newChild);
         }
diff --git a/src/Avalonia.Controls/Page/DrawerBehavior.cs b/src/Avalonia.Controls/Page/DrawerBehavior.cs
index dda02ab3e8..cfc09819da 100644
--- a/src/Avalonia.Controls/Page/DrawerBehavior.cs
+++ b/src/Avalonia.Controls/Page/DrawerBehavior.cs
@@ -16,10 +16,17 @@ namespace Avalonia.Controls
         /// <summary>
         /// The drawer is permanently open and cannot be closed.
         /// </summary>
+        /// <remarks>
+        /// Setting this value forces <see cref="DrawerPage.IsOpen"/> to <see langword="true"/>.
+        /// </remarks>
         Locked,
         /// <summary>
         /// The drawer is hidden and cannot be opened.
         /// </summary>
+        /// <remarks>
+        /// Setting this value forces <see cref="DrawerPage.IsOpen"/> to <see langword="false"/>.
+        /// The <see cref="DrawerPage.Closing"/> event is not raised.
+        /// </remarks>
         Disabled
     }
 }
diff --git a/src/Avalonia.Controls/Page/DrawerClosingEventArgs.cs b/src/Avalonia.Controls/Page/DrawerClosingEventArgs.cs
index 574ebbd406..7c9d3de86d 100644
--- a/src/Avalonia.Controls/Page/DrawerClosingEventArgs.cs
+++ b/src/Avalonia.Controls/Page/DrawerClosingEventArgs.cs
@@ -7,7 +7,11 @@ namespace Avalonia.Controls
     /// </summary>
     public class DrawerClosingEventArgs : RoutedEventArgs
     {
-        internal DrawerClosingEventArgs(RoutedEvent routedEvent) : base(routedEvent) { }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DrawerClosingEventArgs"/> class.
+        /// </summary>
+        /// <param name="routedEvent">The routed event associated with these event data.</param>
+        public DrawerClosingEventArgs(RoutedEvent? routedEvent) : base(routedEvent) { }
 
         /// <summary>
         /// Gets or sets a value indicating whether the closing should be cancelled.
diff --git a/src/Avalonia.Controls/Page/DrawerPage.cs b/src/Avalonia.Controls/Page/DrawerPage.cs
index 814e533939..954ec9c918 100644
--- a/src/Avalonia.Controls/Page/DrawerPage.cs
+++ b/src/Avalonia.Controls/Page/DrawerPage.cs
@@ -1,4 +1,5 @@
 using System;
+using Avalonia.Automation;
 using Avalonia.Automation.Peers;
 using Avalonia.Controls.Documents;
 using Avalonia.Controls.Metadata;
@@ -28,9 +29,6 @@ namespace Avalonia.Controls
     [TemplatePart("PART_PaneButton", typeof(ToggleButton))]
     [TemplatePart("PART_CompactPaneToggle", typeof(ToggleButton))]
     [TemplatePart("PART_Backdrop", typeof(Border))]
-    [TemplatePart("PART_CompactPaneIconPresenter", typeof(ContentPresenter))]
-    [TemplatePart("PART_PaneIconPresenter", typeof(ContentPresenter))]
-    [TemplatePart("PART_BottomPaneIconPresenter", typeof(ContentPresenter))]
     [PseudoClasses(":placement-right", ":placement-top", ":placement-bottom", ":detail-is-navpage")]
     public class DrawerPage : Page
     {
@@ -85,10 +83,10 @@ namespace Avalonia.Controls
                 validate: ValidateLength);
 
         /// <summary>
-        /// Defines the <see cref="DrawerBreakpointWidth"/> property.
+        /// Defines the <see cref="DrawerBreakpointLength"/> property.
         /// </summary>
-        public static readonly StyledProperty<double> DrawerBreakpointWidthProperty =
-            AvaloniaProperty.Register<DrawerPage, double>(nameof(DrawerBreakpointWidth), 0d);
+        public static readonly StyledProperty<double> DrawerBreakpointLengthProperty =
+            AvaloniaProperty.Register<DrawerPage, double>(nameof(DrawerBreakpointLength), 0d);
 
         /// <summary>
         /// Defines the <see cref="IsGestureEnabled"/> property.
@@ -132,6 +130,12 @@ namespace Avalonia.Controls
         public static readonly StyledProperty<object?> DrawerIconProperty =
             AvaloniaProperty.Register<DrawerPage, object?>(nameof(DrawerIcon));
 
+        /// <summary>
+        /// Defines the <see cref="DrawerIconTemplate"/> property.
+        /// </summary>
+        public static readonly StyledProperty<IDataTemplate?> DrawerIconTemplateProperty =
+            AvaloniaProperty.Register<DrawerPage, IDataTemplate?>(nameof(DrawerIconTemplate));
+
         private static readonly DefaultPageDataTemplate s_defaultPageDataTemplate = new DefaultPageDataTemplate();
 
         /// <summary>
@@ -200,17 +204,16 @@ namespace Avalonia.Controls
         public static readonly StyledProperty<SplitViewDisplayMode> DisplayModeProperty =
             SplitView.DisplayModeProperty.AddOwner<DrawerPage>();
 
+
         private ContentPresenter? _contentPresenter;
         private ContentPresenter? _drawerPresenter;
         private ContentPresenter? _drawerHeaderPresenter;
         private ContentPresenter? _drawerFooterPresenter;
-        private ContentPresenter? _compactPaneIconPresenter;
-        private ContentPresenter? _paneIconPresenter;
-        private ContentPresenter? _bottomPaneIconPresenter;
         private SplitView? _splitView;
         private Border? _topBar;
         private ToggleButton? _paneButton;
         private Border? _backdrop;
+        private Point _swipeStartPoint;
         private IDisposable? _navBarVisibleSub;
 
         private const double EdgeGestureWidth = 20;
@@ -292,6 +295,7 @@ namespace Avalonia.Controls
         public DrawerPage()
         {
             GestureRecognizers.Add(_swipeRecognizer);
+            UpdateSwipeRecognizerAxes();
         }
 
         /// <summary>
@@ -318,6 +322,15 @@ namespace Avalonia.Controls
         /// <summary>
         /// Gets or sets whether the drawer pane is currently open.
         /// </summary>
+        /// <remarks>
+        /// Setting this property to <see langword="true"/> while <see cref="DrawerBehavior"/> is
+        /// <see cref="DrawerBehavior.Disabled"/> is a no-op; the value is coerced back to
+        /// <see langword="false"/>. When closing programmatically, the <see cref="Closing"/> event
+        /// is raised and can be cancelled; if cancelled, the property reverts to
+        /// <see langword="true"/>. The <see cref="Closing"/> event is not raised when the drawer
+        /// is forced closed because <see cref="DrawerBehavior"/> is set to
+        /// <see cref="DrawerBehavior.Disabled"/>.
+        /// </remarks>
         public bool IsOpen
         {
             get => GetValue(IsOpenProperty);
@@ -343,12 +356,12 @@ namespace Avalonia.Controls
         }
 
         /// <summary>
-        /// Gets or sets the width threshold for switching to overlay mode.
+        /// Gets or sets the size threshold for switching to overlay mode. Set to 0 to disable.
         /// </summary>
-        public double DrawerBreakpointWidth
+        public double DrawerBreakpointLength
         {
-            get => GetValue(DrawerBreakpointWidthProperty);
-            set => SetValue(DrawerBreakpointWidthProperty, value);
+            get => GetValue(DrawerBreakpointLengthProperty);
+            set => SetValue(DrawerBreakpointLengthProperty, value);
         }
 
         /// <summary>
@@ -414,6 +427,15 @@ namespace Avalonia.Controls
             set => SetValue(DrawerIconProperty, value);
         }
 
+        /// <summary>
+        /// Gets or sets the data template used to display the drawer icon.
+        /// </summary>
+        public IDataTemplate? DrawerIconTemplate
+        {
+            get => GetValue(DrawerIconTemplateProperty);
+            set => SetValue(DrawerIconTemplateProperty, value);
+        }
+
         /// <summary>
         /// Gets or sets the data template used to display <see cref="Drawer"/> content.
         /// </summary>
@@ -517,25 +539,24 @@ namespace Avalonia.Controls
         {
             base.OnApplyTemplate(e);
 
-            if (_backdrop != null)
-                _backdrop.PointerPressed -= OnBackdropPressed;
+            DetachBackdropPointerPressed();
 
             _contentPresenter = e.NameScope.Find<ContentPresenter>("PART_ContentPresenter");
             _drawerPresenter = e.NameScope.Find<ContentPresenter>("PART_DrawerPresenter");
             _drawerHeaderPresenter = e.NameScope.Find<ContentPresenter>("PART_DrawerHeader");
             _drawerFooterPresenter = e.NameScope.Find<ContentPresenter>("PART_DrawerFooter");
-            _compactPaneIconPresenter = e.NameScope.Find<ContentPresenter>("PART_CompactPaneIconPresenter");
-            _paneIconPresenter = e.NameScope.Find<ContentPresenter>("PART_PaneIconPresenter");
-            _bottomPaneIconPresenter = e.NameScope.Find<ContentPresenter>("PART_BottomPaneIconPresenter");
             _splitView = e.NameScope.Find<SplitView>("PART_SplitView");
             _topBar = e.NameScope.Find<Border>("PART_TopBar");
             _paneButton = e.NameScope.Find<ToggleButton>("PART_PaneButton");
             _backdrop = e.NameScope.Find<Border>("PART_Backdrop");
 
-            UpdateIconPresenters();
-
             if (_backdrop != null)
-                _backdrop.PointerPressed += OnBackdropPressed;
+            {
+                if (IsAttachedToVisualTree)
+                    AttachBackdropPointerPressed();
+
+                AutomationProperties.SetAccessibilityView(_backdrop, AccessibilityView.Raw);
+            }
 
             ApplyForeground(_drawerHeaderPresenter, DrawerHeaderForeground);
             ApplyForeground(_drawerFooterPresenter, DrawerFooterForeground);
@@ -551,11 +572,7 @@ namespace Avalonia.Controls
         {
             base.OnPropertyChanged(change);
 
-            if (change.Property == DrawerIconProperty)
-            {
-                UpdateIconPresenters();
-            }
-            else if (change.Property == DrawerProperty || change.Property == ContentProperty)
+            if (change.Property == DrawerProperty || change.Property == ContentProperty)
             {
                 if (change.OldValue is ILogical oldLogical)
                     LogicalChildren.Remove(oldLogical);
@@ -565,6 +582,7 @@ namespace Avalonia.Controls
 
                 if (change.Property == ContentProperty)
                 {
+                    _hasHadFirstPage = false;
                     _navBarVisibleSub?.Dispose();
                     _navBarVisibleSub = null;
 
@@ -603,11 +621,14 @@ namespace Avalonia.Controls
             }
             else if (change.Property == DrawerBehaviorProperty ||
                      change.Property == DrawerLayoutBehaviorProperty ||
-                     change.Property == DrawerBreakpointWidthProperty)
+                     change.Property == DrawerBreakpointLengthProperty)
             {
                 UpdateSplitViewDisplayMode();
+
+                if (change.Property == DrawerBehaviorProperty && Content is NavigationPage nav)
+                    nav.SetDrawerPage(this);
             }
-            else if (change.Property == BoundsProperty && DrawerBreakpointWidth > 0)
+            else if (change.Property == BoundsProperty && DrawerBreakpointLength > 0)
             {
                 UpdateSplitViewDisplayMode();
             }
@@ -617,6 +638,7 @@ namespace Avalonia.Controls
             }
             else if (change.Property == DrawerPlacementProperty)
             {
+                UpdateSwipeRecognizerAxes();
                 UpdatePanePlacement();
                 UpdateContentSafeAreaPadding();
             }
@@ -643,9 +665,10 @@ namespace Avalonia.Controls
             base.OnAttachedToVisualTree(e);
 
             AddHandler(InputElement.SwipeGestureEvent, OnSwipeGesture);
+            AddHandler(PointerPressedEvent, OnSwipePointerPressed, handledEventsToo: true);
 
-            if (_backdrop != null)
-                _backdrop.PointerPressed += OnBackdropPressed;
+            AttachBackdropPointerPressed();
+            RestoreNavigationState();
         }
 
         protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e)
@@ -653,10 +676,27 @@ namespace Avalonia.Controls
             base.OnDetachedFromVisualTree(e);
 
             RemoveHandler(InputElement.SwipeGestureEvent, OnSwipeGesture);
+            RemoveHandler(PointerPressedEvent, OnSwipePointerPressed);
 
-            if (_backdrop != null)
-                _backdrop.PointerPressed -= OnBackdropPressed;
+            DetachBackdropPointerPressed();
+
+            ClearNavigationState();
+        }
+
+        private void RestoreNavigationState()
+        {
+            if (Content is not NavigationPage nav)
+                return;
 
+            _navBarVisibleSub?.Dispose();
+            nav.SetDrawerPage(this);
+            _navBarVisibleSub = nav.GetObservable(NavigationPage.IsNavBarEffectivelyVisibleProperty)
+                .Subscribe(new AnonymousObserver<bool>(_ => UpdateDetailNavBarVisiblePseudoClass()));
+            UpdateDetailNavBarVisiblePseudoClass();
+        }
+
+        private void ClearNavigationState()
+        {
             _navBarVisibleSub?.Dispose();
             _navBarVisibleSub = null;
 
@@ -664,6 +704,25 @@ namespace Avalonia.Controls
                 nav.SetDrawerPage(null);
         }
 
+        private void AttachBackdropPointerPressed()
+        {
+            if (_backdrop != null)
+                _backdrop.PointerPressed += OnBackdropPressed;
+        }
+
+        private void DetachBackdropPointerPressed()
+        {
+            if (_backdrop != null)
+                _backdrop.PointerPressed -= OnBackdropPressed;
+        }
+
+
+        private void UpdateSwipeRecognizerAxes()
+        {
+            _swipeRecognizer.CanVerticallySwipe = IsVerticalPlacement;
+            _swipeRecognizer.CanHorizontallySwipe = !IsVerticalPlacement;
+        }
+
         protected override void OnLoaded(RoutedEventArgs e)
         {
             base.OnLoaded(e);
@@ -675,6 +734,11 @@ namespace Avalonia.Controls
             }
         }
 
+        private void OnSwipePointerPressed(object? sender, PointerPressedEventArgs e)
+        {
+            _swipeStartPoint = e.GetPosition(this);
+        }
+
         protected override void OnKeyDown(KeyEventArgs e)
         {
             base.OnKeyDown(e);
@@ -714,8 +778,8 @@ namespace Avalonia.Controls
                         : EdgeGestureWidth;
 
                     bool inEdge = DrawerPlacement == DrawerPlacement.Bottom
-                        ? e.StartPoint.Y >= Bounds.Height - openGestureEdge
-                        : e.StartPoint.Y <= openGestureEdge;
+                        ? _swipeStartPoint.Y >= Bounds.Height - openGestureEdge
+                        : _swipeStartPoint.Y <= openGestureEdge;
 
                     if (towardPane && inEdge)
                     {
@@ -746,8 +810,8 @@ namespace Avalonia.Controls
                         : EdgeGestureWidth;
 
                     bool inEdge = IsPaneOnRight
-                        ? e.StartPoint.X >= Bounds.Width - openGestureEdge
-                        : e.StartPoint.X <= openGestureEdge;
+                        ? _swipeStartPoint.X >= Bounds.Width - openGestureEdge
+                        : _swipeStartPoint.X <= openGestureEdge;
 
                     if (towardPane && inEdge)
                     {
@@ -860,7 +924,7 @@ namespace Avalonia.Controls
             if (_splitView == null)
                 return;
 
-            if (DrawerBreakpointWidth > 0 && previousMode != mode)
+            if (DrawerBreakpointLength > 0 && previousMode != mode)
             {
                 if (mode == SplitViewDisplayMode.Inline)
                 {
@@ -888,9 +952,13 @@ namespace Avalonia.Controls
                     return SplitViewDisplayMode.Overlay;
             }
 
-            var breakpoint = DrawerBreakpointWidth;
-            if (!IsVerticalPlacement && breakpoint > 0 && Bounds.Width > 0 && Bounds.Width < breakpoint)
-                return SplitViewDisplayMode.Overlay;
+            var breakpoint = DrawerBreakpointLength;
+            if (breakpoint > 0)
+            {
+                var length = IsVerticalPlacement ? Bounds.Height : Bounds.Width;
+                if (length > 0 && length < breakpoint)
+                    return SplitViewDisplayMode.Overlay;
+            }
 
             switch (DrawerLayoutBehavior)
             {
@@ -938,51 +1006,6 @@ namespace Avalonia.Controls
             e.Handled = true;
         }
 
-        private void UpdateIconPresenters()
-        {
-            if (_compactPaneIconPresenter != null)
-                _compactPaneIconPresenter.Content = CreateIconContent(DrawerIcon);
-            if (_paneIconPresenter != null)
-                _paneIconPresenter.Content = CreateIconContent(DrawerIcon);
-            if (_bottomPaneIconPresenter != null)
-                _bottomPaneIconPresenter.Content = CreateIconContent(DrawerIcon);
-        }
-
-        private static object? CreateIconContent(object? icon)
-        {
-            // Non-visual data (Geometry, IImage, string, etc.) can be shared across presenters.
-            if (icon is not Control)
-                return icon;
-
-            // For Control-typed icons, create an independent copy per presenter to avoid
-            // the "already has a visual parent" exception when the same instance is used
-            // in multiple ContentPresenters simultaneously.
-            if (icon is PathIcon pathIcon)
-            {
-                var clone = new PathIcon
-                {
-                    Data = pathIcon.Data,
-                    Width = pathIcon.Width,
-                    Height = pathIcon.Height,
-                };
-
-                if (pathIcon.IsSet(PathIcon.ForegroundProperty))
-                    clone.Foreground = pathIcon.Foreground;
-                if (pathIcon.IsSet(PathIcon.OpacityProperty))
-                    clone.Opacity = pathIcon.Opacity;
-                if (pathIcon.IsSet(PathIcon.RenderTransformProperty))
-                    clone.RenderTransform = pathIcon.RenderTransform;
-                if (pathIcon.IsSet(PathIcon.RenderTransformOriginProperty))
-                    clone.RenderTransformOrigin = pathIcon.RenderTransformOrigin;
-
-                return clone;
-            }
-
-            // For other Control subtypes, return null to avoid a crash.
-            // Users should pass non-Control icon data instead.
-            return null;
-        }
-
         private void ApplyDrawerBackground()
         {
             if (_splitView == null)
diff --git a/src/Avalonia.Controls/Page/INavigation.cs b/src/Avalonia.Controls/Page/INavigation.cs
index b36bc053b6..e617c37b45 100644
--- a/src/Avalonia.Controls/Page/INavigation.cs
+++ b/src/Avalonia.Controls/Page/INavigation.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Avalonia.Animation;
@@ -117,11 +118,15 @@ namespace Avalonia.Controls
         /// Inserts <paramref name="page"/> immediately before <paramref name="before"/> in the stack.
         /// Does not change the currently visible page.
         /// </summary>
+        /// <exception cref="ArgumentNullException"><paramref name="page"/> or <paramref name="before"/> is <see langword="null"/>.</exception>
+        /// <exception cref="InvalidOperationException"><paramref name="before"/> is not in the navigation stack, or <paramref name="page"/> is already hosted by this navigation page.</exception>
         void InsertPage(Page page, Page before);
 
         /// <summary>
         /// Removes <paramref name="page"/> from the navigation stack without animation.
+        /// If <paramref name="page"/> is not in the stack the call is a no-op.
         /// </summary>
+        /// <exception cref="ArgumentNullException"><paramref name="page"/> is <see langword="null"/>.</exception>
         void RemovePage(Page page);
     }
 }
diff --git a/src/Avalonia.Controls/Page/MultiPage.cs b/src/Avalonia.Controls/Page/MultiPage.cs
index 817f1306aa..a9912ced2d 100644
--- a/src/Avalonia.Controls/Page/MultiPage.cs
+++ b/src/Avalonia.Controls/Page/MultiPage.cs
@@ -5,7 +5,6 @@ using System.Collections.Specialized;
 using Avalonia.Controls.Templates;
 using Avalonia.LogicalTree;
 using Avalonia.Metadata;
-using Avalonia.VisualTree;
 
 namespace Avalonia.Controls
 {
@@ -20,6 +19,12 @@ namespace Avalonia.Controls
         public static readonly StyledProperty<IEnumerable<Page>?> PagesProperty =
             AvaloniaProperty.Register<MultiPage, IEnumerable<Page>?>(nameof(Pages));
 
+        /// <summary>
+        /// Defines the <see cref="ItemsSource"/> property.
+        /// </summary>
+        public static readonly StyledProperty<IEnumerable?> ItemsSourceProperty =
+            AvaloniaProperty.Register<MultiPage, IEnumerable?>(nameof(ItemsSource));
+
         /// <summary>
         /// Defines the <see cref="PageTemplate"/> property.
         /// </summary>
@@ -43,6 +48,18 @@ namespace Avalonia.Controls
             set => SetValue(PagesProperty, value);
         }
 
+        /// <summary>
+        /// Gets or sets a view-model collection to bind to. Use together with
+        /// <see cref="PageTemplate"/> to convert each item into a <see cref="Page"/>.
+        /// When set, takes precedence over <see cref="Pages"/> as the item source for
+        /// the inner tab or carousel control.
+        /// </summary>
+        public IEnumerable? ItemsSource
+        {
+            get => GetValue(ItemsSourceProperty);
+            set => SetValue(ItemsSourceProperty, value);
+        }
+
         /// <summary>
         /// Gets or sets the data template used to create pages from view-model items.
         /// </summary>
@@ -68,18 +85,18 @@ namespace Avalonia.Controls
 
             if (change.Property == PagesProperty)
             {
+                if (ReferenceEquals(change.OldValue, change.NewValue))
+                    return;
+
                 if (change.OldValue is INotifyCollectionChanged oldNotifyCollection)
                     oldNotifyCollection.CollectionChanged -= NotifyCollection_CollectionChanged;
 
                 LogicalChildren.Clear();
 
-                if (change.NewValue is IEnumerable<Page> newPages)
+                if (change.NewValue is IEnumerable<Page> newItems)
                 {
-                    foreach (var page in newPages)
-                    {
-                        if (page is ILogical logical)
-                            LogicalChildren.Add(logical);
-                    }
+                    foreach (var page in newItems)
+                        LogicalChildren.Add(page);
                 }
 
                 if (change.NewValue is INotifyCollectionChanged newNotifyCollection)
@@ -87,6 +104,8 @@ namespace Avalonia.Controls
 
                 if (change.NewValue != null)
                     UpdateActivePage();
+                else
+                    SetCurrentValue(CurrentPageProperty, null);
             }
             else if (change.Property == CurrentPageProperty)
                 CurrentPageChanged?.Invoke(this, EventArgs.Empty);
@@ -103,6 +122,24 @@ namespace Avalonia.Controls
         /// Called when the active child page changes.
         /// </summary>
         /// <param name="navigationType">The reason for the page change.</param>
+        /// <remarks>
+        /// The base class calls this method in the following situations, passing the corresponding
+        /// <see cref="NavigationType"/> value:
+        /// <list type="bullet">
+        ///   <item><description>
+        ///     <see cref="NavigationType.Replace"/>. The <see cref="Pages"/> collection was
+        ///     assigned, a new item was added, or the active page changed for any reason not
+        ///     covered below.
+        ///   </description></item>
+        ///   <item><description>
+        ///     <see cref="NavigationType.Remove"/>. The currently active page was removed from
+        ///     the <see cref="Pages"/> collection or the collection was reset and the active page
+        ///     is no longer present. Subclasses should select a replacement page.
+        ///   </description></item>
+        /// </list>
+        /// Subclasses may also call this method directly with any <see cref="NavigationType"/>
+        /// value appropriate for their own navigation model.
+        /// </remarks>
         protected virtual void UpdateActivePage(NavigationType navigationType) { }
 
         protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
@@ -132,33 +169,8 @@ namespace Avalonia.Controls
                     LogicalChildren.Clear();
                     if (Pages != null)
                     {
-                        foreach (var item in Pages)
-                        {
-                            if (item is ILogical logical)
-                                LogicalChildren.Add(logical);
-                        }
-                    }
-                    break;
-
-                case NotifyCollectionChangedAction.Remove:
-                case NotifyCollectionChangedAction.Replace:
-                    if (e.OldItems != null)
-                    {
-                        foreach (var old in e.OldItems)
-                        {
-                            if (old is ILogical logical)
-                                LogicalChildren.Remove(logical);
-                        }
-                    }
-
-                    if (e.NewItems != null)
-                    {
-                        int insertIdx = e.NewStartingIndex >= 0 ? e.NewStartingIndex : LogicalChildren.Count;
-                        foreach (var newItem in e.NewItems)
-                        {
-                            if (newItem is ILogical logical)
-                                LogicalChildren.Insert(insertIdx++, logical);
-                        }
+                        foreach (var page in Pages)
+                            LogicalChildren.Add(page);
                     }
                     break;
 
@@ -167,8 +179,8 @@ namespace Avalonia.Controls
                     {
                         foreach (var old in e.OldItems)
                         {
-                            if (old is ILogical logical)
-                                LogicalChildren.Remove(logical);
+                            if (old is Page page)
+                                LogicalChildren.Remove(page);
                         }
                     }
 
@@ -177,8 +189,8 @@ namespace Avalonia.Controls
                         int insertIdx = e.NewStartingIndex >= 0 ? e.NewStartingIndex : LogicalChildren.Count;
                         foreach (var newItem in e.NewItems)
                         {
-                            if (newItem is ILogical logical)
-                                LogicalChildren.Insert(insertIdx++, logical);
+                            if (newItem is Page page)
+                                LogicalChildren.Insert(insertIdx++, page);
                         }
                     }
                     break;
@@ -196,14 +208,22 @@ namespace Avalonia.Controls
                 {
                     if (e.OldItems != null)
                         foreach (var old in e.OldItems)
-                            if (ReferenceEquals(old, current)) { currentRemoved = true; break; }
+                            if (ReferenceEquals(old, current))
+                            {
+                                currentRemoved = true;
+                                break;
+                            }
                 }
                 else if (e.Action == NotifyCollectionChangedAction.Reset)
                 {
                     currentRemoved = true;
                     if (Pages != null)
-                        foreach (var item in Pages)
-                            if (ReferenceEquals(item, current)) { currentRemoved = false; break; }
+                        foreach (var page in Pages)
+                            if (ReferenceEquals(page, current))
+                            {
+                                currentRemoved = false;
+                                break;
+                            }
                 }
 
                 if (currentRemoved)
diff --git a/src/Avalonia.Controls/Page/NavigationPage.cs b/src/Avalonia.Controls/Page/NavigationPage.cs
index dd14d71a04..8e38fbbdbc 100644
--- a/src/Avalonia.Controls/Page/NavigationPage.cs
+++ b/src/Avalonia.Controls/Page/NavigationPage.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Threading;
 using System.Threading.Tasks;
 using Avalonia.Animation;
@@ -12,6 +11,7 @@ using Avalonia.Logging;
 using Avalonia.LogicalTree;
 using Avalonia.Controls.Presenters;
 using Avalonia.Controls.Primitives;
+using Avalonia.Controls.Shapes;
 using Avalonia.Input;
 using Avalonia.Input.GestureRecognizers;
 using Avalonia.Interactivity;
@@ -29,16 +29,21 @@ namespace Avalonia.Controls
     [TemplatePart("PART_ContentHost", typeof(Panel))]
     [TemplatePart("PART_PagePresenter", typeof(ContentPresenter))]
     [TemplatePart("PART_PageBackPresenter", typeof(ContentPresenter))]
+    [TemplatePart("PART_BackButtonDefaultIcon", typeof(Control))]
+    [TemplatePart("PART_BackButtonContentPresenter", typeof(ContentPresenter))]
     [TemplatePart("PART_TopCommandBar", typeof(ContentPresenter))]
     [TemplatePart("PART_BottomCommandBar", typeof(ContentPresenter))]
     [TemplatePart("PART_ModalBackPresenter", typeof(ContentPresenter))]
     [TemplatePart("PART_ModalPresenter", typeof(ContentPresenter))]
+    [TemplatePart("PART_NavBarShadow", typeof(Border))]
     [PseudoClasses(":nav-bar-inset", ":nav-bar-compact")]
     public class NavigationPage : MultiPage, INavigation
     {
         private const double EdgeGestureWidth = 20;
 
         private Button? _backButton;
+        private Control? _backButtonDefaultIcon;
+        private ContentPresenter? _backButtonContentPresenter;
         private Panel? _contentHost;
         private ContentPresenter? _pagePresenter;
         private ContentPresenter? _pageBackPresenter;
@@ -50,6 +55,7 @@ namespace Avalonia.Controls
         private bool _isPop;
         private bool _hasHadFirstPage;
         private BarLayoutBehavior _effectiveBarLayoutBehavior = BarLayoutBehavior.Inset;
+        private readonly Stack<Page> _navigationStack = new();
         private readonly Stack<Page> _modalStack = new();
         private IReadOnlyList<Page>? _cachedNavigationStack;
         private IReadOnlyList<Page>? _cachedModalStack;
@@ -60,6 +66,7 @@ namespace Avalonia.Controls
         private IDisposable? _isBackButtonEnabledSub;
         private IDisposable? _barLayoutBehaviorSub;
         private IDisposable? _barHeightSub;
+        private IDisposable? _backButtonContentSub;
         private bool _isNavigating;
         private bool _canGoBack;
         private bool? _isBackButtonEffectivelyVisible;
@@ -68,8 +75,11 @@ namespace Avalonia.Controls
         private bool _isBackButtonEffectivelyEnabled;
         private DrawerPage? _drawerPage;
         private IPageTransition? _overrideTransition;
+        private Point _swipeStartPoint;
+        private int _lastSwipeGestureId;
         private bool _hasOverrideTransition;
         private readonly HashSet<object> _pageSet = new(ReferenceEqualityComparer.Instance);
+        private bool _restoringPagesProperty;
 
         private bool IsRtl => FlowDirection == FlowDirection.RightToLeft;
 
@@ -181,6 +191,12 @@ namespace Avalonia.Controls
         public static readonly StyledProperty<bool> IsGestureEnabledProperty =
             AvaloniaProperty.Register<NavigationPage, bool>(nameof(IsGestureEnabled), true);
 
+        /// <summary>
+        /// Defines the <see cref="IsNavigating"/> property.
+        /// </summary>
+        public static readonly DirectProperty<NavigationPage, bool> IsNavigatingProperty =
+            AvaloniaProperty.RegisterDirect<NavigationPage, bool>(nameof(IsNavigating), o => o._isNavigating);
+
         /// <summary>
         /// Defines the <see cref="CanGoBack"/> property.
         /// </summary>
@@ -203,6 +219,22 @@ namespace Avalonia.Controls
         {
             PageNavigationSystemBackButtonPressedEvent.AddClassHandler<NavigationPage>((sender, eventArgs) =>
             {
+                if (eventArgs.Handled)
+                    return;
+
+                if (sender._modalStack.Count > 0)
+                {
+                    var forwarded = new RoutedEventArgs(PageNavigationSystemBackButtonPressedEvent);
+                    sender._modalStack.Peek().RaiseEvent(forwarded);
+
+                    eventArgs.Handled = true;
+
+                    if (!forwarded.Handled)
+                        _ = sender.PopModalAsync();
+
+                    return;
+                }
+
                 if (sender.StackDepth > 1)
                 {
                     eventArgs.Handled = true;
@@ -247,7 +279,7 @@ namespace Avalonia.Controls
             {
                 if (e.NewValue is not Page page || x.StackDepth > 0)
                     return;
-                _ = x.PushAsync(page);
+                _ = x.PushAsync(page); // property-changed handler cannot be async; fire-and-forget is intentional
             });
         }
 
@@ -256,8 +288,13 @@ namespace Avalonia.Controls
         /// </summary>
         public NavigationPage()
         {
-            SetCurrentValue(PagesProperty, new Stack<Page>());
-            GestureRecognizers.Add(new SwipeGestureRecognizer { EdgeSize = EdgeGestureWidth });
+            SetCurrentValue(PagesProperty, _navigationStack);
+            GestureRecognizers.Add(new SwipeGestureRecognizer
+            {
+                CanHorizontallySwipe = true,
+                CanVerticallySwipe = false
+            });
+            AddHandler(PointerPressedEvent, OnSwipePointerPressed, handledEventsToo: true);
         }
 
         /// <summary>
@@ -364,6 +401,11 @@ namespace Avalonia.Controls
             set => SetValue(IsGestureEnabledProperty, value);
         }
 
+        /// <summary>
+        /// Gets whether a navigation operation is currently in progress.
+        /// </summary>
+        public bool IsNavigating => _isNavigating;
+
         /// <summary>
         /// Gets whether the navigation stack has more than one entry.
         /// </summary>
@@ -385,18 +427,9 @@ namespace Avalonia.Controls
                 if (_cachedNavigationStack != null)
                     return _cachedNavigationStack;
 
-                if (Pages is Stack<Page> stack)
-                {
-                    var result = new List<Page>(stack);
-                    result.Reverse();
-                    _cachedNavigationStack = result.AsReadOnly();
-                }
-                else if (Pages is IEnumerable<Page> enumerable)
-                {
-                    _cachedNavigationStack = new List<Page>(enumerable).AsReadOnly();
-                }
-                else
-                    _cachedNavigationStack = Array.Empty<Page>();
+                var result = new List<Page>(_navigationStack);
+                result.Reverse();
+                _cachedNavigationStack = result.AsReadOnly();
 
                 return _cachedNavigationStack;
             }
@@ -422,10 +455,7 @@ namespace Avalonia.Controls
         /// <summary>
         /// Gets the number of pages in the navigation stack.
         /// </summary>
-        public int StackDepth
-        {
-            get => Pages is System.Collections.ICollection c ? c.Count : 0;
-        }
+        public int StackDepth => _navigationStack.Count;
 
         /// <summary>
         /// Gets the custom back-button content for the specified page.
@@ -451,9 +481,15 @@ namespace Avalonia.Controls
         public static void SetHasBackButton(Page page, bool value) =>
             page.SetValue(HasBackButtonProperty, value);
 
+        /// <summary>
+        /// Gets the header of the specified page.
+        /// </summary>
         public static object? GetHeader(Page page) =>
             page.GetValue(Page.HeaderProperty);
 
+        /// <summary>
+        /// Sets the header of the specified page.
+        /// </summary>
         public static void SetHeader(Page page, object? header) =>
             page.SetValue(Page.HeaderProperty, header);
 
@@ -542,6 +578,11 @@ namespace Avalonia.Controls
         /// <summary>
         /// Occurs when the stack is popped to root.
         /// </summary>
+        /// <remarks>
+        /// The <see cref="NavigationEventArgs.Page"/> property holds the root page that is now
+        /// current, not any of the pages that were popped. To observe each popped page
+        /// individually, subscribe to <see cref="Popped"/>.
+        /// </remarks>
         public event EventHandler<NavigationEventArgs>? PoppedToRoot;
 
         /// <summary>
@@ -577,11 +618,36 @@ namespace Avalonia.Controls
             }
         }
 
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+        {
+            if (change.Property == PagesProperty &&
+                !_restoringPagesProperty &&
+                !ReferenceEquals(change.NewValue, _navigationStack))
+            {
+                try
+                {
+                    _restoringPagesProperty = true;
+                    SetCurrentValue(PagesProperty, _navigationStack);
+                }
+                finally
+                {
+                    _restoringPagesProperty = false;
+                }
+
+                throw new InvalidOperationException(
+                    "Direct assignment to NavigationPage.Pages is not supported. Use PushAsync, PopAsync, InsertPage, RemovePage, or ReplaceAsync to modify the navigation stack.");
+            }
+
+            base.OnPropertyChanged(change);
+        }
+
         protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
         {
             base.OnApplyTemplate(e);
 
             BackButton = e.NameScope.Get<Button>("PART_BackButton");
+            _backButtonDefaultIcon = e.NameScope.Find<Control>("PART_BackButtonDefaultIcon");
+            _backButtonContentPresenter = e.NameScope.Find<ContentPresenter>("PART_BackButtonContentPresenter");
 
             _contentHost = e.NameScope.Find<Panel>("PART_ContentHost");
             _pagePresenter = e.NameScope.Find<ContentPresenter>("PART_PagePresenter");
@@ -603,11 +669,7 @@ namespace Avalonia.Controls
                 _modalPresenter.IsVisible = IsModalVisible;
             }
 
-            foreach (var p in NavigationStack)
-            {
-                p.Navigation = this;
-                p.SetInNavigationPage(true);
-            }
+            RestoreNavigationState();
 
             ApplyNavBarVisibility();
             ApplyBackButtonEnabled(IsBackButtonEffectivelyEnabled);
@@ -646,6 +708,7 @@ namespace Avalonia.Controls
         {
             base.OnAttachedToVisualTree(e);
 
+            RestoreNavigationState();
             AddHandler(InputElement.SwipeGestureEvent, OnSwipeGesture);
         }
 
@@ -673,20 +736,10 @@ namespace Avalonia.Controls
             _barLayoutBehaviorSub = null;
             _barHeightSub?.Dispose();
             _barHeightSub = null;
+            _backButtonContentSub?.Dispose();
+            _backButtonContentSub = null;
 
-            while (_modalStack.Count > 0)
-            {
-                var modal = _modalStack.Pop();
-                modal.Navigation = null;
-                modal.SetInNavigationPage(false);
-            }
-            _cachedModalStack = null;
-
-            foreach (var p in NavigationStack)
-            {
-                p.Navigation = null;
-                p.SetInNavigationPage(false);
-            }
+            ClearNavigationState();
             InvalidateNavigationStackCache();
         }
 
@@ -730,18 +783,24 @@ namespace Avalonia.Controls
         /// </summary>
         private Page? PeekDestinationPage()
         {
-            if (Pages is Stack<Page> stack)
+            if (_navigationStack.Count < 2)
+                return null;
+            using var enumerator = _navigationStack.GetEnumerator();
+            enumerator.MoveNext();
+            enumerator.MoveNext();
+            return enumerator.Current;
+        }
+
+        private void ThrowIfPageIsAlreadyPresent(Page page)
+        {
+            if (_pageSet.Contains(page))
+                throw new InvalidOperationException("The page is already hosted by this NavigationPage.");
+
+            foreach (var modal in _modalStack)
             {
-                if (stack.Count < 2)
-                    return null;
-                using var enumerator = stack.GetEnumerator();
-                enumerator.MoveNext();
-                enumerator.MoveNext();
-                return enumerator.Current;
+                if (ReferenceEquals(modal, page))
+                    throw new InvalidOperationException("The page is already hosted by this NavigationPage.");
             }
-            if (Pages is IList<Page> list)
-                return list.Count >= 2 ? list[list.Count - 2] : null;
-            return null;
         }
 
         /// <summary>
@@ -752,18 +811,13 @@ namespace Avalonia.Controls
         {
             ArgumentNullException.ThrowIfNull(page);
 
-            if (_pageSet.Contains(page))
-                throw new InvalidOperationException("The page is already in the navigation stack.");
-
-            if (Pages is Stack<Page> pages)
-                pages.Push(page);
-            else if (Pages is IList<Page> list)
-                list.Add(page);
+            ThrowIfPageIsAlreadyPresent(page);
 
+            _navigationStack.Push(page);
             _pageSet.Add(page);
             InvalidateNavigationStackCache();
 
-            if (page is ILogical logical && Pages is not INotifyCollectionChanged)
+            if (page is ILogical logical)
                 LogicalChildren.Add(logical);
 
             page.Navigation = this;
@@ -780,25 +834,12 @@ namespace Avalonia.Controls
         /// </summary>
         private Page? ExecutePopCore()
         {
-            Page? old = null;
-
-            if (Pages is Stack<Page> pages)
-            {
-                old = pages.Pop();
-            }
-            else if (Pages is IList<Page> list)
-            {
-                if (list.Count > 0)
-                {
-                    old = list[list.Count - 1];
-                    list.RemoveAt(list.Count - 1);
-                }
-            }
+            Page? old = _navigationStack.Count > 0 ? _navigationStack.Pop() : null;
 
             if (old != null)
                 _pageSet.Remove(old);
 
-            if (old is ILogical oldLogical && Pages is not INotifyCollectionChanged)
+            if (old is ILogical oldLogical)
                 LogicalChildren.Remove(oldLogical);
 
             InvalidateNavigationStackCache();
@@ -809,6 +850,7 @@ namespace Avalonia.Controls
             {
                 old.Navigation = null;
                 old.SetInNavigationPage(false);
+                old.SafeAreaPadding = default;
             }
 
             return old;
@@ -817,13 +859,20 @@ namespace Avalonia.Controls
         /// <summary>
         /// Pushes <paramref name="page"/> onto the navigation stack asynchronously using <see cref="PageTransition"/>.
         /// </summary>
+        /// <remarks>
+        /// If a navigation transition is already in progress (<see cref="IsNavigating"/> is <see langword="true"/>),
+        /// the call returns immediately without pushing the page and without raising any events.
+        /// If the outgoing page's <see cref="Page.Navigating"/> handler sets
+        /// <see cref="NavigatingFromEventArgs.Cancel"/> to <see langword="true"/>, the push is
+        /// silently aborted: the stack is not modified, no events are raised, and no exception is thrown.
+        /// </remarks>
         public async Task PushAsync(Page page)
         {
             ArgumentNullException.ThrowIfNull(page);
             if (_isNavigating)
                 return;
 
-            _isNavigating = true;
+            SetAndRaise(IsNavigatingProperty, ref _isNavigating, true);
             try
             {
                 var previousPage = CurrentPage;
@@ -847,7 +896,7 @@ namespace Avalonia.Controls
             }
             finally
             {
-                _isNavigating = false;
+                SetAndRaise(IsNavigatingProperty, ref _isNavigating, false);
             }
         }
 
@@ -856,15 +905,28 @@ namespace Avalonia.Controls
         /// </summary>
         public async Task PushAsync(Page page, IPageTransition? transition)
         {
+            if (_isNavigating)
+                return;
             _overrideTransition = transition;
             _hasOverrideTransition = true;
-            try { await PushAsync(page); }
-            finally { _hasOverrideTransition = false; _overrideTransition = null; }
+            try
+            {
+                await PushAsync(page);
+            }
+            finally
+            {
+                _hasOverrideTransition = false;
+                _overrideTransition = null;
+            }
         }
 
         /// <summary>
         /// Pops the top page from the navigation stack asynchronously using <see cref="PageTransition"/>.
         /// </summary>
+        /// <remarks>
+        /// Returns <see langword="null"/> if the stack has only the root page or if a navigation transition
+        /// is already in progress (<see cref="IsNavigating"/> is <see langword="true"/>).
+        /// </remarks>
         public async Task<Page?> PopAsync()
         {
             if (StackDepth <= 1)
@@ -872,7 +934,7 @@ namespace Avalonia.Controls
             if (_isNavigating)
                 return null;
 
-            _isNavigating = true;
+            SetAndRaise(IsNavigatingProperty, ref _isNavigating, true);
             try
             {
                 var currentPage = CurrentPage;
@@ -897,7 +959,7 @@ namespace Avalonia.Controls
             }
             finally
             {
-                _isNavigating = false;
+                SetAndRaise(IsNavigatingProperty, ref _isNavigating, false);
             }
         }
 
@@ -906,15 +968,28 @@ namespace Avalonia.Controls
         /// </summary>
         public async Task<Page?> PopAsync(IPageTransition? transition)
         {
+            if (_isNavigating)
+                return null;
             _overrideTransition = transition;
             _hasOverrideTransition = true;
-            try { return await PopAsync(); }
-            finally { _hasOverrideTransition = false; _overrideTransition = null; }
+            try
+            {
+                return await PopAsync();
+            }
+            finally
+            {
+                _hasOverrideTransition = false;
+                _overrideTransition = null;
+            }
         }
 
         /// <summary>
         /// Pops all pages to the root page using <see cref="PageTransition"/>.
         /// </summary>
+        /// <remarks>
+        /// If a navigation transition is already in progress (<see cref="IsNavigating"/> is <see langword="true"/>),
+        /// the call returns immediately without modifying the stack and without raising any events.
+        /// </remarks>
         public async Task PopToRootAsync()
         {
             if (StackDepth <= 1)
@@ -922,7 +997,7 @@ namespace Avalonia.Controls
             if (_isNavigating)
                 return;
 
-            _isNavigating = true;
+            SetAndRaise(IsNavigatingProperty, ref _isNavigating, true);
             try
             {
                 var navigationStack = NavigationStack;
@@ -937,33 +1012,21 @@ namespace Avalonia.Controls
                         return;
                 }
 
-                bool isIncc = Pages is INotifyCollectionChanged;
                 var poppedPages = new List<Page>();
 
                 void TearDownPopped(Page popped)
                 {
                     _pageSet.Remove(popped);
-                    if (!isIncc && popped is ILogical poppedLogical)
+                    if (popped is ILogical poppedLogical)
                         LogicalChildren.Remove(poppedLogical);
                     popped.Navigation = null;
                     popped.SetInNavigationPage(false);
+                    popped.SafeAreaPadding = default;
                     poppedPages.Add(popped);
                 }
 
-                if (Pages is Stack<Page> stack)
-                {
-                    while (stack.Count > 1)
-                        TearDownPopped(stack.Pop());
-                }
-                else if (Pages is IList<Page> list)
-                {
-                    while (list.Count > 1)
-                    {
-                        var last = list[list.Count - 1];
-                        list.RemoveAt(list.Count - 1);
-                        TearDownPopped(last);
-                    }
-                }
+                while (_navigationStack.Count > 1)
+                    TearDownPopped(_navigationStack.Pop());
 
                 InvalidateNavigationStackCache();
                 _isPop = true;
@@ -987,7 +1050,7 @@ namespace Avalonia.Controls
             }
             finally
             {
-                _isNavigating = false;
+                SetAndRaise(IsNavigatingProperty, ref _isNavigating, false);
             }
         }
 
@@ -996,15 +1059,36 @@ namespace Avalonia.Controls
         /// </summary>
         public async Task PopToRootAsync(IPageTransition? transition)
         {
+            if (_isNavigating)
+                return;
             _overrideTransition = transition;
             _hasOverrideTransition = true;
-            try { await PopToRootAsync(); }
-            finally { _hasOverrideTransition = false; _overrideTransition = null; }
+            try
+            {
+                await PopToRootAsync();
+            }
+            finally
+            {
+                _hasOverrideTransition = false;
+                _overrideTransition = null;
+            }
         }
 
         /// <summary>
         /// Pops to a specific page in the stack using <see cref="PageTransition"/>.
         /// </summary>
+        /// <remarks>
+        /// All pages above <paramref name="page"/> are removed from the stack. Each removed page
+        /// receives a <see cref="Page.NavigatedFrom"/> call with <see cref="NavigationType.Pop"/>,
+        /// and <see cref="Popped"/> is raised for each one. The target page receives
+        /// <see cref="Page.NavigatedTo"/> with <see cref="NavigationType.Pop"/>. If
+        /// <paramref name="page"/> is already the top of the stack the method returns immediately
+        /// without raising any events.
+        /// <para>
+        /// If a navigation transition is already in progress (<see cref="IsNavigating"/> is <see langword="true"/>),
+        /// the call returns immediately without modifying the stack and without raising any events.
+        /// </para>
+        /// </remarks>
         public async Task PopToPageAsync(Page page)
         {
             ArgumentNullException.ThrowIfNull(page);
@@ -1012,10 +1096,13 @@ namespace Avalonia.Controls
             if (!_pageSet.Contains(page))
                 throw new ArgumentException("Page is not in the navigation stack.", nameof(page));
 
+            if (_navigationStack.Count > 0 && ReferenceEquals(_navigationStack.Peek(), page))
+                return;
+
             if (_isNavigating)
                 return;
 
-            _isNavigating = true;
+            SetAndRaise(IsNavigatingProperty, ref _isNavigating, true);
             try
             {
                 var currentPage = CurrentPage;
@@ -1027,33 +1114,21 @@ namespace Avalonia.Controls
                         return;
                 }
 
-                bool isIncc = Pages is INotifyCollectionChanged;
                 var poppedPages = new List<Page>();
 
                 void TearDownPopped(Page popped)
                 {
                     _pageSet.Remove(popped);
-                    if (!isIncc && popped is ILogical poppedLogical)
+                    if (popped is ILogical poppedLogical)
                         LogicalChildren.Remove(poppedLogical);
                     popped.Navigation = null;
                     popped.SetInNavigationPage(false);
+                    popped.SafeAreaPadding = default;
                     poppedPages.Add(popped);
                 }
 
-                if (Pages is Stack<Page> stack)
-                {
-                    while (stack.Count > 1 && stack.Peek() != page)
-                        TearDownPopped(stack.Pop());
-                }
-                else if (Pages is IList<Page> list)
-                {
-                    while (list.Count > 1 && list[list.Count - 1] != page)
-                    {
-                        var last = list[list.Count - 1];
-                        list.RemoveAt(list.Count - 1);
-                        TearDownPopped(last);
-                    }
-                }
+                while (_navigationStack.Count > 1 && _navigationStack.Peek() != page)
+                    TearDownPopped(_navigationStack.Pop());
 
                 InvalidateNavigationStackCache();
                 _isPop = true;
@@ -1075,7 +1150,7 @@ namespace Avalonia.Controls
             }
             finally
             {
-                _isNavigating = false;
+                SetAndRaise(IsNavigatingProperty, ref _isNavigating, false);
             }
         }
 
@@ -1084,28 +1159,50 @@ namespace Avalonia.Controls
         /// </summary>
         public async Task PopToPageAsync(Page page, IPageTransition? transition)
         {
+            if (_isNavigating)
+                return;
             _overrideTransition = transition;
             _hasOverrideTransition = true;
-            try { await PopToPageAsync(page); }
-            finally { _hasOverrideTransition = false; _overrideTransition = null; }
+            try
+            {
+                await PopToPageAsync(page);
+            }
+            finally
+            {
+                _hasOverrideTransition = false;
+                _overrideTransition = null;
+            }
         }
 
         /// <summary>
         /// Pushes a modal page using <see cref="ModalTransition"/>.
         /// </summary>
+        /// <remarks>
+        /// If a navigation transition is already in progress (<see cref="IsNavigating"/> is <see langword="true"/>),
+        /// the call returns immediately without pushing the page and without raising any events.
+        /// </remarks>
         public async Task PushModalAsync(Page page)
         {
             ArgumentNullException.ThrowIfNull(page);
             if (_isNavigating)
                 return;
+            ThrowIfPageIsAlreadyPresent(page);
 
-            _isNavigating = true;
+            SetAndRaise(IsNavigatingProperty, ref _isNavigating, true);
             try
             {
                 var previousModal = _modalStack.Count > 0 ? (Page?)_modalStack.Peek() : null;
-
                 var coveredPage = previousModal ?? CurrentPage;
 
+                if (coveredPage != null)
+                {
+                    var navigatingArgs = new NavigatingFromEventArgs(page, NavigationType.PushModal);
+                    await coveredPage.SendNavigatingAsync(navigatingArgs);
+
+                    if (navigatingArgs.Cancel)
+                        return;
+                }
+
                 _modalStack.Push(page);
                 _cachedModalStack = null;
                 page.Navigation = this;
@@ -1133,11 +1230,11 @@ namespace Avalonia.Controls
                     }
                     _currentModalTransition?.Cancel();
                     _currentModalTransition?.Dispose();
-                    _currentModalTransition = new CancellationTokenSource();
-                    var modalCt = _currentModalTransition.Token;
+                    var modalCts = new CancellationTokenSource();
+                    _currentModalTransition = modalCts;
                     try
                     {
-                        await effectiveModalTransition.Start(null, _modalPresenter, forward: true, modalCt);
+                        await effectiveModalTransition.Start(null, _modalPresenter, forward: true, modalCts.Token);
                     }
                     catch (OperationCanceledException) { /* Transition cancelled; lifecycle events still fire below. */ }
                     catch (Exception ex)
@@ -1145,11 +1242,18 @@ namespace Avalonia.Controls
                         Logger.TryGet(LogEventLevel.Error, LogArea.Control)
                             ?.Log(this, "Modal transition threw an unhandled exception: {Exception}", ex);
                     }
-
-                    if (_modalBackPresenter != null)
+                    finally
                     {
-                        _modalBackPresenter.IsVisible = false;
-                        _modalBackPresenter.Content = null;
+                        if (_modalBackPresenter != null)
+                        {
+                            _modalBackPresenter.IsVisible = false;
+                            _modalBackPresenter.Content = null;
+                        }
+                        if (ReferenceEquals(_currentModalTransition, modalCts))
+                        {
+                            _currentModalTransition = null;
+                            modalCts.Dispose();
+                        }
                     }
                 }
                 else
@@ -1165,7 +1269,7 @@ namespace Avalonia.Controls
             }
             finally
             {
-                _isNavigating = false;
+                SetAndRaise(IsNavigatingProperty, ref _isNavigating, false);
             }
         }
 
@@ -1174,15 +1278,28 @@ namespace Avalonia.Controls
         /// </summary>
         public async Task PushModalAsync(Page page, IPageTransition? transition)
         {
+            if (_isNavigating)
+                return;
             _overrideTransition = transition;
             _hasOverrideTransition = true;
-            try { await PushModalAsync(page); }
-            finally { _hasOverrideTransition = false; _overrideTransition = null; }
+            try
+            {
+                await PushModalAsync(page);
+            }
+            finally
+            {
+                _hasOverrideTransition = false;
+                _overrideTransition = null;
+            }
         }
 
         /// <summary>
         /// Pops the top modal page using <see cref="ModalTransition"/>.
         /// </summary>
+        /// <remarks>
+        /// Returns <see langword="null"/> if there are no modal pages or if a navigation transition
+        /// is already in progress (<see cref="IsNavigating"/> is <see langword="true"/>).
+        /// </remarks>
         public async Task<Page?> PopModalAsync()
         {
             if (_modalStack.Count == 0)
@@ -1190,10 +1307,30 @@ namespace Avalonia.Controls
             if (_isNavigating)
                 return null;
 
-            _isNavigating = true;
+            SetAndRaise(IsNavigatingProperty, ref _isNavigating, true);
             try
             {
-                var modal = _modalStack.Pop();
+                var modal = _modalStack.Peek();
+                Page? revealedPage;
+                if (_modalStack.Count < 2)
+                {
+                    revealedPage = CurrentPage;
+                }
+                else
+                {
+                    using var enumerator = _modalStack.GetEnumerator();
+                    enumerator.MoveNext();
+                    enumerator.MoveNext();
+                    revealedPage = enumerator.Current;
+                }
+
+                var navigatingArgs = new NavigatingFromEventArgs(revealedPage, NavigationType.PopModal);
+                await modal.SendNavigatingAsync(navigatingArgs);
+
+                if (navigatingArgs.Cancel)
+                    return null;
+
+                modal = _modalStack.Pop();
                 _cachedModalStack = null;
 
                 modal.Navigation = null;
@@ -1216,11 +1353,11 @@ namespace Avalonia.Controls
 
                         _currentModalTransition?.Cancel();
                         _currentModalTransition?.Dispose();
-                        _currentModalTransition = new CancellationTokenSource();
-                        var popCt1 = _currentModalTransition.Token;
+                        var popCts1 = new CancellationTokenSource();
+                        _currentModalTransition = popCts1;
                         try
                         {
-                            await effectiveModalTransition.Start(_modalPresenter, null, forward: false, popCt1);
+                            await effectiveModalTransition.Start(_modalPresenter, null, forward: false, popCts1.Token);
                             SwapModalPresenters();
                             if (_modalBackPresenter != null)
                                 _modalBackPresenter.Content = null;
@@ -1234,6 +1371,11 @@ namespace Avalonia.Controls
                         finally
                         {
                             SetCurrentValue(ModalContentProperty, (object?)next);
+                            if (ReferenceEquals(_currentModalTransition, popCts1))
+                            {
+                                _currentModalTransition = null;
+                                popCts1.Dispose();
+                            }
                         }
                     }
                     else
@@ -1247,11 +1389,11 @@ namespace Avalonia.Controls
                     {
                         _currentModalTransition?.Cancel();
                         _currentModalTransition?.Dispose();
-                        _currentModalTransition = new CancellationTokenSource();
-                        var popCt2 = _currentModalTransition.Token;
+                        var popCts2 = new CancellationTokenSource();
+                        _currentModalTransition = popCts2;
                         try
                         {
-                            await effectiveModalTransition.Start(_modalPresenter, null, forward: false, popCt2);
+                            await effectiveModalTransition.Start(_modalPresenter, null, forward: false, popCts2.Token);
                         }
                         catch (OperationCanceledException) { /* Transition cancelled; lifecycle events still fire below. */ }
                         catch (Exception ex)
@@ -1263,6 +1405,11 @@ namespace Avalonia.Controls
                         {
                             SetCurrentValue(IsModalVisibleProperty, false);
                             SetCurrentValue(ModalContentProperty, (object?)null);
+                            if (ReferenceEquals(_currentModalTransition, popCts2))
+                            {
+                                _currentModalTransition = null;
+                                popCts2.Dispose();
+                            }
                         }
                     }
                     else
@@ -1272,7 +1419,6 @@ namespace Avalonia.Controls
                     }
                 }
 
-                var revealedPage = _modalStack.Count > 0 ? (Page?)_modalStack.Peek() : CurrentPage;
                 modal.SendNavigatedFrom(new NavigatedFromEventArgs(revealedPage, NavigationType.PopModal));
                 revealedPage?.SendNavigatedTo(new NavigatedToEventArgs(modal, NavigationType.PopModal));
 
@@ -1281,7 +1427,7 @@ namespace Avalonia.Controls
             }
             finally
             {
-                _isNavigating = false;
+                SetAndRaise(IsNavigatingProperty, ref _isNavigating, false);
             }
         }
 
@@ -1290,15 +1436,41 @@ namespace Avalonia.Controls
         /// </summary>
         public async Task<Page?> PopModalAsync(IPageTransition? transition)
         {
+            if (_isNavigating)
+                return null;
             _overrideTransition = transition;
             _hasOverrideTransition = true;
-            try { return await PopModalAsync(); }
-            finally { _hasOverrideTransition = false; _overrideTransition = null; }
+            try
+            {
+                return await PopModalAsync();
+            }
+            finally
+            {
+                _hasOverrideTransition = false;
+                _overrideTransition = null;
+            }
         }
 
         /// <summary>
         /// Pops all modal pages using <see cref="ModalTransition"/>.
         /// </summary>
+        /// <remarks>
+        /// All modals are dismissed in a single transition rather than one-by-one, so lifecycle
+        /// events differ from calling <see cref="PopModalAsync()"/> in a loop:
+        /// <list type="bullet">
+        ///   <item><description>
+        ///     <see cref="Page.Navigating"/> is consulted only on the topmost modal. Intermediate
+        ///     modals do not receive a cancellation opportunity. If the top modal cancels, the
+        ///     entire dismiss is aborted and no modals are popped.
+        ///   </description></item>
+        ///   <item><description>
+        ///     <see cref="Page.NavigatedFrom"/> fires on every dismissed modal in LIFO order.
+        ///   </description></item>
+        ///   <item><description>
+        ///     <see cref="Page.NavigatedTo"/> fires only on <see cref="Page.CurrentPage"/>.
+        ///   </description></item>
+        /// </list>
+        /// </remarks>
         public async Task PopAllModalsAsync()
         {
             if (_modalStack.Count == 0)
@@ -1306,9 +1478,18 @@ namespace Avalonia.Controls
             if (_isNavigating)
                 return;
 
-            _isNavigating = true;
+            SetAndRaise(IsNavigatingProperty, ref _isNavigating, true);
             try
             {
+                var topModal = _modalStack.Peek();
+                var revealedPage = CurrentPage;
+
+                var navigatingArgs = new NavigatingFromEventArgs(revealedPage, NavigationType.PopModal);
+                await topModal.SendNavigatingAsync(navigatingArgs);
+
+                if (navigatingArgs.Cancel)
+                    return;
+
                 var effectiveModalTransition = _hasOverrideTransition ? _overrideTransition : ModalTransition;
                 _hasOverrideTransition = false;
                 _overrideTransition = null;
@@ -1317,10 +1498,11 @@ namespace Avalonia.Controls
                 {
                     _currentModalTransition?.Cancel();
                     _currentModalTransition?.Dispose();
-                    _currentModalTransition = new CancellationTokenSource();
+                    var allModalsCts = new CancellationTokenSource();
+                    _currentModalTransition = allModalsCts;
                     try
                     {
-                        await effectiveModalTransition.Start(_modalPresenter, null, forward: false, _currentModalTransition.Token);
+                        await effectiveModalTransition.Start(_modalPresenter, null, forward: false, allModalsCts.Token);
                     }
                     catch (OperationCanceledException) { /* Transition cancelled; lifecycle events still fire below. */ }
                     catch (Exception ex)
@@ -1328,13 +1510,19 @@ namespace Avalonia.Controls
                         Logger.TryGet(LogEventLevel.Error, LogArea.Control)
                             ?.Log(this, "Modal transition threw an unhandled exception: {Exception}", ex);
                     }
+                    finally
+                    {
+                        if (ReferenceEquals(_currentModalTransition, allModalsCts))
+                        {
+                            _currentModalTransition = null;
+                            allModalsCts.Dispose();
+                        }
+                    }
                 }
 
                 SetCurrentValue(ModalContentProperty, (object?)null);
                 SetCurrentValue(IsModalVisibleProperty, false);
 
-                Page? topModal = _modalStack.Count > 0 ? _modalStack.Peek() : null;
-
                 while (_modalStack.Count > 0)
                 {
                     var modal = _modalStack.Pop();
@@ -1346,82 +1534,74 @@ namespace Avalonia.Controls
                 }
                 _cachedModalStack = null;
 
-                var newCurrentPage = CurrentPage;
-                newCurrentPage?.SendNavigatedTo(new NavigatedToEventArgs(topModal, NavigationType.PopModal));
+                revealedPage?.SendNavigatedTo(new NavigatedToEventArgs(topModal, NavigationType.PopModal));
             }
             finally
             {
-                _isNavigating = false;
+                SetAndRaise(IsNavigatingProperty, ref _isNavigating, false);
             }
         }
 
         /// <summary>
         /// Pops all modal pages using <paramref name="transition"/>.
         /// </summary>
+        /// <inheritdoc cref="PopAllModalsAsync()"/>
         public async Task PopAllModalsAsync(IPageTransition? transition)
         {
+            if (_isNavigating)
+                return;
             _overrideTransition = transition;
             _hasOverrideTransition = true;
-            try { await PopAllModalsAsync(); }
-            finally { _hasOverrideTransition = false; _overrideTransition = null; }
+            try
+            {
+                await PopAllModalsAsync();
+            }
+            finally
+            {
+                _hasOverrideTransition = false;
+                _overrideTransition = null;
+            }
         }
 
         /// <summary>
         /// Removes a page from the navigation stack without animation.
         /// </summary>
+        /// <remarks>
+        /// If a navigation transition is already in progress (<see cref="IsNavigating"/> is
+        /// <see langword="true"/>), this call is a no-op: the page is not removed and no events
+        /// are raised.
+        /// </remarks>
         public void RemovePage(Page page)
         {
             ArgumentNullException.ThrowIfNull(page);
             if (_isNavigating)
                 return;
 
-            if (Pages is Stack<Page> stack)
+            if (_navigationStack.Count > 0 && ReferenceEquals(_navigationStack.Peek(), page))
             {
-                if (stack.Count > 0 && ReferenceEquals(stack.Peek(), page))
-                {
-                    var old = ExecutePopCore();
-                    if (old != null)
-                        SendPopLifecycleEvents(old, NavigationType.Pop);
-                    PageRemoved?.Invoke(this, new PageRemovedEventArgs(page));
-                    return;
-                }
-
-                bool found = false;
-                foreach (var p in stack)
-                    if (ReferenceEquals(p, page)) { found = true; break; }
-                if (!found)
-                    return;
-
-                var retained = new List<Page>(stack.Count - 1);
-                foreach (var p in stack)
+                var old = ExecutePopCore();
+                if (old != null)
                 {
-                    if (!ReferenceEquals(p, page))
-                        retained.Add(p);
+                    var newCurrentPage = CurrentPage;
+                    old.SendNavigatedFrom(new NavigatedFromEventArgs(newCurrentPage, NavigationType.Remove));
+                    newCurrentPage?.SendNavigatedTo(new NavigatedToEventArgs(old, NavigationType.Remove));
                 }
-                stack.Clear();
-                for (int i = retained.Count - 1; i >= 0; i--)
-                    stack.Push(retained[i]);
+                PageRemoved?.Invoke(this, new PageRemovedEventArgs(page));
+                return;
             }
-            else if (Pages is IList<Page> list)
-            {
-                int idx = -1;
-                for (int i = 0; i < list.Count; i++)
-                    if (ReferenceEquals(list[i], page)) { idx = i; break; }
-                if (idx < 0)
-                    return;
 
-                if (idx == list.Count - 1)
-                {
-                    var old = ExecutePopCore();
-                    if (old != null)
-                        SendPopLifecycleEvents(old, NavigationType.Pop);
-                    PageRemoved?.Invoke(this, new PageRemovedEventArgs(page));
-                    return;
-                }
+            if (!_pageSet.Contains(page))
+                return;
 
-                list.RemoveAt(idx);
+            var retained = new List<Page>(_navigationStack.Count - 1);
+            foreach (var p in _navigationStack)
+            {
+                if (!ReferenceEquals(p, page))
+                    retained.Add(p);
             }
-            else return;
+            _navigationStack.Clear();
+            for (int i = retained.Count - 1; i >= 0; i--)
+                _navigationStack.Push(retained[i]);
 
             _pageSet.Remove(page);
 
@@ -1431,8 +1611,7 @@ namespace Avalonia.Controls
             page.SetInNavigationPage(false);
             page.SafeAreaPadding = default;
 
-            if (Pages is not INotifyCollectionChanged)
-                LogicalChildren.Remove(page);
+            LogicalChildren.Remove(page);
 
             InvalidateNavigationStackCache();
             UpdateIsBackButtonEffectivelyVisible();
@@ -1443,6 +1622,11 @@ namespace Avalonia.Controls
         /// <summary>
         /// Inserts a page into the stack before the specified page.
         /// </summary>
+        /// <remarks>
+        /// If a navigation transition is already in progress (<see cref="IsNavigating"/> is
+        /// <see langword="true"/>), this call is a no-op: the page is not inserted and no events
+        /// are raised.
+        /// </remarks>
         public void InsertPage(Page page, Page before)
         {
             ArgumentNullException.ThrowIfNull(page);
@@ -1450,52 +1634,35 @@ namespace Avalonia.Controls
             if (_isNavigating)
                 return;
 
-            if (_pageSet.Contains(page))
-                throw new InvalidOperationException("The page is already in the navigation stack.");
-
-            bool inserted = false;
+            ThrowIfPageIsAlreadyPresent(page);
 
-            if (Pages is Stack<Page> stack)
+            var arr = _navigationStack.ToArray();
+            int beforeIdx = -1;
+            for (int i = 0; i < arr.Length; i++)
             {
-                var arr = stack.ToArray();
-                int beforeIdx = -1;
-                for (int i = 0; i < arr.Length; i++)
-                    if (ReferenceEquals(arr[i], before)) { beforeIdx = i; break; }
-                if (beforeIdx < 0)
-                    return;
-
-                stack.Clear();
-                for (int i = arr.Length - 1; i >= 0; i--)
+                if (ReferenceEquals(arr[i], before))
                 {
-                    if (i == beforeIdx)
-                        stack.Push(page);
-                    stack.Push(arr[i]);
+                    beforeIdx = i;
+                    break;
                 }
-
-                inserted = true;
             }
-            else if (Pages is IList<Page> list)
-            {
-                int beforeIdx = -1;
-                for (int i = 0; i < list.Count; i++)
-                    if (ReferenceEquals(list[i], before)) { beforeIdx = i; break; }
-                if (beforeIdx < 0)
-                    return;
+            if (beforeIdx < 0)
+                throw new InvalidOperationException("The 'before' page is not in the navigation stack.");
 
-                list.Insert(beforeIdx, page);
-                inserted = true;
+            _navigationStack.Clear();
+            for (int i = arr.Length - 1; i >= 0; i--)
+            {
+                if (i == beforeIdx)
+                    _navigationStack.Push(page);
+                _navigationStack.Push(arr[i]);
             }
 
-            if (!inserted)
-                return;
-
             _pageSet.Add(page);
             page.Navigation = this;
             page.SetInNavigationPage(true);
             page.SafeAreaPadding = SafeAreaPadding;
 
-            if (Pages is not System.Collections.Specialized.INotifyCollectionChanged)
-                LogicalChildren.Add(page);
+            LogicalChildren.Add(page);
 
             InvalidateNavigationStackCache();
             UpdateIsBackButtonEffectivelyVisible();
@@ -1506,14 +1673,25 @@ namespace Avalonia.Controls
         /// <summary>
         /// Replaces the top page with <paramref name="page"/> using <see cref="PageTransition"/>.
         /// </summary>
+        /// <remarks>
+        /// If a navigation transition is already in progress (<see cref="IsNavigating"/> is <see langword="true"/>),
+        /// the call returns immediately without modifying the stack and without raising any events.
+        /// </remarks>
         public async Task ReplaceAsync(Page page)
         {
             ArgumentNullException.ThrowIfNull(page);
-            if (StackDepth == 0) { await PushAsync(page); return; }
+            if (StackDepth == 0)
+            {
+                await PushAsync(page);
+                return;
+            }
+            if (ReferenceEquals(page, CurrentPage))
+                return;
             if (_isNavigating)
                 return;
+            ThrowIfPageIsAlreadyPresent(page);
 
-            _isNavigating = true;
+            SetAndRaise(IsNavigatingProperty, ref _isNavigating, true);
             try
             {
                 var previousPage = CurrentPage;
@@ -1527,10 +1705,22 @@ namespace Avalonia.Controls
                 }
 
                 ExecuteReplaceCore(page, previousPage);
+
+                await AwaitPageTransitionAsync();
+
+                if (previousPage != null)
+                {
+                    previousPage.Navigation = null;
+                    previousPage.SetInNavigationPage(false);
+                    previousPage.SafeAreaPadding = default;
+                    previousPage.SendNavigatedFrom(new NavigatedFromEventArgs(page, NavigationType.Replace));
+                }
+
+                page.SendNavigatedTo(new NavigatedToEventArgs(previousPage, NavigationType.Replace));
             }
             finally
             {
-                _isNavigating = false;
+                SetAndRaise(IsNavigatingProperty, ref _isNavigating, false);
             }
         }
 
@@ -1539,10 +1729,19 @@ namespace Avalonia.Controls
         /// </summary>
         public async Task ReplaceAsync(Page page, IPageTransition? transition)
         {
+            if (_isNavigating)
+                return;
             _overrideTransition = transition;
             _hasOverrideTransition = true;
-            try { await ReplaceAsync(page); }
-            finally { _hasOverrideTransition = false; _overrideTransition = null; }
+            try
+            {
+                await ReplaceAsync(page);
+            }
+            finally
+            {
+                _hasOverrideTransition = false;
+                _overrideTransition = null;
+            }
         }
 
         // navigationType is intentionally unused; lifecycle events are fired in each navigation
@@ -1557,16 +1756,7 @@ namespace Avalonia.Controls
             _hasOverrideTransition = false;
             _overrideTransition = null;
 
-            Page? page = null;
-            if (Pages is Stack<Page> pages)
-            {
-                pages.TryPeek(out page);
-            }
-            else if (Pages is IList<Page> list)
-            {
-                if (list.Count > 0)
-                    page = list[list.Count - 1];
-            }
+            _navigationStack.TryPeek(out var page);
 
             if (_contentHost != null && _pagePresenter != null && _pageBackPresenter != null)
             {
@@ -1659,6 +1849,9 @@ namespace Avalonia.Controls
             _barHeightSub?.Dispose();
             _barHeightSub = null;
 
+            _backButtonContentSub?.Dispose();
+            _backButtonContentSub = null;
+
             if (page != null)
             {
                 _hasNavigationBarSub = page.GetObservable(HasNavigationBarProperty)
@@ -1672,6 +1865,9 @@ namespace Avalonia.Controls
 
                 _barHeightSub = page.GetObservable(BarHeightOverrideProperty)
                     .Subscribe(new AnonymousObserver<double?>(_ => UpdateEffectiveBarHeight()));
+
+                _backButtonContentSub = page.GetObservable(BackButtonContentProperty)
+                    .Subscribe(new AnonymousObserver<object?>(_ => UpdateBackButtonContent()));
             }
 
             UpdateIsNavBarEffectivelyVisible();
@@ -1682,7 +1878,7 @@ namespace Avalonia.Controls
             UpdateContentSafeAreaPadding();
             UpdateIsBackButtonEffectivelyVisible();
             UpdateIsBackButtonEffectivelyEnabled();
-            UpdateDrawerToggleIcon();
+            UpdateBackButtonContent();
         }
 
         private async Task RunPageTransitionAsync(
@@ -1741,47 +1937,25 @@ namespace Avalonia.Controls
         {
             Page? removed = null;
 
-            if (Pages is Stack<Page> pagesStack && pagesStack.Count > 0)
+            if (_navigationStack.Count > 0)
             {
-                removed = pagesStack.Pop();
+                removed = _navigationStack.Pop();
                 _pageSet.Remove(removed);
             }
-            else if (Pages is IList<Page> pagesList && pagesList.Count > 0)
-            {
-                removed = pagesList[pagesList.Count - 1];
-                _pageSet.Remove(removed);
-                pagesList.RemoveAt(pagesList.Count - 1);
-            }
-
-            if (Pages is Stack<Page> pushStack)
-                pushStack.Push(page);
-            else if (Pages is IList<Page> pushList)
-                pushList.Add(page);
 
+            _navigationStack.Push(page);
             _pageSet.Add(page);
             InvalidateNavigationStackCache();
 
-            if (Pages is not INotifyCollectionChanged)
-            {
-                if (removed is ILogical removedLogical)
-                    LogicalChildren.Remove(removedLogical);
-                if (page is ILogical addedLogical)
-                    LogicalChildren.Add(addedLogical);
-            }
+            if (removed is ILogical removedLogical)
+                LogicalChildren.Remove(removedLogical);
+            if (page is ILogical addedLogical)
+                LogicalChildren.Add(addedLogical);
 
             page.Navigation = this;
             page.SetInNavigationPage(true);
 
             UpdateActivePage();
-
-            if (replacedPage != null)
-            {
-                replacedPage.Navigation = null;
-                replacedPage.SetInNavigationPage(false);
-                replacedPage.SendNavigatedFrom(new NavigatedFromEventArgs(page, NavigationType.Replace));
-            }
-
-            page.SendNavigatedTo(new NavigatedToEventArgs(replacedPage, NavigationType.Replace));
         }
 
         private void SwapModalPresenters()
@@ -1797,6 +1971,36 @@ namespace Avalonia.Controls
 
         private void InvalidateNavigationStackCache() => _cachedNavigationStack = null;
 
+        private void RestoreNavigationState()
+        {
+            foreach (var page in NavigationStack)
+            {
+                page.Navigation = this;
+                page.SetInNavigationPage(true);
+            }
+
+            foreach (var modal in _modalStack)
+            {
+                modal.Navigation = this;
+                modal.SetInNavigationPage(true);
+            }
+        }
+
+        private void ClearNavigationState()
+        {
+            foreach (var modal in _modalStack)
+            {
+                modal.Navigation = null;
+                modal.SetInNavigationPage(false);
+            }
+
+            foreach (var page in NavigationStack)
+            {
+                page.Navigation = null;
+                page.SetInNavigationPage(false);
+            }
+        }
+
         internal void UpdateIsBackButtonEffectivelyVisible()
         {
             var depth = StackDepth;
@@ -1839,31 +2043,34 @@ namespace Avalonia.Controls
         {
             _drawerPage = drawerPage;
             UpdateIsBackButtonEffectivelyVisible();
-            UpdateDrawerToggleIcon();
+            UpdateBackButtonContent();
         }
 
-
-        private void UpdateDrawerToggleIcon()
+        private void UpdateBackButtonContent()
         {
-            if (_drawerPage == null || CurrentPage == null)
-                return;
+            object? content = CurrentPage != null ? GetBackButtonContent(CurrentPage) : null;
 
-            bool showToggle = _drawerPage.DrawerBehavior != DrawerBehavior.Locked
+            bool showToggle = _drawerPage != null
+                           && CurrentPage != null
+                           && StackDepth <= 1
+                           && _drawerPage.DrawerBehavior != DrawerBehavior.Locked
                            && _drawerPage.DrawerBehavior != DrawerBehavior.Disabled;
 
-            if (StackDepth <= 1 && showToggle)
+            if (content is null
+                && showToggle
+                && this.TryFindResource("NavigationPageMenuIcon", out var iconData)
+                && iconData is StreamGeometry geometry)
             {
-                if (GetBackButtonContent(CurrentPage) is null
-                    && this.TryFindResource("NavigationPageMenuIcon", out var iconData)
-                    && iconData is StreamGeometry geometry)
-                {
-                    SetBackButtonContent(CurrentPage, new PathIcon { Data = geometry });
-                }
+                content = new PathIcon { Data = geometry };
             }
-            else
+
+            if (_backButtonDefaultIcon != null)
+                _backButtonDefaultIcon.IsVisible = content is null;
+
+            if (_backButtonContentPresenter != null)
             {
-                if (GetBackButtonContent(CurrentPage) is PathIcon)
-                    SetBackButtonContent(CurrentPage, null);
+                _backButtonContentPresenter.Content = content;
+                _backButtonContentPresenter.IsVisible = content is not null;
             }
 
             UpdateBackButtonAccessibility();
@@ -1871,25 +2078,38 @@ namespace Avalonia.Controls
 
         private void OnSwipeGesture(object? sender, SwipeGestureEventArgs e)
         {
-            if (!IsGestureEnabled || StackDepth <= 1 || _isNavigating || _modalStack.Count > 0)
+            if (!IsGestureEnabled || StackDepth <= 1 || _isNavigating || _modalStack.Count > 0 || e.Id == _lastSwipeGestureId)
+                return;
+
+            bool inEdge = IsRtl
+                ? _swipeStartPoint.X >= Bounds.Width - EdgeGestureWidth
+                : _swipeStartPoint.X <= EdgeGestureWidth;
+            if (!inEdge)
                 return;
+
             bool shouldPop = IsRtl
                 ? e.SwipeDirection == SwipeDirection.Left
                 : e.SwipeDirection == SwipeDirection.Right;
             if (shouldPop)
             {
                 e.Handled = true;
-                _ = PopAsync();
+                _lastSwipeGestureId = e.Id;
+                _ = PopAsync(); // gesture handler cannot be async; fire-and-forget is intentional
             }
         }
 
+        private void OnSwipePointerPressed(object? sender, PointerPressedEventArgs e)
+        {
+            _swipeStartPoint = e.GetPosition(this);
+        }
+
         protected override void OnKeyDown(KeyEventArgs e)
         {
             base.OnKeyDown(e);
 
             if (e.Key == Key.Left && e.KeyModifiers == KeyModifiers.Alt && StackDepth > 1)
             {
-                _ = PopAsync();
+                _ = PopAsync(); // key handler cannot be async; fire-and-forget is intentional
                 e.Handled = true;
             }
         }
diff --git a/src/Avalonia.Controls/Page/Page.cs b/src/Avalonia.Controls/Page/Page.cs
index 48b7bd1b0c..a12ce76ddf 100644
--- a/src/Avalonia.Controls/Page/Page.cs
+++ b/src/Avalonia.Controls/Page/Page.cs
@@ -2,6 +2,7 @@ using System;
 using System.Threading.Tasks;
 using Avalonia.Automation;
 using Avalonia.Controls.Primitives;
+using Avalonia.Controls.Templates;
 using Avalonia.Interactivity;
 
 namespace Avalonia.Controls
@@ -31,6 +32,12 @@ namespace Avalonia.Controls
         public static readonly StyledProperty<object?> IconProperty =
             AvaloniaProperty.Register<Page, object?>(nameof(Icon));
 
+        /// <summary>
+        /// Defines the <see cref="IconTemplate"/> property.
+        /// </summary>
+        public static readonly StyledProperty<IDataTemplate?> IconTemplateProperty =
+            AvaloniaProperty.Register<Page, IDataTemplate?>(nameof(IconTemplate));
+
         /// <summary>
         /// Defines the <see cref="CurrentPage"/> property.
         /// </summary>
@@ -94,6 +101,15 @@ namespace Avalonia.Controls
             set => SetValue(IconProperty, value);
         }
 
+        /// <summary>
+        /// Gets or sets the data template used to display the icon.
+        /// </summary>
+        public IDataTemplate? IconTemplate
+        {
+            get => GetValue(IconTemplateProperty);
+            set => SetValue(IconTemplateProperty, value);
+        }
+
         /// <summary>
         /// Gets or sets the safe-area padding applied to this page's content.
         /// </summary>
@@ -147,6 +163,14 @@ namespace Avalonia.Controls
         /// <summary>
         /// Occurs when the page is about to be navigated from.
         /// </summary>
+        /// <remarks>
+        /// Each subscriber is awaited in turn. Set <see cref="NavigatingFromEventArgs.Cancel"/> to
+        /// <see langword="true"/> to abort the navigation; remaining subscribers are not invoked once
+        /// cancellation is requested. If a subscriber throws an exception, the exception propagates
+        /// to the calling navigation method (such as <see cref="NavigationPage.PushAsync(Page)"/>)
+        /// and the navigation is aborted. Subscribers should use try/catch internally if they need
+        /// guaranteed cancellation semantics regardless of errors.
+        /// </remarks>
         public event Func<NavigatingFromEventArgs, Task>? Navigating;
 
         /// <summary>
@@ -162,6 +186,11 @@ namespace Avalonia.Controls
         /// <summary>
         /// Called when the page is about to be navigated from.
         /// </summary>
+        /// <remarks>
+        /// Setting <see cref="NavigatingFromEventArgs.Cancel"/> to <see langword="true"/> here
+        /// prevents the <see cref="Navigating"/> async handlers from running and aborts the
+        /// navigation. This method is called before the <see cref="Navigating"/> event.
+        /// </remarks>
         protected virtual void OnNavigatingFrom(NavigatingFromEventArgs args) { }
 
         /// <summary>
@@ -181,11 +210,18 @@ namespace Avalonia.Controls
         {
             OnNavigatingFrom(args);
 
+            if (args.Cancel)
+                return;
+
             var navigating = Navigating;
             if (navigating != null)
             {
                 foreach (Func<NavigatingFromEventArgs, Task> handler in navigating.GetInvocationList())
+                {
                     await handler(args);
+                    if (args.Cancel)
+                        return;
+                }
             }
         }
 
@@ -201,7 +237,7 @@ namespace Avalonia.Controls
                 UpdateContentSafeAreaPadding();
 
             if (change.Property == HeaderProperty)
-                AutomationProperties.SetName(this, change.NewValue as string ?? string.Empty);
+                AutomationProperties.SetName(this, change.GetNewValue<object?>() as string ?? string.Empty);
         }
 
         protected override void OnLoaded(RoutedEventArgs e)
diff --git a/src/Avalonia.Controls/Page/PageNavigationHost.cs b/src/Avalonia.Controls/Page/PageNavigationHost.cs
index 06ef2d697a..025a8166ab 100644
--- a/src/Avalonia.Controls/Page/PageNavigationHost.cs
+++ b/src/Avalonia.Controls/Page/PageNavigationHost.cs
@@ -129,12 +129,14 @@ namespace Avalonia.Controls
 
         private void ContentPresenter_PropertyChanged(object? sender, AvaloniaPropertyChangedEventArgs e)
         {
-            if (e.Property == ContentPresenter.ChildProperty
-                && e.NewValue is Page page
-                && _insetManager != null)
-            {
-                page.SafeAreaPadding = _insetManager.SafeAreaPadding;
-            }
+            if (e.Property != ContentPresenter.ChildProperty)
+                return;
+
+            if (e.GetOldValue<object?>() is Page oldPage)
+                oldPage.SafeAreaPadding = default;
+
+            if (e.GetNewValue<object?>() is Page newPage && _insetManager != null)
+                newPage.SafeAreaPadding = _insetManager.SafeAreaPadding;
         }
 
         private void TopLevel_BackRequested(object? sender, RoutedEventArgs e)
diff --git a/src/Avalonia.Controls/Page/PageSelectionChangedEventArgs.cs b/src/Avalonia.Controls/Page/PageSelectionChangedEventArgs.cs
index e3759b615b..e39596cccc 100644
--- a/src/Avalonia.Controls/Page/PageSelectionChangedEventArgs.cs
+++ b/src/Avalonia.Controls/Page/PageSelectionChangedEventArgs.cs
@@ -1,18 +1,20 @@
-using System;
+using Avalonia.Interactivity;
 
 namespace Avalonia.Controls
 {
     /// <summary>
     /// Provides data for a page selection-changed event.
     /// </summary>
-    public class PageSelectionChangedEventArgs : EventArgs
+    public class PageSelectionChangedEventArgs : RoutedEventArgs
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="PageSelectionChangedEventArgs"/> class.
         /// </summary>
+        /// <param name="routedEvent">The routed event associated with this event args instance.</param>
         /// <param name="previousPage">The page that was selected before the change, or <see langword="null"/> if no page was selected.</param>
         /// <param name="currentPage">The page that is now selected, or <see langword="null"/> if selection was cleared.</param>
-        public PageSelectionChangedEventArgs(Page? previousPage, Page? currentPage)
+        public PageSelectionChangedEventArgs(RoutedEvent? routedEvent, Page? previousPage, Page? currentPage)
+            : base(routedEvent)
         {
             PreviousPage = previousPage;
             CurrentPage = currentPage;
diff --git a/src/Avalonia.Controls/Page/SelectingMultiPage.cs b/src/Avalonia.Controls/Page/SelectingMultiPage.cs
index 7f94a86464..9963a0ec2b 100644
--- a/src/Avalonia.Controls/Page/SelectingMultiPage.cs
+++ b/src/Avalonia.Controls/Page/SelectingMultiPage.cs
@@ -1,4 +1,6 @@
 using System;
+using System.Collections.Generic;
+using Avalonia.Interactivity;
 
 namespace Avalonia.Controls
 {
@@ -24,6 +26,14 @@ namespace Avalonia.Controls
                 nameof(SelectedPage),
                 o => o._selectedPage);
 
+        /// <summary>
+        /// Defines the <see cref="SelectionChanged"/> routed event.
+        /// </summary>
+        public static readonly RoutedEvent<PageSelectionChangedEventArgs> SelectionChangedEvent =
+            RoutedEvent.Register<SelectingMultiPage, PageSelectionChangedEventArgs>(
+                nameof(SelectionChanged),
+                RoutingStrategies.Bubble);
+
         private int _selectedIndex = -1;
         private Page? _selectedPage;
 
@@ -44,11 +54,21 @@ namespace Avalonia.Controls
         /// <summary>
         /// Raised when the selected page changes.
         /// </summary>
-        public event EventHandler<PageSelectionChangedEventArgs>? SelectionChanged;
+        public event EventHandler<PageSelectionChangedEventArgs>? SelectionChanged
+        {
+            add => AddHandler(SelectionChangedEvent, value);
+            remove => RemoveHandler(SelectionChangedEvent, value);
+        }
 
         /// <summary>
         /// Commits a selection change and fires lifecycle events on the outgoing and incoming pages.
         /// </summary>
+        /// <remarks>
+        /// Raises <see cref="SelectionChanged"/>, then <see cref="Page.NavigatedFrom"/> on the outgoing
+        /// page and <see cref="Page.NavigatedTo"/> on the incoming page. If the incoming and outgoing
+        /// pages are the same object no events are fired. Subclasses should call this method rather
+        /// than modifying selection state directly.
+        /// </remarks>
         protected void CommitSelection(int newIndex, Page? newPage, NavigationType navigationType = NavigationType.Replace)
         {
             var previousPage = _selectedPage;
@@ -57,7 +77,7 @@ namespace Avalonia.Controls
             SetCurrentValue(CurrentPageProperty, newPage);
             if (!ReferenceEquals(previousPage, newPage))
             {
-                SelectionChanged?.Invoke(this, new PageSelectionChangedEventArgs(previousPage, newPage));
+                RaiseEvent(new PageSelectionChangedEventArgs(SelectionChangedEvent, previousPage, newPage));
 
                 if (previousPage != null)
                 {
@@ -83,5 +103,28 @@ namespace Avalonia.Controls
         {
             SetAndRaise(SelectedIndexProperty, ref _selectedIndex, index);
         }
+
+        /// <summary>
+        /// Returns the page at <paramref name="index"/> from <see cref="MultiPage.Pages"/>,
+        /// or <see langword="null"/> if the index is out of range.
+        /// </summary>
+        protected Page? ResolvePageAtIndex(int index)
+        {
+            if (Pages is IList<Page> list)
+                return (uint)index < (uint)list.Count ? list[index] : null;
+
+            if (Pages != null)
+            {
+                int i = 0;
+                foreach (var page in Pages)
+                {
+                    if (i == index)
+                        return page;
+                    i++;
+                }
+            }
+
+            return null;
+        }
     }
 }
diff --git a/src/Avalonia.Controls/Page/TabbedPage.cs b/src/Avalonia.Controls/Page/TabbedPage.cs
index 6a5422b365..69815eb56a 100644
--- a/src/Avalonia.Controls/Page/TabbedPage.cs
+++ b/src/Avalonia.Controls/Page/TabbedPage.cs
@@ -6,13 +6,10 @@ using Avalonia.Automation.Peers;
 using Avalonia.Collections;
 using Avalonia.Controls.Metadata;
 using Avalonia.Controls.Primitives;
-using Avalonia.Controls.Shapes;
 using Avalonia.Controls.Templates;
 using Avalonia.Input;
 using Avalonia.Input.GestureRecognizers;
-using Avalonia.Layout;
 using Avalonia.LogicalTree;
-using Avalonia.Media;
 using Avalonia.Threading;
 
 namespace Avalonia.Controls
@@ -24,8 +21,11 @@ namespace Avalonia.Controls
     public class TabbedPage : SelectingMultiPage
     {
         private TabControl? _tabControl;
+        private bool _ignoringDisabledSelection;
         private readonly Dictionary<TabItem, Page> _containerPageMap = new();
         private readonly Dictionary<Page, TabItem> _pageContainerMap = new();
+        private readonly HashSet<Page> _templateCreatedPages = new(ReferenceEqualityComparer.Instance);
+        private int _lastSwipeGestureId;
         private readonly SwipeGestureRecognizer _swipeRecognizer = new SwipeGestureRecognizer
         {
             IsEnabled = false
@@ -83,15 +83,21 @@ namespace Avalonia.Controls
         public static void SetIsTabEnabled(Page page, bool value) =>
             page.SetValue(IsTabEnabledProperty, value);
 
+        private static readonly bool s_isMobilePlatform = OperatingSystem.IsAndroid() || OperatingSystem.IsIOS();
+
+        static TabbedPage()
+        {
+            FocusableProperty.OverrideDefaultValue<TabbedPage>(true);
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="TabbedPage"/> class.
         /// </summary>
         public TabbedPage()
         {
             SetCurrentValue(PagesProperty, new AvaloniaList<Page>());
-            Focusable = true;
             GestureRecognizers.Add(_swipeRecognizer);
-            AddHandler(InputElement.SwipeGestureEvent, OnSwipeGesture);
+            UpdateSwipeRecognizerAxes();
         }
 
         /// <summary>
@@ -115,6 +121,11 @@ namespace Avalonia.Controls
         /// <summary>
         /// Gets or sets whether swipe gestures can be used to navigate between tabs.
         /// </summary>
+        /// <remarks>
+        /// Defaults to <see langword="false"/> because tab strips do not respond to swipe gestures
+        /// on most platforms (iOS, desktop). Enable this only when the host platform and the
+        /// content inside each tab page do not conflict with horizontal swipe input.
+        /// </remarks>
         public bool IsGestureEnabled
         {
             get => GetValue(IsGestureEnabledProperty);
@@ -139,6 +150,18 @@ namespace Avalonia.Controls
             set => SetValue(IndicatorTemplateProperty, value);
         }
 
+        protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
+        {
+            base.OnAttachedToVisualTree(e);
+            AddHandler(InputElement.SwipeGestureEvent, OnSwipeGesture);
+        }
+
+        protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e)
+        {
+            base.OnDetachedFromVisualTree(e);
+            RemoveHandler(InputElement.SwipeGestureEvent, OnSwipeGesture);
+        }
+
         protected override void ApplySelectedIndex(int index)
         {
             if (_tabControl != null)
@@ -160,13 +183,10 @@ namespace Avalonia.Controls
                 _tabControl.SelectionChanged -= TabControl_SelectionChanged;
                 _tabControl.ContainerPrepared -= OnContainerPrepared;
                 _tabControl.ContainerClearing -= OnContainerClearing;
-
-                foreach (var page in _containerPageMap.Values)
-                    page.PropertyChanged -= OnPagePropertyChanged;
-                _containerPageMap.Clear();
-                _pageContainerMap.Clear();
             }
 
+            ClearContainerPages();
+
             _tabControl = e.NameScope.Find<TabControl>("PART_TabControl");
 
             if (_tabControl != null)
@@ -174,6 +194,7 @@ namespace Avalonia.Controls
                 _tabControl.SelectionChanged += TabControl_SelectionChanged;
                 _tabControl.ContainerPrepared += OnContainerPrepared;
                 _tabControl.ContainerClearing += OnContainerClearing;
+                _tabControl.ItemsSource = (IEnumerable?)ItemsSource ?? Pages;
 
                 if (SelectedIndex >= 0)
                     _tabControl.SelectedIndex = SelectedIndex;
@@ -185,7 +206,10 @@ namespace Avalonia.Controls
                 ApplyIndicatorTemplate();
                 UpdateActivePage();
 
-                Dispatcher.UIThread.Post(SyncAllTabEnabledStates, DispatcherPriority.Loaded);
+                var capturedTabControl = _tabControl;
+                Dispatcher.UIThread.Post(
+                    () => SyncAllTabEnabledStates(capturedTabControl),
+                    DispatcherPriority.Loaded);
             }
         }
 
@@ -194,13 +218,22 @@ namespace Avalonia.Controls
             base.OnPropertyChanged(change);
 
             if (change.Property == TabPlacementProperty)
+            {
                 ApplyTabPlacement();
+                UpdateSwipeRecognizerAxes();
+            }
             else if (change.Property == PageTransitionProperty && _tabControl != null)
                 _tabControl.PageTransition = change.GetNewValue<IPageTransition?>();
             else if (change.Property == IndicatorTemplateProperty)
                 ApplyIndicatorTemplate();
             else if (change.Property == IsGestureEnabledProperty)
                 _swipeRecognizer.IsEnabled = change.GetNewValue<bool>();
+            else if (change.Property == ItemsSourceProperty && _tabControl != null)
+                _tabControl.ItemsSource = change.GetNewValue<IEnumerable?>() ?? Pages;
+            else if (change.Property == PagesProperty && ItemsSource == null && _tabControl != null)
+                _tabControl.ItemsSource = change.GetNewValue<IEnumerable<Page>?>();
+            else if (change.Property == PageTemplateProperty && ItemsSource != null && _tabControl != null)
+                RebuildTemplateCreatedPages();
         }
 
         private TabPlacement ResolveTabPlacement()
@@ -208,9 +241,7 @@ namespace Avalonia.Controls
             if (TabPlacement != TabPlacement.Auto)
                 return TabPlacement;
 
-            return OperatingSystem.IsAndroid() || OperatingSystem.IsIOS()
-                ? TabPlacement.Bottom
-                : TabPlacement.Top;
+            return s_isMobilePlatform ? TabPlacement.Bottom : TabPlacement.Top;
         }
 
         private void ApplyTabPlacement()
@@ -227,6 +258,14 @@ namespace Avalonia.Controls
             };
         }
 
+        private void UpdateSwipeRecognizerAxes()
+        {
+            var placement = ResolveTabPlacement();
+            var isHorizontal = placement == TabPlacement.Top || placement == TabPlacement.Bottom;
+            _swipeRecognizer.CanHorizontallySwipe = isHorizontal;
+            _swipeRecognizer.CanVerticallySwipe = !isHorizontal;
+        }
+
         private void ApplyIndicatorTemplate()
         {
             if (_tabControl == null)
@@ -235,15 +274,13 @@ namespace Avalonia.Controls
             _tabControl.IndicatorTemplate = IndicatorTemplate;
         }
 
-        private bool _ignoringDisabledSelection;
-
         private void TabControl_SelectionChanged(object? sender, SelectionChangedEventArgs e)
         {
             if (_ignoringDisabledSelection)
                 return;
 
             int newIndex = _tabControl!.SelectedIndex;
-            var newPage = _tabControl.SelectedItem as Page ?? ResolvePageAtIndex(newIndex);
+            var newPage = ResolvePageAtIndex(newIndex);
 
             if (newPage != null && !GetIsTabEnabled(newPage))
             {
@@ -263,51 +300,60 @@ namespace Avalonia.Controls
                 if (target == SelectedIndex)
                     return;
 
-                CommitSelection(target, ResolvePageAtIndex(target), NavigationType.Replace);
+                CommitSelectionIfResolved(target, NavigationType.Replace);
                 UpdateContentSafeAreaPadding();
                 return;
             }
 
-            CommitSelection(newIndex, newPage, NavigationType.Replace);
+            CommitSelectionIfResolved(newIndex, NavigationType.Replace);
             UpdateContentSafeAreaPadding();
         }
 
         private void OnContainerPrepared(object? sender, ContainerPreparedEventArgs e)
         {
-            if (e.Container is not TabItem tabItem) return;
-            if (Pages is not IList pages || e.Index >= pages.Count) return;
-
-            var item = pages[e.Index];
-            Page? page;
+            if (e.Container is not TabItem tabItem)
+                return;
 
-            if (item is Page directPage)
-            {
-                page = directPage;
-            }
-            else
-            {
-                // Data-template mode: build the page and use it directly as the tab's content.
-                page = PageTemplate?.Build(item) as Page;
-                if (page == null) return;
-                tabItem.Content = page;
-            }
+            var page = PreparePageForContainer(tabItem, e.Index);
+            if (page == null)
+                return;
 
             tabItem.IsEnabled = GetIsTabEnabled(page);
             tabItem.Header = page.Header;
-            tabItem.Icon = CreateIconControl(page.Icon);
+            tabItem.Icon = page.Icon;
+            tabItem.IconTemplate = page.IconTemplate;
 
-            _containerPageMap[tabItem] = page;
-            _pageContainerMap[page] = tabItem;
-            page.PropertyChanged += OnPagePropertyChanged;
+            if (e.Index == (_tabControl?.SelectedIndex ?? -1))
+                UpdateActivePage();
         }
 
         private void OnContainerClearing(object? sender, ContainerClearingEventArgs e)
         {
-            if (e.Container is TabItem tabItem && _containerPageMap.Remove(tabItem, out var page))
+            if (e.Container is TabItem tabItem)
+                ClearContainerPage(tabItem);
+        }
+
+        private void RebuildTemplateCreatedPages()
+        {
+            if (_tabControl == null || ItemsSource == null)
+                return;
+
+            for (int i = 0; i < _tabControl.ItemCount; i++)
             {
-                _pageContainerMap.Remove(page);
-                page.PropertyChanged -= OnPagePropertyChanged;
+                if (_tabControl.ContainerFromIndex(i) is not TabItem tabItem)
+                    continue;
+
+                var page = PreparePageForContainer(tabItem, i);
+                if (page == null)
+                    continue;
+
+                tabItem.IsEnabled = GetIsTabEnabled(page);
+                tabItem.Header = page.Header;
+                tabItem.Icon = page.Icon;
+                tabItem.IconTemplate = page.IconTemplate;
             }
+
+            UpdateActivePage();
         }
 
         private void OnPagePropertyChanged(object? sender, AvaloniaPropertyChangedEventArgs e)
@@ -318,7 +364,12 @@ namespace Avalonia.Controls
             if (e.Property == Page.IconProperty)
             {
                 if (_pageContainerMap.TryGetValue(page, out var tabItem))
-                    tabItem.Icon = CreateIconControl(page.Icon);
+                    tabItem.Icon = page.Icon;
+            }
+            else if (e.Property == Page.IconTemplateProperty)
+            {
+                if (_pageContainerMap.TryGetValue(page, out var tabItem))
+                    tabItem.IconTemplate = page.IconTemplate;
             }
             else if (e.Property == Page.HeaderProperty)
             {
@@ -331,118 +382,103 @@ namespace Avalonia.Controls
             }
         }
 
-        /// <summary>
-        /// Creates a visual control from a page icon value.
-        /// </summary>
-        internal static Control? CreateIconControl(object? icon)
-        {
-            Geometry? geometry = icon switch
-            {
-                Geometry g => g,
-                PathIcon pi => pi.Data,
-                DrawingImage { Drawing: GeometryDrawing { Geometry: { } gd } } => gd,
-                string s when !string.IsNullOrEmpty(s) => Geometry.Parse(s),
-                _ => null
-            };
-
-            if (geometry != null)
-            {
-                var path = new Path
-                {
-                    Data = geometry,
-                    Stretch = Stretch.Uniform,
-                    HorizontalAlignment = HorizontalAlignment.Center,
-                };
-
-                path.Bind(
-                    Path.FillProperty,
-                    path.GetObservable(Documents.TextElement.ForegroundProperty));
-
-                return path;
-            }
-
-            if (icon is IImage image)
-            {
-                return new Image
-                {
-                    HorizontalAlignment = HorizontalAlignment.Center,
-                    Source = image,
-                };
-            }
-
-            return null;
-        }
-
         private int FindNearestEnabledTab(int disabledIndex)
         {
-            if (Pages is not IList pages) return -1;
-            int count = pages.Count;
+            int count = GetTabCount();
             for (int dist = 1; dist < count; dist++)
             {
                 int p = disabledIndex - dist;
-                if (p >= 0 && pages[p] is Page pp && GetIsTabEnabled(pp)) return p;
+                if (p >= 0 && IsTabEnabledAtIndex(p))
+                    return p;
                 int n = disabledIndex + dist;
-                if (n < count && pages[n] is Page np && GetIsTabEnabled(np)) return n;
+                if (n < count && IsTabEnabledAtIndex(n))
+                    return n;
             }
 
             return -1;
         }
 
-        protected internal int FindNextEnabledTab(int start, int direction)
+        private protected int FindNextEnabledTab(int start, int direction)
         {
-            if (Pages is not IList pages) return -1;
-            int count = pages.Count;
+            int count = GetTabCount();
             int i = start;
             while (i >= 0 && i < count)
             {
-                if (pages[i] is Page page && GetIsTabEnabled(page)) return i;
+                if (IsTabEnabledAtIndex(i))
+                    return i;
                 i += direction;
             }
 
             return -1;
         }
 
-        private Page? ResolvePageAtIndex(int index)
+        internal int GetTabCount()
+        {
+            if (_tabControl != null)
+                return _tabControl.ItemCount;
+
+            var source = (IEnumerable?)ItemsSource ?? Pages;
+            if (source is ICollection collection)
+                return collection.Count;
+
+            if (source == null)
+                return 0;
+
+            int count = 0;
+            foreach (var _ in source)
+                count++;
+
+            return count;
+        }
+
+        private bool IsTabEnabledAtIndex(int index)
         {
             if (_tabControl?.ContainerFromIndex(index) is TabItem ti && _containerPageMap.TryGetValue(ti, out var p))
-                return p;
-            if (Pages is IList pages && (uint)index < (uint)pages.Count)
-                return pages[index] as Page;
-            return null;
+                return GetIsTabEnabled(p);
+            if (ResolvePageAtIndex(index) is Page page)
+                return GetIsTabEnabled(page);
+            return true;
         }
 
-        private void SyncTabEnabledState(Page page)
+        private new Page? ResolvePageAtIndex(int index)
         {
-            if (_tabControl == null || Pages is not IList pages)
-                return;
+            if (_tabControl?.ContainerFromIndex(index) is TabItem ti && _containerPageMap.TryGetValue(ti, out var p))
+                return p;
 
-            for (int i = 0; i < pages.Count; i++)
+            if (_tabControl != null)
             {
-                if (!ReferenceEquals(pages[i], page))
-                    continue;
+                var itemsView = _tabControl.ItemsView;
+                if ((uint)index < (uint)itemsView.Count)
+                    return itemsView[index] as Page;
+            }
 
-                if (_tabControl.ContainerFromIndex(i) is TabItem tabItem)
-                    tabItem.IsEnabled = GetIsTabEnabled(page);
+            if (_tabControl?.ContainerFromIndex(index) is TabItem { Content: Page page })
+                return page;
 
-                if (!GetIsTabEnabled(page) && i == _tabControl.SelectedIndex)
-                {
-                    int target = FindNearestEnabledTab(i);
-                    if (target >= 0 && target != i)
-                        _tabControl.SelectedIndex = target;
-                }
+            return base.ResolvePageAtIndex(index);
+        }
 
+        private void SyncTabEnabledState(Page page)
+        {
+            if (_tabControl == null || !_pageContainerMap.TryGetValue(page, out var tabItem))
                 return;
+
+            tabItem.IsEnabled = GetIsTabEnabled(page);
+
+            if (!GetIsTabEnabled(page) && ReferenceEquals(tabItem, _tabControl.ContainerFromIndex(_tabControl.SelectedIndex)))
+            {
+                int i = _tabControl.SelectedIndex;
+                int target = FindNearestEnabledTab(i);
+                if (target >= 0 && target != i)
+                    _tabControl.SelectedIndex = target;
             }
         }
 
-        private void SyncAllTabEnabledStates()
+        private void SyncAllTabEnabledStates(TabControl tabControl)
         {
-            if (_tabControl == null || Pages is not IList pages)
-                return;
-
-            for (int i = 0; i < pages.Count; i++)
+            for (int i = 0; i < tabControl.ItemCount; i++)
             {
-                if (_tabControl.ContainerFromIndex(i) is TabItem tabItem &&
+                if (tabControl.ContainerFromIndex(i) is TabItem tabItem &&
                     _containerPageMap.TryGetValue(tabItem, out var page))
                 {
                     tabItem.IsEnabled = GetIsTabEnabled(page);
@@ -455,11 +491,123 @@ namespace Avalonia.Controls
             if (_tabControl != null)
             {
                 int index = _tabControl.SelectedIndex;
-                CommitSelection(index, _tabControl.SelectedItem as Page ?? ResolvePageAtIndex(index), navigationType);
+                CommitSelectionIfResolved(index, navigationType);
                 UpdateContentSafeAreaPadding();
             }
         }
 
+        private Page? PreparePageForContainer(TabItem tabItem, int index)
+        {
+            ClearContainerPage(tabItem);
+
+            Page? page;
+
+            if (ItemsSource != null)
+            {
+                if (!TryGetItemAtIndex(index, out var item))
+                    return null;
+
+                page = PageTemplate?.Build(item) as Page;
+                tabItem.Content = page;
+
+                if (page == null)
+                    return null;
+
+                _templateCreatedPages.Add(page);
+                LogicalChildren.Add(page);
+            }
+            else
+            {
+                if (!TryGetItemAtIndex(index, out var item))
+                    return null;
+
+                page = item as Page;
+                if (page == null)
+                    return null;
+
+                tabItem.Content = page;
+            }
+
+            _containerPageMap[tabItem] = page;
+            _pageContainerMap[page] = tabItem;
+            page.PropertyChanged += OnPagePropertyChanged;
+
+            return page;
+        }
+
+        private void ClearContainerPages()
+        {
+            foreach (var page in _containerPageMap.Values)
+                page.PropertyChanged -= OnPagePropertyChanged;
+
+            foreach (var page in _templateCreatedPages)
+                LogicalChildren.Remove(page);
+
+            _containerPageMap.Clear();
+            _pageContainerMap.Clear();
+            _templateCreatedPages.Clear();
+        }
+
+        private void ClearContainerPage(TabItem tabItem)
+        {
+            if (!_containerPageMap.Remove(tabItem, out var page))
+                return;
+
+            _pageContainerMap.Remove(page);
+            page.PropertyChanged -= OnPagePropertyChanged;
+
+            if (_templateCreatedPages.Remove(page))
+                LogicalChildren.Remove(page);
+        }
+
+        private bool TryGetItemAtIndex(int index, out object? item)
+        {
+            if (_tabControl != null)
+            {
+                var itemsView = _tabControl.ItemsView;
+                if ((uint)index < (uint)itemsView.Count)
+                {
+                    item = itemsView[index];
+                    return true;
+                }
+            }
+
+            var source = (IEnumerable?)ItemsSource ?? Pages;
+            if (source != null)
+            {
+                int currentIndex = 0;
+                foreach (var candidate in source)
+                {
+                    if (currentIndex == index)
+                    {
+                        item = candidate;
+                        return true;
+                    }
+
+                    currentIndex++;
+                }
+            }
+
+            item = null;
+            return false;
+        }
+
+        private void CommitSelectionIfResolved(int index, NavigationType navigationType)
+        {
+            var page = ResolvePageAtIndex(index);
+
+            if (page == null &&
+                ItemsSource != null &&
+                index >= 0 &&
+                _tabControl?.ContainerFromIndex(index) == null)
+            {
+                StoreSelectedIndex(index);
+                return;
+            }
+
+            CommitSelection(index, page, navigationType);
+        }
+
         protected override void UpdateContentSafeAreaPadding()
         {
             base.UpdateContentSafeAreaPadding();
@@ -500,11 +648,12 @@ namespace Avalonia.Controls
 
         private void OnSwipeGesture(object? sender, SwipeGestureEventArgs e)
         {
-            if (!IsGestureEnabled || _tabControl == null) return;
+            if (!IsGestureEnabled || _tabControl == null || e.Id == _lastSwipeGestureId)
+                return;
 
             var placement = ResolveTabPlacement();
             bool isHorizontal = placement == TabPlacement.Top || placement == TabPlacement.Bottom;
-            bool isRtl = FlowDirection == FlowDirection.RightToLeft;
+            bool isRtl = FlowDirection == Media.FlowDirection.RightToLeft;
 
             int delta = (e.SwipeDirection, isHorizontal, isRtl) switch
             {
@@ -517,13 +666,15 @@ namespace Avalonia.Controls
                 _ => 0
             };
 
-            if (delta == 0) return;
+            if (delta == 0)
+                return;
 
             int next = FindNextEnabledTab(_tabControl.SelectedIndex + delta, delta);
             if (next >= 0)
             {
                 _tabControl.SelectedIndex = next;
                 e.Handled = true;
+                _lastSwipeGestureId = e.Id;
             }
         }
 
@@ -536,7 +687,7 @@ namespace Avalonia.Controls
 
             var resolved = ResolveTabPlacement();
             bool isHorizontal = resolved == TabPlacement.Top || resolved == TabPlacement.Bottom;
-            bool isRtl = FlowDirection == FlowDirection.RightToLeft;
+            bool isRtl = FlowDirection == Media.FlowDirection.RightToLeft;
 
             bool next = isHorizontal ? (isRtl ? e.Key == Key.Left : e.Key == Key.Right) : e.Key == Key.Down;
             bool prev = isHorizontal ? (isRtl ? e.Key == Key.Right : e.Key == Key.Left) : e.Key == Key.Up;
diff --git a/src/Avalonia.Controls/Primitives/AdornerLayer.cs b/src/Avalonia.Controls/Primitives/AdornerLayer.cs
index 8d3d97b94f..1c8b24f627 100644
--- a/src/Avalonia.Controls/Primitives/AdornerLayer.cs
+++ b/src/Avalonia.Controls/Primitives/AdornerLayer.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Specialized;
+using System.Linq;
 using Avalonia.Input.TextInput;
 using Avalonia.Media;
 using Avalonia.Reactive;
@@ -71,7 +72,32 @@ namespace Avalonia.Controls.Primitives
 
         public static AdornerLayer? GetAdornerLayer(Visual visual)
         {
-            return visual.FindAncestorOfType<VisualLayerManager>()?.AdornerLayer;
+            // Check if the visual is inside an OverlayLayer with a dedicated AdornerLayer
+            foreach (var ancestor in visual.GetVisualAncestors())
+            {
+                if (GetDirectAdornerLayer(ancestor) is { } adornerLayer)
+                    return adornerLayer;
+            }
+
+            if (TopLevel.GetTopLevel(visual) is { } topLevel)
+            {
+                foreach (var descendant in topLevel.GetVisualDescendants())
+                {
+                    if (GetDirectAdornerLayer(descendant) is { } adornerLayer)
+                        return adornerLayer;
+                }
+            }
+
+            return null;
+
+            static AdornerLayer? GetDirectAdornerLayer(Visual visual)
+            {
+                if (visual is OverlayLayer { AdornerLayer: { } adornerLayer })
+                    return adornerLayer;
+                if (visual is VisualLayerManager vlm)
+                    return vlm.AdornerLayer;
+                return null;
+            }
         }
 
         public static bool GetIsClipEnabled(Visual adorner)
diff --git a/src/Avalonia.Controls/Primitives/OverlayLayer.cs b/src/Avalonia.Controls/Primitives/OverlayLayer.cs
index 3337288a13..a9d9b072f2 100644
--- a/src/Avalonia.Controls/Primitives/OverlayLayer.cs
+++ b/src/Avalonia.Controls/Primitives/OverlayLayer.cs
@@ -13,6 +13,11 @@ namespace Avalonia.Controls.Primitives
 
         public Size AvailableSize { get; private set; }
 
+        /// <summary>
+        /// Gets the dedicated adorner layer for this overlay layer.
+        /// </summary>
+        internal AdornerLayer? AdornerLayer { get; set; }
+
         internal OverlayLayer()
         {
         }
diff --git a/src/Avalonia.Controls/Primitives/VisualLayerManager.cs b/src/Avalonia.Controls/Primitives/VisualLayerManager.cs
index 6630f1e09c..eb912d2cf8 100644
--- a/src/Avalonia.Controls/Primitives/VisualLayerManager.cs
+++ b/src/Avalonia.Controls/Primitives/VisualLayerManager.cs
@@ -3,6 +3,9 @@ using Avalonia.LogicalTree;
 
 namespace Avalonia.Controls.Primitives
 {
+    /// <summary>
+    /// A control that manages multiple layers such as adorners, overlays, text selectors, and popups.
+    /// </summary>
     public sealed class VisualLayerManager : Decorator
     {
         private const int AdornerZIndex = int.MaxValue - 100;
@@ -13,13 +16,37 @@ namespace Avalonia.Controls.Primitives
 
         private ILogicalRoot? _logicalRoot;
         private readonly List<Control> _layers = new();
-
-        public bool IsPopup { get; set; }
-
-        internal AdornerLayer AdornerLayer
+        private OverlayLayer? _overlayLayer;
+
+        /// <summary>
+        /// Gets or sets a value indicating whether an <see cref="Avalonia.Controls.Primitives.AdornerLayer"/> is
+        /// created for this <see cref="VisualLayerManager"/>. When enabled, the adorner layer is added to the
+        /// visual tree, providing a dedicated layer for rendering adorners.
+        /// </summary>
+        public bool EnableAdornerLayer { get; set; } = true;
+
+        /// <summary>
+        /// Gets or sets a value indicating whether an <see cref="Avalonia.Controls.Primitives.OverlayLayer"/> is
+        /// created for this <see cref="VisualLayerManager"/>. When enabled, the overlay layer is added to the
+        /// visual tree, providing a dedicated layer for rendering overlay visuals.
+        /// </summary>
+        public bool EnableOverlayLayer { get; set; }
+
+        internal bool EnablePopupOverlayLayer { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether a <see cref="Avalonia.Controls.Primitives.TextSelectorLayer"/> is
+        /// created for this <see cref="VisualLayerManager"/>. When enabled, the overlay layer is added to the
+        /// visual tree, providing a dedicated layer for rendering text selection handles.
+        /// </summary>
+        public bool EnableTextSelectorLayer { get; set; }
+
+        internal AdornerLayer? AdornerLayer
         {
             get
             {
+                if (!EnableAdornerLayer)
+                    return null;
                 var rv = FindLayer<AdornerLayer>();
                 if (rv == null)
                     AddLayer(rv = new AdornerLayer(), AdornerZIndex);
@@ -31,7 +58,7 @@ namespace Avalonia.Controls.Primitives
         {
             get
             {
-                if (IsPopup)
+                if (!EnablePopupOverlayLayer)
                     return null;
                 var rv = FindLayer<PopupOverlayLayer>();
                 if (rv == null)
@@ -44,12 +71,21 @@ namespace Avalonia.Controls.Primitives
         {
             get
             {
-                if (IsPopup)
+                if (!EnableOverlayLayer)
                     return null;
-                var rv = FindLayer<OverlayLayer>();
-                if (rv == null)
-                    AddLayer(rv = new OverlayLayer(), OverlayZIndex);
-                return rv;
+                if (_overlayLayer == null)
+                {
+                    _overlayLayer = new OverlayLayer();
+                    var adorner = new AdornerLayer();
+                    _overlayLayer.AdornerLayer = adorner;
+                    
+                    var panel = new Panel();
+                    panel.Children.Add(_overlayLayer);
+                    panel.Children.Add(adorner);
+                    
+                    AddLayer(panel, OverlayZIndex);
+                }
+                return _overlayLayer;
             }
         }
 
@@ -57,7 +93,7 @@ namespace Avalonia.Controls.Primitives
         {
             get
             {
-                if (IsPopup)
+                if (!EnableTextSelectorLayer)
                     return null;
                 var rv = FindLayer<TextSelectorLayer>();
                 if (rv == null)
diff --git a/src/Avalonia.Controls/ScrollChangedEventArgs.cs b/src/Avalonia.Controls/ScrollChangedEventArgs.cs
index fed23964f5..617d5c3f4d 100644
--- a/src/Avalonia.Controls/ScrollChangedEventArgs.cs
+++ b/src/Avalonia.Controls/ScrollChangedEventArgs.cs
@@ -16,7 +16,7 @@ namespace Avalonia.Controls
         }
 
         public ScrollChangedEventArgs(
-            RoutedEvent routedEvent,
+            RoutedEvent? routedEvent,
             Vector extentDelta,
             Vector offsetDelta,
             Vector viewportDelta)
diff --git a/src/Avalonia.Controls/SelectionChangedEventArgs.cs b/src/Avalonia.Controls/SelectionChangedEventArgs.cs
index c19d868d57..efbec0c490 100644
--- a/src/Avalonia.Controls/SelectionChangedEventArgs.cs
+++ b/src/Avalonia.Controls/SelectionChangedEventArgs.cs
@@ -15,7 +15,7 @@ namespace Avalonia.Controls
         /// <param name="routedEvent">The event being raised.</param>
         /// <param name="removedItems">The items removed from the selection.</param>
         /// <param name="addedItems">The items added to the selection.</param>
-        public SelectionChangedEventArgs(RoutedEvent routedEvent, IList removedItems, IList addedItems)
+        public SelectionChangedEventArgs(RoutedEvent? routedEvent, IList removedItems, IList addedItems)
             : base(routedEvent)
         {
             RemovedItems = removedItems;
diff --git a/src/Avalonia.Controls/Spinner.cs b/src/Avalonia.Controls/Spinner.cs
index 64c0db62b1..840113acd4 100644
--- a/src/Avalonia.Controls/Spinner.cs
+++ b/src/Avalonia.Controls/Spinner.cs
@@ -66,7 +66,7 @@ namespace Avalonia.Controls
             Direction = direction;
         }
 
-        public SpinEventArgs(RoutedEvent routedEvent, SpinDirection direction)
+        public SpinEventArgs(RoutedEvent? routedEvent, SpinDirection direction)
             : base(routedEvent)
         {
             Direction = direction;
@@ -78,7 +78,7 @@ namespace Avalonia.Controls
             UsingMouseWheel = usingMouseWheel;
         }
 
-        public SpinEventArgs(RoutedEvent routedEvent, SpinDirection direction, bool usingMouseWheel)
+        public SpinEventArgs(RoutedEvent? routedEvent, SpinDirection direction, bool usingMouseWheel)
             : base(routedEvent)
         {
             Direction = direction;
diff --git a/src/Avalonia.Controls/SplitButton/SplitButton.cs b/src/Avalonia.Controls/SplitButton/SplitButton.cs
index 28225a5ad1..390f679191 100644
--- a/src/Avalonia.Controls/SplitButton/SplitButton.cs
+++ b/src/Avalonia.Controls/SplitButton/SplitButton.cs
@@ -331,10 +331,13 @@ namespace Avalonia.Controls
                     oldFlyout.Hide();
                 }
 
+                (oldFlyout as PopupFlyoutBase)?.SetDefaultPlacementTarget(null);
+
                 // Must unregister events here while a reference to the old flyout still exists
                 UnregisterFlyoutEvents(oldFlyout);
 
                 RegisterFlyoutEvents(newFlyout);
+                (newFlyout as PopupFlyoutBase)?.SetDefaultPlacementTarget(this);
                 UpdatePseudoClasses();
             }
 
diff --git a/src/Avalonia.Controls/TabItem.cs b/src/Avalonia.Controls/TabItem.cs
index a4829c16ca..6a116b1e28 100644
--- a/src/Avalonia.Controls/TabItem.cs
+++ b/src/Avalonia.Controls/TabItem.cs
@@ -33,8 +33,14 @@ namespace Avalonia.Controls
         /// <summary>
         /// Defines the <see cref="Icon"/> property.
         /// </summary>
-        public static readonly StyledProperty<Control?> IconProperty =
-            AvaloniaProperty.Register<TabItem, Control?>(nameof(Icon));
+        public static readonly StyledProperty<object?> IconProperty =
+            AvaloniaProperty.Register<TabItem, object?>(nameof(Icon));
+
+        /// <summary>
+        /// Defines the <see cref="IconTemplate"/> property.
+        /// </summary>
+        public static readonly StyledProperty<IDataTemplate?> IconTemplateProperty =
+            AvaloniaProperty.Register<TabItem, IDataTemplate?>(nameof(IconTemplate));
 
         /// <summary>
         /// Defines the <see cref="IndicatorTemplate"/> property.
@@ -77,12 +83,21 @@ namespace Avalonia.Controls
         /// <summary>
         /// Gets or sets the icon displayed alongside the tab header.
         /// </summary>
-        public Control? Icon
+        public object? Icon
         {
             get => GetValue(IconProperty);
             set => SetValue(IconProperty, value);
         }
 
+        /// <summary>
+        /// Gets or sets the data template used to display the icon of the control.
+        /// </summary>
+        public IDataTemplate? IconTemplate
+        {
+            get => GetValue(IconTemplateProperty);
+            set => SetValue(IconTemplateProperty, value);
+        }
+
         /// <summary>
         /// Gets or sets the data template used to render the selection indicator.
         /// </summary>
diff --git a/src/Avalonia.Controls/TopLevel.cs b/src/Avalonia.Controls/TopLevel.cs
index 8556d03d91..ceb9590564 100644
--- a/src/Avalonia.Controls/TopLevel.cs
+++ b/src/Avalonia.Controls/TopLevel.cs
@@ -38,6 +38,7 @@ namespace Avalonia.Controls
     /// tracking the widget's <see cref="ClientSize"/>.
     /// </remarks>
     [TemplatePart("PART_TransparencyFallback", typeof(Border))]
+    [TemplatePart("PART_VisualLayerManager", typeof(VisualLayerManager))]
     public abstract class TopLevel : ContentControl,
         ICloseable,
         IStyleHost,
@@ -125,6 +126,7 @@ namespace Avalonia.Controls
         private Size? _frameSize;
         private WindowTransparencyLevel _actualTransparencyLevel;
         private Border? _transparencyFallbackBorder;
+        private VisualLayerManager? _visualLayerManager;
         private TargetWeakEventSubscriber<TopLevel, ResourcesChangedEventArgs>? _resourcesChangesSubscriber;
         private IStorageProvider? _storageProvider;
         private Screens? _screens;
@@ -133,6 +135,18 @@ namespace Avalonia.Controls
         internal TopLevelHost TopLevelHost => _topLevelHost;
         internal new PresentationSource PresentationSource => _source;
         internal IInputRoot InputRoot => _source;
+        
+        private protected VisualLayerManager? VisualLayerManager => _visualLayerManager;
+
+        private protected void EnableVisualLayerManagerLayers()
+        {
+            if (_visualLayerManager is { } vlm)
+            {
+                vlm.EnableOverlayLayer = true;
+                vlm.EnablePopupOverlayLayer = true;
+                vlm.EnableTextSelectorLayer = true;
+            }
+        }
 
         /// <summary>
         /// Initializes static members of the <see cref="TopLevel"/> class.
@@ -723,6 +737,8 @@ namespace Avalonia.Controls
         {
             base.OnApplyTemplate(e);
 
+            _visualLayerManager = e.NameScope.Find<VisualLayerManager>("PART_VisualLayerManager");
+
             if (PlatformImpl is null)
                 return;
 
diff --git a/src/Avalonia.Controls/VirtualizingCarouselPanel.cs b/src/Avalonia.Controls/VirtualizingCarouselPanel.cs
index 454069b4b2..88a89856bf 100644
--- a/src/Avalonia.Controls/VirtualizingCarouselPanel.cs
+++ b/src/Avalonia.Controls/VirtualizingCarouselPanel.cs
@@ -1,12 +1,18 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.Diagnostics;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using Avalonia.Animation;
+using Avalonia.Animation.Easings;
 using Avalonia.Controls.Primitives;
 using Avalonia.Input;
+using Avalonia.Input.GestureRecognizers;
+using Avalonia.Media;
+using Avalonia.Styling;
+using Avalonia.Utilities;
 
 namespace Avalonia.Controls
 {
@@ -15,23 +21,76 @@ namespace Avalonia.Controls
     /// </summary>
     public class VirtualizingCarouselPanel : VirtualizingPanel, ILogicalScrollable
     {
+        private sealed class ViewportRealizedItem
+        {
+            public ViewportRealizedItem(int itemIndex, Control control)
+            {
+                ItemIndex = itemIndex;
+                Control = control;
+            }
+
+            public int ItemIndex { get; }
+            public Control Control { get; }
+        }
+
         private static readonly AttachedProperty<object?> RecycleKeyProperty =
-            AvaloniaProperty.RegisterAttached<VirtualizingStackPanel, Control, object?>("RecycleKey");
+            AvaloniaProperty.RegisterAttached<VirtualizingCarouselPanel, Control, object?>("RecycleKey");
 
         private static readonly object s_itemIsItsOwnContainer = new object();
         private Size _extent;
         private Vector _offset;
         private Size _viewport;
         private Dictionary<object, Stack<Control>>? _recyclePool;
+        private readonly Dictionary<int, ViewportRealizedItem> _viewportRealized = new();
         private Control? _realized;
         private int _realizedIndex = -1;
         private Control? _transitionFrom;
         private int _transitionFromIndex = -1;
         private CancellationTokenSource? _transition;
+        private Task? _transitionTask;
         private EventHandler? _scrollInvalidated;
         private bool _canHorizontallyScroll;
         private bool _canVerticallyScroll;
 
+        private SwipeGestureRecognizer? _swipeGestureRecognizer;
+        private int _swipeGestureId;
+        private bool _isDragging;
+        private double _totalDelta;
+        private bool _isForward;
+        private Control? _swipeTarget;
+        private int _swipeTargetIndex = -1;
+        private PageSlide.SlideAxis? _swipeAxis;
+        private PageSlide.SlideAxis _lockedAxis;
+
+        private const double SwipeCommitThreshold = 0.25;
+        private const double VelocityCommitThreshold = 800;
+        private const double MinSwipeDistanceForVelocityCommit = 0.05;
+        private const double RubberBandFactor = 0.3;
+        private const double RubberBandReturnDuration = 0.16;
+        private const double MaxCompletionDuration = 0.35;
+        private const double MinCompletionDuration = 0.12;
+
+        private static readonly StyledProperty<double> CompletionProgressProperty =
+            AvaloniaProperty.Register<VirtualizingCarouselPanel, double>("CompletionProgress");
+        private static readonly StyledProperty<double> OffsetAnimationProgressProperty =
+            AvaloniaProperty.Register<VirtualizingCarouselPanel, double>("OffsetAnimationProgress");
+
+        private CancellationTokenSource? _completionCts;
+        private CancellationTokenSource? _offsetAnimationCts;
+        private double _completionEndProgress;
+        private bool _isRubberBanding;
+        private double _dragStartOffset;
+        private double _progressStartOffset;
+        private double _offsetAnimationStart;
+        private double _offsetAnimationTarget;
+        private double _activeViewportTargetOffset;
+        private int _progressFromIndex = -1;
+        private int _progressToIndex = -1;
+
+        internal bool IsManagingInteractionOffset =>
+            UsesViewportFractionLayout() &&
+            (_isDragging || _offsetAnimationCts is { IsCancellationRequested: false });
+
         bool ILogicalScrollable.CanHorizontallyScroll
         {
             get => _canHorizontallyScroll;
@@ -52,15 +111,10 @@ namespace Avalonia.Controls
         Size IScrollable.Extent => Extent;
         Size IScrollable.Viewport => Viewport;
 
-        Vector IScrollable.Offset 
+        Vector IScrollable.Offset
         {
             get => _offset;
-            set
-            {
-                if ((int)_offset.X != value.X)
-                    InvalidateMeasure();
-                _offset = value;
-            }
+            set => SetOffset(value);
         }
 
         private Size Extent
@@ -99,37 +153,343 @@ namespace Avalonia.Controls
         Control? ILogicalScrollable.GetControlInDirection(NavigationDirection direction, Control? from) => null;
         void ILogicalScrollable.RaiseScrollInvalidated(EventArgs e) => _scrollInvalidated?.Invoke(this, e);
 
+        private bool UsesViewportFractionLayout()
+        {
+            return ItemsControl is Carousel carousel &&
+                   !MathUtilities.AreClose(carousel.ViewportFraction, 1d);
+        }
+
+        private PageSlide.SlideAxis GetLayoutAxis()
+        {
+            return (ItemsControl as Carousel)?.GetLayoutAxis() ?? PageSlide.SlideAxis.Horizontal;
+        }
+
+        private double GetViewportFraction()
+        {
+            return (ItemsControl as Carousel)?.ViewportFraction ?? 1d;
+        }
+
+        private double GetViewportUnits()
+        {
+            return 1d / GetViewportFraction();
+        }
+
+        private double GetPrimaryOffset(Vector offset)
+        {
+            return GetLayoutAxis() == PageSlide.SlideAxis.Vertical ? offset.Y : offset.X;
+        }
+
+        private double GetPrimarySize(Size size)
+        {
+            return GetLayoutAxis() == PageSlide.SlideAxis.Vertical ? size.Height : size.Width;
+        }
+
+        private double GetCrossSize(Size size)
+        {
+            return GetLayoutAxis() == PageSlide.SlideAxis.Vertical ? size.Width : size.Height;
+        }
+
+        private Size CreateLogicalSize(double primary)
+        {
+            return GetLayoutAxis() == PageSlide.SlideAxis.Vertical ?
+                new Size(1, primary) :
+                new Size(primary, 1);
+        }
+
+        private Size CreateItemSize(double primary, double cross)
+        {
+            return GetLayoutAxis() == PageSlide.SlideAxis.Vertical ?
+                new Size(cross, primary) :
+                new Size(primary, cross);
+        }
+
+        private Rect CreateItemRect(double primaryOffset, double primarySize, double crossSize)
+        {
+            return GetLayoutAxis() == PageSlide.SlideAxis.Vertical ?
+                new Rect(0, primaryOffset, crossSize, primarySize) :
+                new Rect(primaryOffset, 0, primarySize, crossSize);
+        }
+
+        private Vector WithPrimaryOffset(Vector offset, double primary)
+        {
+            return GetLayoutAxis() == PageSlide.SlideAxis.Vertical ?
+                new Vector(offset.X, primary) :
+                new Vector(primary, offset.Y);
+        }
+
+        private Size ResolveLayoutSize(Size availableSize)
+        {
+            var owner = ItemsControl as Control;
+
+            double ResolveDimension(double available, double bounds, double ownerBounds, double ownerExplicit)
+            {
+                if (!double.IsInfinity(available) && available > 0)
+                    return available;
+
+                if (bounds > 0)
+                    return bounds;
+
+                if (ownerBounds > 0)
+                    return ownerBounds;
+
+                return double.IsNaN(ownerExplicit) ? 0 : ownerExplicit;
+            }
+
+            var width = ResolveDimension(availableSize.Width, Bounds.Width, owner?.Bounds.Width ?? 0, owner?.Width ?? double.NaN);
+            var height = ResolveDimension(availableSize.Height, Bounds.Height, owner?.Bounds.Height ?? 0, owner?.Height ?? double.NaN);
+            return new Size(width, height);
+        }
+
+        private double GetViewportItemExtent(Size size)
+        {
+            var viewportUnits = GetViewportUnits();
+            return viewportUnits <= 0 ? 0 : GetPrimarySize(size) / viewportUnits;
+        }
+
+        private bool UsesViewportWrapLayout()
+        {
+            return UsesViewportFractionLayout() &&
+                   ItemsControl is Carousel { WrapSelection: true } &&
+                   Items.Count > 1;
+        }
+
+        private static int NormalizeIndex(int index, int count)
+        {
+            return ((index % count) + count) % count;
+        }
+
+        private double GetNearestLogicalOffset(int itemIndex, double referenceOffset)
+        {
+            if (!UsesViewportWrapLayout() || Items.Count == 0)
+                return Math.Clamp(itemIndex, 0, Math.Max(0, Items.Count - 1));
+
+            var wrapSpan = Items.Count;
+            var wrapMultiplier = Math.Round((referenceOffset - itemIndex) / wrapSpan);
+            return itemIndex + (wrapMultiplier * wrapSpan);
+        }
+
+        private bool IsPreferredViewportSlot(int candidateLogicalIndex, int existingLogicalIndex, double primaryOffset)
+        {
+            var candidateDistance = Math.Abs(candidateLogicalIndex - primaryOffset);
+            var existingDistance = Math.Abs(existingLogicalIndex - primaryOffset);
+
+            if (!MathUtilities.AreClose(candidateDistance, existingDistance))
+                return candidateDistance < existingDistance;
+
+            var candidateInRange = candidateLogicalIndex >= 0 && candidateLogicalIndex < Items.Count;
+            var existingInRange = existingLogicalIndex >= 0 && existingLogicalIndex < Items.Count;
+
+            if (candidateInRange != existingInRange)
+                return candidateInRange;
+
+            if (_isDragging)
+                return _isForward ? candidateLogicalIndex > existingLogicalIndex : candidateLogicalIndex < existingLogicalIndex;
+
+            return candidateLogicalIndex < existingLogicalIndex;
+        }
+
+        private IReadOnlyList<(int LogicalIndex, int ItemIndex)> GetRequiredViewportSlots(double primaryOffset)
+        {
+            if (Items.Count == 0)
+                return Array.Empty<(int LogicalIndex, int ItemIndex)>();
+
+            var viewportUnits = GetViewportUnits();
+            var edgeInset = (viewportUnits - 1) / 2;
+            var start = (int)Math.Floor(primaryOffset - edgeInset);
+            var end = (int)Math.Ceiling(primaryOffset + viewportUnits - edgeInset) - 1;
+
+            if (!UsesViewportWrapLayout())
+            {
+                start = Math.Max(0, start);
+                end = Math.Min(Items.Count - 1, end);
+
+                if (start > end)
+                    return Array.Empty<(int LogicalIndex, int ItemIndex)>();
+
+                var result = new (int LogicalIndex, int ItemIndex)[end - start + 1];
+
+                for (var i = 0; i < result.Length; ++i)
+                {
+                    var index = start + i;
+                    result[i] = (index, index);
+                }
+
+                return result;
+            }
+
+            var bestSlots = new Dictionary<int, int>();
+
+            for (var logicalIndex = start; logicalIndex <= end; ++logicalIndex)
+            {
+                var itemIndex = NormalizeIndex(logicalIndex, Items.Count);
+
+                if (!bestSlots.TryGetValue(itemIndex, out var existingLogicalIndex) ||
+                    IsPreferredViewportSlot(logicalIndex, existingLogicalIndex, primaryOffset))
+                {
+                    bestSlots[itemIndex] = logicalIndex;
+                }
+            }
+
+            return bestSlots
+                .Select(x => (LogicalIndex: x.Value, ItemIndex: x.Key))
+                .OrderBy(x => x.LogicalIndex)
+                .ToArray();
+        }
+
+        private bool ViewportSlotsChanged(double oldPrimaryOffset, double newPrimaryOffset)
+        {
+            var oldSlots = GetRequiredViewportSlots(oldPrimaryOffset);
+            var newSlots = GetRequiredViewportSlots(newPrimaryOffset);
+
+            if (oldSlots.Count != newSlots.Count)
+                return true;
+
+            for (var i = 0; i < oldSlots.Count; ++i)
+            {
+                if (oldSlots[i].LogicalIndex != newSlots[i].LogicalIndex ||
+                    oldSlots[i].ItemIndex != newSlots[i].ItemIndex)
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        private void SetOffset(Vector value)
+        {
+            if (UsesViewportFractionLayout())
+            {
+                var oldPrimaryOffset = GetPrimaryOffset(_offset);
+                var newPrimaryOffset = GetPrimaryOffset(value);
+
+                if (MathUtilities.AreClose(oldPrimaryOffset, newPrimaryOffset))
+                {
+                    _offset = value;
+                    return;
+                }
+
+                _offset = value;
+
+                var rangeChanged = ViewportSlotsChanged(oldPrimaryOffset, newPrimaryOffset);
+
+                if (rangeChanged)
+                    InvalidateMeasure();
+                else
+                    InvalidateArrange();
+
+                _scrollInvalidated?.Invoke(this, EventArgs.Empty);
+                return;
+            }
+
+            if ((int)_offset.X != value.X)
+                InvalidateMeasure();
+
+            _offset = value;
+        }
+
+        private void ClearViewportRealized()
+        {
+            if (_viewportRealized.Count == 0)
+                return;
+
+            foreach (var element in _viewportRealized.Values.Select(x => x.Control).ToArray())
+                RecycleElement(element);
+
+            _viewportRealized.Clear();
+        }
+
+        private void ResetSinglePageState()
+        {
+            _transition?.Cancel();
+            _transition = null;
+            _transitionTask = null;
+
+            if (_transitionFrom is not null)
+                RecycleElement(_transitionFrom);
+
+            if (_swipeTarget is not null)
+                RecycleElement(_swipeTarget);
+
+            if (_realized is not null)
+                RecycleElement(_realized);
+
+            _transitionFrom = null;
+            _transitionFromIndex = -1;
+            _swipeTarget = null;
+            _swipeTargetIndex = -1;
+            _realized = null;
+            _realizedIndex = -1;
+        }
+
+        private void CancelOffsetAnimation()
+        {
+            _offsetAnimationCts?.Cancel();
+            _offsetAnimationCts = null;
+        }
+
+        protected override void OnItemsControlChanged(ItemsControl? oldValue)
+        {
+            base.OnItemsControlChanged(oldValue);
+            // ItemsPresenter attaches the panel to the visual tree before calling Attach(ItemsControl),
+            // so OnAttachedToVisualTree fires with a null ItemsControl; re-run setup here.
+            RefreshGestureRecognizer();
+        }
+
+        protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
+        {
+            base.OnAttachedToVisualTree(e);
+            RefreshGestureRecognizer();
+        }
+
+        protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e)
+        {
+            base.OnDetachedFromVisualTree(e);
+            TeardownGestureRecognizer();
+        }
+
         protected override Size MeasureOverride(Size availableSize)
+        {
+            if (UsesViewportFractionLayout())
+                return MeasureViewportFractionOverride(availableSize);
+
+            ClearViewportRealized();
+            CancelOffsetAnimation();
+
+            return MeasureSinglePageOverride(availableSize);
+        }
+
+        private Size MeasureSinglePageOverride(Size availableSize)
         {
             var items = Items;
-            var index = (int)_offset.X;
+            var index = (ItemsControl as Carousel)?.SelectedIndex ?? (int)_offset.X;
+
+            CompleteFinishedTransitionIfNeeded();
 
             if (index != _realizedIndex)
             {
                 if (_realized is not null)
                 {
-                    var cancelTransition = _transition is not null;
-
                     // Cancel any already running transition, and recycle the element we're transitioning from.
-                    if (cancelTransition)
+                    if (_transition is not null)
                     {
-                        _transition!.Cancel();
+                        _transition.Cancel();
                         _transition = null;
+                        _transitionTask = null;
                         if (_transitionFrom is not null)
                             RecycleElement(_transitionFrom);
                         _transitionFrom = null;
                         _transitionFromIndex = -1;
+                        ResetTransitionState(_realized);
                     }
 
-                    if (cancelTransition || GetTransition() is null)
+                    if (GetTransition() is null)
                     {
-                        // If don't have a transition or we've just canceled a transition then recycle the element
-                        // we're moving from.
                         RecycleElement(_realized);
                     }
                     else
                     {
-                        // We have a transition to do: record the current element as the element we're transitioning
+                        // Record the current element as the element we're transitioning
                         // from and we'll start the transition in the arrange pass.
                         _transitionFrom = _realized;
                         _transitionFromIndex = _realizedIndex;
@@ -138,8 +498,7 @@ namespace Avalonia.Controls
                     _realized = null;
                     _realizedIndex = -1;
                 }
-                
-                // Get or create an element for the new item.
+
                 if (index >= 0 && index < items.Count)
                 {
                     _realized = GetOrCreateElement(items, index);
@@ -163,6 +522,14 @@ namespace Avalonia.Controls
         }
 
         protected override Size ArrangeOverride(Size finalSize)
+        {
+            if (UsesViewportFractionLayout())
+                return ArrangeViewportFractionOverride(finalSize);
+
+            return ArrangeSinglePageOverride(finalSize);
+        }
+
+        private Size ArrangeSinglePageOverride(Size finalSize)
         {
             var result = base.ArrangeOverride(finalSize);
 
@@ -171,20 +538,109 @@ namespace Avalonia.Controls
                 _realized is { } to &&
                 GetTransition() is { } transition)
             {
-                _transition = new CancellationTokenSource();
+                var transitionCts = new CancellationTokenSource();
+                _transition = transitionCts;
+
+                var forward = _realizedIndex > _transitionFromIndex;
+
+                _transitionTask = RunTransitionAsync(_transition, _transitionFrom, to, forward, transition);
+            }
+
+            return result;
+        }
+
+        private Size MeasureViewportFractionOverride(Size availableSize)
+        {
+            ResetSinglePageState();
+
+            if (Items.Count == 0)
+            {
+                ClearViewportRealized();
+                Extent = Viewport = new(0, 0);
+                return default;
+            }
+
+            var layoutSize = ResolveLayoutSize(availableSize);
+            var primarySize = GetPrimarySize(layoutSize);
+            var crossSize = GetCrossSize(layoutSize);
+            var viewportUnits = GetViewportUnits();
+
+            if (primarySize <= 0 || viewportUnits <= 0)
+            {
+                ClearViewportRealized();
+                Extent = Viewport = new(0, 0);
+                return default;
+            }
+
+            var itemPrimarySize = primarySize / viewportUnits;
+            var itemSize = CreateItemSize(itemPrimarySize, crossSize);
+            var requiredSlots = GetRequiredViewportSlots(GetPrimaryOffset(_offset));
+            var requiredMap = requiredSlots.ToDictionary(x => x.LogicalIndex, x => x.ItemIndex);
+
+            foreach (var entry in _viewportRealized.ToArray())
+            {
+                if (!requiredMap.TryGetValue(entry.Key, out var itemIndex) ||
+                    entry.Value.ItemIndex != itemIndex)
+                {
+                    RecycleElement(entry.Value.Control);
+                    _viewportRealized.Remove(entry.Key);
+                }
+            }
 
-                var forward = (_realizedIndex > _transitionFromIndex);
-                if (Items.Count > 2)
+            foreach (var slot in requiredSlots)
+            {
+                if (!_viewportRealized.ContainsKey(slot.LogicalIndex))
                 {
-                    forward = forward || (_transitionFromIndex == Items.Count - 1 && _realizedIndex == 0);
-                    forward = forward && !(_transitionFromIndex == 0 && _realizedIndex == Items.Count - 1);
+                    _viewportRealized[slot.LogicalIndex] = new ViewportRealizedItem(
+                        slot.ItemIndex,
+                        GetOrCreateElement(Items, slot.ItemIndex));
                 }
+            }
 
-                transition.Start(_transitionFrom, to, forward, _transition.Token)
-                    .ContinueWith(TransitionFinished, TaskScheduler.FromCurrentSynchronizationContext());
+            var maxCrossDesiredSize = 0d;
+
+            foreach (var element in _viewportRealized.Values.Select(x => x.Control))
+            {
+                element.Measure(itemSize);
+                maxCrossDesiredSize = Math.Max(maxCrossDesiredSize, GetCrossSize(element.DesiredSize));
             }
 
-            return result;
+            Viewport = CreateLogicalSize(viewportUnits);
+            Extent = CreateLogicalSize(Math.Max(0, Items.Count + viewportUnits - 1));
+
+            var desiredPrimary = double.IsInfinity(primarySize) ? itemPrimarySize * viewportUnits : primarySize;
+            var desiredCross = double.IsInfinity(crossSize) ? maxCrossDesiredSize : crossSize;
+            return CreateItemSize(desiredPrimary, desiredCross);
+        }
+
+        private Size ArrangeViewportFractionOverride(Size finalSize)
+        {
+            var primarySize = GetPrimarySize(finalSize);
+            var crossSize = GetCrossSize(finalSize);
+            var viewportUnits = GetViewportUnits();
+
+            if (primarySize <= 0 || viewportUnits <= 0)
+                return finalSize;
+
+            if (_viewportRealized.Count == 0 && Items.Count > 0)
+            {
+                InvalidateMeasure();
+                return finalSize;
+            }
+
+            var itemPrimarySize = primarySize / viewportUnits;
+            var edgeInset = (viewportUnits - 1) / 2;
+            var primaryOffset = GetPrimaryOffset(_offset);
+
+            foreach (var entry in _viewportRealized.OrderBy(x => x.Key))
+            {
+                var itemOffset = (edgeInset + entry.Key - primaryOffset) * itemPrimarySize;
+                var rect = CreateItemRect(itemOffset, itemPrimarySize, crossSize);
+                entry.Value.Control.IsVisible = true;
+                entry.Value.Control.Arrange(rect);
+            }
+
+            return finalSize;
         }
 
         protected override IInputElement? GetControl(NavigationDirection direction, IInputElement? from, bool wrap) => null;
@@ -193,6 +649,9 @@ namespace Avalonia.Controls
         {
             if (index < 0 || index >= Items.Count)
                 return null;
+            var viewportRealized = _viewportRealized.Values.FirstOrDefault(x => x.ItemIndex == index);
+            if (viewportRealized is not null)
+                return viewportRealized.Control;
             if (index == _realizedIndex)
                 return _realized;
             if (Items[index] is Control c && c.GetValue(RecycleKeyProperty) == s_itemIsItsOwnContainer)
@@ -202,11 +661,20 @@ namespace Avalonia.Controls
 
         protected internal override IEnumerable<Control>? GetRealizedContainers()
         {
+            if (_viewportRealized.Count > 0)
+                return _viewportRealized.OrderBy(x => x.Key).Select(x => x.Value.Control);
+
             return _realized is not null ? new[] { _realized } : null;
         }
 
         protected internal override int IndexFromContainer(Control container)
         {
+            foreach (var entry in _viewportRealized)
+            {
+                if (ReferenceEquals(entry.Value.Control, container))
+                    return entry.Value.ItemIndex;
+            }
+
             return container == _realized ? _realizedIndex : -1;
         }
 
@@ -219,8 +687,21 @@ namespace Avalonia.Controls
         {
             base.OnItemsChanged(items, e);
 
+            if (UsesViewportFractionLayout() || _viewportRealized.Count > 0)
+            {
+                ClearViewportRealized();
+                InvalidateMeasure();
+                return;
+            }
+
             void Add(int index, int count)
             {
+                if (_realized is null)
+                {
+                    InvalidateMeasure();
+                    return;
+                }
+
                 if (index <= _realizedIndex)
                     _realizedIndex += count;
             }
@@ -251,26 +732,20 @@ namespace Avalonia.Controls
                     break;
                 case NotifyCollectionChangedAction.Replace:
                     if (e.OldStartingIndex < 0)
-                    {
                         goto case NotifyCollectionChangedAction.Reset;
-                    }
 
                     Remove(e.OldStartingIndex, e.OldItems!.Count);
                     Add(e.NewStartingIndex, e.NewItems!.Count);
                     break;
                 case NotifyCollectionChangedAction.Move:
                     if (e.OldStartingIndex < 0)
-                    {
                         goto case NotifyCollectionChangedAction.Reset;
-                    }
 
                     Remove(e.OldStartingIndex, e.OldItems!.Count);
                     var insertIndex = e.NewStartingIndex;
 
                     if (e.NewStartingIndex > e.OldStartingIndex)
-                    {
                         insertIndex -= e.OldItems.Count - 1;
-                    }
 
                     Add(insertIndex, e.NewItems!.Count);
                     break;
@@ -281,6 +756,7 @@ namespace Avalonia.Controls
                         _realized = null;
                         _realizedIndex = -1;
                     }
+
                     break;
             }
 
@@ -291,29 +767,33 @@ namespace Avalonia.Controls
         {
             Debug.Assert(ItemContainerGenerator is not null);
 
-            var e = GetRealizedElement(index);
+            var element = GetRealizedElement(index);
 
-            if (e is null)
+            if (element is null)
             {
                 var item = items[index];
                 var generator = ItemContainerGenerator!;
 
                 if (generator.NeedsContainer(item, index, out var recycleKey))
                 {
-                    e = GetRecycledElement(item, index, recycleKey) ??
+                    element = GetRecycledElement(item, index, recycleKey) ??
                         CreateElement(item, index, recycleKey);
                 }
                 else
                 {
-                    e = GetItemAsOwnContainer(item, index);
+                    element = GetItemAsOwnContainer(item, index);
                 }
             }
 
-            return e;
+            return element;
         }
 
         private Control? GetRealizedElement(int index)
         {
+            var viewportRealized = _viewportRealized.Values.FirstOrDefault(x => x.ItemIndex == index);
+            if (viewportRealized is not null)
+                return viewportRealized.Control;
+
             return _realizedIndex == index ? _realized : null;
         }
 
@@ -379,38 +859,785 @@ namespace Avalonia.Controls
             var recycleKey = element.GetValue(RecycleKeyProperty);
             Debug.Assert(recycleKey is not null);
 
+            // Hide first so cleanup doesn't visibly snap transforms/opacity for a frame.
+            element.IsVisible = false;
+            ResetTransitionState(element);
+
             if (recycleKey == s_itemIsItsOwnContainer)
             {
-                element.IsVisible = false;
+                return;
             }
-            else
-            {
-                ItemContainerGenerator.ClearItemContainer(element);
-                _recyclePool ??= new();
 
-                if (!_recyclePool.TryGetValue(recycleKey, out var pool))
-                {
-                    pool = new();
-                    _recyclePool.Add(recycleKey, pool);
-                }
+            ItemContainerGenerator.ClearItemContainer(element);
+            _recyclePool ??= new();
 
-                pool.Push(element);
-                element.IsVisible = false;
+            if (!_recyclePool.TryGetValue(recycleKey, out var pool))
+            {
+                pool = new();
+                _recyclePool.Add(recycleKey, pool);
             }
+
+            pool.Push(element);
         }
 
         private IPageTransition? GetTransition() => (ItemsControl as Carousel)?.PageTransition;
 
-        private void TransitionFinished(Task task)
+        private void CompleteFinishedTransitionIfNeeded()
+        {
+            if (_transition is not null && _transitionTask?.IsCompleted == true)
+            {
+                if (_transitionFrom is not null)
+                    RecycleElement(_transitionFrom);
+
+                _transition = null;
+                _transitionTask = null;
+                _transitionFrom = null;
+                _transitionFromIndex = -1;
+            }
+        }
+
+        private async Task RunTransitionAsync(
+            CancellationTokenSource transitionCts,
+            Control transitionFrom,
+            Control transitionTo,
+            bool forward,
+            IPageTransition transition)
         {
-            if (task.IsCanceled)
+            try
+            {
+                await transition.Start(transitionFrom, transitionTo, forward, transitionCts.Token);
+            }
+            catch (OperationCanceledException)
+            {
+                // Expected when a transition is interrupted by a newer navigation action.
+            }
+            catch (Exception e)
+            {
+                _ = e;
+            }
+
+            if (transitionCts.IsCancellationRequested || !ReferenceEquals(_transition, transitionCts))
                 return;
 
             if (_transitionFrom is not null)
                 RecycleElement(_transitionFrom);
             _transition = null;
+            _transitionTask = null;
             _transitionFrom = null;
             _transitionFromIndex = -1;
         }
+
+        internal void SyncSelectionOffset(int selectedIndex)
+        {
+            if (!UsesViewportFractionLayout())
+            {
+                SetOffset(WithPrimaryOffset(_offset, selectedIndex));
+                return;
+            }
+
+            var currentOffset = GetPrimaryOffset(_offset);
+            var targetOffset = GetNearestLogicalOffset(selectedIndex, currentOffset);
+
+            if (MathUtilities.AreClose(currentOffset, targetOffset))
+            {
+                SetOffset(WithPrimaryOffset(_offset, targetOffset));
+                return;
+            }
+
+            if (_isDragging)
+                return;
+
+            var transition = GetTransition();
+            var canAnimate = transition is not null && Math.Abs(targetOffset - currentOffset) <= 1.001;
+
+            if (!canAnimate)
+            {
+                ResetViewportTransitionState();
+                ClearFractionalProgressContext();
+                SetOffset(WithPrimaryOffset(_offset, targetOffset));
+                return;
+            }
+
+            var fromIndex = Items.Count > 0 ? NormalizeIndex((int)Math.Round(currentOffset), Items.Count) : -1;
+            var forward = targetOffset > currentOffset;
+
+            ResetViewportTransitionState();
+            SetFractionalProgressContext(fromIndex, selectedIndex, forward, currentOffset, targetOffset);
+            _ = AnimateViewportOffsetAsync(
+                currentOffset,
+                targetOffset,
+                TimeSpan.FromSeconds(MaxCompletionDuration),
+                new QuadraticEaseOut(),
+                () =>
+                {
+                    ResetViewportTransitionState();
+                    ClearFractionalProgressContext();
+                    // SyncScrollOffset is blocked during animation and the post-animation layout
+                    // still sees a live CTS, so re-sync explicitly in case SelectedIndex changed.
+                    if (ItemsControl is Carousel carousel)
+                        SyncSelectionOffset(carousel.SelectedIndex);
+                });
+        }
+
+        /// <summary>
+        /// Refreshes the gesture recognizer based on the carousel's IsSwipeEnabled and PageTransition settings.
+        /// </summary>
+        internal void RefreshGestureRecognizer()
+        {
+            TeardownGestureRecognizer();
+
+            if (ItemsControl is not Carousel carousel || !carousel.IsSwipeEnabled)
+                return;
+
+            _swipeAxis = UsesViewportFractionLayout() ? carousel.GetLayoutAxis() : carousel.GetTransitionAxis();
+
+            _swipeGestureRecognizer = new SwipeGestureRecognizer
+            {
+                CanHorizontallySwipe = _swipeAxis != PageSlide.SlideAxis.Vertical,
+                CanVerticallySwipe = _swipeAxis != PageSlide.SlideAxis.Horizontal,
+            };
+
+            GestureRecognizers.Add(_swipeGestureRecognizer);
+            AddHandler(InputElement.SwipeGestureEvent, OnSwipeGesture);
+            AddHandler(InputElement.SwipeGestureEndedEvent, OnSwipeGestureEnded);
+        }
+
+        private void TeardownGestureRecognizer()
+        {
+            _completionCts?.Cancel();
+            _completionCts = null;
+            CancelOffsetAnimation();
+
+            if (_swipeGestureRecognizer is not null)
+            {
+                GestureRecognizers.Remove(_swipeGestureRecognizer);
+                _swipeGestureRecognizer = null;
+            }
+
+            RemoveHandler(InputElement.SwipeGestureEvent, OnSwipeGesture);
+            RemoveHandler(InputElement.SwipeGestureEndedEvent, OnSwipeGestureEnded);
+            ResetSwipeState();
+        }
+
+        private Control? FindViewportControl(int itemIndex)
+        {
+            return _viewportRealized.Values.FirstOrDefault(x => x.ItemIndex == itemIndex)?.Control;
+        }
+
+        private void SetFractionalProgressContext(int fromIndex, int toIndex, bool forward, double startOffset, double targetOffset)
+        {
+            _progressFromIndex = fromIndex;
+            _progressToIndex = toIndex;
+            _isForward = forward;
+            _progressStartOffset = startOffset;
+            _activeViewportTargetOffset = targetOffset;
+        }
+
+        private void ClearFractionalProgressContext()
+        {
+            _progressFromIndex = -1;
+            _progressToIndex = -1;
+            _progressStartOffset = 0;
+            _activeViewportTargetOffset = 0;
+        }
+
+        private double GetFractionalTransitionProgress(double currentOffset)
+        {
+            var totalDistance = Math.Abs(_activeViewportTargetOffset - _progressStartOffset);
+            if (totalDistance <= 0)
+                return 0;
+
+            return Math.Clamp(Math.Abs(currentOffset - _progressStartOffset) / totalDistance, 0, 1);
+        }
+
+        private void ResetViewportTransitionState()
+        {
+            foreach (var element in _viewportRealized.Values.Select(x => x.Control))
+                ResetTransitionState(element);
+        }
+
+        private void OnSwipeGesture(object? sender, SwipeGestureEventArgs e)
+        {
+            if (ItemsControl is not Carousel carousel || !carousel.IsSwipeEnabled)
+                return;
+
+            if (UsesViewportFractionLayout())
+            {
+                OnViewportFractionSwipeGesture(carousel, e);
+                return;
+            }
+
+            if (_realizedIndex < 0 || Items.Count == 0)
+                return;
+
+            if (_completionCts is { IsCancellationRequested: false })
+            {
+                _completionCts.Cancel();
+                _completionCts = null;
+
+                var wasCommit = _completionEndProgress > 0.5;
+                if (wasCommit && _swipeTarget is not null)
+                {
+                    if (_realized != null)
+                        RecycleElement(_realized);
+
+                    _realized = _swipeTarget;
+                    _realizedIndex = _swipeTargetIndex;
+                    carousel.SelectedIndex = _swipeTargetIndex;
+                }
+                else
+                {
+                    ResetSwipeState();
+                }
+
+                _swipeTarget = null;
+                _swipeTargetIndex = -1;
+                _totalDelta = 0;
+            }
+
+            if (_isDragging && e.Id != _swipeGestureId)
+                return;
+
+            if (!_isDragging)
+            {
+                // Lock the axis on gesture start to keep diagonal drags stable.
+                _lockedAxis = _swipeAxis ?? (Math.Abs(e.Delta.X) >= Math.Abs(e.Delta.Y) ?
+                    PageSlide.SlideAxis.Horizontal :
+                    PageSlide.SlideAxis.Vertical);
+            }
+
+            var delta = _lockedAxis == PageSlide.SlideAxis.Horizontal ? e.Delta.X : e.Delta.Y;
+
+            if (!_isDragging)
+            {
+                _isForward = delta > 0;
+                _isRubberBanding = false;
+                var currentIndex = _realizedIndex;
+                var targetIndex = _isForward ? currentIndex + 1 : currentIndex - 1;
+
+                if (targetIndex >= Items.Count)
+                {
+                    if (carousel.WrapSelection)
+                        targetIndex = 0;
+                    else
+                        _isRubberBanding = true;
+                }
+                else if (targetIndex < 0)
+                {
+                    if (carousel.WrapSelection)
+                        targetIndex = Items.Count - 1;
+                    else
+                        _isRubberBanding = true;
+                }
+
+                if (!_isRubberBanding && (targetIndex == currentIndex || targetIndex < 0 || targetIndex >= Items.Count))
+                    return;
+
+                _isDragging = true;
+                _swipeGestureId = e.Id;
+                _totalDelta = 0;
+                _swipeTargetIndex = _isRubberBanding ? -1 : targetIndex;
+                carousel.IsSwiping = true;
+
+                if (_transition is not null)
+                {
+                    _transition.Cancel();
+                    _transition = null;
+                    if (_transitionFrom is not null)
+                        RecycleElement(_transitionFrom);
+                    _transitionFrom = null;
+                    _transitionFromIndex = -1;
+                }
+
+                if (!_isRubberBanding)
+                {
+                    _swipeTarget = GetOrCreateElement(Items, _swipeTargetIndex);
+                    _swipeTarget.Measure(Bounds.Size);
+                    _swipeTarget.Arrange(new Rect(Bounds.Size));
+                    _swipeTarget.IsVisible = true;
+                }
+            }
+
+            _totalDelta += delta;
+
+            // Clamp so totalDelta cannot cross zero (absorbs touch jitter).
+            if (_isForward)
+                _totalDelta = Math.Max(0, _totalDelta);
+            else
+                _totalDelta = Math.Min(0, _totalDelta);
+            
+            var size = _lockedAxis == PageSlide.SlideAxis.Horizontal ? Bounds.Width : Bounds.Height;
+            if (size <= 0)
+                return;
+
+            var rawProgress = Math.Clamp(Math.Abs(_totalDelta) / size, 0, 1);
+            var progress = _isRubberBanding
+                ? RubberBandFactor * Math.Sqrt(rawProgress)
+                : rawProgress;
+
+            if (GetTransition() is IProgressPageTransition progressive)
+            {
+                progressive.Update(
+                    progress,
+                    _realized,
+                    _isRubberBanding ? null : _swipeTarget,
+                    _isForward,
+                    size,
+                    Array.Empty<PageTransitionItem>());
+            }
+
+            e.Handled = true;
+        }
+
+        private void OnViewportFractionSwipeGesture(Carousel carousel, SwipeGestureEventArgs e)
+        {
+            if (_offsetAnimationCts is { IsCancellationRequested: false })
+            {
+                CancelOffsetAnimation();
+                SetOffset(WithPrimaryOffset(_offset, GetNearestLogicalOffset(carousel.SelectedIndex, GetPrimaryOffset(_offset))));
+            }
+
+            if (_isDragging && e.Id != _swipeGestureId)
+                return;
+
+            var delta = _lockedAxis == PageSlide.SlideAxis.Horizontal ? e.Delta.X : e.Delta.Y;
+
+            if (!_isDragging)
+            {
+                _lockedAxis = carousel.GetLayoutAxis();
+                _swipeGestureId = e.Id;
+                _dragStartOffset = GetNearestLogicalOffset(carousel.SelectedIndex, GetPrimaryOffset(_offset));
+                _totalDelta = 0;
+                _isDragging = true;
+                _isRubberBanding = false;
+                carousel.IsSwiping = true;
+                _isForward = delta > 0;
+                var targetIndex = _isForward ? carousel.SelectedIndex + 1 : carousel.SelectedIndex - 1;
+
+                if (targetIndex >= Items.Count || targetIndex < 0)
+                {
+                    if (carousel.WrapSelection && Items.Count > 1)
+                        targetIndex = NormalizeIndex(targetIndex, Items.Count);
+                    else
+                        _isRubberBanding = true;
+                }
+
+                var targetOffset = _isForward ? _dragStartOffset + 1 : _dragStartOffset - 1;
+                SetFractionalProgressContext(
+                    carousel.SelectedIndex,
+                    _isRubberBanding ? -1 : targetIndex,
+                    _isForward,
+                    _dragStartOffset,
+                    targetOffset);
+                ResetViewportTransitionState();
+            }
+
+            _totalDelta += delta;
+
+            if (_isForward)
+                _totalDelta = Math.Max(0, _totalDelta);
+            else
+                _totalDelta = Math.Min(0, _totalDelta);
+
+            var itemExtent = GetViewportItemExtent(Bounds.Size);
+            if (itemExtent <= 0)
+                return;
+
+            var logicalDelta = Math.Clamp(Math.Abs(_totalDelta) / itemExtent, 0, 1);
+            var proposedOffset = _dragStartOffset + (_isForward ? logicalDelta : -logicalDelta);
+
+            if (!_isRubberBanding)
+            {
+                proposedOffset = Math.Clamp(
+                    proposedOffset,
+                    Math.Min(_dragStartOffset, _activeViewportTargetOffset),
+                    Math.Max(_dragStartOffset, _activeViewportTargetOffset));
+            }
+            else if (proposedOffset < 0)
+            {
+                proposedOffset = -(RubberBandFactor * Math.Sqrt(-proposedOffset));
+            }
+            else
+            {
+                var maxOffset = Math.Max(0, Items.Count - 1);
+                proposedOffset = maxOffset + (RubberBandFactor * Math.Sqrt(proposedOffset - maxOffset));
+            }
+
+            SetOffset(WithPrimaryOffset(_offset, proposedOffset));
+
+            if (GetTransition() is IProgressPageTransition progressive)
+            {
+                var currentOffset = GetPrimaryOffset(_offset);
+                var progress = Math.Clamp(Math.Abs(currentOffset - _dragStartOffset), 0, 1);
+                progressive.Update(
+                    progress,
+                    FindViewportControl(_progressFromIndex),
+                    FindViewportControl(_progressToIndex),
+                    _isForward,
+                    GetViewportItemExtent(Bounds.Size),
+                    BuildFractionalVisibleItems(currentOffset));
+            }
+
+            e.Handled = true;
+        }
+
+        private void OnViewportFractionSwipeGestureEnded(Carousel carousel, SwipeGestureEndedEventArgs e)
+        {
+            var itemExtent = GetViewportItemExtent(Bounds.Size);
+            var currentOffset = GetPrimaryOffset(_offset);
+            var currentProgress = Math.Abs(currentOffset - _dragStartOffset);
+            var velocity = _lockedAxis == PageSlide.SlideAxis.Horizontal ? Math.Abs(e.Velocity.X) : Math.Abs(e.Velocity.Y);
+            var targetIndex = _progressToIndex;
+            var canCommit = !_isRubberBanding && targetIndex >= 0;
+            var commit = canCommit &&
+                         (currentProgress >= SwipeCommitThreshold ||
+                          (velocity > VelocityCommitThreshold && currentProgress >= MinSwipeDistanceForVelocityCommit));
+            var endOffset = commit
+                ? _activeViewportTargetOffset
+                : GetNearestLogicalOffset(carousel.SelectedIndex, currentOffset);
+            var remainingDistance = Math.Abs(endOffset - currentOffset);
+            var durationSeconds = _isRubberBanding
+                ? RubberBandReturnDuration
+                : velocity > 0 && itemExtent > 0
+                    ? Math.Clamp(remainingDistance * itemExtent / velocity, MinCompletionDuration, MaxCompletionDuration)
+                    : MaxCompletionDuration;
+            var easing = _isRubberBanding ? (Easing)new SineEaseOut() : new QuadraticEaseOut();
+
+            _isDragging = false;
+            _ = AnimateViewportOffsetAsync(
+                currentOffset,
+                endOffset,
+                TimeSpan.FromSeconds(durationSeconds),
+                easing,
+                () =>
+                {
+                    _totalDelta = 0;
+                    _isRubberBanding = false;
+                    carousel.IsSwiping = false;
+
+                    if (commit)
+                    {
+                        SetOffset(WithPrimaryOffset(_offset, GetNearestLogicalOffset(targetIndex, endOffset)));
+                        carousel.SelectedIndex = targetIndex;
+                    }
+                    else
+                    {
+                        SetOffset(WithPrimaryOffset(_offset, GetNearestLogicalOffset(carousel.SelectedIndex, endOffset)));
+                    }
+
+                    ResetViewportTransitionState();
+                    ClearFractionalProgressContext();
+                });
+        }
+
+        private async Task AnimateViewportOffsetAsync(
+            double fromOffset,
+            double toOffset,
+            TimeSpan duration,
+            Easing easing,
+            Action onCompleted)
+        {
+            CancelOffsetAnimation();
+            var offsetAnimationCts = new CancellationTokenSource();
+            _offsetAnimationCts = offsetAnimationCts;
+            var cancellationToken = offsetAnimationCts.Token;
+
+            var animation = new Animation.Animation
+            {
+                FillMode = FillMode.Forward,
+                Duration = duration,
+                Easing = easing,
+                Children =
+                {
+                    new KeyFrame
+                    {
+                        Setters = { new Setter(OffsetAnimationProgressProperty, 0d) },
+                        Cue = new Cue(0d)
+                    },
+                    new KeyFrame
+                    {
+                        Setters = { new Setter(OffsetAnimationProgressProperty, 1d) },
+                        Cue = new Cue(1d)
+                    }
+                }
+            };
+
+            _offsetAnimationStart = fromOffset;
+            _offsetAnimationTarget = toOffset;
+            SetValue(OffsetAnimationProgressProperty, 0d);
+
+            try
+            {
+                await animation.RunAsync(this, null, cancellationToken);
+
+                if (cancellationToken.IsCancellationRequested)
+                    return;
+
+                SetOffset(WithPrimaryOffset(_offset, toOffset));
+
+                if (UsesViewportFractionLayout() &&
+                    GetTransition() is IProgressPageTransition progressive)
+                {
+                    var transitionProgress = GetFractionalTransitionProgress(toOffset);
+                    progressive.Update(
+                        transitionProgress,
+                        FindViewportControl(_progressFromIndex),
+                        FindViewportControl(_progressToIndex),
+                        _isForward,
+                        GetViewportItemExtent(Bounds.Size),
+                        BuildFractionalVisibleItems(toOffset));
+                }
+
+                onCompleted();
+            }
+            finally
+            {
+                if (ReferenceEquals(_offsetAnimationCts, offsetAnimationCts))
+                    _offsetAnimationCts = null;
+            }
+        }
+
+        private void OnSwipeGestureEnded(object? sender, SwipeGestureEndedEventArgs e)
+        {
+            if (!_isDragging || e.Id != _swipeGestureId || ItemsControl is not Carousel carousel)
+                return;
+
+            if (UsesViewportFractionLayout())
+            {
+                OnViewportFractionSwipeGestureEnded(carousel, e);
+                return;
+            }
+
+            var size = _lockedAxis == PageSlide.SlideAxis.Horizontal ? Bounds.Width : Bounds.Height;
+            var rawProgress = size > 0 ? Math.Abs(_totalDelta) / size : 0;
+            var currentProgress = _isRubberBanding
+                ? RubberBandFactor * Math.Sqrt(rawProgress)
+                : rawProgress;
+            var velocity = _lockedAxis == PageSlide.SlideAxis.Horizontal
+                ? Math.Abs(e.Velocity.X)
+                : Math.Abs(e.Velocity.Y);
+            var commit = !_isRubberBanding
+                         && (currentProgress >= SwipeCommitThreshold ||
+                             (velocity > VelocityCommitThreshold && currentProgress >= MinSwipeDistanceForVelocityCommit))
+                         && _swipeTarget is not null;
+
+            _completionEndProgress = commit ? 1.0 : 0.0;
+            var remainingDistance = Math.Abs(_completionEndProgress - currentProgress);
+            var durationSeconds = _isRubberBanding
+                ? RubberBandReturnDuration
+                : velocity > 0
+                ? Math.Clamp(remainingDistance * size / velocity, MinCompletionDuration, MaxCompletionDuration)
+                : MaxCompletionDuration;
+            Easing easing = _isRubberBanding ? new SineEaseOut() : new QuadraticEaseOut();
+
+            _completionCts?.Cancel();
+            var completionCts = new CancellationTokenSource();
+            _completionCts = completionCts;
+
+            SetValue(CompletionProgressProperty, currentProgress);
+
+            var animation = new Animation.Animation
+            {
+                FillMode = FillMode.Forward,
+                Easing = easing,
+                Duration = TimeSpan.FromSeconds(durationSeconds),
+                Children =
+                {
+                    new KeyFrame
+                    {
+                        Setters = { new Setter { Property = CompletionProgressProperty, Value = currentProgress } },
+                        Cue = new Cue(0d)
+                    },
+                    new KeyFrame
+                    {
+                        Setters = { new Setter { Property = CompletionProgressProperty, Value = _completionEndProgress } },
+                        Cue = new Cue(1d)
+                    }
+                }
+            };
+
+            _isDragging = false;
+            _ = RunCompletionAnimation(animation, carousel, completionCts);
+        }
+
+        private async Task RunCompletionAnimation(
+            Animation.Animation animation,
+            Carousel carousel,
+            CancellationTokenSource completionCts)
+        {
+            var cancellationToken = completionCts.Token;
+
+            try
+            {
+                await animation.RunAsync(this, null, cancellationToken);
+
+                if (cancellationToken.IsCancellationRequested)
+                    return;
+
+                if (GetTransition() is IProgressPageTransition progressive)
+                {
+                    var swipeTarget = ReferenceEquals(_realized, _swipeTarget) ? null : _swipeTarget;
+                    var size = _lockedAxis == PageSlide.SlideAxis.Horizontal ? Bounds.Width : Bounds.Height;
+                    progressive.Update(
+                        _completionEndProgress,
+                        _realized,
+                        swipeTarget,
+                        _isForward,
+                        size,
+                        Array.Empty<PageTransitionItem>());
+                }
+
+                var commit = _completionEndProgress > 0.5;
+
+                if (commit && _swipeTarget is not null)
+                {
+                    var targetIndex = _swipeTargetIndex;
+                    var targetElement = _swipeTarget;
+
+                    // Clear swipe target state before promoting it to the realized element so
+                    // interactive transitions never receive the same control as both from/to.
+                    _swipeTarget = null;
+                    _swipeTargetIndex = -1;
+
+                    if (_realized != null)
+                        RecycleElement(_realized);
+
+                    _realized = targetElement;
+                    _realizedIndex = targetIndex;
+
+                    carousel.SelectedIndex = targetIndex;
+                }
+                else
+                {
+                    ResetSwipeState();
+                }
+
+                _totalDelta = 0;
+                _swipeTarget = null;
+                _swipeTargetIndex = -1;
+                _isRubberBanding = false;
+                carousel.IsSwiping = false;
+            }
+            finally
+            {
+                if (ReferenceEquals(_completionCts, completionCts))
+                    _completionCts = null;
+            }
+        }
+
+        /// <inheritdoc/>
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+        {
+            base.OnPropertyChanged(change);
+
+            if (change.Property == OffsetAnimationProgressProperty)
+            {
+                if (_offsetAnimationCts is { IsCancellationRequested: false })
+                {
+                    var animProgress = change.GetNewValue<double>();
+                    var primaryOffset = _offsetAnimationStart +
+                        ((_offsetAnimationTarget - _offsetAnimationStart) * animProgress);
+                    SetOffset(WithPrimaryOffset(_offset, primaryOffset));
+
+                    if (UsesViewportFractionLayout() &&
+                        GetTransition() is IProgressPageTransition progressive)
+                    {
+                        var transitionProgress = GetFractionalTransitionProgress(primaryOffset);
+                        progressive.Update(
+                            transitionProgress,
+                            FindViewportControl(_progressFromIndex),
+                            FindViewportControl(_progressToIndex),
+                            _isForward,
+                            GetViewportItemExtent(Bounds.Size),
+                            BuildFractionalVisibleItems(primaryOffset));
+                    }
+                }
+            }
+            else if (change.Property == CompletionProgressProperty)
+            {
+                var isCompletionAnimating = _completionCts is { IsCancellationRequested: false };
+
+                if (!_isDragging && _swipeTarget is null && !isCompletionAnimating)
+                    return;
+
+                var progress = change.GetNewValue<double>();
+                if (GetTransition() is IProgressPageTransition progressive)
+                {
+                    var swipeTarget = ReferenceEquals(_realized, _swipeTarget) ? null : _swipeTarget;
+                    var size = _lockedAxis == PageSlide.SlideAxis.Horizontal ? Bounds.Width : Bounds.Height;
+                    progressive.Update(
+                        progress,
+                        _realized,
+                        swipeTarget,
+                        _isForward,
+                        size,
+                        Array.Empty<PageTransitionItem>());
+                }
+            }
+        }
+
+        private IReadOnlyList<PageTransitionItem> BuildFractionalVisibleItems(double currentOffset)
+        {
+            var items = new PageTransitionItem[_viewportRealized.Count];
+            var i = 0;
+            foreach (var entry in _viewportRealized.OrderBy(x => x.Key))
+            {
+                items[i++] = new PageTransitionItem(
+                    entry.Value.ItemIndex,
+                    entry.Value.Control,
+                    entry.Key - currentOffset);
+            }
+
+            return items;
+        }
+
+        private void ResetSwipeState()
+        {
+            if (ItemsControl is Carousel carousel)
+                carousel.IsSwiping = false;
+
+            CancelOffsetAnimation();
+
+            ResetViewportTransitionState();
+            ResetTransitionState(_realized);
+
+            if (_swipeTarget is not null)
+                RecycleElement(_swipeTarget);
+
+            _isDragging = false;
+            _totalDelta = 0;
+            _swipeTarget = null;
+            _swipeTargetIndex = -1;
+            _isRubberBanding = false;
+            ClearFractionalProgressContext();
+
+            if (UsesViewportFractionLayout() && ItemsControl is Carousel viewportCarousel)
+                SetOffset(WithPrimaryOffset(_offset, GetNearestLogicalOffset(viewportCarousel.SelectedIndex, GetPrimaryOffset(_offset))));
+        }
+
+        private void ResetTransitionState(Control? control)
+        {
+            if (control is null)
+                return;
+
+            if (GetTransition() is IProgressPageTransition progressive)
+            {
+                progressive.Reset(control);
+            }
+            else
+            {
+                ResetVisualState(control);
+            }
+        }
+
+        private static void ResetVisualState(Control? control)
+        {
+            if (control is null)
+                return;
+            control.RenderTransform = null;
+            control.Opacity = 1;
+            control.ZIndex = 0;
+            control.Clip = null;
+        }
     }
 }
diff --git a/src/Avalonia.Controls/VirtualizingStackPanel.cs b/src/Avalonia.Controls/VirtualizingStackPanel.cs
index bc529b526c..669e75d81a 100644
--- a/src/Avalonia.Controls/VirtualizingStackPanel.cs
+++ b/src/Avalonia.Controls/VirtualizingStackPanel.cs
@@ -84,7 +84,8 @@ namespace Avalonia.Controls
         
         private bool _hasReachedStart = false;
         private bool _hasReachedEnd = false;
-        private Rect _extendedViewport;
+        private Rect _lastMeasuredExtendedViewport;
+        private Rect _lastKnownExtendedViewport;
 
         static VirtualizingStackPanel()
         {
@@ -182,7 +183,7 @@ namespace Avalonia.Controls
         /// <summary>
         /// Returns the extended viewport that contains any visible elements and the additional elements for fast scrolling (viewport * CacheLength * 2)
         /// </summary>
-        internal Rect ExtendedViewPort => _extendedViewport;
+        internal Rect LastMeasuredExtendedViewPort => _lastMeasuredExtendedViewport;
 
         protected override Size MeasureOverride(Size availableSize)
         {
@@ -692,7 +693,7 @@ namespace Avalonia.Controls
             Debug.Assert(_realizedElements is not null);
 
             // Use the extended viewport for calculations
-            var viewport = _extendedViewport;
+            var viewport = _lastMeasuredExtendedViewport;
 
             // Get the viewport in the orientation direction.
             var viewportStart = orientation == Orientation.Horizontal ? viewport.X : viewport.Y;
@@ -1165,40 +1166,25 @@ namespace Avalonia.Controls
             ItemContainerGenerator.ItemContainerIndexChanged(element, oldIndex, newIndex);
         }
         
-        private void OnEffectiveViewportChanged(object? sender, EffectiveViewportChangedEventArgs e)
+        private Rect CalculateExtendedViewport(bool vertical, double viewportSize, double bufferSize)
         {
-            var vertical = Orientation == Orientation.Vertical;
-            var oldViewportStart = vertical ? _viewport.Top : _viewport.Left;
-            var oldViewportEnd = vertical ? _viewport.Bottom : _viewport.Right;
-            var oldExtendedViewportStart = vertical ? _extendedViewport.Top : _extendedViewport.Left;
-            var oldExtendedViewportEnd = vertical ? _extendedViewport.Bottom : _extendedViewport.Right;
-
-            // Update current viewport
-            _viewport = e.EffectiveViewport.Intersect(new(Bounds.Size));
-            _isWaitingForViewportUpdate = false;
 
-            // Calculate buffer sizes based on viewport dimensions
-            var viewportSize = vertical ? _viewport.Height : _viewport.Width;
-            var bufferSize = viewportSize * _bufferFactor;
-            
-            // Calculate extended viewport with relative buffers
-            var extendedViewportStart = vertical ? 
-                Math.Max(0, _viewport.Top - bufferSize) : 
+            var extendedViewportStart = vertical ?
+                Math.Max(0, _viewport.Top - bufferSize) :
                 Math.Max(0, _viewport.Left - bufferSize);
-                
-            var extendedViewportEnd = vertical ? 
-                Math.Min(Bounds.Height, _viewport.Bottom + bufferSize) : 
+
+            var extendedViewportEnd = vertical ?
+                Math.Min(Bounds.Height, _viewport.Bottom + bufferSize) :
                 Math.Min(Bounds.Width, _viewport.Right + bufferSize);
 
-            // special case:
             // If we are at the start of the list, append 2 * CacheLength additional items
             // If we are at the end of the list, prepend 2 * CacheLength additional items
-            // - this way we always maintain "2 * CacheLength * element" items. 
+            // - this way we always maintain "2 * CacheLength * element" items.
             if (vertical)
             {
                 var spaceAbove = _viewport.Top - bufferSize;
                 var spaceBelow = Bounds.Height - (_viewport.Bottom + bufferSize);
-                
+
                 if (spaceAbove < 0 && spaceBelow >= 0)
                     extendedViewportEnd = Math.Min(Bounds.Height, extendedViewportEnd + Math.Abs(spaceAbove));
                 if (spaceAbove >= 0 && spaceBelow < 0)
@@ -1208,30 +1194,48 @@ namespace Avalonia.Controls
             {
                 var spaceLeft = _viewport.Left - bufferSize;
                 var spaceRight = Bounds.Width - (_viewport.Right + bufferSize);
-                
+
                 if (spaceLeft < 0 && spaceRight >= 0)
                     extendedViewportEnd = Math.Min(Bounds.Width, extendedViewportEnd + Math.Abs(spaceLeft));
-                if(spaceLeft >= 0 && spaceRight < 0)
+                if (spaceLeft >= 0 && spaceRight < 0)
                     extendedViewportStart = Math.Max(0, extendedViewportStart - Math.Abs(spaceRight));
             }
 
-            Rect extendedViewPort;
             if (vertical)
             {
-                extendedViewPort = new Rect(
-                    _viewport.X, 
+                return new Rect(
+                    _viewport.X,
                     extendedViewportStart,
                     _viewport.Width,
                     extendedViewportEnd - extendedViewportStart);
             }
             else
             {
-                extendedViewPort = new Rect(
+                return new Rect(
                     extendedViewportStart,
                     _viewport.Y,
                     extendedViewportEnd - extendedViewportStart,
                     _viewport.Height);
             }
+        }
+
+        private void OnEffectiveViewportChanged(object? sender, EffectiveViewportChangedEventArgs e)
+        {
+            var vertical = Orientation == Orientation.Vertical;
+            var oldViewportStart = vertical ? _viewport.Top : _viewport.Left;
+            var oldViewportEnd = vertical ? _viewport.Bottom : _viewport.Right;
+            var oldExtendedViewportStart = vertical ? _lastMeasuredExtendedViewport.Top : _lastMeasuredExtendedViewport.Left;
+            var oldExtendedViewportEnd = vertical ? _lastMeasuredExtendedViewport.Bottom : _lastMeasuredExtendedViewport.Right;
+
+            // Update current viewport
+            _viewport = e.EffectiveViewport.Intersect(new(Bounds.Size));
+            _isWaitingForViewportUpdate = false;
+
+            // Calculate buffer sizes based on viewport dimensions
+            var viewportSize = vertical ? _viewport.Height : _viewport.Width;
+            var bufferSize = viewportSize * _bufferFactor;
+
+            var extendedViewPort = CalculateExtendedViewport(vertical, viewportSize, bufferSize);
 
             // Determine if we need a new measure
             var newViewportStart = vertical ? _viewport.Top : _viewport.Left;
@@ -1240,14 +1244,13 @@ namespace Avalonia.Controls
             var newExtendedViewportEnd = vertical ? extendedViewPort.Bottom : extendedViewPort.Right;
 
             var needsMeasure = false;
-            
-           
+
             // Case 1: Viewport has changed significantly
             if (!MathUtilities.AreClose(oldViewportStart, newViewportStart) ||
                 !MathUtilities.AreClose(oldViewportEnd, newViewportEnd))
             {
                 // Case 1a: The new viewport exceeds the old extended viewport
-                if (newViewportStart < oldExtendedViewportStart || 
+                if (newViewportStart < oldExtendedViewportStart ||
                     newViewportEnd > oldExtendedViewportEnd)
                 {
                     needsMeasure = true;
@@ -1259,19 +1262,19 @@ namespace Avalonia.Controls
                     // Check if we're about to scroll into an area where we don't have realized elements
                     // This would be the case if we're near the edge of our current extended viewport
                     var nearingEdge = false;
-                    
+
                     if (_realizedElements != null)
                     {
                         var firstRealizedElementU = _realizedElements.StartU;
                         var lastRealizedElementU = _realizedElements.StartU;
-                        
+
                         for (var i = 0; i < _realizedElements.Count; i++)
                         {
                             lastRealizedElementU += _realizedElements.SizeU[i];
                         }
-                        
+
                         // If scrolling up/left and nearing the top/left edge of realized elements
-                        if (newViewportStart < oldViewportStart && 
+                        if (newViewportStart < oldViewportStart &&
                             newViewportStart - newExtendedViewportStart < bufferSize)
                         {
                             // Edge case: We're at item 0 with excess measurement space.
@@ -1279,9 +1282,9 @@ namespace Avalonia.Controls
                             // This prevents redundant Measure-Arrange cycles when at list beginning.
                             nearingEdge = !_hasReachedStart;
                         }
-                        
+
                         // If scrolling down/right and nearing the bottom/right edge of realized elements
-                        if (newViewportEnd > oldViewportEnd && 
+                        if (newViewportEnd > oldViewportEnd &&
                             newExtendedViewportEnd - newViewportEnd < bufferSize)
                         {
                             // Edge case: We're at the last item with excess measurement space.
@@ -1294,16 +1297,34 @@ namespace Avalonia.Controls
                     {
                         nearingEdge = true;
                     }
-                    
+
                     needsMeasure = nearingEdge;
                 }
             }
 
+            // Supplementary check: detect viewport growth after a previous shrink.
+            // The main comparison (Cases 1a/1b) uses _extendedViewport which only updates
+            // on measure. When the viewport shrinks (e.g. ComboBox popup during filtering),
+            // _extendedViewport stays stale-large, masking subsequent growth. Compare against
+            // _lastKnownExtendedViewport (always updated) to catch this case.
+            if (!needsMeasure)
+            {
+                var lastKnownStart = vertical ? _lastKnownExtendedViewport.Top : _lastKnownExtendedViewport.Left;
+                var lastKnownEnd = vertical ? _lastKnownExtendedViewport.Bottom : _lastKnownExtendedViewport.Right;
+                if (newViewportStart < lastKnownStart || newViewportEnd > lastKnownEnd)
+                {
+                    needsMeasure = true;
+                }
+            }
+
+            _lastKnownExtendedViewport = extendedViewPort;
+
             if (needsMeasure)
             {
-                // only store the new "old" extended viewport if we _did_ actually measure
-                _extendedViewport = extendedViewPort;
-                
+                // Only update the measure viewport when triggering a measure. This keeps the
+                // wider realization range available for externally-triggered measures (e.g. from
+                // OnItemsChanged), ensuring enough items are realized.
+                _lastMeasuredExtendedViewport = extendedViewPort;
                 InvalidateMeasure();
             }
         }
diff --git a/src/Avalonia.Controls/Window.cs b/src/Avalonia.Controls/Window.cs
index db3ec6a077..e7a4ce953e 100644
--- a/src/Avalonia.Controls/Window.cs
+++ b/src/Avalonia.Controls/Window.cs
@@ -6,6 +6,7 @@ using System.Threading.Tasks;
 using Avalonia.Automation.Peers;
 using Avalonia.Controls.Chrome;
 using Avalonia.Controls.Platform;
+using Avalonia.Controls.Primitives;
 using Avalonia.Input;
 using Avalonia.Interactivity;
 using Avalonia.Layout;
@@ -795,6 +796,12 @@ namespace Avalonia.Controls
             ShowCore<object>(null, false);
         }
 
+        protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
+        {
+            base.OnApplyTemplate(e);
+            EnableVisualLayerManagerLayers();
+        }
+
         protected override void IsVisibleChanged(AvaloniaPropertyChangedEventArgs e)
         {
             if (!IgnoreVisibilityChanges)
diff --git a/src/Avalonia.Themes.Fluent/Controls/CarouselPage.xaml b/src/Avalonia.Themes.Fluent/Controls/CarouselPage.xaml
new file mode 100644
index 0000000000..25b5d67cb3
--- /dev/null
+++ b/src/Avalonia.Themes.Fluent/Controls/CarouselPage.xaml
@@ -0,0 +1,30 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <Design.PreviewWith>
+    <Border Width="400" Height="300">
+      <CarouselPage>
+        <ContentPage Header="Page 1">
+          <TextBlock Text="First page" HorizontalAlignment="Center" VerticalAlignment="Center" />
+        </ContentPage>
+        <ContentPage Header="Page 2">
+          <TextBlock Text="Second page" HorizontalAlignment="Center" VerticalAlignment="Center" />
+        </ContentPage>
+      </CarouselPage>
+    </Border>
+  </Design.PreviewWith>
+
+  <ControlTheme x:Key="{x:Type CarouselPage}" TargetType="CarouselPage">
+    <Setter Property="Background" Value="{DynamicResource SolidBackgroundFillColorBaseBrush}" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Carousel Name="PART_Carousel"
+                  Background="{TemplateBinding Background}"
+                  ItemTemplate="{TemplateBinding PageTemplate}"
+                  PageTransition="{TemplateBinding PageTransition}"
+                  ItemsPanel="{TemplateBinding ItemsPanel}"
+                  HorizontalAlignment="Stretch"
+                  VerticalAlignment="Stretch" />
+      </ControlTemplate>
+    </Setter>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/DrawerPage.xaml b/src/Avalonia.Themes.Fluent/Controls/DrawerPage.xaml
index 4f892153b1..985814c967 100644
--- a/src/Avalonia.Themes.Fluent/Controls/DrawerPage.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/DrawerPage.xaml
@@ -47,6 +47,8 @@
                     VerticalAlignment="Center"/>
                   <ContentPresenter
                     Name="PART_CompactPaneIconPresenter"
+                    Content="{TemplateBinding DrawerIcon}"
+                    ContentTemplate="{TemplateBinding DrawerIconTemplate}"
                     IsVisible="{Binding DrawerIcon, RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static ObjectConverters.IsNotNull}}"
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"/>
@@ -101,6 +103,8 @@
                         VerticalAlignment="Center"/>
                       <ContentPresenter
                         Name="PART_PaneIconPresenter"
+                        Content="{TemplateBinding DrawerIcon}"
+                        ContentTemplate="{TemplateBinding DrawerIconTemplate}"
                         IsVisible="{Binding DrawerIcon, RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static ObjectConverters.IsNotNull}}"
                         HorizontalAlignment="Center"
                         VerticalAlignment="Center"/>
@@ -146,6 +150,8 @@
                         VerticalAlignment="Center"/>
                       <ContentPresenter
                         Name="PART_BottomPaneIconPresenter"
+                        Content="{TemplateBinding DrawerIcon}"
+                        ContentTemplate="{TemplateBinding DrawerIconTemplate}"
                         IsVisible="{Binding DrawerIcon, RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static ObjectConverters.IsNotNull}}"
                         HorizontalAlignment="Center"
                         VerticalAlignment="Center"/>
diff --git a/src/Avalonia.Themes.Fluent/Controls/EmbeddableControlRoot.xaml b/src/Avalonia.Themes.Fluent/Controls/EmbeddableControlRoot.xaml
index 1fc931db36..2ea83ec6a9 100644
--- a/src/Avalonia.Themes.Fluent/Controls/EmbeddableControlRoot.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/EmbeddableControlRoot.xaml
@@ -12,7 +12,7 @@
         <Panel>
           <Border Name="PART_TransparencyFallback" IsHitTestVisible="False" />
           <Border Background="{TemplateBinding Background}">
-            <VisualLayerManager>
+            <VisualLayerManager Name="PART_VisualLayerManager">
               <ContentPresenter Name="PART_ContentPresenter"
                                 ContentTemplate="{TemplateBinding ContentTemplate}"
                                 Content="{TemplateBinding Content}"
diff --git a/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml b/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml
index 71327c371b..0daa900a4c 100644
--- a/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml
@@ -9,6 +9,7 @@
                 <MergeResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/AdornerLayer.xaml" />
                 <MergeResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/Button.xaml" />
                 <MergeResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/CommandBar.xaml" />
+                <MergeResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/CarouselPage.xaml" />
                 <MergeResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/ContentPage.xaml" />
                 <MergeResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/DrawerPage.xaml" />
                 <MergeResourceInclude Source="avares://Avalonia.Themes.Fluent/Controls/NavigationPage.xaml" />
diff --git a/src/Avalonia.Themes.Fluent/Controls/GroupBox.xaml b/src/Avalonia.Themes.Fluent/Controls/GroupBox.xaml
index 4278b91e36..5b31fdb55c 100644
--- a/src/Avalonia.Themes.Fluent/Controls/GroupBox.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/GroupBox.xaml
@@ -1,11 +1,13 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:converters="clr-namespace:Avalonia.Controls.Converters;assembly=Avalonia.Controls"
                     x:ClassModifier="internal">
   <Design.PreviewWith>
     <GroupBox Padding="10" Margin="10">
       <TextBlock Text="Hello World" />
     </GroupBox>
   </Design.PreviewWith>
+  <converters:BorderGapMaskConverter x:Key="BorderGapMaskConverter" />
 
   <ControlTheme x:Key="{x:Type GroupBox}"
                 TargetType="GroupBox">
@@ -18,62 +20,60 @@
       <ControlTemplate>
         <Grid x:Name="RootGrid" UseLayoutRounding="true" ColumnDefinitions="6,Auto,*,6" RowDefinitions="Auto,Auto,*,6">
           <!-- Separate Border for the background because if the background is set in the Border with the Header the opacity mask will be applied to the background as well. -->
-            <Border Grid.Row="1"
-                    Grid.RowSpan="3"
-                    Grid.Column="0"
-                    Grid.ColumnSpan="4"
-                    CornerRadius="{TemplateBinding CornerRadius}"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    BorderBrush="Transparent"
-                    Background="{TemplateBinding Background}"/>
+          <Border Grid.Row="1"
+                  Grid.RowSpan="3"
+                  Grid.Column="0"
+                  Grid.ColumnSpan="4"
+                  CornerRadius="{TemplateBinding CornerRadius}"
+                  BorderThickness="{TemplateBinding BorderThickness}"
+                  BorderBrush="Transparent"
+                  Background="{TemplateBinding Background}"/>
 
-            <Border Grid.Row="1"
-                    Grid.RowSpan="3"
-                    Grid.ColumnSpan="4"
-                    CornerRadius="{TemplateBinding CornerRadius}"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    BorderBrush="{TemplateBinding BorderBrush}">
-              <Border.OpacityMask>
-                <VisualBrush>
-                  <VisualBrush.Visual>
-                    <Canvas Background="Transparent">
-                      <Rectangle Fill="Transparent"
-                                Width="{Binding #Header.Bounds.Width}"
-                                Height="{Binding #Header.Bounds.Height}"
-                                Canvas.Left="{Binding #Header.Bounds.X}"
-                                Canvas.Top="{Binding #Header.Bounds.Y}"/>
-                    </Canvas>
-                  </VisualBrush.Visual>
-                </VisualBrush>
-              </Border.OpacityMask>
-            </Border>
+          <Border Grid.Row="1"
+                  Grid.RowSpan="3"
+                  Grid.ColumnSpan="4"
+                  CornerRadius="{TemplateBinding CornerRadius}"
+                  BorderThickness="{TemplateBinding BorderThickness}"
+                  BorderBrush="{TemplateBinding BorderBrush}">
+            <Border.OpacityMask>
+              <MultiBinding Converter="{StaticResource BorderGapMaskConverter}"
+                            ConverterParameter="6">
+                <Binding ElementName="Header"
+                         Path="Bounds.Width"/>
+                <Binding RelativeSource="{RelativeSource Self}"
+                         Path="Bounds.Width"/>
+                <Binding RelativeSource="{RelativeSource Self}"
+                         Path="Bounds.Height"/>
+              </MultiBinding>
+            </Border.OpacityMask>
+          </Border>
 
-            <!-- ContentPresenter for the header -->
-            <Border x:Name="Header"
-                    Padding="3,0,3,0"
-                    Grid.Row="0"
-                    Grid.RowSpan="2"
-                    Grid.Column="1">
-                <ContentPresenter Name="PART_HeaderPresenter"
-                                  Content="{TemplateBinding Header}"
-                                  FontSize="{DynamicResource GroupBoxHeaderFontSize}"
-                                  Foreground="{DynamicResource GroupBoxHeaderForeground}"
-                                  ContentTemplate="{TemplateBinding HeaderTemplate}"
-                                  HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                  VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                  UseLayoutRounding="{TemplateBinding UseLayoutRounding}" />
-            </Border>
-            <!-- Primary content for GroupBox -->
-            <ContentPresenter Grid.Row="2"
-                              Grid.Column="1"
-                              Grid.ColumnSpan="2"
-                              Name="PART_ContentPresenter"
-                              ContentTemplate="{TemplateBinding ContentTemplate}"
-                              Content="{TemplateBinding Content}"
-                              VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+          <!-- ContentPresenter for the header -->
+          <Border x:Name="Header"
+                  Padding="3,0,3,0"
+                  Grid.Row="0"
+                  Grid.RowSpan="2"
+                  Grid.Column="1">
+            <ContentPresenter Name="PART_HeaderPresenter"
+                              Content="{TemplateBinding Header}"
+                              FontSize="{DynamicResource GroupBoxHeaderFontSize}"
+                              Foreground="{DynamicResource GroupBoxHeaderForeground}"
+                              ContentTemplate="{TemplateBinding HeaderTemplate}"
                               HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                              UseLayoutRounding="{TemplateBinding UseLayoutRounding}"
-                              Margin="{TemplateBinding Padding}" />
+                              VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                              UseLayoutRounding="{TemplateBinding UseLayoutRounding}" />
+          </Border>
+          <!-- Primary content for GroupBox -->
+          <ContentPresenter Grid.Row="2"
+                            Grid.Column="1"
+                            Grid.ColumnSpan="2"
+                            Name="PART_ContentPresenter"
+                            ContentTemplate="{TemplateBinding ContentTemplate}"
+                            Content="{TemplateBinding Content}"
+                            VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                            UseLayoutRounding="{TemplateBinding UseLayoutRounding}"
+                            Margin="{TemplateBinding Padding}" />
         </Grid>
       </ControlTemplate>
     </Setter>
@@ -84,7 +84,7 @@
 
     <Style Selector="^ /template/ ContentPresenter#PART_HeaderPresenter">
       <Setter Property="RecognizesAccessKey" Value="True" />
-    </Style> 
+    </Style>
 
   </ControlTheme>
 </ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/NavigationPage.xaml b/src/Avalonia.Themes.Fluent/Controls/NavigationPage.xaml
index dd12d3ce27..8c2172a787 100644
--- a/src/Avalonia.Themes.Fluent/Controls/NavigationPage.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/NavigationPage.xaml
@@ -18,12 +18,26 @@
     <Setter Property="Background" Value="Transparent" />
     <Setter Property="PageTransition">
       <Setter.Value>
-        <PageSlide Duration="0:0:0.3" Orientation="Horizontal" FillMode="Forward" />
+        <PageSlide Duration="0:0:0.3" Orientation="Horizontal" FillMode="Forward">
+          <PageSlide.SlideInEasing>
+            <SplineEasing X1="0.16" Y1="1" X2="0.3" Y2="1" />
+          </PageSlide.SlideInEasing>
+          <PageSlide.SlideOutEasing>
+            <SplineEasing X1="0.2" Y1="0.85" X2="0.3" Y2="1" />
+          </PageSlide.SlideOutEasing>
+        </PageSlide>
       </Setter.Value>
     </Setter>
     <Setter Property="ModalTransition">
       <Setter.Value>
-        <PageSlide Duration="0:0:0.25" Orientation="Vertical" FillMode="Forward" />
+        <PageSlide Duration="0:0:0.25" Orientation="Vertical" FillMode="Forward">
+          <PageSlide.SlideInEasing>
+            <SplineEasing X1="0.16" Y1="1" X2="0.3" Y2="1" />
+          </PageSlide.SlideInEasing>
+          <PageSlide.SlideOutEasing>
+            <SplineEasing X1="0.2" Y1="0.85" X2="0.3" Y2="1" />
+          </PageSlide.SlideOutEasing>
+        </PageSlide>
       </Setter.Value>
     </Setter>
     <Setter Property="Template">
@@ -107,16 +121,15 @@
                       ToolTip.Tip="{x:Null}">
                 <Panel Background="Transparent">
                   <Path Data="{DynamicResource NavigationPageBackIcon}"
+                        x:Name="PART_BackButtonDefaultIcon"
                         Fill="{DynamicResource NavigationBarForeground}"
                         Width="24"
                         Height="24"
                         Stretch="Uniform"
                         HorizontalAlignment="Center"
-                        VerticalAlignment="Center"
-                        IsVisible="{Binding CurrentPage?.(NavigationPage.BackButtonContent), RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static ObjectConverters.IsNull}, FallbackValue=False}" />
+                        VerticalAlignment="Center" />
                   <ContentPresenter
-                    Content="{Binding CurrentPage?.(NavigationPage.BackButtonContent), RelativeSource={RelativeSource TemplatedParent}, FallbackValue={x:Null}}"
-                    IsVisible="{Binding CurrentPage?.(NavigationPage.BackButtonContent), RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static ObjectConverters.IsNotNull}, FallbackValue=False}"
+                    x:Name="PART_BackButtonContentPresenter"
                     VerticalAlignment="Center"
                     HorizontalAlignment="Center"/>
                 </Panel>
diff --git a/src/Avalonia.Themes.Fluent/Controls/OverlayPopupHost.xaml b/src/Avalonia.Themes.Fluent/Controls/OverlayPopupHost.xaml
index 3b1b5f6c3d..132400d859 100644
--- a/src/Avalonia.Themes.Fluent/Controls/OverlayPopupHost.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/OverlayPopupHost.xaml
@@ -11,7 +11,7 @@
     <Setter Property="Template">
       <ControlTemplate>
         <LayoutTransformControl LayoutTransform="{TemplateBinding Transform}">
-          <VisualLayerManager IsPopup="True">
+          <VisualLayerManager Name="PART_VisualLayerManager">
             <ContentPresenter Name="PART_ContentPresenter"
                               Background="{TemplateBinding Background}"
                               ContentTemplate="{TemplateBinding ContentTemplate}"
diff --git a/src/Avalonia.Themes.Fluent/Controls/PopupRoot.xaml b/src/Avalonia.Themes.Fluent/Controls/PopupRoot.xaml
index cd3942738c..1ce4e63576 100644
--- a/src/Avalonia.Themes.Fluent/Controls/PopupRoot.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/PopupRoot.xaml
@@ -15,7 +15,7 @@
         <LayoutTransformControl LayoutTransform="{TemplateBinding Transform}">
           <Panel>
             <Border Name="PART_TransparencyFallback" IsHitTestVisible="False" />
-            <VisualLayerManager IsPopup="True">
+            <VisualLayerManager Name="PART_VisualLayerManager">
               <ContentPresenter Name="PART_ContentPresenter"
                                 Background="{TemplateBinding Background}"
                                 ContentTemplate="{TemplateBinding ContentTemplate}"
diff --git a/src/Avalonia.Themes.Fluent/Controls/TabbedPage.xaml b/src/Avalonia.Themes.Fluent/Controls/TabbedPage.xaml
index e552ecab2e..d19f8937ee 100644
--- a/src/Avalonia.Themes.Fluent/Controls/TabbedPage.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/TabbedPage.xaml
@@ -136,6 +136,7 @@
                         VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
               <ContentPresenter Name="PART_IconPresenter"
                                 Content="{TemplateBinding Icon}"
+                                ContentTemplate="{TemplateBinding IconTemplate}"
                                 HorizontalAlignment="Center"
                                 IsVisible="{TemplateBinding Icon, Converter={x:Static ObjectConverters.IsNotNull}}"
                                 Width="{DynamicResource TabbedPageTabItemHeaderIconSize}"
@@ -253,8 +254,7 @@
                       Theme="{StaticResource TabbedPageTabControlTheme}"
                       ItemContainerTheme="{StaticResource TabbedPageTabItemTheme}"
                       HorizontalAlignment="Stretch"
-                      VerticalAlignment="Stretch"
-                      ItemsSource="{TemplateBinding Pages}" />
+                      VerticalAlignment="Stretch" />
         </Panel>
       </ControlTemplate>
     </Setter>
diff --git a/src/Avalonia.Themes.Fluent/Controls/Window.xaml b/src/Avalonia.Themes.Fluent/Controls/Window.xaml
index f56c9fbd10..0f25079004 100644
--- a/src/Avalonia.Themes.Fluent/Controls/Window.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/Window.xaml
@@ -14,7 +14,7 @@
           <Border Name="PART_TransparencyFallback" IsHitTestVisible="False" />
           <Border Background="{TemplateBinding Background}" IsHitTestVisible="False" />
           <Panel Background="Transparent" Margin="{TemplateBinding WindowDecorationMargin}" />
-          <VisualLayerManager>
+          <VisualLayerManager Name="PART_VisualLayerManager">
             <ContentPresenter Name="PART_ContentPresenter"
                               ContentTemplate="{TemplateBinding ContentTemplate}"
                               Content="{TemplateBinding Content}"
diff --git a/src/Avalonia.Themes.Fluent/Controls/WindowDrawnDecorations.xaml b/src/Avalonia.Themes.Fluent/Controls/WindowDrawnDecorations.xaml
index d00007010c..b2d66fdbbd 100644
--- a/src/Avalonia.Themes.Fluent/Controls/WindowDrawnDecorations.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/WindowDrawnDecorations.xaml
@@ -190,12 +190,7 @@
     <Style Selector="^:maximized /template/ Path#RestoreButtonPath">
       <Setter Property="Data" Value="M2048 410h-410v-410h-1638v1638h410v410h1638v-1638zM1434 1434h-1229v-1229h1229v1229zM1843 1843h-1229v-205h1024v-1024h205v1229z" />
     </Style>
-
-    <!-- Fullscreen: update fullscreen button icon to "exit fullscreen" -->
-    <Style Selector="^:fullscreen /template/ Path#FullScreenButtonPath">
-      <Setter Property="Data" Value="M205 1024h819v-819h-205v469l-674 -674l-145 145l674 674h-469v205zM1374 1229h469v-205h-819v819h205v-469l674 674l145 -145z" />
-    </Style>
-
+    
     <!-- Disabled buttons -->
     <Style Selector="^ /template/ Button:disabled">
       <Setter Property="Opacity" Value="0.2"/>
diff --git a/src/Avalonia.Themes.Simple/Controls/CarouselPage.xaml b/src/Avalonia.Themes.Simple/Controls/CarouselPage.xaml
new file mode 100644
index 0000000000..3e228c34c9
--- /dev/null
+++ b/src/Avalonia.Themes.Simple/Controls/CarouselPage.xaml
@@ -0,0 +1,30 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <Design.PreviewWith>
+    <Border Width="400" Height="300">
+      <CarouselPage>
+        <ContentPage Header="Page 1">
+          <TextBlock Text="First page" HorizontalAlignment="Center" VerticalAlignment="Center" />
+        </ContentPage>
+        <ContentPage Header="Page 2">
+          <TextBlock Text="Second page" HorizontalAlignment="Center" VerticalAlignment="Center" />
+        </ContentPage>
+      </CarouselPage>
+    </Border>
+  </Design.PreviewWith>
+
+  <ControlTheme x:Key="{x:Type CarouselPage}" TargetType="CarouselPage">
+    <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Carousel Name="PART_Carousel"
+                  Background="{TemplateBinding Background}"
+                  ItemTemplate="{TemplateBinding PageTemplate}"
+                  PageTransition="{TemplateBinding PageTransition}"
+                  ItemsPanel="{TemplateBinding ItemsPanel}"
+                  HorizontalAlignment="Stretch"
+                  VerticalAlignment="Stretch" />
+      </ControlTemplate>
+    </Setter>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Avalonia.Themes.Simple/Controls/DrawerPage.xaml b/src/Avalonia.Themes.Simple/Controls/DrawerPage.xaml
index 9a3e6d37cf..9acf4c4d43 100644
--- a/src/Avalonia.Themes.Simple/Controls/DrawerPage.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/DrawerPage.xaml
@@ -46,6 +46,8 @@
                     VerticalAlignment="Center"/>
                   <ContentPresenter
                     Name="PART_CompactPaneIconPresenter"
+                    Content="{TemplateBinding DrawerIcon}"
+                    ContentTemplate="{TemplateBinding DrawerIconTemplate}"
                     IsVisible="{Binding DrawerIcon, RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static ObjectConverters.IsNotNull}}"
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"/>
@@ -92,6 +94,8 @@
                         VerticalAlignment="Center"/>
                       <ContentPresenter
                         Name="PART_PaneIconPresenter"
+                        Content="{TemplateBinding DrawerIcon}"
+                        ContentTemplate="{TemplateBinding DrawerIconTemplate}"
                         IsVisible="{Binding DrawerIcon, RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static ObjectConverters.IsNotNull}}"
                         HorizontalAlignment="Center"
                         VerticalAlignment="Center"/>
@@ -129,6 +133,8 @@
                         VerticalAlignment="Center"/>
                       <ContentPresenter
                         Name="PART_BottomPaneIconPresenter"
+                        Content="{TemplateBinding DrawerIcon}"
+                        ContentTemplate="{TemplateBinding DrawerIconTemplate}"
                         IsVisible="{Binding DrawerIcon, RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static ObjectConverters.IsNotNull}}"
                         HorizontalAlignment="Center"
                         VerticalAlignment="Center"/>
diff --git a/src/Avalonia.Themes.Simple/Controls/EmbeddableControlRoot.xaml b/src/Avalonia.Themes.Simple/Controls/EmbeddableControlRoot.xaml
index 87c940c281..6bd45b331d 100644
--- a/src/Avalonia.Themes.Simple/Controls/EmbeddableControlRoot.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/EmbeddableControlRoot.xaml
@@ -13,7 +13,7 @@
           <Border Name="PART_TransparencyFallback"
                   IsHitTestVisible="False" />
           <Border Background="{TemplateBinding Background}">
-            <VisualLayerManager>
+            <VisualLayerManager Name="PART_VisualLayerManager">
               <ContentPresenter Name="PART_ContentPresenter"
                                 Margin="{TemplateBinding Padding}"
                                 Content="{TemplateBinding Content}"
diff --git a/src/Avalonia.Themes.Simple/Controls/GroupBox.xaml b/src/Avalonia.Themes.Simple/Controls/GroupBox.xaml
index 526ba7cc77..826c3ec2fe 100644
--- a/src/Avalonia.Themes.Simple/Controls/GroupBox.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/GroupBox.xaml
@@ -1,11 +1,13 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:converters="clr-namespace:Avalonia.Controls.Converters;assembly=Avalonia.Controls"
                     x:ClassModifier="internal">
   <Design.PreviewWith>
     <GroupBox Padding="10" Margin="10">
       <TextBlock Text="Hello World" />
     </GroupBox>
   </Design.PreviewWith>
+  <converters:BorderGapMaskConverter x:Key="BorderGapMaskConverter" />
 
   <ControlTheme x:Key="{x:Type GroupBox}"
                 TargetType="GroupBox">
@@ -16,60 +18,58 @@
       <ControlTemplate>
         <Grid x:Name="RootGrid" UseLayoutRounding="true" ColumnDefinitions="6,Auto,*,6" RowDefinitions="Auto,Auto,*,6">
           <!-- Separate Border for the background because if the background is set in the Border with the Header the opacity mask will be applied to the background as well. -->
-            <Border Grid.Row="1"
-                    Grid.RowSpan="3"
-                    Grid.Column="0"
-                    Grid.ColumnSpan="4"
-                    CornerRadius="{TemplateBinding CornerRadius}"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    BorderBrush="Transparent"
-                    Background="{TemplateBinding Background}"/>
+          <Border Grid.Row="1"
+                  Grid.RowSpan="3"
+                  Grid.Column="0"
+                  Grid.ColumnSpan="4"
+                  CornerRadius="{TemplateBinding CornerRadius}"
+                  BorderThickness="{TemplateBinding BorderThickness}"
+                  BorderBrush="Transparent"
+                  Background="{TemplateBinding Background}"/>
 
-            <Border Grid.Row="1"
-                    Grid.RowSpan="3"
-                    Grid.ColumnSpan="4"
-                    CornerRadius="{TemplateBinding CornerRadius}"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    BorderBrush="{TemplateBinding BorderBrush}">
-              <Border.OpacityMask>
-                <VisualBrush>
-                  <VisualBrush.Visual>
-                    <Canvas Background="Transparent">
-                      <Rectangle Fill="Transparent"
-                                Width="{Binding #Header.Bounds.Width}"
-                                Height="{Binding #Header.Bounds.Height}"
-                                Canvas.Left="{Binding #Header.Bounds.X}"
-                                Canvas.Top="{Binding #Header.Bounds.Y}"/>
-                    </Canvas>
-                  </VisualBrush.Visual>
-                </VisualBrush>
-              </Border.OpacityMask>
-            </Border>
+          <Border Grid.Row="1"
+                  Grid.RowSpan="3"
+                  Grid.ColumnSpan="4"
+                  CornerRadius="{TemplateBinding CornerRadius}"
+                  BorderThickness="{TemplateBinding BorderThickness}"
+                  BorderBrush="{TemplateBinding BorderBrush}">
+            <Border.OpacityMask>
+              <MultiBinding Converter="{StaticResource BorderGapMaskConverter}"
+                            ConverterParameter="6">
+                <Binding ElementName="Header"
+                         Path="Bounds.Width"/>
+                <Binding RelativeSource="{RelativeSource Self}"
+                         Path="Bounds.Width"/>
+                <Binding RelativeSource="{RelativeSource Self}"
+                         Path="Bounds.Height"/>
+              </MultiBinding>
+            </Border.OpacityMask>
+          </Border>
 
-            <!-- ContentPresenter for the header -->
-            <Border x:Name="Header"
-                    Padding="3,0,3,0"
-                    Grid.Row="0"
-                    Grid.RowSpan="2"
-                    Grid.Column="1">
-                <ContentPresenter Name="PART_HeaderPresenter"
-                                  Content="{TemplateBinding Header}"
-                                  ContentTemplate="{TemplateBinding HeaderTemplate}"
-                                  HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                  VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                  UseLayoutRounding="{TemplateBinding UseLayoutRounding}" />
-            </Border>
-            <!-- Primary content for GroupBox -->
-            <ContentPresenter Grid.Row="2"
-                              Grid.Column="1"
-                              Grid.ColumnSpan="2"
-                              Name="PART_ContentPresenter"
-                              ContentTemplate="{TemplateBinding ContentTemplate}"
-                              Content="{TemplateBinding Content}"
-                              VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+          <!-- ContentPresenter for the header -->
+          <Border x:Name="Header"
+                  Padding="3,0,3,0"
+                  Grid.Row="0"
+                  Grid.RowSpan="2"
+                  Grid.Column="1">
+            <ContentPresenter Name="PART_HeaderPresenter"
+                              Content="{TemplateBinding Header}"
+                              ContentTemplate="{TemplateBinding HeaderTemplate}"
                               HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                              UseLayoutRounding="{TemplateBinding UseLayoutRounding}"
-                              Margin="{TemplateBinding Padding}" />
+                              VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                              UseLayoutRounding="{TemplateBinding UseLayoutRounding}" />
+          </Border>
+          <!-- Primary content for GroupBox -->
+          <ContentPresenter Grid.Row="2"
+                            Grid.Column="1"
+                            Grid.ColumnSpan="2"
+                            Name="PART_ContentPresenter"
+                            ContentTemplate="{TemplateBinding ContentTemplate}"
+                            Content="{TemplateBinding Content}"
+                            VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                            UseLayoutRounding="{TemplateBinding UseLayoutRounding}"
+                            Margin="{TemplateBinding Padding}" />
         </Grid>
       </ControlTemplate>
     </Setter>
@@ -80,6 +80,6 @@
 
     <Style Selector="^ /template/ ContentPresenter#PART_HeaderPresenter">
       <Setter Property="RecognizesAccessKey" Value="True" />
-    </Style> 
-  </ControlTheme>
+    </Style>
+</ControlTheme>
 </ResourceDictionary>
diff --git a/src/Avalonia.Themes.Simple/Controls/NavigationPage.xaml b/src/Avalonia.Themes.Simple/Controls/NavigationPage.xaml
index fee14e61ba..66325a9ba7 100644
--- a/src/Avalonia.Themes.Simple/Controls/NavigationPage.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/NavigationPage.xaml
@@ -17,12 +17,26 @@
     <Setter Property="Background" Value="Transparent" />
     <Setter Property="PageTransition">
       <Setter.Value>
-        <PageSlide Duration="0:0:0.3" Orientation="Horizontal" FillMode="Forward" />
+        <PageSlide Duration="0:0:0.3" Orientation="Horizontal" FillMode="Forward">
+          <PageSlide.SlideInEasing>
+            <SplineEasing X1="0.16" Y1="1" X2="0.3" Y2="1" />
+          </PageSlide.SlideInEasing>
+          <PageSlide.SlideOutEasing>
+            <SplineEasing X1="0.2" Y1="0.85" X2="0.3" Y2="1" />
+          </PageSlide.SlideOutEasing>
+        </PageSlide>
       </Setter.Value>
     </Setter>
     <Setter Property="ModalTransition">
       <Setter.Value>
-        <PageSlide Duration="0:0:0.25" Orientation="Vertical" FillMode="Forward" />
+        <PageSlide Duration="0:0:0.25" Orientation="Vertical" FillMode="Forward">
+          <PageSlide.SlideInEasing>
+            <SplineEasing X1="0.16" Y1="1" X2="0.3" Y2="1" />
+          </PageSlide.SlideInEasing>
+          <PageSlide.SlideOutEasing>
+            <SplineEasing X1="0.2" Y1="0.85" X2="0.3" Y2="1" />
+          </PageSlide.SlideOutEasing>
+        </PageSlide>
       </Setter.Value>
     </Setter>
     <Setter Property="Template">
@@ -101,16 +115,15 @@
                       ToolTip.Tip="{x:Null}">
                 <Panel Background="Transparent">
                   <Path Data="{DynamicResource NavigationPageBackIcon}"
+                        x:Name="PART_BackButtonDefaultIcon"
                         Fill="{DynamicResource NavigationBarForeground}"
                         Width="24"
                         Height="24"
                         Stretch="Uniform"
                         HorizontalAlignment="Center"
-                        VerticalAlignment="Center"
-                        IsVisible="{Binding CurrentPage?.(NavigationPage.BackButtonContent), RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static ObjectConverters.IsNull}, FallbackValue=False}" />
+                        VerticalAlignment="Center" />
                   <ContentPresenter
-                    Content="{Binding CurrentPage?.(NavigationPage.BackButtonContent), RelativeSource={RelativeSource TemplatedParent}, FallbackValue={x:Null}}"
-                    IsVisible="{Binding CurrentPage?.(NavigationPage.BackButtonContent), RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static ObjectConverters.IsNotNull}, FallbackValue=False}"
+                    x:Name="PART_BackButtonContentPresenter"
                     VerticalAlignment="Center"
                     HorizontalAlignment="Center"/>
                 </Panel>
diff --git a/src/Avalonia.Themes.Simple/Controls/OverlayPopupHost.xaml b/src/Avalonia.Themes.Simple/Controls/OverlayPopupHost.xaml
index 6e2f41cf2c..515d821169 100644
--- a/src/Avalonia.Themes.Simple/Controls/OverlayPopupHost.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/OverlayPopupHost.xaml
@@ -13,7 +13,7 @@
       <ControlTemplate>
         <!--  Do not forget to update Templated_Control_With_Popup_In_Template_Should_Set_TemplatedParent test  -->
         <LayoutTransformControl LayoutTransform="{TemplateBinding Transform}">
-          <VisualLayerManager IsPopup="True">
+          <VisualLayerManager Name="PART_VisualLayerManager">
             <ContentPresenter Name="PART_ContentPresenter"
                               Padding="{TemplateBinding Padding}"
                               Background="{TemplateBinding Background}"
diff --git a/src/Avalonia.Themes.Simple/Controls/PopupRoot.xaml b/src/Avalonia.Themes.Simple/Controls/PopupRoot.xaml
index d4e8d252eb..db402b208c 100644
--- a/src/Avalonia.Themes.Simple/Controls/PopupRoot.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/PopupRoot.xaml
@@ -17,7 +17,7 @@
           <Panel>
             <Border Name="PART_TransparencyFallback"
                     IsHitTestVisible="False" />
-            <VisualLayerManager IsPopup="True">
+            <VisualLayerManager Name="PART_VisualLayerManager">
               <ContentPresenter Name="PART_ContentPresenter"
                                 Padding="{TemplateBinding Padding}"
                                 Background="{TemplateBinding Background}"
diff --git a/src/Avalonia.Themes.Simple/Controls/SimpleControls.xaml b/src/Avalonia.Themes.Simple/Controls/SimpleControls.xaml
index e5ba9163b5..ef6de7ca78 100644
--- a/src/Avalonia.Themes.Simple/Controls/SimpleControls.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/SimpleControls.xaml
@@ -75,6 +75,7 @@
         <MergeResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/TextSelectionHandle.xaml" />
         <MergeResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/CommandBar.xaml" />
         <MergeResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/ContentPage.xaml" />
+        <MergeResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/CarouselPage.xaml" />
         <MergeResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/DrawerPage.xaml" />
         <MergeResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/NavigationPage.xaml" />
         <MergeResourceInclude Source="avares://Avalonia.Themes.Simple/Controls/TabbedPage.xaml" />
diff --git a/src/Avalonia.Themes.Simple/Controls/TabbedPage.xaml b/src/Avalonia.Themes.Simple/Controls/TabbedPage.xaml
index 2ce01f4392..c18e57581c 100644
--- a/src/Avalonia.Themes.Simple/Controls/TabbedPage.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/TabbedPage.xaml
@@ -133,6 +133,7 @@
                         VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
               <ContentPresenter Name="PART_IconPresenter"
                                 Content="{TemplateBinding Icon}"
+                                ContentTemplate="{TemplateBinding IconTemplate}"
                                 HorizontalAlignment="Center"
                                 IsVisible="{TemplateBinding Icon, Converter={x:Static ObjectConverters.IsNotNull}}"
                                 Width="{DynamicResource TabbedPageTabItemHeaderIconSize}"
@@ -250,8 +251,7 @@
                       Theme="{StaticResource TabbedPageTabControlTheme}"
                       ItemContainerTheme="{StaticResource TabbedPageTabItemTheme}"
                       HorizontalAlignment="Stretch"
-                      VerticalAlignment="Stretch"
-                      ItemsSource="{TemplateBinding Pages}" />
+                      VerticalAlignment="Stretch" />
         </Panel>
       </ControlTemplate>
     </Setter>
diff --git a/src/Avalonia.Themes.Simple/Controls/Window.xaml b/src/Avalonia.Themes.Simple/Controls/Window.xaml
index 43eef2e515..e524a8a8a8 100644
--- a/src/Avalonia.Themes.Simple/Controls/Window.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/Window.xaml
@@ -17,7 +17,7 @@
                   IsHitTestVisible="False" />
           <Panel Margin="{TemplateBinding WindowDecorationMargin}"
                  Background="Transparent" />
-          <VisualLayerManager>
+          <VisualLayerManager Name="PART_VisualLayerManager">
             <ContentPresenter Name="PART_ContentPresenter"
                               Margin="{TemplateBinding Padding}"
                               HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
diff --git a/src/Avalonia.Themes.Simple/Controls/WindowDrawnDecorations.xaml b/src/Avalonia.Themes.Simple/Controls/WindowDrawnDecorations.xaml
index a7ae9a7f2e..d4e938b58c 100644
--- a/src/Avalonia.Themes.Simple/Controls/WindowDrawnDecorations.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/WindowDrawnDecorations.xaml
@@ -197,11 +197,6 @@
       <Setter Property="Data" Value="M2048 410h-410v-410h-1638v1638h410v410h1638v-1638zM1434 1434h-1229v-1229h1229v1229zM1843 1843h-1229v-205h1024v-1024h205v1229z" />
     </Style>
 
-    <!-- Fullscreen: update fullscreen button icon to "exit fullscreen" -->
-    <Style Selector="^:fullscreen /template/ Path#FullScreenButtonPath">
-      <Setter Property="Data" Value="M205 1024h819v-819h-205v469l-674 -674l-145 145l674 674h-469v205zM1374 1229h469v-205h-819v819h205v-469l674 674l145 -145z" />
-    </Style>
-
     <!-- Disabled buttons -->
     <Style Selector="^ /template/ Button:disabled">
       <Setter Property="Opacity" Value="0.2"/>
diff --git a/src/Avalonia.Vulkan/VulkanContext.cs b/src/Avalonia.Vulkan/VulkanContext.cs
index 6667055e8c..8691e55a05 100644
--- a/src/Avalonia.Vulkan/VulkanContext.cs
+++ b/src/Avalonia.Vulkan/VulkanContext.cs
@@ -41,6 +41,10 @@ internal class VulkanContext : IVulkanPlatformGraphicsContext
     {
         if (featureType == typeof(IVulkanContextExternalObjectsFeature))
             return _externalObjectsFeature;
+                
+        if (featureType == typeof(IVulkanKhrSurfacePlatformSurfaceFactory))
+            return _surfaceFactory;
+
         return null;
     }
 
@@ -71,4 +75,4 @@ internal class VulkanContext : IVulkanPlatformGraphicsContext
 
         throw new VulkanException("Unable to find a suitable platform surface");
     }
-}
\ No newline at end of file
+}
diff --git a/src/Windows/Avalonia.Win32/WindowImpl.cs b/src/Windows/Avalonia.Win32/WindowImpl.cs
index db42fca251..92564d296d 100644
--- a/src/Windows/Avalonia.Win32/WindowImpl.cs
+++ b/src/Windows/Avalonia.Win32/WindowImpl.cs
@@ -1472,13 +1472,6 @@ namespace Avalonia.Win32
                 {
                     case WindowDecorations.Full:
                         style |= WindowStyles.WS_BORDER | WindowStyles.WS_CAPTION | WindowStyles.WS_SYSMENU;
-
-                        if (newProperties.IsMinimizable)
-                            style |= WindowStyles.WS_MINIMIZEBOX;
-
-                        if (newProperties.IsMaximizable || (newProperties.WindowState == WindowState.Maximized && newProperties.IsResizable))
-                            style |= WindowStyles.WS_MAXIMIZEBOX;
-
                         break;
 
                     case WindowDecorations.BorderOnly:
@@ -1486,6 +1479,12 @@ namespace Avalonia.Win32
                         break;
                 }
 
+                if (newProperties.IsMinimizable)
+                    style |= WindowStyles.WS_MINIMIZEBOX;
+
+                if (newProperties.IsMaximizable || (newProperties.WindowState == WindowState.Maximized && newProperties.IsResizable))
+                    style |= WindowStyles.WS_MAXIMIZEBOX;
+
                 if (newProperties.Decorations != WindowDecorations.None && newProperties.IsResizable)
                     style |= WindowStyles.WS_THICKFRAME;
 
diff --git a/tests/Avalonia.Base.UnitTests/Input/InputElement_Focus.cs b/tests/Avalonia.Base.UnitTests/Input/InputElement_Focus.cs
index cdb4588fff..a09eccc1a3 100644
--- a/tests/Avalonia.Base.UnitTests/Input/InputElement_Focus.cs
+++ b/tests/Avalonia.Base.UnitTests/Input/InputElement_Focus.cs
@@ -806,7 +806,43 @@ namespace Avalonia.Base.UnitTests.Input
         }
 
         [Fact]
-        public void Can_Get_Next_Element_With_Options()
+        public void Can_Get_Next_Element_With_FocusedElement_Option()
+        {
+            using (UnitTestApplication.Start(TestServices.RealFocus))
+            {
+                var target1 = new Button { Focusable = true, Content = "1" };
+                var target2 = new Button { Focusable = true, Content = "2" };
+                var target3 = new Button { Focusable = true, Content = "3" };
+                var target4 = new Button { Focusable = true, Content = "4" };
+                var container = new StackPanel
+                {
+                    Children =
+                    {
+                        target1,
+                        target2,
+                        target3,
+                        target4
+                    }
+                };
+                var root = new TestRoot
+                {
+                    Child = container
+                };
+
+                var focusManager = FocusManager.GetFocusManager(container);
+                Assert.NotNull(focusManager);
+                Assert.Null(focusManager.GetFocusedElement());
+
+                var next = focusManager.FindNextElement(
+                    NavigationDirection.Next,
+                    new FindNextElementOptions { FocusedElement = target1 });
+
+                Assert.Equal(next, target2);
+            }
+        }
+
+        [Fact]
+        public void Can_Get_Directional_Next_Element_With_Options()
         {
             using (UnitTestApplication.Start(TestServices.RealFocus))
             {
@@ -870,6 +906,76 @@ namespace Avalonia.Base.UnitTests.Input
             }
         }
 
+        [Fact]
+        public void Can_Get_Directional_Next_Element_With_FocusedElement_Option()
+        {
+            using (UnitTestApplication.Start(TestServices.RealFocus))
+            {
+                var target1 = new Button { Focusable = true, Content = "1" };
+                var target2 = new Button { Focusable = true, Content = "2" };
+                var target3 = new Button { Focusable = true, Content = "3" };
+                var target4 = new Button { Focusable = true, Content = "4" };
+                var target5 = new Button { Focusable = true, Content = "5" };
+                var searchStack = new StackPanel()
+                {
+                    Children =
+                    {
+                        target3,
+                        target4
+                    }
+                };
+                var container = new StackPanel
+                {
+                    Orientation = Avalonia.Layout.Orientation.Horizontal,
+                    Children =
+                    {
+                        target1,
+                        target2,
+                        searchStack,
+                        target5
+                    }
+                };
+                var root = new TestRoot
+                {
+                    Child = container
+                };
+
+                root.InvalidateMeasure();
+                root.ExecuteInitialLayoutPass();
+
+                var focusManager = FocusManager.GetFocusManager(container);
+                Assert.NotNull(focusManager);
+                Assert.Null(focusManager.GetFocusedElement());
+
+                // Search root is right of the specified focused element, should return the first focusable element in the search root
+                var next = focusManager.FindNextElement(NavigationDirection.Right, new FindNextElementOptions
+                {
+                    SearchRoot = searchStack,
+                    FocusedElement = target1
+                });
+
+                Assert.Equal(next, target3);
+
+                // Search root is left of the specified focused element, should return the first focusable element in the search root
+                next = focusManager.FindNextElement(NavigationDirection.Left, new FindNextElementOptions
+                {
+                    SearchRoot = searchStack,
+                    FocusedElement = target5
+                });
+
+                Assert.Equal(next, target3);
+
+                // Search root isn't to the right of the specified focused element, should return null
+                next = focusManager.FindNextElement(NavigationDirection.Right, new FindNextElementOptions
+                {
+                    SearchRoot = searchStack,
+                    FocusedElement = target5
+                });
+
+                Assert.Null(next);
+            }
+        }
+
         [Fact]
         public void Focus_Should_Move_According_To_Direction()
         {
diff --git a/tests/Avalonia.Base.UnitTests/Input/SwipeGestureRecognizerTests.cs b/tests/Avalonia.Base.UnitTests/Input/SwipeGestureRecognizerTests.cs
new file mode 100644
index 0000000000..d0821c91b1
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Input/SwipeGestureRecognizerTests.cs
@@ -0,0 +1,158 @@
+using System.Collections.Generic;
+using System.Threading;
+using Avalonia.Controls;
+using Avalonia.Input;
+using Avalonia.Input.GestureRecognizers;
+using Avalonia.UnitTests;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Input;
+
+public class SwipeGestureRecognizerTests : ScopedTestBase
+{
+    [Fact]
+    public void Does_Not_Raise_Swipe_When_Both_Axes_Are_Disabled()
+    {
+        var (border, root) = CreateTarget(new SwipeGestureRecognizer { Threshold = 1 });
+        var touch = new TouchTestHelper();
+        var swipeRaised = false;
+        var endedRaised = false;
+
+        root.AddHandler(InputElement.SwipeGestureEvent, (_, _) => swipeRaised = true);
+        root.AddHandler(InputElement.SwipeGestureEndedEvent, (_, _) => endedRaised = true);
+
+        touch.Down(border, new Point(50, 50));
+        touch.Move(border, new Point(20, 20));
+        touch.Up(border, new Point(20, 20));
+
+        Assert.False(swipeRaised);
+        Assert.False(endedRaised);
+    }
+
+    [Fact]
+    public void Defaults_Disable_Both_Axes()
+    {
+        var recognizer = new SwipeGestureRecognizer();
+
+        Assert.False(recognizer.CanHorizontallySwipe);
+        Assert.False(recognizer.CanVerticallySwipe);
+    }
+
+    [Fact]
+    public void Starts_Only_After_Threshold_Is_Exceeded()
+    {
+        var (border, root) = CreateTarget(new SwipeGestureRecognizer
+        {
+            CanHorizontallySwipe = true,
+            Threshold = 50
+        });
+        var touch = new TouchTestHelper();
+        var deltas = new List<Vector>();
+
+        root.AddHandler(InputElement.SwipeGestureEvent, (_, e) => deltas.Add(e.Delta));
+
+        touch.Down(border, new Point(5, 5));
+        touch.Move(border, new Point(40, 5));
+
+        Assert.Empty(deltas);
+
+        touch.Move(border, new Point(80, 5));
+
+        Assert.Single(deltas);
+        Assert.NotEqual(Vector.Zero, deltas[0]);
+    }
+
+    [Fact]
+    public void Ended_Event_Uses_Same_Id_And_Last_Velocity()
+    {
+        var (border, root) = CreateTarget(new SwipeGestureRecognizer
+        {
+            CanHorizontallySwipe = true,
+            Threshold = 1
+        });
+        var touch = new TouchTestHelper();
+        var updateIds = new List<int>();
+        var velocities = new List<Vector>();
+        var endedId = 0;
+        var endedVelocity = Vector.Zero;
+
+        root.AddHandler(InputElement.SwipeGestureEvent, (_, e) =>
+        {
+            updateIds.Add(e.Id);
+            velocities.Add(e.Velocity);
+        });
+        root.AddHandler(InputElement.SwipeGestureEndedEvent, (_, e) =>
+        {
+            endedId = e.Id;
+            endedVelocity = e.Velocity;
+        });
+
+        touch.Down(border, new Point(50, 50));
+        touch.Move(border, new Point(40, 50));
+        touch.Move(border, new Point(30, 50));
+        touch.Up(border, new Point(30, 50));
+
+        Assert.True(updateIds.Count >= 2);
+        Assert.All(updateIds, id => Assert.Equal(updateIds[0], id));
+        Assert.Equal(updateIds[0], endedId);
+        Assert.Equal(velocities[^1], endedVelocity);
+    }
+
+    [Fact]
+    public void Mouse_Swipe_Requires_IsMouseEnabled()
+    {
+        var mouse = new MouseTestHelper();
+        var (border, root) = CreateTarget(new SwipeGestureRecognizer
+        {
+            CanHorizontallySwipe = true,
+            Threshold = 1
+        });
+        var swipeRaised = false;
+
+        root.AddHandler(InputElement.SwipeGestureEvent, (_, _) => swipeRaised = true);
+
+        mouse.Down(border, position: new Point(50, 50));
+        mouse.Move(border, new Point(30, 50));
+        mouse.Up(border, position: new Point(30, 50));
+
+        Assert.False(swipeRaised);
+    }
+
+    [Fact]
+    public void Mouse_Swipe_Is_Raised_When_Enabled()
+    {
+        var mouse = new MouseTestHelper();
+        var (border, root) = CreateTarget(new SwipeGestureRecognizer
+        {
+            CanHorizontallySwipe = true,
+            Threshold = 1,
+            IsMouseEnabled = true
+        });
+        var swipeRaised = false;
+
+        root.AddHandler(InputElement.SwipeGestureEvent, (_, _) => swipeRaised = true);
+
+        mouse.Down(border, position: new Point(50, 50));
+        mouse.Move(border, new Point(30, 50));
+        mouse.Up(border, position: new Point(30, 50));
+
+        Assert.True(swipeRaised);
+    }
+
+    private static (Border Border, TestRoot Root) CreateTarget(SwipeGestureRecognizer recognizer)
+    {
+        var border = new Border
+        {
+            Width = 100,
+            Height = 100
+        };
+        border.GestureRecognizers.Add(recognizer);
+
+        var root = new TestRoot
+        {
+            Child = border
+        };
+
+        return (border, root);
+    }
+}
diff --git a/tests/Avalonia.Benchmarks/Navigation/CarouselPageBenchmark.cs b/tests/Avalonia.Benchmarks/Navigation/CarouselPageBenchmark.cs
new file mode 100644
index 0000000000..8f45b99038
--- /dev/null
+++ b/tests/Avalonia.Benchmarks/Navigation/CarouselPageBenchmark.cs
@@ -0,0 +1,96 @@
+using System;
+using System.Collections;
+using System.Runtime.CompilerServices;
+using Avalonia.Controls;
+using Avalonia.Platform;
+using Avalonia.Styling;
+using Avalonia.Themes.Fluent;
+using Avalonia.Threading;
+using Avalonia.UnitTests;
+using BenchmarkDotNet.Attributes;
+
+namespace Avalonia.Benchmarks.Navigation
+{
+    /// <summary>
+    /// Measures the cost of creating a CarouselPage and applying its template
+    /// as the number of pages grows.
+    /// </summary>
+    [MemoryDiagnoser]
+    public class CarouselPageCreationBenchmark : IDisposable
+    {
+        private readonly IDisposable _app;
+        private readonly TestRoot _root;
+
+        [Params(2, 5, 10)]
+        public int PageCount { get; set; }
+
+        public CarouselPageCreationBenchmark()
+        {
+            AssetLoader.RegisterResUriParsers();
+            _app = UnitTestApplication.Start(TestServices.StyledWindow.With(
+                theme: () => new Styles { new FluentTheme() }));
+            _root = new TestRoot(true, null) { Renderer = new NullRenderer() };
+            _root.LayoutManager.ExecuteInitialLayoutPass();
+        }
+
+        [Benchmark]
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        public void Create()
+        {
+            var cp = new CarouselPage { PageTransition = null };
+            for (var i = 0; i < PageCount; i++)
+                ((IList)cp.Pages!).Add(new ContentPage { Header = $"Page {i}" });
+            _root.Child = cp;
+            _root.LayoutManager.ExecuteLayoutPass();
+            Dispatcher.UIThread.RunJobs(DispatcherPriority.Loaded);
+        }
+
+        public void Dispose() => _app.Dispose();
+    }
+
+    /// <summary>
+    /// Measures the cost of navigating between pages on a CarouselPage with five pages (no transition).
+    /// </summary>
+    [MemoryDiagnoser]
+    public class CarouselPageNavigationBenchmark : IDisposable
+    {
+        private readonly IDisposable _app;
+        private readonly TestRoot _root;
+        private CarouselPage _carouselPage = null!;
+
+        public CarouselPageNavigationBenchmark()
+        {
+            AssetLoader.RegisterResUriParsers();
+            _app = UnitTestApplication.Start(TestServices.StyledWindow.With(
+                theme: () => new Styles { new FluentTheme() }));
+            _root = new TestRoot(true, null) { Renderer = new NullRenderer() };
+            _root.LayoutManager.ExecuteInitialLayoutPass();
+        }
+
+        [IterationSetup]
+        public void SetupIteration()
+        {
+            _carouselPage = new CarouselPage { PageTransition = null };
+            for (var i = 0; i < 5; i++)
+                ((IList)_carouselPage.Pages!).Add(new ContentPage { Header = $"Page {i}" });
+            _root.Child = _carouselPage;
+            _root.LayoutManager.ExecuteLayoutPass();
+            _carouselPage.SelectedIndex = 0;
+            _root.LayoutManager.ExecuteLayoutPass();
+            Dispatcher.UIThread.RunJobs(DispatcherPriority.Loaded);
+        }
+
+        /// <summary>
+        /// Navigate forward from page 0 to page 1 (no transition).
+        /// </summary>
+        [Benchmark]
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        public void NavigateNext()
+        {
+            _carouselPage.SelectedIndex = 1;
+            _root.LayoutManager.ExecuteLayoutPass();
+        }
+
+        public void Dispose() => _app.Dispose();
+    }
+}
diff --git a/tests/Avalonia.Controls.UnitTests/Automation/PageAutomationPeerTests.cs b/tests/Avalonia.Controls.UnitTests/Automation/PageAutomationPeerTests.cs
index be2ec9f6cd..0276b66086 100644
--- a/tests/Avalonia.Controls.UnitTests/Automation/PageAutomationPeerTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/Automation/PageAutomationPeerTests.cs
@@ -1,4 +1,6 @@
+using Avalonia.Automation;
 using Avalonia.Automation.Peers;
+using Avalonia.Automation.Provider;
 using Avalonia.UnitTests;
 using Xunit;
 
@@ -222,5 +224,102 @@ public class PageAutomationPeerTests
 
             Assert.True(string.IsNullOrEmpty(peer.GetName()));
         }
+
+        [Fact]
+        public void Implements_IExpandCollapseProvider()
+        {
+            var page = new DrawerPage();
+            var peer = (DrawerPageAutomationPeer)ControlAutomationPeer.CreatePeerForElement(page);
+
+            Assert.IsAssignableFrom<IExpandCollapseProvider>(peer);
+        }
+
+        [Fact]
+        public void ExpandCollapseState_Collapsed_When_Closed()
+        {
+            var page = new DrawerPage { IsOpen = false };
+            var peer = (DrawerPageAutomationPeer)ControlAutomationPeer.CreatePeerForElement(page);
+
+            Assert.Equal(ExpandCollapseState.Collapsed, peer.ExpandCollapseState);
+        }
+
+        [Fact]
+        public void ExpandCollapseState_Expanded_When_Open()
+        {
+            var page = new DrawerPage { IsOpen = true };
+            var peer = (DrawerPageAutomationPeer)ControlAutomationPeer.CreatePeerForElement(page);
+
+            Assert.Equal(ExpandCollapseState.Expanded, peer.ExpandCollapseState);
+        }
+
+        [Fact]
+        public void Expand_Sets_IsOpen_True()
+        {
+            var page = new DrawerPage { IsOpen = false };
+            var peer = (DrawerPageAutomationPeer)ControlAutomationPeer.CreatePeerForElement(page);
+
+            peer.Expand();
+
+            Assert.True(page.IsOpen);
+        }
+
+        [Fact]
+        public void Collapse_Sets_IsOpen_False()
+        {
+            var page = new DrawerPage { IsOpen = true };
+            var peer = (DrawerPageAutomationPeer)ControlAutomationPeer.CreatePeerForElement(page);
+
+            peer.Collapse();
+
+            Assert.False(page.IsOpen);
+        }
+    }
+
+    public class CarouselPagePeer : ScopedTestBase
+    {
+        [Fact]
+        public void Creates_CarouselPageAutomationPeer()
+        {
+            var page = new CarouselPage();
+            var peer = ControlAutomationPeer.CreatePeerForElement(page);
+
+            Assert.IsType<CarouselPageAutomationPeer>(peer);
+        }
+
+        [Fact]
+        public void ControlType_Is_Pane()
+        {
+            var page = new CarouselPage();
+            var peer = (CarouselPageAutomationPeer)ControlAutomationPeer.CreatePeerForElement(page);
+
+            Assert.Equal(AutomationControlType.Pane, peer.GetAutomationControlType());
+        }
+
+        [Fact]
+        public void Name_Returns_String_Header()
+        {
+            var page = new CarouselPage { Header = "Photos" };
+            var peer = (CarouselPageAutomationPeer)ControlAutomationPeer.CreatePeerForElement(page);
+
+            Assert.Equal("Photos", peer.GetName());
+        }
+
+        [Fact]
+        public void Name_Returns_ToString_For_Non_String_Header()
+        {
+            var page = new CarouselPage { Header = 7 };
+            var peer = (CarouselPageAutomationPeer)ControlAutomationPeer.CreatePeerForElement(page);
+
+            Assert.Equal("7", peer.GetName());
+        }
+
+        [Fact]
+        public void Name_Is_Empty_When_No_Header()
+        {
+            var page = new CarouselPage();
+            var peer = (CarouselPageAutomationPeer)ControlAutomationPeer.CreatePeerForElement(page);
+
+            Assert.True(string.IsNullOrEmpty(peer.GetName()));
+        }
     }
 }
diff --git a/tests/Avalonia.Controls.UnitTests/CarouselPageTests.cs b/tests/Avalonia.Controls.UnitTests/CarouselPageTests.cs
new file mode 100644
index 0000000000..d4ba06d6e2
--- /dev/null
+++ b/tests/Avalonia.Controls.UnitTests/CarouselPageTests.cs
@@ -0,0 +1,1389 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Avalonia.Animation;
+using Avalonia.Collections;
+using Avalonia.Controls.Presenters;
+using Avalonia.Controls.Primitives;
+using Avalonia.Controls.Templates;
+using Avalonia.Input;
+using Avalonia.Input.GestureRecognizers;
+using Avalonia.Threading;
+using Avalonia.Layout;
+using Avalonia.LogicalTree;
+using Avalonia.Media;
+using Avalonia.UnitTests;
+using Avalonia.VisualTree;
+using Xunit;
+
+namespace Avalonia.Controls.UnitTests;
+
+public class CarouselPageTests
+{
+    public class PropertyDefaults : ScopedTestBase
+    {
+        [Fact]
+        public void SelectedIndex_DefaultIsMinusOne()
+        {
+            var cp = new CarouselPage();
+            Assert.Equal(-1, cp.SelectedIndex);
+        }
+
+        [Fact]
+        public void SelectedPage_DefaultIsNull()
+        {
+            var cp = new CarouselPage();
+            Assert.Null(cp.SelectedPage);
+        }
+
+        [Fact]
+        public void CurrentPage_DefaultIsNull()
+        {
+            var cp = new CarouselPage();
+            Assert.Null(cp.CurrentPage);
+        }
+
+        [Fact]
+        public void PageTransition_DefaultIsNull()
+        {
+            var cp = new CarouselPage();
+            Assert.Null(cp.PageTransition);
+        }
+
+        [Fact]
+        public void IsGestureEnabled_DefaultIsTrue()
+        {
+            var cp = new CarouselPage();
+            Assert.True(cp.IsGestureEnabled);
+        }
+
+        [Fact]
+        public void IsKeyboardNavigationEnabled_DefaultIsTrue()
+        {
+            var cp = new CarouselPage();
+            Assert.True(cp.IsKeyboardNavigationEnabled);
+        }
+
+    }
+
+    public class PropertyRoundTrips : ScopedTestBase
+    {
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public void IsGestureEnabled_RoundTrips(bool value)
+        {
+            var cp = new CarouselPage { IsGestureEnabled = value };
+            Assert.Equal(value, cp.IsGestureEnabled);
+        }
+
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public void IsKeyboardNavigationEnabled_RoundTrips(bool value)
+        {
+            var cp = new CarouselPage { IsKeyboardNavigationEnabled = value };
+            Assert.Equal(value, cp.IsKeyboardNavigationEnabled);
+        }
+
+        [Fact]
+        public void PageTransition_RoundTrip()
+        {
+            var transition = new TestPageTransition();
+            var cp = new CarouselPage { PageTransition = transition };
+            Assert.Same(transition, cp.PageTransition);
+        }
+
+        [Fact]
+        public void PageTransition_CanBeSetToNull()
+        {
+            var cp = new CarouselPage { PageTransition = new TestPageTransition() };
+            cp.PageTransition = null;
+            Assert.Null(cp.PageTransition);
+        }
+
+        [Fact]
+        public void ItemsPanel_RoundTrip()
+        {
+            var template = new FuncTemplate<Panel?>(() => new StackPanel());
+            var cp = new CarouselPage { ItemsPanel = template };
+            Assert.Same(template, cp.ItemsPanel);
+        }
+
+        [Fact]
+        public void PageTemplate_RoundTrip()
+        {
+            var template = new FuncDataTemplate<Page>((_, _) => new ContentControl());
+            var cp = new CarouselPage { PageTemplate = template };
+            Assert.Same(template, cp.PageTemplate);
+        }
+
+        [Fact]
+        public void PageTemplate_CanBeSetToNull()
+        {
+            var cp = new CarouselPage { PageTemplate = null };
+            Assert.Null(cp.PageTemplate);
+        }
+    }
+
+    public class SelectionBehavior : ScopedTestBase
+    {
+        [Fact]
+        public void SelectedIndex_SetUpdatesSelectedPageAndCurrentPage()
+        {
+            var cp = new CarouselPage();
+            var page1 = new ContentPage { Header = "A" };
+            var page2 = new ContentPage { Header = "B" };
+            ((AvaloniaList<Page>)cp.Pages!).AddRange(new[] { page1, page2 });
+            cp.SelectedIndex = 0;
+
+            cp.SelectedIndex = 1;
+
+            Assert.Same(page2, cp.SelectedPage);
+            Assert.Same(page2, cp.CurrentPage);
+        }
+
+        [Fact]
+        public void SelectedIndex_AutoSelectsFirst_WhenPagesSet()
+        {
+            var cp = new CarouselPage();
+            var page1 = new ContentPage { Header = "A" };
+            var page2 = new ContentPage { Header = "B" };
+            ((AvaloniaList<Page>)cp.Pages!).AddRange(new[] { page1, page2 });
+
+            Assert.Equal(0, cp.SelectedIndex);
+            Assert.Same(page1, cp.SelectedPage);
+        }
+
+        [Fact]
+        public void UpdateActivePage_SelectsFirst_WhenFirstPageAddedToEmptyCollection()
+        {
+            var cp = new CarouselPage();
+            Assert.Equal(-1, cp.SelectedIndex);
+
+            var page1 = new ContentPage { Header = "A" };
+            ((AvaloniaList<Page>)cp.Pages!).Add(page1);
+
+            Assert.Equal(0, cp.SelectedIndex);
+            Assert.Same(page1, cp.SelectedPage);
+        }
+
+        [Fact]
+        public void UpdateActivePage_DoesNotOverrideExistingSelection()
+        {
+            var cp = new CarouselPage();
+            var page1 = new ContentPage { Header = "A" };
+            var page2 = new ContentPage { Header = "B" };
+            ((AvaloniaList<Page>)cp.Pages!).AddRange(new[] { page1, page2 });
+            cp.SelectedIndex = 1;
+
+            ((AvaloniaList<Page>)cp.Pages!).Add(new ContentPage { Header = "C" });
+
+            Assert.Equal(1, cp.SelectedIndex);
+        }
+
+        [Fact]
+        public void SelectedPage_SameReferenceAsCurrentPage()
+        {
+            var cp = new CarouselPage();
+            var page1 = new ContentPage { Header = "A" };
+            var page2 = new ContentPage { Header = "B" };
+            ((AvaloniaList<Page>)cp.Pages!).AddRange(new[] { page1, page2 });
+            cp.SelectedIndex = 1;
+
+            Assert.Same(cp.SelectedPage, cp.CurrentPage);
+        }
+
+        [Fact]
+        public void SelectedIndex_InvalidWithPages_CoercesToFirstPage()
+        {
+            var cp = new CarouselPage();
+            var page1 = new ContentPage { Header = "A" };
+            var page2 = new ContentPage { Header = "B" };
+            ((AvaloniaList<Page>)cp.Pages!).AddRange(new[] { page1, page2 });
+
+            cp.SelectedIndex = 999;
+
+            Assert.Equal(0, cp.SelectedIndex);
+            Assert.Same(page1, cp.SelectedPage);
+            Assert.Same(page1, cp.CurrentPage);
+        }
+
+        [Fact]
+        public void SelectedIndex_SetBeforePages_IsStored()
+        {
+            var cp = new CarouselPage();
+
+            cp.SelectedIndex = 2;
+
+            Assert.Equal(2, cp.SelectedIndex);
+            Assert.Null(cp.SelectedPage);
+            Assert.Null(cp.CurrentPage);
+        }
+
+        [Fact]
+        public void SelectedIndex_SetBeforePages_IsAppliedWhenPagesSet()
+        {
+            var cp = new CarouselPage
+            {
+                SelectedIndex = 2
+            };
+
+            var page1 = new ContentPage { Header = "A" };
+            var page2 = new ContentPage { Header = "B" };
+            var page3 = new ContentPage { Header = "C" };
+
+            cp.Pages = new AvaloniaList<Page> { page1, page2, page3 };
+
+            Assert.Equal(2, cp.SelectedIndex);
+            Assert.Same(page3, cp.SelectedPage);
+            Assert.Same(page3, cp.CurrentPage);
+        }
+
+        [Fact]
+        public void Pages_SetNull_SelectedIndex_RetainsLastValue()
+        {
+            var cp = new CarouselPage();
+            ((AvaloniaList<Page>)cp.Pages!).Add(new ContentPage { Header = "A" });
+            Assert.Equal(0, cp.SelectedIndex);
+
+            cp.Pages = null;
+
+            Assert.Equal(0, cp.SelectedIndex);
+        }
+    }
+
+    public class SelectionChangedEvent : ScopedTestBase
+    {
+        [Fact]
+        public void SelectionChanged_FiresWhenSelectionChanges()
+        {
+            var cp = new CarouselPage();
+            var page1 = new ContentPage { Header = "A" };
+            var page2 = new ContentPage { Header = "B" };
+            ((AvaloniaList<Page>)cp.Pages!).AddRange(new[] { page1, page2 });
+            cp.SelectedIndex = 0;
+
+            PageSelectionChangedEventArgs? received = null;
+            cp.SelectionChanged += (_, e) => received = e;
+
+            cp.SelectedIndex = 1;
+
+            Assert.NotNull(received);
+            Assert.Same(page1, received!.PreviousPage);
+            Assert.Same(page2, received.CurrentPage);
+        }
+
+        [Fact]
+        public void SelectionChanged_NotFiredWhenSamePageSelected()
+        {
+            var cp = new CarouselPage();
+            var page = new ContentPage { Header = "A" };
+            ((AvaloniaList<Page>)cp.Pages!).Add(page);
+            cp.SelectedIndex = 0;
+
+            int count = 0;
+            cp.SelectionChanged += (_, _) => count++;
+
+            cp.SelectedIndex = 0;
+
+            Assert.Equal(0, count);
+        }
+
+        [Fact]
+        public void SelectionChanged_TracksSequentialSelections()
+        {
+            var cp = new CarouselPage();
+            var pages = new[]
+            {
+                new ContentPage { Header = "A" },
+                new ContentPage { Header = "B" },
+                new ContentPage { Header = "C" },
+            };
+            ((AvaloniaList<Page>)cp.Pages!).AddRange(pages);
+            cp.SelectedIndex = 0;
+
+            var events = new List<(Page? prev, Page? curr)>();
+            cp.SelectionChanged += (_, e) => events.Add((e.PreviousPage, e.CurrentPage));
+
+            cp.SelectedIndex = 1;
+            cp.SelectedIndex = 2;
+            cp.SelectedIndex = 0;
+
+            Assert.Equal(3, events.Count);
+            Assert.Same(pages[0], events[0].prev);
+            Assert.Same(pages[1], events[0].curr);
+            Assert.Same(pages[1], events[1].prev);
+            Assert.Same(pages[2], events[1].curr);
+            Assert.Same(pages[2], events[2].prev);
+            Assert.Same(pages[0], events[2].curr);
+        }
+
+        [Fact]
+        public void SelectionChanged_PreviousPage_IsNull_OnFirstAutoSelection()
+        {
+            var cp = new CarouselPage();
+            var page1 = new ContentPage { Header = "A" };
+
+            PageSelectionChangedEventArgs? received = null;
+            cp.SelectionChanged += (_, e) => received = e;
+
+            ((AvaloniaList<Page>)cp.Pages!).Add(page1);
+
+            Assert.NotNull(received);
+            Assert.Null(received!.PreviousPage);
+            Assert.Same(page1, received.CurrentPage);
+        }
+    }
+
+    public class CurrentPageChangedEvent : ScopedTestBase
+    {
+        [Fact]
+        public void CurrentPageChanged_FiresOnSelectionChange()
+        {
+            var cp = new CarouselPage();
+            var page1 = new ContentPage { Header = "A" };
+            var page2 = new ContentPage { Header = "B" };
+            ((AvaloniaList<Page>)cp.Pages!).AddRange(new[] { page1, page2 });
+            cp.SelectedIndex = 0;
+
+            int count = 0;
+            cp.CurrentPageChanged += (_, _) => count++;
+
+            cp.SelectedIndex = 1;
+
+            Assert.Equal(1, count);
+        }
+
+        [Fact]
+        public void CurrentPageChanged_NotFiredWhenSamePageSelected()
+        {
+            var cp = new CarouselPage();
+            var page = new ContentPage { Header = "A" };
+            ((AvaloniaList<Page>)cp.Pages!).Add(page);
+            cp.SelectedIndex = 0;
+
+            int count = 0;
+            cp.CurrentPageChanged += (_, _) => count++;
+
+            cp.SelectedIndex = 0;
+
+            Assert.Equal(0, count);
+        }
+    }
+
+    public class PagesChangedEvent : ScopedTestBase
+    {
+        [Fact]
+        public void PagesChanged_FiresOnAdd()
+        {
+            var cp = new CarouselPage();
+            NotifyCollectionChangedEventArgs? received = null;
+            cp.PagesChanged += (_, e) => received = e;
+
+            ((AvaloniaList<Page>)cp.Pages!).Add(new ContentPage());
+
+            Assert.NotNull(received);
+            Assert.Equal(NotifyCollectionChangedAction.Add, received!.Action);
+        }
+
+        [Fact]
+        public void PagesChanged_FiresOnRemove()
+        {
+            var cp = new CarouselPage();
+            var page = new ContentPage();
+            ((AvaloniaList<Page>)cp.Pages!).Add(page);
+
+            NotifyCollectionChangedEventArgs? received = null;
+            cp.PagesChanged += (_, e) => received = e;
+
+            ((AvaloniaList<Page>)cp.Pages!).Remove(page);
+
+            Assert.NotNull(received);
+            Assert.Equal(NotifyCollectionChangedAction.Remove, received!.Action);
+        }
+
+        [Fact]
+        public void PagesChanged_NotFiredAfterPagesCollectionReplaced()
+        {
+            var cp = new CarouselPage();
+            var oldPages = (AvaloniaList<Page>)cp.Pages!;
+            cp.Pages = new AvaloniaList<Page>();
+
+            cp.PagesChanged += (_, _) => throw new InvalidOperationException("Should not fire for old collection");
+
+            oldPages.Add(new ContentPage());
+        }
+    }
+
+    public class PageLifecycleEvents : ScopedTestBase
+    {
+        [Fact]
+        public void SelectionChange_FiresNavigatedFrom_OnPreviousPage()
+        {
+            var cp = new CarouselPage();
+            var page1 = new ContentPage { Header = "A" };
+            var page2 = new ContentPage { Header = "B" };
+            ((AvaloniaList<Page>)cp.Pages!).AddRange(new[] { page1, page2 });
+            cp.SelectedIndex = 0;
+
+            NavigatedFromEventArgs? args = null;
+            page1.NavigatedFrom += (_, e) => args = e;
+
+            cp.SelectedIndex = 1;
+
+            Assert.NotNull(args);
+            Assert.Same(page2, args!.DestinationPage);
+        }
+
+        [Fact]
+        public void SelectionChange_FiresNavigatedTo_OnNewPage()
+        {
+            var cp = new CarouselPage();
+            var page1 = new ContentPage { Header = "A" };
+            var page2 = new ContentPage { Header = "B" };
+            ((AvaloniaList<Page>)cp.Pages!).AddRange(new[] { page1, page2 });
+            cp.SelectedIndex = 0;
+
+            NavigatedToEventArgs? args = null;
+            page2.NavigatedTo += (_, e) => args = e;
+
+            cp.SelectedIndex = 1;
+
+            Assert.NotNull(args);
+            Assert.Same(page1, args!.PreviousPage);
+        }
+
+        [Fact]
+        public void SelectionChange_LifecycleOrder_NavigatedFromThenNavigatedTo()
+        {
+            var cp = new CarouselPage();
+            var page1 = new ContentPage { Header = "A" };
+            var page2 = new ContentPage { Header = "B" };
+            ((AvaloniaList<Page>)cp.Pages!).AddRange(new[] { page1, page2 });
+            cp.SelectedIndex = 0;
+
+            var order = new List<string>();
+            page1.NavigatedFrom += (_, _) => order.Add("NavigatedFrom");
+            page2.NavigatedTo += (_, _) => order.Add("NavigatedTo");
+
+            cp.SelectedIndex = 1;
+
+            Assert.Equal(new[] { "NavigatedFrom", "NavigatedTo" }, order);
+        }
+
+        [Fact]
+        public void SelectionChange_SamePage_NoLifecycleEvents()
+        {
+            var cp = new CarouselPage();
+            var page = new ContentPage { Header = "A" };
+            ((AvaloniaList<Page>)cp.Pages!).Add(page);
+            cp.SelectedIndex = 0;
+
+            var events = new List<string>();
+            page.NavigatedTo += (_, _) => events.Add("NavigatedTo");
+            page.NavigatedFrom += (_, _) => events.Add("NavigatedFrom");
+
+            cp.SelectedIndex = 0;
+
+            Assert.Empty(events);
+        }
+
+        [Fact]
+        public void NavigatedFrom_NavigationType_IsReplace()
+        {
+            var cp = new CarouselPage();
+            var page1 = new ContentPage { Header = "A" };
+            var page2 = new ContentPage { Header = "B" };
+            ((AvaloniaList<Page>)cp.Pages!).AddRange(new[] { page1, page2 });
+
+            NavigatedFromEventArgs? args = null;
+            page1.NavigatedFrom += (_, e) => args = e;
+
+            cp.SelectedIndex = 1;
+
+            Assert.NotNull(args);
+            Assert.Equal(NavigationType.Replace, args!.NavigationType);
+        }
+
+        [Fact]
+        public void NavigatedTo_NavigationType_IsReplace()
+        {
+            var cp = new CarouselPage();
+            var page1 = new ContentPage { Header = "A" };
+            var page2 = new ContentPage { Header = "B" };
+            ((AvaloniaList<Page>)cp.Pages!).AddRange(new[] { page1, page2 });
+
+            NavigatedToEventArgs? args = null;
+            page2.NavigatedTo += (_, e) => args = e;
+
+            cp.SelectedIndex = 1;
+
+            Assert.NotNull(args);
+            Assert.Equal(NavigationType.Replace, args!.NavigationType);
+        }
+
+        [Fact]
+        public void NavigatedTo_FirstAutoSelection_NavigationType_IsReplace()
+        {
+            var cp = new CarouselPage();
+            var page = new ContentPage { Header = "A" };
+
+            NavigatedToEventArgs? args = null;
+            page.NavigatedTo += (_, e) => args = e;
+
+            ((AvaloniaList<Page>)cp.Pages!).Add(page);
+
+            Assert.NotNull(args);
+            Assert.Equal(NavigationType.Replace, args!.NavigationType);
+        }
+    }
+
+    public class LogicalChildrenTests : ScopedTestBase
+    {
+        [Fact]
+        public void Pages_Added_BecomeLogicalChildren()
+        {
+            var cp = new CarouselPage();
+            var page = new ContentPage { Header = "A" };
+
+            ((AvaloniaList<Page>)cp.Pages!).Add(page);
+
+            Assert.Contains(page, cp.GetLogicalChildren());
+        }
+
+        [Fact]
+        public void Pages_Removed_RemovedFromLogicalChildren()
+        {
+            var cp = new CarouselPage();
+            var page = new ContentPage { Header = "A" };
+            ((AvaloniaList<Page>)cp.Pages!).Add(page);
+
+            ((AvaloniaList<Page>)cp.Pages!).Remove(page);
+
+            Assert.DoesNotContain(page, cp.GetLogicalChildren());
+        }
+
+        [Fact]
+        public void Pages_Clear_RemovesAllLogicalChildren()
+        {
+            var cp = new CarouselPage();
+            var page1 = new ContentPage { Header = "A" };
+            var page2 = new ContentPage { Header = "B" };
+            ((AvaloniaList<Page>)cp.Pages!).AddRange(new[] { page1, page2 });
+
+            ((AvaloniaList<Page>)cp.Pages!).Clear();
+
+            Assert.DoesNotContain(page1, cp.GetLogicalChildren());
+            Assert.DoesNotContain(page2, cp.GetLogicalChildren());
+        }
+
+        [Fact]
+        public void Pages_Replaced_OldPagesRemovedNewPagesAdded()
+        {
+            var cp = new CarouselPage();
+            var old1 = new ContentPage { Header = "Old1" };
+            var old2 = new ContentPage { Header = "Old2" };
+            ((AvaloniaList<Page>)cp.Pages!).AddRange(new[] { old1, old2 });
+
+            var newPages = new AvaloniaList<Page> { new ContentPage { Header = "New1" } };
+            cp.Pages = newPages;
+
+            Assert.DoesNotContain(old1, cp.GetLogicalChildren());
+            Assert.DoesNotContain(old2, cp.GetLogicalChildren());
+            Assert.Contains(newPages[0], cp.GetLogicalChildren());
+        }
+
+        [Fact]
+        public void Pages_SetNull_ClearsLogicalChildren()
+        {
+            var cp = new CarouselPage();
+            var page = new ContentPage { Header = "A" };
+            ((AvaloniaList<Page>)cp.Pages!).Add(page);
+
+            cp.Pages = null;
+
+            Assert.DoesNotContain(page, cp.GetLogicalChildren());
+        }
+    }
+
+    public class KeyboardNavigationTests : ScopedTestBase
+    {
+        [Fact]
+        public void RightKey_NavigatesToNextPage()
+        {
+            var cp = MakeCarousel(3, selectedIndex: 0);
+            cp.SimulateKeyDown(Key.Right);
+            Assert.Equal(1, cp.SelectedIndex);
+        }
+
+        [Fact]
+        public void DownKey_NavigatesToNextPage()
+        {
+            var cp = MakeCarousel(3, selectedIndex: 0);
+            cp.SimulateKeyDown(Key.Down);
+            Assert.Equal(1, cp.SelectedIndex);
+        }
+
+        [Fact]
+        public void LeftKey_NavigatesToPreviousPage()
+        {
+            var cp = MakeCarousel(3, selectedIndex: 2);
+            cp.SimulateKeyDown(Key.Left);
+            Assert.Equal(1, cp.SelectedIndex);
+        }
+
+        [Fact]
+        public void UpKey_NavigatesToPreviousPage()
+        {
+            var cp = MakeCarousel(3, selectedIndex: 2);
+            cp.SimulateKeyDown(Key.Up);
+            Assert.Equal(1, cp.SelectedIndex);
+        }
+
+        [Fact]
+        public void HomeKey_NavigatesToFirstPage()
+        {
+            var cp = MakeCarousel(3, selectedIndex: 2);
+            cp.SimulateKeyDown(Key.Home);
+            Assert.Equal(0, cp.SelectedIndex);
+        }
+
+        [Fact]
+        public void EndKey_NavigatesToLastPage()
+        {
+            var cp = MakeCarousel(3, selectedIndex: 0);
+            cp.SimulateKeyDown(Key.End);
+            Assert.Equal(2, cp.SelectedIndex);
+        }
+
+        [Fact]
+        public void LeftKey_AtFirstPage_DoesNotNavigate()
+        {
+            var cp = MakeCarousel(3, selectedIndex: 0);
+            cp.SimulateKeyDown(Key.Left);
+            Assert.Equal(0, cp.SelectedIndex);
+        }
+
+        [Fact]
+        public void RightKey_AtLastPage_DoesNotNavigate()
+        {
+            var cp = MakeCarousel(3, selectedIndex: 2);
+            cp.SimulateKeyDown(Key.Right);
+            Assert.Equal(2, cp.SelectedIndex);
+        }
+
+        [Fact]
+        public void KeyNavigation_Disabled_IgnoresArrowKey()
+        {
+            var cp = MakeCarousel(3, selectedIndex: 0);
+            cp.IsKeyboardNavigationEnabled = false;
+            cp.SimulateKeyDown(Key.Right);
+            Assert.Equal(0, cp.SelectedIndex);
+        }
+
+        [Fact]
+        public void RightKey_MarksEventHandled()
+        {
+            var cp = MakeCarousel(3, selectedIndex: 0);
+            var handled = cp.SimulateKeyDownReturnsHandled(Key.Right);
+            Assert.True(handled);
+        }
+
+        [Fact]
+        public void RightKey_AtLastPage_DoesNotMarkEventHandled()
+        {
+            var cp = MakeCarousel(3, selectedIndex: 2);
+            var handled = cp.SimulateKeyDownReturnsHandled(Key.Right);
+            Assert.False(handled);
+        }
+
+        [Fact]
+        public void RtlFlowDirection_LeftKey_NavigatesToNextPage()
+        {
+            var cp = MakeCarousel(3, selectedIndex: 0);
+            cp.FlowDirection = FlowDirection.RightToLeft;
+            cp.SimulateKeyDown(Key.Left);
+            Assert.Equal(1, cp.SelectedIndex);
+        }
+
+        [Fact]
+        public void RtlFlowDirection_RightKey_NavigatesToPreviousPage()
+        {
+            var cp = MakeCarousel(3, selectedIndex: 2);
+            cp.FlowDirection = FlowDirection.RightToLeft;
+            cp.SimulateKeyDown(Key.Right);
+            Assert.Equal(1, cp.SelectedIndex);
+        }
+
+        [Fact]
+        public void RtlFlowDirection_LeftKey_AtLastPage_DoesNotNavigate()
+        {
+            var cp = MakeCarousel(3, selectedIndex: 2);
+            cp.FlowDirection = FlowDirection.RightToLeft;
+            cp.SimulateKeyDown(Key.Left);
+            Assert.Equal(2, cp.SelectedIndex);
+        }
+
+        [Fact]
+        public void RtlFlowDirection_RightKey_AtFirstPage_DoesNotNavigate()
+        {
+            var cp = MakeCarousel(3, selectedIndex: 0);
+            cp.FlowDirection = FlowDirection.RightToLeft;
+            cp.SimulateKeyDown(Key.Right);
+            Assert.Equal(0, cp.SelectedIndex);
+        }
+
+        private static TestableCarouselPage MakeCarousel(int count, int selectedIndex)
+        {
+            var cp = new TestableCarouselPage();
+            for (var i = 0; i < count; i++)
+                ((AvaloniaList<Page>)cp.Pages!).Add(new ContentPage { Header = $"P{i}" });
+            cp.SelectedIndex = selectedIndex;
+            return cp;
+        }
+    }
+
+    public class WheelBehavior : ScopedTestBase
+    {
+        [Fact]
+        public void WheelDown_NavigatesForward()
+        {
+            var cp = MakeCarousel(3, selectedIndex: 0);
+            cp.SimulateWheel(new Vector(0, -1));
+            Assert.Equal(1, cp.SelectedIndex);
+        }
+
+        [Fact]
+        public void WheelUp_NavigatesBackward()
+        {
+            var cp = MakeCarousel(3, selectedIndex: 2);
+            cp.SimulateWheel(new Vector(0, 1));
+            Assert.Equal(1, cp.SelectedIndex);
+        }
+
+        [Fact]
+        public void WheelDown_AtLastPage_DoesNotHandleEvent()
+        {
+            var cp = MakeCarousel(3, selectedIndex: 2);
+            var handled = cp.SimulateWheelReturnsHandled(new Vector(0, -1));
+            Assert.Equal(2, cp.SelectedIndex);
+            Assert.False(handled);
+        }
+
+        [Fact]
+        public void WheelUp_AtFirstPage_DoesNotHandleEvent()
+        {
+            var cp = MakeCarousel(3, selectedIndex: 0);
+            var handled = cp.SimulateWheelReturnsHandled(new Vector(0, 1));
+            Assert.Equal(0, cp.SelectedIndex);
+            Assert.False(handled);
+        }
+
+        [Fact]
+        public void Wheel_WhenGestureDisabled_DoesNotHandleEvent()
+        {
+            var cp = MakeCarousel(3, selectedIndex: 0);
+            cp.IsGestureEnabled = false;
+            var handled = cp.SimulateWheelReturnsHandled(new Vector(0, -1));
+            Assert.Equal(0, cp.SelectedIndex);
+            Assert.False(handled);
+        }
+
+        [Fact]
+        public void Wheel_HandledByChild_DoesNotNavigate()
+        {
+            var cp = new CarouselPage
+            {
+                Width = 400,
+                Height = 300,
+                IsGestureEnabled = true,
+                Template = CreateCarouselPageTemplate(),
+            };
+
+            var child = new Border();
+            child.AddHandler(InputElement.PointerWheelChangedEvent, (_, e) => e.Handled = true);
+
+            var page0 = new ContentPage { Header = "P0", Content = child };
+            var page1 = new ContentPage { Header = "P1" };
+            var page2 = new ContentPage { Header = "P2" };
+            ((AvaloniaList<Page>)cp.Pages!).Add(page0);
+            ((AvaloniaList<Page>)cp.Pages!).Add(page1);
+            ((AvaloniaList<Page>)cp.Pages!).Add(page2);
+
+            var root = new TestRoot(cp) { ClientSize = new Size(400, 300) };
+            root.LayoutManager.ExecuteInitialLayoutPass();
+
+            var pointer = new Pointer(Pointer.GetNextFreeId(), PointerType.Mouse, true);
+            var wheelArgs = new PointerWheelEventArgs(
+                child,
+                pointer,
+                root,
+                default,
+                0,
+                new PointerPointProperties(RawInputModifiers.None, PointerUpdateKind.Other),
+                KeyModifiers.None,
+                new Vector(0, -1))
+            {
+                RoutedEvent = InputElement.PointerWheelChangedEvent
+            };
+            child.RaiseEvent(wheelArgs);
+
+            Assert.True(wheelArgs.Handled);
+            Assert.Equal(0, cp.SelectedIndex);
+        }
+
+        private static FuncControlTemplate<CarouselPage> CreateCarouselPageTemplate()
+        {
+            return new FuncControlTemplate<CarouselPage>((_, scope) =>
+                new Carousel
+                {
+                    Name = "PART_Carousel",
+                    Template = new FuncControlTemplate((c, ns) =>
+                        new ScrollViewer
+                        {
+                            Name = "PART_ScrollViewer",
+                            HorizontalScrollBarVisibility = ScrollBarVisibility.Hidden,
+                            VerticalScrollBarVisibility = ScrollBarVisibility.Hidden,
+                            Content = new ItemsPresenter
+                            {
+                                Name = "PART_ItemsPresenter",
+                                [~ItemsPresenter.ItemsPanelProperty] = c[~ItemsControl.ItemsPanelProperty],
+                            }.RegisterInNameScope(ns)
+                        }.RegisterInNameScope(ns)),
+                    HorizontalAlignment = HorizontalAlignment.Stretch,
+                    VerticalAlignment = VerticalAlignment.Stretch,
+                }.RegisterInNameScope(scope));
+        }
+
+        private static TestableCarouselPage MakeCarousel(int count, int selectedIndex)
+        {
+            var cp = new TestableCarouselPage();
+            for (var i = 0; i < count; i++)
+                ((AvaloniaList<Page>)cp.Pages!).Add(new ContentPage { Header = $"P{i}" });
+            cp.SelectedIndex = selectedIndex;
+            _ = new TestRoot { Child = cp };
+            return cp;
+        }
+    }
+
+    public class DataTemplateTests : ScopedTestBase
+    {
+        private record DataItem(string Name);
+
+        [Fact]
+        public void ItemsSource_SelectedPage_IsResolvedAfterLayout()
+        {
+            var cp = CreateTemplatedCarouselPage<CarouselPage>(
+                new[] { new DataItem("First"), new DataItem("Second") });
+
+            var root = new TestRoot { ClientSize = new Size(400, 300), Child = cp };
+            root.ExecuteInitialLayoutPass();
+            Dispatcher.UIThread.RunJobs(null, TestContext.Current.CancellationToken);
+
+            Assert.NotNull(cp.SelectedPage);
+            Assert.Equal("First", cp.SelectedPage!.Header?.ToString());
+            Assert.Equal("Page 1 of 2: First", Avalonia.Automation.AutomationProperties.GetName(cp));
+        }
+
+        [Fact]
+        public void KeyboardNavigation_UsesItemsSourceCount()
+        {
+            var cp = CreateTemplatedCarouselPage<TestableCarouselPage>(
+                new[] { new DataItem("First"), new DataItem("Second") });
+
+            var root = new TestRoot { ClientSize = new Size(400, 300), Child = cp };
+            root.ExecuteInitialLayoutPass();
+            Dispatcher.UIThread.RunJobs(null, TestContext.Current.CancellationToken);
+
+            cp.SimulateKeyDown(Key.Right);
+            root.LayoutManager.ExecuteLayoutPass();
+            Dispatcher.UIThread.RunJobs(null, TestContext.Current.CancellationToken);
+
+            Assert.Equal(1, cp.SelectedIndex);
+            Assert.NotNull(cp.SelectedPage);
+            Assert.Equal("Second", cp.SelectedPage!.Header?.ToString());
+            Assert.Equal("Page 2 of 2: Second", Avalonia.Automation.AutomationProperties.GetName(cp));
+        }
+
+        [Fact]
+        public void WheelNavigation_UsesItemsSourceCount()
+        {
+            var cp = CreateTemplatedCarouselPage<TestableCarouselPage>(
+                new[] { new DataItem("First"), new DataItem("Second") });
+
+            var root = new TestRoot { ClientSize = new Size(400, 300), Child = cp };
+            root.ExecuteInitialLayoutPass();
+            Dispatcher.UIThread.RunJobs(null, TestContext.Current.CancellationToken);
+
+            var handled = cp.SimulateWheelReturnsHandled(new Vector(0, -1));
+            root.LayoutManager.ExecuteLayoutPass();
+            Dispatcher.UIThread.RunJobs(null, TestContext.Current.CancellationToken);
+
+            Assert.True(handled);
+            Assert.Equal(1, cp.SelectedIndex);
+            Assert.NotNull(cp.SelectedPage);
+            Assert.Equal("Second", cp.SelectedPage!.Header?.ToString());
+        }
+
+        [Fact]
+        public void ItemsSource_SelectionChanges_FireLifecycleOnGeneratedPages()
+        {
+            var cp = CreateTemplatedCarouselPage<TestableCarouselPage>(
+                new[] { new DataItem("First"), new DataItem("Second") },
+                item => new TrackingPage
+                {
+                    Header = item?.Name,
+                    Content = new Border { Width = 400, Height = 300 }
+                });
+
+            var root = new TestRoot { ClientSize = new Size(400, 300), Child = cp };
+            root.ExecuteInitialLayoutPass();
+            Dispatcher.UIThread.RunJobs(null, TestContext.Current.CancellationToken);
+
+            var firstPage = Assert.IsType<TrackingPage>(cp.SelectedPage);
+            Assert.Equal(1, firstPage.NavigatedToCount);
+            Assert.Equal(0, firstPage.NavigatedFromCount);
+
+            cp.SimulateKeyDown(Key.Right);
+            root.LayoutManager.ExecuteLayoutPass();
+            Dispatcher.UIThread.RunJobs(null, TestContext.Current.CancellationToken);
+
+            var secondPage = Assert.IsType<TrackingPage>(cp.SelectedPage);
+            Assert.Equal(1, firstPage.NavigatedFromCount);
+            Assert.Equal(1, secondPage.NavigatedToCount);
+            Assert.Same(secondPage, cp.CurrentPage);
+        }
+
+        [Fact]
+        public void PageTemplate_ChangedAfterContainersRealized_UpdatesSelectedPage()
+        {
+            var cp = CreateTemplatedCarouselPage<CarouselPage>(
+                new[] { new DataItem("First"), new DataItem("Second") },
+                item => new ContentPage
+                {
+                    Header = $"Detail {item?.Name}",
+                    Content = new Border { Width = 400, Height = 300 }
+                });
+
+            var root = new TestRoot { ClientSize = new Size(400, 300), Child = cp };
+            root.ExecuteInitialLayoutPass();
+            Dispatcher.UIThread.RunJobs(null, TestContext.Current.CancellationToken);
+
+            var originalPage = Assert.IsType<ContentPage>(cp.SelectedPage);
+            Assert.Equal("Detail First", originalPage.Header);
+
+            cp.PageTemplate = new FuncDataTemplate<DataItem>(
+                (item, _) => new ContentPage
+                {
+                    Header = $"Showcase {item?.Name}",
+                    Content = new Border { Width = 400, Height = 300 }
+                },
+                supportsRecycling: false);
+
+            root.LayoutManager.ExecuteLayoutPass();
+            Dispatcher.UIThread.RunJobs(null, TestContext.Current.CancellationToken);
+
+            var updatedPage = Assert.IsType<ContentPage>(cp.SelectedPage);
+            Assert.NotSame(originalPage, updatedPage);
+            Assert.Equal("Showcase First", updatedPage.Header);
+        }
+
+        private static T CreateTemplatedCarouselPage<T>(IEnumerable<DataItem> items)
+            where T : CarouselPage, new()
+        {
+            return CreateTemplatedCarouselPage<T>(
+                items,
+                item => new ContentPage
+                {
+                    Header = item?.Name,
+                    Content = new Border { Width = 400, Height = 300 }
+                });
+        }
+
+        private static T CreateTemplatedCarouselPage<T>(IEnumerable<DataItem> items, Func<DataItem?, Page> pageFactory)
+            where T : CarouselPage, new()
+        {
+            return new T
+            {
+                Width = 400,
+                Height = 300,
+                ItemsSource = items,
+                PageTemplate = new FuncDataTemplate<DataItem>(
+                    (item, _) => pageFactory(item),
+                    supportsRecycling: false),
+                Template = CreateCarouselPageTemplate(),
+            };
+        }
+
+        private static FuncControlTemplate<CarouselPage> CreateCarouselPageTemplate()
+        {
+            return new FuncControlTemplate<CarouselPage>((_, scope) =>
+                new Carousel
+                {
+                    Name = "PART_Carousel",
+                    Template = CarouselTemplate(),
+                    HorizontalAlignment = HorizontalAlignment.Stretch,
+                    VerticalAlignment = VerticalAlignment.Stretch,
+                }.RegisterInNameScope(scope));
+        }
+
+        private static IControlTemplate CarouselTemplate()
+        {
+            return new FuncControlTemplate((c, ns) =>
+                new ScrollViewer
+                {
+                    Name = "PART_ScrollViewer",
+                    Template = ScrollViewerTemplate(),
+                    HorizontalScrollBarVisibility = ScrollBarVisibility.Hidden,
+                    VerticalScrollBarVisibility = ScrollBarVisibility.Hidden,
+                    Content = new ItemsPresenter
+                    {
+                        Name = "PART_ItemsPresenter",
+                        [~ItemsPresenter.ItemsPanelProperty] = c[~ItemsControl.ItemsPanelProperty],
+                    }.RegisterInNameScope(ns)
+                }.RegisterInNameScope(ns));
+        }
+
+        private static FuncControlTemplate ScrollViewerTemplate()
+        {
+            return new FuncControlTemplate((_, ns) =>
+                new ScrollContentPresenter
+                {
+                    Name = "PART_ContentPresenter",
+                }.RegisterInNameScope(ns));
+        }
+
+        private sealed class TrackingPage : ContentPage
+        {
+            public int NavigatedToCount { get; private set; }
+            public int NavigatedFromCount { get; private set; }
+
+            protected override void OnNavigatedTo(NavigatedToEventArgs args)
+            {
+                NavigatedToCount++;
+                base.OnNavigatedTo(args);
+            }
+
+            protected override void OnNavigatedFrom(NavigatedFromEventArgs args)
+            {
+                NavigatedFromCount++;
+                base.OnNavigatedFrom(args);
+            }
+        }
+    }
+
+    private sealed class TestableCarouselPage : CarouselPage
+    {
+        public void SimulateKeyDown(Key key)
+        {
+            var e = new KeyEventArgs { RoutedEvent = InputElement.KeyDownEvent, Key = key };
+            OnKeyDown(e);
+        }
+
+        public bool SimulateKeyDownReturnsHandled(Key key)
+        {
+            var e = new KeyEventArgs { RoutedEvent = InputElement.KeyDownEvent, Key = key };
+            OnKeyDown(e);
+            return e.Handled;
+        }
+
+        public void SimulateWheel(Vector delta)
+        {
+            SimulateWheelReturnsHandled(delta);
+        }
+
+        public bool SimulateWheelReturnsHandled(Vector delta)
+        {
+            var pointer = new FakePointer();
+            var e = new PointerWheelEventArgs(this, pointer, this, default, 0,
+                new PointerPointProperties(RawInputModifiers.None, PointerUpdateKind.Other),
+                KeyModifiers.None, delta)
+            {
+                RoutedEvent = PointerWheelChangedEvent
+            };
+            RaiseEvent(e);
+            return e.Handled;
+        }
+    }
+
+    public class SwipeGestureTests : ScopedTestBase
+    {
+        [Fact]
+        public void MouseSwipe_Advances_Page()
+        {
+            var clock = new MockGlobalClock();
+            using var app = UnitTestApplication.Start(
+                TestServices.MockPlatformRenderInterface.With(globalClock: clock));
+            using var sync = UnitTestSynchronizationContext.Begin();
+
+            var (cp, carousel, panel) = CreateSwipeReadyCarouselPage();
+            var mouse = new MouseTestHelper();
+
+            mouse.Down(panel, position: new Point(200, 100));
+            mouse.Move(panel, new Point(40, 100));
+            mouse.Up(panel, position: new Point(40, 100));
+            clock.Pulse(TimeSpan.Zero);
+            clock.Pulse(TimeSpan.FromSeconds(1));
+            sync.ExecutePostedCallbacks();
+            Dispatcher.UIThread.RunJobs(null, TestContext.Current.CancellationToken);
+
+            Assert.Equal(1, carousel.SelectedIndex);
+            Assert.Equal(1, cp.SelectedIndex);
+            Assert.Same(((AvaloniaList<Page>)cp.Pages!)[1], cp.CurrentPage);
+        }
+
+        [Fact]
+        public void TouchSwipe_Advances_Page()
+        {
+            var clock = new MockGlobalClock();
+            using var app = UnitTestApplication.Start(
+                TestServices.MockPlatformRenderInterface.With(globalClock: clock));
+            using var sync = UnitTestSynchronizationContext.Begin();
+
+            var (cp, carousel, panel) = CreateSwipeReadyCarouselPage();
+            var touch = new TouchTestHelper();
+
+            touch.Down(panel, new Point(200, 100));
+            touch.Move(panel, new Point(40, 100));
+            touch.Up(panel, new Point(40, 100));
+            clock.Pulse(TimeSpan.Zero);
+            clock.Pulse(TimeSpan.FromSeconds(1));
+            sync.ExecutePostedCallbacks();
+            Dispatcher.UIThread.RunJobs(null, TestContext.Current.CancellationToken);
+
+            Assert.Equal(1, carousel.SelectedIndex);
+            Assert.Equal(1, cp.SelectedIndex);
+            Assert.Same(((AvaloniaList<Page>)cp.Pages!)[1], cp.CurrentPage);
+        }
+
+        private static (CarouselPage Page, Carousel Carousel, VirtualizingCarouselPanel Panel) CreateSwipeReadyCarouselPage()
+        {
+            var cp = new CarouselPage
+            {
+                Width = 400,
+                Height = 300,
+                IsGestureEnabled = true,
+                PageTransition = new PageSlide(TimeSpan.FromMilliseconds(1)),
+                Pages = new AvaloniaList<Page>
+                {
+                    new ContentPage { Header = "A", Content = new Border { Width = 400, Height = 300 } },
+                    new ContentPage { Header = "B", Content = new Border { Width = 400, Height = 300 } },
+                    new ContentPage { Header = "C", Content = new Border { Width = 400, Height = 300 } }
+                },
+                Template = new FuncControlTemplate<CarouselPage>((parent, scope) =>
+                    new Carousel
+                    {
+                        Name = "PART_Carousel",
+                        Template = CarouselTemplate(),
+                        HorizontalAlignment = HorizontalAlignment.Stretch,
+                        VerticalAlignment = VerticalAlignment.Stretch,
+                        [~ItemsControl.ItemsSourceProperty] = parent[~CarouselPage.PagesProperty],
+                        [~ItemsControl.ItemTemplateProperty] = parent[~CarouselPage.PageTemplateProperty],
+                        [~ItemsControl.ItemsPanelProperty] = parent[~CarouselPage.ItemsPanelProperty],
+                        [~Carousel.PageTransitionProperty] = parent[~CarouselPage.PageTransitionProperty],
+                    }.RegisterInNameScope(scope))
+            };
+
+            var root = new TestRoot
+            {
+                ClientSize = new Size(400, 300),
+                Child = cp
+            };
+            root.ExecuteInitialLayoutPass();
+            Dispatcher.UIThread.RunJobs(null, TestContext.Current.CancellationToken);
+
+            var carousel = cp.GetVisualDescendants().OfType<Carousel>().Single();
+            var panel = Assert.IsType<VirtualizingCarouselPanel>(carousel.Presenter!.Panel!);
+            Assert.True(carousel.IsSwipeEnabled);
+            var recognizer = Assert.Single(panel.GestureRecognizers.OfType<SwipeGestureRecognizer>());
+            Assert.True(recognizer.IsEnabled);
+            Assert.True(recognizer.CanHorizontallySwipe);
+            recognizer.IsMouseEnabled = true;
+            return (cp, carousel, panel);
+        }
+
+        private static IControlTemplate CarouselTemplate()
+        {
+            return new FuncControlTemplate((c, ns) =>
+                new ScrollViewer
+                {
+                    Name = "PART_ScrollViewer",
+                    Template = ScrollViewerTemplate(),
+                    HorizontalScrollBarVisibility = ScrollBarVisibility.Hidden,
+                    VerticalScrollBarVisibility = ScrollBarVisibility.Hidden,
+                    Content = new ItemsPresenter
+                    {
+                        Name = "PART_ItemsPresenter",
+                        [~ItemsPresenter.ItemsPanelProperty] = c[~ItemsControl.ItemsPanelProperty],
+                    }.RegisterInNameScope(ns)
+                }.RegisterInNameScope(ns));
+        }
+
+        private static FuncControlTemplate ScrollViewerTemplate()
+        {
+            return new FuncControlTemplate<ScrollViewer>((parent, scope) =>
+                new Panel
+                {
+                    Children =
+                    {
+                        new ScrollContentPresenter
+                        {
+                            Name = "PART_ContentPresenter",
+                        }.RegisterInNameScope(scope),
+                    }
+                });
+        }
+    }
+
+    public class InteractiveTransitionTests : ScopedTestBase
+    {
+        [Fact]
+        public void PageSlide_Update_AppliesTranslateTransformToFrom()
+        {
+            var parent = new Canvas { Width = 400, Height = 300 };
+            var from = new Border();
+            var to = new Border();
+            parent.Children.Add(from);
+            parent.Children.Add(to);
+            parent.Measure(new Size(400, 300));
+            parent.Arrange(new Rect(0, 0, 400, 300));
+
+            var slide = new PageSlide(TimeSpan.FromMilliseconds(300));
+            slide.Update(0.5, from, to, true, 400, Array.Empty<PageTransitionItem>());
+
+            Assert.IsType<TranslateTransform>(from.RenderTransform);
+            var ft = (TranslateTransform)from.RenderTransform!;
+            Assert.Equal(-200, ft.X);
+        }
+
+        [Fact]
+        public void PageSlide_Update_AppliesTranslateTransformToTo()
+        {
+            var parent = new Canvas { Width = 400, Height = 300 };
+            var from = new Border();
+            var to = new Border();
+            parent.Children.Add(from);
+            parent.Children.Add(to);
+            parent.Measure(new Size(400, 300));
+            parent.Arrange(new Rect(0, 0, 400, 300));
+
+            var slide = new PageSlide(TimeSpan.FromMilliseconds(300));
+            slide.Update(0.5, from, to, true, 400, Array.Empty<PageTransitionItem>());
+
+            Assert.IsType<TranslateTransform>(to.RenderTransform);
+            var tt = (TranslateTransform)to.RenderTransform!;
+            Assert.Equal(200, tt.X);
+        }
+
+        [Fact]
+        public void CrossFade_Update_SetsOpacity()
+        {
+            var from = new Border();
+            var to = new Border();
+
+            var crossFade = new CrossFade(TimeSpan.FromMilliseconds(300));
+            crossFade.Update(0.5, from, to, true, 0, Array.Empty<PageTransitionItem>());
+
+            Assert.Equal(0.5, from.Opacity, 2);
+            Assert.Equal(0.5, to.Opacity, 2);
+            Assert.True(to.IsVisible);
+        }
+
+    }
+
+    public class CarouselIsSwipeEnabledTests : ScopedTestBase
+    {
+        [Fact]
+        public void IsSwipeEnabled_DefaultIsFalse()
+        {
+            var carousel = new Carousel();
+            Assert.False(carousel.IsSwipeEnabled);
+        }
+
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public void IsSwipeEnabled_RoundTrips(bool value)
+        {
+            var carousel = new Carousel { IsSwipeEnabled = value };
+            Assert.Equal(value, carousel.IsSwipeEnabled);
+        }
+
+        [Fact]
+        public void GetTransitionAxis_ReturnsNull_WhenNoTransition()
+        {
+            var carousel = new Carousel();
+            Assert.Null(carousel.GetTransitionAxis());
+        }
+
+        [Fact]
+        public void GetTransitionAxis_ReturnsNull_WhenNonPageSlideTransition()
+        {
+            var carousel = new Carousel { PageTransition = new CrossFade(TimeSpan.FromMilliseconds(200)) };
+            Assert.Null(carousel.GetTransitionAxis());
+        }
+
+        [Fact]
+        public void GetTransitionAxis_ReturnsVertical_WhenPageSlideVertical()
+        {
+            var carousel = new Carousel
+            {
+                PageTransition = new PageSlide(TimeSpan.FromMilliseconds(200), PageSlide.SlideAxis.Vertical)
+            };
+            Assert.Equal(PageSlide.SlideAxis.Vertical, carousel.GetTransitionAxis());
+        }
+
+        [Fact]
+        public void GetTransitionAxis_ReturnsVertical_WhenRotate3DVertical()
+        {
+            var carousel = new Carousel
+            {
+                PageTransition = new Rotate3DTransition(TimeSpan.FromMilliseconds(200), PageSlide.SlideAxis.Vertical)
+            };
+            Assert.Equal(PageSlide.SlideAxis.Vertical, carousel.GetTransitionAxis());
+        }
+    }
+
+    private sealed class TestPageTransition : IPageTransition
+    {
+        public Task Start(Visual? from, Visual? to, bool forward, CancellationToken cancellationToken)
+            => Task.CompletedTask;
+    }
+
+    private sealed class FakePointer : IPointer
+    {
+        public int Id { get; } = Pointer.GetNextFreeId();
+        public void Capture(IInputElement? control) => Captured = control;
+        public IInputElement? Captured { get; set; }
+        public PointerType Type => PointerType.Mouse;
+        public bool IsPrimary => true;
+    }
+
+    public class VisualTreeLifecycleTests : ScopedTestBase
+    {
+        [Fact]
+        public void Detach_And_Reattach_CollectionChangedStillUpdatesSelection()
+        {
+            var pages = new AvaloniaList<Page>();
+            var cp = new CarouselPage { Pages = pages };
+            var root = new TestRoot { Child = cp };
+
+            var page1 = new ContentPage { Header = "A" };
+            pages.Add(page1);
+            Assert.Same(page1, cp.SelectedPage);
+
+            root.Child = null;
+            root.Child = cp;
+
+            var page2 = new ContentPage { Header = "B" };
+            pages.Add(page2);
+
+            pages.Remove(page1);
+            Assert.Same(page2, cp.SelectedPage);
+        }
+    }
+}
diff --git a/tests/Avalonia.Controls.UnitTests/CarouselTests.cs b/tests/Avalonia.Controls.UnitTests/CarouselTests.cs
index ab93686966..11221eb7d1 100644
--- a/tests/Avalonia.Controls.UnitTests/CarouselTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/CarouselTests.cs
@@ -2,10 +2,12 @@ using System;
 using System.Collections.ObjectModel;
 using System.Linq;
 using System.Reactive.Subjects;
+using Avalonia.Animation;
 using Avalonia.Controls.Presenters;
 using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Templates;
 using Avalonia.Data;
+using Avalonia.Input;
 using Avalonia.Layout;
 using Avalonia.LogicalTree;
 using Avalonia.UnitTests;
@@ -59,6 +61,28 @@ namespace Avalonia.Controls.UnitTests
             Assert.Equal("Foo", child.Text);
         }
 
+        [Fact]
+        public void ViewportFraction_Defaults_To_One()
+        {
+            using var app = Start();
+            var target = new Carousel();
+
+            Assert.Equal(1d, target.ViewportFraction);
+        }
+
+        [Fact]
+        public void ViewportFraction_Coerces_Invalid_Values_To_One()
+        {
+            using var app = Start();
+            var target = new Carousel();
+
+            target.ViewportFraction = 0;
+            Assert.Equal(1d, target.ViewportFraction);
+
+            target.ViewportFraction = double.NaN;
+            Assert.Equal(1d, target.ViewportFraction);
+        }
+
         [Fact]
         public void Selected_Item_Changes_To_First_Item_When_Items_Property_Changes()
         {
@@ -147,8 +171,7 @@ namespace Avalonia.Controls.UnitTests
             target.ItemsSource = null;
             Layout(target);
 
-            var numChildren = target.GetRealizedContainers().Count();
-
+            Assert.Empty(target.GetRealizedContainers());
             Assert.Equal(-1, target.SelectedIndex);
         }
 
@@ -326,6 +349,204 @@ namespace Avalonia.Controls.UnitTests
             Assert.Equal(1, target.SelectedIndex);
         }
 
+        public class WrapSelectionTests : ScopedTestBase
+        {
+            [Fact]
+            public void Next_Loops_When_WrapSelection_Is_True()
+            {
+                using var app = Start();
+                var items = new[] { "foo", "bar", "baz" };
+                var target = new Carousel
+                {
+                    Template = CarouselTemplate(),
+                    ItemsSource = items,
+                    WrapSelection = true,
+                    SelectedIndex = 2
+                };
+
+                Prepare(target);
+
+                target.Next();
+                Layout(target);
+
+                Assert.Equal(0, target.SelectedIndex);
+            }
+
+            [Fact]
+            public void Previous_Loops_When_WrapSelection_Is_True()
+            {
+                using var app = Start();
+                var items = new[] { "foo", "bar", "baz" };
+                var target = new Carousel
+                {
+                    Template = CarouselTemplate(),
+                    ItemsSource = items,
+                    WrapSelection = true,
+                    SelectedIndex = 0
+                };
+
+                Prepare(target);
+
+                target.Previous();
+                Layout(target);
+
+                Assert.Equal(2, target.SelectedIndex);
+            }
+
+            [Fact]
+            public void Next_Does_Not_Loop_When_WrapSelection_Is_False()
+            {
+                using var app = Start();
+                var items = new[] { "foo", "bar", "baz" };
+                var target = new Carousel
+                {
+                    Template = CarouselTemplate(),
+                    ItemsSource = items,
+                    WrapSelection = false,
+                    SelectedIndex = 2
+                };
+
+                Prepare(target);
+
+                target.Next();
+                Layout(target);
+
+                Assert.Equal(2, target.SelectedIndex);
+            }
+
+            [Fact]
+            public void Previous_Does_Not_Loop_When_WrapSelection_Is_False()
+            {
+                using var app = Start();
+                var items = new[] { "foo", "bar", "baz" };
+                var target = new Carousel
+                {
+                    Template = CarouselTemplate(),
+                    ItemsSource = items,
+                    WrapSelection = false,
+                    SelectedIndex = 0
+                };
+
+                Prepare(target);
+
+                target.Previous();
+                Layout(target);
+
+                Assert.Equal(0, target.SelectedIndex);
+            }
+        }
+
+
+
+        [Fact]
+        public void Right_Arrow_Navigates_To_Next_With_Horizontal_PageSlide()
+        {
+            using var app = Start();
+            var target = new Carousel
+            {
+                Template = CarouselTemplate(),
+                ItemsSource = new[] { "Foo", "Bar", "Baz" },
+                PageTransition = new PageSlide(TimeSpan.FromMilliseconds(100), PageSlide.SlideAxis.Horizontal),
+            };
+
+            Prepare(target);
+            Assert.Equal(0, target.SelectedIndex);
+
+            target.RaiseEvent(new KeyEventArgs { RoutedEvent = InputElement.KeyDownEvent, Key = Key.Right });
+            Assert.Equal(1, target.SelectedIndex);
+        }
+
+        [Fact]
+        public void Down_Arrow_Navigates_To_Next_With_Vertical_PageSlide()
+        {
+            using var app = Start();
+            var target = new Carousel
+            {
+                Template = CarouselTemplate(),
+                ItemsSource = new[] { "Foo", "Bar", "Baz" },
+                PageTransition = new PageSlide(TimeSpan.FromMilliseconds(100), PageSlide.SlideAxis.Vertical),
+            };
+
+            Prepare(target);
+            Assert.Equal(0, target.SelectedIndex);
+
+            target.RaiseEvent(new KeyEventArgs { RoutedEvent = InputElement.KeyDownEvent, Key = Key.Down });
+            Assert.Equal(1, target.SelectedIndex);
+        }
+
+        [Fact]
+        public void Home_Navigates_To_First_Item()
+        {
+            using var app = Start();
+            var target = new Carousel
+            {
+                Template = CarouselTemplate(),
+                ItemsSource = new[] { "Foo", "Bar", "Baz" },
+                SelectedIndex = 2,
+            };
+
+            Prepare(target);
+            Layout(target);
+            Assert.Equal(2, target.SelectedIndex);
+
+            target.RaiseEvent(new KeyEventArgs { RoutedEvent = InputElement.KeyDownEvent, Key = Key.Home });
+            Assert.Equal(0, target.SelectedIndex);
+        }
+
+        [Fact]
+        public void End_Navigates_To_Last_Item()
+        {
+            using var app = Start();
+            var target = new Carousel
+            {
+                Template = CarouselTemplate(),
+                ItemsSource = new[] { "Foo", "Bar", "Baz" },
+            };
+
+            Prepare(target);
+            Assert.Equal(0, target.SelectedIndex);
+
+            target.RaiseEvent(new KeyEventArgs { RoutedEvent = InputElement.KeyDownEvent, Key = Key.End });
+            Assert.Equal(2, target.SelectedIndex);
+        }
+
+        [Fact]
+        public void Wrong_Axis_Arrow_Is_Ignored()
+        {
+            using var app = Start();
+            var target = new Carousel
+            {
+                Template = CarouselTemplate(),
+                ItemsSource = new[] { "Foo", "Bar", "Baz" },
+                PageTransition = new PageSlide(TimeSpan.FromMilliseconds(100), PageSlide.SlideAxis.Horizontal),
+            };
+
+            Prepare(target);
+            Assert.Equal(0, target.SelectedIndex);
+
+            target.RaiseEvent(new KeyEventArgs { RoutedEvent = InputElement.KeyDownEvent, Key = Key.Down });
+            Assert.Equal(0, target.SelectedIndex);
+        }
+
+        [Fact]
+        public void Left_Arrow_Wraps_With_WrapSelection()
+        {
+            using var app = Start();
+            var target = new Carousel
+            {
+                Template = CarouselTemplate(),
+                ItemsSource = new[] { "Foo", "Bar", "Baz" },
+                PageTransition = new PageSlide(TimeSpan.FromMilliseconds(100), PageSlide.SlideAxis.Horizontal),
+                WrapSelection = true,
+            };
+
+            Prepare(target);
+            Assert.Equal(0, target.SelectedIndex);
+
+            target.RaiseEvent(new KeyEventArgs { RoutedEvent = InputElement.KeyDownEvent, Key = Key.Left });
+            Assert.Equal(2, target.SelectedIndex);
+        }
+
         private static IDisposable Start() => UnitTestApplication.Start(TestServices.MockPlatformRenderInterface);
 
         private static void Prepare(Carousel target)
diff --git a/tests/Avalonia.Controls.UnitTests/CommandBarTests.cs b/tests/Avalonia.Controls.UnitTests/CommandBarTests.cs
index 0e291071d8..8bd4401d10 100644
--- a/tests/Avalonia.Controls.UnitTests/CommandBarTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/CommandBarTests.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Collections.Specialized;
 using Avalonia.Controls;
 using Avalonia.UnitTests;
 using Xunit;
@@ -521,6 +522,19 @@ public class CommandBarCollectionTests : ScopedTestBase
         Assert.Contains(btn, cb.VisiblePrimaryCommands);
     }
 
+    [Fact]
+    public void PrimaryCommands_DefaultCollection_DoesNotDuplicateVisiblePrimaryNotifications()
+    {
+        var cb = new CommandBar();
+        var notifications = 0;
+
+        ((INotifyCollectionChanged)cb.VisiblePrimaryCommands).CollectionChanged += (_, _) => notifications++;
+
+        cb.PrimaryCommands!.Add(new AppBarButton { Label = "Save" });
+
+        Assert.Equal(2, notifications);
+    }
+
     [Fact]
     public void PrimaryCommands_Removed_DisappearsFromVisiblePrimary()
     {
@@ -540,6 +554,19 @@ public class CommandBarCollectionTests : ScopedTestBase
         Assert.Contains(btn, cb.OverflowItems);
     }
 
+    [Fact]
+    public void SecondaryCommands_DefaultCollection_DoesNotDuplicateOverflowNotifications()
+    {
+        var cb = new CommandBar();
+        var notifications = 0;
+
+        ((INotifyCollectionChanged)cb.OverflowItems).CollectionChanged += (_, _) => notifications++;
+
+        cb.SecondaryCommands!.Add(new AppBarButton { Label = "Settings" });
+
+        Assert.Equal(2, notifications);
+    }
+
     [Fact]
     public void SecondaryCommands_Removed_DisappearsFromOverflowItems()
     {
diff --git a/tests/Avalonia.Controls.UnitTests/ContentPageTests.cs b/tests/Avalonia.Controls.UnitTests/ContentPageTests.cs
index 19a9becc4f..385163b103 100644
--- a/tests/Avalonia.Controls.UnitTests/ContentPageTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/ContentPageTests.cs
@@ -1,4 +1,6 @@
+using System;
 using Avalonia.Controls.Templates;
+using Avalonia.Interactivity;
 using Avalonia.Layout;
 using Avalonia.LogicalTree;
 using Avalonia.UnitTests;
@@ -112,6 +114,17 @@ public class ContentPageTests
             Assert.Same(ctrl, page.Content);
         }
 
+        [Theory]
+        [InlineData(typeof(ContentPage))]
+        [InlineData(typeof(NavigationPage))]
+        [InlineData(typeof(TabbedPage))]
+        public void Content_SetAnyPageSubtype_ThrowsInvalidOperationException(Type pageType)
+        {
+            var host = new ContentPage();
+            var child = (Page)Activator.CreateInstance(pageType)!;
+            Assert.Throws<InvalidOperationException>(() => host.Content = child);
+        }
+
         [Fact]
         public void AutomaticallyApplySafeAreaPadding_DefaultIsTrue()
         {
@@ -222,18 +235,6 @@ public class ContentPageTests
             Assert.Empty(((ILogical)page).LogicalChildren);
         }
 
-        [Fact]
-        public void Content_ReplacedPage_ResetsSafeAreaPaddingOnOldPage()
-        {
-            var host = new ContentPage();
-            var oldChild = new ContentPage();
-            oldChild.SafeAreaPadding = new Thickness(10, 20, 10, 30);
-            host.Content = oldChild;
-
-            host.Content = new ContentPage();
-
-            Assert.Equal(default(Thickness), oldChild.SafeAreaPadding);
-        }
     }
 
     public class CommandBarPropertyTests : ScopedTestBase
diff --git a/tests/Avalonia.Controls.UnitTests/DrawerPageTests.cs b/tests/Avalonia.Controls.UnitTests/DrawerPageTests.cs
index ca3b1267bd..87fb421a72 100644
--- a/tests/Avalonia.Controls.UnitTests/DrawerPageTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/DrawerPageTests.cs
@@ -1,13 +1,17 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
 using Avalonia.Input;
+using Avalonia.Input.GestureRecognizers;
 using Avalonia.Interactivity;
 using Avalonia.Layout;
 using Avalonia.LogicalTree;
 using Avalonia.Media;
+using Avalonia.Controls.Templates;
 using Avalonia.Threading;
 using Avalonia.UnitTests;
+using Avalonia.VisualTree;
 using Xunit;
 
 namespace Avalonia.Controls.UnitTests;
@@ -51,10 +55,10 @@ public class DrawerPageTests
         [InlineData(600.0)]
         [InlineData(800.0)]
         [InlineData(1200.0)]
-        public void DrawerBreakpointWidth_RoundTrips(double width)
+        public void DrawerBreakpointLength_RoundTrips(double width)
         {
-            var dp = new DrawerPage { DrawerBreakpointWidth = width };
-            Assert.Equal(width, dp.DrawerBreakpointWidth);
+            var dp = new DrawerPage { DrawerBreakpointLength = width };
+            Assert.Equal(width, dp.DrawerBreakpointLength);
         }
 
         [Theory]
@@ -557,6 +561,57 @@ public class DrawerPageTests
 
             Assert.True(dp.IsOpen);
         }
+
+        [Fact]
+        public void IsOpen_RapidToggle_EventsFiredExactlyOncePerChange()
+        {
+            var dp = new DrawerPage();
+            int openedCount = 0;
+            int closedCount = 0;
+            dp.Opened += (_, _) => openedCount++;
+            dp.Closed += (_, _) => closedCount++;
+
+            for (int i = 0; i < 5; i++)
+            {
+                dp.IsOpen = true;
+                dp.IsOpen = false;
+            }
+
+            Assert.Equal(5, openedCount);
+            Assert.Equal(5, closedCount);
+            Assert.False(dp.IsOpen);
+        }
+
+        [Fact]
+        public void BackdropPress_WithCanceledClose_FiresClosingOnce_WhenTemplateWasAppliedBeforeAttach()
+        {
+            var dp = new DrawerPage
+            {
+                Template = BackdropOnlyTemplate(),
+                IsOpen = true,
+                BackdropBrush = Brushes.Black,
+                DisplayMode = SplitViewDisplayMode.Overlay
+            };
+
+            dp.ApplyTemplate();
+
+            int closingCount = 0;
+            dp.Closing += (_, e) =>
+            {
+                closingCount++;
+                e.Cancel = true;
+            };
+
+            var root = new TestRoot { Child = dp };
+            root.ExecuteInitialLayoutPass();
+
+            var backdrop = Assert.Single(dp.GetVisualDescendants().OfType<Border>(), x => x.Name == "PART_Backdrop");
+
+            RaisePointerPressed(backdrop);
+
+            Assert.Equal(1, closingCount);
+            Assert.True(dp.IsOpen);
+        }
     }
 
     public class LifecycleEventTests : ScopedTestBase
@@ -830,27 +885,97 @@ public class DrawerPageTests
         }
 
         [Fact]
-        public void DrawerBreakpointWidth_BeforeLayout_DoesNotOverrideLayoutBehavior()
+        public void DrawerBreakpointLength_BeforeLayout_DoesNotOverrideLayoutBehavior()
         {
             var dp = new DrawerPage
             {
                 DrawerLayoutBehavior = DrawerLayoutBehavior.Split,
-                DrawerBreakpointWidth = 1200
+                DrawerBreakpointLength = 1200
             };
             Assert.Equal(SplitViewDisplayMode.Inline, dp.DisplayMode);
         }
 
         [Fact]
-        public void DrawerBreakpointWidth_Zero_DoesNotOverrideLayoutBehavior()
+        public void DrawerBreakpointLength_Zero_DoesNotOverrideLayoutBehavior()
         {
             // Breakpoint == 0 means the feature is disabled; DrawerLayoutBehavior drives DisplayMode.
             var dp = new DrawerPage
             {
                 DrawerLayoutBehavior = DrawerLayoutBehavior.Split,
-                DrawerBreakpointWidth = 0
+                DrawerBreakpointLength = 0
             };
             Assert.Equal(SplitViewDisplayMode.Inline, dp.DisplayMode);
         }
+
+        [Theory]
+        [InlineData(DrawerPlacement.Left)]
+        [InlineData(DrawerPlacement.Right)]
+        public void DrawerBreakpointLength_Horizontal_BelowBreakpoint_ForcesOverlay(DrawerPlacement placement)
+        {
+            var dp = new DrawerPage
+            {
+                DrawerLayoutBehavior = DrawerLayoutBehavior.Split,
+                DrawerBreakpointLength = 1200,
+                DrawerPlacement = placement
+            };
+            dp.Measure(new Size(800, 600));
+            dp.Arrange(new Rect(0, 0, 800, 600));
+
+            Assert.Equal(SplitViewDisplayMode.Overlay, dp.DisplayMode);
+        }
+
+        [Theory]
+        [InlineData(DrawerPlacement.Left)]
+        [InlineData(DrawerPlacement.Right)]
+        public void DrawerBreakpointLength_Horizontal_AboveBreakpoint_UsesConfiguredLayout(DrawerPlacement placement)
+        {
+            var dp = new DrawerPage
+            {
+                DrawerLayoutBehavior = DrawerLayoutBehavior.Split,
+                DrawerBreakpointLength = 600,
+                DrawerPlacement = placement
+            };
+            dp.Measure(new Size(800, 600));
+            dp.Arrange(new Rect(0, 0, 800, 600));
+
+            Assert.Equal(SplitViewDisplayMode.Inline, dp.DisplayMode);
+        }
+
+        [Theory]
+        [InlineData(DrawerPlacement.Top)]
+        [InlineData(DrawerPlacement.Bottom)]
+        public void DrawerBreakpointLength_Vertical_BelowBreakpoint_ForcesOverlay(DrawerPlacement placement)
+        {
+            var dp = new DrawerPage
+            {
+                DrawerLayoutBehavior = DrawerLayoutBehavior.Split,
+                DrawerBreakpointLength = 800,
+                DrawerPlacement = placement
+            };
+            dp.Measure(new Size(800, 600));
+            dp.Arrange(new Rect(0, 0, 800, 600));
+
+            // Vertical: breakpoint compares against Bounds.Height (600 < 800 → Overlay)
+            Assert.Equal(SplitViewDisplayMode.Overlay, dp.DisplayMode);
+        }
+
+        [Theory]
+        [InlineData(DrawerPlacement.Top)]
+        [InlineData(DrawerPlacement.Bottom)]
+        public void DrawerBreakpointLength_Vertical_AboveBreakpoint_UsesConfiguredLayout(DrawerPlacement placement)
+        {
+            var dp = new DrawerPage
+            {
+                DrawerLayoutBehavior = DrawerLayoutBehavior.Split,
+                DrawerBreakpointLength = 400,
+                DrawerPlacement = placement
+            };
+            dp.Measure(new Size(800, 600));
+            dp.Arrange(new Rect(0, 0, 800, 600));
+
+            // Vertical: breakpoint compares against Bounds.Height (600 > 400 → Inline)
+            Assert.Equal(SplitViewDisplayMode.Inline, dp.DisplayMode);
+        }
     }
 
     public class DisabledBehaviorClosingTests : ScopedTestBase
@@ -1032,23 +1157,138 @@ public class DrawerPageTests
         }
     }
 
-    public class DrawerIconTests : ScopedTestBase
+    public class IconTests : ScopedTestBase
     {
         [Fact]
-        public void DrawerIcon_PathIcon_DoesNotCrashWhenTemplateApplied()
+        public void DrawerIconTemplate_RoundTrips()
         {
-            var icon = new PathIcon();
-            var dp = new DrawerPage { DrawerIcon = icon };
+            var template = new FuncDataTemplate<object>((_, _) => new PathIcon());
+            var dp = new DrawerPage { DrawerIconTemplate = template };
+            Assert.Same(template, dp.DrawerIconTemplate);
+        }
+
+        [Fact]
+        public void DrawerIcon_With_Geometry_Does_Not_Throw()
+        {
+            var geometry = new EllipseGeometry { Rect = new Rect(0, 0, 10, 10) };
+            var dp = new DrawerPage
+            {
+                DrawerIcon = geometry,
+                DrawerIconTemplate = new FuncDataTemplate<object>((_, _) => new PathIcon()),
+            };
             var root = new TestRoot { Child = dp };
 
-            // Changing DrawerIcon after template is applied must not throw.
-            var icon2 = new PathIcon();
-            dp.DrawerIcon = icon2;
+            dp.DrawerIcon = new EllipseGeometry { Rect = new Rect(0, 0, 20, 20) };
+            Assert.NotNull(dp.DrawerIcon);
+        }
+    }
+
+    public class SwipeGestureTests : ScopedTestBase
+    {
+        [Fact]
+        public void HandledPointerPressedAtEdge_AllowsSwipeOpen()
+        {
+            var dp = new DrawerPage
+            {
+                DrawerPlacement = DrawerPlacement.Left,
+                DisplayMode = SplitViewDisplayMode.Overlay,
+                Width = 400,
+                Height = 300
+            };
+            dp.GestureRecognizers.OfType<SwipeGestureRecognizer>().First().IsMouseEnabled = true;
+
+            var root = new TestRoot
+            {
+                ClientSize = new Size(400, 300),
+                Child = dp
+            };
+            root.ExecuteInitialLayoutPass();
+
+            RaiseHandledPointerPressed(dp, new Point(5, 5));
+
+            var swipe = new SwipeGestureEventArgs(1, new Vector(-20, 0), default);
+            dp.RaiseEvent(swipe);
+
+            Assert.True(swipe.Handled);
+            Assert.True(dp.IsOpen);
+        }
+
+        [Fact]
+        public void MouseEdgeDrag_AllowsSwipeOpen()
+        {
+            var dp = new DrawerPage
+            {
+                DrawerPlacement = DrawerPlacement.Left,
+                DisplayMode = SplitViewDisplayMode.Overlay,
+                Width = 400,
+                Height = 300
+            };
+            dp.GestureRecognizers.OfType<SwipeGestureRecognizer>().First().IsMouseEnabled = true;
+
+            var root = new TestRoot
+            {
+                ClientSize = new Size(400, 300),
+                Child = dp
+            };
+            root.ExecuteInitialLayoutPass();
+
+            var mouse = new MouseTestHelper();
+            mouse.Down(dp, position: new Point(5, 5));
+            mouse.Move(dp, new Point(40, 5));
+            mouse.Up(dp, position: new Point(40, 5));
+
+            Assert.True(dp.IsOpen);
+        }
+
+        private static void RaiseHandledPointerPressed(Interactive target, Point position)
+        {
+            var pointer = new Pointer(Pointer.GetNextFreeId(), PointerType.Touch, true);
+            var args = new PointerPressedEventArgs(
+                target,
+                pointer,
+                (Visual)target,
+                position,
+                timestamp: 1,
+                new PointerPointProperties(RawInputModifiers.LeftMouseButton, PointerUpdateKind.LeftButtonPressed),
+                KeyModifiers.None)
+            {
+                Handled = true
+            };
 
-            Assert.Same(icon2, dp.DrawerIcon);
+            target.RaiseEvent(args);
         }
     }
 
+    private static void RaisePointerPressed(Interactive target, Point? position = null)
+    {
+        var pointer = new Pointer(Pointer.GetNextFreeId(), PointerType.Touch, true);
+        var args = new PointerPressedEventArgs(
+            target,
+            pointer,
+            (Visual)target,
+            position ?? default,
+            timestamp: 1,
+            new PointerPointProperties(RawInputModifiers.LeftMouseButton, PointerUpdateKind.LeftButtonPressed),
+            KeyModifiers.None);
+
+        target.RaiseEvent(args);
+    }
+
+    private static IControlTemplate BackdropOnlyTemplate()
+    {
+        return new FuncControlTemplate<DrawerPage>((_, scope) =>
+            new Canvas
+            {
+                Children =
+                {
+                    new Border
+                    {
+                        Name = "PART_Backdrop"
+                    }.RegisterInNameScope(scope)
+                }
+            });
+    }
+
     public class DetachmentTests : ScopedTestBase
     {
         [Fact]
@@ -1068,5 +1308,23 @@ public class DrawerPageTests
             await nav.PushAsync(page);
             Assert.Null(NavigationPage.GetBackButtonContent(page));
         }
+
+        [Fact]
+        public async Task Detach_And_Reattach_RestoresDrawerPageReference()
+        {
+            var nav = new NavigationPage();
+            var dp = new DrawerPage { Content = nav };
+            var root = new TestRoot { Child = dp };
+            var page = new ContentPage();
+            await nav.PushAsync(page);
+
+            Assert.True(nav.IsBackButtonEffectivelyVisible);
+
+            root.Child = null;
+            Assert.False(nav.IsBackButtonEffectivelyVisible ?? false);
+
+            root.Child = dp;
+            Assert.True(nav.IsBackButtonEffectivelyVisible);
+        }
     }
 }
diff --git a/tests/Avalonia.Controls.UnitTests/FlyoutTests.cs b/tests/Avalonia.Controls.UnitTests/FlyoutTests.cs
index 4d8a90f5e7..77c3eb0874 100644
--- a/tests/Avalonia.Controls.UnitTests/FlyoutTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/FlyoutTests.cs
@@ -3,6 +3,7 @@ using System.ComponentModel;
 using System.Linq;
 
 using Avalonia.Controls.Primitives;
+using Avalonia.Data;
 using Avalonia.Input;
 using Avalonia.Markup.Xaml;
 using Avalonia.Media;
@@ -646,6 +647,203 @@ namespace Avalonia.Controls.UnitTests
             }
         }
 
+        [Fact]
+        public void IsOpen_SetFalse_Closes_Flyout()
+        {
+            using (CreateServicesWithFocus())
+            {
+                var window = PreparedWindow();
+                window.Show();
+
+                var flyout = new TestFlyout();
+                bool closedFired = false;
+                flyout.Closed += (s, e) => closedFired = true;
+
+                flyout.ShowAt(window);
+                Assert.True(flyout.IsOpen);
+
+                flyout.IsOpen = false;
+
+                Assert.False(flyout.IsOpen);
+                Assert.False(flyout.Popup.IsOpen);
+                Assert.True(closedFired);
+            }
+        }
+
+        [Fact]
+        public void IsOpen_SetTrue_Reopens_At_Last_Target()
+        {
+            using (CreateServicesWithFocus())
+            {
+                var window = PreparedWindow();
+                window.Show();
+
+                var flyout = new TestFlyout();
+                flyout.ShowAt(window);
+                Assert.True(flyout.IsOpen);
+
+                flyout.Hide();
+                Assert.False(flyout.IsOpen);
+
+                flyout.IsOpen = true;
+
+                Assert.True(flyout.IsOpen);
+                Assert.True(flyout.Popup.IsOpen);
+                Assert.Equal(window, flyout.Popup.PlacementTarget);
+            }
+        }
+
+        [Fact]
+        public void IsOpen_SetTrue_Without_Previous_Target_Reverts_To_False()
+        {
+            using (CreateServicesWithFocus())
+            {
+                var window = PreparedWindow();
+                window.Show();
+
+                var flyout = new TestFlyout();
+
+                flyout.IsOpen = true;
+
+                Assert.False(flyout.IsOpen);
+                Assert.False(flyout.Popup.IsOpen);
+            }
+        }
+
+        [Fact]
+        public void IsOpen_SetTrue_Opens_At_Button_Flyout_Owner()
+        {
+            using (CreateServicesWithFocus())
+            {
+                var button = new Button();
+                var window = PreparedWindow(button);
+                window.Show();
+
+                var flyout = new TestFlyout();
+                button.Flyout = flyout;
+
+                flyout.IsOpen = true;
+
+                Assert.True(flyout.IsOpen);
+                Assert.True(flyout.Popup.IsOpen);
+                Assert.Equal(button, flyout.Popup.PlacementTarget);
+            }
+        }
+
+        [Fact]
+        public void IsOpen_Button_Flyout_Removed_Clears_Target()
+        {
+            using (CreateServicesWithFocus())
+            {
+                var button = new Button();
+                var window = PreparedWindow(button);
+                window.Show();
+
+                var flyout = new TestFlyout();
+                button.Flyout = flyout;
+
+                button.Flyout = null;
+
+                flyout.IsOpen = true;
+
+                Assert.False(flyout.IsOpen);
+            }
+        }
+
+        [Fact]
+        public void IsOpen_TwoWay_Binding_Syncs_With_Source()
+        {
+            using (CreateServicesWithFocus())
+            {
+                var window = PreparedWindow();
+                window.Show();
+
+                var viewModel = new FlyoutViewModel();
+                var flyout = new TestFlyout();
+                flyout.Bind(FlyoutBase.IsOpenProperty, new Binding(nameof(FlyoutViewModel.IsOpen))
+                {
+                    Source = viewModel,
+                    Mode = BindingMode.TwoWay
+                });
+
+                Assert.False(viewModel.IsOpen);
+
+                flyout.ShowAt(window);
+                Assert.True(viewModel.IsOpen);
+
+                flyout.Hide();
+                Assert.False(viewModel.IsOpen);
+            }
+        }
+
+        [Fact]
+        public void IsOpen_SetFalse_Cancelled_Closing_Reverts_To_True()
+        {
+            using (CreateServicesWithFocus())
+            {
+                var window = PreparedWindow();
+                window.Show();
+
+                var flyout = new TestFlyout();
+                flyout.Closing += (s, e) => e.Cancel = true;
+
+                flyout.ShowAt(window);
+                Assert.True(flyout.IsOpen);
+
+                flyout.IsOpen = false;
+
+                Assert.True(flyout.IsOpen);
+                Assert.True(flyout.Popup.IsOpen);
+            }
+        }
+
+        [Fact]
+        public void IsOpen_SetTrue_After_Target_Detached_Reverts_To_False()
+        {
+            using (CreateServicesWithFocus())
+            {
+                var target = new Button();
+                var window = PreparedWindow(target);
+                window.Show();
+
+                var flyout = new TestFlyout();
+                flyout.ShowAt(target);
+                Assert.True(flyout.IsOpen);
+
+                // Detach the target from the visual tree
+                window.Content = null;
+                Assert.False(flyout.IsOpen);
+
+                flyout.IsOpen = true;
+
+                Assert.False(flyout.IsOpen);
+            }
+        }
+
+        [Fact]
+        public void IsOpen_SetTrue_Cancelled_Opening_Reverts_To_False()
+        {
+            using (CreateServicesWithFocus())
+            {
+                var window = PreparedWindow();
+                window.Show();
+
+                var flyout = new TestFlyout();
+                flyout.ShowAt(window);
+                flyout.Hide();
+
+                flyout.Opening += (s, e) =>
+                {
+                    if (e is CancelEventArgs cancelArgs)
+                        cancelArgs.Cancel = true;
+                };
+
+                flyout.IsOpen = true;
+
+                Assert.False(flyout.IsOpen);
+            }
+        }
+
         private IDisposable CreateServicesWithFocus()
         {
             return UnitTestApplication.Start(TestServices.StyledWindow.With(windowingPlatform:
@@ -677,11 +875,31 @@ namespace Avalonia.Controls.UnitTests
                 new PointerPointProperties(RawInputModifiers.None, PointerUpdateKind.LeftButtonPressed),
                 KeyModifiers.None);
         }
-        
+
         public class TestFlyout : Flyout
         {
             public new Popup Popup => base.Popup;
         }
+
+        private class FlyoutViewModel : INotifyPropertyChanged
+        {
+            private bool _isOpen;
+
+            public bool IsOpen
+            {
+                get => _isOpen;
+                set
+                {
+                    if (_isOpen != value)
+                    {
+                        _isOpen = value;
+                        PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsOpen)));
+                    }
+                }
+            }
+
+            public event PropertyChangedEventHandler? PropertyChanged;
+        }
     }
 
     public class OverlayPopupFlyoutTests : FlyoutTests
diff --git a/tests/Avalonia.Controls.UnitTests/InputElementGestureTests.cs b/tests/Avalonia.Controls.UnitTests/InputElementGestureTests.cs
new file mode 100644
index 0000000000..20f5f2ec2e
--- /dev/null
+++ b/tests/Avalonia.Controls.UnitTests/InputElementGestureTests.cs
@@ -0,0 +1,23 @@
+using Avalonia.Input;
+using Avalonia.UnitTests;
+using Xunit;
+
+namespace Avalonia.Controls.UnitTests;
+
+public class InputElementGestureTests : ScopedTestBase
+{
+    [Fact]
+    public void SwipeGestureEnded_PublicEvent_CanBeObserved()
+    {
+        var target = new Border();
+        SwipeGestureEndedEventArgs? received = null;
+
+        target.SwipeGestureEnded += (_, e) => received = e;
+
+        var args = new SwipeGestureEndedEventArgs(42, new Vector(12, 34));
+        target.RaiseEvent(args);
+
+        Assert.Same(args, received);
+        Assert.Equal(InputElement.SwipeGestureEndedEvent, args.RoutedEvent);
+    }
+}
diff --git a/tests/Avalonia.Controls.UnitTests/NavigationEventArgsTests.cs b/tests/Avalonia.Controls.UnitTests/NavigationEventArgsTests.cs
index 3e57152d08..82d092162e 100644
--- a/tests/Avalonia.Controls.UnitTests/NavigationEventArgsTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/NavigationEventArgsTests.cs
@@ -94,7 +94,7 @@ public class NavigationEventArgsTests
         {
             var prev = new ContentPage { Header = "Tab 1" };
             var current = new ContentPage { Header = "Tab 2" };
-            var args = new PageSelectionChangedEventArgs(prev, current);
+            var args = new PageSelectionChangedEventArgs(SelectingMultiPage.SelectionChangedEvent, prev, current);
             Assert.Same(prev, args.PreviousPage);
             Assert.Same(current, args.CurrentPage);
         }
diff --git a/tests/Avalonia.Controls.UnitTests/NavigationPageTests.cs b/tests/Avalonia.Controls.UnitTests/NavigationPageTests.cs
index 9602256fe8..e61b449a91 100644
--- a/tests/Avalonia.Controls.UnitTests/NavigationPageTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/NavigationPageTests.cs
@@ -1,14 +1,21 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using Avalonia.Animation;
 using Avalonia.Controls.Presenters;
 using Avalonia.Controls.Primitives;
+using Avalonia.Controls.Shapes;
 using Avalonia.Controls.Templates;
+using Avalonia.Input;
+using Avalonia.Input.GestureRecognizers;
 using Avalonia.Interactivity;
 using Avalonia.LogicalTree;
+using Avalonia.Media;
+using Avalonia.Threading;
 using Avalonia.UnitTests;
+using Avalonia.VisualTree;
 using Xunit;
 
 namespace Avalonia.Controls.UnitTests;
@@ -76,6 +83,18 @@ public class NavigationPageTests
             await Assert.ThrowsAsync<InvalidOperationException>(() => nav.PushAsync(page));
         }
 
+        [Fact]
+        public async Task Push_PageAlreadyPresentedModally_Throws()
+        {
+            var nav = new NavigationPage();
+            await nav.PushAsync(new ContentPage());
+
+            var modal = new ContentPage();
+            await nav.PushModalAsync(modal);
+
+            await Assert.ThrowsAsync<InvalidOperationException>(() => nav.PushAsync(modal));
+        }
+
         [Fact]
         public async Task Push_FiresPushedEvent()
         {
@@ -148,8 +167,6 @@ public class NavigationPageTests
         [Fact]
         public async Task Push_ReentrantFromNavigatedTo_IsIgnoredNotThrown()
         {
-            // Verifies that a re-entrant Push called from inside a NavigatedTo
-            // lifecycle callback is silently ignored rather than throwing.
             var nav = new NavigationPage();
             var root = new ContentPage();
             await nav.PushAsync(root);
@@ -157,13 +174,65 @@ public class NavigationPageTests
             var second = new ContentPage();
             second.NavigatedTo += async (_, _) => await nav.PushAsync(new ContentPage());
 
-            await nav.PushAsync(second); // must not throw
+            await nav.PushAsync(second);
 
             Assert.Equal(2, nav.StackDepth);
             Assert.Same(second, nav.CurrentPage);
         }
     }
 
+    public class ReentrantNavigationTests : ScopedTestBase
+    {
+        [Fact]
+        public async Task Pop_ReentrantFromNavigatedTo_IsIgnored()
+        {
+            var nav = new NavigationPage();
+            var root = new ContentPage();
+            var top = new ContentPage();
+            await nav.PushAsync(root);
+            await nav.PushAsync(top);
+
+            root.NavigatedTo += async (_, _) => await nav.PopAsync();
+
+            await nav.PopAsync();
+
+            Assert.Equal(1, nav.StackDepth);
+            Assert.Same(root, nav.CurrentPage);
+        }
+
+        [Fact]
+        public async Task PushModal_ReentrantFromNavigatedTo_IsIgnored()
+        {
+            var nav = new NavigationPage();
+            await nav.PushAsync(new ContentPage());
+
+            var modal = new ContentPage();
+            modal.NavigatedTo += async (_, _) => await nav.PushModalAsync(new ContentPage());
+
+            await nav.PushModalAsync(modal);
+
+            Assert.Equal(1, nav.ModalStack.Count);
+            Assert.Same(modal, nav.ModalStack[0]);
+        }
+
+        [Fact]
+        public async Task PopModal_ReentrantFromNavigatedTo_IsIgnored()
+        {
+            var nav = new NavigationPage();
+            var root = new ContentPage();
+            var modal = new ContentPage();
+            await nav.PushAsync(root);
+            await nav.PushModalAsync(modal);
+
+            root.NavigatedTo += async (_, _) => await nav.PopModalAsync();
+
+            await nav.PopModalAsync();
+
+            Assert.Equal(0, nav.ModalStack.Count);
+            Assert.Same(root, nav.CurrentPage);
+        }
+    }
+
     public class PopTests : ScopedTestBase
     {
         [Fact]
@@ -403,6 +472,135 @@ public class NavigationPageTests
         }
     }
 
+    public class BackButtonContentTests : ScopedTestBase
+    {
+        [Fact]
+        public async Task DrawerToggle_UsesMenuIconWithoutMutatingPageBackButtonContent()
+        {
+            var parts = new BackButtonParts();
+            var nav = CreateNavigationPageWithBackButtonParts(parts);
+            nav.Resources.Add("NavigationPageMenuIcon", new StreamGeometry());
+            var drawer = new DrawerPage();
+            var root = new TestRoot { Child = nav };
+            root.LayoutManager.ExecuteInitialLayoutPass();
+            nav.SetDrawerPage(drawer);
+
+            var page = new ContentPage { Header = "Root" };
+            await nav.PushAsync(page);
+
+            Assert.NotNull(parts.DefaultIcon);
+            Assert.NotNull(parts.ContentPresenter);
+            Assert.Null(NavigationPage.GetBackButtonContent(page));
+            Assert.False(parts.DefaultIcon!.IsVisible);
+            Assert.IsType<PathIcon>(parts.ContentPresenter!.Content);
+        }
+
+        [Fact]
+        public async Task CurrentPageBackButtonContent_UpdatesRenderedPresenter()
+        {
+            var parts = new BackButtonParts();
+            var nav = CreateNavigationPageWithBackButtonParts(parts);
+            var root = new TestRoot { Child = nav };
+            root.LayoutManager.ExecuteInitialLayoutPass();
+
+            await nav.PushAsync(new ContentPage { Header = "Root" });
+            var detail = new ContentPage { Header = "Detail" };
+            await nav.PushAsync(detail);
+
+            var customContent = "Custom";
+            NavigationPage.SetBackButtonContent(detail, customContent);
+
+            Assert.NotNull(parts.DefaultIcon);
+            Assert.NotNull(parts.ContentPresenter);
+            Assert.False(parts.DefaultIcon!.IsVisible);
+            Assert.Equal(customContent, parts.ContentPresenter!.Content);
+
+            NavigationPage.SetBackButtonContent(detail, null);
+
+            Assert.True(parts.DefaultIcon.IsVisible);
+            Assert.Null(parts.ContentPresenter.Content);
+        }
+
+        [Fact]
+        public async Task DrawerBehaviorChange_DoesNotClearCustomPathIcon()
+        {
+            var parts = new BackButtonParts();
+            var nav = CreateNavigationPageWithBackButtonParts(parts);
+            var drawer = new DrawerPage();
+            var root = new TestRoot { Child = nav };
+            root.LayoutManager.ExecuteInitialLayoutPass();
+            nav.SetDrawerPage(drawer);
+
+            var customIcon = new PathIcon();
+            var page = new ContentPage { Header = "Root" };
+            NavigationPage.SetBackButtonContent(page, customIcon);
+
+            await nav.PushAsync(page);
+            drawer.DrawerBehavior = DrawerBehavior.Locked;
+            nav.SetDrawerPage(drawer);
+
+            Assert.NotNull(parts.DefaultIcon);
+            Assert.NotNull(parts.ContentPresenter);
+            Assert.Same(customIcon, NavigationPage.GetBackButtonContent(page));
+            Assert.Same(customIcon, parts.ContentPresenter!.Content);
+            Assert.False(parts.DefaultIcon!.IsVisible);
+        }
+
+        private static NavigationPage CreateNavigationPageWithBackButtonParts(BackButtonParts parts)
+        {
+            return new NavigationPage
+            {
+                Template = new FuncControlTemplate<NavigationPage>((parent, ns) =>
+                {
+                    parts.DefaultIcon = new Path { Name = "PART_BackButtonDefaultIcon" }.RegisterInNameScope(ns);
+                    parts.ContentPresenter = new ContentPresenter { Name = "PART_BackButtonContentPresenter" }.RegisterInNameScope(ns);
+
+                    return new Panel
+                    {
+                        Children =
+                        {
+                            new Border
+                            {
+                                Name = "PART_NavigationBar",
+                                Child = new Button
+                                {
+                                    Name = "PART_BackButton",
+                                    Content = new Panel
+                                    {
+                                        Children =
+                                        {
+                                            parts.DefaultIcon,
+                                            parts.ContentPresenter
+                                        }
+                                    }
+                                }.RegisterInNameScope(ns)
+                            }.RegisterInNameScope(ns),
+                            new Panel
+                            {
+                                Name = "PART_ContentHost",
+                                Children =
+                                {
+                                    new ContentPresenter { Name = "PART_PageBackPresenter" }.RegisterInNameScope(ns),
+                                    new ContentPresenter { Name = "PART_PagePresenter" }.RegisterInNameScope(ns),
+                                }
+                            }.RegisterInNameScope(ns),
+                            new ContentPresenter { Name = "PART_TopCommandBar" }.RegisterInNameScope(ns),
+                            new ContentPresenter { Name = "PART_ModalBackPresenter" }.RegisterInNameScope(ns),
+                            new ContentPresenter { Name = "PART_ModalPresenter" }.RegisterInNameScope(ns),
+                        }
+                    };
+                })
+            };
+        }
+
+        private sealed class BackButtonParts
+        {
+            public Path? DefaultIcon { get; set; }
+
+            public ContentPresenter? ContentPresenter { get; set; }
+        }
+    }
+
     public class PopToRootTests : ScopedTestBase
     {
         [Fact]
@@ -612,20 +810,49 @@ public class NavigationPageTests
         [Fact]
         public async Task InsertPage_DoesNotFireNavigatedTo_OnInsertedPage()
         {
-            // InsertPage should not invoke NavigatedTo on a non-current (background) page.
             var nav = new NavigationPage();
             var root = new ContentPage();
             var top = new ContentPage();
             await nav.PushAsync(root);
             await nav.PushAsync(top);
 
-            bool navigatedToFired = false;
+            NavigatedToEventArgs? args = null;
+            var inserted = new ContentPage();
+            inserted.NavigatedTo += (_, e) => args = e;
+
+            nav.InsertPage(inserted, top);
+
+            Assert.Null(args);
+        }
+
+        [Fact]
+        public async Task InsertPage_FiresNavigatedTo_WhenInsertedPageBecomesCurrent()
+        {
+            var nav = new NavigationPage();
+            var root = new ContentPage();
+            var top = new ContentPage();
+            await nav.PushAsync(root);
+            await nav.PushAsync(top);
+
             var inserted = new ContentPage();
-            inserted.NavigatedTo += (_, _) => navigatedToFired = true;
+            int navigatedToCount = 0;
+            NavigatedToEventArgs? args = null;
+            inserted.NavigatedTo += (_, e) =>
+            {
+                navigatedToCount++;
+                args = e;
+            };
 
             nav.InsertPage(inserted, top);
+            Assert.Equal(0, navigatedToCount);
 
-            Assert.False(navigatedToFired);
+            await nav.PopAsync();
+
+            Assert.Equal(1, navigatedToCount);
+            Assert.NotNull(args);
+            Assert.Equal(NavigationType.Pop, args!.NavigationType);
+            Assert.Same(top, args.PreviousPage);
+            Assert.Same(inserted, nav.CurrentPage);
         }
 
         [Fact]
@@ -640,6 +867,31 @@ public class NavigationPageTests
             Assert.Throws<InvalidOperationException>(() => nav.InsertPage(root, top));
         }
 
+        [Fact]
+        public async Task InsertPage_PageAlreadyPresentedModally_ThrowsInvalidOperationException()
+        {
+            var nav = new NavigationPage();
+            var root = new ContentPage();
+            var top = new ContentPage();
+            var modal = new ContentPage();
+            await nav.PushAsync(root);
+            await nav.PushAsync(top);
+            await nav.PushModalAsync(modal);
+
+            Assert.Throws<InvalidOperationException>(() => nav.InsertPage(modal, top));
+        }
+
+        [Fact]
+        public async Task InsertPage_BeforeNotInStack_ThrowsInvalidOperationException()
+        {
+            var nav = new NavigationPage();
+            var root = new ContentPage();
+            await nav.PushAsync(root);
+
+            var stranger = new ContentPage();
+            Assert.Throws<InvalidOperationException>(() => nav.InsertPage(new ContentPage(), stranger));
+        }
+
         [Fact]
         public async Task RemovePage_PageNotInStack_IsNoOp()
         {
@@ -651,6 +903,59 @@ public class NavigationPageTests
             nav.RemovePage(stranger);
             Assert.Equal(1, nav.StackDepth);
         }
+
+        [Fact]
+        public async Task RemovePage_TopPage_FiresNavigatedFrom_WithRemoveType()
+        {
+            var nav = new NavigationPage();
+            var root = new ContentPage { Header = "Root" };
+            var top = new ContentPage { Header = "Top" };
+            await nav.PushAsync(root);
+            await nav.PushAsync(top);
+
+            NavigatedFromEventArgs? fromArgs = null;
+            top.NavigatedFrom += (_, e) => fromArgs = e;
+
+            nav.RemovePage(top);
+
+            Assert.NotNull(fromArgs);
+            Assert.Equal(NavigationType.Remove, fromArgs!.NavigationType);
+            Assert.Same(root, fromArgs.DestinationPage);
+        }
+
+        [Fact]
+        public async Task RemovePage_TopPage_FiresNavigatedTo_OnNewCurrentPage_WithRemoveType()
+        {
+            var nav = new NavigationPage();
+            var root = new ContentPage { Header = "Root" };
+            var top = new ContentPage { Header = "Top" };
+            await nav.PushAsync(root);
+            await nav.PushAsync(top);
+
+            NavigatedToEventArgs? toArgs = null;
+            root.NavigatedTo += (_, e) => toArgs = e;
+
+            nav.RemovePage(top);
+
+            Assert.NotNull(toArgs);
+            Assert.Equal(NavigationType.Remove, toArgs!.NavigationType);
+            Assert.Same(top, toArgs.PreviousPage);
+        }
+
+        [Fact]
+        public async Task RemovePage_TopPage_UpdatesCurrentPage()
+        {
+            var nav = new NavigationPage();
+            var root = new ContentPage { Header = "Root" };
+            var top = new ContentPage { Header = "Top" };
+            await nav.PushAsync(root);
+            await nav.PushAsync(top);
+
+            nav.RemovePage(top);
+
+            Assert.Same(root, nav.CurrentPage);
+            Assert.Equal(1, nav.StackDepth);
+        }
     }
 
     public class ModalTests : ScopedTestBase
@@ -667,6 +972,28 @@ public class NavigationPageTests
             Assert.Equal(1, nav.ModalStack.Count);
         }
 
+        [Fact]
+        public async Task PushModal_PageAlreadyInNavigationStack_Throws()
+        {
+            var nav = new NavigationPage();
+            var root = new ContentPage { Header = "Root" };
+            await nav.PushAsync(root);
+
+            await Assert.ThrowsAsync<InvalidOperationException>(() => nav.PushModalAsync(root));
+        }
+
+        [Fact]
+        public async Task PushModal_DuplicateModal_Throws()
+        {
+            var nav = new NavigationPage();
+            await nav.PushAsync(new ContentPage());
+
+            var modal = new ContentPage { Header = "Modal" };
+            await nav.PushModalAsync(modal);
+
+            await Assert.ThrowsAsync<InvalidOperationException>(() => nav.PushModalAsync(modal));
+        }
+
         [Fact]
         public async Task PopModal_RemovesFromModalStack()
         {
@@ -875,54 +1202,219 @@ public class NavigationPageTests
             Assert.NotNull(args);
             Assert.Same(modal, args!.PreviousPage);
         }
-    }
 
-    public class AttachedPropertyTests : ScopedTestBase
-    {
         [Fact]
-        public async Task EffectiveBarHeight_UsesPageOverride()
+        public async Task PushModal_WhenCoveredPageCancelsNavigating_DoesNotPushModal()
         {
             var nav = new NavigationPage();
-            var page = new ContentPage();
-            NavigationPage.SetBarHeightOverride(page, 60.0);
-            await nav.PushAsync(page);
-            Assert.Equal(60.0, nav.EffectiveBarHeight);
-        }
+            var root = new ContentPage { Header = "Root" };
+            await nav.PushAsync(root);
 
-        [Fact]
-        public async Task EffectiveBarHeight_FallsBackToGlobalBarHeight()
-        {
-            var nav = new NavigationPage { BarHeight = 56.0 };
-            await nav.PushAsync(new ContentPage());
-            Assert.Equal(56.0, nav.EffectiveBarHeight);
+            bool handlerInvoked = false;
+            root.Navigating += args =>
+            {
+                handlerInvoked = true;
+                args.Cancel = true;
+                return Task.CompletedTask;
+            };
+
+            await nav.PushModalAsync(new ContentPage { Header = "Modal" });
+
+            Assert.True(handlerInvoked);
+            Assert.Empty(nav.ModalStack);
         }
 
         [Fact]
-        public async Task BarLayoutBehavior_DefaultAppliesNavBarInsetPseudoClass()
+        public async Task PushModal_WhenTopModalCancelsNavigating_DoesNotPushAnotherModal()
         {
             var nav = new NavigationPage();
-            await nav.PushAsync(new ContentPage());
-            Assert.True(nav.Classes.Contains(":nav-bar-inset"));
+            await nav.PushAsync(new ContentPage { Header = "Root" });
+
+            var firstModal = new ContentPage { Header = "Modal 1" };
+            await nav.PushModalAsync(firstModal);
+
+            bool handlerInvoked = false;
+            firstModal.Navigating += args =>
+            {
+                handlerInvoked = true;
+                args.Cancel = true;
+                return Task.CompletedTask;
+            };
+
+            await nav.PushModalAsync(new ContentPage { Header = "Modal 2" });
+
+            Assert.True(handlerInvoked);
+            Assert.Single(nav.ModalStack);
+            Assert.Same(firstModal, nav.ModalStack[0]);
         }
 
         [Fact]
-        public async Task BarLayoutBehavior_OverlayRemovesNavBarInsetPseudoClass()
+        public async Task PopModal_WhenModalCancelsNavigating_DoesNotPopModal()
         {
             var nav = new NavigationPage();
-            var page = new ContentPage();
-            NavigationPage.SetBarLayoutBehavior(page, BarLayoutBehavior.Overlay);
-            await nav.PushAsync(page);
-            Assert.False(nav.Classes.Contains(":nav-bar-inset"));
-        }
-    }
+            await nav.PushAsync(new ContentPage { Header = "Root" });
 
-    public class InitialContentTests : ScopedTestBase
-    {
-        [Fact]
-        public void Content_SetBeforePush_IsUsedAsInitialPage()
-        {
-            var page = new ContentPage { Header = "Initial" };
-            var nav = new NavigationPage { Content = page };
+            var modal = new ContentPage { Header = "Modal" };
+            await nav.PushModalAsync(modal);
+
+            bool handlerInvoked = false;
+            modal.Navigating += args =>
+            {
+                handlerInvoked = true;
+                args.Cancel = true;
+                return Task.CompletedTask;
+            };
+
+            var result = await nav.PopModalAsync();
+
+            Assert.True(handlerInvoked);
+            Assert.Null(result);
+            Assert.Single(nav.ModalStack);
+            Assert.Same(modal, nav.ModalStack[0]);
+        }
+    }
+
+    public class SystemBackButtonTests : ScopedTestBase
+    {
+        private static RoutedEventArgs RaiseBackButton(NavigationPage nav)
+        {
+            var args = new RoutedEventArgs(Page.PageNavigationSystemBackButtonPressedEvent);
+            nav.RaiseEvent(args);
+            return args;
+        }
+
+        [Fact]
+        public async Task BackButton_WithModalOnRoot_PopsModal()
+        {
+            var nav = new NavigationPage();
+            var root = new ContentPage { Header = "Root" };
+            var modal = new ContentPage { Header = "Modal" };
+            await nav.PushAsync(root);
+            await nav.PushModalAsync(modal);
+
+            var args = RaiseBackButton(nav);
+
+            Assert.True(args.Handled);
+            Assert.Empty(nav.ModalStack);
+            Assert.Equal(1, nav.StackDepth);
+            Assert.Same(root, nav.CurrentPage);
+        }
+
+        [Fact]
+        public async Task BackButton_WithModalAndDeepStack_PopsModalBeforeStack()
+        {
+            var nav = new NavigationPage();
+            var root = new ContentPage { Header = "Root" };
+            var detail = new ContentPage { Header = "Detail" };
+            var modal = new ContentPage { Header = "Modal" };
+            await nav.PushAsync(root);
+            await nav.PushAsync(detail);
+            await nav.PushModalAsync(modal);
+
+            var args = RaiseBackButton(nav);
+
+            Assert.True(args.Handled);
+            Assert.Empty(nav.ModalStack);
+            Assert.Equal(2, nav.StackDepth);
+            Assert.Same(detail, nav.CurrentPage);
+        }
+
+        [Fact]
+        public async Task BackButton_ForwardsToTopModalBeforeAutoPop()
+        {
+            var nav = new NavigationPage();
+            await nav.PushAsync(new ContentPage { Header = "Root" });
+
+            var modal = new BackHandlingPage { HandleBack = true };
+            await nav.PushModalAsync(modal);
+
+            var args = RaiseBackButton(nav);
+
+            Assert.True(args.Handled);
+            Assert.Equal(1, modal.BackButtonPressCount);
+            Assert.Single(nav.ModalStack);
+            Assert.Same(modal, nav.ModalStack[0]);
+        }
+
+        private sealed class BackHandlingPage : ContentPage
+        {
+            public int BackButtonPressCount { get; private set; }
+
+            public bool HandleBack { get; set; }
+
+            protected override bool OnSystemBackButtonPressed()
+            {
+                BackButtonPressCount++;
+                return HandleBack;
+            }
+        }
+    }
+
+    public class PropertyTests : ScopedTestBase
+    {
+        [Fact]
+        public void IsGestureEnabled_Default_IsTrue()
+        {
+            var nav = new NavigationPage();
+            Assert.True(nav.IsGestureEnabled);
+        }
+
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public void IsGestureEnabled_RoundTrips(bool value)
+        {
+            var nav = new NavigationPage { IsGestureEnabled = value };
+            Assert.Equal(value, nav.IsGestureEnabled);
+        }
+    }
+
+    public class AttachedPropertyTests : ScopedTestBase
+    {
+        [Fact]
+        public async Task EffectiveBarHeight_UsesPageOverride()
+        {
+            var nav = new NavigationPage();
+            var page = new ContentPage();
+            NavigationPage.SetBarHeightOverride(page, 60.0);
+            await nav.PushAsync(page);
+            Assert.Equal(60.0, nav.EffectiveBarHeight);
+        }
+
+        [Fact]
+        public async Task EffectiveBarHeight_FallsBackToGlobalBarHeight()
+        {
+            var nav = new NavigationPage { BarHeight = 56.0 };
+            await nav.PushAsync(new ContentPage());
+            Assert.Equal(56.0, nav.EffectiveBarHeight);
+        }
+
+        [Fact]
+        public async Task BarLayoutBehavior_DefaultAppliesNavBarInsetPseudoClass()
+        {
+            var nav = new NavigationPage();
+            await nav.PushAsync(new ContentPage());
+            Assert.True(nav.Classes.Contains(":nav-bar-inset"));
+        }
+
+        [Fact]
+        public async Task BarLayoutBehavior_OverlayRemovesNavBarInsetPseudoClass()
+        {
+            var nav = new NavigationPage();
+            var page = new ContentPage();
+            NavigationPage.SetBarLayoutBehavior(page, BarLayoutBehavior.Overlay);
+            await nav.PushAsync(page);
+            Assert.False(nav.Classes.Contains(":nav-bar-inset"));
+        }
+    }
+
+    public class InitialContentTests : ScopedTestBase
+    {
+        [Fact]
+        public void Content_SetBeforePush_IsUsedAsInitialPage()
+        {
+            var page = new ContentPage { Header = "Initial" };
+            var nav = new NavigationPage { Content = page };
             Assert.Equal(1, nav.StackDepth);
             Assert.Same(page, nav.CurrentPage);
         }
@@ -1089,6 +1581,49 @@ public class NavigationPageTests
             Assert.True(handlerInvoked);
             Assert.Equal(2, nav.StackDepth);
         }
+
+        [Fact]
+        public async Task Navigating_CancelInFirstHandler_SkipsSubsequentHandlers()
+        {
+            var nav = new NavigationPage();
+            var root = new ContentPage();
+            await nav.PushAsync(root);
+            var top = new ContentPage();
+            await nav.PushAsync(top);
+
+            bool secondHandlerInvoked = false;
+            top.Navigating += args => { args.Cancel = true; return Task.CompletedTask; };
+            top.Navigating += args => { secondHandlerInvoked = true; return Task.CompletedTask; };
+
+            await nav.PopAsync();
+
+            Assert.False(secondHandlerInvoked);
+            Assert.Equal(2, nav.StackDepth);
+        }
+
+        [Fact]
+        public async Task Navigating_CancelInOnNavigatingFrom_SkipsNavigatingEvent()
+        {
+            var nav = new NavigationPage();
+            var root = new ContentPage();
+            await nav.PushAsync(root);
+
+            var top = new CancellingPage();
+            await nav.PushAsync(top);
+
+            bool asyncHandlerInvoked = false;
+            top.Navigating += args => { asyncHandlerInvoked = true; return Task.CompletedTask; };
+
+            await nav.PopAsync();
+
+            Assert.False(asyncHandlerInvoked);
+            Assert.Equal(2, nav.StackDepth);
+        }
+
+        private sealed class CancellingPage : ContentPage
+        {
+            protected override void OnNavigatingFrom(NavigatingFromEventArgs args) => args.Cancel = true;
+        }
     }
 
     public class LogicalChildrenTests : ScopedTestBase
@@ -1154,6 +1689,33 @@ public class NavigationPageTests
             Assert.Contains(root, children);
             Assert.Contains(second, children);
         }
+
+        [Fact]
+        public async Task PushModal_ModalPageIsNotInDirectLogicalChildren()
+        {
+            var nav = new NavigationPage();
+            await nav.PushAsync(new ContentPage());
+            var modal = new ContentPage();
+            await nav.PushModalAsync(modal);
+
+            Assert.DoesNotContain(modal, nav.GetLogicalChildren());
+            Assert.Same(nav, modal.Navigation);
+            Assert.True(modal.IsInNavigationPage);
+        }
+
+        [Fact]
+        public async Task PopModal_ClearsNavigationAndIsInNavigationPage()
+        {
+            var nav = new NavigationPage();
+            await nav.PushAsync(new ContentPage());
+            var modal = new ContentPage();
+            await nav.PushModalAsync(modal);
+
+            await nav.PopModalAsync();
+
+            Assert.Null(modal.Navigation);
+            Assert.False(modal.IsInNavigationPage);
+        }
     }
 
     public class PopAllModalsTests : ScopedTestBase
@@ -1164,7 +1726,7 @@ public class NavigationPageTests
             var nav = new NavigationPage();
             await nav.PushAsync(new ContentPage());
 
-            await nav.PopAllModalsAsync(); // must not throw
+            await nav.PopAllModalsAsync();
 
             Assert.Equal(0, nav.ModalStack.Count);
         }
@@ -1309,6 +1871,52 @@ public class NavigationPageTests
 
             Assert.Same(m2, previousPage);
         }
+
+        [Fact]
+        public async Task PopAllModals_MultipleModals_NavigatedTo_FiredOnlyOnBaseCurrentPage()
+        {
+            var nav = new NavigationPage();
+            var root = new ContentPage { Header = "Root" };
+            await nav.PushAsync(root);
+            var m1 = new ContentPage { Header = "M1" };
+            var m2 = new ContentPage { Header = "M2" };
+            await nav.PushModalAsync(m1);
+            await nav.PushModalAsync(m2);
+
+            var navigatedToPages = new List<string>();
+            root.NavigatedTo += (_, _) => navigatedToPages.Add("root");
+            m1.NavigatedTo += (_, _) => navigatedToPages.Add("m1");
+            m2.NavigatedTo += (_, _) => navigatedToPages.Add("m2");
+
+            await nav.PopAllModalsAsync();
+
+            Assert.Equal(["root"], navigatedToPages);
+        }
+
+        [Fact]
+        public async Task PopAllModals_WhenTopModalCancelsNavigating_DoesNotClearModalStack()
+        {
+            var nav = new NavigationPage();
+            await nav.PushAsync(new ContentPage { Header = "Root" });
+
+            var m1 = new ContentPage { Header = "M1" };
+            var m2 = new ContentPage { Header = "M2" };
+            await nav.PushModalAsync(m1);
+            await nav.PushModalAsync(m2);
+
+            bool handlerInvoked = false;
+            m2.Navigating += args =>
+            {
+                handlerInvoked = true;
+                args.Cancel = true;
+                return Task.CompletedTask;
+            };
+
+            await nav.PopAllModalsAsync();
+
+            Assert.True(handlerInvoked);
+            Assert.Equal(new[] { m1, m2 }, nav.ModalStack);
+        }
     }
 
     public class ReplaceTests : ScopedTestBase
@@ -1348,6 +1956,51 @@ public class NavigationPageTests
             Assert.DoesNotContain(root, nav.NavigationStack);
         }
 
+        [Fact]
+        public async Task ReplaceAsync_WhenReplacementAlreadyExistsInNavigationStack_Throws()
+        {
+            var nav = new NavigationPage();
+            var root = new ContentPage { Header = "Root" };
+            var top = new ContentPage { Header = "Top" };
+            await nav.PushAsync(root);
+            await nav.PushAsync(top);
+
+            await Assert.ThrowsAsync<InvalidOperationException>(() => nav.ReplaceAsync(root));
+        }
+
+        [Fact]
+        public async Task ReplaceAsync_WhenReplacementAlreadyExistsInModalStack_Throws()
+        {
+            var nav = new NavigationPage();
+            await nav.PushAsync(new ContentPage { Header = "Root" });
+            await nav.PushAsync(new ContentPage { Header = "Top" });
+
+            var modal = new ContentPage { Header = "Modal" };
+            await nav.PushModalAsync(modal);
+
+            await Assert.ThrowsAsync<InvalidOperationException>(() => nav.ReplaceAsync(modal));
+        }
+
+        [Fact]
+        public async Task ReplaceAsync_WithCurrentPage_IsNoOp()
+        {
+            var nav = new NavigationPage();
+            var root = new ContentPage { Header = "Root" };
+            var top = new ContentPage { Header = "Top" };
+            await nav.PushAsync(root);
+            await nav.PushAsync(top);
+
+            var lifecycleEvents = 0;
+            top.NavigatedFrom += (_, _) => lifecycleEvents++;
+            top.NavigatedTo += (_, _) => lifecycleEvents++;
+
+            await nav.ReplaceAsync(top);
+
+            Assert.Equal(2, nav.StackDepth);
+            Assert.Same(top, nav.CurrentPage);
+            Assert.Equal(0, lifecycleEvents);
+        }
+
         [Fact]
         public async Task ReplaceAsync_FiresLifecycleEventsInOrder()
         {
@@ -1519,6 +2172,25 @@ public class NavigationPageTests
             var stranger = new ContentPage();
             await Assert.ThrowsAsync<ArgumentException>(() => nav.PopToPageAsync(stranger));
         }
+
+        [Fact]
+        public async Task PopToPageAsync_TargetIsAlreadyTop_IsNoOp()
+        {
+            var nav = new NavigationPage();
+            var root = new ContentPage();
+            var top = new ContentPage();
+            await nav.PushAsync(root);
+            await nav.PushAsync(top);
+
+            int navigatedToCount = 0;
+            top.NavigatedTo += (_, _) => navigatedToCount++;
+
+            await nav.PopToPageAsync(top);
+
+            Assert.Same(top, nav.CurrentPage);
+            Assert.Equal(2, nav.StackDepth);
+            Assert.Equal(0, navigatedToCount);
+        }
     }
 
     public class ModalTransitionCancellationTests : ScopedTestBase
@@ -1674,6 +2346,33 @@ public class NavigationPageTests
             Assert.False(poppedToRootDuringTransition);
         }
 
+        [Fact]
+        public async Task ReplaceAsync_LifecycleEvents_FireAfterTransition()
+        {
+            var tcs = new TaskCompletionSource();
+            var nav = CreateNavigationPage(null);
+
+            var root = new ContentPage { Header = "Root" };
+            await nav.PushAsync(root);
+
+            nav.PageTransition = new ControllableTransition(tcs.Task);
+
+            bool navigatedFromDuringTransition = false;
+            bool navigatedToDuringTransition = false;
+
+            var replacement = new ContentPage { Header = "Replacement" };
+            root.NavigatedFrom += (_, _) => navigatedFromDuringTransition = !tcs.Task.IsCompleted;
+            replacement.NavigatedTo += (_, _) => navigatedToDuringTransition = !tcs.Task.IsCompleted;
+
+            var replaceTask = nav.ReplaceAsync(replacement);
+
+            tcs.SetResult();
+            await replaceTask;
+
+            Assert.False(navigatedFromDuringTransition);
+            Assert.False(navigatedToDuringTransition);
+        }
+
         private static NavigationPage CreateNavigationPage(IPageTransition? transition)
         {
             var nav = new NavigationPage
@@ -1738,4 +2437,366 @@ public class NavigationPageTests
         }
     }
 
+    public class SwipeGestureTests : ScopedTestBase
+    {
+        [Fact]
+        public async Task HandledPointerPressedAtEdge_AllowsSwipePop()
+        {
+            var nav = new NavigationPage();
+            var rootPage = new ContentPage { Header = "Root" };
+            var topPage = new ContentPage { Header = "Top" };
+
+            await nav.PushAsync(rootPage);
+            await nav.PushAsync(topPage);
+
+            var root = new TestRoot { Child = nav };
+            root.ExecuteInitialLayoutPass();
+
+            RaiseHandledPointerPressed(nav, new Point(5, 5));
+
+            var swipe = new SwipeGestureEventArgs(1, new Vector(-20, 0), default);
+            nav.RaiseEvent(swipe);
+            Dispatcher.UIThread.RunJobs(null, TestContext.Current.CancellationToken);
+
+            Assert.True(swipe.Handled);
+            Assert.Equal(1, nav.StackDepth);
+            Assert.Same(rootPage, nav.CurrentPage);
+        }
+
+        [Fact]
+        public async Task MouseEdgeDrag_AllowsSwipePop()
+        {
+            var nav = new NavigationPage
+            {
+                Width = 400,
+                Height = 300
+            };
+            nav.GestureRecognizers.OfType<SwipeGestureRecognizer>().First().IsMouseEnabled = true;
+            var rootPage = new ContentPage { Header = "Root" };
+            var topPage = new ContentPage { Header = "Top" };
+
+            await nav.PushAsync(rootPage);
+            await nav.PushAsync(topPage);
+
+            var root = new TestRoot
+            {
+                ClientSize = new Size(400, 300),
+                Child = nav
+            };
+            root.ExecuteInitialLayoutPass();
+
+            var mouse = new MouseTestHelper();
+            mouse.Down(nav, position: new Point(5, 5));
+            mouse.Move(nav, new Point(40, 5));
+            mouse.Up(nav, position: new Point(40, 5));
+            Dispatcher.UIThread.RunJobs(null, TestContext.Current.CancellationToken);
+
+            Assert.Equal(1, nav.StackDepth);
+            Assert.Same(rootPage, nav.CurrentPage);
+        }
+
+        [Fact]
+        public async Task SameGestureId_OnlyPops_One_Page()
+        {
+            var nav = new NavigationPage
+            {
+                Width = 400,
+                Height = 300
+            };
+            var page1 = new ContentPage { Header = "1" };
+            var page2 = new ContentPage { Header = "2" };
+            var page3 = new ContentPage { Header = "3" };
+
+            await nav.PushAsync(page1);
+            await nav.PushAsync(page2);
+            await nav.PushAsync(page3);
+
+            var root = new TestRoot
+            {
+                ClientSize = new Size(400, 300),
+                Child = nav
+            };
+            root.ExecuteInitialLayoutPass();
+
+            RaiseHandledPointerPressed(nav, new Point(5, 5));
+
+            nav.RaiseEvent(new SwipeGestureEventArgs(42, new Vector(-20, 0), default));
+            nav.RaiseEvent(new SwipeGestureEventArgs(42, new Vector(-30, 0), default));
+            Dispatcher.UIThread.RunJobs(null, TestContext.Current.CancellationToken);
+
+            Assert.Equal(2, nav.StackDepth);
+            Assert.Same(page2, nav.CurrentPage);
+        }
+
+        private static void RaiseHandledPointerPressed(Interactive target, Point position)
+        {
+            var pointer = new Pointer(Pointer.GetNextFreeId(), PointerType.Touch, true);
+            var args = new PointerPressedEventArgs(
+                target,
+                pointer,
+                (Visual)target,
+                position,
+                timestamp: 1,
+                new PointerPointProperties(RawInputModifiers.LeftMouseButton, PointerUpdateKind.LeftButtonPressed),
+                KeyModifiers.None)
+            {
+                Handled = true
+            };
+
+            target.RaiseEvent(args);
+        }
+    }
+
+    public class IsNavigatingTests : ScopedTestBase
+    {
+        [Fact]
+        public void IsNavigating_FalseByDefault()
+        {
+            var nav = new NavigationPage();
+            Assert.False(nav.IsNavigating);
+        }
+
+        [Fact]
+        public async Task IsNavigating_TrueWhilePushInProgress()
+        {
+            var tcs = new TaskCompletionSource<bool>();
+            var nav = CreateNavigationPage(new ControllableTransition(tcs.Task));
+
+            await nav.PushAsync(new ContentPage());
+
+            bool duringPush = false;
+            var pushTask = nav.PushAsync(new ContentPage());
+            duringPush = nav.IsNavigating;
+            tcs.SetResult(true);
+            await pushTask;
+
+            Assert.True(duringPush);
+        }
+
+        [Fact]
+        public async Task IsNavigating_FalseAfterPushCompletes()
+        {
+            var tcs = new TaskCompletionSource<bool>();
+            var nav = CreateNavigationPage(new ControllableTransition(tcs.Task));
+
+            await nav.PushAsync(new ContentPage());
+            var pushTask = nav.PushAsync(new ContentPage());
+            tcs.SetResult(true);
+            await pushTask;
+
+            Assert.False(nav.IsNavigating);
+        }
+
+        private static NavigationPage CreateNavigationPage(IPageTransition? transition)
+        {
+            var nav = new NavigationPage
+            {
+                PageTransition = transition,
+                Template = new FuncControlTemplate<NavigationPage>((parent, ns) =>
+                {
+                    return new Panel
+                    {
+                        Children =
+                        {
+                            new Panel
+                            {
+                                Name = "PART_ContentHost",
+                                Children =
+                                {
+                                    new ContentPresenter { Name = "PART_PageBackPresenter" }.RegisterInNameScope(ns),
+                                    new ContentPresenter { Name = "PART_PagePresenter" }.RegisterInNameScope(ns),
+                                }
+                            }.RegisterInNameScope(ns),
+                            new Border { Name = "PART_NavigationBar",
+                                Child = new Button { Name = "PART_BackButton" }.RegisterInNameScope(ns) }.RegisterInNameScope(ns),
+                            new ContentPresenter { Name = "PART_TopCommandBar" }.RegisterInNameScope(ns),
+                            new ContentPresenter { Name = "PART_ModalBackPresenter" }.RegisterInNameScope(ns),
+                            new ContentPresenter { Name = "PART_ModalPresenter" }.RegisterInNameScope(ns),
+                        }
+                    };
+                })
+            };
+            var root = new TestRoot { Child = nav };
+            root.LayoutManager.ExecuteInitialLayoutPass();
+            return nav;
+        }
+
+        private class ControllableTransition : IPageTransition
+        {
+            private readonly Task _gate;
+
+            public ControllableTransition(Task gate)
+            {
+                _gate = gate;
+            }
+
+            public async Task Start(Visual? from, Visual? to, bool forward, CancellationToken cancellationToken)
+            {
+                if (to != null)
+                    to.IsVisible = true;
+                await _gate;
+                if (from != null)
+                    from.IsVisible = false;
+            }
+        }
+    }
+
+    public class VisualTreeLifecycleTests : ScopedTestBase
+    {
+        [Fact]
+        public async Task Detach_And_Reattach_PreservesModalStack()
+        {
+            var nav = new NavigationPage
+            {
+                Template = new FuncControlTemplate<NavigationPage>((parent, ns) =>
+                {
+                    return new Panel
+                    {
+                        Children =
+                        {
+                            new Panel
+                            {
+                                Name = "PART_ContentHost",
+                                Children =
+                                {
+                                    new ContentPresenter { Name = "PART_PageBackPresenter" }.RegisterInNameScope(ns),
+                                    new ContentPresenter { Name = "PART_PagePresenter" }.RegisterInNameScope(ns),
+                                }
+                            }.RegisterInNameScope(ns),
+                            new Border
+                            {
+                                Name = "PART_NavigationBar",
+                                Child = new Button { Name = "PART_BackButton" }.RegisterInNameScope(ns)
+                            }.RegisterInNameScope(ns),
+                            new ContentPresenter { Name = "PART_TopCommandBar" }.RegisterInNameScope(ns),
+                            new ContentPresenter { Name = "PART_ModalBackPresenter" }.RegisterInNameScope(ns),
+                            new ContentPresenter { Name = "PART_ModalPresenter" }.RegisterInNameScope(ns),
+                        }
+                    };
+                })
+            };
+
+            var root = new TestRoot { Child = nav };
+            root.LayoutManager.ExecuteInitialLayoutPass();
+
+            var page = new ContentPage { Header = "Root" };
+            var modal = new ContentPage { Header = "Modal" };
+
+            await nav.PushAsync(page);
+            await nav.PushModalAsync(modal);
+
+            root.Child = null;
+
+            Assert.Single(nav.ModalStack);
+            Assert.Same(modal, nav.ModalStack[0]);
+            Assert.Null(modal.Navigation);
+            Assert.False(modal.IsInNavigationPage);
+
+            root.Child = nav;
+            root.LayoutManager.ExecuteInitialLayoutPass();
+
+            Assert.Single(nav.ModalStack);
+            Assert.Same(modal, nav.ModalStack[0]);
+            Assert.Same(nav, modal.Navigation);
+            Assert.True(modal.IsInNavigationPage);
+        }
+    }
+
+    public class PagesPropertyTests : ScopedTestBase
+    {
+        [Fact]
+        public void Pages_DirectAssignment_ThrowsInvalidOperationException()
+        {
+            var nav = new NavigationPage();
+            var originalPages = nav.Pages;
+
+            Assert.Throws<InvalidOperationException>(() => nav.Pages = new List<Page> { new ContentPage() });
+
+            Assert.Same(originalPages, nav.Pages);
+            Assert.Empty(nav.NavigationStack);
+            Assert.Null(nav.CurrentPage);
+        }
+
+        [Fact]
+        public void Pages_AssignNull_ThrowsInvalidOperationException()
+        {
+            var nav = new NavigationPage();
+            var originalPages = nav.Pages;
+
+            Assert.Throws<InvalidOperationException>(() => nav.Pages = null);
+
+            Assert.Same(originalPages, nav.Pages);
+            Assert.Empty(nav.NavigationStack);
+            Assert.Null(nav.CurrentPage);
+        }
+
+        [Fact]
+        public async Task Pages_DirectAssignment_DoesNotCorruptExistingStack()
+        {
+            var nav = new NavigationPage();
+            var root = new ContentPage();
+            var top = new ContentPage();
+            await nav.PushAsync(root);
+            await nav.PushAsync(top);
+            var originalPages = nav.Pages;
+
+            Assert.Throws<InvalidOperationException>(() => nav.Pages = new List<Page> { new ContentPage() });
+
+            Assert.Same(originalPages, nav.Pages);
+            Assert.Equal(2, nav.NavigationStack.Count);
+            Assert.Same(root, nav.NavigationStack[0]);
+            Assert.Same(top, nav.NavigationStack[1]);
+            Assert.Same(top, nav.CurrentPage);
+        }
+    }
+
+    public class ContentPageCoerceTests : ScopedTestBase
+    {
+        [Fact]
+        public void ContentPage_ContentSetToPage_ThrowsInvalidOperationException()
+        {
+            var page = new ContentPage();
+            Assert.Throws<InvalidOperationException>(() => page.Content = new ContentPage());
+        }
+
+        [Fact]
+        public void ContentPage_ContentSetToNonPage_DoesNotThrow()
+        {
+            var page = new ContentPage();
+            page.Content = "hello";
+            Assert.Equal("hello", page.Content);
+        }
+    }
+
+    public class DrawerPageFirstPageTests : ScopedTestBase
+    {
+        [Fact]
+        public void DrawerPage_ContentReplaced_ResendsNavigatedToOnLoad()
+        {
+            var root = new TestRoot();
+            var nav1 = new NavigationPage();
+            var page1 = new ContentPage();
+            var drawer = new DrawerPage { Content = nav1 };
+            root.Child = drawer;
+            root.LayoutManager.ExecuteInitialLayoutPass();
+
+            NavigatedToEventArgs? firstArgs = null;
+            page1.NavigatedTo += (_, e) => firstArgs = e;
+            nav1.Content = page1;
+
+            Assert.NotNull(firstArgs);
+
+            var nav2 = new NavigationPage();
+            var page2 = new ContentPage();
+
+            NavigatedToEventArgs? secondArgs = null;
+            page2.NavigatedTo += (_, e) => secondArgs = e;
+
+            drawer.Content = nav2;
+            nav2.Content = page2;
+
+            Assert.NotNull(secondArgs);
+        }
+    }
+
 }
diff --git a/tests/Avalonia.Controls.UnitTests/Primitives/VisualLayerManagerTests.cs b/tests/Avalonia.Controls.UnitTests/Primitives/VisualLayerManagerTests.cs
new file mode 100644
index 0000000000..70c7d946f9
--- /dev/null
+++ b/tests/Avalonia.Controls.UnitTests/Primitives/VisualLayerManagerTests.cs
@@ -0,0 +1,37 @@
+using Avalonia.Controls.Primitives;
+using Avalonia.UnitTests;
+using Xunit;
+
+namespace Avalonia.Controls.UnitTests.Primitives
+{
+    public class VisualLayerManagerTests : ScopedTestBase
+    {
+        [Fact]
+        public void GetAdornerLayer_Returns_Dedicated_AdornerLayer_For_Controls_Inside_OverlayLayer()
+        {
+            var button = new Button();
+            var vlm = new VisualLayerManager { EnableOverlayLayer = true, Child = button };
+            var root = new TestRoot { Child = vlm };
+
+            root.Measure(new Size(100, 100));
+            root.Arrange(new Rect(0, 0, 100, 100));
+
+            var overlayLayer = vlm.OverlayLayer;
+            Assert.NotNull(overlayLayer);
+
+            var overlayChild = new Border();
+            overlayLayer.Children.Add(overlayChild);
+
+            // The adorner layer for a control inside the OverlayLayer
+            // should be the dedicated one, not the main VLM adorner layer.
+            var overlayAdornerLayer = AdornerLayer.GetAdornerLayer(overlayChild);
+            Assert.NotNull(overlayAdornerLayer);
+            Assert.Same(overlayLayer.AdornerLayer, overlayAdornerLayer);
+
+            // The main VLM adorner layer should be different.
+            var mainAdornerLayer = AdornerLayer.GetAdornerLayer(button);
+            Assert.NotNull(mainAdornerLayer);
+            Assert.NotSame(overlayAdornerLayer, mainAdornerLayer);
+        }
+    }
+}
diff --git a/tests/Avalonia.Controls.UnitTests/TabControlTests.cs b/tests/Avalonia.Controls.UnitTests/TabControlTests.cs
index 8bad019c2b..42643c5560 100644
--- a/tests/Avalonia.Controls.UnitTests/TabControlTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/TabControlTests.cs
@@ -955,6 +955,30 @@ namespace Avalonia.Controls.UnitTests
                 }.RegisterInNameScope(scope));
         }
 
+        private static IControlTemplate TabItemWithIconTemplate()
+        {
+            return new FuncControlTemplate<TabItem>((parent, scope) =>
+                new StackPanel
+                {
+                    Children =
+                    {
+                        new ContentPresenter
+                        {
+                            Name = "PART_IconPresenter",
+                            [~ContentPresenter.ContentProperty] = new TemplateBinding(TabItem.IconProperty),
+                            [~ContentPresenter.ContentTemplateProperty] = new TemplateBinding(TabItem.IconTemplateProperty),
+                        }.RegisterInNameScope(scope),
+                        new ContentPresenter
+                        {
+                            Name = "PART_ContentPresenter",
+                            [~ContentPresenter.ContentProperty] = new TemplateBinding(TabItem.HeaderProperty),
+                            [~ContentPresenter.ContentTemplateProperty] = new TemplateBinding(TabItem.HeaderTemplateProperty),
+                            RecognizesAccessKey = true,
+                        }.RegisterInNameScope(scope),
+                    }
+                });
+        }
+
         private static ControlTheme CreateTabControlControlTheme()
         {
             return new ControlTheme(typeof(TabControl))
@@ -1495,35 +1519,72 @@ namespace Avalonia.Controls.UnitTests
         }
 
         [Fact]
-        public void TabItem_Icon_DefaultIsNull()
+        public void TabItem_IconTemplate_Creates_Content_From_NonControl_Icon()
         {
-            var tabItem = new TabItem();
-            Assert.Null(tabItem.Icon);
+            var tabItem = new TabItem
+            {
+                Icon = "home",
+                IconTemplate = new FuncDataTemplate<object>((val, _) =>
+                    new TextBlock { Text = (string)val }),
+                Template = TabItemWithIconTemplate(),
+            };
+
+            var root = new TestRoot { Child = tabItem };
+            tabItem.ApplyTemplate();
+            tabItem.Presenter!.UpdateChild();
+
+            var iconPresenter = tabItem.GetTemplateChildren().OfType<ContentPresenter>().First(x => x.Name == "PART_IconPresenter");
+            Assert.NotNull(iconPresenter);
+            Assert.Equal("home", iconPresenter!.Content);
+            Assert.NotNull(iconPresenter.ContentTemplate);
+
+            iconPresenter.UpdateChild();
+            var textBlock = iconPresenter.Child as TextBlock;
+            Assert.NotNull(textBlock);
+            Assert.Equal("home", textBlock!.Text);
         }
 
         [Fact]
-        public void TabItem_Icon_RoundTrips()
+        public void TabItem_Icon_Without_Template_Renders_Control_Directly()
         {
-            var tabItem = new TabItem();
             var icon = new Avalonia.Controls.Shapes.Path
             {
                 Data = new Avalonia.Media.EllipseGeometry { Rect = new Rect(0, 0, 10, 10) }
             };
-            tabItem.Icon = icon;
-            Assert.Same(icon, tabItem.Icon);
+            var tabItem = new TabItem
+            {
+                Icon = icon,
+                Template = TabItemWithIconTemplate(),
+            };
+
+            var root = new TestRoot { Child = tabItem };
+            tabItem.ApplyTemplate();
+            tabItem.Presenter!.UpdateChild();
+
+            var iconPresenter = tabItem.GetTemplateChildren().OfType<ContentPresenter>().First(x => x.Name == "PART_IconPresenter");
+            Assert.NotNull(iconPresenter);
+            Assert.Same(icon, iconPresenter!.Content);
+            Assert.Null(iconPresenter.ContentTemplate);
         }
 
         [Fact]
-        public void TabItem_Icon_CanBeSetToNull()
+        public void TabItem_Icon_Change_Updates_Presenter_Content()
         {
-            var tabItem = new TabItem();
-            var icon = new Avalonia.Controls.Shapes.Path
+            var tabItem = new TabItem
             {
-                Data = new Avalonia.Media.EllipseGeometry { Rect = new Rect(0, 0, 10, 10) }
+                Icon = "first",
+                Template = TabItemWithIconTemplate(),
             };
-            tabItem.Icon = icon;
-            tabItem.Icon = null;
-            Assert.Null(tabItem.Icon);
+
+            var root = new TestRoot { Child = tabItem };
+            tabItem.ApplyTemplate();
+            tabItem.Presenter!.UpdateChild();
+
+            var iconPresenter = tabItem.GetTemplateChildren().OfType<ContentPresenter>().First(x => x.Name == "PART_IconPresenter");
+            Assert.Equal("first", iconPresenter!.Content);
+
+            tabItem.Icon = "second";
+            Assert.Equal("second", iconPresenter.Content);
         }
 
         [Fact]
diff --git a/tests/Avalonia.Controls.UnitTests/TabbedPageTests.cs b/tests/Avalonia.Controls.UnitTests/TabbedPageTests.cs
index c6c567e315..a27f398a17 100644
--- a/tests/Avalonia.Controls.UnitTests/TabbedPageTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/TabbedPageTests.cs
@@ -1,12 +1,18 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
+using System.Linq;
 using Avalonia.Animation;
 using Avalonia.Collections;
+using Avalonia.Controls.Presenters;
 using Avalonia.Controls.Shapes;
 using Avalonia.Controls.Templates;
+using Avalonia.Input;
+using Avalonia.Input.GestureRecognizers;
+using Avalonia.Interactivity;
 using Avalonia.LogicalTree;
 using Avalonia.Media;
+using Avalonia.Threading;
 using Avalonia.UnitTests;
 using Xunit;
 
@@ -181,6 +187,18 @@ public class TabbedPageTests
             Assert.DoesNotContain(page, ((ILogical)tp).LogicalChildren);
         }
 
+        [Fact]
+        public void Pages_SetNull_ClearsCurrentPage()
+        {
+            var tp = new TestableTabbedPage();
+            var page = new ContentPage();
+            tp.Pages = new AvaloniaList<Page> { page };
+            tp.CallCommitSelection(0, page);
+            Assert.NotNull(tp.CurrentPage);
+            tp.Pages = null;
+            Assert.Null(tp.CurrentPage);
+        }
+
         [Fact]
         public void Pages_AddMultiple_AllBecomeLogicalChildren()
         {
@@ -682,6 +700,194 @@ public class TabbedPageTests
         }
     }
 
+    public class KeyboardNavigationTests : ScopedTestBase
+    {
+        [Fact]
+        public void IsKeyboardNavigationEnabled_Default_IsTrue()
+        {
+            var tp = new TabbedPage();
+            Assert.True(tp.IsKeyboardNavigationEnabled);
+        }
+
+        [Fact]
+        public void IsKeyboardNavigationEnabled_False_RightKey_IsNotHandled()
+        {
+            var tp = new TestableTabbedPage { IsKeyboardNavigationEnabled = false };
+            tp.Pages = new AvaloniaList<Page> { new ContentPage(), new ContentPage() };
+            tp.SelectedIndex = 0;
+
+            bool handled = tp.SimulateKeyDownReturnsHandled(Key.Right);
+
+            Assert.False(handled);
+        }
+
+        [Fact]
+        public void IsKeyboardNavigationEnabled_False_CtrlTab_IsNotHandled()
+        {
+            var tp = new TestableTabbedPage { IsKeyboardNavigationEnabled = false };
+            tp.Pages = new AvaloniaList<Page> { new ContentPage(), new ContentPage() };
+            tp.SelectedIndex = 0;
+
+            bool handled = tp.SimulateKeyDownWithModifiersReturnsHandled(Key.Tab, KeyModifiers.Control);
+
+            Assert.False(handled);
+        }
+
+        [Fact]
+        public void IsKeyboardNavigationEnabled_True_NoTemplate_KeyIsNotHandled()
+        {
+            var tp = new TestableTabbedPage { IsKeyboardNavigationEnabled = true };
+            tp.Pages = new AvaloniaList<Page> { new ContentPage(), new ContentPage() };
+
+            bool handled = tp.SimulateKeyDownReturnsHandled(Key.Right);
+
+            Assert.False(handled);
+        }
+    }
+
+    public class KeyboardNavigationWithTemplateTests : ScopedTestBase
+    {
+        // Builds a TabbedPage with a real PART_TabControl wired up so OnKeyDown can navigate.
+        private static TestableTabbedPage MakeTabbed(int pageCount, int selectedIndex = 0,
+            TabPlacement placement = TabPlacement.Top)
+        {
+            var tp = new TestableTabbedPage { TabPlacement = placement };
+            for (int i = 0; i < pageCount; i++)
+                ((AvaloniaList<Page>)tp.Pages!).Add(new ContentPage { Header = $"Tab {i}" });
+
+            tp.Template = new FuncControlTemplate<TabbedPage>((parent, scope) =>
+                new TabControl
+                {
+                    Name = "PART_TabControl",
+                    ItemsSource = parent.Pages,
+                }.RegisterInNameScope(scope));
+
+            _ = new TestRoot { Child = tp };
+            tp.ApplyTemplate();
+            tp.SelectedIndex = selectedIndex;
+            return tp;
+        }
+
+        [Fact]
+        public void RightKey_NavigatesToNextPage()
+        {
+            var tp = MakeTabbed(3, selectedIndex: 0);
+            tp.SimulateKeyDown(Key.Right);
+            Assert.Equal(1, tp.SelectedIndex);
+        }
+
+        [Fact]
+        public void LeftKey_NavigatesToPreviousPage()
+        {
+            var tp = MakeTabbed(3, selectedIndex: 1);
+            tp.SimulateKeyDown(Key.Left);
+            Assert.Equal(0, tp.SelectedIndex);
+        }
+
+        [Fact]
+        public void DownKey_WithVerticalPlacement_NavigatesToNextPage()
+        {
+            var tp = MakeTabbed(3, selectedIndex: 0, placement: TabPlacement.Left);
+            tp.SimulateKeyDown(Key.Down);
+            Assert.Equal(1, tp.SelectedIndex);
+        }
+
+        [Fact]
+        public void UpKey_WithVerticalPlacement_NavigatesToPreviousPage()
+        {
+            var tp = MakeTabbed(3, selectedIndex: 1, placement: TabPlacement.Left);
+            tp.SimulateKeyDown(Key.Up);
+            Assert.Equal(0, tp.SelectedIndex);
+        }
+
+        [Fact]
+        public void RightKey_AtLastPage_DoesNotNavigate()
+        {
+            var tp = MakeTabbed(3, selectedIndex: 2);
+            tp.SimulateKeyDown(Key.Right);
+            Assert.Equal(2, tp.SelectedIndex);
+        }
+
+        [Fact]
+        public void LeftKey_AtFirstPage_DoesNotNavigate()
+        {
+            var tp = MakeTabbed(3, selectedIndex: 0);
+            tp.SimulateKeyDown(Key.Left);
+            Assert.Equal(0, tp.SelectedIndex);
+        }
+
+        [Fact]
+        public void RightKey_MarksEventHandled()
+        {
+            var tp = MakeTabbed(3, selectedIndex: 0);
+            bool handled = tp.SimulateKeyDownReturnsHandled(Key.Right);
+            Assert.True(handled);
+        }
+
+        [Fact]
+        public void RightKey_AtLastPage_DoesNotMarkEventHandled()
+        {
+            var tp = MakeTabbed(3, selectedIndex: 2);
+            bool handled = tp.SimulateKeyDownReturnsHandled(Key.Right);
+            Assert.False(handled);
+        }
+
+        [Fact]
+        public void CtrlTab_NavigatesToNextPage()
+        {
+            var tp = MakeTabbed(3, selectedIndex: 0);
+            bool handled = tp.SimulateKeyDownWithModifiersReturnsHandled(Key.Tab, KeyModifiers.Control);
+            Assert.Equal(1, tp.SelectedIndex);
+            Assert.True(handled);
+        }
+
+        [Fact]
+        public void CtrlShiftTab_NavigatesToPreviousPage()
+        {
+            var tp = MakeTabbed(3, selectedIndex: 1);
+            bool handled = tp.SimulateKeyDownWithModifiersReturnsHandled(Key.Tab, KeyModifiers.Control | KeyModifiers.Shift);
+            Assert.Equal(0, tp.SelectedIndex);
+            Assert.True(handled);
+        }
+
+        [Fact]
+        public void RtlFlowDirection_LeftKey_NavigatesToNextPage()
+        {
+            var tp = MakeTabbed(3, selectedIndex: 0);
+            tp.FlowDirection = FlowDirection.RightToLeft;
+            tp.SimulateKeyDown(Key.Left);
+            Assert.Equal(1, tp.SelectedIndex);
+        }
+
+        [Fact]
+        public void RtlFlowDirection_RightKey_NavigatesToPreviousPage()
+        {
+            var tp = MakeTabbed(3, selectedIndex: 1);
+            tp.FlowDirection = FlowDirection.RightToLeft;
+            tp.SimulateKeyDown(Key.Right);
+            Assert.Equal(0, tp.SelectedIndex);
+        }
+
+        [Fact]
+        public void RightKey_SkipsDisabledTab()
+        {
+            var tp = MakeTabbed(3, selectedIndex: 0);
+            TabbedPage.SetIsTabEnabled((Page)((System.Collections.IList)tp.Pages!)[1]!, false);
+            tp.SimulateKeyDown(Key.Right);
+            Assert.Equal(2, tp.SelectedIndex);
+        }
+
+        [Fact]
+        public void RightKey_AllTabsAhead_Disabled_DoesNotNavigate()
+        {
+            var tp = MakeTabbed(3, selectedIndex: 0);
+            TabbedPage.SetIsTabEnabled((Page)((System.Collections.IList)tp.Pages!)[1]!, false);
+            TabbedPage.SetIsTabEnabled((Page)((System.Collections.IList)tp.Pages!)[2]!, false);
+            tp.SimulateKeyDown(Key.Right);
+            Assert.Equal(0, tp.SelectedIndex);
+        }
+    }
+
     public class SelectingMultiPageTests : ScopedTestBase
     {
         [Fact]
@@ -707,72 +913,53 @@ public class TabbedPageTests
         }
     }
 
-    public class CreateIconControlTests : ScopedTestBase
+    public class PageIconTemplateTests : ScopedTestBase
     {
         [Fact]
-        public void Geometry_ReturnsPath()
+        public void Page_Icon_AcceptsControlValue()
         {
-            var geometry = new EllipseGeometry { Rect = new Rect(0, 0, 10, 10) };
-            var result = TabbedPage.CreateIconControl(geometry);
-            Assert.IsType<Path>(result);
-            Assert.Same(geometry, ((Path)result!).Data);
+            var icon = new PathIcon { Data = new EllipseGeometry { Rect = new Rect(0, 0, 10, 10) } };
+            var page = new ContentPage { Icon = icon };
+            Assert.Same(icon, page.Icon);
         }
 
         [Fact]
-        public void PathIcon_ReturnsPath()
+        public void Page_Icon_AcceptsNonControlValue()
         {
             var geometry = new EllipseGeometry { Rect = new Rect(0, 0, 10, 10) };
-            var pathIcon = new PathIcon { Data = geometry };
-            var result = TabbedPage.CreateIconControl(pathIcon);
-            Assert.IsType<Path>(result);
-            Assert.Same(geometry, ((Path)result!).Data);
+            var page = new ContentPage { Icon = geometry };
+            Assert.Same(geometry, page.Icon);
         }
 
         [Fact]
-        public void EmptyString_ReturnsNull()
+        public void Page_IconTemplate_RoundTrips()
         {
-            var result = TabbedPage.CreateIconControl("");
-            Assert.Null(result);
-        }
-
-        [Fact]
-        public void NullString_ReturnsNull()
-        {
-            var result = TabbedPage.CreateIconControl((string?)null);
-            Assert.Null(result);
-        }
-
-        [Fact]
-        public void Null_ReturnsNull()
-        {
-            var result = TabbedPage.CreateIconControl(null);
-            Assert.Null(result);
+            var template = new FuncDataTemplate<object>((_, _) => new Border());
+            var page = new ContentPage { IconTemplate = template };
+            Assert.Same(template, page.IconTemplate);
         }
 
         [Fact]
-        public void DrawingImage_WithGeometryDrawing_ReturnsPath()
+        public void DrawerPage_DrawerIconTemplate_RoundTrips()
         {
-            var geometry = new EllipseGeometry { Rect = new Rect(0, 0, 10, 10) };
-            var drawing = new GeometryDrawing { Geometry = geometry };
-            var drawingImage = new DrawingImage(drawing);
-            var result = TabbedPage.CreateIconControl(drawingImage);
-            Assert.IsType<Path>(result);
-            Assert.Same(geometry, ((Path)result!).Data);
+            var template = new FuncDataTemplate<object>((_, _) => new Border());
+            var dp = new DrawerPage { DrawerIconTemplate = template };
+            Assert.Same(template, dp.DrawerIconTemplate);
         }
 
         [Fact]
-        public void Path_HasStretchUniform()
+        public void DrawerPage_DrawerIcon_With_Geometry_Does_Not_Throw()
         {
             var geometry = new EllipseGeometry { Rect = new Rect(0, 0, 10, 10) };
-            var result = TabbedPage.CreateIconControl(geometry);
-            Assert.Equal(Stretch.Uniform, ((Path)result!).Stretch);
-        }
+            var dp = new DrawerPage
+            {
+                DrawerIcon = geometry,
+                DrawerIconTemplate = new FuncDataTemplate<object>((_, _) => new PathIcon()),
+            };
+            var root = new TestRoot { Child = dp };
 
-        [Fact]
-        public void UnsupportedType_ReturnsNull()
-        {
-            var result = TabbedPage.CreateIconControl(42);
-            Assert.Null(result);
+            dp.DrawerIcon = new EllipseGeometry { Rect = new Rect(0, 0, 20, 20) };
+            Assert.NotNull(dp.DrawerIcon);
         }
     }
 
@@ -807,6 +994,433 @@ public class TabbedPageTests
             var built = tp.PageTemplate!.Build(new DataItem("Test"));
             Assert.IsType<ContentPage>(built);
         }
+
+        [Fact]
+        public void ViewModelItems_WithPageTemplate_BuildContainersAsContentPages()
+        {
+            var items = new System.Collections.ObjectModel.ObservableCollection<DataItem>
+            {
+                new("Electronics"),
+                new("Books"),
+            };
+
+            var tp = new TabbedPage
+            {
+                Width = 400, Height = 300,
+                ItemsSource = items,
+                PageTemplate = new FuncDataTemplate<DataItem>(
+                    (item, _) => new ContentPage { Header = item!.Name }, supportsRecycling: false),
+                Template = CreateTabbedPageTemplate(),
+            };
+
+            var root = new TestRoot { ClientSize = new Size(400, 300), Child = tp };
+            root.ExecuteInitialLayoutPass();
+            Dispatcher.UIThread.RunJobs(null, TestContext.Current.CancellationToken);
+
+            var logicals = ((ILogical)tp).LogicalChildren;
+            Assert.Contains(logicals, l => l is ContentPage cp && cp.Header?.ToString() == "Electronics");
+            Assert.Contains(logicals, l => l is ContentPage cp && cp.Header?.ToString() == "Books");
+        }
+
+        [Fact]
+        public void ItemsSource_SelectedPage_IsNotNullAfterContainersRealized()
+        {
+            var items = new System.Collections.ObjectModel.ObservableCollection<DataItem>
+            {
+                new("First"),
+                new("Second"),
+            };
+
+            var tp = new TabbedPage
+            {
+                Width = 400, Height = 300,
+                ItemsSource = items,
+                PageTemplate = new FuncDataTemplate<DataItem>(
+                    (item, _) => new ContentPage { Header = item!.Name }, supportsRecycling: false),
+                Template = CreateTabbedPageTemplate(),
+            };
+
+            var root = new TestRoot { ClientSize = new Size(400, 300), Child = tp };
+            root.ExecuteInitialLayoutPass();
+            Dispatcher.UIThread.RunJobs(null, TestContext.Current.CancellationToken);
+
+            Assert.NotNull(tp.SelectedPage);
+            Assert.Equal(0, tp.SelectedIndex);
+            Assert.IsType<ContentPage>(tp.SelectedPage);
+            Assert.Equal("First", tp.SelectedPage!.Header?.ToString());
+        }
+
+        [Fact]
+        public void NonListItemsSource_SelectedPage_And_AutomationName_AreResolved()
+        {
+            var tp = new TabbedPage
+            {
+                Width = 400, Height = 300,
+                ItemsSource = EnumerateItems(new("First"), new("Second")),
+                PageTemplate = new FuncDataTemplate<DataItem>(
+                    (item, _) => new ContentPage { Header = item!.Name }, supportsRecycling: false),
+                Template = CreateTabbedPageTemplate(),
+            };
+
+            var root = new TestRoot { ClientSize = new Size(400, 300), Child = tp };
+            root.ExecuteInitialLayoutPass();
+            Dispatcher.UIThread.RunJobs(null, TestContext.Current.CancellationToken);
+
+            Assert.NotNull(tp.SelectedPage);
+            Assert.Equal("First", tp.SelectedPage!.Header?.ToString());
+            Assert.Equal("Tab 1 of 2: First", new Avalonia.Automation.Peers.TabbedPageAutomationPeer(tp).GetName());
+
+            tp.SelectedIndex = 1;
+            root.LayoutManager.ExecuteLayoutPass();
+            Dispatcher.UIThread.RunJobs(null, TestContext.Current.CancellationToken);
+
+            Assert.NotNull(tp.SelectedPage);
+            Assert.Equal("Second", tp.SelectedPage!.Header?.ToString());
+            Assert.Equal("Tab 2 of 2: Second", new Avalonia.Automation.Peers.TabbedPageAutomationPeer(tp).GetName());
+        }
+
+        [Fact]
+        public void ItemsSource_SelectionChanged_ReportsCorrectPage()
+        {
+            var items = new System.Collections.ObjectModel.ObservableCollection<DataItem>
+            {
+                new("Alpha"),
+                new("Beta"),
+            };
+
+            var tp = new TabbedPage
+            {
+                Width = 400, Height = 300,
+                ItemsSource = items,
+                PageTemplate = new FuncDataTemplate<DataItem>(
+                    (item, _) => new ContentPage { Header = item!.Name }, supportsRecycling: false),
+                Template = CreateTabbedPageTemplate(),
+            };
+
+            var root = new TestRoot { ClientSize = new Size(400, 300), Child = tp };
+            root.ExecuteInitialLayoutPass();
+            Dispatcher.UIThread.RunJobs(null, TestContext.Current.CancellationToken);
+
+            Page? reportedPage = null;
+            tp.SelectionChanged += (_, e) => reportedPage = e.CurrentPage;
+
+            tp.SelectedIndex = 1;
+            root.LayoutManager.ExecuteLayoutPass();
+            Dispatcher.UIThread.RunJobs(null, TestContext.Current.CancellationToken);
+
+            Assert.NotNull(tp.SelectedPage);
+            Assert.Equal(1, tp.SelectedIndex);
+            Assert.Equal("Beta", tp.SelectedPage!.Header?.ToString());
+            Assert.NotNull(reportedPage);
+            Assert.Equal("Beta", reportedPage!.Header?.ToString());
+        }
+
+        [Fact]
+        public void ViewModelItems_RemovedFromCollection_TemplateCreatedPageRemovedFromLogicalChildren()
+        {
+            var items = new System.Collections.ObjectModel.ObservableCollection<DataItem>
+            {
+                new("A"),
+                new("B"),
+            };
+
+            var tp = new TabbedPage
+            {
+                Width = 400, Height = 300,
+                ItemsSource = items,
+                PageTemplate = new FuncDataTemplate<DataItem>(
+                    (item, _) => new ContentPage { Header = item!.Name }, supportsRecycling: false),
+                Template = CreateTabbedPageTemplate(),
+            };
+
+            var root = new TestRoot { ClientSize = new Size(400, 300), Child = tp };
+            root.ExecuteInitialLayoutPass();
+            Dispatcher.UIThread.RunJobs(null, TestContext.Current.CancellationToken);
+
+            items.RemoveAt(1);
+            root.LayoutManager.ExecuteLayoutPass();
+            Dispatcher.UIThread.RunJobs(null, TestContext.Current.CancellationToken);
+
+            var logicals = ((ILogical)tp).LogicalChildren;
+            Assert.DoesNotContain(logicals, l => l is ContentPage cp && cp.Header?.ToString() == "B");
+        }
+
+        [Fact]
+        public void ItemsSource_Replaced_NoPhantomLogicalChildren()
+        {
+            var first = new System.Collections.ObjectModel.ObservableCollection<DataItem>
+            {
+                new("One"),
+                new("Two"),
+            };
+            var second = new System.Collections.ObjectModel.ObservableCollection<DataItem>
+            {
+                new("Three"),
+                new("Four"),
+            };
+
+            var tp = new TabbedPage
+            {
+                Width = 400, Height = 300,
+                ItemsSource = first,
+                PageTemplate = new FuncDataTemplate<DataItem>(
+                    (item, _) => new ContentPage { Header = item!.Name }, supportsRecycling: false),
+                Template = CreateTabbedPageTemplate(),
+            };
+
+            var root = new TestRoot { ClientSize = new Size(400, 300), Child = tp };
+            root.ExecuteInitialLayoutPass();
+            Dispatcher.UIThread.RunJobs(null, TestContext.Current.CancellationToken);
+
+            tp.ItemsSource = second;
+            root.LayoutManager.ExecuteLayoutPass();
+            Dispatcher.UIThread.RunJobs(null, TestContext.Current.CancellationToken);
+
+            var logicals = ((ILogical)tp).LogicalChildren;
+            Assert.DoesNotContain(logicals, l => l is ContentPage cp && cp.Header?.ToString() == "One");
+            Assert.DoesNotContain(logicals, l => l is ContentPage cp && cp.Header?.ToString() == "Two");
+            Assert.Contains(logicals, l => l is ContentPage cp && cp.Header?.ToString() == "Three");
+            Assert.Contains(logicals, l => l is ContentPage cp && cp.Header?.ToString() == "Four");
+        }
+
+        [Fact]
+        public void PageTemplate_ChangedAfterContainersRealized_RebuildsExistingContainers()
+        {
+            var items = new System.Collections.ObjectModel.ObservableCollection<DataItem>
+            {
+                new("X"),
+                new("Y"),
+            };
+
+            var tp = new TabbedPage
+            {
+                Width = 400, Height = 300,
+                ItemsSource = items,
+                PageTemplate = new FuncDataTemplate<DataItem>(
+                    (item, _) => new ContentPage { Header = "old-" + item!.Name }, supportsRecycling: false),
+                Template = CreateTabbedPageTemplate(),
+            };
+
+            var root = new TestRoot { ClientSize = new Size(400, 300), Child = tp };
+            root.ExecuteInitialLayoutPass();
+            Dispatcher.UIThread.RunJobs(null, TestContext.Current.CancellationToken);
+
+            tp.PageTemplate = new FuncDataTemplate<DataItem>(
+                (item, _) => new ContentPage { Header = "new-" + item!.Name }, supportsRecycling: false);
+            root.LayoutManager.ExecuteLayoutPass();
+            Dispatcher.UIThread.RunJobs(null, TestContext.Current.CancellationToken);
+
+            var logicals = ((ILogical)tp).LogicalChildren;
+            Assert.DoesNotContain(logicals, l => l is ContentPage cp && cp.Header?.ToString()?.StartsWith("old-") == true);
+            Assert.Contains(logicals, l => l is ContentPage cp && cp.Header?.ToString() == "new-X");
+            Assert.Contains(logicals, l => l is ContentPage cp && cp.Header?.ToString() == "new-Y");
+        }
+
+        [Fact]
+        public void PageTemplate_ChangedAfterContainersRealized_UpdatesSelectedPage()
+        {
+            var items = new System.Collections.ObjectModel.ObservableCollection<DataItem>
+            {
+                new("A"),
+                new("B"),
+            };
+
+            var tp = new TabbedPage
+            {
+                Width = 400, Height = 300,
+                ItemsSource = items,
+                PageTemplate = new FuncDataTemplate<DataItem>(
+                    (item, _) => new ContentPage { Header = "old-" + item!.Name }, supportsRecycling: false),
+                Template = CreateTabbedPageTemplate(),
+            };
+
+            var root = new TestRoot { ClientSize = new Size(400, 300), Child = tp };
+            root.ExecuteInitialLayoutPass();
+            Dispatcher.UIThread.RunJobs(null, TestContext.Current.CancellationToken);
+
+            tp.PageTemplate = new FuncDataTemplate<DataItem>(
+                (item, _) => new ContentPage { Header = "new-" + item!.Name }, supportsRecycling: false);
+            root.LayoutManager.ExecuteLayoutPass();
+            Dispatcher.UIThread.RunJobs(null, TestContext.Current.CancellationToken);
+
+            Assert.NotNull(tp.SelectedPage);
+            Assert.Equal("new-A", tp.SelectedPage!.Header?.ToString());
+        }
+
+        [Fact]
+        public void ReapplyingTemplate_DoesNotLeavePhantomLogicalChildren()
+        {
+            var items = new System.Collections.ObjectModel.ObservableCollection<DataItem>
+            {
+                new("A"),
+                new("B"),
+            };
+
+            var tp = new TabbedPage
+            {
+                Width = 400, Height = 300,
+                ItemsSource = items,
+                PageTemplate = new FuncDataTemplate<DataItem>(
+                    (item, _) => new ContentPage { Header = item!.Name }, supportsRecycling: false),
+                Template = CreateTabbedPageTemplate(),
+            };
+
+            var root = new TestRoot { ClientSize = new Size(400, 300), Child = tp };
+            root.ExecuteInitialLayoutPass();
+            Dispatcher.UIThread.RunJobs(null, TestContext.Current.CancellationToken);
+
+            var firstSelectedPage = tp.SelectedPage;
+
+            tp.Template = CreateTabbedPageTemplate();
+            root.LayoutManager.ExecuteLayoutPass();
+            Dispatcher.UIThread.RunJobs(null, TestContext.Current.CancellationToken);
+
+            Assert.Equal(2, ((ILogical)tp).LogicalChildren.Count);
+            Assert.DoesNotContain(firstSelectedPage!, ((ILogical)tp).LogicalChildren);
+        }
+
+        [Fact]
+        public void PageTemplate_SetToNullAfterContainersRealized_ClearsGeneratedPages()
+        {
+            var items = new System.Collections.ObjectModel.ObservableCollection<DataItem>
+            {
+                new("A"),
+                new("B"),
+            };
+
+            var tp = new TabbedPage
+            {
+                Width = 400, Height = 300,
+                ItemsSource = items,
+                PageTemplate = new FuncDataTemplate<DataItem>(
+                    (item, _) => new ContentPage { Header = item!.Name }, supportsRecycling: false),
+                Template = CreateTabbedPageTemplate(),
+            };
+
+            var root = new TestRoot { ClientSize = new Size(400, 300), Child = tp };
+            root.ExecuteInitialLayoutPass();
+            Dispatcher.UIThread.RunJobs(null, TestContext.Current.CancellationToken);
+
+            var originalSelectedPage = tp.SelectedPage;
+
+            tp.PageTemplate = null;
+            root.LayoutManager.ExecuteLayoutPass();
+            Dispatcher.UIThread.RunJobs(null, TestContext.Current.CancellationToken);
+
+            Assert.Null(tp.SelectedPage);
+            Assert.Null(tp.CurrentPage);
+            Assert.Empty(((ILogical)tp).LogicalChildren);
+            Assert.DoesNotContain(originalSelectedPage!, ((ILogical)tp).LogicalChildren);
+        }
+
+        private static FuncControlTemplate<TabbedPage> CreateTabbedPageTemplate()
+        {
+            return new FuncControlTemplate<TabbedPage>((parent, scope) =>
+            {
+                var tc = new TabControl
+                {
+                    Name = "PART_TabControl",
+                    Template = new FuncControlTemplate<TabControl>((_, tcScope) =>
+                        new ItemsPresenter
+                        {
+                            Name = "PART_ItemsPresenter",
+                        }.RegisterInNameScope(tcScope)),
+                };
+                tc.RegisterInNameScope(scope);
+                return tc;
+            });
+        }
+
+        private static IEnumerable<DataItem> EnumerateItems(params DataItem[] items)
+        {
+            foreach (var item in items)
+                yield return item;
+        }
+    }
+
+    public class SwipeGestureTests : ScopedTestBase
+    {
+        [Fact]
+        public void SameGestureId_OnlyAdvancesOneTab()
+        {
+            var tp = CreateSwipeReadyTabbedPage();
+
+            var firstSwipe = new SwipeGestureEventArgs(7, new Vector(20, 0), default);
+            var repeatedSwipe = new SwipeGestureEventArgs(7, new Vector(20, 0), default);
+
+            tp.RaiseEvent(firstSwipe);
+            tp.RaiseEvent(repeatedSwipe);
+            Dispatcher.UIThread.RunJobs(null, TestContext.Current.CancellationToken);
+
+            Assert.True(firstSwipe.Handled);
+            Assert.False(repeatedSwipe.Handled);
+            Assert.Equal(1, tp.SelectedIndex);
+        }
+
+        [Fact]
+        public void NewGestureId_CanAdvanceAgain()
+        {
+            var tp = CreateSwipeReadyTabbedPage();
+
+            tp.RaiseEvent(new SwipeGestureEventArgs(7, new Vector(20, 0), default));
+            tp.RaiseEvent(new SwipeGestureEventArgs(8, new Vector(20, 0), default));
+            Dispatcher.UIThread.RunJobs(null, TestContext.Current.CancellationToken);
+
+            Assert.Equal(2, tp.SelectedIndex);
+        }
+
+        [Fact]
+        public void MouseSwipe_Advances_Tab()
+        {
+            var tp = CreateSwipeReadyTabbedPage();
+            var mouse = new MouseTestHelper();
+
+            mouse.Down(tp, position: new Point(200, 100));
+            mouse.Move(tp, new Point(160, 100));
+            mouse.Up(tp, position: new Point(160, 100));
+            Dispatcher.UIThread.RunJobs(null, TestContext.Current.CancellationToken);
+
+            Assert.Equal(1, tp.SelectedIndex);
+        }
+
+        private static TabbedPage CreateSwipeReadyTabbedPage()
+        {
+            var tp = new TabbedPage
+            {
+                IsGestureEnabled = true,
+                Width = 400,
+                Height = 300,
+                TabPlacement = TabPlacement.Top,
+                SelectedIndex = 0,
+                Pages = new AvaloniaList<Page>
+                {
+                    new ContentPage { Header = "A" },
+                    new ContentPage { Header = "B" },
+                    new ContentPage { Header = "C" }
+                },
+                Template = new FuncControlTemplate<TabbedPage>((parent, scope) =>
+                {
+                    var tabControl = new TabControl
+                    {
+                        Name = "PART_TabControl",
+                        ItemsSource = parent.Pages
+                    };
+                    scope.Register("PART_TabControl", tabControl);
+                    return tabControl;
+                })
+            };
+            tp.GestureRecognizers.OfType<SwipeGestureRecognizer>().First().IsMouseEnabled = true;
+
+            var root = new TestRoot
+            {
+                ClientSize = new Size(400, 300),
+                Child = tp
+            };
+            tp.ApplyTemplate();
+            Dispatcher.UIThread.RunJobs(null, TestContext.Current.CancellationToken);
+
+            return tp;
+        }
     }
 
     private sealed class TestableTabbedPage : TabbedPage
@@ -816,5 +1430,47 @@ public class TabbedPageTests
         public int CallFindNextEnabledTab(int start, int dir) => FindNextEnabledTab(start, dir);
 
         protected override void ApplySelectedIndex(int index) => base.ApplySelectedIndex(index);
+
+        public void SimulateKeyDown(Key key)
+        {
+            var e = new KeyEventArgs { RoutedEvent = InputElement.KeyDownEvent, Key = key };
+            OnKeyDown(e);
+        }
+
+        public bool SimulateKeyDownReturnsHandled(Key key)
+        {
+            var e = new KeyEventArgs { RoutedEvent = InputElement.KeyDownEvent, Key = key };
+            OnKeyDown(e);
+            return e.Handled;
+        }
+
+        public bool SimulateKeyDownWithModifiersReturnsHandled(Key key, KeyModifiers modifiers)
+        {
+            var e = new KeyEventArgs { RoutedEvent = InputElement.KeyDownEvent, Key = key, KeyModifiers = modifiers };
+            OnKeyDown(e);
+            return e.Handled;
+        }
+    }
+
+    public class VisualTreeLifecycleTests : ScopedTestBase
+    {
+        [Fact]
+        public void Detach_And_Reattach_CollectionChangedStillFiresPagesChanged()
+        {
+            var pages = new AvaloniaList<Page>();
+            var tp = new TabbedPage { Pages = pages };
+            var root = new TestRoot { Child = tp };
+
+            root.Child = null;
+            root.Child = tp;
+
+            int fireCount = 0;
+            tp.PagesChanged += (_, _) => fireCount++;
+
+            pages.Add(new ContentPage { Header = "A" });
+            pages.Add(new ContentPage { Header = "B" });
+
+            Assert.Equal(2, fireCount);
+        }
     }
 }
diff --git a/tests/Avalonia.Controls.UnitTests/VirtualizingCarouselPanelTests.cs b/tests/Avalonia.Controls.UnitTests/VirtualizingCarouselPanelTests.cs
index cc506dd7a9..7a1e735d95 100644
--- a/tests/Avalonia.Controls.UnitTests/VirtualizingCarouselPanelTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/VirtualizingCarouselPanelTests.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections;
+using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
 using System.Threading;
@@ -9,7 +10,10 @@ using Avalonia.Collections;
 using Avalonia.Controls.Presenters;
 using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Templates;
+using Avalonia.Input;
+using Avalonia.Input.GestureRecognizers;
 using Avalonia.Layout;
+using Avalonia.Media;
 using Avalonia.Threading;
 using Avalonia.UnitTests;
 using Avalonia.VisualTree;
@@ -34,6 +38,37 @@ namespace Avalonia.Controls.UnitTests
             Assert.Equal("foo", container.Content);
         }
 
+        [Fact]
+        public void Initial_SelectedIndex_Is_Displayed()
+        {
+            using var app = Start();
+            var items = new[] { "foo", "bar" };
+            var (target, _) = CreateTarget(items, selectedIndex: 1);
+
+            Assert.Single(target.Children);
+            var container = Assert.IsType<ContentPresenter>(target.Children[0]);
+            Assert.Equal("bar", container.Content);
+        }
+
+        [Fact]
+        public void Refreshing_Swipe_Wiring_Reuses_A_Single_Recognizer()
+        {
+            using var app = Start();
+            var items = new[] { "foo", "bar" };
+            var (target, carousel) = CreateTarget(items);
+
+            carousel.IsSwipeEnabled = true;
+            carousel.PageTransition = new PageSlide(TimeSpan.FromMilliseconds(1));
+            carousel.IsSwipeEnabled = false;
+            carousel.IsSwipeEnabled = true;
+            carousel.PageTransition = null;
+            carousel.PageTransition = new PageSlide(TimeSpan.FromMilliseconds(1));
+
+            var recognizers = target.GestureRecognizers.OfType<SwipeGestureRecognizer>().ToArray();
+            var recognizer = Assert.Single(recognizers);
+            Assert.True(recognizer.IsEnabled);
+        }
+
         [Fact]
         public void Displays_Next_Item()
         {
@@ -135,6 +170,86 @@ namespace Avalonia.Controls.UnitTests
             });
         }
 
+        [Fact]
+        public void ViewportFraction_Centers_Selected_Item_And_Peeks_Neighbors()
+        {
+            using var app = Start();
+            var items = new[] { "foo", "bar", "baz" };
+            var (target, _) = CreateTarget(items, viewportFraction: 0.8, clientSize: new Size(400, 300));
+
+            var realized = target.GetRealizedContainers()!
+                .OfType<ContentPresenter>()
+                .ToDictionary(x => (string)x.Content!);
+
+            Assert.Equal(2, realized.Count);
+            Assert.Equal(40d, realized["foo"].Bounds.X, 6);
+            Assert.Equal(320d, realized["foo"].Bounds.Width, 6);
+            Assert.Equal(360d, realized["bar"].Bounds.X, 6);
+        }
+
+        [Fact]
+        public void ViewportFraction_OneThird_Shows_Three_Full_Items()
+        {
+            using var app = Start();
+            var items = new[] { "foo", "bar", "baz", "qux" };
+            var (target, carousel) = CreateTarget(items, viewportFraction: 1d / 3d, clientSize: new Size(300, 120));
+
+            carousel.SelectedIndex = 1;
+            Layout(target);
+
+            var realized = target.GetRealizedContainers()!
+                .OfType<ContentPresenter>()
+                .ToDictionary(x => (string)x.Content!);
+
+            Assert.Equal(3, realized.Count);
+            Assert.Equal(0d, realized["foo"].Bounds.X, 6);
+            Assert.Equal(100d, realized["bar"].Bounds.X, 6);
+            Assert.Equal(200d, realized["baz"].Bounds.X, 6);
+            Assert.Equal(100d, realized["bar"].Bounds.Width, 6);
+        }
+
+        [Fact]
+        public void Changing_SelectedIndex_Repositions_Fractional_Viewport()
+        {
+            using var app = Start();
+            var items = new[] { "foo", "bar", "baz" };
+            var (target, carousel) = CreateTarget(items, viewportFraction: 0.8, clientSize: new Size(400, 300));
+
+            carousel.SelectedIndex = 1;
+            Layout(target);
+
+            var realized = target.GetRealizedContainers()!
+                .OfType<ContentPresenter>()
+                .ToDictionary(x => (string)x.Content!);
+
+            Assert.Equal(40d, realized["bar"].Bounds.X, 6);
+            Assert.Equal(-280d, realized["foo"].Bounds.X, 6);
+        }
+
+        [Fact]
+        public void Changing_ViewportFraction_Does_Not_Change_Selected_Item()
+        {
+            using var app = Start();
+            var items = new[] { "foo", "bar", "baz" };
+            var (target, carousel) = CreateTarget(items, viewportFraction: 0.72, clientSize: new Size(400, 300));
+
+            carousel.WrapSelection = true;
+            carousel.SelectedIndex = 2;
+            Layout(target);
+
+            carousel.ViewportFraction = 1d;
+            Layout(target);
+
+            var visible = target.Children
+                .OfType<ContentPresenter>()
+                .Where(x => x.IsVisible)
+                .ToList();
+
+            Assert.Single(visible);
+            Assert.Equal("baz", visible[0].Content);
+            Assert.Equal(2, carousel.SelectedIndex);
+        }
+
         public class Transitions : ScopedTestBase
         {
             [Fact]
@@ -173,7 +288,7 @@ namespace Avalonia.Controls.UnitTests
             }
 
             [Fact]
-            public void Changing_SelectedIndex_transitions_forward_cycle()
+            public void Changing_SelectedIndex_From_First_To_Last_Transitions_Forward()
             {
                 using var app = Start();
                 Dispatcher.UIThread.Invoke(() => // This sets up a proper sync context
@@ -181,28 +296,23 @@ namespace Avalonia.Controls.UnitTests
                     var items = new Control[] { new Button(), new Canvas(), new Label() };
                     var transition = new Mock<IPageTransition>();
                     var (target, carousel) = CreateTarget(items, transition.Object);
-                    var cycleindexes = new[] { 1, 2, 0 };
 
-                    for (int cycleIndex = 0; cycleIndex < cycleindexes.Length; cycleIndex++)
-                    {
-                        carousel.SelectedIndex = cycleindexes[cycleIndex];
-                        Layout(target);
-                        
-                        Dispatcher.UIThread.RunJobs();
-
-                        var index = cycleIndex;
-                        transition.Verify(x => x.Start(
-                                index > 0 ? items[cycleindexes[index - 1]] : items[0],
-                                items[cycleindexes[index]],
-                                true,
-                                It.IsAny<CancellationToken>()),
-                            Times.Once);
-                    }
+                    carousel.SelectedIndex = 2;
+                    Layout(target);
+
+                    Dispatcher.UIThread.RunJobs();
+
+                    transition.Verify(x => x.Start(
+                            items[0],
+                            items[2],
+                            true,
+                            It.IsAny<CancellationToken>()),
+                        Times.Once);
                 });
             }
 
             [Fact]
-            public void Changing_SelectedIndex_transitions_backward_cycle()
+            public void Changing_SelectedIndex_From_Last_To_First_Transitions_Backward()
             {
                 using var app = Start();
                 Dispatcher.UIThread.Invoke(() => // This sets up a proper sync context
@@ -211,23 +321,20 @@ namespace Avalonia.Controls.UnitTests
                     var transition = new Mock<IPageTransition>();
                     var (target, carousel) = CreateTarget(items, transition.Object);
 
-                    var cycleindexes = new[] { 2, 1, 0 };
+                    carousel.SelectedIndex = 2;
+                    Layout(target);
+                    Dispatcher.UIThread.RunJobs();
 
-                    for (int cycleIndex = 0; cycleIndex < cycleindexes.Length; cycleIndex++)
-                    {
-                        carousel.SelectedIndex = cycleindexes[cycleIndex];
-                        Layout(target);
-
-                        Dispatcher.UIThread.RunJobs();
-                        
-                        var index = cycleIndex;
-                        transition.Verify(x => x.Start(
-                                index > 0 ? items[cycleindexes[index - 1]] : items[0],
-                                items[cycleindexes[index]],
-                                false,
-                                It.IsAny<CancellationToken>()),
-                            Times.Once);
-                    }
+                    carousel.SelectedIndex = 0;
+                    Layout(target);
+                    Dispatcher.UIThread.RunJobs();
+
+                    transition.Verify(x => x.Start(
+                            items[2],
+                            items[0],
+                            false,
+                            It.IsAny<CancellationToken>()),
+                        Times.Once);
                 });
             }
 
@@ -292,22 +399,93 @@ namespace Avalonia.Controls.UnitTests
 
                 Assert.True(cancelationToken!.Value.IsCancellationRequested);
             }
+
+            [Fact]
+            public void Completed_Transition_Is_Flushed_Before_Starting_Next_Transition()
+            {
+                using var app = Start();
+                using var sync = UnitTestSynchronizationContext.Begin();
+                var items = new Control[] { new Button(), new Canvas(), new Label() };
+                var transition = new Mock<IPageTransition>();
+
+                transition.Setup(x => x.Start(
+                        It.IsAny<Visual>(),
+                        It.IsAny<Visual>(),
+                        It.IsAny<bool>(),
+                        It.IsAny<CancellationToken>()))
+                    .Returns(Task.CompletedTask);
+
+                var (target, carousel) = CreateTarget(items, transition.Object);
+
+                carousel.SelectedIndex = 1;
+                Layout(target);
+
+                carousel.SelectedIndex = 2;
+                Layout(target);
+
+                transition.Verify(x => x.Start(
+                        items[0],
+                        items[1],
+                        true,
+                        It.IsAny<CancellationToken>()),
+                    Times.Once);
+                transition.Verify(x => x.Start(
+                        items[1],
+                        items[2],
+                        true,
+                        It.IsAny<CancellationToken>()),
+                    Times.Once);
+
+                sync.ExecutePostedCallbacks();
+            }
+
+            [Fact]
+            public void Interrupted_Transition_Resets_Current_Page_Before_Starting_Next_Transition()
+            {
+                using var app = Start();
+                var items = new Control[] { new Button(), new Canvas(), new Label() };
+                var transition = new DirtyStateTransition();
+                var (target, carousel) = CreateTarget(items, transition);
+
+                carousel.SelectedIndex = 1;
+                Layout(target);
+
+                carousel.SelectedIndex = 2;
+                Layout(target);
+
+                Assert.Equal(2, transition.Starts.Count);
+                Assert.Equal(1d, transition.Starts[1].FromOpacity);
+                Assert.Null(transition.Starts[1].FromTransform);
+            }
         }
 
         private static IDisposable Start() => UnitTestApplication.Start(TestServices.MockPlatformRenderInterface);
 
         private static (VirtualizingCarouselPanel, Carousel) CreateTarget(
             IEnumerable items,
-            IPageTransition? transition = null)
+            IPageTransition? transition = null,
+            int? selectedIndex = null,
+            double viewportFraction = 1d,
+            Size? clientSize = null)
         {
+            var size = clientSize ?? new Size(400, 300);
             var carousel = new Carousel
             {
                 ItemsSource = items,
                 Template = CarouselTemplate(),
                 PageTransition = transition,
+                ViewportFraction = viewportFraction,
+                Width = size.Width,
+                Height = size.Height,
             };
 
-            var root = new TestRoot(carousel);
+            if (selectedIndex.HasValue)
+                carousel.SelectedIndex = selectedIndex.Value;
+
+            var root = new TestRoot(carousel)
+            {
+                ClientSize = size,
+            };
             root.LayoutManager.ExecuteInitialLayoutPass();
             return ((VirtualizingCarouselPanel)carousel.Presenter!.Panel!, carousel);
         }
@@ -345,5 +523,619 @@ namespace Avalonia.Controls.UnitTests
         }
 
         private static void Layout(Control c) => c.GetLayoutManager()?.ExecuteLayoutPass();
+
+        private sealed class DirtyStateTransition : IPageTransition
+        {
+            public List<(double FromOpacity, ITransform? FromTransform)> Starts { get; } = new();
+
+            public Task Start(Visual? from, Visual? to, bool forward, CancellationToken cancellationToken)
+            {
+                Starts.Add((from?.Opacity ?? 1d, from?.RenderTransform));
+
+                if (to is not null)
+                {
+                    to.Opacity = 0.25;
+                    to.RenderTransform = new TranslateTransform { X = 50 };
+                }
+
+                return Task.Delay(Timeout.Infinite, cancellationToken);
+            }
+        }
+
+        public class WrapSelectionTests : ScopedTestBase
+        {
+            [Fact]
+            public void Next_Wraps_To_First_Item_When_WrapSelection_Enabled()
+            {
+                using var app = Start();
+                var items = new[] { "foo", "bar", "baz" };
+                var (target, carousel) = CreateTarget(items);
+
+                carousel.WrapSelection = true;
+                carousel.SelectedIndex = 2; // Last item
+                Layout(target);
+
+                carousel.Next();
+                Layout(target);
+
+                Assert.Equal(0, carousel.SelectedIndex);
+            }
+
+            [Fact]
+            public void Next_Does_Not_Wrap_When_WrapSelection_Disabled()
+            {
+                using var app = Start();
+                var items = new[] { "foo", "bar", "baz" };
+                var (target, carousel) = CreateTarget(items);
+
+                carousel.WrapSelection = false;
+                carousel.SelectedIndex = 2; // Last item
+                Layout(target);
+
+                carousel.Next();
+                Layout(target);
+
+                Assert.Equal(2, carousel.SelectedIndex); // Should stay at last item
+            }
+
+            [Fact]
+            public void Previous_Wraps_To_Last_Item_When_WrapSelection_Enabled()
+            {
+                using var app = Start();
+                var items = new[] { "foo", "bar", "baz" };
+                var (target, carousel) = CreateTarget(items);
+
+                carousel.WrapSelection = true;
+                carousel.SelectedIndex = 0; // First item
+                Layout(target);
+
+                carousel.Previous();
+                Layout(target);
+
+                Assert.Equal(2, carousel.SelectedIndex); // Should wrap to last item
+            }
+
+            [Fact]
+            public void Previous_Does_Not_Wrap_When_WrapSelection_Disabled()
+            {
+                using var app = Start();
+                var items = new[] { "foo", "bar", "baz" };
+                var (target, carousel) = CreateTarget(items);
+
+                carousel.WrapSelection = false;
+                carousel.SelectedIndex = 0; // First item
+                Layout(target);
+
+                carousel.Previous();
+                Layout(target);
+
+                Assert.Equal(0, carousel.SelectedIndex); // Should stay at first item
+            }
+
+            [Fact]
+            public void WrapSelection_Works_With_Two_Items()
+            {
+                using var app = Start();
+                var items = new[] { "foo", "bar" };
+                var (target, carousel) = CreateTarget(items);
+
+                carousel.WrapSelection = true;
+                carousel.SelectedIndex = 1;
+                Layout(target);
+
+                carousel.Next();
+                Layout(target);
+
+                Assert.Equal(0, carousel.SelectedIndex);
+
+                carousel.Previous();
+                Layout(target);
+
+                Assert.Equal(1, carousel.SelectedIndex);
+            }
+
+            [Fact]
+            public void WrapSelection_Does_Not_Apply_To_Single_Item()
+            {
+                using var app = Start();
+                var items = new[] { "foo" };
+                var (target, carousel) = CreateTarget(items);
+
+                carousel.WrapSelection = true;
+                carousel.SelectedIndex = 0;
+                Layout(target);
+
+                carousel.Next();
+                Layout(target);
+
+                Assert.Equal(0, carousel.SelectedIndex);
+
+                carousel.Previous();
+                Layout(target);
+
+                Assert.Equal(0, carousel.SelectedIndex);
+            }
+        }
+
+        public class Gestures : ScopedTestBase
+        {
+            [Fact]
+            public void Swiping_Forward_Realizes_Next_Item()
+            {
+                using var app = Start();
+                var items = new[] { "foo", "bar" };
+                var (panel, carousel) = CreateTarget(items);
+                carousel.IsSwipeEnabled = true;
+
+                var e = new SwipeGestureEventArgs(1, new Vector(10, 0), default);
+                panel.RaiseEvent(e);
+
+                Assert.True(carousel.IsSwiping);
+                Assert.Equal(2, panel.Children.Count);
+                var target = panel.Children[1] as Control;
+                Assert.NotNull(target);
+                Assert.True(target.IsVisible);
+                Assert.Equal("bar", ((target as ContentPresenter)?.Content));
+            }
+
+            [Fact]
+            public void Swiping_Backward_At_Start_RubberBands_When_WrapSelection_False()
+            {
+                using var app = Start();
+                var items = new[] { "foo", "bar" };
+                var (panel, carousel) = CreateTarget(items);
+                carousel.IsSwipeEnabled = true;
+                carousel.WrapSelection = false;
+
+                var e = new SwipeGestureEventArgs(1, new Vector(-10, 0), default);
+                panel.RaiseEvent(e);
+
+                Assert.True(carousel.IsSwiping);
+                Assert.Single(panel.Children);
+            }
+
+            [Fact]
+            public void Swiping_Backward_At_Start_Wraps_When_WrapSelection_True()
+            {
+                using var app = Start();
+                var items = new[] { "foo", "bar", "baz" };
+                var (panel, carousel) = CreateTarget(items);
+                carousel.IsSwipeEnabled = true;
+                carousel.WrapSelection = true;
+
+                var e = new SwipeGestureEventArgs(1, new Vector(-10, 0), default);
+                panel.RaiseEvent(e);
+
+                Assert.True(carousel.IsSwiping);
+                Assert.Equal(2, panel.Children.Count);
+                var target = panel.Children[1] as Control;
+                Assert.Equal("baz", ((target as ContentPresenter)?.Content));
+            }
+
+            [Fact]
+            public void ViewportFraction_Swiping_Backward_At_Start_Wraps_When_WrapSelection_True()
+            {
+                var clock = new MockGlobalClock();
+
+                using var app = UnitTestApplication.Start(
+                    TestServices.MockPlatformRenderInterface.With(globalClock: clock));
+                using var sync = UnitTestSynchronizationContext.Begin();
+
+                var items = new[] { "foo", "bar", "baz" };
+                var (panel, carousel) = CreateTarget(items, viewportFraction: 0.8);
+                carousel.IsSwipeEnabled = true;
+                carousel.WrapSelection = true;
+                Layout(panel);
+
+                panel.RaiseEvent(new SwipeGestureEventArgs(1, new Vector(-120, 0), default));
+
+                Assert.True(carousel.IsSwiping);
+                Assert.Contains(panel.Children.OfType<ContentPresenter>(), x => Equals(x.Content, "baz"));
+
+                panel.RaiseEvent(new SwipeGestureEndedEventArgs(1, default));
+
+                clock.Pulse(TimeSpan.Zero);
+                clock.Pulse(TimeSpan.FromSeconds(1));
+                sync.ExecutePostedCallbacks();
+                Dispatcher.UIThread.RunJobs(null, TestContext.Current.CancellationToken);
+
+                Assert.Equal(2, carousel.SelectedIndex);
+            }
+
+            [Fact]
+            public void Swiping_Forward_At_End_RubberBands_When_WrapSelection_False()
+            {
+                using var app = Start();
+                var items = new[] { "foo", "bar" };
+                var (panel, carousel) = CreateTarget(items);
+                carousel.IsSwipeEnabled = true;
+                carousel.WrapSelection = false;
+                carousel.SelectedIndex = 1;
+
+                Layout(panel);
+                Layout(panel);
+
+                Assert.Equal(2, ((IReadOnlyList<string>?)carousel.ItemsSource)?.Count);
+                Assert.Equal(1, carousel.SelectedIndex);
+                Assert.False(carousel.WrapSelection, "WrapSelection should be false");
+
+                var container = Assert.IsType<ContentPresenter>(panel.Children[0]);
+                Assert.Equal("bar", container.Content);
+
+                var e = new SwipeGestureEventArgs(1, new Vector(10, 0), default);
+                panel.RaiseEvent(e);
+
+                Assert.True(carousel.IsSwiping);
+                Assert.Single(panel.Children);
+            }
+
+            [Fact]
+            public void Swiping_Locks_To_Dominant_Axis()
+            {
+                using var app = Start();
+                var items = new[] { "foo", "bar" };
+                var (panel, carousel) = CreateTarget(items, new CrossFade(TimeSpan.FromSeconds(1)));
+                carousel.IsSwipeEnabled = true;
+
+                var e = new SwipeGestureEventArgs(1, new Vector(10, 2), default);
+                panel.RaiseEvent(e);
+
+                Assert.True(carousel.IsSwiping);
+            }
+
+            [Fact]
+            public void Swipe_Completion_Does_Not_Update_With_Same_From_And_To()
+            {
+                var clock = new MockGlobalClock();
+
+                using var app = UnitTestApplication.Start(
+                    TestServices.MockPlatformRenderInterface.With(globalClock: clock));
+                using var sync = UnitTestSynchronizationContext.Begin();
+
+                var items = new[] { "foo", "bar" };
+                var transition = new TrackingInteractiveTransition();
+                var (panel, carousel) = CreateTarget(items, transition);
+                carousel.IsSwipeEnabled = true;
+
+                panel.RaiseEvent(new SwipeGestureEventArgs(1, new Vector(1000, 0), default));
+                panel.RaiseEvent(new SwipeGestureEndedEventArgs(1, new Vector(1000, 0)));
+
+                clock.Pulse(TimeSpan.Zero);
+                clock.Pulse(TimeSpan.FromSeconds(1));
+                sync.ExecutePostedCallbacks();
+                Dispatcher.UIThread.RunJobs(null, TestContext.Current.CancellationToken);
+
+                Assert.True(transition.UpdateCallCount > 0);
+                Assert.False(transition.SawAliasedUpdate);
+                Assert.Equal(1d, transition.LastProgress);
+                Assert.Equal(1, carousel.SelectedIndex);
+            }
+
+            [Fact]
+            public void Swipe_Completion_Keeps_Target_Final_Interactive_Visual_State()
+            {
+                var clock = new MockGlobalClock();
+
+                using var app = UnitTestApplication.Start(
+                    TestServices.MockPlatformRenderInterface.With(globalClock: clock));
+                using var sync = UnitTestSynchronizationContext.Begin();
+
+                var items = new[] { "foo", "bar" };
+                var transition = new TransformTrackingInteractiveTransition();
+                var (panel, carousel) = CreateTarget(items, transition);
+                carousel.IsSwipeEnabled = true;
+
+                panel.RaiseEvent(new SwipeGestureEventArgs(1, new Vector(1000, 0), default));
+                panel.RaiseEvent(new SwipeGestureEndedEventArgs(1, new Vector(1000, 0)));
+
+                clock.Pulse(TimeSpan.Zero);
+                clock.Pulse(TimeSpan.FromSeconds(1));
+                sync.ExecutePostedCallbacks();
+                Dispatcher.UIThread.RunJobs(null, TestContext.Current.CancellationToken);
+
+                Assert.Equal(1, carousel.SelectedIndex);
+                var realized = Assert.Single(panel.Children.OfType<ContentPresenter>(), x => Equals(x.Content, "bar"));
+                Assert.NotNull(transition.LastTargetTransform);
+                Assert.Same(transition.LastTargetTransform, realized.RenderTransform);
+            }
+
+            [Fact]
+            public void Swipe_Completion_Hides_Outgoing_Page_Before_Resetting_Visual_State()
+            {
+                var clock = new MockGlobalClock();
+
+                using var app = UnitTestApplication.Start(
+                    TestServices.MockPlatformRenderInterface.With(globalClock: clock));
+                using var sync = UnitTestSynchronizationContext.Begin();
+
+                var items = new[] { "foo", "bar" };
+                var transition = new OutgoingTransformTrackingInteractiveTransition();
+                var (panel, carousel) = CreateTarget(items, transition);
+                carousel.IsSwipeEnabled = true;
+
+                var outgoing = Assert.Single(panel.Children.OfType<ContentPresenter>(), x => Equals(x.Content, "foo"));
+                bool? hiddenWhenReset = null;
+                outgoing.PropertyChanged += (_, args) =>
+                {
+                    if (args.Property == Visual.RenderTransformProperty &&
+                        args.GetNewValue<ITransform?>() is null)
+                    {
+                        hiddenWhenReset = !outgoing.IsVisible;
+                    }
+                };
+
+                panel.RaiseEvent(new SwipeGestureEventArgs(1, new Vector(1000, 0), default));
+                panel.RaiseEvent(new SwipeGestureEndedEventArgs(1, new Vector(1000, 0)));
+
+                clock.Pulse(TimeSpan.Zero);
+                clock.Pulse(TimeSpan.FromSeconds(1));
+                sync.ExecutePostedCallbacks();
+                Dispatcher.UIThread.RunJobs(null, TestContext.Current.CancellationToken);
+
+                Assert.True(hiddenWhenReset);
+            }
+
+            [Fact]
+            public void RubberBand_Swipe_Release_Animates_Back_Through_Intermediate_Progress()
+            {
+                var clock = new MockGlobalClock();
+
+                using var app = UnitTestApplication.Start(
+                    TestServices.MockPlatformRenderInterface.With(globalClock: clock));
+                using var sync = UnitTestSynchronizationContext.Begin();
+
+                var items = new[] { "foo", "bar" };
+                var transition = new ProgressTrackingInteractiveTransition();
+                var (panel, carousel) = CreateTarget(items, transition);
+                carousel.IsSwipeEnabled = true;
+                carousel.WrapSelection = false;
+
+                panel.RaiseEvent(new SwipeGestureEventArgs(1, new Vector(-100, 0), default));
+
+                var releaseStartProgress = transition.Progresses[^1];
+                var updatesBeforeRelease = transition.Progresses.Count;
+
+                panel.RaiseEvent(new SwipeGestureEndedEventArgs(1, default));
+
+                clock.Pulse(TimeSpan.Zero);
+                clock.Pulse(TimeSpan.FromSeconds(0.1));
+                sync.ExecutePostedCallbacks();
+                Dispatcher.UIThread.RunJobs(null, TestContext.Current.CancellationToken);
+
+                var postReleaseProgresses = transition.Progresses.Skip(updatesBeforeRelease).ToArray();
+
+                Assert.Contains(postReleaseProgresses, p => p > 0 && p < releaseStartProgress);
+
+                clock.Pulse(TimeSpan.FromSeconds(1));
+                sync.ExecutePostedCallbacks();
+                Dispatcher.UIThread.RunJobs(null, TestContext.Current.CancellationToken);
+
+                Assert.Equal(0d, transition.Progresses[^1]);
+                Assert.Equal(0, carousel.SelectedIndex);
+            }
+
+            [Fact]
+            public void ViewportFraction_SelectedIndex_Change_Drives_Progress_Updates()
+            {
+                var clock = new MockGlobalClock();
+
+                using var app = UnitTestApplication.Start(
+                    TestServices.MockPlatformRenderInterface.With(globalClock: clock));
+                using var sync = UnitTestSynchronizationContext.Begin();
+
+                var items = new[] { "foo", "bar", "baz" };
+                var transition = new ProgressTrackingInteractiveTransition();
+                var (panel, carousel) = CreateTarget(items, transition, viewportFraction: 0.8);
+
+                carousel.SelectedIndex = 1;
+
+                clock.Pulse(TimeSpan.Zero);
+                clock.Pulse(TimeSpan.FromSeconds(0.1));
+                clock.Pulse(TimeSpan.FromSeconds(1));
+                sync.ExecutePostedCallbacks();
+                Dispatcher.UIThread.RunJobs(null, TestContext.Current.CancellationToken);
+
+                Assert.NotEmpty(transition.Progresses);
+                Assert.Contains(transition.Progresses, p => p > 0 && p < 1);
+                Assert.Equal(1d, transition.Progresses[^1]);
+                Assert.Equal(1, carousel.SelectedIndex);
+            }
+
+            private sealed class TrackingInteractiveTransition : IProgressPageTransition
+            {
+                public int UpdateCallCount { get; private set; }
+                public bool SawAliasedUpdate { get; private set; }
+                public double LastProgress { get; private set; }
+
+                public Task Start(Visual? from, Visual? to, bool forward, CancellationToken cancellationToken)
+                    => Task.CompletedTask;
+
+                public void Update(
+                    double progress,
+                    Visual? from,
+                    Visual? to,
+                    bool forward,
+                    double pageLength,
+                    IReadOnlyList<PageTransitionItem> visibleItems)
+                {
+                    UpdateCallCount++;
+                    LastProgress = progress;
+
+                    if (from is not null && ReferenceEquals(from, to))
+                        SawAliasedUpdate = true;
+                }
+
+                public void Reset(Visual visual)
+                {
+                    visual.RenderTransform = null;
+                    visual.Opacity = 1;
+                    visual.ZIndex = 0;
+                    visual.Clip = null;
+                }
+            }
+
+            private sealed class ProgressTrackingInteractiveTransition : IProgressPageTransition
+            {
+                public List<double> Progresses { get; } = new();
+
+                public Task Start(Visual? from, Visual? to, bool forward, CancellationToken cancellationToken)
+                    => Task.CompletedTask;
+
+                public void Update(
+                    double progress,
+                    Visual? from,
+                    Visual? to,
+                    bool forward,
+                    double pageLength,
+                    IReadOnlyList<PageTransitionItem> visibleItems)
+                {
+                    Progresses.Add(progress);
+                }
+
+                public void Reset(Visual visual)
+                {
+                    visual.RenderTransform = null;
+                    visual.Opacity = 1;
+                    visual.ZIndex = 0;
+                    visual.Clip = null;
+                }
+            }
+
+            private sealed class TransformTrackingInteractiveTransition : IProgressPageTransition
+            {
+                public TransformGroup? LastTargetTransform { get; private set; }
+
+                public Task Start(Visual? from, Visual? to, bool forward, CancellationToken cancellationToken)
+                    => Task.CompletedTask;
+
+                public void Update(
+                    double progress,
+                    Visual? from,
+                    Visual? to,
+                    bool forward,
+                    double pageLength,
+                    IReadOnlyList<PageTransitionItem> visibleItems)
+                {
+                    if (to is not Control target)
+                        return;
+
+                    if (target.RenderTransform is not TransformGroup group)
+                    {
+                        group = new TransformGroup
+                        {
+                            Children =
+                            {
+                                new ScaleTransform(),
+                                new TranslateTransform()
+                            }
+                        };
+                        target.RenderTransform = group;
+                    }
+
+                    var scale = Assert.IsType<ScaleTransform>(group.Children[0]);
+                    var translate = Assert.IsType<TranslateTransform>(group.Children[1]);
+                    scale.ScaleX = scale.ScaleY = 0.9 + (0.1 * progress);
+                    translate.X = 100 * (1 - progress);
+                    LastTargetTransform = group;
+                }
+
+                public void Reset(Visual visual)
+                {
+                    visual.RenderTransform = null;
+                }
+            }
+
+            private sealed class OutgoingTransformTrackingInteractiveTransition : IProgressPageTransition
+            {
+                public Task Start(Visual? from, Visual? to, bool forward, CancellationToken cancellationToken)
+                    => Task.CompletedTask;
+
+                public void Update(
+                    double progress,
+                    Visual? from,
+                    Visual? to,
+                    bool forward,
+                    double pageLength,
+                    IReadOnlyList<PageTransitionItem> visibleItems)
+                {
+                    if (from is Control source)
+                        source.RenderTransform = new TranslateTransform(100 * progress, 0);
+
+                    if (to is Control target)
+                        target.RenderTransform = new TranslateTransform(100 * (1 - progress), 0);
+                }
+
+                public void Reset(Visual visual)
+                {
+                    visual.RenderTransform = null;
+                }
+            }
+
+            [Fact]
+            public void Vertical_Swipe_Forward_Realizes_Next_Item()
+            {
+                using var app = Start();
+                var items = new[] { "foo", "bar" };
+                var transition = new PageSlide(TimeSpan.FromSeconds(1), PageSlide.SlideAxis.Vertical);
+                var (panel, carousel) = CreateTarget(items, transition);
+                carousel.IsSwipeEnabled = true;
+
+                var e = new SwipeGestureEventArgs(1, new Vector(0, 10), default);
+                panel.RaiseEvent(e);
+
+                Assert.True(carousel.IsSwiping);
+                Assert.Equal(2, panel.Children.Count);
+                var target = panel.Children[1] as ContentPresenter;
+                Assert.NotNull(target);
+                Assert.Equal("bar", target.Content);
+            }
+
+            [Fact]
+            public void New_Swipe_Interrupts_Active_Completion_Animation()
+            {
+                var clock = new MockGlobalClock();
+
+                using var app = UnitTestApplication.Start(
+                    TestServices.MockPlatformRenderInterface.With(globalClock: clock));
+                using var sync = UnitTestSynchronizationContext.Begin();
+
+                var items = new[] { "foo", "bar", "baz" };
+                var transition = new TrackingInteractiveTransition();
+                var (panel, carousel) = CreateTarget(items, transition);
+                carousel.IsSwipeEnabled = true;
+
+                panel.RaiseEvent(new SwipeGestureEventArgs(1, new Vector(1000, 0), default));
+                panel.RaiseEvent(new SwipeGestureEndedEventArgs(1, new Vector(1000, 0)));
+
+                clock.Pulse(TimeSpan.Zero);
+                clock.Pulse(TimeSpan.FromMilliseconds(50));
+                sync.ExecutePostedCallbacks();
+
+                Assert.Equal(0, carousel.SelectedIndex);
+
+                panel.RaiseEvent(new SwipeGestureEventArgs(2, new Vector(10, 0), default));
+
+                Assert.True(carousel.IsSwiping);
+                Assert.Equal(1, carousel.SelectedIndex);
+            }
+
+            [Fact]
+            public void Swipe_With_NonInteractive_Transition_Does_Not_Crash()
+            {
+                using var app = Start();
+                var items = new[] { "foo", "bar" };
+                var transition = new Mock<IPageTransition>();
+                transition.Setup(x => x.Start(It.IsAny<Visual>(), It.IsAny<Visual>(), It.IsAny<bool>(), It.IsAny<CancellationToken>()))
+                    .Returns(Task.CompletedTask);
+                var (panel, carousel) = CreateTarget(items, transition.Object);
+                carousel.IsSwipeEnabled = true;
+
+                var e = new SwipeGestureEventArgs(1, new Vector(10, 0), default);
+                panel.RaiseEvent(e);
+
+                Assert.True(carousel.IsSwiping);
+                Assert.Equal(2, panel.Children.Count);
+            }
+        }
     }
 }
diff --git a/tests/Avalonia.Controls.UnitTests/VirtualizingStackPanelTests.cs b/tests/Avalonia.Controls.UnitTests/VirtualizingStackPanelTests.cs
index 36c15f76bb..873da11c67 100644
--- a/tests/Avalonia.Controls.UnitTests/VirtualizingStackPanelTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/VirtualizingStackPanelTests.cs
@@ -632,6 +632,69 @@ namespace Avalonia.Controls.UnitTests
             Assert.Equal(new Vector(0, 0), scroll.Offset);
         }
 
+        [Fact]
+        public void Shrinking_Viewport_Then_Growing_Back_Triggers_Remeasure()
+        {
+            // Regression test for stale _extendedViewport comparison in OnEffectiveViewportChanged.
+            //
+            // When the viewport shrinks (e.g., ComboBox popup shrinks during filtering),
+            // OnEffectiveViewportChanged doesn't trigger a measure (needsMeasure=false because
+            // the smaller viewport is within the old extended viewport). The _extendedViewport
+            // comparison baseline is NOT updated. When the viewport later grows back,
+            // OnEffectiveViewportChanged compares against the stale large _extendedViewport,
+            // concludes "no significant change", and skips the measure. This prevents item
+            // realization when the only measure trigger is OnEffectiveViewportChanged.
+            //
+            // The fix uses a separate _lastKnownExtendedViewport that is always updated,
+            // so the comparison correctly detects viewport growth after a shrink.
+            //
+            // Key: ScrollContentPresenter passes infinite height for vertical scroll, so
+            // the panel's MeasureOverride is NOT called from the layout cascade when only
+            // the root size changes. OnEffectiveViewportChanged is the sole measure trigger.
+            using var app = App();
+
+            var items = Enumerable.Range(0, 20).Select(x => $"Item {x}");
+            var (target, scroll, itemsControl) =
+               CreateUnrootedTarget<ItemsControl, VirtualizingStackPanelCountingMeasureArrange>(
+                  items: items, bufferFactor: 0);
+            var root = CreateRoot(itemsControl, new Size(100, 100));
+
+            root.LayoutManager.ExecuteInitialLayoutPass();
+
+            // Initial state: viewport 0-100, 10 items visible, _extendedViewport = (0,0,100,100)
+            AssertRealizedItems(target, itemsControl, 0, 10);
+
+            // Shrink viewport (simulates popup shrinking when items are filtered).
+            // Panel MeasureOverride is NOT called (ScrollContentPresenter passes infinite height).
+            // OnEffectiveViewportChanged fires with small viewport but needsMeasure=false
+            // because the small viewport is within the old _extendedViewport.
+            root.ClientSize = new Size(100, 10);
+            root.InvalidateMeasure();
+            Layout(target);
+
+            // Reset counters after shrink
+            target.ResetMeasureArrangeCounters();
+
+            // Grow viewport back (simulates popup growing when filter is removed).
+            // Panel MeasureOverride is NOT called from layout cascade (same infinite constraint).
+            // OnEffectiveViewportChanged is the ONLY path to trigger a remeasure.
+            root.ClientSize = new Size(100, 100);
+            root.InvalidateMeasure();
+            Layout(target);
+
+            // Without fix: OnEffectiveViewportChanged compares new viewport (0-100) against
+            // stale _extendedViewport (0-100, never updated during shrink). Sees no change.
+            // needsMeasure=false. No remeasure triggered. Measure count = 0.
+            //
+            // With fix: compares against _lastKnownExtendedViewport (0-10, updated during
+            // shrink). Detects that viewport grew past it (100 > 10). needsMeasure=true.
+            // InvalidateMeasure called. Measure count >= 1.
+            Assert.True(target.Measured >= 1,
+               "Panel should be re-measured when viewport grows back after a previous shrink. " +
+               "OnEffectiveViewportChanged must detect viewport growth by comparing against " +
+               "the last known extended viewport, not the stale _extendedViewport.");
+        }
+
         [Theory]
         [InlineData(0d, 10, "4,9")]
         [InlineData(0.5d, 20, "4,9,14,19")]
@@ -1655,8 +1718,8 @@ namespace Avalonia.Controls.UnitTests
             Assert.Equal(0, target.ViewPort.Top);
             Assert.Equal(100, target.ViewPort.Bottom);
 
-            Assert.Equal(0, target.ExtendedViewPort.Top);
-            Assert.Equal(200, target.ExtendedViewPort.Bottom);
+            Assert.Equal(0, target.LastMeasuredExtendedViewPort.Top);
+            Assert.Equal(200, target.LastMeasuredExtendedViewPort.Bottom);
         }
 
         [Fact]
@@ -1680,8 +1743,8 @@ namespace Avalonia.Controls.UnitTests
             Assert.Equal(900, target.ViewPort.Top);
             Assert.Equal(1000, target.ViewPort.Bottom);
 
-            Assert.Equal(800, target.ExtendedViewPort.Top);
-            Assert.Equal(1000, target.ExtendedViewPort.Bottom);
+            Assert.Equal(800, target.LastMeasuredExtendedViewPort.Top);
+            Assert.Equal(1000, target.LastMeasuredExtendedViewPort.Bottom);
         }
 
         [Fact]
@@ -1705,8 +1768,8 @@ namespace Avalonia.Controls.UnitTests
             Assert.Equal(500, target.ViewPort.Top);
             Assert.Equal(600, target.ViewPort.Bottom);
 
-            Assert.Equal(450, target.ExtendedViewPort.Top);
-            Assert.Equal(650, target.ExtendedViewPort.Bottom);
+            Assert.Equal(450, target.LastMeasuredExtendedViewPort.Top);
+            Assert.Equal(650, target.LastMeasuredExtendedViewPort.Bottom);
         }
 
         [Fact]
@@ -1729,8 +1792,8 @@ namespace Avalonia.Controls.UnitTests
             Assert.Equal(0, target.ViewPort.Left);
             Assert.Equal(100, target.ViewPort.Right);
 
-            Assert.Equal(0, target.ExtendedViewPort.Left);
-            Assert.Equal(200, target.ExtendedViewPort.Right);
+            Assert.Equal(0, target.LastMeasuredExtendedViewPort.Left);
+            Assert.Equal(200, target.LastMeasuredExtendedViewPort.Right);
         }
 
         [Fact]
@@ -1754,8 +1817,8 @@ namespace Avalonia.Controls.UnitTests
             Assert.Equal(900, target.ViewPort.Left);
             Assert.Equal(1000, target.ViewPort.Right);
 
-            Assert.Equal(800, target.ExtendedViewPort.Left);
-            Assert.Equal(1000, target.ExtendedViewPort.Right);
+            Assert.Equal(800, target.LastMeasuredExtendedViewPort.Left);
+            Assert.Equal(1000, target.LastMeasuredExtendedViewPort.Right);
         }
 
         [Fact]
@@ -1780,8 +1843,8 @@ namespace Avalonia.Controls.UnitTests
             Assert.Equal(500, target.ViewPort.Left);
             Assert.Equal(600, target.ViewPort.Right);
 
-            Assert.Equal(450, target.ExtendedViewPort.Left);
-            Assert.Equal(650, target.ExtendedViewPort.Right);
+            Assert.Equal(450, target.LastMeasuredExtendedViewPort.Left);
+            Assert.Equal(650, target.LastMeasuredExtendedViewPort.Right);
         }
 
         [Fact]
@@ -1806,11 +1869,15 @@ namespace Avalonia.Controls.UnitTests
             // visible are 10 => need to scroll down 100px until the next 5 (visible*BufferFactor) additional items are added.
             // until then no measure-arrange call should happen
 
+            var count = 0;
             // Scroll down until the extended viewport bounds are reached
             while (target.LastRealizedIndex < 20)
             {
                 scroll.Offset = new Vector(0, scroll.Offset.Y + 5);
                 Layout(target);
+                count++;
+                if (count > 1000)
+                    throw new InvalidOperationException("infinite scroll detected");
             }
 
             // Assert
@@ -1862,11 +1929,15 @@ namespace Avalonia.Controls.UnitTests
 
             var initialFirstRealizedIndex = target.FirstRealizedIndex;
 
+            var count = 0;
             // Scroll down until the extended viewport bounds are reached
             while (target.FirstRealizedIndex >= 15)
             {
                 scroll.Offset = new Vector(0, scroll.Offset.Y - 5);
                 Layout(target);
+                count++;
+                if (count > 1000)
+                    throw new InvalidOperationException("infinite scroll detected");
             }
 
             // Assert
@@ -1918,11 +1989,15 @@ namespace Avalonia.Controls.UnitTests
 
             var initialLastRealizedIndex = target.LastRealizedIndex;
 
+            var count = 0;
             // Scroll down until we reached the very last item
             while (target.LastRealizedIndex < 99)
             {
                 scroll.Offset = new Vector(0, scroll.Offset.Y + 5);
                 Layout(target);
+                count++;
+                if (count > 1000)
+                    throw new InvalidOperationException("infinite scroll detected");
             }
 
             // Assert
@@ -1972,11 +2047,15 @@ namespace Avalonia.Controls.UnitTests
             // visible are 10 => need to scroll down 100px until the next 5 (visible*BufferFactor) additional items are added.
             // until then no measure-arrange call should happen
 
+            var count = 0;
             // Scroll down until the extended viewport bounds are reached
             while (target.FirstRealizedIndex > 0)
             {
                 scroll.Offset = new Vector(0, scroll.Offset.Y - 5);
                 Layout(target);
+                count++;
+                if (count > 1000)
+                    throw new InvalidOperationException("infinite scroll detected");
             }
 
             // Assert
@@ -2022,12 +2101,15 @@ namespace Avalonia.Controls.UnitTests
             // shows 20 items, each is 10 high.
             // visible are 10 => need to scroll down 100px until the next 5 (visible*BufferFactor) additional items are added.
             // until then no measure-arrange call should happen
-
+            var count = 0;
             // Scroll down until the extended viewport bounds are reached
             while (target.LastRealizedIndex < 20)
             {
                 scroll.Offset = new Vector(scroll.Offset.X + 5, 0);
                 Layout(target);
+                count++;
+                if (count > 1000)
+                    throw new InvalidOperationException("infinite scroll detected");
             }
 
             // Assert
@@ -2079,12 +2161,15 @@ namespace Avalonia.Controls.UnitTests
             // until then no measure-arrange call should happen
 
             var initialFirstRealizedIndex = target.FirstRealizedIndex;
-
+            var count = 0;
             // Scroll down until the extended viewport bounds are reached
             while (target.FirstRealizedIndex >= 15)
             {
                 scroll.Offset = new Vector(scroll.Offset.X - 5, 0);
                 Layout(target);
+                count++;
+                if (count > 1000)
+                    throw new InvalidOperationException("infinite scroll detected");
             }
 
             // Assert
@@ -2137,11 +2222,15 @@ namespace Avalonia.Controls.UnitTests
 
             var initialLastRealizedIndex = target.LastRealizedIndex;
 
+            var count = 0;
             // Scroll down until we reached the very last item
             while (target.LastRealizedIndex < 99)
             {
                 scroll.Offset = new Vector(scroll.Offset.X + 5, 0);
                 Layout(target);
+                count++;
+                if (count > 1000)
+                    throw new InvalidOperationException("infinite scroll detected");
             }
 
             // Assert
@@ -2192,11 +2281,15 @@ namespace Avalonia.Controls.UnitTests
             // visible are 10 => need to scroll down 100px until the next 5 (visible*BufferFactor) additional items are added.
             // until then no measure-arrange call should happen
 
+            var count = 0;
             // Scroll down until the extended viewport bounds are reached
             while (target.FirstRealizedIndex > 0)
             {
                 scroll.Offset = new Vector(scroll.Offset.X - 5, 0);
                 Layout(target);
+                count++;
+                if (count > 1000)
+                    throw new InvalidOperationException("infinite scroll detected");
             }
 
             // Assert
diff --git a/tests/Avalonia.RenderTests/Controls/CarouselPageTests.cs b/tests/Avalonia.RenderTests/Controls/CarouselPageTests.cs
new file mode 100644
index 0000000000..00d669bf14
--- /dev/null
+++ b/tests/Avalonia.RenderTests/Controls/CarouselPageTests.cs
@@ -0,0 +1,133 @@
+using System.Collections;
+using System.Threading.Tasks;
+using Avalonia.Controls;
+using Avalonia.Layout;
+using Avalonia.Media;
+using Avalonia.Styling;
+using Avalonia.Themes.Simple;
+using Xunit;
+
+#if AVALONIA_SKIA
+namespace Avalonia.Skia.RenderTests
+#else
+namespace Avalonia.Direct2D1.RenderTests.Controls
+#endif
+{
+    public class CarouselPageRenderTests : TestBase
+    {
+        public CarouselPageRenderTests()
+            : base(@"Controls\CarouselPage")
+        {
+        }
+
+        private static Style FontStyle => new Style(x => x.OfType<TextBlock>())
+        {
+            Setters = { new Setter(TextBlock.FontFamilyProperty, TestFontFamily) }
+        };
+
+        private static ContentPage MakePage(string label, string bgHex, string fgHex) =>
+            new ContentPage
+            {
+                Header = label,
+                Background = new SolidColorBrush(Color.Parse(bgHex)),
+                Content = new TextBlock
+                {
+                    Text = label,
+                    Foreground = new SolidColorBrush(Color.Parse(fgHex)),
+                    FontSize = 28,
+                    FontWeight = FontWeight.Bold,
+                    HorizontalAlignment = HorizontalAlignment.Center,
+                    VerticalAlignment = VerticalAlignment.Center
+                },
+                HorizontalContentAlignment = HorizontalAlignment.Center,
+                VerticalContentAlignment = VerticalAlignment.Center
+            };
+
+        [Fact]
+        public async Task CarouselPage_Blue_Page()
+        {
+            var cp = new CarouselPage { Background = Brushes.White, PageTransition = null };
+            ((IList)cp.Pages!).Add(MakePage("Page 1", "#1565C0", "#FFFFFF"));
+
+            var target = new Decorator { Width = 400, Height = 300, Child = cp };
+            target.Styles.Add(new SimpleTheme());
+            target.Styles.Add(FontStyle);
+            await RenderToFile(target);
+            CompareImages(skipImmediate: true);
+        }
+
+        [Fact]
+        public async Task CarouselPage_Green_Page()
+        {
+            var cp = new CarouselPage { Background = Brushes.White, PageTransition = null };
+            ((IList)cp.Pages!).Add(MakePage("Page 2", "#2E7D32", "#FFFFFF"));
+
+            var target = new Decorator { Width = 400, Height = 300, Child = cp };
+            target.Styles.Add(new SimpleTheme());
+            target.Styles.Add(FontStyle);
+            await RenderToFile(target);
+            CompareImages(skipImmediate: true);
+        }
+
+        [Fact]
+        public async Task CarouselPage_Red_Page()
+        {
+            var cp = new CarouselPage { Background = Brushes.White, PageTransition = null };
+            ((IList)cp.Pages!).Add(MakePage("Page 3", "#C62828", "#FFFFFF"));
+
+            var target = new Decorator { Width = 400, Height = 300, Child = cp };
+            target.Styles.Add(new SimpleTheme());
+            target.Styles.Add(FontStyle);
+            await RenderToFile(target);
+            CompareImages(skipImmediate: true);
+        }
+
+        [Fact]
+        public async Task CarouselPage_ThreePages_FirstSelected()
+        {
+            var cp = new CarouselPage { Background = Brushes.White, PageTransition = null };
+            ((IList)cp.Pages!).Add(MakePage("Page 1", "#1565C0", "#FFFFFF"));
+            ((IList)cp.Pages!).Add(MakePage("Page 2", "#2E7D32", "#FFFFFF"));
+            ((IList)cp.Pages!).Add(MakePage("Page 3", "#C62828", "#FFFFFF"));
+
+            var target = new Decorator { Width = 400, Height = 300, Child = cp };
+            target.Styles.Add(new SimpleTheme());
+            target.Styles.Add(FontStyle);
+            await RenderToFile(target);
+            CompareImages(skipImmediate: true);
+        }
+
+        [Fact]
+        public async Task CarouselPage_ThreePages_SecondSelected()
+        {
+            var cp = new CarouselPage { Background = Brushes.White, PageTransition = null };
+            ((IList)cp.Pages!).Add(MakePage("Page 1", "#1565C0", "#FFFFFF"));
+            ((IList)cp.Pages!).Add(MakePage("Page 2", "#2E7D32", "#FFFFFF"));
+            ((IList)cp.Pages!).Add(MakePage("Page 3", "#C62828", "#FFFFFF"));
+            cp.SelectedIndex = 1;
+
+            var target = new Decorator { Width = 400, Height = 300, Child = cp };
+            target.Styles.Add(new SimpleTheme());
+            target.Styles.Add(FontStyle);
+            await RenderToFile(target);
+            CompareImages(skipImmediate: true);
+        }
+
+        [Fact]
+        public async Task CarouselPage_CustomBackground()
+        {
+            var cp = new CarouselPage
+            {
+                Background = new SolidColorBrush(Color.Parse("#212121")),
+                PageTransition = null
+            };
+            ((IList)cp.Pages!).Add(MakePage("Dark Theme", "#F57F17", "#212121"));
+
+            var target = new Decorator { Width = 400, Height = 300, Child = cp };
+            target.Styles.Add(new SimpleTheme());
+            target.Styles.Add(FontStyle);
+            await RenderToFile(target);
+            CompareImages(skipImmediate: true);
+        }
+    }
+}
diff --git a/tests/Avalonia.RenderTests/Controls/CarouselTests.cs b/tests/Avalonia.RenderTests/Controls/CarouselTests.cs
new file mode 100644
index 0000000000..6e5c42d093
--- /dev/null
+++ b/tests/Avalonia.RenderTests/Controls/CarouselTests.cs
@@ -0,0 +1,127 @@
+using System.Threading.Tasks;
+using Avalonia.Controls;
+using Avalonia.Input;
+using Avalonia.Layout;
+using Avalonia.Media;
+using Avalonia.Media.Imaging;
+using Avalonia.Platform;
+using Avalonia.Styling;
+using Avalonia.Themes.Simple;
+using Avalonia.UnitTests;
+using Xunit;
+
+#if AVALONIA_SKIA
+namespace Avalonia.Skia.RenderTests
+#else
+namespace Avalonia.Direct2D1.RenderTests.Controls
+#endif
+{
+    public class CarouselRenderTests : TestBase
+    {
+        public CarouselRenderTests()
+            : base(@"Controls\Carousel")
+        {
+        }
+
+        private static Style FontStyle => new Style(x => x.OfType<TextBlock>())
+        {
+            Setters = { new Setter(TextBlock.FontFamilyProperty, TestFontFamily) }
+        };
+
+        [Fact]
+        public async Task Carousel_ViewportFraction_MiddleItemSelected_ShowsSidePeeks()
+        {
+            var carousel = new Carousel
+            {
+                Background = Brushes.Transparent,
+                ViewportFraction = 0.8,
+                SelectedIndex = 1,
+                HorizontalAlignment = HorizontalAlignment.Stretch,
+                VerticalAlignment = VerticalAlignment.Stretch,
+                ItemsSource = new Control[]
+                {
+                    CreateCard("One", "#D8574B", "#F7C5BE"),
+                    CreateCard("Two", "#3E7AD9", "#BCD0F7"),
+                    CreateCard("Three", "#3D9B67", "#BEE4CB"),
+                }
+            };
+
+            var target = new Border
+            {
+                Width = 520,
+                Height = 340,
+                Background = Brushes.White,
+                Padding = new Thickness(20),
+                Child = carousel
+            };
+
+            AvaloniaLocator.CurrentMutable.Bind<ICursorFactory>().ToConstant(new CursorFactoryStub());
+            target.Styles.Add(new SimpleTheme());
+            target.Styles.Add(FontStyle);
+            await RenderToFile(target);
+            CompareImages(skipImmediate: true);
+        }
+
+        private static Control CreateCard(string label, string background, string accent)
+        {
+            return new Border
+            {
+                Margin = new Thickness(14, 12),
+                CornerRadius = new CornerRadius(18),
+                ClipToBounds = true,
+                Background = Brush.Parse(background),
+                BorderBrush = Brushes.White,
+                BorderThickness = new Thickness(2),
+                Child = new Grid
+                {
+                    Children =
+                    {
+                        new Border
+                        {
+                            Height = 56,
+                            Background = Brush.Parse(accent),
+                            VerticalAlignment = VerticalAlignment.Top
+                        },
+                        new Border
+                        {
+                            Width = 88,
+                            Height = 88,
+                            CornerRadius = new CornerRadius(44),
+                            Background = Brushes.White,
+                            Opacity = 0.9,
+                            HorizontalAlignment = HorizontalAlignment.Center,
+                            VerticalAlignment = VerticalAlignment.Center
+                        },
+                        new Border
+                        {
+                            Background = new SolidColorBrush(Color.Parse("#80000000")),
+                            VerticalAlignment = VerticalAlignment.Bottom,
+                            Padding = new Thickness(12),
+                            Child = new TextBlock
+                            {
+                                Text = label,
+                                Foreground = Brushes.White,
+                                HorizontalAlignment = HorizontalAlignment.Center,
+                                FontWeight = FontWeight.SemiBold
+                            }
+                        }
+                    }
+                }
+            };
+        }
+
+        private sealed class CursorFactoryStub : ICursorFactory
+        {
+            public ICursorImpl GetCursor(StandardCursorType cursorType) => new CursorStub();
+
+            public ICursorImpl CreateCursor(Bitmap cursor, PixelPoint hotSpot) => new CursorStub();
+
+            private sealed class CursorStub : ICursorImpl
+            {
+                public void Dispose()
+                {
+                }
+            }
+        }
+    }
+}
diff --git a/tests/Avalonia.RenderTests/TestRenderHelper.cs b/tests/Avalonia.RenderTests/TestRenderHelper.cs
index 87132881f7..2bd12cfa81 100644
--- a/tests/Avalonia.RenderTests/TestRenderHelper.cs
+++ b/tests/Avalonia.RenderTests/TestRenderHelper.cs
@@ -5,6 +5,7 @@ using Avalonia.Media.Imaging;
 using Avalonia.Rendering;
 using SixLabors.ImageSharp;
 using Xunit;
+using Avalonia.Input;
 using Avalonia.Platform;
 using System.Threading.Tasks;
 using System;
@@ -33,6 +34,18 @@ static class TestRenderHelper
         SkiaPlatform.Initialize();
         AvaloniaLocator.CurrentMutable.Bind<IAssetLoader>().ToConstant(new StandardAssetLoader());
         AvaloniaLocator.CurrentMutable.Bind<ITextShaperImpl>().ToConstant(new HarfBuzzTextShaper());
+        AvaloniaLocator.CurrentMutable.Bind<ICursorFactory>().ToConstant(new NullCursorFactory());
+    }
+
+    private sealed class NullCursorFactory : ICursorFactory
+    {
+        public ICursorImpl GetCursor(StandardCursorType cursorType) => new NullCursor();
+        public ICursorImpl CreateCursor(Bitmap cursor, PixelPoint hotSpot) => new NullCursor();
+
+        private sealed class NullCursor : ICursorImpl
+        {
+            public void Dispose() { }
+        }
     }
     
     
diff --git a/tests/Avalonia.UnitTests/MouseTestHelper.cs b/tests/Avalonia.UnitTests/MouseTestHelper.cs
index 235841fd04..082ae718f3 100644
--- a/tests/Avalonia.UnitTests/MouseTestHelper.cs
+++ b/tests/Avalonia.UnitTests/MouseTestHelper.cs
@@ -68,8 +68,13 @@ namespace Avalonia.UnitTests
 
         public void Move(Interactive target, Interactive source, in Point position, KeyModifiers modifiers = default)
         {
-            target.RaiseEvent(new PointerEventArgs(InputElement.PointerMovedEvent, source, _pointer, GetRoot(target), position,
-                Timestamp(), new PointerPointProperties((RawInputModifiers)_pressedButtons, PointerUpdateKind.Other), modifiers));
+            var e = new PointerEventArgs(InputElement.PointerMovedEvent, source, _pointer, GetRoot(target), position,
+                Timestamp(), new PointerPointProperties((RawInputModifiers)_pressedButtons, PointerUpdateKind.Other), modifiers);
+
+            if (_pointer.CapturedGestureRecognizer != null)
+                _pointer.CapturedGestureRecognizer.PointerMovedInternal(e);
+            else
+                target.RaiseEvent(e);
         }
 
         public void Up(Interactive target, MouseButton mouseButton = MouseButton.Left, Point? position = null,
@@ -88,9 +93,17 @@ namespace Avalonia.UnitTests
             );
             if (ButtonCount(props) == 0)
             {
-                target.RaiseEvent(new PointerReleasedEventArgs(source, _pointer, GetRoot(target), position ?? MidpointRelativeToRoot(target),
-                    Timestamp(), props, modifiers, _pressedButton));
+                var e = new PointerReleasedEventArgs(source, _pointer, GetRoot(target), position ?? MidpointRelativeToRoot(target),
+                    Timestamp(), props, modifiers, _pressedButton);
+
+                if (_pointer.CapturedGestureRecognizer != null)
+                    _pointer.CapturedGestureRecognizer.PointerReleasedInternal(e);
+                else
+                    target.RaiseEvent(e);
+
                 _pointer.Capture(null);
+                _pointer.CaptureGestureRecognizer(null);
+                _pointer.IsGestureRecognitionSkipped = false;
             }
             else
                 Move(target, source, position ?? default);
diff --git a/tests/TestFiles/Skia/Controls/Carousel/Carousel_ViewportFraction_MiddleItemSelected_ShowsSidePeeks.expected.png b/tests/TestFiles/Skia/Controls/Carousel/Carousel_ViewportFraction_MiddleItemSelected_ShowsSidePeeks.expected.png
new file mode 100644
index 0000000000..68fe675925
Binary files /dev/null and b/tests/TestFiles/Skia/Controls/Carousel/Carousel_ViewportFraction_MiddleItemSelected_ShowsSidePeeks.expected.png differ
diff --git a/tests/TestFiles/Skia/Controls/CarouselPage/CarouselPage_Blue_Page.expected.png b/tests/TestFiles/Skia/Controls/CarouselPage/CarouselPage_Blue_Page.expected.png
new file mode 100644
index 0000000000..4bc663b85b
Binary files /dev/null and b/tests/TestFiles/Skia/Controls/CarouselPage/CarouselPage_Blue_Page.expected.png differ
diff --git a/tests/TestFiles/Skia/Controls/CarouselPage/CarouselPage_CustomBackground.expected.png b/tests/TestFiles/Skia/Controls/CarouselPage/CarouselPage_CustomBackground.expected.png
new file mode 100644
index 0000000000..3f3373bc75
Binary files /dev/null and b/tests/TestFiles/Skia/Controls/CarouselPage/CarouselPage_CustomBackground.expected.png differ
diff --git a/tests/TestFiles/Skia/Controls/CarouselPage/CarouselPage_Green_Page.expected.png b/tests/TestFiles/Skia/Controls/CarouselPage/CarouselPage_Green_Page.expected.png
new file mode 100644
index 0000000000..651b32b47f
Binary files /dev/null and b/tests/TestFiles/Skia/Controls/CarouselPage/CarouselPage_Green_Page.expected.png differ
diff --git a/tests/TestFiles/Skia/Controls/CarouselPage/CarouselPage_Red_Page.expected.png b/tests/TestFiles/Skia/Controls/CarouselPage/CarouselPage_Red_Page.expected.png
new file mode 100644
index 0000000000..f8ffcb901d
Binary files /dev/null and b/tests/TestFiles/Skia/Controls/CarouselPage/CarouselPage_Red_Page.expected.png differ
diff --git a/tests/TestFiles/Skia/Controls/CarouselPage/CarouselPage_ThreePages_FirstSelected.expected.png b/tests/TestFiles/Skia/Controls/CarouselPage/CarouselPage_ThreePages_FirstSelected.expected.png
new file mode 100644
index 0000000000..4bc663b85b
Binary files /dev/null and b/tests/TestFiles/Skia/Controls/CarouselPage/CarouselPage_ThreePages_FirstSelected.expected.png differ
diff --git a/tests/TestFiles/Skia/Controls/CarouselPage/CarouselPage_ThreePages_SecondSelected.expected.png b/tests/TestFiles/Skia/Controls/CarouselPage/CarouselPage_ThreePages_SecondSelected.expected.png
new file mode 100644
index 0000000000..651b32b47f
Binary files /dev/null and b/tests/TestFiles/Skia/Controls/CarouselPage/CarouselPage_ThreePages_SecondSelected.expected.png differ