diff --git a/demo/Ursa.Demo/Pages/DualBadgeDemo.axaml b/demo/Ursa.Demo/Pages/DualBadgeDemo.axaml
index 16b908b..3658046 100644
--- a/demo/Ursa.Demo/Pages/DualBadgeDemo.axaml
+++ b/demo/Ursa.Demo/Pages/DualBadgeDemo.axaml
@@ -19,106 +19,34 @@
         <StackPanel HorizontalAlignment="Left" Spacing="20">
             <TextBlock Text="Flat:" />
             <StackPanel Orientation="Horizontal">
-                <u:DualBadge>
-                    2.4k
-                </u:DualBadge>
-                <u:DualBadge>
-                    <u:DualBadge.Icon>
-                        <PathIcon
-                            Theme="{StaticResource InnerPathIcon}"
-                            Data="{StaticResource SemiIconDownload}" />
-                    </u:DualBadge.Icon>
-                    2.4k
-                </u:DualBadge>
-                <u:DualBadge Header="downloads">
-                    2.4k
-                </u:DualBadge>
-                <u:DualBadge Header="downloads">
-                    <u:DualBadge.Icon>
-                        <PathIcon
-                            Theme="{StaticResource InnerPathIcon}"
-                            Data="{StaticResource SemiIconDownload}" />
-                    </u:DualBadge.Icon>
-                    2.4k
-                </u:DualBadge>
+                <u:DualBadge Content="35k" />
+                <u:DualBadge Content="35k" Icon="{StaticResource SemiIconDownload}" />
+                <u:DualBadge Content="35k" Header="downloads" />
+                <u:DualBadge Content="35k" Header="downloads" Icon="{StaticResource SemiIconDownload}" />
             </StackPanel>
 
             <TextBlock Text="FlatSquare:" />
             <StackPanel Orientation="Horizontal">
-                <u:DualBadge Classes="FlatSquare">
-                    2.4k
-                </u:DualBadge>
-                <u:DualBadge Classes="FlatSquare">
-                    <u:DualBadge.Icon>
-                        <PathIcon
-                            Theme="{StaticResource InnerPathIcon}"
-                            Data="{StaticResource SemiIconDownload}" />
-                    </u:DualBadge.Icon>
-                    2.4k
-                </u:DualBadge>
-                <u:DualBadge Classes="FlatSquare" Header="downloads">
-                    2.4k
-                </u:DualBadge>
-                <u:DualBadge Classes="FlatSquare" Header="downloads">
-                    <u:DualBadge.Icon>
-                        <PathIcon
-                            Theme="{StaticResource InnerPathIcon}"
-                            Data="{StaticResource SemiIconDownload}" />
-                    </u:DualBadge.Icon>
-                    2.4k
-                </u:DualBadge>
+                <u:DualBadge Classes="FlatSquare" Content="35k" />
+                <u:DualBadge Classes="FlatSquare" Content="35k" Icon="{StaticResource SemiIconDownload}" />
+                <u:DualBadge Classes="FlatSquare" Content="35k" Header="downloads" />
+                <u:DualBadge Classes="FlatSquare" Content="35k" Header="downloads" Icon="{StaticResource SemiIconDownload}" />
             </StackPanel>
 
             <TextBlock Text="Plastic:" />
             <StackPanel Orientation="Horizontal">
-                <u:DualBadge Classes="Plastic">
-                    2.4k
-                </u:DualBadge>
-                <u:DualBadge Classes="Plastic">
-                    <u:DualBadge.Icon>
-                        <PathIcon
-                            Theme="{StaticResource InnerPathIcon}"
-                            Data="{StaticResource SemiIconDownload}" />
-                    </u:DualBadge.Icon>
-                    2.4k
-                </u:DualBadge>
-                <u:DualBadge Classes="Plastic" Header="downloads">
-                    2.4k
-                </u:DualBadge>
-                <u:DualBadge Classes="Plastic" Header="downloads">
-                    <u:DualBadge.Icon>
-                        <PathIcon
-                            Theme="{StaticResource InnerPathIcon}"
-                            Data="{StaticResource SemiIconDownload}" />
-                    </u:DualBadge.Icon>
-                    2.4k
-                </u:DualBadge>
+                <u:DualBadge Classes="Plastic" Content="35k" />
+                <u:DualBadge Classes="Plastic" Content="35k" Icon="{StaticResource SemiIconDownload}" />
+                <u:DualBadge Classes="Plastic" Content="35k" Header="downloads" />
+                <u:DualBadge Classes="Plastic" Content="35k" Header="downloads" Icon="{StaticResource SemiIconDownload}" />
             </StackPanel>
 
             <TextBlock Text="ForTheBadge:" />
             <StackPanel Orientation="Horizontal">
