diff --git a/v2rayN/v2rayN.Desktop/App.axaml b/v2rayN/v2rayN.Desktop/App.axaml
index 37c54471..21204f60 100644
--- a/v2rayN/v2rayN.Desktop/App.axaml
+++ b/v2rayN/v2rayN.Desktop/App.axaml
@@ -8,14 +8,7 @@
     xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
     Name="v2rayN"
     x:DataType="vms:StatusBarViewModel"
-    RequestedThemeVariant="Default">
-    <Application.Styles>
-        <semi:SemiTheme />
-        <semi:AvaloniaEditSemiTheme />
-        <StyleInclude Source="Assets/GlobalStyles.axaml" />
-        <StyleInclude Source="avares://Semi.Avalonia.DataGrid/Index.axaml" />
-        <dialogHost:DialogHostStyles />
-    </Application.Styles>
+    RequestedThemeVariant="Default">    
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
@@ -23,6 +16,13 @@
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Application.Resources>
+    <Application.Styles>
+        <semi:SemiTheme />
+        <semi:AvaloniaEditSemiTheme />
+        <StyleInclude Source="Assets/GlobalStyles.axaml" />
+        <StyleInclude Source="avares://Semi.Avalonia.DataGrid/Index.axaml" />
+        <dialogHost:DialogHostStyles />
+    </Application.Styles>
 
     <TrayIcon.Icons>
         <TrayIcons>
diff --git a/v2rayN/v2rayN.Desktop/Assets/GlobalStyles.axaml b/v2rayN/v2rayN.Desktop/Assets/GlobalStyles.axaml
index 6a2cfacd..eccdeb91 100644
--- a/v2rayN/v2rayN.Desktop/Assets/GlobalStyles.axaml
+++ b/v2rayN/v2rayN.Desktop/Assets/GlobalStyles.axaml
@@ -13,6 +13,7 @@
     <Style Selector="PathIcon">
         <Setter Property="Width" Value="16" />
         <Setter Property="Height" Value="16" />
+        <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultTertiaryForeground}" />
     </Style>
 
     <Style Selector="TextBox">
@@ -26,4 +27,12 @@
     <Style Selector="TabControl">
         <Setter Property="Theme" Value="{StaticResource LineTabControl}" />
     </Style>
+
+    <Style Selector="Button.IconButton">
+        <Setter Property="Width" Value="{StaticResource IconButtonWidth}" />
+        <Setter Property="Height" Value="{StaticResource IconButtonHeight}" />
+        <Setter Property="MinWidth" Value="{StaticResource IconButtonWidth}" />
+        <Setter Property="Theme" Value="{DynamicResource BorderlessButton}" />
+    </Style>
+
 </Styles>
diff --git a/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml b/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml
index 7aa6a0be..7e3dda10 100644
--- a/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml
@@ -607,12 +607,14 @@
 
                         <Button
                             x:Name="btnExtra"
-                            Width="{StaticResource IconButtonWidth}"
-                            Height="{StaticResource IconButtonHeight}"
-                            Margin="{StaticResource MarginLr8}"
-                            Theme="{DynamicResource BorderlessButton}">
+                            Classes="IconButton"
+                            Margin="{StaticResource MarginLr8}">
                             <Button.Content>
-                                <PathIcon Data="{StaticResource building_more}" Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
+                                <PathIcon Data="{StaticResource SemiIconMore}" >
+                                    <PathIcon.RenderTransform>
+                                        <RotateTransform Angle="90" />
+                                    </PathIcon.RenderTransform>
+                                </PathIcon>
                             </Button.Content>
                             <Button.Flyout>
                                 <Flyout>
