diff --git a/src/Ursa.Themes.Semi/Controls/Calendar.axaml b/src/Ursa.Themes.Semi/Controls/Calendar.axaml
index 27a1a50..72f21f6 100644
--- a/src/Ursa.Themes.Semi/Controls/Calendar.axaml
+++ b/src/Ursa.Themes.Semi/Controls/Calendar.axaml
@@ -206,8 +206,8 @@
                             Foreground="{TemplateBinding Foreground}"
                             Theme="{DynamicResource BorderlessButton}">
                             <PathIcon
-                                Width="{DynamicResource CalenderViewPathIconWidth}"
-                                Height="{DynamicResource CalenderViewPathIconHeight}"
+                                Theme="{StaticResource InnerPathIcon}"
+                                Classes="Large"
                                 Data="{DynamicResource CalendarViewFastForwardGlyph}"
                                 Foreground="{DynamicResource CalendarItemIconForeground}" />
                         </Button>
@@ -219,8 +219,8 @@
                             Foreground="{TemplateBinding Foreground}"
                             Theme="{DynamicResource BorderlessButton}">
                             <PathIcon
-                                Width="{DynamicResource CalenderViewPathIconWidth}"
-                                Height="{DynamicResource CalenderViewPathIconHeight}"
+                                Theme="{StaticResource InnerPathIcon}"
+                                Classes="Large"
                                 Data="{DynamicResource CalendarItemPreviousIconGlyph}"
                                 Foreground="{DynamicResource CalendarItemIconForeground}" />
                         </Button>
@@ -253,8 +253,8 @@
                             Foreground="{TemplateBinding Foreground}"
                             Theme="{DynamicResource BorderlessButton}">
                             <PathIcon
-                                Width="{DynamicResource CalenderViewPathIconWidth}"
-                                Height="{DynamicResource CalenderViewPathIconHeight}"
+                                Theme="{StaticResource InnerPathIcon}"
+                                Classes="Large"
                                 Data="{DynamicResource CalendarItemNextIconGlyph}"
                                 Foreground="{DynamicResource CalendarItemIconForeground}" />
                         </Button>
@@ -265,8 +265,8 @@
                             Foreground="{TemplateBinding Foreground}"
                             Theme="{DynamicResource BorderlessButton}">
                             <PathIcon
-                                Width="{DynamicResource CalenderViewPathIconWidth}"
-                                Height="{DynamicResource CalenderViewPathIconHeight}"
+                                Theme="{StaticResource InnerPathIcon}"
+                                Classes="Large"
                                 Data="{DynamicResource CalendarViewFastBackwardGlyph}"
                                 Foreground="{DynamicResource CalendarItemIconForeground}" />
                         </Button>
diff --git a/src/Ursa.Themes.Semi/Controls/NavMenu.axaml b/src/Ursa.Themes.Semi/Controls/NavMenu.axaml
index d0eea3e..9f8a54a 100644
--- a/src/Ursa.Themes.Semi/Controls/NavMenu.axaml
+++ b/src/Ursa.Themes.Semi/Controls/NavMenu.axaml
@@ -91,8 +91,7 @@
                     <PathIcon
                         Name="PART_ExpanderIcon"
                         Grid.Column="2"
-                        Width="8"
-                        Height="8"
+                        Theme="{StaticResource InnerPathIcon}"
                         Margin="12,0"
                         Data="{DynamicResource NavigationMenuItemExpandIconGlyph}"
                         Foreground="{DynamicResource NavigationMenuItemExpandIconForeground}">
diff --git a/src/Ursa.Themes.Semi/Controls/Pagination.axaml b/src/Ursa.Themes.Semi/Controls/Pagination.axaml
index 558bede..401e286 100644
--- a/src/Ursa.Themes.Semi/Controls/Pagination.axaml
+++ b/src/Ursa.Themes.Semi/Controls/Pagination.axaml
@@ -14,16 +14,14 @@
                 <StackPanel Orientation="Horizontal">
                     <u:PaginationButton Name="{x:Static u:Pagination.PART_PreviousButton}" u:DisabledAdorner.IsEnabled="True">
                         <PathIcon
-                            Width="12"
-                            Height="12"
+                            Theme="{StaticResource InnerPathIcon}"
                             Data="{DynamicResource PaginationBackwardGlyph}"
                             Foreground="{DynamicResource PaginationButtonIconForeground}" />
                     </u:PaginationButton>
                     <StackPanel Name="{x:Static u:Pagination.PART_ButtonPanel}" Orientation="Horizontal" />
                     <u:PaginationButton Name="{x:Static u:Pagination.PART_NextButton}" u:DisabledAdorner.IsEnabled="True">
                         <PathIcon
