diff --git a/src/Ursa.Themes.Semi/Controls/ToolBar.axaml b/src/Ursa.Themes.Semi/Controls/ToolBar.axaml
index 9fe7cfb..90746f1 100644
--- a/src/Ursa.Themes.Semi/Controls/ToolBar.axaml
+++ b/src/Ursa.Themes.Semi/Controls/ToolBar.axaml
@@ -28,6 +28,7 @@
     <ControlTheme x:Key="{x:Type u:ToolBar}" TargetType="u:ToolBar">
         <Setter Property="HorizontalAlignment" Value="Left"/>
         <Setter Property="VerticalAlignment" Value="Top"/>
+        <Setter Property="Background" Value="Transparent"/>
         <Setter Property="ItemsPanel">
             <ItemsPanelTemplate>
                 <u:ToolBarPanel />
@@ -36,12 +37,14 @@
         <Setter Property="Template">
             <ControlTemplate TargetType="u:ToolBar">
                 <Border
-                    Padding="2"
-                    Margin="0"
+                    Name="PART_BackgroundBorder"
+                    Padding="{TemplateBinding Padding}"
+                    Background="{TemplateBinding Background}"
+                    BorderBrush="{TemplateBinding BorderBrush}"
+                    BorderThickness="{TemplateBinding BorderThickness}"
                     HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
                     VerticalAlignment="{TemplateBinding VerticalAlignment}"
-                    CornerRadius="4"
-                    Theme="{DynamicResource CardBorder}">
+                    CornerRadius="4">
                     <DockPanel LastChildFill="True">
                         <ContentPresenter
                             Name="PART_Header"