diff --git a/demo/Semi.Avalonia.Demo/Pages/DrawerPageDemo.axaml b/demo/Semi.Avalonia.Demo/Pages/DrawerPageDemo.axaml
index e5affdc..0636b90 100644
--- a/demo/Semi.Avalonia.Demo/Pages/DrawerPageDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/DrawerPageDemo.axaml
@@ -23,6 +23,13 @@
                           Content="Gesture Enabled"
                           IsChecked="True"
                           IsCheckedChanged="OnGestureChanged" />
+                
+                <ComboBox SelectionChanged="OnLayoutChanged" >
+                    <ComboBoxItem Content="CompactOverlay" />
+                    <ComboBoxItem Content="CompactInline" />
+                    <ComboBoxItem Content="Split" />
+                    <ComboBoxItem Content="Overlay" />
+                </ComboBox>
 
                 <Separator />
 
@@ -35,38 +42,36 @@
         </ScrollViewer>
 
         <Border DockPanel.Dock="Right" Width="1" Background="{DynamicResource SemiColorBackground0}" />
-
-        <Border Margin="12"
-                BorderBrush="{DynamicResource SemiColorBorder}"
-                BorderThickness="1"
-                CornerRadius="6"
-                ClipToBounds="True">
-            <DrawerPage Name="DemoDrawer"
-                        Header="First Look"
-                        DrawerLength="250">
-                <DrawerPage.DrawerHeader>
-                    <Border Padding="16" Background="{DynamicResource SemiColorPrimary}">
-                        <TextBlock Text="Menu" FontSize="18" FontWeight="SemiBold" Foreground="{DynamicResource SemiColorText0}" />
-                    </Border>
-                </DrawerPage.DrawerHeader>
-                <DrawerPage.Drawer>
-                    <ListBox Name="DrawerMenu" SelectionChanged="OnMenuSelectionChanged">
-                        <ListBoxItem Content="Home" />
-                        <ListBoxItem Content="Settings" />
-                        <ListBoxItem Content="Profile" />
-                        <ListBoxItem Content="About" />
-                    </ListBox>
-                </DrawerPage.Drawer>
-                <DrawerPage.Content>
-                    <ContentPage Header="Home">
-                        <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Spacing="8">
-                            <TextBlock Text="Home Page" FontSize="20" FontWeight="SemiBold" HorizontalAlignment="Center" />
-                            <TextBlock Text="Swipe from the left edge or use the hamburger button to open the drawer."
-                                       FontSize="13" Opacity="0.7" TextWrapping="Wrap" TextAlignment="Center" MaxWidth="300" />
-                        </StackPanel>
-                    </ContentPage>
-                </DrawerPage.Content>
-            </DrawerPage>
-        </Border>
+        
+        <DrawerPage Name="DemoDrawer"
+                    Margin="12"
+                    Header="First Look"
+                    DrawerLayoutBehavior="Overlay"
+                    CompactDrawerLength="80"
+                    DrawerLength="250">
+            <DrawerPage.DrawerHeader>
+                <TextBlock Text="Menu" Margin="16" FontSize="18" FontWeight="SemiBold" Foreground="{DynamicResource SemiColorPrimary}" />
+            </DrawerPage.DrawerHeader>
+            <DrawerPage.DrawerFooter>
+                <TextBlock HorizontalAlignment="Center" Text="Powered by IRIHI" Margin="8" />
+            </DrawerPage.DrawerFooter>
+            <DrawerPage.Drawer>
+                <ListBox Name="DrawerMenu" SelectionChanged="OnMenuSelectionChanged">
+                    <ListBoxItem Content="Home" />
+                    <ListBoxItem Content="Settings" />
+                    <ListBoxItem Content="Profile" />
+                    <ListBoxItem Content="About" />
+                </ListBox>
+            </DrawerPage.Drawer>
+            <DrawerPage.Content>
+                <ContentPage Header="Home">
+                    <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Spacing="8">
+                        <TextBlock Text="Home Page" FontSize="20" FontWeight="SemiBold" HorizontalAlignment="Center" />
+                        <TextBlock Text="Swipe from the left edge or use the hamburger button to open the drawer."
+                                   FontSize="13" Opacity="0.7" TextWrapping="Wrap" TextAlignment="Center" MaxWidth="300" />
+                    </StackPanel>
+                </ContentPage>
+            </DrawerPage.Content>
+        </DrawerPage>
     </DockPanel>
 </UserControl>