-                <u:DualBadge Classes="ForTheBadge">
-                    2.4K
-                </u:DualBadge>
-                <u:DualBadge Classes="ForTheBadge">
-                    <u:DualBadge.Icon>
-                        <PathIcon
-                            Theme="{StaticResource InnerPathIcon}"
-                            Data="{StaticResource SemiIconDownload}" />
-                    </u:DualBadge.Icon>
-                    2.4K
-                </u:DualBadge>
-                <u:DualBadge Classes="ForTheBadge" Header="DOWNLOADS">
-                    2.4K
-                </u:DualBadge>
-                <u:DualBadge Classes="ForTheBadge" Header="DOWNLOADS">
-                    <u:DualBadge.Icon>
-                        <PathIcon
-                            Theme="{StaticResource InnerPathIcon}"
-                            Data="{StaticResource SemiIconDownload}" />
-                    </u:DualBadge.Icon>
-                    2.4K
-                </u:DualBadge>
+                <u:DualBadge Classes="ForTheBadge" Content="35K" />
+                <u:DualBadge Classes="ForTheBadge" Content="35K" Icon="{StaticResource SemiIconDownload}" />
+                <u:DualBadge Classes="ForTheBadge" Content="35K" Header="DOWNLOADS" />
+                <u:DualBadge Classes="ForTheBadge" Content="35K" Header="DOWNLOADS" Icon="{StaticResource SemiIconDownload}" />
             </StackPanel>
 
             <WrapPanel>
diff --git a/src/Ursa.Themes.Semi/Controls/DualBadge.axaml b/src/Ursa.Themes.Semi/Controls/DualBadge.axaml
index d438616..eb9c5d9 100644
--- a/src/Ursa.Themes.Semi/Controls/DualBadge.axaml
+++ b/src/Ursa.Themes.Semi/Controls/DualBadge.axaml
@@ -3,39 +3,54 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:u="https://irihi.tech/ursa"
     xmlns:iri="https://irihi.tech/shared">
+    <Design.PreviewWith>
+        <StackPanel>
+            <u:DualBadge
+                Icon="{StaticResource SemiIconDownload}"
+                Header="downloads"
+                Content="35k" />
+        </StackPanel>
+    </Design.PreviewWith>
     <ControlTheme x:Key="{x:Type u:DualBadge}" TargetType="u:DualBadge">
-        <Setter Property="CornerRadius" Value="{DynamicResource DualBadgeDefaultCornerRadius}" />
-        <Setter Property="FontSize" Value="{DynamicResource DualBadgeDefaultFontSize}" />
+        <Setter Property="HorizontalAlignment" Value="Left" />
+        <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="IconForeground" Value="{DynamicResource DualBadgeDefaultIconForeground}" />
         <Setter Property="HeaderForeground" Value="{DynamicResource DualBadgeDefaultHeaderForeground}" />
         <Setter Property="HeaderBackground" Value="{DynamicResource DualBadgeDefaultHeaderBackground}" />
         <Setter Property="Foreground" Value="{DynamicResource DualBadgeDefaultForeground}" />
+        <Setter Property="CornerRadius" Value="{DynamicResource DualBadgeDefaultCornerRadius}" />
         <Setter Property="Background" Value="{DynamicResource DualBadgeFlatGreenBackground}" />
-        <Setter Property="ClipToBounds" Value="{DynamicResource DualBadgeDefaultClipToBounds}" />
-        <Setter Property="HorizontalAlignment" Value="{DynamicResource DualBadgeDefaultHorizontalAlignment}" />
-        <Setter Property="VerticalAlignment" Value="{DynamicResource DualBadgeDefaultVerticalAlignment}" />
-        <Setter Property="UseLayoutRounding" Value="{DynamicResource DualBadgeDefaultUseLayoutRounding}" />
         <Setter Property="Padding" Value="{DynamicResource DualBadgeDefaultPadding}" />
+        <Setter Property="FontSize" Value="{DynamicResource DualBadgeDefaultFontSize}" />
+        <Setter Property="UseLayoutRounding" Value="False" />
+        <Setter Property="ClipToBounds" Value="True" />
         <Setter Property="Template">
             <ControlTemplate TargetType="{x:Type u:DualBadge}">
                 <Border
                     HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
                     VerticalAlignment="{TemplateBinding VerticalAlignment}"
-                    ClipToBounds="True"
-                    CornerRadius="{TemplateBinding CornerRadius}">
+                    CornerRadius="{TemplateBinding CornerRadius}"
+                    ClipToBounds="{TemplateBinding ClipToBounds}">
                     <Grid ColumnDefinitions="Auto,Auto">
                         <DockPanel
                             Grid.Column="0"
                             Background="{TemplateBinding HeaderBackground}">
                             <ContentPresenter
                                 Name="{x:Static u:DualBadge.PART_Icon}"
-                                Width="{DynamicResource DualBadgeIconWidth}"
-                                Height="{DynamicResource DualBadgeIconHeight}"
+                                DockPanel.Dock="Left"
                                 IsVisible="{TemplateBinding Icon,Converter={x:Static ObjectConverters.IsNotNull}}"
                                 Foreground="{TemplateBinding IconForeground}"
                                 Margin="{TemplateBinding Padding, Converter={iri:ThicknessMixerConverter 'Vertical,Left'}}"
                                 Content="{TemplateBinding Icon}"