diff --git a/v2rayN/v2rayN.Desktop/Views/BackupAndRestoreView.axaml b/v2rayN/v2rayN.Desktop/Views/BackupAndRestoreView.axaml
index 7130c400..70d6b9a9 100644
--- a/v2rayN/v2rayN.Desktop/Views/BackupAndRestoreView.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/BackupAndRestoreView.axaml
@@ -88,13 +88,14 @@
                         <TextBlock Margin="{StaticResource Margin4}" Text="{x:Static resx:ResUI.menuRemoteBackupAndRestore}" />
 
                         <Button
-                            Width="{StaticResource IconButtonWidth}"
-                            Height="{StaticResource IconButtonHeight}"
-                            MinWidth="{StaticResource IconButtonWidth}"
-                            Margin="{StaticResource MarginLr8}"
-                            Theme="{DynamicResource BorderlessButton}">
+                            Classes="IconButton"
+                            Margin="{StaticResource MarginLr8}">
                             <Button.Content>
-                                <PathIcon Data="{StaticResource building_more}" Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
+                                <PathIcon Data="{StaticResource SemiIconMore}" >
+                                    <PathIcon.RenderTransform>
+                                        <RotateTransform Angle="90" />
+                                    </PathIcon.RenderTransform>
+                                </PathIcon>
                             </Button.Content>
                             <Button.Flyout>
                                 <Flyout>
diff --git a/v2rayN/v2rayN.Desktop/Views/ClashConnectionsView.axaml b/v2rayN/v2rayN.Desktop/Views/ClashConnectionsView.axaml
index eb174636..21bad138 100644
--- a/v2rayN/v2rayN.Desktop/Views/ClashConnectionsView.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/ClashConnectionsView.axaml
@@ -27,27 +27,21 @@
 
             <Button
                 x:Name="btnConnectionCloseAll"
-                Width="{StaticResource IconButtonWidth}"
-                Height="{StaticResource IconButtonHeight}"
-                Classes="Success"
+                Classes="IconButton Success"
                 Margin="{StaticResource MarginLr8}"
-                Theme="{DynamicResource BorderlessButton}"
                 ToolTip.Tip="{x:Static resx:ResUI.menuConnectionCloseAll}">
                 <Button.Content>
-                    <PathIcon Data="{StaticResource building_delete}" Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
+                    <PathIcon Data="{StaticResource SemiIconClose}" />
                 </Button.Content>
             </Button>
 
             <Button
                 x:Name="btnAutofitColumnWidth"
-                Width="{StaticResource IconButtonWidth}"
-                Height="{StaticResource IconButtonHeight}"
-                Classes="Success"
+                Classes="IconButton Success"
                 Margin="{StaticResource MarginLr8}"
-                Theme="{DynamicResource BorderlessButton}"
                 ToolTip.Tip="{x:Static resx:ResUI.menuProfileAutofitColumnWidth}">
                 <Button.Content>
-                    <PathIcon Data="{StaticResource building_fit}" Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
+                    <PathIcon Data="{StaticResource SemiIconExpand}" />
                 </Button.Content>
             </Button>
 
diff --git a/v2rayN/v2rayN.Desktop/Views/ClashProxiesView.axaml b/v2rayN/v2rayN.Desktop/Views/ClashProxiesView.axaml
index 974d5192..a4ef8315 100644
--- a/v2rayN/v2rayN.Desktop/Views/ClashProxiesView.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/ClashProxiesView.axaml
@@ -50,27 +50,21 @@
 
             <Button
                 x:Name="menuProxiesReload"
-                Width="{StaticResource IconButtonWidth}"
-                Height="{StaticResource IconButtonHeight}"
                 Margin="{StaticResource MarginLr8}"
-                Classes="Success"
-                Theme="{DynamicResource BorderlessButton}"
+                Classes="IconButton Success"
                 ToolTip.Tip="{x:Static resx:ResUI.menuProxiesReload}">
                 <Button.Content>
-                    <PathIcon Data="{StaticResource building_refresh}" Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
+                    <PathIcon Data="{StaticResource SemiIconRefresh}" />
                 </Button.Content>
             </Button>
 
             <Button
                 x:Name="menuProxiesDelaytest"