\ No newline at end of file
diff --git a/demo/Semi.Avalonia.Demo/Pages/DrawerPageDemo.axaml.cs b/demo/Semi.Avalonia.Demo/Pages/DrawerPageDemo.axaml.cs
index 7e0316f..4428e53 100644
--- a/demo/Semi.Avalonia.Demo/Pages/DrawerPageDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/DrawerPageDemo.axaml.cs
@@ -1,8 +1,9 @@
 using System;
+using System.Linq;
 using Avalonia.Controls;
+using Avalonia.Input.GestureRecognizers;
 using Avalonia.Interactivity;
 using Avalonia.Layout;
-using Avalonia.Media;
 
 namespace Semi.Avalonia.Demo.Pages;
 
@@ -11,6 +12,7 @@ public partial class DrawerPageDemo : UserControl
     public DrawerPageDemo()
     {
         InitializeComponent();
+        EnableMouseSwipeGesture(DemoDrawer);
     }
 
     protected override void OnLoaded(RoutedEventArgs e)
@@ -52,7 +54,6 @@ public partial class DrawerPageDemo : UserControl
                     FontSize = 16,
                     HorizontalAlignment = HorizontalAlignment.Center,
                     VerticalAlignment = VerticalAlignment.Center,
-                    Foreground = Brushes.Black,
                 },
                 HorizontalContentAlignment = HorizontalAlignment.Stretch,
                 VerticalContentAlignment = VerticalAlignment.Stretch
@@ -65,4 +66,25 @@ public partial class DrawerPageDemo : UserControl
     {
         StatusText.Text = $"Drawer: {(DemoDrawer.IsOpen ? "Open" : "Closed")}";
     }
+
+    private static void EnableMouseSwipeGesture(Control control)
+    {
+        var recognizer = control.GestureRecognizers
+            .OfType<SwipeGestureRecognizer>()
+            .FirstOrDefault();
+
+        recognizer?.IsMouseEnabled = true;
+    }
+
+    private void OnLayoutChanged(object? sender, SelectionChangedEventArgs e)
+    {
+        DemoDrawer.DrawerLayoutBehavior = (sender as ComboBox)?.SelectedIndex switch
+        {
+            0 => DrawerLayoutBehavior.CompactOverlay,
+            1 => DrawerLayoutBehavior.CompactInline,
+            2 => DrawerLayoutBehavior.Split,
+            3 => DrawerLayoutBehavior.Overlay,
+            _ => DrawerLayoutBehavior.CompactOverlay
+        };
+    }
 }
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Controls/DrawerPage.axaml b/src/Semi.Avalonia/Controls/DrawerPage.axaml
index e56179b..556a7e2 100644
--- a/src/Semi.Avalonia/Controls/DrawerPage.axaml
+++ b/src/Semi.Avalonia/Controls/DrawerPage.axaml
@@ -1,6 +1,4 @@
-<ResourceDictionary
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <Design.PreviewWith>
         <DrawerPage Width="400" Height="300" />
     </Design.PreviewWith>
@@ -8,142 +6,247 @@
     <ControlTheme x:Key="{x:Type DrawerPage}" TargetType="DrawerPage">
         <Setter Property="Background" Value="{DynamicResource DrawerPageBackground}" />
         <Setter Property="Foreground" Value="{DynamicResource DrawerPageForeground}" />