-                                ContentTemplate="{TemplateBinding IconTemplate}" />
+                                ContentTemplate="{TemplateBinding IconTemplate}">
+                                <ContentPresenter.DataTemplates>
+                                    <DataTemplate DataType="Geometry">
+                                        <PathIcon
+                                            Theme="{StaticResource InnerPathIcon}"
+                                            Data="{Binding}" />
+                                    </DataTemplate>
+                                </ContentPresenter.DataTemplates>
+                            </ContentPresenter>
                             <ContentPresenter
                                 Name="{x:Static u:DualBadge.PART_HeaderPresenter}"
                                 TextElement.FontSize="{TemplateBinding FontSize}"
diff --git a/src/Ursa.Themes.Semi/Themes/Dark/DualBadge.axaml b/src/Ursa.Themes.Semi/Themes/Dark/DualBadge.axaml
index 18d9881..c04b278 100644
--- a/src/Ursa.Themes.Semi/Themes/Dark/DualBadge.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Dark/DualBadge.axaml
@@ -3,143 +3,143 @@
     <StaticResource x:Key="DualBadgeDefaultHeaderForeground" ResourceKey="SemiColorWhite" />
     <StaticResource x:Key="DualBadgeDefaultForeground" ResourceKey="SemiColorWhite" />
     <LinearGradientBrush x:Key="DualBadgeDefaultHeaderBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#555B61" Offset="0" />
-        <GradientStop Color="#41464C" Offset="1" />
+        <GradientStop Color="{StaticResource SemiGrey3Color}" Offset="0" />
+        <GradientStop Color="{StaticResource SemiGrey2Color}" Offset="1" />
     </LinearGradientBrush>
 
     <LinearGradientBrush x:Key="DualBadgeFlatRedBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#FA664C" Offset="0" />
-        <GradientStop Color="#F93920" Offset="1" />
+        <GradientStop Color="{StaticResource SemiRed5Color}" Offset="0" />
+        <GradientStop Color="{StaticResource SemiRed4Color}" Offset="1" />
     </LinearGradientBrush>
     <LinearGradientBrush x:Key="DualBadgeFlatPinkBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#ED487B" Offset="0" />
-        <GradientStop Color="#E91E63" Offset="1" />
+        <GradientStop Color="{StaticResource SemiPink5Color}" Offset="0" />
+        <GradientStop Color="{StaticResource SemiPink4Color}" Offset="1" />
     </LinearGradientBrush>
     <LinearGradientBrush x:Key="DualBadgeFlatPurpleBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#B449C2" Offset="0" />
-        <GradientStop Color="#9E28B3" Offset="1" />
+        <GradientStop Color="{StaticResource SemiPurple5Color}" Offset="0" />
+        <GradientStop Color="{StaticResource SemiPurple4Color}" Offset="1" />
     </LinearGradientBrush>
     <LinearGradientBrush x:Key="DualBadgeFlatVioletBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#885BD2" Offset="0" />
-        <GradientStop Color="#6A3AC7" Offset="1" />
+        <GradientStop Color="{StaticResource SemiViolet5Color}" Offset="0" />
+        <GradientStop Color="{StaticResource SemiViolet4Color}" Offset="1" />
     </LinearGradientBrush>
     <LinearGradientBrush x:Key="DualBadgeFlatIndigoBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#5E6FC4" Offset="0" />
-        <GradientStop Color="#3F51B5" Offset="1" />
+        <GradientStop Color="{StaticResource SemiIndigo5Color}" Offset="0" />
+        <GradientStop Color="{StaticResource SemiIndigo4Color}" Offset="1" />
     </LinearGradientBrush>
     <LinearGradientBrush x:Key="DualBadgeFlatBlueBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#3295FB" Offset="0" />
-        <GradientStop Color="#0077FA" Offset="1" />
+        <GradientStop Color="{StaticResource SemiBlue5Color}" Offset="0" />
+        <GradientStop Color="{StaticResource SemiBlue4Color}" Offset="1" />
     </LinearGradientBrush>
     <LinearGradientBrush x:Key="DualBadgeFlatLightBlueBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#30ACF1" Offset="0" />
-        <GradientStop Color="#0095EE" Offset="1" />
+        <GradientStop Color="{StaticResource SemiLightBlue5Color}" Offset="0" />
+        <GradientStop Color="{StaticResource SemiLightBlue4Color}" Offset="1" />
     </LinearGradientBrush>
     <LinearGradientBrush x:Key="DualBadgeFlatCyanBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#2CB8C5" Offset="0" />
-        <GradientStop Color="#2CB8C5" Offset="1" />
+        <GradientStop Color="{StaticResource SemiCyan5Color}" Offset="0" />
+        <GradientStop Color="{StaticResource SemiCyan4Color}" Offset="1" />
     </LinearGradientBrush>
     <LinearGradientBrush x:Key="DualBadgeFlatTealBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#27C2B0" Offset="0" />
