diff --git a/demo/Ursa.Demo/Pages/ButtonGroupDemo.axaml b/demo/Ursa.Demo/Pages/ButtonGroupDemo.axaml
index 17a0621..510c423 100644
--- a/demo/Ursa.Demo/Pages/ButtonGroupDemo.axaml
+++ b/demo/Ursa.Demo/Pages/ButtonGroupDemo.axaml
@@ -15,5 +15,8 @@
     <StackPanel Margin="20" Spacing="20">
         <u:ButtonGroup Classes="Primary Solid" ItemsSource="{Binding Items}" />
         <u:ButtonGroup Classes="Primary" ItemsSource="{Binding Items}" />
+        <u:ButtonGroup Classes="Primary Borderless" ItemsSource="{Binding Items}" />
+        <u:ButtonGroup Classes="Primary Large" ItemsSource="{Binding Items}" />
+        <u:ButtonGroup Classes="Primary Small" ItemsSource="{Binding Items}" />
     </StackPanel>
 </UserControl>
diff --git a/src/Ursa.Themes.Semi/Controls/ButtonGroup.axaml b/src/Ursa.Themes.Semi/Controls/ButtonGroup.axaml
index 45c12f6..15a70c1 100644
--- a/src/Ursa.Themes.Semi/Controls/ButtonGroup.axaml
+++ b/src/Ursa.Themes.Semi/Controls/ButtonGroup.axaml
@@ -40,6 +40,7 @@
         <Setter Property="HorizontalContentAlignment" Value="Center" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
         <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Padding" Value="{DynamicResource ButtonGroupDefaultPadding}" />
         <Setter Property="FontWeight" Value="{DynamicResource ButtonGroupDefaultFontWeight}" />
         <Setter Property="Cursor" Value="Hand" />
         <Setter Property="Button.Template">
@@ -53,12 +54,12 @@
                         DockPanel.Dock="Right"
                         Fill="{DynamicResource ButtonGroupSeparatorForeground}" />
                     <Border
-                        Padding="8"
                         Background="{TemplateBinding Background}"
                         BorderBrush="{TemplateBinding BorderBrush}"
                         BorderThickness="{TemplateBinding BorderThickness}"
                         CornerRadius="{TemplateBinding CornerRadius}">
                         <ContentPresenter
+                            Margin="{TemplateBinding Padding}"
                             HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                             VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                             Content="{TemplateBinding Content}"
diff --git a/src/Ursa.Themes.Semi/Styles/ButtonGroup.axaml b/src/Ursa.Themes.Semi/Styles/ButtonGroup.axaml
index a3737fd..9317410 100644
--- a/src/Ursa.Themes.Semi/Styles/ButtonGroup.axaml
+++ b/src/Ursa.Themes.Semi/Styles/ButtonGroup.axaml
@@ -21,6 +21,12 @@
     <Style Selector="u|ButtonGroup.Borderless">
         <Setter Property="Background" Value="Transparent" />
     </Style>
+    <Style Selector="u|ButtonGroup.Large Button">
+        <Setter Property="Padding" Value="{DynamicResource ButtonGroupLargePadding}" />
+    </Style>
+    <Style Selector="u|ButtonGroup.Small Button">
+        <Setter Property="Padding" Value="{DynamicResource ButtonGroupSmallPadding}" />
+    </Style>
     <Style Selector="u|ButtonGroup Button:pointerover">
         <Setter Property="Background" Value="{DynamicResource ButtonGroupDefaultPointeroverBackground}" />
     </Style>
diff --git a/src/Ursa.Themes.Semi/Themes/Light/ButtonGroup.axaml b/src/Ursa.Themes.Semi/Themes/Light/ButtonGroup.axaml
index efa6ebe..6645722 100644
--- a/src/Ursa.Themes.Semi/Themes/Light/ButtonGroup.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Light/ButtonGroup.axaml
@@ -1,10 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <!--  Add Resources Here  -->
 
-    <x:Double x:Key="ButtonGroupDefaultFontSize">14</x:Double>
-    <FontWeight x:Key="ButtonGroupDefaultFontWeight">600</FontWeight>
-    <CornerRadius x:Key="ButtonGroupCornerRadius">3</CornerRadius>
-
     <SolidColorBrush x:Key="ButtonGroupSeparatorForeground" Opacity="0.08" Color="#FF1C1F23" />
     <!--  Light  -->
     <SolidColorBrush x:Key="ButtonGroupDefaultPrimaryForeground" Color="#0077FA" />
diff --git a/src/Ursa.Themes.Semi/Themes/Shared/ButtonGroup.axaml b/src/Ursa.Themes.Semi/Themes/Shared/ButtonGroup.axaml
new file mode 100644
index 0000000..b7459fd
--- /dev/null
+++ b/src/Ursa.Themes.Semi/Themes/Shared/ButtonGroup.axaml
@@ -0,0 +1,10 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <!--  Add Resources Here  -->
+    <x:Double x:Key="ButtonGroupDefaultFontSize">14</x:Double>
+    <FontWeight x:Key="ButtonGroupDefaultFontWeight">600</FontWeight>
+    <CornerRadius x:Key="ButtonGroupCornerRadius">3</CornerRadius>
+
+    <Thickness x:Key="ButtonGroupDefaultPadding">12 6</Thickness>
+    <Thickness x:Key="ButtonGroupLargePadding">16 10</Thickness>
+    <Thickness x:Key="ButtonGroupSmallPadding">6 2</Thickness>
+</ResourceDictionary>
diff --git a/src/Ursa.Themes.Semi/Themes/Shared/_index.axaml b/src/Ursa.Themes.Semi/Themes/Shared/_index.axaml
index d8dca1e..5e6a238 100644
--- a/src/Ursa.Themes.Semi/Themes/Shared/_index.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Shared/_index.axaml
@@ -3,6 +3,7 @@
     <ResourceDictionary.MergedDictionaries>
         <MergeResourceInclude Source="Badge.axaml" />
         <MergeResourceInclude Source="Banner.axaml" />
+        <MergeResourceInclude Source="ButtonGroup.axaml" />
         <MergeResourceInclude Source="Divider.axaml" />
         <MergeResourceInclude Source="IPv4Box.axaml" />
         <MergeResourceInclude Source="NavigationMenu.axaml" />