diff --git a/demo/Ursa.Demo/Pages/AvatarDemo.axaml b/demo/Ursa.Demo/Pages/AvatarDemo.axaml
index 861960f..c3046c3 100644
--- a/demo/Ursa.Demo/Pages/AvatarDemo.axaml
+++ b/demo/Ursa.Demo/Pages/AvatarDemo.axaml
@@ -11,9 +11,6 @@
     <Design.DataContext>
         <vm:AvatarDemoViewModel />
     </Design.DataContext>
-    <UserControl.Resources>
-        <StreamGeometry x:Key="IconCamera">M7.44721 3.10557C7.786 2.428 8.47852 2 9.23607 2H14.7639C15.5215 2 16.214 2.428 16.5528 3.10557L17.5 5H20C21.6569 5 23 6.34315 23 8V18C23 19.6569 21.6569 21 20 21H4C2.34315 21 1 19.6569 1 18V8C1 6.34315 2.34315 5 4 5H6.5L7.44721 3.10557ZM9 13C9 11.3431 10.3431 10 12 10C13.6569 10 15 11.3431 15 13C15 14.6569 13.6569 16 12 16C10.3431 16 9 14.6569 9 13ZM12 8C9.23858 8 7 10.2386 7 13C7 15.7614 9.23858 18 12 18C14.7614 18 17 15.7614 17 13C17 10.2386 14.7614 8 12 8Z</StreamGeometry>
-    </UserControl.Resources>
     <UserControl.Styles>
         <Style Selector="u|Avatar">
             <Setter Property="Content" Value="{Binding Content}" />
@@ -32,7 +29,8 @@
                                 Width="{Binding $parent[u:Avatar].Width}"
                                 Height="{Binding $parent[u:Avatar].Height}" />
                             <PathIcon
-                                Data="{StaticResource IconCamera}"
+                                Theme="{StaticResource InnerPathIcon}"
+                                Data="{StaticResource SemiIconCamera}"
                                 Width="{Binding $parent[u:Avatar].FontSize}"
                                 Height="{Binding $parent[u:Avatar].FontSize}" />
                         </Panel>
@@ -86,7 +84,8 @@
                                 Width="{Binding $parent[u:Avatar].Width}"
                                 Height="{Binding $parent[u:Avatar].Height}" />
                             <PathIcon
-                                Data="{StaticResource IconCamera}"
+                                Theme="{StaticResource InnerPathIcon}"
+                                Data="{StaticResource SemiIconCamera}"
                                 Width="{Binding $parent[u:Avatar].FontSize}"
                                 Height="{Binding $parent[u:Avatar].FontSize}" />
                         </Panel>
diff --git a/demo/Ursa.Demo/Pages/BreadcrumbDemo.axaml b/demo/Ursa.Demo/Pages/BreadcrumbDemo.axaml
index 101542e..f35ef49 100644
--- a/demo/Ursa.Demo/Pages/BreadcrumbDemo.axaml
+++ b/demo/Ursa.Demo/Pages/BreadcrumbDemo.axaml
@@ -48,7 +48,9 @@
             </u:Breadcrumb.Styles>
             <u:Breadcrumb.IconTemplate>
                 <DataTemplate DataType="x:String">
-                    <PathIcon Width="12" Height="12" Data="{Binding Path=., Converter={StaticResource IconConverter}}"></PathIcon>
+                    <PathIcon
+                        Theme="{StaticResource InnerPathIcon}"
+                        Data="{Binding Converter={StaticResource IconConverter}}" />
                 </DataTemplate>
             </u:Breadcrumb.IconTemplate>
         </u:Breadcrumb>
diff --git a/demo/Ursa.Demo/Pages/DialogDemo.axaml b/demo/Ursa.Demo/Pages/DialogDemo.axaml
index 2683c00..7fce698 100644
--- a/demo/Ursa.Demo/Pages/DialogDemo.axaml
+++ b/demo/Ursa.Demo/Pages/DialogDemo.axaml
@@ -56,11 +56,10 @@
                             <StackPanel Orientation="Horizontal">
                                 <TextBlock Text="Style Class" />
                                 <PathIcon
-                                    Width="12"
-                                    Height="12"
+                                    Theme="{StaticResource InnerPathIcon}"
                                     VerticalAlignment="Center"
                                     TextElement.FontWeight="Normal"
-                                    Data="{DynamicResource DialogQuestionIconGlyph}"
+                                    Data="{DynamicResource SemiIconHelpCircle}"
                                     ToolTip.Tip="Pass a Style Class to the created Dialog. In this example, if you set StyleClass as 'Custom', You will get Special Style for OK Button. These styles usually are defined in the root of your App/Window" />
                             </StackPanel>
                         </u:FormItem.Label>