-        <GradientStop Color="#00B3A1" Offset="1" />
+        <GradientStop Color="{StaticResource SemiTeal5Color}" Offset="0" />
+        <GradientStop Color="{StaticResource SemiTeal4Color}" Offset="1" />
     </LinearGradientBrush>
     <LinearGradientBrush x:Key="DualBadgeFlatGreenBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#5AC262" Offset="0" />
-        <GradientStop Color="#3BB346" Offset="1" />
+        <GradientStop Color="{StaticResource SemiGreen5Color}" Offset="0" />
+        <GradientStop Color="{StaticResource SemiGreen4Color}" Offset="1" />
     </LinearGradientBrush>
     <LinearGradientBrush x:Key="DualBadgeFlatLightGreenBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#93C55B" Offset="0" />
-        <GradientStop Color="#7BB63C" Offset="1" />
+        <GradientStop Color="{StaticResource SemiLightGreen5Color}" Offset="0" />
+        <GradientStop Color="{StaticResource SemiLightGreen4Color}" Offset="1" />
     </LinearGradientBrush>
     <LinearGradientBrush x:Key="DualBadgeFlatLimeBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#A7DA2C" Offset="0" />
-        <GradientStop Color="#9BD100" Offset="1" />
+        <GradientStop Color="{StaticResource SemiLime5Color}" Offset="0" />
+        <GradientStop Color="{StaticResource SemiLime4Color}" Offset="1" />
     </LinearGradientBrush>
     <LinearGradientBrush x:Key="DualBadgeFlatYellowBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#FBDA32" Offset="0" />
-        <GradientStop Color="#FAC800" Offset="1" />
+        <GradientStop Color="{StaticResource SemiYellow5Color}" Offset="0" />
+        <GradientStop Color="{StaticResource SemiYellow4Color}" Offset="1" />
     </LinearGradientBrush>
     <LinearGradientBrush x:Key="DualBadgeFlatAmberBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#F3C641" Offset="0" />
-        <GradientStop Color="#F0B114" Offset="1" />
+        <GradientStop Color="{StaticResource SemiAmber5Color}" Offset="0" />
+        <GradientStop Color="{StaticResource SemiAmber4Color}" Offset="1" />
     </LinearGradientBrush>
     <LinearGradientBrush x:Key="DualBadgeFlatOrangeBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#FDA633" Offset="0" />
-        <GradientStop Color="#FC8800" Offset="1" />
+        <GradientStop Color="{StaticResource SemiOrange5Color}" Offset="0" />
+        <GradientStop Color="{StaticResource SemiOrange4Color}" Offset="1" />
     </LinearGradientBrush>
     <LinearGradientBrush x:Key="DualBadgeFlatGreyBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#888D92" Offset="0" />
-        <GradientStop Color="#6B7075" Offset="1" />
+        <GradientStop Color="{StaticResource SemiGrey5Color}" Offset="0" />
+        <GradientStop Color="{StaticResource SemiGrey4Color}" Offset="1" />
     </LinearGradientBrush>
 
 
     <LinearGradientBrush x:Key="DualBadgePlasticHeaderBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#555B61" Offset="0" />
-        <GradientStop Color="#2E3238" Offset="1" />
+        <GradientStop Color="{StaticResource SemiGrey4Color}" Offset="0" />
+        <GradientStop Color="{StaticResource SemiGrey2Color}" Offset="1" />
     </LinearGradientBrush>
 
     <LinearGradientBrush x:Key="DualBadgePlasticRedBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#FA664C" Offset="0" />
-        <GradientStop Color="#D52515" Offset="1" />
+        <GradientStop Color="{StaticResource SemiRed6Color}" Offset="0" />
+        <GradientStop Color="{StaticResource SemiRed4Color}" Offset="1" />
     </LinearGradientBrush>
     <LinearGradientBrush x:Key="DualBadgePlasticPinkBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#ED487B" Offset="0" />
-        <GradientStop Color="#C51356" Offset="1" />
+        <GradientStop Color="{StaticResource SemiPink6Color}" Offset="0" />
+        <GradientStop Color="{StaticResource SemiPink4Color}" Offset="1" />
     </LinearGradientBrush>
     <LinearGradientBrush x:Key="DualBadgePlasticPurpleBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#B449C2" Offset="0" />
-        <GradientStop Color="#871E9E" Offset="1" />
+        <GradientStop Color="{StaticResource SemiPurple6Color}" Offset="0" />
+        <GradientStop Color="{StaticResource SemiPurple4Color}" Offset="1" />
     </LinearGradientBrush>
     <LinearGradientBrush x:Key="DualBadgePlasticVioletBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#885BD2" Offset="0" />
-        <GradientStop Color="#572FB3" Offset="1" />
+        <GradientStop Color="{StaticResource SemiViolet6Color}" Offset="0" />
+        <GradientStop Color="{StaticResource SemiViolet4Color}" Offset="1" />
     </LinearGradientBrush>
     <LinearGradientBrush x:Key="DualBadgePlasticIndigoBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#5E6FC4" Offset="0" />
