diff --git a/demo/Ursa.Demo/Pages/ToolBarDemo.axaml b/demo/Ursa.Demo/Pages/ToolBarDemo.axaml
index 913a3f3..b00fc45 100644
--- a/demo/Ursa.Demo/Pages/ToolBarDemo.axaml
+++ b/demo/Ursa.Demo/Pages/ToolBarDemo.axaml
@@ -70,7 +70,7 @@
             Grid.Row="2"
             Grid.Column="2"
             RowDefinitions="Auto, *">
-            <u:ToolBar>
+            <u:ToolBar Margin="16">
                 <ToggleButton Name="bold">
                     <PathIcon
                         Width="16"
diff --git a/src/Ursa.Themes.Semi/Controls/ToolBar.axaml b/src/Ursa.Themes.Semi/Controls/ToolBar.axaml
index b7770d7..9fe7cfb 100644
--- a/src/Ursa.Themes.Semi/Controls/ToolBar.axaml
+++ b/src/Ursa.Themes.Semi/Controls/ToolBar.axaml
@@ -37,6 +37,7 @@
             <ControlTemplate TargetType="u:ToolBar">
                 <Border
                     Padding="2"
+                    Margin="0"
                     HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
                     VerticalAlignment="{TemplateBinding VerticalAlignment}"
                     CornerRadius="4"
@@ -62,7 +63,8 @@
                                 Theme="{DynamicResource ToolBarExpandToggleButton}">
                                 <PathIcon
                                     Name="PART_Icon"
-                                    Height="16"
+                                    Height="12"
+                                    Foreground="{DynamicResource SemiColorText2}"
                                     Data="{DynamicResource ToolBarHorizontalMoreGlyph}" />
                             </ToggleButton>
                             <Popup
@@ -102,7 +104,7 @@
             </Style>
             <Style Selector="^ /template/ PathIcon#PART_Icon">
                 <Setter Property="Data" Value="{DynamicResource ToolBarVerticalMoreGlyph}" />
-                <Setter Property="Width" Value="16" />
+                <Setter Property="Width" Value="12" />
                 <Setter Property="Height" Value="{x:Static x:Double.NaN}" />
             </Style>
         </Style>