@@ -148,11 +147,10 @@
                             <StackPanel Orientation="Horizontal">
                                 <TextBlock Text="Style Class" />
                                 <PathIcon
-                                    Width="12"
-                                    Height="12"
+                                    Theme="{StaticResource InnerPathIcon}"
                                     VerticalAlignment="Center"
                                     TextElement.FontWeight="Normal"
-                                    Data="{DynamicResource DialogQuestionIconGlyph}"
+                                    Data="{DynamicResource SemiIconHelpCircle}"
                                     ToolTip.Tip="Pass a Style Class to the created Dialog. In this example, if you set StyleClass as 'Custom', You will get Special Style for OK Button. These styles usually are defined in the root of your App/Window" />
                             </StackPanel>
                         </u:FormItem.Label>
diff --git a/demo/Ursa.Demo/Pages/DualBadgeDemo.axaml b/demo/Ursa.Demo/Pages/DualBadgeDemo.axaml
index f7b87eb..16b908b 100644
--- a/demo/Ursa.Demo/Pages/DualBadgeDemo.axaml
+++ b/demo/Ursa.Demo/Pages/DualBadgeDemo.axaml
@@ -9,10 +9,6 @@
     d:DesignWidth="800"
     mc:Ignorable="d">
 
-    <UserControl.Resources>
-        <StreamGeometry x:Key="InfoPath">M12 23C18.0751 23 23 18.0751 23 12C23 5.92487 18.0751 1 12 1C5.92487 1 1 5.92487 1 12C1 18.0751 5.92487 23 12 23ZM14 7C14 8.10457 13.1046 9 12 9C10.8954 9 10 8.10457 10 7C10 5.89543 10.8954 5 12 5C13.1046 5 14 5.89543 14 7ZM9 10.75C9 10.3358 9.33579 10 9.75 10H12.5C13.0523 10 13.5 10.4477 13.5 11V16.5H14.25C14.6642 16.5 15 16.8358 15 17.25C15 17.6642 14.6642 18 14.25 18H9.75C9.33579 18 9 17.6642 9 17.25C9 16.8358 9.33579 16.5 9.75 16.5H10.5V11.5H9.75C9.33579 11.5 9 11.1642 9 10.75Z</StreamGeometry>
-    </UserControl.Resources>
-
     <UserControl.Styles>
         <Style Selector="u|DualBadge">
             <Setter Property="Margin" Value="4" />
@@ -29,9 +25,8 @@
                 <u:DualBadge>
                     <u:DualBadge.Icon>
                         <PathIcon
-                            Width="14"
-                            Height="14"
-                            Data="{StaticResource InfoPath}" />
+                            Theme="{StaticResource InnerPathIcon}"
+                            Data="{StaticResource SemiIconDownload}" />
                     </u:DualBadge.Icon>
                     2.4k
                 </u:DualBadge>
@@ -41,9 +36,8 @@
                 <u:DualBadge Header="downloads">
                     <u:DualBadge.Icon>
                         <PathIcon
-                            Width="14"
-                            Height="14"
-                            Data="{StaticResource InfoPath}" />
+                            Theme="{StaticResource InnerPathIcon}"
+                            Data="{StaticResource SemiIconDownload}" />
                     </u:DualBadge.Icon>
                     2.4k
                 </u:DualBadge>
@@ -57,9 +51,8 @@
                 <u:DualBadge Classes="FlatSquare">
                     <u:DualBadge.Icon>
                         <PathIcon
-                            Width="14"
-                            Height="14"
-                            Data="{StaticResource InfoPath}" />
+                            Theme="{StaticResource InnerPathIcon}"
+                            Data="{StaticResource SemiIconDownload}" />
                     </u:DualBadge.Icon>
                     2.4k
                 </u:DualBadge>
@@ -69,9 +62,8 @@
                 <u:DualBadge Classes="FlatSquare" Header="downloads">
                     <u:DualBadge.Icon>
                         <PathIcon
-                            Width="14"
-                            Height="14"
-                            Data="{StaticResource InfoPath}" />
+                            Theme="{StaticResource InnerPathIcon}"
+                            Data="{StaticResource SemiIconDownload}" />
                     </u:DualBadge.Icon>
                     2.4k
                 </u:DualBadge>
@@ -85,9 +77,8 @@
                 <u:DualBadge Classes="Plastic">
                     <u:DualBadge.Icon>
                         <PathIcon
-                            Width="12"
-                            Height="12"
-                            Data="{StaticResource InfoPath}" />
+                            Theme="{StaticResource InnerPathIcon}"
+                            Data="{StaticResource SemiIconDownload}" />
                     </u:DualBadge.Icon>
                     2.4k
                 </u:DualBadge>
@@ -97,9 +88,8 @@
                 <u:DualBadge Classes="Plastic" Header="downloads">
                     <u:DualBadge.Icon>
                         <PathIcon