-                            Width="12"
-                            Height="12"
+                            Theme="{StaticResource InnerPathIcon}"
                             Data="{DynamicResource PaginationForwardGlyph}"
                             Foreground="{DynamicResource PaginationButtonIconForeground}" />
                     </u:PaginationButton>
@@ -58,8 +56,7 @@
                 <StackPanel Orientation="Horizontal">
                     <u:PaginationButton Name="{x:Static u:Pagination.PART_PreviousButton}" u:DisabledAdorner.IsEnabled="True">
                         <PathIcon
-                            Width="12"
-                            Height="12"
+                            Theme="{StaticResource InnerPathIcon}"
                             Data="{DynamicResource PaginationBackwardGlyph}"
                             Foreground="{DynamicResource PaginationButtonIconForeground}" />
                     </u:PaginationButton>
@@ -92,8 +89,7 @@
                     </Grid>
                     <u:PaginationButton Name="{x:Static u:Pagination.PART_NextButton}" u:DisabledAdorner.IsEnabled="True">
                         <PathIcon
-                            Width="12"
-                            Height="12"
+                            Theme="{StaticResource InnerPathIcon}"
                             Data="{DynamicResource PaginationForwardGlyph}"
                             Foreground="{DynamicResource PaginationButtonIconForeground}" />
                     </u:PaginationButton>
@@ -143,8 +139,7 @@
             <Setter Property="Content">
                 <Template>
                     <PathIcon
-                        Width="12"
-                        Height="12"
+                        Theme="{StaticResource InnerPathIcon}"
                         Data="{DynamicResource PaginationMoreGlyph}"
                         Foreground="{DynamicResource PaginationButtonIconForeground}" />
                 </Template>
@@ -153,8 +148,7 @@
                 <Setter Property="Content">
                     <Template>
                         <PathIcon
-                            Width="12"
-                            Height="12"
+                            Theme="{StaticResource InnerPathIcon}"
                             Data="{DynamicResource PaginationFastBackwardGlyph}"
                             Foreground="{DynamicResource PaginationButtonIconForeground}" />
                     </Template>
@@ -165,8 +159,7 @@
             <Setter Property="Content">
                 <Template>
                     <PathIcon
-                        Width="12"
-                        Height="12"
+                        Theme="{StaticResource InnerPathIcon}"
                         Data="{DynamicResource PaginationMoreGlyph}"
                         Foreground="{DynamicResource PaginationButtonIconForeground}" />
                 </Template>
@@ -175,8 +168,7 @@
                 <Setter Property="Content">
                     <Template>
                         <PathIcon
-                            Width="12"
-                            Height="12"
+                            Theme="{StaticResource InnerPathIcon}"
                             Data="{DynamicResource PaginationFastForwardGlyph}"
                             Foreground="{DynamicResource PaginationButtonIconForeground}" />
                     </Template>
diff --git a/src/Ursa.Themes.Semi/Controls/ScrollToButton.axaml b/src/Ursa.Themes.Semi/Controls/ScrollToButton.axaml
index e0859d3..67c8c64 100644
--- a/src/Ursa.Themes.Semi/Controls/ScrollToButton.axaml
+++ b/src/Ursa.Themes.Semi/Controls/ScrollToButton.axaml
@@ -17,8 +17,7 @@
                     <PathIcon
                         Name="PART_Icon"
                         Margin="8"
-                        Width="12"
-                        Height="12"
+                        Theme="{StaticResource InnerPathIcon}"
                         Data="{DynamicResource ScrollToButtonIconGlyph}"
                         Foreground="{DynamicResource ButtonDefaultPrimaryForeground}" />
                 </Border>
@@ -61,8 +60,7 @@
                     <PathIcon
                         Name="PART_Icon"
                         Margin="8"
-                        Width="12"
-                        Height="12"
+                        Theme="{StaticResource InnerPathIcon}"
                         Data="{DynamicResource ScrollToButtonIconGlyph}"
                         Foreground="{DynamicResource ButtonSolidForeground}" />
                 </Border>
@@ -89,4 +87,4 @@
             <Setter Property="RenderTransform" Value="rotate(270deg)" />
         </Style>
     </ControlTheme>
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Controls/TagInput.axaml b/src/Ursa.Themes.Semi/Controls/TagInput.axaml
index e3a8732..4247894 100644
--- a/src/Ursa.Themes.Semi/Controls/TagInput.axaml
+++ b/src/Ursa.Themes.Semi/Controls/TagInput.axaml
@@ -124,8 +124,8 @@
                     <DockPanel LastChildFill="True">
                         <PathIcon
                             Name="{x:Static u:ClosableTag.PART_CloseButton}"
-                            Width="8"
-                            Height="8"
+                            Theme="{StaticResource InnerPathIcon}"
+                            Classes="Small"
                             Margin="4,0"
                             Background="Transparent"
                             Data="{DynamicResource ClosableTagCloseIconGlyph}"