diff --git a/src/Snap.Hutao/Snap.Hutao.Win32/Snap.Hutao.Win32.csproj b/src/Snap.Hutao/Snap.Hutao.Win32/Snap.Hutao.Win32.csproj
index c499b94e..88f4159f 100644
--- a/src/Snap.Hutao/Snap.Hutao.Win32/Snap.Hutao.Win32.csproj
+++ b/src/Snap.Hutao/Snap.Hutao.Win32/Snap.Hutao.Win32.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
+    <TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
     <ImplicitUsings>disable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
diff --git a/src/Snap.Hutao/Snap.Hutao/Core/DependencyInjection/IocHttpClientConfiguration.cs b/src/Snap.Hutao/Snap.Hutao/Core/DependencyInjection/IocHttpClientConfiguration.cs
index e16554b7..d9b10b3a 100644
--- a/src/Snap.Hutao/Snap.Hutao/Core/DependencyInjection/IocHttpClientConfiguration.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Core/DependencyInjection/IocHttpClientConfiguration.cs
@@ -88,7 +88,6 @@ internal static partial class IocHttpClientConfiguration
     /// HoYoLAB web
     /// </summary>
     /// <param name="client">配置后的客户端</param>
-    [SuppressMessage("", "IDE0051")]
     private static void XRpc4Configuration(HttpClient client)
     {
         client.Timeout = Timeout.InfiniteTimeSpan;
diff --git a/src/Snap.Hutao/Snap.Hutao/Model/CollectionsNameValue.cs b/src/Snap.Hutao/Snap.Hutao/Model/CollectionsNameValue.cs
index 6501702c..0649c237 100644
--- a/src/Snap.Hutao/Snap.Hutao/Model/CollectionsNameValue.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Model/CollectionsNameValue.cs
@@ -5,9 +5,15 @@ namespace Snap.Hutao.Model;
 
 internal static class CollectionsNameValue
 {
-    public static List<NameValue<T>> ListFromEnum<T>()
-        where T : struct, Enum
+    public static List<NameValue<TEnum>> ListFromEnum<TEnum>()
+        where TEnum : struct, Enum
     {
-        return Enum.GetValues<T>().Select(x => new NameValue<T>(x.ToString(), x)).ToList();
+        return Enum.GetValues<TEnum>().Select(x => new NameValue<TEnum>(x.ToString(), x)).ToList();
+    }
+
+    public static List<NameValue<TEnum>> ListFromEnum<TEnum>(Func<TEnum, string> nameSelector)
+        where TEnum : struct, Enum
+    {
+        return Enum.GetValues<TEnum>().Select(x => new NameValue<TEnum>(nameSelector(x), x)).ToList();
     }
 }
\ No newline at end of file
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/SettingPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/SettingPage.xaml
index f469a180..93779f61 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/SettingPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/SettingPage.xaml
@@ -108,7 +108,7 @@
                 </cwc:SettingsExpander>
                 <!--
                     https://github.com/DGP-Studio/Snap.Hutao/issues/1072
-                    ItemsRepeater will behave abnormal is no direct scrollhost wrapping it
+                    ItemsRepeater will behave abnormal if no direct scrollhost wrapping it
                 -->
                 <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Disabled">
                     <cwc:SettingsExpander
@@ -252,8 +252,6 @@
                             VerticalAlignment="Center"
                             IsOn="{Binding HotKeyOptions.MouseClickRepeatForeverKeyCombination.IsEnabled, Mode=TwoWay}"/>
                     </StackPanel>
-
-
                 </cwc:SettingsCard>
 
                 <TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" Text="{shcm:ResourceString Name=ViewpageSettingHomeHeader}"/>
diff --git a/src/Snap.Hutao/Snap.Hutao/ViewModel/Guide/StaticResource.cs b/src/Snap.Hutao/Snap.Hutao/ViewModel/Guide/StaticResource.cs
index 3d88e5d2..1774698e 100644
--- a/src/Snap.Hutao/Snap.Hutao/ViewModel/Guide/StaticResource.cs
+++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/Guide/StaticResource.cs
@@ -47,7 +47,7 @@ internal static class StaticResource
     {
         { "AchievementIcon", 1 },
         { "AvatarCard", 0 },
-        { "AvatarIcon", 1 },
+        { "AvatarIcon", 2 },
         { "Bg", 1 },
         { "ChapterIcon", 0 },
         { "CodexMonster", 0 },
diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/DataSigning/DataSignAlgorithmVersion.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/DataSigning/DataSignAlgorithmVersion.cs
index 20b425d4..e2c004ab 100644
--- a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/DataSigning/DataSignAlgorithmVersion.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/DataSigning/DataSignAlgorithmVersion.cs
@@ -4,7 +4,7 @@
 namespace Snap.Hutao.Web.Hoyolab.DataSigning;
 
 /// <summary>
-/// 动态密钥版本
+/// 数据签名版本
 /// </summary>
 [HighQuality]
 internal enum DataSignAlgorithmVersion
diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Request/Builder/HttpRequestMessageBuilderExtension.cs b/src/Snap.Hutao/Snap.Hutao/Web/Request/Builder/HttpRequestMessageBuilderExtension.cs
index 51cb7539..469b5e72 100644
--- a/src/Snap.Hutao/Snap.Hutao/Web/Request/Builder/HttpRequestMessageBuilderExtension.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Web/Request/Builder/HttpRequestMessageBuilderExtension.cs
@@ -15,8 +15,13 @@ internal static class HttpRequestMessageBuilderExtension
     {
         try
         {
-            HttpResponseMessage message = await httpClient.SendAsync(builder.HttpRequestMessage, token).ConfigureAwait(false);
-            return await builder.HttpContentSerializer.DeserializeAsync<TResult>(message.Content, token).ConfigureAwait(false);
+            using (builder.HttpRequestMessage)
+            {
+                using (HttpResponseMessage message = await httpClient.SendAsync(builder.HttpRequestMessage, token).ConfigureAwait(false))
+                {
+                    return await builder.HttpContentSerializer.DeserializeAsync<TResult>(message.Content, token).ConfigureAwait(false);
+                }
+            }
         }
         catch (HttpRequestException ex)
         {
@@ -49,7 +54,9 @@ internal static class HttpRequestMessageBuilderExtension
     {
         try
         {
-            HttpResponseMessage message = await httpClient.SendAsync(builder.HttpRequestMessage, token).ConfigureAwait(false);
+            using (HttpResponseMessage message = await httpClient.SendAsync(builder.HttpRequestMessage, token).ConfigureAwait(false))
+            {
+            }
         }
         catch (HttpRequestException ex)
         {
diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Request/Builder/HttpRequestMessageBuilderFactoryExtension.cs b/src/Snap.Hutao/Snap.Hutao/Web/Request/Builder/HttpRequestMessageBuilderFactoryExtension.cs
new file mode 100644
index 00000000..c7ecbb03
--- /dev/null
+++ b/src/Snap.Hutao/Snap.Hutao/Web/Request/Builder/HttpRequestMessageBuilderFactoryExtension.cs
@@ -0,0 +1,14 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+using Snap.Hutao.Web.Request.Builder.Abstraction;
+
+namespace Snap.Hutao.Web.Request.Builder;
+
+internal static class HttpRequestMessageBuilderFactoryExtension
+{
+    public static HttpRequestMessageBuilder Create(this IHttpRequestMessageBuilderFactory factory, string requestUri)
+    {
+        return factory.Create().SetRequestUri(requestUri);
+    }
+}
\ No newline at end of file