-                            Width="12"
-                            Height="12"
-                            Data="{StaticResource InfoPath}" />
+                            Theme="{StaticResource InnerPathIcon}"
+                            Data="{StaticResource SemiIconDownload}" />
                     </u:DualBadge.Icon>
                     2.4k
                 </u:DualBadge>
@@ -113,9 +103,8 @@
                 <u:DualBadge Classes="ForTheBadge">
                     <u:DualBadge.Icon>
                         <PathIcon
-                            Width="14"
-                            Height="14"
-                            Data="{StaticResource InfoPath}" />
+                            Theme="{StaticResource InnerPathIcon}"
+                            Data="{StaticResource SemiIconDownload}" />
                     </u:DualBadge.Icon>
                     2.4K
                 </u:DualBadge>
@@ -125,9 +114,8 @@
                 <u:DualBadge Classes="ForTheBadge" Header="DOWNLOADS">
                     <u:DualBadge.Icon>
                         <PathIcon
-                            Width="14"
-                            Height="14"
-                            Data="{StaticResource InfoPath}" />
+                            Theme="{StaticResource InnerPathIcon}"
+                            Data="{StaticResource SemiIconDownload}" />
                     </u:DualBadge.Icon>
                     2.4K
                 </u:DualBadge>
diff --git a/demo/Ursa.Demo/Pages/IconButtonDemo.axaml b/demo/Ursa.Demo/Pages/IconButtonDemo.axaml
index 9313a4c..79957e1 100644
--- a/demo/Ursa.Demo/Pages/IconButtonDemo.axaml
+++ b/demo/Ursa.Demo/Pages/IconButtonDemo.axaml
@@ -9,9 +9,6 @@
     d:DesignHeight="450"
     d:DesignWidth="800"
     mc:Ignorable="d">
-    <UserControl.Resources>
-        <StreamGeometry x:Key="iconGlyph">M12.0101 1C5.92171 1 1 5.92171 1 12.0101C1 16.8771 4.15354 20.9967 8.5284 22.455C9.07526 22.5644 9.27577 22.218 9.27577 21.9264C9.27577 21.6712 9.25754 20.7962 9.25754 19.8848C6.19514 20.541 5.55714 18.5723 5.55714 18.5723C5.06497 17.2963 4.33583 16.9682 4.33583 16.9682C3.33326 16.2938 4.40874 16.2938 4.40874 16.2938C5.52069 16.3667 6.104 17.4239 6.104 17.4239C7.08834 19.101 8.67423 18.627 9.31223 18.3354C9.40337 17.6245 9.69503 17.1323 10.0049 16.8589C7.56229 16.6037 4.99206 15.6558 4.99206 11.4267C4.99206 10.2237 5.42954 9.23931 6.12223 8.47371C6.01286 8.20028 5.63006 7.07011 6.2316 5.55714C6.2316 5.55714 7.16126 5.26548 9.25754 6.68731C10.1325 6.45034 11.0804 6.32274 12.0101 6.32274C12.9397 6.32274 13.8876 6.45034 14.7626 6.68731C16.8589 5.26548 17.7885 5.55714 17.7885 5.55714C18.3901 7.07011 18.0073 8.20028 17.8979 8.47371C18.6088 9.23931 19.0281 10.2237 19.0281 11.4267C19.0281 15.6558 16.4578 16.5854 13.997 16.8589C14.398 17.2052 14.7443 17.8614 14.7443 18.9004C14.7443 20.377 14.7261 21.5618 14.7261 21.9264C14.7261 22.218 14.9266 22.5644 15.4735 22.455C19.8483 20.9967 23.0019 16.8771 23.0019 12.0101C23.0201 5.92171 18.0802 1 12.0101 1Z</StreamGeometry>
-    </UserControl.Resources>
     <StackPanel HorizontalAlignment="Left" Spacing="16">
         <ToggleSwitch Name="loading" Content="Toggle Loading" />
         <u:EnumSelector Name="placement" EnumType="{x:Type common:Position}" />
@@ -36,9 +33,8 @@
             IsLoading="{Binding #loading.IsChecked}">
             <u:IconButton.Icon>
                 <PathIcon
-                    Width="14"
-                    Height="14"
-                    Data="{StaticResource iconGlyph}" />
+                    Theme="{StaticResource InnerPathIcon}"
+                    Data="{StaticResource SemiIconGithubLogo}" />
             </u:IconButton.Icon>
         </u:IconButton>
         <u:IconButton
@@ -48,9 +44,8 @@
             IsLoading="{Binding #loading.IsChecked}">
             <u:IconButton.Icon>
                 <PathIcon
-                    Width="14"
-                    Height="14"
-                    Data="{StaticResource iconGlyph}" />
+                    Theme="{StaticResource InnerPathIcon}"
+                    Data="{StaticResource SemiIconGithubLogo}" />
             </u:IconButton.Icon>
         </u:IconButton>
         <u:IconButton
