diff --git a/src/Snap.Hutao/Snap.Hutao/App.xaml b/src/Snap.Hutao/Snap.Hutao/App.xaml
index ebf0792b..0e9acba1 100644
--- a/src/Snap.Hutao/Snap.Hutao/App.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/App.xaml
@@ -94,6 +94,7 @@
             <x:String x:Key="UI_MarkTower">https://static.snapgenshin.com/Bg/UI_MarkTower.png</x:String>
             <x:String x:Key="UI_Icon_Intee_Explore_1">https://static.snapgenshin.com/Bg/UI_Icon_Intee_Explore_1.png</x:String>
             <x:String x:Key="UI_MarkQuest_Events_Proce">https://static.snapgenshin.com/Bg/UI_MarkQuest_Events_Proce.png</x:String>
+            <x:String x:Key="UI_ItemIcon_201">https://static.snapgenshin.com/ItemIcon/UI_ItemIcon_201.png</x:String>
             <x:String x:Key="UI_ItemIcon_204">https://static.snapgenshin.com/ItemIcon/UI_ItemIcon_204.png</x:String>
             <x:String x:Key="UI_ItemIcon_210">https://static.snapgenshin.com/ItemIcon/UI_ItemIcon_210.png</x:String>
             <x:String x:Key="UI_ItemIcon_220021">https://static.snapgenshin.com/ItemIcon/UI_ItemIcon_220021.png</x:String>
diff --git a/src/Snap.Hutao/Snap.Hutao/Core/Shell/JumpListInterop.cs b/src/Snap.Hutao/Snap.Hutao/Core/Shell/JumpListInterop.cs
index e618eb3b..2e875dd4 100644
--- a/src/Snap.Hutao/Snap.Hutao/Core/Shell/JumpListInterop.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Core/Shell/JumpListInterop.cs
@@ -26,7 +26,7 @@ internal sealed class JumpListInterop : IJumpListInterop
             list.Items.Clear();
 
             JumpListItem launchGameItem = JumpListItem.CreateWithArguments(Activation.LaunchGame, SH.CoreJumpListHelperLaunchGameItemDisplayName);
-            launchGameItem.Logo = "ms-appx:///Resource/Icon/UI_GuideIcon_PlayMethod.png".ToUri();
+            launchGameItem.Logo = "ms-appx:///Resource/Navigation/LaunchGame.png".ToUri();
 
             list.Items.Add(launchGameItem);
 
diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Icon/UI_BagTabIcon_Avatar.png b/src/Snap.Hutao/Snap.Hutao/Resource/Icon/UI_BagTabIcon_Avatar.png
deleted file mode 100644
index 708123e9..00000000
Binary files a/src/Snap.Hutao/Snap.Hutao/Resource/Icon/UI_BagTabIcon_Avatar.png and /dev/null differ
diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Icon/UI_BagTabIcon_Weapon.png b/src/Snap.Hutao/Snap.Hutao/Resource/Icon/UI_BagTabIcon_Weapon.png
deleted file mode 100644
index 78e3363a..00000000
Binary files a/src/Snap.Hutao/Snap.Hutao/Resource/Icon/UI_BagTabIcon_Weapon.png and /dev/null differ
diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Icon/UI_BtnIcon_ActivityEntry.png b/src/Snap.Hutao/Snap.Hutao/Resource/Icon/UI_BtnIcon_ActivityEntry.png
deleted file mode 100644
index 7f655490..00000000
Binary files a/src/Snap.Hutao/Snap.Hutao/Resource/Icon/UI_BtnIcon_ActivityEntry.png and /dev/null differ
diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Icon/UI_BtnIcon_Gacha.png b/src/Snap.Hutao/Snap.Hutao/Resource/Icon/UI_BtnIcon_Gacha.png
deleted file mode 100644
index a2853260..00000000
Binary files a/src/Snap.Hutao/Snap.Hutao/Resource/Icon/UI_BtnIcon_Gacha.png and /dev/null differ
diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Icon/UI_ChapterIcon_Hutao.png b/src/Snap.Hutao/Snap.Hutao/Resource/Icon/UI_ChapterIcon_Hutao.png
deleted file mode 100644
index bb1ec9f1..00000000
Binary files a/src/Snap.Hutao/Snap.Hutao/Resource/Icon/UI_ChapterIcon_Hutao.png and /dev/null differ
diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Icon/UI_GuideIcon_PlayMethod.png b/src/Snap.Hutao/Snap.Hutao/Resource/Icon/UI_GuideIcon_PlayMethod.png
deleted file mode 100644
index 71b3db69..00000000
Binary files a/src/Snap.Hutao/Snap.Hutao/Resource/Icon/UI_GuideIcon_PlayMethod.png and /dev/null differ
diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Icon/UI_HomeWorldTabIcon_2_Team.png b/src/Snap.Hutao/Snap.Hutao/Resource/Icon/UI_HomeWorldTabIcon_2_Team.png
deleted file mode 100644
index 6700d9e0..00000000
Binary files a/src/Snap.Hutao/Snap.Hutao/Resource/Icon/UI_HomeWorldTabIcon_2_Team.png and /dev/null differ
diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Icon/UI_Icon_Achievement.png b/src/Snap.Hutao/Snap.Hutao/Resource/Icon/UI_Icon_Achievement.png
deleted file mode 100644
index ebe3f873..00000000
Binary files a/src/Snap.Hutao/Snap.Hutao/Resource/Icon/UI_Icon_Achievement.png and /dev/null differ
diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Icon/UI_Icon_BoostUp.png b/src/Snap.Hutao/Snap.Hutao/Resource/Icon/UI_Icon_BoostUp.png
deleted file mode 100644
index d91d016f..00000000
Binary files a/src/Snap.Hutao/Snap.Hutao/Resource/Icon/UI_Icon_BoostUp.png and /dev/null differ
diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Icon/UI_Icon_None.png b/src/Snap.Hutao/Snap.Hutao/Resource/Icon/UI_Icon_None.png
deleted file mode 100644
index caf3679a..00000000
Binary files a/src/Snap.Hutao/Snap.Hutao/Resource/Icon/UI_Icon_None.png and /dev/null differ
diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Icon/UI_ItemIcon_204.png b/src/Snap.Hutao/Snap.Hutao/Resource/Icon/UI_ItemIcon_204.png
deleted file mode 100644
index 26123ca6..00000000
Binary files a/src/Snap.Hutao/Snap.Hutao/Resource/Icon/UI_ItemIcon_204.png and /dev/null differ
diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Icon/UI_ItemIcon_210.png b/src/Snap.Hutao/Snap.Hutao/Resource/Icon/UI_ItemIcon_210.png
deleted file mode 100644
index 636ce0a2..00000000
Binary files a/src/Snap.Hutao/Snap.Hutao/Resource/Icon/UI_ItemIcon_210.png and /dev/null differ
diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Icon/UI_MarkCustom_TagMonster.png b/src/Snap.Hutao/Snap.Hutao/Resource/Icon/UI_MarkCustom_TagMonster.png
deleted file mode 100644
index d883405d..00000000
Binary files a/src/Snap.Hutao/Snap.Hutao/Resource/Icon/UI_MarkCustom_TagMonster.png and /dev/null differ
diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Icon/UI_MarkTower.png b/src/Snap.Hutao/Snap.Hutao/Resource/Icon/UI_MarkTower.png
deleted file mode 100644
index b8643b0e..00000000
Binary files a/src/Snap.Hutao/Snap.Hutao/Resource/Icon/UI_MarkTower.png and /dev/null differ
diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Icon/UI_MarkTower_Tower.png b/src/Snap.Hutao/Snap.Hutao/Resource/Icon/UI_MarkTower_Tower.png
deleted file mode 100644
index 73f88076..00000000
Binary files a/src/Snap.Hutao/Snap.Hutao/Resource/Icon/UI_MarkTower_Tower.png and /dev/null differ
diff --git a/src/Snap.Hutao/Snap.Hutao/Snap.Hutao.csproj b/src/Snap.Hutao/Snap.Hutao/Snap.Hutao.csproj
index 4cbe9f85..e3f7cf2c 100644
--- a/src/Snap.Hutao/Snap.Hutao/Snap.Hutao.csproj
+++ b/src/Snap.Hutao/Snap.Hutao/Snap.Hutao.csproj
@@ -83,25 +83,11 @@
     <None Remove="Resource\Font\MiSans-Regular.ttf" />
     <None Remove="Resource\HutaoIconSourceTransparentBackgroundGradient1.png" />
     <None Remove="Resource\Icon\UI_AchievementIcon_3_3.png" />
-    <None Remove="Resource\Icon\UI_BagTabIcon_Avatar.png" />
-    <None Remove="Resource\Icon\UI_BagTabIcon_Weapon.png" />
-    <None Remove="Resource\Icon\UI_BtnIcon_ActivityEntry.png" />
-    <None Remove="Resource\Icon\UI_BtnIcon_Gacha.png" />
-    <None Remove="Resource\Icon\UI_ChapterIcon_Hutao.png" />
     <None Remove="Resource\Icon\UI_GachaShowPanel_Bg_Weapon.png" />
-    <None Remove="Resource\Icon\UI_GuideIcon_PlayMethod.png" />
-    <None Remove="Resource\Icon\UI_HomeWorldTabIcon_2_Team.png" />
-    <None Remove="Resource\Icon\UI_Icon_Achievement.png" />
-    <None Remove="Resource\Icon\UI_Icon_BoostUp.png" />
     <None Remove="Resource\Icon\UI_Icon_Fetter.png" />
     <None Remove="Resource\Icon\UI_Icon_Locked.png" />
