diff --git a/UI/SemiUrsa/Client.Avalonia/App.axaml b/UI/SemiUrsa/Client.Avalonia/App.axaml
index 23fa542..a0ed5e4 100644
--- a/UI/SemiUrsa/Client.Avalonia/App.axaml
+++ b/UI/SemiUrsa/Client.Avalonia/App.axaml
@@ -14,7 +14,6 @@
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceInclude Source="avares://Common.Avalonia/Themes/Resources/_index.axaml" />
                 <ResourceInclude Source="avares://Common.Avalonia/Themes/Controls/_index.axaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
diff --git a/UI/SemiUrsa/Client.Avalonia/Views/MainView.axaml b/UI/SemiUrsa/Client.Avalonia/Views/MainView.axaml
index a2e3458..bef3cc5 100644
--- a/UI/SemiUrsa/Client.Avalonia/Views/MainView.axaml
+++ b/UI/SemiUrsa/Client.Avalonia/Views/MainView.axaml
@@ -10,9 +10,7 @@
              x:Class="Client.Avalonia.Views.MainView"
              x:DataType="vm:MainViewViewModel">
     <UserControl.Resources>
-        <ResourceDictionary>
-            <converters:EnumToBoolConverter x:Key="EnumToBooleanConverter" />
-        </ResourceDictionary>
+        <converters:EnumToBoolConverter x:Key="EnumToBooleanConverter" />
     </UserControl.Resources>
 
     <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Spacing="10" MinWidth="550">
@@ -92,23 +90,20 @@
             <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Spacing="10">
                 <Button
                     Name="StopButton"
-                    Padding="8"
-                    Theme="{StaticResource BorderlessButton}"
+                    Theme="{StaticResource IconBorderlessButton}"
                     Classes="Danger"
                     ToolTip.Tip="停止"
-                    Command="{Binding StopCommand}">
-                    <PathIcon
-                        Theme="{StaticResource InnerPathIcon}"
-                        Data="{StaticResource SemiIconStop}" />
-                </Button>
+                    Content="{StaticResource SemiIconStop}"
+                    Command="{Binding StopCommand}" />
                 <ToggleSwitch
                     Name="StartButton"
-                    Padding="8"
                     IsChecked="{Binding  Status,
                      Converter={StaticResource EnumToBooleanConverter},
                       ConverterParameter={x:Static services:DownloadStatus.Downloading},
                        Mode=OneWay}"
-                    Theme="{StaticResource ButtonToggleSwitch}"
+                    Theme="{StaticResource IconBorderlessToggleSwitch}"
+                    OffContent="{StaticResource SemiIconPlay}"
+                    OnContent="{StaticResource SemiIconPause}"
                     Command="{Binding StartCommand}">
                     <ToolTip.Tip>
                         <Panel>
@@ -116,28 +111,14 @@
                             <TextBlock Text="暂停" IsVisible="{Binding $parent[ToggleSwitch].IsChecked}" />
                         </Panel>
                     </ToolTip.Tip>
-                    <ToggleSwitch.OffContent>
-                        <PathIcon
-                            Theme="{StaticResource InnerPathIcon}"
-                            Data="{StaticResource SemiIconPlay}" />
-                    </ToggleSwitch.OffContent>
-                    <ToggleSwitch.OnContent>
-                        <PathIcon
-                            Theme="{StaticResource InnerPathIcon}"
-                            Data="{StaticResource SemiIconPause}" />
-                    </ToggleSwitch.OnContent>
                 </ToggleSwitch>
                 <Button
                     Name="RestartButton"
-                    Padding="8"
-                    Theme="{StaticResource BorderlessButton}"
+                    Theme="{StaticResource IconBorderlessButton}"
                     Classes="Tertiary"
                     ToolTip.Tip="重新下载"
-                    Command="{Binding RestartCommand}">
-                    <PathIcon
-                        Theme="{StaticResource InnerPathIcon}"
-                        Data="{StaticResource SemiIconRestart}" />
-                </Button>
+                    Content="{StaticResource SemiIconRefresh}"
+                    Command="{Binding RestartCommand}" />
             </StackPanel>
         </Border>
     </StackPanel>