-                Width="{StaticResource IconButtonWidth}"
-                Height="{StaticResource IconButtonHeight}"
                 Margin="{StaticResource MarginLr8}"
-                Classes="Success"
-                Theme="{DynamicResource BorderlessButton}"
+                Classes="IconButton Success"
                 ToolTip.Tip="{x:Static resx:ResUI.menuProxiesDelaytest}">
                 <Button.Content>
-                    <PathIcon Data="{StaticResource building_ping}" Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
+                    <PathIcon Data="{StaticResource SemiIconBolt}" />
                 </Button.Content>
             </Button>
 
diff --git a/v2rayN/v2rayN.Desktop/Views/MsgView.axaml b/v2rayN/v2rayN.Desktop/Views/MsgView.axaml
index 2f7ad807..8c2cc90c 100644
--- a/v2rayN/v2rayN.Desktop/Views/MsgView.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/MsgView.axaml
@@ -25,28 +25,22 @@
 
             <Button
                 x:Name="btnCopy"
-                Width="{StaticResource IconButtonWidth}"
-                Height="{StaticResource IconButtonHeight}"
                 Margin="{StaticResource MarginLr8}"
-                Classes="Success"
+                Classes="IconButton Success"
                 Click="menuMsgViewCopyAll_Click"
-                Theme="{DynamicResource BorderlessButton}"
                 ToolTip.Tip="{x:Static resx:ResUI.menuMsgViewCopyAll}">
                 <Button.Content>
-                    <PathIcon Data="{StaticResource building_copy}" Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
+                    <PathIcon Data="{StaticResource SemiIconCopy}" />
                 </Button.Content>
             </Button>
             <Button
                 x:Name="btnClear"
-                Width="{StaticResource IconButtonWidth}"
-                Height="{StaticResource IconButtonHeight}"
                 Margin="{StaticResource MarginLr8}"
-                Classes="Success"
+                Classes="IconButton Success"
                 Click="menuMsgViewClear_Click"
-                Theme="{DynamicResource BorderlessButton}"
                 ToolTip.Tip="{x:Static resx:ResUI.menuMsgViewClear}">
                 <Button.Content>
-                    <PathIcon Data="{StaticResource building_delete}" Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
+                    <PathIcon Data="{StaticResource SemiIconDelete}" />
                 </Button.Content>
             </Button>
             <TextBlock
diff --git a/v2rayN/v2rayN.Desktop/Views/ProfilesSelectWindow.axaml b/v2rayN/v2rayN.Desktop/Views/ProfilesSelectWindow.axaml
index eda3b105..c89a7f71 100644
--- a/v2rayN/v2rayN.Desktop/Views/ProfilesSelectWindow.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/ProfilesSelectWindow.axaml
@@ -51,12 +51,11 @@
 
                     <Button
                         x:Name="btnAutofitColumnWidth"
-                        Width="32"
-                        Height="32"
-                        Margin="8,0"
+                        Margin="{StaticResource MarginLr4}"
+                        Classes="IconButton Success"
                         ToolTip.Tip="{x:Static resx:ResUI.menuProfileAutofitColumnWidth}">
                         <Button.Content>
-                            <PathIcon Data="{StaticResource building_fit}" />
+                            <PathIcon Data="{StaticResource SemiIconExpand}" />
                         </Button.Content>
                     </Button>
 
diff --git a/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml b/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml
index a0f5af1b..7a6cf085 100644
--- a/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml
@@ -32,39 +32,30 @@
 
                 <Button
                     x:Name="btnEditSub"
-                    Width="{StaticResource IconButtonWidth}"
-                    Height="{StaticResource IconButtonHeight}"
                     Margin="{StaticResource MarginLr4}"
-                    Classes="Success"
-                    Theme="{DynamicResource BorderlessButton}"
+                    Classes="IconButton Success"
                     ToolTip.Tip="{x:Static resx:ResUI.menuSubEdit}">
                     <Button.Content>