-        <GradientStop Color="#3342A1" Offset="1" />
+        <GradientStop Color="{StaticResource SemiIndigo6Color}" Offset="0" />
+        <GradientStop Color="{StaticResource SemiIndigo4Color}" Offset="1" />
     </LinearGradientBrush>
     <LinearGradientBrush x:Key="DualBadgePlasticBlueBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#3295FB" Offset="0" />
-        <GradientStop Color="#0077FA" Offset="1" />
+        <GradientStop Color="{StaticResource SemiBlue6Color}" Offset="0" />
+        <GradientStop Color="{StaticResource SemiBlue4Color}" Offset="1" />
     </LinearGradientBrush>
     <LinearGradientBrush x:Key="DualBadgePlasticLightBlueBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#30ACF1" Offset="0" />
-        <GradientStop Color="#007BCA" Offset="1" />
+        <GradientStop Color="{StaticResource SemiLightBlue6Color}" Offset="0" />
+        <GradientStop Color="{StaticResource SemiLightBlue4Color}" Offset="1" />
     </LinearGradientBrush>
     <LinearGradientBrush x:Key="DualBadgePlasticCyanBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#2CB8C5" Offset="0" />
-        <GradientStop Color="#038698" Offset="1" />
+        <GradientStop Color="{StaticResource SemiCyan6Color}" Offset="0" />
+        <GradientStop Color="{StaticResource SemiCyan4Color}" Offset="1" />
     </LinearGradientBrush>
     <LinearGradientBrush x:Key="DualBadgePlasticTealBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#27C2B0" Offset="0" />
-        <GradientStop Color="#009589" Offset="1" />
+        <GradientStop Color="{StaticResource SemiTeal6Color}" Offset="0" />
+        <GradientStop Color="{StaticResource SemiTeal4Color}" Offset="1" />
     </LinearGradientBrush>
     <LinearGradientBrush x:Key="DualBadgePlasticGreenBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#5AC262" Offset="0" />
-        <GradientStop Color="#30953B" Offset="1" />
+        <GradientStop Color="{StaticResource SemiGreen6Color}" Offset="0" />
+        <GradientStop Color="{StaticResource SemiGreen4Color}" Offset="1" />
     </LinearGradientBrush>
     <LinearGradientBrush x:Key="DualBadgePlasticLightGreenBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#93C55B" Offset="0" />
-        <GradientStop Color="#649830" Offset="1" />
+        <GradientStop Color="{StaticResource SemiLightGreen6Color}" Offset="0" />
+        <GradientStop Color="{StaticResource SemiLightGreen4Color}" Offset="1" />
     </LinearGradientBrush>
     <LinearGradientBrush x:Key="DualBadgePlasticLimeBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#A7DA2C" Offset="0" />
-        <GradientStop Color="#7EAE00" Offset="1" />
+        <GradientStop Color="{StaticResource SemiLime6Color}" Offset="0" />
+        <GradientStop Color="{StaticResource SemiLime4Color}" Offset="1" />
     </LinearGradientBrush>
     <LinearGradientBrush x:Key="DualBadgePlasticYellowBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#FBDA32" Offset="0" />
-        <GradientStop Color="#D0AA00" Offset="1" />
+        <GradientStop Color="{StaticResource SemiYellow6Color}" Offset="0" />
+        <GradientStop Color="{StaticResource SemiYellow4Color}" Offset="1" />
     </LinearGradientBrush>
     <LinearGradientBrush x:Key="DualBadgePlasticAmberBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#F3C641" Offset="0" />
-        <GradientStop Color="#C88A0F" Offset="1" />
+        <GradientStop Color="{StaticResource SemiAmber6Color}" Offset="0" />
+        <GradientStop Color="{StaticResource SemiAmber4Color}" Offset="1" />
     </LinearGradientBrush>
     <LinearGradientBrush x:Key="DualBadgePlasticOrangeBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#FDA633" Offset="0" />
-        <GradientStop Color="#D26700" Offset="1" />
+        <GradientStop Color="{StaticResource SemiOrange6Color}" Offset="0" />
+        <GradientStop Color="{StaticResource SemiOrange4Color}" Offset="1" />
     </LinearGradientBrush>
     <LinearGradientBrush x:Key="DualBadgePlasticGreyBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#888D92" Offset="0" />
-        <GradientStop Color="#555B61" Offset="1" />
+        <GradientStop Color="{StaticResource SemiGrey6Color}" Offset="0" />
+        <GradientStop Color="{StaticResource SemiGrey4Color}" Offset="1" />
     </LinearGradientBrush>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/Light/DualBadge.axaml b/src/Ursa.Themes.Semi/Themes/Light/DualBadge.axaml
index 18d9881..e67db7f 100644
--- a/src/Ursa.Themes.Semi/Themes/Light/DualBadge.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Light/DualBadge.axaml
@@ -3,143 +3,143 @@
     <StaticResource x:Key="DualBadgeDefaultHeaderForeground" ResourceKey="SemiColorWhite" />
     <StaticResource x:Key="DualBadgeDefaultForeground" ResourceKey="SemiColorWhite" />
     <LinearGradientBrush x:Key="DualBadgeDefaultHeaderBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#555B61" Offset="0" />
