diff --git a/demo/Semi.Avalonia.Demo/Pages/CommandBarDemo.axaml b/demo/Semi.Avalonia.Demo/Pages/CommandBarDemo.axaml
index 559a433..6ab08df 100644
--- a/demo/Semi.Avalonia.Demo/Pages/CommandBarDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/CommandBarDemo.axaml
@@ -7,6 +7,11 @@
     d:DesignHeight="600"
     d:DesignWidth="800"
     mc:Ignorable="d">
+    <UserControl.Resources>
+        <StreamGeometry x:Key="SemiIconShare">
+            M17.5 2A3.5 3.5 0 1 1 15 7.95l-5.13 3.11a3.5 3.5 0 0 1 .03 1.78l5.22 3.1A3.49 3.49 0 0 1 21 18.5a3.5 3.5 0 1 1-6.9-.85l-5.22-3.08A3.49 3.49 0 0 1 3 12a3.5 3.5 0 0 1 5.8-2.63l5.27-3.19A3.5 3.5 0 0 1 17.5 2Z
+        </StreamGeometry>
+    </UserControl.Resources>
     <ScrollViewer>
         <StackPanel Spacing="16" Margin="0,0,0,16">
 
@@ -16,37 +21,17 @@
                     <TextBlock Text="CommandBar — Label Position: Bottom (default)" />
                 </HeaderedContentControl.Header>
                 <CommandBar>
-                    <AppBarButton Label="New">
-                        <AppBarButton.Icon>
-                            <PathIcon Data="M19,13H13V19H11V13H5V11H11V5H13V11H19V13Z" />
-                        </AppBarButton.Icon>
-                    </AppBarButton>
-                    <AppBarButton Label="Open">
-                        <AppBarButton.Icon>
-                            <PathIcon Data="M19,20H4C2.89,20 2,19.1 2,18V6C2,4.89 2.89,4 4,4H10L12,6H19A2,2 0 0,1 21,8H21L4,8V18L6.14,10H23.21L20.93,18.5C20.7,19.37 19.92,20 19,20Z" />
-                        </AppBarButton.Icon>
-                    </AppBarButton>
-                    <AppBarButton Label="Save">
-                        <AppBarButton.Icon>
-                            <PathIcon Data="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" />
-                        </AppBarButton.Icon>
-                    </AppBarButton>
+                    <AppBarButton Label="New" Icon="{DynamicResource SemiIconPlus}" />
+                    <AppBarButton Label="Save" Icon="{DynamicResource SemiIconSave}" />
                     <AppBarSeparator />
-                    <AppBarToggleButton Label="Bold">
-                        <AppBarToggleButton.Icon>
-                            <PathIcon Data="M15.6,10.79C17.04,10.07 18,8.64 18,7C18,4.79 16.21,3 14,3H7V21H14.73C16.78,21 18.5,19.37 18.5,17.32C18.5,15.82 17.72,14.53 16.5,13.77C16.2,13.59 15.9,13.44 15.6,13.32V10.79M10,6.5H13C13.83,6.5 14.5,7.17 14.5,8C14.5,8.83 13.83,9.5 13,9.5H10V6.5M13.5,17.5H10V14H13.5C14.33,14 15,14.67 15,15.5C15,16.33 14.33,17.5 13.5,17.5Z" />
-                        </AppBarToggleButton.Icon>
-                    </AppBarToggleButton>
-                    <AppBarToggleButton Label="Italic" IsChecked="True">
-                        <AppBarToggleButton.Icon>
-                            <PathIcon Data="M10,4V7H12.21L8.79,15H6V18H14V15H11.79L15.21,7H18V4H10Z" />
-                        </AppBarToggleButton.Icon>
-                    </AppBarToggleButton>
-                    <AppBarButton Label="Disabled" IsEnabled="False">
-                        <AppBarButton.Icon>
-                            <PathIcon Data="M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2Z" />
-                        </AppBarButton.Icon>
-                    </AppBarButton>
+                    <AppBarToggleButton Label="Bold" Icon="{DynamicResource SemiIconBold}" />
+                    <AppBarToggleButton Label="Italic" Icon="{DynamicResource SemiIconItalic}" />
+                    <AppBarSeparator />
+                    <AppBarButton Label="Share" Icon="{DynamicResource SemiIconShare}" />
+                    <AppBarButton Label="Export" Icon="{DynamicResource SemiIconExport}" />
+                    <AppBarButton Label="Print" Icon="{DynamicResource SemiIconPrint}" />
+                    <AppBarSeparator />
+                    <AppBarButton Label="Delete" Icon="{DynamicResource SemiIconDelete}" />
                 </CommandBar>
             </HeaderedContentControl>
 
