diff --git a/src/Ursa.Themes.Semi/Controls/Badge.axaml b/src/Ursa.Themes.Semi/Controls/Badge.axaml
index 9dd320d..7af3113 100644
--- a/src/Ursa.Themes.Semi/Controls/Badge.axaml
+++ b/src/Ursa.Themes.Semi/Controls/Badge.axaml
@@ -9,8 +9,8 @@
 
     <ControlTheme x:Key="{x:Type u:Badge}" TargetType="{x:Type u:Badge}">
         <!--  Set a very large corner radius to achieve pill look.  -->
-        <Setter Property="u:Badge.CornerRadius" Value="100" />
-        <Setter Property="u:Badge.FontSize" Value="14" />
+        <Setter Property="u:Badge.CornerRadius" Value="{DynamicResource BadgeCornerRadius}" />
+        <Setter Property="u:Badge.FontSize" Value="{DynamicResource BadgeFontSize}" />
         <Setter Property="u:Badge.Foreground" Value="{DynamicResource BadgeForeground}" />
         <Setter Property="u:Badge.Background" Value="{DynamicResource BadgePrimaryBadgeBackground}" />
         <Setter Property="u:Badge.ClipToBounds" Value="False" />
@@ -19,7 +19,7 @@
         <Setter Property="u:Badge.BorderThickness" Value="{DynamicResource BadgeBorderThickness}" />
         <Setter Property="u:Badge.UseLayoutRounding" Value="False" />
         <Setter Property="u:Badge.BorderBrush" Value="{DynamicResource BadgeBorderBrush}" />
-        <Setter Property="u:Badge.CornerPosition" Value="TopRight" />
+        <Setter Property="u:Badge.CornerPosition" Value="{DynamicResource BadgeCornerPosition}" />
         <Setter Property="u:Badge.Template">
             <ControlTemplate TargetType="{x:Type u:Badge}">
                 <Grid
@@ -36,8 +36,8 @@
                         ContentTemplate="{TemplateBinding ContentTemplate}" />
                     <Border
                         Name="{x:Static u:Badge.PART_BadgeContainer}"
-                        MinWidth="{DynamicResource BadgeHeight}"
-                        MinHeight="{DynamicResource BadgeHeight}"
+                        MinWidth="{DynamicResource BadgeMinWidth}"
+                        MinHeight="{DynamicResource BadgeMinHeight}"
                         Padding="{DynamicResource BadgePadding}"
                         HorizontalAlignment="Right"
                         VerticalAlignment="Top"
@@ -85,7 +85,7 @@
                             ContentTemplate="{TemplateBinding ContentTemplate}" />
                         <Border
                             Name="{x:Static u:Badge.PART_BadgeContainer}"
-                            Width="{DynamicResource BadgeDotHeight}"
+                            Width="{DynamicResource BadgeDotWidth}"
                             Height="{DynamicResource BadgeDotHeight}"
                             HorizontalAlignment="Right"
                             VerticalAlignment="Top"
diff --git a/src/Ursa.Themes.Semi/Themes/Shared/Badge.axaml b/src/Ursa.Themes.Semi/Themes/Shared/Badge.axaml
index 688be66..9ff0988 100644
--- a/src/Ursa.Themes.Semi/Themes/Shared/Badge.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Shared/Badge.axaml
@@ -1,8 +1,14 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!--  Add Resources Here  -->
-    <x:Double x:Key="BadgeHeight">18</x:Double>
+<ResourceDictionary
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:common="clr-namespace:Ursa.Common;assembly=Ursa">
+    <x:Double x:Key="BadgeMinWidth">18</x:Double>
+    <x:Double x:Key="BadgeMinHeight">18</x:Double>
+    <x:Double x:Key="BadgeDotWidth">8</x:Double>
     <x:Double x:Key="BadgeDotHeight">8</x:Double>
     <Thickness x:Key="BadgePadding">6,0</Thickness>
     <Thickness x:Key="BadgeBorderThickness">1</Thickness>
-    <x:Double x:Key="BadgeFontSize">8</x:Double>
-</ResourceDictionary>
+    <x:Double x:Key="BadgeFontSize">14</x:Double>
+    <CornerRadius x:Key="BadgeCornerRadius">100</CornerRadius>
+    <common:CornerPosition x:Key="BadgeCornerPosition">TopRight</common:CornerPosition>
+</ResourceDictionary>
\ No newline at end of file