-        <GradientStop Color="#41464C" Offset="1" />
+        <GradientStop Color="{StaticResource SemiGrey6Color}" Offset="0" />
+        <GradientStop Color="{StaticResource SemiGrey7Color}" Offset="1" />
     </LinearGradientBrush>
 
     <LinearGradientBrush x:Key="DualBadgeFlatRedBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#FA664C" Offset="0" />
-        <GradientStop Color="#F93920" Offset="1" />
+        <GradientStop Color="{StaticResource SemiRed4Color}" Offset="0" />
+        <GradientStop Color="{StaticResource SemiRed5Color}" Offset="1" />
     </LinearGradientBrush>
     <LinearGradientBrush x:Key="DualBadgeFlatPinkBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#ED487B" Offset="0" />
-        <GradientStop Color="#E91E63" Offset="1" />
+        <GradientStop Color="{StaticResource SemiPink4Color}" Offset="0" />
+        <GradientStop Color="{StaticResource SemiPink5Color}" Offset="1" />
     </LinearGradientBrush>
     <LinearGradientBrush x:Key="DualBadgeFlatPurpleBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#B449C2" Offset="0" />
-        <GradientStop Color="#9E28B3" Offset="1" />
+        <GradientStop Color="{StaticResource SemiPurple4Color}" Offset="0" />
+        <GradientStop Color="{StaticResource SemiPurple5Color}" Offset="1" />
     </LinearGradientBrush>
     <LinearGradientBrush x:Key="DualBadgeFlatVioletBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#885BD2" Offset="0" />
-        <GradientStop Color="#6A3AC7" Offset="1" />
+        <GradientStop Color="{StaticResource SemiViolet4Color}" Offset="0" />
+        <GradientStop Color="{StaticResource SemiViolet5Color}" Offset="1" />
     </LinearGradientBrush>
     <LinearGradientBrush x:Key="DualBadgeFlatIndigoBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#5E6FC4" Offset="0" />
-        <GradientStop Color="#3F51B5" Offset="1" />
+        <GradientStop Color="{StaticResource SemiIndigo4Color}" Offset="0" />
+        <GradientStop Color="{StaticResource SemiIndigo5Color}" Offset="1" />
     </LinearGradientBrush>
     <LinearGradientBrush x:Key="DualBadgeFlatBlueBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#3295FB" Offset="0" />
-        <GradientStop Color="#0077FA" Offset="1" />
+        <GradientStop Color="{StaticResource SemiBlue4Color}" Offset="0" />
+        <GradientStop Color="{StaticResource SemiBlue5Color}" Offset="1" />
     </LinearGradientBrush>
     <LinearGradientBrush x:Key="DualBadgeFlatLightBlueBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#30ACF1" Offset="0" />
-        <GradientStop Color="#0095EE" Offset="1" />
+        <GradientStop Color="{StaticResource SemiLightBlue4Color}" Offset="0" />
+        <GradientStop Color="{StaticResource SemiLightBlue5Color}" Offset="1" />
     </LinearGradientBrush>
     <LinearGradientBrush x:Key="DualBadgeFlatCyanBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#2CB8C5" Offset="0" />
-        <GradientStop Color="#2CB8C5" Offset="1" />
+        <GradientStop Color="{StaticResource SemiCyan4Color}" Offset="0" />
+        <GradientStop Color="{StaticResource SemiCyan5Color}" Offset="1" />
     </LinearGradientBrush>
     <LinearGradientBrush x:Key="DualBadgeFlatTealBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#27C2B0" Offset="0" />
-        <GradientStop Color="#00B3A1" Offset="1" />
+        <GradientStop Color="{StaticResource SemiTeal4Color}" Offset="0" />
+        <GradientStop Color="{StaticResource SemiTeal5Color}" Offset="1" />
     </LinearGradientBrush>
     <LinearGradientBrush x:Key="DualBadgeFlatGreenBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#5AC262" Offset="0" />
-        <GradientStop Color="#3BB346" Offset="1" />
+        <GradientStop Color="{StaticResource SemiGreen4Color}" Offset="0" />
+        <GradientStop Color="{StaticResource SemiGreen5Color}" Offset="1" />
     </LinearGradientBrush>
     <LinearGradientBrush x:Key="DualBadgeFlatLightGreenBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#93C55B" Offset="0" />
-        <GradientStop Color="#7BB63C" Offset="1" />
+        <GradientStop Color="{StaticResource SemiLightGreen4Color}" Offset="0" />
+        <GradientStop Color="{StaticResource SemiLightGreen5Color}" Offset="1" />
     </LinearGradientBrush>
     <LinearGradientBrush x:Key="DualBadgeFlatLimeBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#A7DA2C" Offset="0" />
-        <GradientStop Color="#9BD100" Offset="1" />
+        <GradientStop Color="{StaticResource SemiLime4Color}" Offset="0" />
+        <GradientStop Color="{StaticResource SemiLime5Color}" Offset="1" />
     </LinearGradientBrush>
     <LinearGradientBrush x:Key="DualBadgeFlatYellowBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#FBDA32" Offset="0" />