diff --git a/UI/SemiUrsa/Common.Avalonia/Services/MockDownloadService.cs b/UI/SemiUrsa/Common.Avalonia/Services/MockDownloadService.cs
index 54d4026..07d9c83 100644
--- a/UI/SemiUrsa/Common.Avalonia/Services/MockDownloadService.cs
+++ b/UI/SemiUrsa/Common.Avalonia/Services/MockDownloadService.cs
@@ -19,7 +19,7 @@ public MockDownloadService()
     {
         CurrentStatistics = new DownloadStatistics
         {
-            Version = "11.2.3",
+            Version = "11.2.6",
             Speed = 0,
             Remaining = TimeSpan.Zero,
             TotalBytesToReceive = 1024 * 1024 * 10,
diff --git a/UI/SemiUrsa/Common.Avalonia/Themes/Controls/ToggleSwitch.axaml b/UI/SemiUrsa/Common.Avalonia/Themes/Controls/ToggleSwitch.axaml
index dd16358..d5fd78b 100644
--- a/UI/SemiUrsa/Common.Avalonia/Themes/Controls/ToggleSwitch.axaml
+++ b/UI/SemiUrsa/Common.Avalonia/Themes/Controls/ToggleSwitch.axaml
@@ -1,113 +1,35 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <ControlTheme x:Key="ButtonToggleSwitch" TargetType="ToggleSwitch">
-        <Setter Property="HorizontalAlignment" Value="Center" />
-        <Setter Property="VerticalAlignment" Value="Center" />
-        <Setter Property="HorizontalContentAlignment" Value="Center" />
-        <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Setter Property="Padding" Value="{DynamicResource ButtonDefaultPadding}" />
-        <Setter Property="Background" Value="Transparent" />
-        <Setter Property="BackgroundSizing" Value="OuterBorderEdge" />
-        <Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultBorderBrush}" />
-        <Setter Property="BorderThickness" Value="{DynamicResource ButtonBorderThickness}" />
-        <Setter Property="CornerRadius" Value="{DynamicResource ButtonCornerRadius}" />
-        <Setter Property="Cursor" Value="Hand" />
-        <Setter Property="OnContent" Value="{x:Null}" />
-        <Setter Property="OffContent" Value="{x:Null}" />
-        <Setter Property="Content" Value="{x:Null}" />
-        <Setter Property="MinHeight" Value="{DynamicResource ButtonDefaultHeight}" />
-        <Setter Property="FontSize" Value="{DynamicResource ButtonDefaultFontSize}" />
-        <Setter Property="FontWeight" Value="{DynamicResource ButtonDefaultFontWeight}" />
-        <Setter Property="Template">
-            <ControlTemplate TargetType="ToggleSwitch">
-                <Border
-                    Name="Background"
-                    Padding="{TemplateBinding Padding}"
-                    Background="{TemplateBinding Background}"
-                    BorderBrush="{TemplateBinding BorderBrush}"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    CornerRadius="{TemplateBinding CornerRadius}">
-                    <Panel>
-                        <Panel Name="PART_SwitchKnob" />
-                        <Panel Name="PART_MovingKnobs" />
-                        <ContentPresenter
-                            Name="PART_OnContentPresenter"
-                            IsVisible="{TemplateBinding IsChecked}"
-                            Content="{TemplateBinding OnContent}"
-                            ContentTemplate="{TemplateBinding OnContentTemplate}" />
-                        <ContentPresenter
-                            Name="PART_OffContentPresenter"
-                            IsVisible="{TemplateBinding IsChecked, Converter={x:Static BoolConverters.Not}}"
-                            Content="{TemplateBinding OffContent}"
-                            ContentTemplate="{TemplateBinding OffContentTemplate}" />
-                        <ContentPresenter
-                            Name="PART_ContentPresenter"
-                            Content="{TemplateBinding Content}"
-                            ContentTemplate="{TemplateBinding ContentTemplate}">
-                            <ContentPresenter.IsVisible>
-                                <MultiBinding Converter="{x:Static BoolConverters.And}">
-                                    <TemplateBinding Property="Content" Converter="{x:Static ObjectConverters.IsNotNull}" />
-                                    <TemplateBinding Property="OnContent" Converter="{x:Static ObjectConverters.IsNull}" />
-                                    <TemplateBinding Property="OffContent" Converter="{x:Static ObjectConverters.IsNull}" />
-                                </MultiBinding>
-                            </ContentPresenter.IsVisible>
-                        </ContentPresenter>
-                    </Panel>
-                </Border>
-            </ControlTemplate>
+    <ControlTheme x:Key="IconBorderlessToggleSwitch"
+                  BasedOn="{StaticResource ButtonToggleSwitch}"
+                  TargetType="ToggleSwitch">
+        <Setter Property="Padding" Value="{StaticResource SemiThicknessTight}" />
+        <Setter Property="Width" Value="{StaticResource SemiSpacingExtraLoose}" />
+        <Setter Property="Height" Value="{StaticResource SemiSpacingExtraLoose}" />
+        <Setter Property="Foreground" Value="{DynamicResource SemiColorText1}" />
+        <Setter Property="OnContentTemplate">
+            <StaticResource ResourceKey="GeometryDataTemplate" />
         </Setter>
+        <Setter Property="OffContentTemplate">
+            <StaticResource ResourceKey="GeometryDataTemplate" />
+        </Setter>
+        <Setter Property="ContentTemplate">
+            <StaticResource ResourceKey="GeometryDataTemplate" />
+        </Setter>
+    </ControlTheme>
 
-        <Style Selector="^:pressed">
-            <Setter Property="RenderTransform" Value="scale(0.98)" />
-        </Style>
-
-        <Style Selector="^ /template/ Border#Background">
-            <Setter Property="BorderBrush" Value="{TemplateBinding BorderBrush}" />
-            <Setter Property="Background" Value="{TemplateBinding Background}" />
-        </Style>
-
-        <Style Selector="^:pointerover /template/ Border#Background">
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultPointeroverBorderBrush}" />
-            <Setter Property="Background" Value="{DynamicResource ButtonDefaultPointeroverBackground}" />
-        </Style>
-
-        <Style Selector="^:pressed /template/ Border#Background">
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultPressedBorderBrush}" />
-            <Setter Property="Background" Value="{DynamicResource ButtonDefaultPressedBackground}" />
-        </Style>
-
-        <Style Selector="^:disabled /template/ Border#Background">
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultDisabledBorderBrush}" />
-        </Style>
-
-        <Style Selector="^:disabled">
-            <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
-                <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
-            </Style>
-            <Style Selector="^ /template/ ContentPresenter#PART_OnContentPresenter">
-                <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
-            </Style>
-            <Style Selector="^ /template/ ContentPresenter#PART_OffContentPresenter">
-                <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
-            </Style>
-        </Style>
-
-        <Style Selector="^.Large">
-            <Setter Property="MinHeight" Value="{DynamicResource ButtonLargeHeight}" />
-            <Setter Property="Padding" Value="{DynamicResource ButtonLargePadding}" />
-        </Style>
-        <Style Selector="^.Small">
-            <Setter Property="MinHeight" Value="{DynamicResource ButtonSmallHeight}" />
-            <Setter Property="Padding" Value="{DynamicResource ButtonSmallPadding}" />
-        </Style>
-
-        <Style Selector="^ /template/ Border#Background">
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonBorderlessBorderBrush}" />
-            <Setter Property="Background" Value="{DynamicResource ButtonBorderlessBackground}" />
-        </Style>
-        <Style Selector="^:disabled /template/ Border#Background">
-            <Setter Property="BorderBrush" Value="{DynamicResource ButtonBorderlessBorderBrush}" />
-            <Setter Property="Background" Value="{DynamicResource ButtonBorderlessBackground}" />
-            <!-- <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" /> -->
-        </Style>
+    <ControlTheme x:Key="IconBorderlessButton"
+                  BasedOn="{StaticResource BorderlessButton}"
+                  TargetType="Button">
+        <Setter Property="Padding" Value="{StaticResource SemiThicknessTight}" />
+        <Setter Property="Width" Value="{StaticResource SemiSpacingExtraLoose}" />
+        <Setter Property="Height" Value="{StaticResource SemiSpacingExtraLoose}" />
+        <Setter Property="Foreground" Value="{DynamicResource SemiColorText1}" />
+        <Setter Property="ContentTemplate">
+            <StaticResource ResourceKey="GeometryDataTemplate" />
+        </Setter>
     </ControlTheme>