-        <Setter Property="DrawerBackground" Value="{DynamicResource DrawerPageDrawerBackground}" />
-        <Setter Property="DrawerLength" Value="{DynamicResource DrawerPageDrawerLength}" />
-        <Setter Property="CompactDrawerLength" Value="{DynamicResource DrawerPageCompactDrawerLength}" />
-        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-        <Setter Property="VerticalContentAlignment" Value="Stretch" />
         <Setter Property="Template">
             <ControlTemplate TargetType="DrawerPage">
-                <Grid RowDefinitions="Auto,*" Background="{TemplateBinding Background}">
-
-                    <!--  Top bar with pane toggle button  -->
-                    <Border
-                        Name="PART_TopBar"
-                        Grid.Row="0"
-                        MinHeight="{DynamicResource DrawerPageTopBarMinHeight}"
-                        Padding="{DynamicResource DrawerPageTopBarPadding}"
-                        Background="{DynamicResource DrawerPageTopBarBackground}"
-                        BorderBrush="{DynamicResource DrawerPageTopBarBorderBrush}"
-                        BorderThickness="{DynamicResource DrawerPageTopBarBorderThickness}">
-                        <Grid ColumnDefinitions="Auto,Auto,*">
-                            <!--  Pane toggle button (hamburger)  -->
+                <SplitView
+                    Name="PART_SplitView"
+                    CompactPaneLength="{TemplateBinding CompactDrawerLength}"
+                    DisplayMode="{TemplateBinding DisplayMode}"
+                    IsPaneOpen="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
+                    OpenPaneLength="{TemplateBinding DrawerLength}"
+                    PaneBackground="{Binding DrawerBackground, RelativeSource={RelativeSource TemplatedParent}}">
+                    <SplitView.Pane>
+                        <DockPanel Background="{TemplateBinding DrawerBackground}">
+                            <!--  Compact-mode toggle: visible only in CompactOverlay/CompactInline.  -->
                             <ToggleButton