@@ -61,9 +56,8 @@
             IsLoading="{Binding #loading.IsChecked}">
             <u:IconButton.Icon>
                 <PathIcon
-                    Width="14"
-                    Height="14"
-                    Data="{StaticResource iconGlyph}" />
+                    Theme="{StaticResource InnerPathIcon}"
+                    Data="{StaticResource SemiIconGithubLogo}" />
             </u:IconButton.Icon>
         </u:IconButton>
         <u:IconButton
@@ -74,9 +68,8 @@
             Theme="{DynamicResource SolidIconButton}">
             <u:IconButton.Icon>
                 <PathIcon
-                    Width="14"
-                    Height="14"
-                    Data="{StaticResource iconGlyph}" />
+                    Theme="{StaticResource InnerPathIcon}"
+                    Data="{StaticResource SemiIconGithubLogo}" />
             </u:IconButton.Icon>
         </u:IconButton>
         <u:IconButton
@@ -88,9 +81,8 @@
             Theme="{DynamicResource SolidIconButton}">
             <u:IconButton.Icon>
                 <PathIcon
-                    Width="14"
-                    Height="14"
-                    Data="{StaticResource iconGlyph}" />
+                    Theme="{StaticResource InnerPathIcon}"
+                    Data="{StaticResource SemiIconGithubLogo}" />
             </u:IconButton.Icon>
         </u:IconButton>
         <u:IconButton
diff --git a/demo/Ursa.Demo/Pages/IntroductionDemo.axaml b/demo/Ursa.Demo/Pages/IntroductionDemo.axaml
index c292152..ac0a9f2 100644
--- a/demo/Ursa.Demo/Pages/IntroductionDemo.axaml
+++ b/demo/Ursa.Demo/Pages/IntroductionDemo.axaml
@@ -14,7 +14,6 @@
         <vm:IntroductionDemoViewModel />
     </Design.DataContext>
     <UserControl.Resources>
-        <StreamGeometry x:Key="InfoPath">M12 23C18.0751 23 23 18.0751 23 12C23 5.92487 18.0751 1 12 1C5.92487 1 1 5.92487 1 12C1 18.0751 5.92487 23 12 23ZM14 7C14 8.10457 13.1046 9 12 9C10.8954 9 10 8.10457 10 7C10 5.89543 10.8954 5 12 5C13.1046 5 14 5.89543 14 7ZM9 10.75C9 10.3358 9.33579 10 9.75 10H12.5C13.0523 10 13.5 10.4477 13.5 11V16.5H14.25C14.6642 16.5 15 16.8358 15 17.25C15 17.6642 14.6642 18 14.25 18H9.75C9.33579 18 9 17.6642 9 17.25C9 16.8358 9.33579 16.5 9.75 16.5H10.5V11.5H9.75C9.33579 11.5 9 11.1642 9 10.75Z</StreamGeometry>
         <SolidColorBrush x:Key="MaskBackground" Opacity="0.2" Color="{DynamicResource SemiBlue3Color}" />
         <SolidColorBrush x:Key="MaskBorderBrush" Color="{DynamicResource SemiBlue5Color}" />
     </UserControl.Resources>
@@ -190,36 +189,32 @@
                         <u:DualBadge Header="downloads">
                             <u:DualBadge.Icon>
                                 <PathIcon
-                                    Width="14"
-                                    Height="14"
-                                    Data="{StaticResource InfoPath}" />
+                                    Theme="{StaticResource InnerPathIcon}"
+                                    Data="{StaticResource SemiIconDownload}" />
                             </u:DualBadge.Icon>
                             2.4k
                         </u:DualBadge>
                         <u:DualBadge Classes="FlatSquare" Header="downloads">
                             <u:DualBadge.Icon>
                                 <PathIcon
-                                    Width="14"
-                                    Height="14"
-                                    Data="{StaticResource InfoPath}" />
+                                    Theme="{StaticResource InnerPathIcon}"
+                                    Data="{StaticResource SemiIconDownload}" />
                             </u:DualBadge.Icon>
                             2.4k
                         </u:DualBadge>
                         <u:DualBadge Classes="Plastic" Header="downloads">
                             <u:DualBadge.Icon>
                                 <PathIcon
-                                    Width="12"
-                                    Height="12"
-                                    Data="{StaticResource InfoPath}" />
+                                    Theme="{StaticResource InnerPathIcon}"
+                                    Data="{StaticResource SemiIconDownload}" />
                             </u:DualBadge.Icon>
                             2.4k
                         </u:DualBadge>
                         <u:DualBadge Classes="ForTheBadge" Header="downloads">
                             <u:DualBadge.Icon>
                                 <PathIcon
