diff --git a/src/Ursa.Themes.Semi/Controls/Dialog.axaml b/src/Ursa.Themes.Semi/Controls/Dialog.axaml
index 4689866..1dcf7cb 100644
--- a/src/Ursa.Themes.Semi/Controls/Dialog.axaml
+++ b/src/Ursa.Themes.Semi/Controls/Dialog.axaml
@@ -76,9 +76,8 @@
                     <MenuItem Command="{Binding $parent[u:DialogControlBase].Close}" Header="{DynamicResource STRING_MENU_DIALOG_CLOSE}">
                         <MenuItem.Icon>
                             <PathIcon
-                                Width="12"
-                                Height="12"
-                                Data="{DynamicResource WindowCloseIconGlyph}" />
+                                Theme="{StaticResource InnerPathIcon}"
+                                Data="{DynamicResource SemiIconClose}" />
                         </MenuItem.Icon>
                     </MenuItem>
                 </MenuFlyout>
@@ -93,8 +92,7 @@
                         Header="{DynamicResource STRING_MENU_BRING_FORWARD}">
                         <MenuItem.Icon>
                             <PathIcon
-                                Width="12"
-                                Height="12"
+                                Theme="{StaticResource InnerPathIcon}"
                                 Data="{DynamicResource DialogArrangeBringForwardGlyph}" />
                         </MenuItem.Icon>
                     </MenuItem>
@@ -104,8 +102,7 @@
                         Header="{DynamicResource STRING_MENU_BRING_TO_FRONT}">
                         <MenuItem.Icon>
                             <PathIcon
-                                Width="12"
-                                Height="12"
+                                Theme="{StaticResource InnerPathIcon}"
                                 Data="{DynamicResource DialogArrangeBringToFrontGlyph}" />
                         </MenuItem.Icon>
                     </MenuItem>
@@ -115,8 +112,7 @@
                         Header="{DynamicResource STRING_MENU_SEND_BACKWARD}">
                         <MenuItem.Icon>
                             <PathIcon
-                                Width="12"
-                                Height="12"
+                                Theme="{StaticResource InnerPathIcon}"
                                 Data="{DynamicResource DialogArrangeSendBackwardGlyph}" />
                         </MenuItem.Icon>
                     </MenuItem>
@@ -126,17 +122,15 @@
                         Header="{DynamicResource STRING_MENU_SEND_TO_BACK}">
                         <MenuItem.Icon>
                             <PathIcon
-                                Width="12"
-                                Height="12"
+                                Theme="{StaticResource InnerPathIcon}"
                                 Data="{DynamicResource DialogArrangeSendToBackGlyph}" />
                         </MenuItem.Icon>
                     </MenuItem>
                     <MenuItem Command="{Binding $parent[u:DialogControlBase].Close}" Header="{DynamicResource STRING_MENU_DIALOG_CLOSE}">
                         <MenuItem.Icon>
                             <PathIcon
-                                Width="12"
-                                Height="12"
-                                Data="{DynamicResource WindowCloseIconGlyph}" />
+                                Theme="{StaticResource InnerPathIcon}"
+                                Data="{DynamicResource SemiIconClose}" />
                         </MenuItem.Icon>
                     </MenuItem>
                 </MenuFlyout>
@@ -186,8 +180,8 @@
                                     <PathIcon
                                         Name="PART_Icon"
                                         Grid.Column="0"
-                                        Width="16"
-                                        Height="16"
+                                        Theme="{StaticResource InnerPathIcon}"
+                                        Classes="ExtraLarge"
                                         Margin="24,24,8,0"
                                         VerticalAlignment="Center" />
                                     <TextBlock
@@ -392,9 +386,8 @@
                     <MenuItem Command="{Binding $parent[u:DialogControlBase].Close}" Header="{DynamicResource STRING_MENU_DIALOG_CLOSE}">
                         <MenuItem.Icon>
                             <PathIcon
-                                Width="12"
-                                Height="12"
-                                Data="{DynamicResource WindowCloseIconGlyph}" />
+                                Theme="{StaticResource InnerPathIcon}"
+                                Data="{DynamicResource SemiIconClose}" />
                         </MenuItem.Icon>
                     </MenuItem>
                 </MenuFlyout>
@@ -409,8 +402,7 @@
                         Header="{DynamicResource STRING_MENU_BRING_FORWARD}">
                         <MenuItem.Icon>
                             <PathIcon
-                                Width="12"
-                                Height="12"
+                                Theme="{StaticResource InnerPathIcon}"
                                 Data="{DynamicResource DialogArrangeBringForwardGlyph}" />
                         </MenuItem.Icon>
                     </MenuItem>
@@ -420,8 +412,7 @@
                         Header="{DynamicResource STRING_MENU_BRING_TO_FRONT}">
                         <MenuItem.Icon>
                             <PathIcon