-                                Name="PART_PaneButton"
-                                Grid.Column="0"
-                                Width="{DynamicResource DrawerPagePaneButtonSize}"
-                                Height="{DynamicResource DrawerPagePaneButtonSize}"
-                                Margin="{DynamicResource DrawerPagePaneButtonMargin}"
-                                VerticalAlignment="Center"
-                                Background="{DynamicResource DrawerPagePaneButtonBackground}"
-                                Foreground="{DynamicResource DrawerPagePaneButtonForeground}"
-                                IsChecked="{TemplateBinding IsOpen, Mode=TwoWay}">
-                                <PathIcon
-                                    Width="16"
-                                    Height="16"
-                                    Data="{DynamicResource DrawerPageMenuGlyph}"
-                                    Foreground="{DynamicResource DrawerPagePaneButtonForeground}" />
-                            </ToggleButton>
-
-                            <!--  Drawer icon (shown in top bar)  -->
-                            <ContentPresenter
-                                Name="PART_PaneIconPresenter"
-                                Grid.Column="1"
-                                VerticalAlignment="Center"
-                                Content="{TemplateBinding DrawerIcon}"
-                                ContentTemplate="{TemplateBinding DrawerIconTemplate}" />
-                        </Grid>
-                    </Border>
-
-                    <!--  Main area: SplitView + Backdrop  -->
-                    <Panel Grid.Row="1">
-                        <SplitView
-                            Name="PART_SplitView"
-                            CompactPaneLength="{TemplateBinding CompactDrawerLength}"
-                            DisplayMode="{TemplateBinding DisplayMode}"
-                            IsPaneOpen="{TemplateBinding IsOpen, Mode=TwoWay}"
-                            OpenPaneLength="{TemplateBinding DrawerLength}"
-                            PaneBackground="{TemplateBinding DrawerBackground}">
-                            <SplitView.Pane>
-                                <DockPanel>
-                                    <!--  Drawer header  -->
-                                    <ContentPresenter
-                                        Name="PART_DrawerHeader"
-                                        DockPanel.Dock="Top"
-                                        Background="{TemplateBinding DrawerHeaderBackground}"
-                                        Content="{TemplateBinding DrawerHeader}"
-                                        ContentTemplate="{TemplateBinding DrawerHeaderTemplate}" />
-
-                                    <!--  Drawer footer  -->
-                                    <ContentPresenter
-                                        Name="PART_DrawerFooter"
-                                        DockPanel.Dock="Bottom"
-                                        Background="{TemplateBinding DrawerFooterBackground}"
-                                        Content="{TemplateBinding DrawerFooter}"
-                                        ContentTemplate="{TemplateBinding DrawerFooterTemplate}" />
-
-                                    <!--  Compact pane icon (compact mode)  -->
+                                Name="PART_CompactPaneToggle"
+                                Width="{DynamicResource ButtonDefaultHeight}"
+                                Height="{DynamicResource ButtonDefaultHeight}"
+                                HorizontalAlignment="Left"
+                                AutomationProperties.Name="Toggle navigation drawer"
+                                Background="Transparent"
+                                DockPanel.Dock="Top"
+                                IsChecked="{Binding #PART_SplitView.IsPaneOpen, Mode=TwoWay}"
+                                IsVisible="False"
+                                ToolTip.Tip="Toggle navigation drawer">
+                                <Panel>
+                                    <PathIcon
+                                        HorizontalAlignment="Center"
+                                        VerticalAlignment="Center"
+                                        Data="{DynamicResource DrawerPageMenuGlyph}"
+                                        Foreground="{DynamicResource DrawerPagePaneButtonForeground}"
+                                        IsVisible="{TemplateBinding DrawerIcon, Converter={x:Static ObjectConverters.IsNull}}"
+                                        Theme="{DynamicResource InnerPathIcon}" />
                                     <ContentPresenter
                                         Name="PART_CompactPaneIconPresenter"
-                                        DockPanel.Dock="Top"
-                                        IsVisible="False"
+                                        HorizontalAlignment="Center"
+                                        VerticalAlignment="Center"
                                         Content="{TemplateBinding DrawerIcon}"