@@ -56,22 +41,9 @@
                     <TextBlock Text="CommandBar — Label Position: Right" />
                 </HeaderedContentControl.Header>
                 <CommandBar DefaultLabelPosition="Right">
-                    <AppBarButton Label="New">
-                        <AppBarButton.Icon>
-                            <PathIcon Data="M19,13H13V19H11V13H5V11H11V5H13V11H19V13Z" />
-                        </AppBarButton.Icon>
-                    </AppBarButton>
-                    <AppBarButton Label="Save">
-                        <AppBarButton.Icon>
-                            <PathIcon Data="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" />
-                        </AppBarButton.Icon>
-                    </AppBarButton>
-                    <AppBarSeparator />
-                    <AppBarToggleButton Label="Bold" IsChecked="True">
-                        <AppBarToggleButton.Icon>
-                            <PathIcon Data="M15.6,10.79C17.04,10.07 18,8.64 18,7C18,4.79 16.21,3 14,3H7V21H14.73C16.78,21 18.5,19.37 18.5,17.32C18.5,15.82 17.72,14.53 16.5,13.77C16.2,13.59 15.9,13.44 15.6,13.32V10.79M10,6.5H13C13.83,6.5 14.5,7.17 14.5,8C14.5,8.83 13.83,9.5 13,9.5H10V6.5M13.5,17.5H10V14H13.5C14.33,14 15,14.67 15,15.5C15,16.33 14.33,17.5 13.5,17.5Z" />
-                        </AppBarToggleButton.Icon>
-                    </AppBarToggleButton>
+                    <AppBarToggleButton Label="Bold" Icon="{DynamicResource SemiIconBold}" />
+                    <AppBarToggleButton Label="Italic" Icon="{DynamicResource SemiIconItalic}" />
+                    <AppBarToggleButton Label="Underline" Icon="{DynamicResource SemiIconUnderline}" />
                 </CommandBar>
             </HeaderedContentControl>
 
@@ -81,27 +53,9 @@
                     <TextBlock Text="CommandBar — Compact (icons only)" />
                 </HeaderedContentControl.Header>
                 <CommandBar DefaultLabelPosition="Collapsed">
-                    <AppBarButton Label="New">
-                        <AppBarButton.Icon>
-                            <PathIcon Data="M19,13H13V19H11V13H5V11H11V5H13V11H19V13Z" />
-                        </AppBarButton.Icon>
-                    </AppBarButton>
-                    <AppBarButton Label="Open">
-                        <AppBarButton.Icon>
-                            <PathIcon Data="M19,20H4C2.89,20 2,19.1 2,18V6C2,4.89 2.89,4 4,4H10L12,6H19A2,2 0 0,1 21,8H21L4,8V18L6.14,10H23.21L20.93,18.5C20.7,19.37 19.92,20 19,20Z" />
-                        </AppBarButton.Icon>
-                    </AppBarButton>
-                    <AppBarButton Label="Save">
-                        <AppBarButton.Icon>
-                            <PathIcon Data="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" />
-                        </AppBarButton.Icon>
-                    </AppBarButton>
-                    <AppBarSeparator />
-                    <AppBarToggleButton Label="Bold">
-                        <AppBarToggleButton.Icon>
-                            <PathIcon Data="M15.6,10.79C17.04,10.07 18,8.64 18,7C18,4.79 16.21,3 14,3H7V21H14.73C16.78,21 18.5,19.37 18.5,17.32C18.5,15.82 17.72,14.53 16.5,13.77C16.2,13.59 15.9,13.44 15.6,13.32V10.79M10,6.5H13C13.83,6.5 14.5,7.17 14.5,8C14.5,8.83 13.83,9.5 13,9.5H10V6.5M13.5,17.5H10V14H13.5C14.33,14 15,14.67 15,15.5C15,16.33 14.33,17.5 13.5,17.5Z" />
-                        </AppBarToggleButton.Icon>
-                    </AppBarToggleButton>
+                    <AppBarToggleButton Label="Bold" Icon="{DynamicResource SemiIconBold}" />
+                    <AppBarToggleButton Label="Italic" Icon="{DynamicResource SemiIconItalic}" />
+                    <AppBarToggleButton Label="Underline" Icon="{DynamicResource SemiIconUnderline}" />
                 </CommandBar>
             </HeaderedContentControl>
 