+
+    <DataTemplate x:Key="GeometryDataTemplate" DataType="Geometry">
+        <PathIcon Theme="{StaticResource InnerPathIcon}" Data="{Binding}" />
+    </DataTemplate>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/UI/SemiUrsa/Common.Avalonia/Themes/Resources/Icon.axaml b/UI/SemiUrsa/Common.Avalonia/Themes/Resources/Icon.axaml
deleted file mode 100644
index d1981be..0000000
--- a/UI/SemiUrsa/Common.Avalonia/Themes/Resources/Icon.axaml
+++ /dev/null
@@ -1,2 +0,0 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-</ResourceDictionary>
\ No newline at end of file
diff --git a/UI/SemiUrsa/Common.Avalonia/Themes/Resources/_index.axaml b/UI/SemiUrsa/Common.Avalonia/Themes/Resources/_index.axaml
deleted file mode 100644
index 459076d..0000000
--- a/UI/SemiUrsa/Common.Avalonia/Themes/Resources/_index.axaml
+++ /dev/null
@@ -1,5 +0,0 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <ResourceDictionary.MergedDictionaries>
-        <ResourceInclude Source="/Themes/Resources/Icon.axaml" />
-    </ResourceDictionary.MergedDictionaries>
-</ResourceDictionary>
\ No newline at end of file
diff --git a/UI/SemiUrsa/Directory.Packages.props b/UI/SemiUrsa/Directory.Packages.props
index 8ac7810..7efba84 100644
--- a/UI/SemiUrsa/Directory.Packages.props
+++ b/UI/SemiUrsa/Directory.Packages.props
@@ -1,7 +1,7 @@
 <Project>
     <PropertyGroup>
         <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