-                                        ContentTemplate="{TemplateBinding DrawerIconTemplate}" />
-
-                                    <!--  Bottom pane icon  -->
-                                    <ContentPresenter
-                                        Name="PART_BottomPaneIconPresenter"
-                                        DockPanel.Dock="Bottom"
-                                        IsVisible="False" 
-                                        Content="{TemplateBinding DrawerIcon}"
-                                        ContentTemplate="{TemplateBinding DrawerIconTemplate}" />
-
-                                    <!--  Drawer main content  -->
-                                    <ContentPresenter
-                                        Name="PART_DrawerPresenter"
-                                        Content="{TemplateBinding Drawer}"
-                                        ContentTemplate="{TemplateBinding DrawerTemplate}" />
+                                        ContentTemplate="{TemplateBinding DrawerIconTemplate}"
+                                        Foreground="{DynamicResource DrawerPagePaneButtonForeground}"
+                                        IsVisible="{TemplateBinding DrawerIcon, Converter={x:Static ObjectConverters.IsNotNull}}" />
+                                </Panel>
+                            </ToggleButton>
+                            <ContentPresenter
+                                Name="PART_DrawerHeader"
+                                Background="{TemplateBinding DrawerHeaderBackground}"
+                                Content="{TemplateBinding DrawerHeader}"
+                                ContentTemplate="{TemplateBinding DrawerHeaderTemplate}"
+                                DockPanel.Dock="Top"
+                                IsVisible="{TemplateBinding DrawerHeader,
+                                                            Converter={x:Static ObjectConverters.IsNotNull}}" />
+                            <ContentPresenter
+                                Name="PART_DrawerFooter"
+                                Background="{TemplateBinding DrawerFooterBackground}"
+                                Content="{TemplateBinding DrawerFooter}"
+                                ContentTemplate="{TemplateBinding DrawerFooterTemplate}"
+                                DockPanel.Dock="Bottom"
+                                IsVisible="{TemplateBinding DrawerFooter,
+                                                            Converter={x:Static ObjectConverters.IsNotNull}}" />
+                            <ContentPresenter
+                                Name="PART_DrawerPresenter"
+                                HorizontalContentAlignment="Stretch"
+                                VerticalContentAlignment="Stretch"
+                                Content="{TemplateBinding Drawer}"
+                                ContentTemplate="{TemplateBinding DrawerTemplate}" />
+                        </DockPanel>
+                    </SplitView.Pane>
+                    <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+                        <DockPanel Name="PART_ContentDock">
+                            <Border
+                                Name="PART_TopBar"
+                                Height="{DynamicResource DrawerPageTopBarMinHeight}"
+                                Padding="5"
+                                Background="{DynamicResource DrawerPageTopBarBackground}"
+                                DockPanel.Dock="Top">
+                                <DockPanel HorizontalAlignment="Stretch">
+                                    <ToggleButton
+                                        Name="PART_PaneButton"
+                                        Width="{DynamicResource ButtonDefaultHeight}"
+                                        Height="{DynamicResource ButtonDefaultHeight}"
+                                        AutomationProperties.Name="Toggle navigation drawer"
+                                        Background="Transparent"
+                                        DockPanel.Dock="Left"
+                                        IsChecked="{Binding #PART_SplitView.IsPaneOpen, Mode=TwoWay}"
+                                        ToolTip.Tip="Toggle navigation drawer">
+                                        <Panel>
+                                            <PathIcon
+                                                HorizontalAlignment="Center"
+                                                VerticalAlignment="Center"
+                                                Data="{DynamicResource DrawerPageMenuGlyph}"
+                                                Foreground="{DynamicResource DrawerPagePaneButtonForeground}"
+                                                IsVisible="{TemplateBinding DrawerIcon, Converter={x:Static ObjectConverters.IsNull}}"
+                                                Theme="{DynamicResource InnerPathIcon}" />
+                                            <ContentPresenter
+                                                Name="PART_PaneIconPresenter"
+                                                HorizontalAlignment="Center"
+                                                VerticalAlignment="Center"
+                                                Content="{TemplateBinding DrawerIcon}"
+                                                ContentTemplate="{TemplateBinding DrawerIconTemplate}"
+                                                Foreground="{DynamicResource DrawerPagePaneButtonForeground}"
+                                                IsVisible="{TemplateBinding DrawerIcon, Converter={x:Static ObjectConverters.IsNotNull}}" />
+                                        </Panel>
+                                    </ToggleButton>
+                                    <ContentControl
+                                        Name="PART_TitlePresenter"
+                                        Margin="8,0,0,0"
+                                        VerticalAlignment="Center"
+                                        VerticalContentAlignment="Center"
+                                        Content="{TemplateBinding Header}"
+                                        FontSize="16"
+                                        FontWeight="SemiBold"
+                                        IsVisible="{TemplateBinding Header,
+                                                                    Converter={x:Static ObjectConverters.IsNotNull}}" />
                                 </DockPanel>