-                                Width="12"
-                                Height="12"
+                                Theme="{StaticResource InnerPathIcon}"
                                 Data="{DynamicResource DialogArrangeBringToFrontGlyph}" />
                         </MenuItem.Icon>
                     </MenuItem>
@@ -431,8 +422,7 @@
                         Header="{DynamicResource STRING_MENU_SEND_BACKWARD}">
                         <MenuItem.Icon>
                             <PathIcon
-                                Width="12"
-                                Height="12"
+                                Theme="{StaticResource InnerPathIcon}"
                                 Data="{DynamicResource DialogArrangeSendBackwardGlyph}" />
                         </MenuItem.Icon>
                     </MenuItem>
@@ -442,8 +432,7 @@
                         Header="{DynamicResource STRING_MENU_SEND_TO_BACK}">
                         <MenuItem.Icon>
                             <PathIcon
-                                Width="12"
-                                Height="12"
+                                Theme="{StaticResource InnerPathIcon}"
                                 Data="{DynamicResource DialogArrangeSendToBackGlyph}" />
                         </MenuItem.Icon>
                     </MenuItem>
@@ -453,9 +442,8 @@
                         Header="{DynamicResource STRING_MENU_DIALOG_CLOSE}">
                         <MenuItem.Icon>
                             <PathIcon
-                                Width="12"
-                                Height="12"
-                                Data="{DynamicResource WindowCloseIconGlyph}" />
+                                Theme="{StaticResource InnerPathIcon}"
+                                Data="{DynamicResource SemiIconClose}" />
                         </MenuItem.Icon>
                     </MenuItem>
                 </MenuFlyout>
@@ -588,8 +576,8 @@
                                 <PathIcon
                                     Name="PART_Icon"
                                     Grid.Column="0"
-                                    Width="16"
-                                    Height="16"
+                                    Theme="{StaticResource InnerPathIcon}"
+                                    Classes="ExtraLarge"
                                     Margin="24,24,8,0"
                                     VerticalAlignment="Center" />
                                 <TextBlock
diff --git a/src/Ursa.Themes.Semi/Controls/MessageBox.axaml b/src/Ursa.Themes.Semi/Controls/MessageBox.axaml
index 5797196..f9ed5b4 100644
--- a/src/Ursa.Themes.Semi/Controls/MessageBox.axaml
+++ b/src/Ursa.Themes.Semi/Controls/MessageBox.axaml
@@ -47,8 +47,8 @@
                             <PathIcon
                                 Name="PART_Icon"
                                 Grid.Column="0"
-                                Width="24"
-                                Height="24"
+                                Theme="{StaticResource InnerPathIcon}"
+                                Classes="ExtraLarge"
                                 Margin="0,0,8,0"
                                 VerticalAlignment="Center"
                                 IsHitTestVisible="False" />
@@ -193,8 +193,8 @@
                                 <PathIcon
                                     Name="PART_Icon"
                                     Grid.Column="0"
-                                    Width="24"
-                                    Height="24"
+                                    Theme="{StaticResource InnerPathIcon}"
+                                    Classes="ExtraLarge"
                                     Margin="24,24,8,0"
                                     VerticalAlignment="Center"
                                     IsHitTestVisible="False" />
diff --git a/src/Ursa.Themes.Semi/Controls/Notification.axaml b/src/Ursa.Themes.Semi/Controls/Notification.axaml
index 2c398fa..f33e013 100644
--- a/src/Ursa.Themes.Semi/Controls/Notification.axaml
+++ b/src/Ursa.Themes.Semi/Controls/Notification.axaml
@@ -84,8 +84,8 @@
                             <DockPanel MinWidth="{DynamicResource NotificationCardMinWidth}">
                                 <PathIcon
                                     x:Name="NotificationIcon"
-                                    Width="{DynamicResource NotificationCardIconWidth}"
-                                    Height="{DynamicResource NotificationCardIconHeight}"
+                                    Theme="{StaticResource InnerPathIcon}"
+                                    Classes="Large"
                                     Margin="{DynamicResource NotificationCardIconMargin}"
                                     VerticalAlignment="Top"
                                     IsVisible="{TemplateBinding ShowIcon}"
diff --git a/src/Ursa.Themes.Semi/Controls/Toast.axaml b/src/Ursa.Themes.Semi/Controls/Toast.axaml
index 9d2a121..98b0379 100644
--- a/src/Ursa.Themes.Semi/Controls/Toast.axaml
+++ b/src/Ursa.Themes.Semi/Controls/Toast.axaml
@@ -56,8 +56,8 @@
                             <DockPanel>
                                 <PathIcon
                                     x:Name="ToastIcon"
-                                    Width="{DynamicResource ToastCardIconWidth}"
-                                    Height="{DynamicResource ToastCardIconHeight}"
+                                    Theme="{StaticResource InnerPathIcon}"
+                                    Classes="Large"
                                     Margin="{DynamicResource ToastCardIconMargin}"
                                     VerticalAlignment="Top"
                                     IsVisible="{TemplateBinding ShowIcon}"