-                                    Width="12"
-                                    Height="12"
-                                    Data="{StaticResource InfoPath}" />
+                                    Theme="{StaticResource InnerPathIcon}"
+                                    Data="{StaticResource SemiIconDownload}" />
                             </u:DualBadge.Icon>
                             2.4k
                         </u:DualBadge>
diff --git a/demo/Ursa.Demo/Pages/RatingDemo.axaml b/demo/Ursa.Demo/Pages/RatingDemo.axaml
index 89ab51f..f4e4ef6 100644
--- a/demo/Ursa.Demo/Pages/RatingDemo.axaml
+++ b/demo/Ursa.Demo/Pages/RatingDemo.axaml
@@ -10,11 +10,6 @@
              x:CompileBindings="True"
              x:DataType="vm:RatingDemoViewModel"
              mc:Ignorable="d">
-    <UserControl.Resources>
-        <StreamGeometry x:Key="LoveHeartGeometry">
-            M12 5.99999C10.5 2.12432 5.75193 2.0557 3.40383 4.4038C0.865423 6.94221 0.999999 10.5 3.50001 14C5.52139 16.8299 9.83088 20.3136 11.4069 21.5438C11.7573 21.8172 12.2427 21.8172 12.5931 21.5438C14.1691 20.3136 18.4786 16.8299 20.5 14C23 10.5 23.1346 6.94221 20.5962 4.4038C18.2481 2.0557 14.5 2.12432 12 5.99999Z
-        </StreamGeometry>
-    </UserControl.Resources>
     <StackPanel Spacing="20">
         <Grid ColumnDefinitions="*, 300">
             <Grid Grid.Column="0">
@@ -43,7 +38,7 @@
                         Count="{Binding Count}"
                         DefaultValue="{Binding DefaultValue}"
                         Foreground="{StaticResource SemiRed5}"
-                        Character="{StaticResource LoveHeartGeometry}" />
+                        Character="{StaticResource SemiIconLikeHeart}" />
                 </StackPanel>
             </Grid>
             <Border Grid.Column="1" VerticalAlignment="Top">
diff --git a/demo/Ursa.Demo/Pages/ToolBarDemo.axaml b/demo/Ursa.Demo/Pages/ToolBarDemo.axaml
index c852b9c..96629da 100644
--- a/demo/Ursa.Demo/Pages/ToolBarDemo.axaml
+++ b/demo/Ursa.Demo/Pages/ToolBarDemo.axaml
@@ -12,12 +12,6 @@
     x:CompileBindings="True"
     x:DataType="vm:ToolBarDemoViewModel"
     mc:Ignorable="d">
-    <UserControl.Resources>
-        <ResourceDictionary>
-            <StreamGeometry x:Key="BoldGlyph">M13.5,15.5H10V12.5H13.5A1.5,1.5 0 0,1 15,14A1.5,1.5 0 0,1 13.5,15.5M10,6.5H13A1.5,1.5 0 0,1 14.5,8A1.5,1.5 0 0,1 13,9.5H10M15.6,10.79C16.57,10.11 17.25,9 17.25,8C17.25,5.74 15.5,4 13.25,4H7V18H14.04C16.14,18 17.75,16.3 17.75,14.21C17.75,12.69 16.89,11.39 15.6,10.79Z</StreamGeometry>
-            <StreamGeometry x:Key="ItalicGlyph">M10,4V7H12.21L8.79,15H6V18H14V15H11.79L15.21,7H18V4H10Z</StreamGeometry>
-        </ResourceDictionary>
-    </UserControl.Resources>
     <Grid ColumnDefinitions="Auto, Auto, *" RowDefinitions="Auto, Auto, *">
         <u:EnumSelector Name="Orientation" EnumType="Orientation" />
         <u:ToolBar
@@ -78,15 +72,13 @@
             <u:ToolBar Margin="16">
                 <ToggleButton Name="bold">
                     <PathIcon
-                        Width="16"
-                        Height="16"
-                        Data="{DynamicResource BoldGlyph}" />
+                        Theme="{StaticResource InnerPathIcon}"
+                        Data="{DynamicResource SemiIconBold}" />
                 </ToggleButton>
                 <ToggleButton Name="italic">
                     <PathIcon
-                        Width="16"
-                        Height="16"
-                        Data="{DynamicResource ItalicGlyph}" />
+                        Theme="{StaticResource InnerPathIcon}"
+                        Data="{DynamicResource SemiIconItalic}" />
                 </ToggleButton>
                 <u:ToolBarSeparator />
                 <StackPanel Orientation="Horizontal">