-                            </SplitView.Pane>
-
-                            <!--  Main page content  -->
+                            </Border>
+                            <Border
+                                Name="PART_BottomBar"
+                                Height="{DynamicResource DrawerPageTopBarMinHeight}"
+                                Padding="5"
+                                Background="{DynamicResource DrawerPageTopBarBackground}"
+                                DockPanel.Dock="Bottom"
+                                IsVisible="False">
+                                <DockPanel HorizontalAlignment="Stretch">
+                                    <ToggleButton
+                                        Name="PART_BottomPaneButton"
+                                        AutomationProperties.Name="Toggle navigation drawer"
+                                        Background="Transparent"
+                                        DockPanel.Dock="Left"
+                                        IsChecked="{Binding #PART_SplitView.IsPaneOpen, Mode=TwoWay}"
+                                        ToolTip.Tip="Toggle navigation drawer">
+                                        <Panel>
+                                            <PathIcon
+                                                HorizontalAlignment="Center"
+                                                VerticalAlignment="Center"
+                                                Data="{DynamicResource DrawerPaneButtonIcon}"
+                                                IsVisible="{TemplateBinding DrawerIcon, Converter={x:Static ObjectConverters.IsNull}}"
+                                                Theme="{DynamicResource InnerPathIcon}" />
+                                            <ContentPresenter
+                                                Name="PART_BottomPaneIconPresenter"
+                                                HorizontalAlignment="Center"
+                                                VerticalAlignment="Center"
+                                                Content="{TemplateBinding DrawerIcon}"
+                                                ContentTemplate="{TemplateBinding DrawerIconTemplate}"
+                                                IsVisible="{TemplateBinding DrawerIcon, Converter={x:Static ObjectConverters.IsNotNull}}" />
+                                        </Panel>
+                                    </ToggleButton>
+                                    <ContentControl
+                                        Name="PART_BottomTitlePresenter"
+                                        Margin="8,0,0,0"
+                                        VerticalAlignment="Center"
+                                        VerticalContentAlignment="Center"
+                                        Content="{TemplateBinding Header}"
+                                        FontSize="16"
+                                        FontWeight="SemiBold"
+                                        IsVisible="{TemplateBinding Header,
+                                                                    Converter={x:Static ObjectConverters.IsNotNull}}" />
+                                </DockPanel>
+                            </Border>
                             <ContentPresenter
                                 Name="PART_ContentPresenter"
+                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                Background="{TemplateBinding Background}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="{TemplateBinding BorderThickness}"
                                 Content="{TemplateBinding Content}"
                                 ContentTemplate="{TemplateBinding ContentTemplate}"
-                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
-                        </SplitView>
-
-                        <!--  Backdrop overlay (shown in overlay/flyout modes)  -->
+                                CornerRadius="{TemplateBinding CornerRadius}" />
+                        </DockPanel>
                         <Border
                             Name="PART_Backdrop"
                             Background="{TemplateBinding BackdropBrush}"
                             IsHitTestVisible="False"
                             IsVisible="False" />
-
-                        <!--  Compact pane toggle  -->
-                        <ToggleButton
-                            Name="PART_CompactPaneToggle"
-                            IsVisible="False" />
-                    </Panel>
-                </Grid>
+                    </Grid>
+                </SplitView>
             </ControlTemplate>
         </Setter>
 
-        <!--  Pseudo-class: right-side drawer  -->
-        <Style Selector="^:placement-right /template/ SplitView#PART_SplitView">
-            <Setter Property="PanePlacement" Value="Right" />
+        <Style Selector="^:placement-right /template/ ToggleButton#PART_PaneButton">
+            <Setter Property="DockPanel.Dock" Value="Right" />
         </Style>
 
-        <!--  Pseudo-class: top drawer  -->
-        <Style Selector="^:placement-top /template/ SplitView#PART_SplitView">
-            <Setter Property="PanePlacement" Value="Top" />
+        <!--  Bottom placement: swap top bar for bottom bar  -->
+        <Style Selector="^:placement-bottom /template/ Border#PART_TopBar">
+            <Setter Property="IsVisible" Value="False" />
+        </Style>
+        <Style Selector="^:placement-bottom /template/ Border#PART_BottomBar">
+            <Setter Property="IsVisible" Value="True" />
         </Style>
 