-                        <PathIcon Data="{StaticResource building_edit}" Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
+                        <PathIcon Data="{StaticResource SemiIconEdit}" />
                     </Button.Content>
                 </Button>
                 <Button
                     x:Name="btnAddSub"
-                    Width="{StaticResource IconButtonWidth}"
-                    Height="{StaticResource IconButtonHeight}"
                     Margin="{StaticResource MarginLr4}"
-                    Classes="Success"
-                    Theme="{DynamicResource BorderlessButton}"
+                    Classes="IconButton Success"
                     ToolTip.Tip="{x:Static resx:ResUI.menuSubAdd}">
                     <Button.Content>
-                        <PathIcon Data="{StaticResource building_add}" Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
+                        <PathIcon Data="{StaticResource SemiIconPlus}" />
                     </Button.Content>
                 </Button>
 
                 <Button
                     x:Name="btnAutofitColumnWidth"
-                    Width="{StaticResource IconButtonWidth}"
-                    Height="{StaticResource IconButtonHeight}"
                     Margin="{StaticResource MarginLr4}"
-                    Classes="Success"
-                    Theme="{DynamicResource BorderlessButton}"
+                    Classes="IconButton Success"
                     ToolTip.Tip="{x:Static resx:ResUI.menuProfileAutofitColumnWidth}">
                     <Button.Content>
-                        <PathIcon Data="{StaticResource building_fit}" Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
+                        <PathIcon Data="{StaticResource SemiIconExpand}" />
                     </Button.Content>
                 </Button>
 
diff --git a/v2rayN/v2rayN.Desktop/Views/SubEditWindow.axaml b/v2rayN/v2rayN.Desktop/Views/SubEditWindow.axaml
index 211cff40..79216921 100644
--- a/v2rayN/v2rayN.Desktop/Views/SubEditWindow.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/SubEditWindow.axaml
@@ -72,13 +72,15 @@
                 <Button
                     Grid.Row="2"
                     Grid.Column="2"
-                    Width="{StaticResource IconButtonWidth}"
-                    Height="{StaticResource IconButtonHeight}"
-                    Margin="{StaticResource MarginLr8}"
+                    Classes="IconButton"
                     HorizontalAlignment="Left"
-                    Theme="{DynamicResource BorderlessButton}">
+                    Margin="{StaticResource MarginLr8}">
                     <Button.Content>
-                        <PathIcon Data="{StaticResource building_more}" Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
+                        <PathIcon Data="{StaticResource SemiIconMore}" >
+                            <PathIcon.RenderTransform>
+                                <RotateTransform Angle="90" />
+                            </PathIcon.RenderTransform>
+                        </PathIcon>
                     </Button.Content>
                     <Button.Flyout>
                         <Flyout>
diff --git a/v2rayN/v2rayN.Desktop/Views/ThemeSettingView.axaml b/v2rayN/v2rayN.Desktop/Views/ThemeSettingView.axaml
index a39a82a2..7eb23738 100644
--- a/v2rayN/v2rayN.Desktop/Views/ThemeSettingView.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/ThemeSettingView.axaml
@@ -19,13 +19,13 @@
         </Style>
     </UserControl.Styles>
 
-    <Button
-        Width="{StaticResource IconButtonWidth}"
-        Height="{StaticResource IconButtonHeight}"
-        Margin="{StaticResource MarginLr8}"
-        Theme="{DynamicResource BorderlessButton}">
+    <Button Margin="{StaticResource MarginLr8}" Classes="IconButton">
         <Button.Content>
-            <PathIcon Data="{StaticResource building_more}" Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
+            <PathIcon Data="{StaticResource SemiIconMore}">
+                <PathIcon.RenderTransform>
+                    <RotateTransform Angle="90" />
+                </PathIcon.RenderTransform>
+            </PathIcon>
         </Button.Content>
         <Button.Flyout>
             <Flyout>