diff --git a/demo/Ursa.Demo/Pages/TwoTonePathIconDemo.axaml b/demo/Ursa.Demo/Pages/TwoTonePathIconDemo.axaml
index ae22c4b..226fa3e 100644
--- a/demo/Ursa.Demo/Pages/TwoTonePathIconDemo.axaml
+++ b/demo/Ursa.Demo/Pages/TwoTonePathIconDemo.axaml
@@ -6,13 +6,13 @@
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="Ursa.Demo.Pages.TwoTonePathIconDemo">
     <StackPanel>
-        <TextBlock Text="Size"></TextBlock>
-        <Slider Name="width" Minimum="0" Maximum="100" Value="20" Width="300"></Slider>
-        <ToggleSwitch Name="active" Content="Active"></ToggleSwitch>
+        <TextBlock Text="Size" />
+        <Slider Name="width" Minimum="0" Maximum="100" Value="20" Width="300" />
+        <ToggleSwitch Name="active" Content="Active" />
         <u:TwoTonePathIcon
             IsActive="{Binding ElementName=active, Path=IsChecked}"
             Width="{Binding #width.Value}"
             Height="{Binding #width.Value}"
-            Data="M12 3L2 12H5V20H19V12H22L12 3M13 18H11V16H13V18M13 14H11V8H13V14Z"/>
+            Data="{StaticResource SemiIconHome}" />
     </StackPanel>
 </UserControl>
diff --git a/demo/Ursa.Demo/Views/MainView.axaml b/demo/Ursa.Demo/Views/MainView.axaml
index 9aea83a..40325a3 100644
--- a/demo/Ursa.Demo/Views/MainView.axaml
+++ b/demo/Ursa.Demo/Views/MainView.axaml
@@ -18,7 +18,6 @@
     </Design.DataContext>
     <UserControl.Resources>
         <converters:IconNameToPathConverter x:Key="IconConverter" />
-        <StreamGeometry x:Key="SettingIcon">M7.99973 5.07197C7.19713 5.53535 6.20729 5.53113 5.40866 5.06092L5.1637 4.91669C4.55751 4.55978 3.77662 4.65563 3.34264 5.20927C2.69567 6.03462 2.17585 6.94251 1.79166 7.90124C1.53027 8.55354 1.83733 9.27693 2.449 9.62286L2.69407 9.76145C3.50107 10.2178 4.00002 11.0732 4.00002 12.0003C4.00002 12.9271 3.50145 13.7822 2.69492 14.2387L2.44842 14.3783C1.83596 14.725 1.52888 15.4497 1.79213 16.1024C1.98358 16.577 2.21048 17.044 2.47374 17.5C2.73723 17.9564 3.0285 18.3868 3.34416 18.7902C3.77773 19.3443 4.5588 19.4406 5.16498 19.0834L5.40839 18.9399C6.20714 18.4692 7.19739 18.4648 8.0003 18.9284C8.80291 19.3918 9.29417 20.2511 9.28627 21.1778L9.28386 21.4601C9.27787 22.1629 9.75107 22.7906 10.4468 22.8903C11.4692 23.0368 12.5154 23.0404 13.5537 22.8927C14.2499 22.7936 14.7231 22.1653 14.7169 21.462L14.7143 21.1785C14.7061 20.2514 15.1974 19.3916 16.0003 18.928C16.8029 18.4647 17.7927 18.4689 18.5914 18.9391L18.8363 19.0833C19.4425 19.4402 20.2234 19.3444 20.6574 18.7907C21.3044 17.9654 21.8242 17.0575 22.2084 16.0988C22.4698 15.4465 22.1627 14.7231 21.551 14.3772L21.306 14.2386C20.499 13.7822 20 12.9268 20 11.9997C20 11.0729 20.4986 10.2178 21.3051 9.76126L21.5516 9.62174C22.1641 9.27506 22.4712 8.55029 22.2079 7.89761C22.0165 7.42297 21.7896 6.95598 21.5263 6.50001C21.2628 6.04362 20.9715 5.61325 20.6559 5.20982C20.2223 4.65568 19.4412 4.55944 18.8351 4.91665L18.5916 5.06009C17.7929 5.53078 16.8026 5.53519 15.9997 5.07163C15.1971 4.60825 14.7059 3.74891 14.7138 2.82218L14.7162 2.53994C14.7222 1.83708 14.249 1.20945 13.5532 1.10973C12.5308 0.963214 11.4846 0.959581 10.4464 1.10733C9.75011 1.20641 9.27691 1.83473 9.28317 2.53798L9.28569 2.82154C9.29395 3.74862 8.80264 4.60841 7.99973 5.07197ZM14 15.4641C15.9132 14.3595 16.5687 11.9132 15.4641 9.99999C14.3595 8.08682 11.9132 7.43132 10 8.53589C8.08684 9.64046 7.43134 12.0868 8.53591 14C9.64048 15.9132 12.0868 16.5687 14 15.4641Z</StreamGeometry>
     </UserControl.Resources>
     <Panel>
         <Panel.Styles>