-        <GradientStop Color="#FAC800" Offset="1" />
+        <GradientStop Color="{StaticResource SemiYellow4Color}" Offset="0" />
+        <GradientStop Color="{StaticResource SemiYellow5Color}" Offset="1" />
     </LinearGradientBrush>
     <LinearGradientBrush x:Key="DualBadgeFlatAmberBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#F3C641" Offset="0" />
-        <GradientStop Color="#F0B114" Offset="1" />
+        <GradientStop Color="{StaticResource SemiAmber4Color}" Offset="0" />
+        <GradientStop Color="{StaticResource SemiAmber5Color}" Offset="1" />
     </LinearGradientBrush>
     <LinearGradientBrush x:Key="DualBadgeFlatOrangeBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#FDA633" Offset="0" />
-        <GradientStop Color="#FC8800" Offset="1" />
+        <GradientStop Color="{StaticResource SemiOrange4Color}" Offset="0" />
+        <GradientStop Color="{StaticResource SemiOrange5Color}" Offset="1" />
     </LinearGradientBrush>
     <LinearGradientBrush x:Key="DualBadgeFlatGreyBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#888D92" Offset="0" />
-        <GradientStop Color="#6B7075" Offset="1" />
+        <GradientStop Color="{StaticResource SemiGrey4Color}" Offset="0" />
+        <GradientStop Color="{StaticResource SemiGrey5Color}" Offset="1" />
     </LinearGradientBrush>
 
 
     <LinearGradientBrush x:Key="DualBadgePlasticHeaderBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#555B61" Offset="0" />
-        <GradientStop Color="#2E3238" Offset="1" />
+        <GradientStop Color="{StaticResource SemiGrey6Color}" Offset="0" />
+        <GradientStop Color="{StaticResource SemiGrey8Color}" Offset="1" />
     </LinearGradientBrush>
 
     <LinearGradientBrush x:Key="DualBadgePlasticRedBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#FA664C" Offset="0" />
-        <GradientStop Color="#D52515" Offset="1" />
+        <GradientStop Color="{StaticResource SemiRed4Color}" Offset="0" />
+        <GradientStop Color="{StaticResource SemiRed6Color}" Offset="1" />
     </LinearGradientBrush>
     <LinearGradientBrush x:Key="DualBadgePlasticPinkBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#ED487B" Offset="0" />
-        <GradientStop Color="#C51356" Offset="1" />
+        <GradientStop Color="{StaticResource SemiPink4Color}" Offset="0" />
+        <GradientStop Color="{StaticResource SemiPink6Color}" Offset="1" />
     </LinearGradientBrush>
     <LinearGradientBrush x:Key="DualBadgePlasticPurpleBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#B449C2" Offset="0" />
-        <GradientStop Color="#871E9E" Offset="1" />
+        <GradientStop Color="{StaticResource SemiPurple4Color}" Offset="0" />
+        <GradientStop Color="{StaticResource SemiPurple6Color}" Offset="1" />
     </LinearGradientBrush>
     <LinearGradientBrush x:Key="DualBadgePlasticVioletBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#885BD2" Offset="0" />
-        <GradientStop Color="#572FB3" Offset="1" />
+        <GradientStop Color="{StaticResource SemiViolet4Color}" Offset="0" />
+        <GradientStop Color="{StaticResource SemiViolet6Color}" Offset="1" />
     </LinearGradientBrush>
     <LinearGradientBrush x:Key="DualBadgePlasticIndigoBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#5E6FC4" Offset="0" />
-        <GradientStop Color="#3342A1" Offset="1" />
+        <GradientStop Color="{StaticResource SemiIndigo4Color}" Offset="0" />
+        <GradientStop Color="{StaticResource SemiIndigo6Color}" Offset="1" />
     </LinearGradientBrush>
     <LinearGradientBrush x:Key="DualBadgePlasticBlueBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#3295FB" Offset="0" />
-        <GradientStop Color="#0077FA" Offset="1" />
+        <GradientStop Color="{StaticResource SemiBlue4Color}" Offset="0" />
+        <GradientStop Color="{StaticResource SemiBlue6Color}" Offset="1" />
     </LinearGradientBrush>
     <LinearGradientBrush x:Key="DualBadgePlasticLightBlueBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#30ACF1" Offset="0" />
-        <GradientStop Color="#007BCA" Offset="1" />
+        <GradientStop Color="{StaticResource SemiLightBlue4Color}" Offset="0" />
+        <GradientStop Color="{StaticResource SemiLightBlue6Color}" Offset="1" />
     </LinearGradientBrush>
     <LinearGradientBrush x:Key="DualBadgePlasticCyanBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#2CB8C5" Offset="0" />
-        <GradientStop Color="#038698" Offset="1" />
+        <GradientStop Color="{StaticResource SemiCyan4Color}" Offset="0" />
+        <GradientStop Color="{StaticResource SemiCyan6Color}" Offset="1" />
     </LinearGradientBrush>
     <LinearGradientBrush x:Key="DualBadgePlasticTealBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#27C2B0" Offset="0" />