@@ -111,42 +65,35 @@
                     <TextBlock Text="CommandBar — With Secondary Commands (overflow)" />
                 </HeaderedContentControl.Header>
                 <CommandBar>
-                    <AppBarButton Label="Cut">
-                        <AppBarButton.Icon>
-                            <PathIcon Data="M19,3L13,9L15,11L22,4V3M12,12.5A0.5,0.5 0 0,1 11.5,12A0.5,0.5 0 0,1 12,11.5A0.5,0.5 0 0,1 12.5,12A0.5,0.5 0 0,1 12,12.5M6,20A2,2 0 0,1 4,18C4,16.89 4.89,16 6,16A2,2 0 0,1 8,18C8,19.11 7.11,20 6,20M6,8A2,2 0 0,1 4,6C4,4.89 4.89,4 6,4A2,2 0 0,1 8,6C8,7.11 7.11,8 6,8M9.64,7.64C9.87,7.14 10,6.59 10,6A4,4 0 0,0 6,2A4,4 0 0,0 2,6A4,4 0 0,0 6,10C6.59,10 7.14,9.87 7.64,9.64L10,12L7.64,14.36C7.14,14.13 6.59,14 6,14A4,4 0 0,0 2,18A4,4 0 0,0 6,22A4,4 0 0,0 10,18C10,17.41 9.87,16.86 9.64,16.36L12,14L19,21H22V20L9.64,7.64Z" />
-                        </AppBarButton.Icon>
-                    </AppBarButton>
-                    <AppBarButton Label="Copy">
-                        <AppBarButton.Icon>
-                            <PathIcon Data="M19,21H8V7H19M19,5H8A2,2 0 0,0 6,7V21A2,2 0 0,0 8,23H19A2,2 0 0,0 21,21V7A2,2 0 0,0 19,5M16,1H4A2,2 0 0,0 2,3V17H4V3H16V1Z" />
-                        </AppBarButton.Icon>
-                    </AppBarButton>
-                    <AppBarButton Label="Paste">
-                        <AppBarButton.Icon>
-                            <PathIcon Data="M19,20H5V4H7V7H17V4H19M12,2A1,1 0 0,1 13,3A1,1 0 0,1 12,4A1,1 0 0,1 11,3A1,1 0 0,1 12,2M19,2H14.82C14.4,0.84 13.3,0 12,0C10.7,0 9.6,0.84 9.18,2H5A2,2 0 0,0 3,4V20A2,2 0 0,0 5,22H19A2,2 0 0,0 21,20V4A2,2 0 0,0 19,2Z" />
-                        </AppBarButton.Icon>
-                    </AppBarButton>
+                    <AppBarButton Label="New" Icon="{DynamicResource SemiIconPlus}" />
+                    <AppBarButton Label="Save" Icon="{DynamicResource SemiIconSave}" />
+                    <AppBarButton Label="Share" Icon="{DynamicResource SemiIconShare}" />
                     <CommandBar.SecondaryCommands>
-                        <AppBarButton Label="Select All">
-                            <AppBarButton.Icon>
-                                <PathIcon Data="M17,13H13V17H11V13H7V11H11V7H13V11H17M19,3H5C3.89,3 3,3.89 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V5C21,3.89 20.1,3 19,3Z" />
-                            </AppBarButton.Icon>
-                        </AppBarButton>
-                        <AppBarSeparator />
-                        <AppBarButton Label="Find">
-                            <AppBarButton.Icon>
-                                <PathIcon Data="M9.5,3A6.5,6.5 0 0,1 16,9.5C16,11.11 15.41,12.59 14.44,13.73L14.71,14H15.5L20.5,19L19,20.5L14,15.5V14.71L13.73,14.44C12.59,15.41 11.11,16 9.5,16A6.5,6.5 0 0,1 3,9.5A6.5,6.5 0 0,1 9.5,3M9.5,5C7,5 5,7 5,9.5C5,12 7,14 9.5,14C12,14 14,12 14,9.5C14,7 12,5 9.5,5Z" />
-                            </AppBarButton.Icon>
-                        </AppBarButton>
-                        <AppBarToggleButton Label="Wrap Text">
-                            <AppBarToggleButton.Icon>
-                                <PathIcon Data="M21,5H3V7H21V5M3,10H16A3,3 0 0,1 19,13A3,3 0 0,1 16,16H14V14L11,17L14,20V18H16A5,5 0 0,0 21,13A5,5 0 0,0 16,8H3V10M3,19H10V17H3V19Z" />
-                            </AppBarToggleButton.Icon>
-                        </AppBarToggleButton>
+                        <AppBarButton Label="Export" Icon="{DynamicResource SemiIconExport}" />
+                        <AppBarButton Label="Delete" Icon="{DynamicResource SemiIconDelete}" />
                     </CommandBar.SecondaryCommands>
                 </CommandBar>
             </HeaderedContentControl>
 