@@ -96,9 +95,8 @@
                                 IsVisible="{Binding !#menu.IsHorizontalCollapsed}" />
                             <u:IconButton.Icon>
                                 <PathIcon
-                                    Width="16"
-                                    Height="16"
-                                    Data="{StaticResource SettingIcon}" />
+                                    Theme="{StaticResource InnerPathIcon}"
+                                    Data="{StaticResource SemiIconSetting}" />
                             </u:IconButton.Icon>
                             <Button.Flyout>
                                 <Flyout Placement="RightEdgeAlignedBottom">
diff --git a/demo/Ursa.Demo/Views/TitleBarRightContent.axaml b/demo/Ursa.Demo/Views/TitleBarRightContent.axaml
index dd4d12b..1ba3aaa 100644
--- a/demo/Ursa.Demo/Views/TitleBarRightContent.axaml
+++ b/demo/Ursa.Demo/Views/TitleBarRightContent.axaml
@@ -6,12 +6,14 @@
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="Ursa.Demo.Views.TitleBarRightContent">
     <StackPanel Orientation="Horizontal">
-        <Button Theme="{DynamicResource BorderlessButton}" Click="OpenRepository">
+        <Button
+            Padding="8"
+            Theme="{DynamicResource BorderlessButton}"
+            Click="OpenRepository">
             <PathIcon
-                Width="16"
-                Height="16"
-                Data="M12,2A10,10 0 0,0 2,12C2,16.42 4.87,20.17 8.84,21.5C9.34,21.58 9.5,21.27 9.5,21C9.5,20.77 9.5,20.14 9.5,19.31C6.73,19.91 6.14,17.97 6.14,17.97C5.68,16.81 5.03,16.5 5.03,16.5C4.12,15.88 5.1,15.9 5.1,15.9C6.1,15.97 6.63,16.93 6.63,16.93C7.5,18.45 8.97,18 9.54,17.76C9.63,17.11 9.89,16.67 10.17,16.42C7.95,16.17 5.62,15.31 5.62,11.5C5.62,10.39 6,9.5 6.65,8.79C6.55,8.54 6.2,7.5 6.75,6.15C6.75,6.15 7.59,5.88 9.5,7.17C10.29,6.95 11.15,6.84 12,6.84C12.85,6.84 13.71,6.95 14.5,7.17C16.41,5.88 17.25,6.15 17.25,6.15C17.8,7.5 17.45,8.54 17.35,8.79C18,9.5 18.38,10.39 18.38,11.5C18.38,15.32 16.04,16.16 13.81,16.41C14.17,16.72 14.5,17.33 14.5,18.26C14.5,19.6 14.5,20.68 14.5,21C14.5,21.27 14.66,21.59 15.17,21.5C19.14,20.16 22,16.42 22,12A10,10 0 0,0 12,2Z"
-                Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
+                Theme="{StaticResource InnerPathIcon}"
+                Data="{StaticResource SemiIconGithubLogo}"
+                Foreground="{DynamicResource SemiColorText1}" />
         </Button>
         <u:ThemeToggleButton
             IsThreeState="True"
diff --git a/src/Ursa.Themes.Semi/Compatibles/Icon.axaml b/src/Ursa.Themes.Semi/Compatibles/Icon.axaml
index 5230ae9..8380cfc 100644
--- a/src/Ursa.Themes.Semi/Compatibles/Icon.axaml
+++ b/src/Ursa.Themes.Semi/Compatibles/Icon.axaml
@@ -50,4 +50,21 @@
     <StreamGeometry x:Key="SemiIconStar">
         M10.75 1.9c.4-1.2 2.1-1.2 2.5 0l1.99 6.12h6.45a1.3 1.3 0 0 1 .77 2.37l-5.22 3.78 2 6.11c.39 1.2-1 2.2-2.02 1.46L12 17.96l-5.22 3.78c-1.02.75-2.4-.25-2.01-1.46l1.99-6.11-5.22-3.78a1.3 1.3 0 0 1 .77-2.37h6.45l2-6.12Z
     </StreamGeometry>