-        <AvaloniaVersion>11.2.3</AvaloniaVersion>
+        <AvaloniaVersion>11.2.6</AvaloniaVersion>
     </PropertyGroup>
     <ItemGroup>
         <PackageVersion Include="Avalonia" Version="$(AvaloniaVersion)"/>
@@ -9,9 +9,9 @@
         <PackageVersion Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)"/>
 
         <PackageVersion Include="Avalonia.Svg" Version="11.2.0.2"/>
-        <PackageVersion Include="Semi.Avalonia" Version="11.2.1.3"/>
-        <PackageVersion Include="Irihi.Ursa" Version="1.7.0"/>
-        <PackageVersion Include="Irihi.Ursa.Themes.Semi" Version="1.7.0"/>
+        <PackageVersion Include="Semi.Avalonia" Version="11.2.1.6"/>
+        <PackageVersion Include="Irihi.Ursa" Version="1.10.0"/>
+        <PackageVersion Include="Irihi.Ursa.Themes.Semi" Version="1.10.0"/>
 
         <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.0"/>
         <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0"/>
diff --git a/UI/SemiUrsa/Upgrade.Avalonia/App.axaml b/UI/SemiUrsa/Upgrade.Avalonia/App.axaml
index de3c282..7be413f 100644
--- a/UI/SemiUrsa/Upgrade.Avalonia/App.axaml
+++ b/UI/SemiUrsa/Upgrade.Avalonia/App.axaml
@@ -16,7 +16,6 @@
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceInclude Source="avares://Common.Avalonia/Themes/Resources/_index.axaml" />
                 <ResourceInclude Source="avares://Common.Avalonia/Themes/Controls/_index.axaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