+            <HeaderedContentControl Theme="{StaticResource GroupBox}">
+                <HeaderedContentControl.Header>
+                    <StackPanel HorizontalAlignment="Left">
+                        <TextBlock Text="CommandBar — Dynamic Overflow" />
+                        <ToggleSwitch Name="idfe" IsChecked="True" />
+                        <Slider Name="ws" Width="500" Minimum="0" Maximum="500" Value="100" />
+                    </StackPanel>
+                </HeaderedContentControl.Header>
+                <CommandBar
+                    IsDynamicOverflowEnabled="{Binding #idfe.IsChecked}"
+                    Width="{Binding #ws.Value}">
+                    <AppBarButton Label="New" Icon="{DynamicResource SemiIconPlus}" />
+                    <AppBarButton Label="Save" Icon="{DynamicResource SemiIconSave}" />
+                    <AppBarButton Label="Share" Icon="{DynamicResource SemiIconShare}" />
+                    <AppBarButton Label="Export" Icon="{DynamicResource SemiIconExport}" />
+                    <AppBarButton Label="Delete" Icon="{DynamicResource SemiIconDelete}" />
+                </CommandBar>
+            </HeaderedContentControl>
+
         </StackPanel>
     </ScrollViewer>
-</UserControl>
+</UserControl>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Controls/CommandBar.axaml b/src/Semi.Avalonia/Controls/CommandBar.axaml
index 817497e..4f15503 100644
--- a/src/Semi.Avalonia/Controls/CommandBar.axaml
+++ b/src/Semi.Avalonia/Controls/CommandBar.axaml
@@ -6,27 +6,11 @@
         <Border Padding="16" Width="600" Background="{DynamicResource SemiColorBackground0}">
             <StackPanel Spacing="16">
                 <CommandBar>
-                    <AppBarButton Label="New">
-                        <AppBarButton.Icon>
-                            <PathIcon Data="M19,13H13V19H11V13H5V11H11V5H13V11H19V13Z" />
-                        </AppBarButton.Icon>
-                    </AppBarButton>
-                    <AppBarButton Label="Save">
-                        <AppBarButton.Icon>
-                            <PathIcon Data="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" />
-                        </AppBarButton.Icon>
-                    </AppBarButton>
+                    <AppBarButton Label="New" Icon="{DynamicResource SemiIconPlus}" />
+                    <AppBarButton Label="Save" Icon="{DynamicResource SemiIconSave}" />
                     <AppBarSeparator />
-                    <AppBarToggleButton Label="Bold">
-                        <AppBarToggleButton.Icon>
-                            <PathIcon Data="M15.6,10.79C17.04,10.07 18,8.64 18,7C18,4.79 16.21,3 14,3H7V21H14.73C16.78,21 18.5,19.37 18.5,17.32C18.5,15.82 17.72,14.53 16.5,13.77C16.2,13.59 15.9,13.44 15.6,13.32V10.79M10,6.5H13C13.83,6.5 14.5,7.17 14.5,8C14.5,8.83 13.83,9.5 13,9.5H10V6.5M13.5,17.5H10V14H13.5C14.33,14 15,14.67 15,15.5C15,16.33 14.33,17.5 13.5,17.5Z" />
-                        </AppBarToggleButton.Icon>
-                    </AppBarToggleButton>
-                    <AppBarButton Label="Disabled" IsEnabled="False">
-                        <AppBarButton.Icon>
-                            <PathIcon Data="M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2Z" />
-                        </AppBarButton.Icon>
-                    </AppBarButton>
+                    <AppBarToggleButton Label="Bold" Icon="{DynamicResource SemiIconBold}" />
+                    <AppBarButton Label="Copy" IsEnabled="False" Icon="{DynamicResource SemiIconCopy}" />
                 </CommandBar>
             </StackPanel>
         </Border>