-        <!--  Pseudo-class: bottom drawer  -->
-        <Style Selector="^:placement-bottom /template/ SplitView#PART_SplitView">
-            <Setter Property="PanePlacement" Value="Bottom" />
+        <!--  Bottom placement + compact modes: pane compact strip provides toggle, hide bottom bar  -->
+        <Style Selector="^:placement-bottom[DisplayMode=CompactOverlay] /template/ Border#PART_BottomBar">
+            <Setter Property="IsVisible" Value="False" />
         </Style>
+        <Style Selector="^:placement-bottom[DisplayMode=CompactInline] /template/ Border#PART_BottomBar">
+            <Setter Property="IsVisible" Value="False" />
+        </Style>
+
+        <!--  Horizontal pane (Bottom/Top): compact toggle must dock Left so drawer content can fill the rest  -->
+        <Style Selector="^:placement-bottom /template/ ToggleButton#PART_CompactPaneToggle">
+            <Setter Property="DockPanel.Dock" Value="Left" />
+        </Style>
+        <Style Selector="^:placement-top /template/ ToggleButton#PART_CompactPaneToggle">
+            <Setter Property="DockPanel.Dock" Value="Left" />
+        </Style>
+
+        <Style Selector="^[DrawerBehavior=Locked] /template/ Border#PART_TopBar">
+            <Setter Property="IsVisible" Value="False" />
+        </Style>
+
+        <Style Selector="^[DrawerBehavior=Disabled] /template/ Border#PART_TopBar">
+            <Setter Property="IsVisible" Value="False" />
+        </Style>
+
+        <Style Selector="^:detail-is-navpage /template/ Border#PART_TopBar">
+            <Setter Property="IsVisible" Value="False" />
+        </Style>
+
+        <Style Selector="^[DisplayMode=CompactOverlay] /template/ Border#PART_TopBar">
+            <Setter Property="IsVisible" Value="False" />
+        </Style>
+
+        <Style Selector="^[DisplayMode=CompactOverlay] /template/ ToggleButton#PART_CompactPaneToggle">
+            <Setter Property="IsVisible" Value="True" />
+        </Style>
+
+        <Style Selector="^[DisplayMode=CompactInline] /template/ Border#PART_TopBar">
+            <Setter Property="IsVisible" Value="False" />
+        </Style>
+
+        <Style Selector="^[DisplayMode=CompactInline] /template/ ToggleButton#PART_CompactPaneToggle">
+            <Setter Property="IsVisible" Value="True" />
+        </Style>
+
+        <Style Selector="^[IsInNavigationPage=True] /template/ Border#PART_TopBar">
+            <Setter Property="IsVisible" Value="False" />
+        </Style>
+
+        <!--  NavigationPage already hosts a hamburger toggle — suppress the compact pane toggle.  -->
+        <Style Selector="^:detail-is-navpage /template/ ToggleButton#PART_CompactPaneToggle">
+            <Setter Property="IsVisible" Value="False" />
+        </Style>
+
     </ControlTheme>
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/DrawerPage.axaml b/src/Semi.Avalonia/Themes/Dark/DrawerPage.axaml
index 09cd1a7..1a5dc4a 100644
--- a/src/Semi.Avalonia/Themes/Dark/DrawerPage.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/DrawerPage.axaml
@@ -4,10 +4,6 @@
     <StaticResource x:Key="DrawerPageForeground" ResourceKey="SemiColorText0" />
     <!--  Top bar  -->
     <StaticResource x:Key="DrawerPageTopBarBackground" ResourceKey="SemiColorBackground1" />
-    <StaticResource x:Key="DrawerPageTopBarBorderBrush" ResourceKey="SemiColorBorder" />
-    <!--  Drawer pane  -->
-    <StaticResource x:Key="DrawerPageDrawerBackground" ResourceKey="SemiColorNavBackground" />
     <!--  Pane button  -->
-    <SolidColorBrush x:Key="DrawerPagePaneButtonBackground" Color="Transparent" />
     <StaticResource x:Key="DrawerPagePaneButtonForeground" ResourceKey="SemiColorText0" />
 </ResourceDictionary>