-        <GradientStop Color="#009589" Offset="1" />
+        <GradientStop Color="{StaticResource SemiTeal4Color}" Offset="0" />
+        <GradientStop Color="{StaticResource SemiTeal6Color}" Offset="1" />
     </LinearGradientBrush>
     <LinearGradientBrush x:Key="DualBadgePlasticGreenBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#5AC262" Offset="0" />
-        <GradientStop Color="#30953B" Offset="1" />
+        <GradientStop Color="{StaticResource SemiGreen4Color}" Offset="0" />
+        <GradientStop Color="{StaticResource SemiGreen6Color}" Offset="1" />
     </LinearGradientBrush>
     <LinearGradientBrush x:Key="DualBadgePlasticLightGreenBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#93C55B" Offset="0" />
-        <GradientStop Color="#649830" Offset="1" />
+        <GradientStop Color="{StaticResource SemiLightGreen4Color}" Offset="0" />
+        <GradientStop Color="{StaticResource SemiLightGreen6Color}" Offset="1" />
     </LinearGradientBrush>
     <LinearGradientBrush x:Key="DualBadgePlasticLimeBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#A7DA2C" Offset="0" />
-        <GradientStop Color="#7EAE00" Offset="1" />
+        <GradientStop Color="{StaticResource SemiLime4Color}" Offset="0" />
+        <GradientStop Color="{StaticResource SemiLime6Color}" Offset="1" />
     </LinearGradientBrush>
     <LinearGradientBrush x:Key="DualBadgePlasticYellowBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#FBDA32" Offset="0" />
-        <GradientStop Color="#D0AA00" Offset="1" />
+        <GradientStop Color="{StaticResource SemiYellow4Color}" Offset="0" />
+        <GradientStop Color="{StaticResource SemiYellow6Color}" Offset="1" />
     </LinearGradientBrush>
     <LinearGradientBrush x:Key="DualBadgePlasticAmberBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#F3C641" Offset="0" />
-        <GradientStop Color="#C88A0F" Offset="1" />
+        <GradientStop Color="{StaticResource SemiAmber4Color}" Offset="0" />
+        <GradientStop Color="{StaticResource SemiAmber6Color}" Offset="1" />
     </LinearGradientBrush>
     <LinearGradientBrush x:Key="DualBadgePlasticOrangeBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#FDA633" Offset="0" />
-        <GradientStop Color="#D26700" Offset="1" />
+        <GradientStop Color="{StaticResource SemiOrange4Color}" Offset="0" />
+        <GradientStop Color="{StaticResource SemiOrange6Color}" Offset="1" />
     </LinearGradientBrush>
     <LinearGradientBrush x:Key="DualBadgePlasticGreyBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#888D92" Offset="0" />
-        <GradientStop Color="#555B61" Offset="1" />
+        <GradientStop Color="{StaticResource SemiGrey4Color}" Offset="0" />
+        <GradientStop Color="{StaticResource SemiGrey6Color}" Offset="1" />
     </LinearGradientBrush>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/Shared/DualBadge.axaml b/src/Ursa.Themes.Semi/Themes/Shared/DualBadge.axaml
index 7a55daa..84f9b61 100644
--- a/src/Ursa.Themes.Semi/Themes/Shared/DualBadge.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Shared/DualBadge.axaml
@@ -1,19 +1,10 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <CornerRadius x:Key="DualBadgeDefaultCornerRadius">4</CornerRadius>
+    <CornerRadius x:Key="DualBadgeDefaultCornerRadius">3</CornerRadius>
     <x:Double x:Key="DualBadgeDefaultFontSize">12</x:Double>
     <Thickness x:Key="DualBadgeDefaultThickness">1</Thickness>
     <Thickness x:Key="DualBadgeDefaultPadding">4 2</Thickness>
-    <HorizontalAlignment x:Key="DualBadgeDefaultHorizontalAlignment">Left</HorizontalAlignment>
-    <VerticalAlignment x:Key="DualBadgeDefaultVerticalAlignment">Center</VerticalAlignment>
-    <x:Boolean x:Key="DualBadgeDefaultClipToBounds">False</x:Boolean>
-    <x:Boolean x:Key="DualBadgeDefaultUseLayoutRounding">False</x:Boolean>
-    <x:Double x:Key="DualBadgeIconWidth">14</x:Double>
-    <x:Double x:Key="DualBadgeIconHeight">14</x:Double>
-
     <CornerRadius x:Key="DualBadgeFlatSquareCornerRadius">0</CornerRadius>
     <Thickness x:Key="DualBadgePlasticPadding">4 0</Thickness>
-
     <CornerRadius x:Key="DualBadgeForTheBadgeCornerRadius">0</CornerRadius>
     <Thickness x:Key="DualBadgeForTheBadgePadding">12 6</Thickness>
-
 </ResourceDictionary>
\ No newline at end of file