@@ -48,27 +32,35 @@
         <Setter Property="Template">
             <ControlTemplate TargetType="AppBarButton">
                 <Border
-                    x:Name="PART_Border"
+                    Name="PART_Border"
                     Background="{TemplateBinding Background}"
                     BorderBrush="{TemplateBinding BorderBrush}"
                     BorderThickness="{TemplateBinding BorderThickness}"
                     CornerRadius="{TemplateBinding CornerRadius}"
                     Padding="{TemplateBinding Padding}">
                     <StackPanel
-                        x:Name="PART_LayoutRoot"
+                        Name="PART_LayoutRoot"
                         Spacing="4"
                         HorizontalAlignment="Center"
                         VerticalAlignment="Center">
                         <ContentPresenter
-                            x:Name="PART_IconPresenter"
+                            Name="PART_IconPresenter"
                             Content="{TemplateBinding Icon}"
                             Foreground="{TemplateBinding Foreground}"
                             Width="{DynamicResource AppBarButtonIconSize}"
                             Height="{DynamicResource AppBarButtonIconSize}"
                             HorizontalAlignment="Center"
-                            VerticalAlignment="Center" />
+                            VerticalAlignment="Center">
+                            <ContentPresenter.DataTemplates>
+                                <DataTemplate DataType="Geometry">
+                                    <PathIcon
+                                        Theme="{DynamicResource InnerPathIcon}"
+                                        Data="{Binding}" />
+                                </DataTemplate>
+                            </ContentPresenter.DataTemplates>
+                        </ContentPresenter>
                         <TextBlock
-                            x:Name="PART_Label"
+                            Name="PART_Label"
                             Text="{TemplateBinding Label}"
                             Foreground="{TemplateBinding Foreground}"
                             FontSize="{DynamicResource AppBarButtonLabelFontSize}"
@@ -115,7 +107,7 @@
 
         <!--  LabelPosition=Right: horizontal layout, auto-width  -->
         <Style Selector="^[LabelPosition=Right]">
-            <Setter Property="Width" Value="NaN" />
+            <Setter Property="Width" Value="{x:Static x:Double.NaN}" />
             <Setter Property="MinWidth" Value="{DynamicResource AppBarButtonCompactWidth}" />
         </Style>
         <Style Selector="^[LabelPosition=Right] /template/ StackPanel#PART_LayoutRoot">
@@ -132,7 +124,7 @@
         <Style Selector="^[IsInOverflow=True]">
             <Setter Property="HorizontalAlignment" Value="Stretch" />
             <Setter Property="HorizontalContentAlignment" Value="Left" />
-            <Setter Property="Width" Value="NaN" />
+            <Setter Property="Width" Value="{x:Static x:Double.NaN}" />
             <Setter Property="MinHeight" Value="{DynamicResource AppBarButtonOverflowMinHeight}" />
             <Setter Property="Padding" Value="{DynamicResource AppBarButtonOverflowPadding}" />
         </Style>
@@ -163,27 +155,35 @@
         <Setter Property="Template">
             <ControlTemplate TargetType="AppBarToggleButton">
                 <Border
-                    x:Name="PART_Border"
+                    Name="PART_Border"
                     Background="{TemplateBinding Background}"
                     BorderBrush="{TemplateBinding BorderBrush}"
                     BorderThickness="{TemplateBinding BorderThickness}"
                     CornerRadius="{TemplateBinding CornerRadius}"
                     Padding="{TemplateBinding Padding}">
                     <StackPanel
-                        x:Name="PART_LayoutRoot"
+                        Name="PART_LayoutRoot"
                         Spacing="4"
                         HorizontalAlignment="Center"
                         VerticalAlignment="Center">
                         <ContentPresenter
-                            x:Name="PART_IconPresenter"
+                            Name="PART_IconPresenter"
                             Content="{TemplateBinding Icon}"
                             Foreground="{TemplateBinding Foreground}"
                             Width="{DynamicResource AppBarButtonIconSize}"
                             Height="{DynamicResource AppBarButtonIconSize}"
                             HorizontalAlignment="Center"