diff --git a/UI/SemiUrsa/Upgrade.Avalonia/Views/MainView.axaml b/UI/SemiUrsa/Upgrade.Avalonia/Views/MainView.axaml
index 02f5b5d..ac124d4 100644
--- a/UI/SemiUrsa/Upgrade.Avalonia/Views/MainView.axaml
+++ b/UI/SemiUrsa/Upgrade.Avalonia/Views/MainView.axaml
@@ -11,9 +11,7 @@
              x:Class="Upgrade.Avalonia.Views.MainView"
              x:DataType="vm:MainViewViewModel">
     <UserControl.Resources>
-        <ResourceDictionary>
-            <converters:EnumToBoolConverter x:Key="EnumToBooleanConverter" />
-        </ResourceDictionary>
+        <converters:EnumToBoolConverter x:Key="EnumToBooleanConverter" />
     </UserControl.Resources>
 
     <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Spacing="10" MinWidth="550">
@@ -100,25 +98,22 @@
             Background="{DynamicResource SemiBackground0Color}"
             Theme="{StaticResource CardBorder}">
             <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Spacing="10">
-                <Button
+                <u:IconButton
                     Name="StopButton"
-                    Padding="8"
-                    Theme="{StaticResource BorderlessButton}"
+                    Theme="{StaticResource BorderlessIconButton}"
                     Classes="Danger"
                     ToolTip.Tip="停止"
-                    Command="{Binding StopCommand}">
-                    <PathIcon
-                        Theme="{StaticResource InnerPathIcon}"
-                        Data="{StaticResource SemiIconStop}" />
-                </Button>
+                    Icon="{StaticResource SemiIconStop}"
+                    Command="{Binding StopCommand}" />
                 <ToggleSwitch
                     Name="StartButton"
-                    Padding="8"
                     IsChecked="{Binding  Status,
                      Converter={StaticResource EnumToBooleanConverter},
                       ConverterParameter={x:Static services:DownloadStatus.Downloading},
                        Mode=OneWay}"
-                    Theme="{StaticResource ButtonToggleSwitch}"
+                    Theme="{StaticResource IconBorderlessToggleSwitch}"
+                    OffContent="{StaticResource SemiIconPlay}"
+                    OnContent="{StaticResource SemiIconPause}"
                     Command="{Binding StartCommand}">
                     <ToolTip.Tip>
                         <Panel>
@@ -126,28 +121,14 @@
                             <TextBlock Text="暂停" IsVisible="{Binding $parent[ToggleSwitch].IsChecked}" />
                         </Panel>
                     </ToolTip.Tip>
-                    <ToggleSwitch.OffContent>
-                        <PathIcon
-                            Theme="{StaticResource InnerPathIcon}"
-                            Data="{StaticResource SemiIconPlay}" />
-                    </ToggleSwitch.OffContent>
-                    <ToggleSwitch.OnContent>
-                        <PathIcon
-                            Theme="{StaticResource InnerPathIcon}"
-                            Data="{StaticResource SemiIconPause}" />
-                    </ToggleSwitch.OnContent>
                 </ToggleSwitch>
-                <Button
+                <u:IconButton
                     Name="RestartButton"
-                    Padding="8"
-                    Theme="{StaticResource BorderlessButton}"
+                    Theme="{StaticResource BorderlessIconButton}"
                     Classes="Tertiary"
                     ToolTip.Tip="重新下载"
-                    Command="{Binding RestartCommand}">
-                    <PathIcon
-                        Theme="{StaticResource InnerPathIcon}"
-                        Data="{StaticResource SemiIconRestart}" />
-                </Button>
+                    Icon="{StaticResource SemiIconRefresh}"
+                    Command="{Binding RestartCommand}" />
             </StackPanel>
         </Border>
     </StackPanel>