diff --git a/src/Semi.Avalonia/Themes/HighContrast/DrawerPage.axaml b/src/Semi.Avalonia/Themes/HighContrast/DrawerPage.axaml
index aa185e9..e13eef0 100644
--- a/src/Semi.Avalonia/Themes/HighContrast/DrawerPage.axaml
+++ b/src/Semi.Avalonia/Themes/HighContrast/DrawerPage.axaml
@@ -4,10 +4,6 @@
     <StaticResource x:Key="DrawerPageForeground" ResourceKey="SemiColorWindowText" />
     <!--  Top bar  -->
     <StaticResource x:Key="DrawerPageTopBarBackground" ResourceKey="SemiColorWindow" />
-    <StaticResource x:Key="DrawerPageTopBarBorderBrush" ResourceKey="SemiColorWindowText" />
-    <!--  Drawer pane  -->
-    <StaticResource x:Key="DrawerPageDrawerBackground" ResourceKey="SemiColorWindow" />
     <!--  Pane button  -->
-    <SolidColorBrush x:Key="DrawerPagePaneButtonBackground" Color="Transparent" />
     <StaticResource x:Key="DrawerPagePaneButtonForeground" ResourceKey="SemiColorWindowText" />
 </ResourceDictionary>
diff --git a/src/Semi.Avalonia/Themes/Light/DrawerPage.axaml b/src/Semi.Avalonia/Themes/Light/DrawerPage.axaml
index e2098ff..518a63f 100644
--- a/src/Semi.Avalonia/Themes/Light/DrawerPage.axaml
+++ b/src/Semi.Avalonia/Themes/Light/DrawerPage.axaml
@@ -4,10 +4,6 @@
     <StaticResource x:Key="DrawerPageForeground" ResourceKey="SemiColorText0" />
     <!--  Top bar  -->
     <StaticResource x:Key="DrawerPageTopBarBackground" ResourceKey="SemiColorBackground1" />
-    <StaticResource x:Key="DrawerPageTopBarBorderBrush" ResourceKey="SemiColorBorder" />
-    <!--  Drawer pane  -->
-    <StaticResource x:Key="DrawerPageDrawerBackground" ResourceKey="SemiColorNavBackground" />
     <!--  Pane button  -->
-    <SolidColorBrush x:Key="DrawerPagePaneButtonBackground" Color="Transparent" />
     <StaticResource x:Key="DrawerPagePaneButtonForeground" ResourceKey="SemiColorText0" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Shared/DrawerPage.axaml b/src/Semi.Avalonia/Themes/Shared/DrawerPage.axaml
index 48c5d66..e637290 100644
--- a/src/Semi.Avalonia/Themes/Shared/DrawerPage.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/DrawerPage.axaml
@@ -1,15 +1,7 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <!--  DrawerPage top bar  -->
-    <x:Double x:Key="DrawerPageTopBarMinHeight">48</x:Double>
-    <Thickness x:Key="DrawerPageTopBarPadding">4 0</Thickness>
-    <Thickness x:Key="DrawerPageTopBarBorderThickness">0 0 0 1</Thickness>
-
-    <!--  DrawerPage pane/drawer  -->
-    <x:Double x:Key="DrawerPageDrawerLength">280</x:Double>
-    <x:Double x:Key="DrawerPageCompactDrawerLength">56</x:Double>
+    <x:Double x:Key="DrawerPageTopBarMinHeight">32</x:Double>
 
     <!--  DrawerPage pane button  -->
-    <x:Double x:Key="DrawerPagePaneButtonSize">32</x:Double>
-    <Thickness x:Key="DrawerPagePaneButtonMargin">8 0</Thickness>
     <StaticResource x:Key="DrawerPageMenuGlyph" ResourceKey="SemiIconMenu" />
 </ResourceDictionary>