-    <None Remove="Resource\Icon\UI_Icon_None.png" />
     <None Remove="Resource\Icon\UI_Icon_Tower_Star.png" />
     <None Remove="Resource\Icon\UI_ItemIcon_201.png" />
-    <None Remove="Resource\Icon\UI_ItemIcon_210.png" />
-    <None Remove="Resource\Icon\UI_MarkCustom_TagMonster.png" />
-    <None Remove="Resource\Icon\UI_MarkTower.png" />
-    <None Remove="Resource\Icon\UI_MarkTower_Tower.png" />
     <None Remove="Resource\Navigation\Achievement.png" />
     <None Remove="Resource\Navigation\Announcement.png" />
     <None Remove="Resource\Navigation\AvatarProperty.png" />
@@ -223,25 +209,11 @@
     <Content Include="Resource\Font\MiSans-Regular.ttf" />
     <Content Include="Resource\HutaoIconSourceTransparentBackgroundGradient1.png" />
     <Content Include="Resource\Icon\UI_AchievementIcon_3_3.png" />
-    <Content Include="Resource\Icon\UI_BagTabIcon_Avatar.png" />
-    <Content Include="Resource\Icon\UI_BagTabIcon_Weapon.png" />
-    <Content Include="Resource\Icon\UI_BtnIcon_ActivityEntry.png" />
-    <Content Include="Resource\Icon\UI_BtnIcon_Gacha.png" />
-    <Content Include="Resource\Icon\UI_ChapterIcon_Hutao.png" />
     <Content Include="Resource\Icon\UI_GachaShowPanel_Bg_Weapon.png" />
-    <Content Include="Resource\Icon\UI_GuideIcon_PlayMethod.png" />
-    <Content Include="Resource\Icon\UI_HomeWorldTabIcon_2_Team.png" />
-    <Content Include="Resource\Icon\UI_Icon_Achievement.png" />
-    <Content Include="Resource\Icon\UI_Icon_BoostUp.png" />
     <Content Include="Resource\Icon\UI_Icon_Fetter.png" />
     <Content Include="Resource\Icon\UI_Icon_Locked.png" />
-    <Content Include="Resource\Icon\UI_Icon_None.png" />
     <Content Include="Resource\Icon\UI_Icon_Tower_Star.png" />
     <Content Include="Resource\Icon\UI_ItemIcon_201.png" />
-    <Content Include="Resource\Icon\UI_ItemIcon_210.png" />
-    <Content Include="Resource\Icon\UI_MarkCustom_TagMonster.png" />
-    <Content Include="Resource\Icon\UI_MarkTower.png" />
-    <Content Include="Resource\Icon\UI_MarkTower_Tower.png" />
     <Content Include="Resource\Navigation\Achievement.png" />
     <Content Include="Resource\Navigation\Announcement.png" />
     <Content Include="Resource\Navigation\AvatarProperty.png" />
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/AchievementPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/AchievementPage.xaml
index 3eb21484..b2db5bf0 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/AchievementPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/AchievementPage.xaml
@@ -13,6 +13,7 @@
     xmlns:shcm="using:Snap.Hutao.Control.Markup"
     xmlns:shcp="using:Snap.Hutao.Control.Panel"
     xmlns:shva="using:Snap.Hutao.ViewModel.Achievement"
+    xmlns:shvh="using:Snap.Hutao.View.Helper"
     d:DataContext="{d:DesignInstance shva:AchievementViewModel}"
     Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
     mc:Ignorable="d">
@@ -230,10 +231,10 @@
                                                             VerticalAlignment="Center"
                                                             Text="{Binding Time}"
                                                             Visibility="{Binding IsChecked, Converter={StaticResource BoolToVisibilityConverter}}"/>
-                                                        <Image
+                                                        <shci:CachedImage
                                                             Grid.Column="2"
-                                                            Height="32"
-                                                            Source="ms-appx:///Resource/Icon/UI_ItemIcon_201.png"/>
+                                                            shvh:FrameworkElementHelper.SquareLength="32"
+                                                            Source="{StaticResource UI_ItemIcon_201}"/>
                                                         <TextBlock
                                                             Grid.Column="3"
                                                             Margin="12,0,0,0"
@@ -303,7 +304,7 @@
                 <Image
                     Width="120"
                     Height="120"
-                    Source="ms-appx:///Resource/Icon/UI_AchievementIcon_3_3.png"/>
+                    Source="ms-appx:///Resource/Navigation/Achievement.png"/>
                 <TextBlock
                     Margin="0,16,0,0"
                     HorizontalAlignment="Center"