+    <StreamGeometry x:Key="SemiIconSun">
+        M10.5 1.5a1.5 1.5 0 0 1 3 0v1a1.5 1.5 0 0 1-3 0v-1Z,
+        M10.5 21.5a1.5 1.5 0 0 1 3 0v1a1.5 1.5 0 0 1-3 0v-1Z,
+        M24 12c0-.83-.67-1.5-1.5-1.5h-1a1.5 1.5 0 0 0 0 3h1c.83 0 1.5-.67 1.5-1.5Z,
+        M2.5 10.5a1.5 1.5 0 0 1 0 3h-1a1.5 1.5 0 0 1 0-3h1Z,
+        M20.49 3.51a1.5 1.5 0 0 0-2.13 0l-.7.71a1.5 1.5 0 1 0 2.12 2.12l.7-.7a1.5 1.5 0 0 0 0-2.13Z,
+        M4.22 17.66a1.5 1.5 0 1 1 2.12 2.12l-.7.7a1.5 1.5 0 1 1-2.13-2.12l.71-.7Z,
+        M3.51 3.51a1.5 1.5 0 0 0 0 2.13l.71.7a1.5 1.5 0 0 0 2.12-2.12l-.7-.7a1.5 1.5 0 0 0-2.13 0Z,
+        M17.66 19.78a1.5 1.5 0 1 1 2.12-2.12l.7.7a1.5 1.5 0 1 1-2.12 2.13l-.7-.71Z,
+        M12 19a7 7 0 1 0 0-14 7 7 0 0 0 0 14Z
+    </StreamGeometry>
+    <StreamGeometry x:Key="SemiIconContrast">
+        M12 23a11 11 0 1 0 0-22 11 11 0 0 0 0 22Zm8-11a8 8 0 0 1-8 8V4a8 8 0 0 1 8 8Z
+    </StreamGeometry>
+    <StreamGeometry x:Key="SemiIconMoon">
+        M12 23a11 11 0 1 0 0-22 11 11 0 0 0 0 22Zm5-8c.48 0 .94-.05 1.39-.14a7 7 0 1 1-7.78-9.72A7 7 0 0 0 17 15Z
+    </StreamGeometry>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Controls/ThemeSelector.axaml b/src/Ursa.Themes.Semi/Controls/ThemeSelector.axaml
index 7968a38..204768a 100644
--- a/src/Ursa.Themes.Semi/Controls/ThemeSelector.axaml
+++ b/src/Ursa.Themes.Semi/Controls/ThemeSelector.axaml
@@ -1,7 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:u="https://irihi.tech/ursa">
-    <!-- Add Resources Here -->
     <ControlTheme TargetType="u:ThemeToggleButton" x:Key="{x:Type u:ThemeToggleButton}">
         <Setter Property="Template">
             <ControlTemplate TargetType="u:ThemeToggleButton">
@@ -13,8 +12,7 @@
                     Theme="{DynamicResource BorderlessButton}">
                     <PathIcon
                         Name="PART_Icon"
-                        Width="16"
-                        Height="16"
+                        Theme="{StaticResource InnerPathIcon}"
                         Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
                 </Button>
             </ControlTemplate>
@@ -32,4 +30,4 @@
             <Setter Property="ToolTip.Tip" Value="{DynamicResource STRING_THEME_TOGGLE_SYSTEM}" />
         </Style>
     </ControlTheme>
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/Shared/ThemeSelector.axaml b/src/Ursa.Themes.Semi/Themes/Shared/ThemeSelector.axaml
index d40b263..f5d893f 100644
--- a/src/Ursa.Themes.Semi/Themes/Shared/ThemeSelector.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Shared/ThemeSelector.axaml
@@ -1,7 +1,5 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!-- Add Resources Here -->
-    <StreamGeometry x:Key="ThemeSelectorButtonDarkGlyph">M9,2C7.95,2 6.95,2.16 6,2.46C10.06,3.73 13,7.5 13,12C13,16.5 10.06,20.27 6,21.54C6.95,21.84 7.95,22 9,22A10,10 0 0,0 19,12A10,10 0 0,0 9,2Z</StreamGeometry>
-    <StreamGeometry x:Key="ThemeSelectorButtonLightGlyph">M12,8A4,4 0 0,0 8,12A4,4 0 0,0 12,16A4,4 0 0,0 16,12A4,4 0 0,0 12,8M12,18A6,6 0 0,1 6,12A6,6 0 0,1 12,6A6,6 0 0,1 18,12A6,6 0 0,1 12,18M20,8.69V4H15.31L12,0.69L8.69,4H4V8.69L0.69,12L4,15.31V20H8.69L12,23.31L15.31,20H20V15.31L23.31,12L20,8.69Z</StreamGeometry>
-    <StreamGeometry x:Key="ThemeSelectorButtonDefaultGlyph">M12,18V6A6,6 0 0,1 18,12A6,6 0 0,1 12,18M20,15.31L23.31,12L20,8.69V4H15.31L12,0.69L8.69,4H4V8.69L0.69,12L4,15.31V20H8.69L12,23.31L15.31,20H20V15.31Z</StreamGeometry>
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <StaticResource x:Key="ThemeSelectorButtonDarkGlyph" ResourceKey="SemiIconMoon" />
+    <StaticResource x:Key="ThemeSelectorButtonLightGlyph" ResourceKey="SemiIconSun" />
+    <StaticResource x:Key="ThemeSelectorButtonDefaultGlyph" ResourceKey="SemiIconContrast" />
 </ResourceDictionary>