-                            VerticalAlignment="Center" />
+                            VerticalAlignment="Center">
+                            <ContentPresenter.DataTemplates>
+                                <DataTemplate DataType="Geometry">
+                                    <PathIcon
+                                        Theme="{DynamicResource InnerPathIcon}"
+                                        Data="{Binding}" />
+                                </DataTemplate>
+                            </ContentPresenter.DataTemplates>
+                        </ContentPresenter>
                         <TextBlock
-                            x:Name="PART_Label"
+                            Name="PART_Label"
                             Text="{TemplateBinding Label}"
                             Foreground="{TemplateBinding Foreground}"
                             FontSize="{DynamicResource AppBarButtonLabelFontSize}"
@@ -246,7 +246,7 @@
 
         <!--  LabelPosition=Right: horizontal layout, auto-width  -->
         <Style Selector="^[LabelPosition=Right]">
-            <Setter Property="Width" Value="NaN" />
+            <Setter Property="Width" Value="{x:Static x:Double.NaN}" />
             <Setter Property="MinWidth" Value="{DynamicResource AppBarButtonCompactWidth}" />
         </Style>
         <Style Selector="^[LabelPosition=Right] /template/ StackPanel#PART_LayoutRoot">
@@ -263,7 +263,7 @@
         <Style Selector="^[IsInOverflow=True]">
             <Setter Property="HorizontalAlignment" Value="Stretch" />
             <Setter Property="HorizontalContentAlignment" Value="Left" />
-            <Setter Property="Width" Value="NaN" />
+            <Setter Property="Width" Value="{x:Static x:Double.NaN}" />
             <Setter Property="MinHeight" Value="{DynamicResource AppBarButtonOverflowMinHeight}" />
             <Setter Property="Padding" Value="{DynamicResource AppBarButtonOverflowPadding}" />
         </Style>
@@ -296,7 +296,7 @@
         <!--  IsInOverflow: horizontal line separator  -->
         <Style Selector="^[IsInOverflow=True]">
             <Setter Property="HorizontalAlignment" Value="Stretch" />
-            <Setter Property="Width" Value="NaN" />
+            <Setter Property="Width" Value="{x:Static x:Double.NaN}" />
             <Setter Property="Height" Value="{DynamicResource AppBarSeparatorOverflowHeight}" />
             <Setter Property="MinHeight" Value="0" />
             <Setter Property="Margin" Value="{DynamicResource AppBarSeparatorOverflowMargin}" />
@@ -326,7 +326,7 @@
                         <DockPanel>
                             <!--  Overflow button (docked right)  -->
                             <Button
-                                x:Name="PART_OverflowButton"
+                                Name="PART_OverflowButton"
                                 DockPanel.Dock="Right"
                                 Theme="{DynamicResource AppBarOverflowButton}"
                                 IsVisible="{TemplateBinding IsOverflowButtonVisible}"
@@ -340,14 +340,14 @@
 
                             <!--  Custom content (docked left)  -->
                             <ContentPresenter
-                                x:Name="PART_ContentPresenter"
+                                Name="PART_ContentPresenter"
                                 DockPanel.Dock="Left"
                                 Content="{TemplateBinding Content}"
                                 VerticalAlignment="Center" />
 
                             <!--  Primary commands (fills remaining space, right-aligned)  -->
                             <ItemsControl
-                                x:Name="PART_PrimaryCommands"
+                                Name="PART_PrimaryCommands"
                                 ItemsSource="{Binding VisiblePrimaryCommands, RelativeSource={RelativeSource TemplatedParent}}"
                                 HorizontalAlignment="Right"
                                 VerticalAlignment="Stretch"
@@ -362,7 +362,7 @@
 
                         <!--  Overflow popup  -->
                         <Popup
-                            x:Name="PART_OverflowPopup"
+                            Name="PART_OverflowPopup"
                             IsOpen="{TemplateBinding IsOpen, Mode=TwoWay}"
                             PlacementTarget="{Binding #PART_OverflowButton}"
                             Placement="Bottom"
@@ -403,4 +403,4 @@
         <Setter Property="CornerRadius" Value="{DynamicResource AppBarButtonCornerRadius}" />
     </ControlTheme>
 
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file