From bdae08b13bb8f272dbc95a8bac191f2636ab199b Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Mon, 14 Oct 2024 14:27:53 +0800
Subject: [PATCH] Improved UI

---
 v2rayN/v2rayN/App.xaml                        |  36 ++-
 v2rayN/v2rayN/Views/AddServer2Window.xaml     |  36 +--
 v2rayN/v2rayN/Views/AddServerWindow.xaml      | 180 ++++++------
 v2rayN/v2rayN/Views/BackupAndRestoreView.xaml |  56 ++--
 v2rayN/v2rayN/Views/CheckUpdateView.xaml      |  16 +-
 v2rayN/v2rayN/Views/ClashConnectionsView.xaml |  16 +-
 v2rayN/v2rayN/Views/ClashProxiesView.xaml     |  28 +-
 v2rayN/v2rayN/Views/DNSSettingWindow.xaml     |  44 +--
 .../Views/GlobalHotkeySettingWindow.xaml      |  32 +--
 v2rayN/v2rayN/Views/MainWindow.xaml           |  58 +---
 v2rayN/v2rayN/Views/MsgView.xaml              |  18 +-
 v2rayN/v2rayN/Views/OptionSettingWindow.xaml  | 270 +++++++++---------
 v2rayN/v2rayN/Views/ProfilesView.xaml         |  10 +-
 v2rayN/v2rayN/Views/QrcodeView.xaml           |   4 +-
 .../Views/RoutingRuleDetailsWindow.xaml       |  40 +--
 .../Views/RoutingRuleSettingWindow.xaml       |  46 +--
 v2rayN/v2rayN/Views/RoutingSettingWindow.xaml |  35 ++-
 v2rayN/v2rayN/Views/StatusBarView.xaml        |  30 +-
 v2rayN/v2rayN/Views/SubEditWindow.xaml        |  58 ++--
 v2rayN/v2rayN/Views/SubSettingWindow.xaml     |  10 +-
 v2rayN/v2rayN/Views/ThemeSettingView.xaml     |  12 +-
 21 files changed, 515 insertions(+), 520 deletions(-)

diff --git a/v2rayN/v2rayN/App.xaml b/v2rayN/v2rayN/App.xaml
index 844c6af9..b5d2997d 100644
--- a/v2rayN/v2rayN/App.xaml
+++ b/v2rayN/v2rayN/App.xaml
@@ -24,23 +24,47 @@
 
             <conv:InverseBooleanConverter x:Key="InverseBooleanConverter" />
             <Thickness
-                x:Key="ServerItemMargin"
+                x:Key="Margin4"
                 Bottom="4"
                 Left="4"
                 Right="4"
                 Top="4" />
             <Thickness
-                x:Key="SettingItemMargin"
+                x:Key="Margin8"
                 Bottom="8"
                 Left="8"
                 Right="8"
                 Top="8" />
             <Thickness
                 x:Key="OutlinedTextBoxDefaultPadding"
-                Bottom="12"
-                Left="16"
-                Right="12"
-                Top="12" />
+                Bottom="8"
+                Left="8"
+                Right="8"
+                Top="8" />
+            <Thickness
+                x:Key="MarginLeftRight4"
+                Bottom="0"
+                Left="4"
+                Right="4"
+                Top="0" />
+            <Thickness
+                x:Key="MarginLeftRight8"
+                Bottom="0"
+                Left="8"
+                Right="8"
+                Top="0" />
+            <Thickness
+                x:Key="MarginLeft8"
+                Bottom="0"
+                Left="8"
+                Right="0"
+                Top="0" />
+            <Thickness
+                x:Key="MarginRight8"
+                Bottom="0"
+                Left="0"
+                Right="8"
+                Top="0" />
             <Style
                 x:Key="ModuleTitle"
                 BasedOn="{StaticResource MaterialDesignTextBlock}"
diff --git a/v2rayN/v2rayN/Views/AddServer2Window.xaml b/v2rayN/v2rayN/Views/AddServer2Window.xaml
index b196a212..904f2248 100644
--- a/v2rayN/v2rayN/Views/AddServer2Window.xaml
+++ b/v2rayN/v2rayN/Views/AddServer2Window.xaml
@@ -22,9 +22,9 @@
     TextElement.Foreground="{DynamicResource MaterialDesignBody}"
     WindowStartupLocation="CenterScreen"
     mc:Ignorable="d">
-    <DockPanel Margin="8">
+    <DockPanel Margin="{StaticResource Margin8}">
         <StackPanel
-            Margin="4"
+            Margin="{StaticResource Margin4}"
             HorizontalAlignment="Center"
             DockPanel.Dock="Bottom"
             Orientation="Horizontal">
@@ -37,7 +37,7 @@
             <Button
                 x:Name="btnCancel"
                 Width="100"
-                Margin="8,0"
+                Margin="{StaticResource MarginLeftRight8}"
                 Content="{x:Static resx:ResUI.TbCancel}"
                 Cursor="Hand"
                 IsCancel="true"
@@ -72,14 +72,14 @@
                     <TextBlock
                         Grid.Row="0"
                         Grid.Column="0"
-                        Margin="4"
+                        Margin="{StaticResource Margin4}"
                         Style="{StaticResource ModuleTitle}"
                         Text="{x:Static resx:ResUI.menuServers}" />
 
                     <TextBlock
                         Grid.Row="1"
                         Grid.Column="0"
-                        Margin="4"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbRemarks}" />
@@ -89,7 +89,7 @@
                         Grid.Row="1"
                         Grid.Column="1"
                         Width="400"
-                        Margin="4"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Top"
                         AcceptsReturn="True"
                         Style="{StaticResource MyOutlinedTextBox}" />
@@ -97,7 +97,7 @@
                     <TextBlock
                         Grid.Row="2"
                         Grid.Column="0"
-                        Margin="4"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbAddress}" />
@@ -106,7 +106,7 @@
                         Grid.Row="2"
                         Grid.Column="1"
                         Width="400"
-                        Margin="4"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Top"
                         AcceptsReturn="True"
                         IsReadOnly="True"
@@ -118,12 +118,12 @@
                         Orientation="Horizontal">
                         <Button
                             x:Name="btnBrowse"
-                            Margin="2,0"
+                            Margin="{StaticResource MarginLeftRight4}"
                             Content="{x:Static resx:ResUI.TbBrowse}"
                             Style="{StaticResource DefButton}" />
                         <Button
                             x:Name="btnEdit"
-                            Margin="2,0"
+                            Margin="{StaticResource MarginLeftRight4}"
                             Content="{x:Static resx:ResUI.TbEdit}"
                             Style="{StaticResource DefButton}" />
                     </StackPanel>
@@ -131,7 +131,7 @@
                     <TextBlock
                         Grid.Row="3"
                         Grid.Column="0"
-                        Margin="4"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbCoreType}" />
@@ -140,7 +140,7 @@
                         Grid.Row="3"
                         Grid.Column="1"
                         Width="200"
-                        Margin="4"
+                        Margin="{StaticResource Margin4}"
                         HorizontalAlignment="Left"
                         MaxDropDownHeight="1000"
                         Style="{StaticResource MyOutlinedTextComboBox}" />
@@ -148,18 +148,18 @@
                     <TextBlock
                         Grid.Row="4"
                         Grid.Column="0"
-                        Margin="4"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbDisplayLog}" />
                     <StackPanel
                         Grid.Row="4"
                         Grid.Column="1"
-                        Margin="4"
+                        Margin="{StaticResource Margin4}"
                         Orientation="Horizontal">
                         <ToggleButton x:Name="togDisplayLog" HorizontalAlignment="Left" />
                         <TextBlock
-                            Margin="8,0"
+                            Margin="{StaticResource MarginLeftRight8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TipDisplayLog}" />
@@ -168,7 +168,7 @@
                     <TextBlock
                         Grid.Row="5"
                         Grid.Column="0"
-                        Margin="4"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbPreSocksPort}" />
@@ -177,7 +177,7 @@
                         Grid.Row="5"
                         Grid.Column="1"
                         Width="200"
-                        Margin="4"
+                        Margin="{StaticResource Margin4}"
                         HorizontalAlignment="Left"
                         AcceptsReturn="True"
                         Style="{StaticResource MyOutlinedTextBox}" />
@@ -193,7 +193,7 @@
                             TextWrapping="Wrap" />
                         <TextBlock
                             Width="500"
-                            Margin="8,0"
+                            Margin="{StaticResource MarginLeftRight8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.CustomServerTips}"
diff --git a/v2rayN/v2rayN/Views/AddServerWindow.xaml b/v2rayN/v2rayN/Views/AddServerWindow.xaml
index f23efe25..ad9a229b 100644
--- a/v2rayN/v2rayN/Views/AddServerWindow.xaml
+++ b/v2rayN/v2rayN/Views/AddServerWindow.xaml
@@ -22,9 +22,9 @@
     TextElement.Foreground="{DynamicResource MaterialDesignBody}"
     WindowStartupLocation="CenterScreen"
     mc:Ignorable="d">
-    <DockPanel Margin="8">
+    <DockPanel Margin="{StaticResource Margin8}">
         <StackPanel
-            Margin="4"
+            Margin="{StaticResource Margin4}"
             HorizontalAlignment="Center"
             DockPanel.Dock="Bottom"
             Orientation="Horizontal">
@@ -37,7 +37,7 @@
             <Button
                 x:Name="btnCancel"
                 Width="100"
-                Margin="8,0"
+                Margin="{StaticResource MarginLeftRight8}"
                 Content="{x:Static resx:ResUI.TbCancel}"
                 Cursor="Hand"
                 IsCancel="true"
@@ -76,7 +76,7 @@
                     <TextBlock
                         Grid.Row="0"
                         Grid.Column="0"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         Style="{StaticResource ModuleTitle}"
                         Text="{x:Static resx:ResUI.menuServers}" />
                     <StackPanel
@@ -86,7 +86,7 @@
                         <ComboBox
                             x:Name="cmbCoreType"
                             Width="100"
-                            Margin="{StaticResource ServerItemMargin}"
+                            Margin="{StaticResource Margin4}"
                             materialDesign:HintAssist.Hint="{x:Static resx:ResUI.TbCoreType}"
                             Style="{StaticResource DefComboBox}" />
                     </StackPanel>
@@ -94,7 +94,7 @@
                     <TextBlock
                         Grid.Row="1"
                         Grid.Column="0"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbRemarks}" />
@@ -103,13 +103,13 @@
                         Grid.Row="1"
                         Grid.Column="1"
                         Width="400"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         Style="{StaticResource DefTextBox}" />
 
                     <TextBlock
                         Grid.Row="2"
                         Grid.Column="0"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbAddress}" />
@@ -118,13 +118,13 @@
                         Grid.Row="2"
                         Grid.Column="1"
                         Width="400"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         Style="{StaticResource DefTextBox}" />
 
                     <TextBlock
                         Grid.Row="3"
                         Grid.Column="0"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbPort}" />
@@ -133,7 +133,7 @@
                         Grid.Row="3"
                         Grid.Column="1"
                         Width="100"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         HorizontalAlignment="Left"
                         Style="{StaticResource DefTextBox}" />
                 </Grid>
@@ -162,7 +162,7 @@
                     <TextBlock
                         Grid.Row="1"
                         Grid.Column="0"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbId}" />
@@ -171,20 +171,20 @@
                         Grid.Row="1"
                         Grid.Column="1"
                         Width="400"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         Style="{StaticResource DefTextBox}" />
                     <Button
                         x:Name="btnGUID"
                         Grid.Row="1"
                         Grid.Column="2"
-                        Margin="4,0"
+                        Margin="{StaticResource MarginLeftRight4}"
                         Content="{x:Static resx:ResUI.TbGUID}"
                         Style="{StaticResource DefButton}" />
 
                     <TextBlock
                         Grid.Row="2"
                         Grid.Column="0"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbAlterId}" />
@@ -193,14 +193,14 @@
                         Grid.Row="2"
                         Grid.Column="1"
                         Width="100"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         HorizontalAlignment="Left"
                         Style="{StaticResource DefTextBox}" />
 
                     <TextBlock
                         Grid.Row="3"
                         Grid.Column="0"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbSecurity}" />
@@ -209,7 +209,7 @@
                         Grid.Row="3"
                         Grid.Column="1"
                         Width="200"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         Style="{StaticResource DefComboBox}" />
                 </Grid>
                 <Grid
@@ -230,7 +230,7 @@
                     <TextBlock
                         Grid.Row="1"
                         Grid.Column="0"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbId3}" />
@@ -239,13 +239,13 @@
                         Grid.Row="1"
                         Grid.Column="1"
                         Width="400"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         Style="{StaticResource DefTextBox}" />
 
                     <TextBlock
                         Grid.Row="2"
                         Grid.Column="0"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbSecurity3}" />
@@ -254,7 +254,7 @@
                         Grid.Row="2"
                         Grid.Column="1"
                         Width="300"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         Style="{StaticResource DefComboBox}" />
                 </Grid>
                 <Grid
@@ -275,7 +275,7 @@
                     <TextBlock
                         Grid.Row="1"
                         Grid.Column="0"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbSecurity4}" />
@@ -284,13 +284,13 @@
                         Grid.Row="1"
                         Grid.Column="1"
                         Width="400"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         Style="{StaticResource DefTextBox}" />
 
                     <TextBlock
                         Grid.Row="2"
                         Grid.Column="0"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbId4}" />
@@ -299,7 +299,7 @@
                         Grid.Row="2"
                         Grid.Column="1"
                         Width="400"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         Style="{StaticResource DefTextBox}" />
                 </Grid>
                 <Grid
@@ -321,7 +321,7 @@
                     <TextBlock
                         Grid.Row="1"
                         Grid.Column="0"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbId5}" />
@@ -330,20 +330,20 @@
                         Grid.Row="1"
                         Grid.Column="1"
                         Width="400"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         Style="{StaticResource DefTextBox}" />
                     <Button
                         x:Name="btnGUID5"
                         Grid.Row="1"
                         Grid.Column="2"
-                        Margin="4,0"
+                        Margin="{StaticResource MarginLeftRight4}"
                         Content="{x:Static resx:ResUI.TbGUID}"
                         Style="{StaticResource DefButton}" />
 
                     <TextBlock
                         Grid.Row="2"
                         Grid.Column="0"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbFlow5}" />
@@ -352,13 +352,13 @@
                         Grid.Row="2"
                         Grid.Column="1"
                         Width="200"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         Style="{StaticResource DefComboBox}" />
 
                     <TextBlock
                         Grid.Row="3"
                         Grid.Column="0"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbSecurity5}" />
@@ -367,7 +367,7 @@
                         Grid.Row="3"
                         Grid.Column="1"
                         Width="200"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         HorizontalAlignment="Left"
                         Style="{StaticResource DefTextBox}" />
                 </Grid>
@@ -389,7 +389,7 @@
                     <TextBlock
                         Grid.Row="1"
                         Grid.Column="0"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbId3}" />
@@ -398,13 +398,13 @@
                         Grid.Row="1"
                         Grid.Column="1"
                         Width="400"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         Style="{StaticResource DefTextBox}" />
 
                     <TextBlock
                         Grid.Row="2"
                         Grid.Column="0"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbFlow5}" />
@@ -413,7 +413,7 @@
                         Grid.Row="2"
                         Grid.Column="1"
                         Width="200"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         Style="{StaticResource DefComboBox}" />
                 </Grid>
                 <Grid
@@ -434,7 +434,7 @@
                     <TextBlock
                         Grid.Row="1"
                         Grid.Column="0"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbId3}" />
@@ -443,13 +443,13 @@
                         Grid.Row="1"
                         Grid.Column="1"
                         Width="400"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         Style="{StaticResource DefTextBox}" />
 
                     <TextBlock
                         Grid.Row="2"
                         Grid.Column="0"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbPath7}" />
@@ -458,7 +458,7 @@
                         Grid.Row="2"
                         Grid.Column="1"
                         Width="400"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         Style="{StaticResource DefTextBox}" />
                 </Grid>
                 <Grid
@@ -479,7 +479,7 @@
                     <TextBlock
                         Grid.Row="1"
                         Grid.Column="0"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbId}" />
@@ -488,13 +488,13 @@
                         Grid.Row="1"
                         Grid.Column="1"
                         Width="400"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         Style="{StaticResource DefTextBox}" />
 
                     <TextBlock
                         Grid.Row="2"
                         Grid.Column="0"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbId3}" />
@@ -503,13 +503,13 @@
                         Grid.Row="2"
                         Grid.Column="1"
                         Width="400"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         Style="{StaticResource DefTextBox}" />
 
                     <TextBlock
                         Grid.Row="3"
                         Grid.Column="0"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbHeaderType8}" />
@@ -518,7 +518,7 @@
                         Grid.Row="3"
                         Grid.Column="1"
                         Width="100"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         Style="{StaticResource DefComboBox}" />
                 </Grid>
                 <Grid
@@ -541,7 +541,7 @@
                     <TextBlock
                         Grid.Row="1"
                         Grid.Column="0"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbPrivateKey}" />
@@ -550,13 +550,13 @@
                         Grid.Row="1"
                         Grid.Column="1"
                         Width="400"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         Style="{StaticResource DefTextBox}" />
 
                     <TextBlock
                         Grid.Row="2"
                         Grid.Column="0"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbPublicKey}" />
@@ -565,14 +565,14 @@
                         Grid.Row="2"
                         Grid.Column="1"
                         Width="400"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         HorizontalAlignment="Left"
                         Style="{StaticResource DefTextBox}" />
 
                     <TextBlock
                         Grid.Row="3"
                         Grid.Column="0"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbReserved}" />
@@ -581,13 +581,13 @@
                         Grid.Row="3"
                         Grid.Column="1"
                         Width="400"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         Style="{StaticResource DefTextBox}" />
 
                     <TextBlock
                         Grid.Row="4"
                         Grid.Column="0"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbLocalAddress}" />
@@ -596,13 +596,13 @@
                         Grid.Row="4"
                         Grid.Column="1"
                         Width="400"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         Style="{StaticResource DefTextBox}" />
 
                     <TextBlock
                         Grid.Row="5"
                         Grid.Column="0"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="Mtu" />
@@ -611,7 +611,7 @@
                         Grid.Row="5"
                         Grid.Column="1"
                         Width="100"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         HorizontalAlignment="Left"
                         Style="{StaticResource DefTextBox}" />
                 </Grid>
@@ -642,14 +642,14 @@
                     <TextBlock
                         Grid.Row="0"
                         Grid.ColumnSpan="2"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         Style="{StaticResource ModuleTitle}"
                         Text="{x:Static resx:ResUI.GbTransport}" />
 
                     <TextBlock
                         Grid.Row="1"
                         Grid.Column="0"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbNetwork}" />
@@ -658,12 +658,12 @@
                         Grid.Row="1"
                         Grid.Column="1"
                         Width="100"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         Style="{StaticResource DefComboBox}" />
                     <TextBlock
                         Grid.Row="1"
                         Grid.Column="2"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TipNetwork}" />
@@ -672,7 +672,7 @@
                         x:Name="labHeaderType"
                         Grid.Row="2"
                         Grid.Column="0"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbHeaderType}" />
@@ -681,13 +681,13 @@
                         Grid.Row="2"
                         Grid.Column="1"
                         Width="100"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         Style="{StaticResource DefComboBox}" />
                     <TextBlock
                         x:Name="tipHeaderType"
                         Grid.Row="2"
                         Grid.Column="2"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbHeaderType}" />
@@ -695,7 +695,7 @@
                     <TextBlock
                         Grid.Row="3"
                         Grid.Column="0"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbRequestHost}" />
@@ -704,13 +704,13 @@
                         Grid.Row="3"
                         Grid.Column="1"
                         Width="400"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         Style="{StaticResource DefTextBox}" />
                     <TextBlock
                         x:Name="tipRequestHost"
                         Grid.Row="3"
                         Grid.Column="2"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbRequestHost}" />
@@ -718,7 +718,7 @@
                     <TextBlock
                         Grid.Row="4"
                         Grid.Column="0"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbPath}" />
@@ -727,13 +727,13 @@
                         Grid.Row="4"
                         Grid.Column="1"
                         Width="400"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         Style="{StaticResource DefTextBox}" />
                     <TextBlock
                         x:Name="tipPath"
                         Grid.Row="4"
                         Grid.Column="2"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbPath}" />
@@ -760,7 +760,7 @@
                     <TextBlock
                         Grid.Row="0"
                         Grid.Column="0"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbStreamSecurity}" />
@@ -769,7 +769,7 @@
                         Grid.Row="0"
                         Grid.Column="1"
                         Width="100"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         Style="{StaticResource DefComboBox}" />
                 </Grid>
                 <Grid
@@ -791,7 +791,7 @@
                     <TextBlock
                         Grid.Row="1"
                         Grid.Column="0"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbSNI}" />
@@ -800,14 +800,14 @@
                         Grid.Row="1"
                         Grid.Column="1"
                         Width="400"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         HorizontalAlignment="Left"
                         Style="{StaticResource DefTextBox}" />
 
                     <TextBlock
                         Grid.Row="2"
                         Grid.Column="0"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbFingerprint}" />
@@ -816,14 +816,14 @@
                         Grid.Row="2"
                         Grid.Column="1"
                         Width="200"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         IsEditable="True"
                         Style="{StaticResource DefComboBox}" />
 
                     <TextBlock
                         Grid.Row="3"
                         Grid.Column="0"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbAlpn}" />
@@ -832,13 +832,13 @@
                         Grid.Row="3"
                         Grid.Column="1"
                         Width="200"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         Style="{StaticResource DefComboBox}" />
 
                     <TextBlock
                         Grid.Row="4"
                         Grid.Column="0"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbAllowInsecure}" />
@@ -847,7 +847,7 @@
                         Grid.Row="4"
                         Grid.Column="1"
                         Width="100"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         Style="{StaticResource DefComboBox}" />
                 </Grid>
                 <Grid
@@ -869,7 +869,7 @@
                     <TextBlock
                         Grid.Row="0"
                         Grid.Column="0"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbSNI}" />
@@ -878,14 +878,14 @@
                         Grid.Row="0"
                         Grid.Column="1"
                         Width="400"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         HorizontalAlignment="Left"
                         Style="{StaticResource DefTextBox}" />
 
                     <TextBlock
                         Grid.Row="1"
                         Grid.Column="0"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbFingerprint}" />
@@ -894,14 +894,14 @@
                         Grid.Row="1"
                         Grid.Column="1"
                         Width="200"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         IsEditable="True"
                         Style="{StaticResource DefComboBox}" />
 
                     <TextBlock
                         Grid.Row="2"
                         Grid.Column="0"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbPublicKey}" />
@@ -910,14 +910,14 @@
                         Grid.Row="2"
                         Grid.Column="1"
                         Width="400"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         HorizontalAlignment="Left"
                         Style="{StaticResource DefTextBox}" />
 
                     <TextBlock
                         Grid.Row="3"
                         Grid.Column="0"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbShortId}" />
@@ -926,14 +926,14 @@
                         Grid.Row="3"
                         Grid.Column="1"
                         Width="200"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         HorizontalAlignment="Left"
                         Style="{StaticResource DefTextBox}" />
 
                     <TextBlock
                         Grid.Row="4"
                         Grid.Column="0"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbSpiderX}" />
@@ -942,7 +942,7 @@
                         Grid.Row="4"
                         Grid.Column="1"
                         Width="400"
-                        Margin="{StaticResource ServerItemMargin}"
+                        Margin="{StaticResource Margin4}"
                         HorizontalAlignment="Left"
                         Style="{StaticResource DefTextBox}" />
                 </Grid>
diff --git a/v2rayN/v2rayN/Views/BackupAndRestoreView.xaml b/v2rayN/v2rayN/Views/BackupAndRestoreView.xaml
index 219893bb..4107d199 100644
--- a/v2rayN/v2rayN/Views/BackupAndRestoreView.xaml
+++ b/v2rayN/v2rayN/Views/BackupAndRestoreView.xaml
@@ -21,11 +21,11 @@
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </UserControl.Resources>
-    <DockPanel Margin="16">
-        <DockPanel Margin="8" DockPanel.Dock="Bottom">
+    <DockPanel Margin="{StaticResource Margin8}">
+        <DockPanel Margin="{StaticResource Margin8}" DockPanel.Dock="Bottom">
             <Button
                 Width="100"
-                Margin="8"
+                Margin="{StaticResource Margin8}"
                 Command="{x:Static materialDesign:DialogHost.CloseDialogCommand}"
                 Content="{x:Static resx:ResUI.menuClose}"
                 DockPanel.Dock="Right"
@@ -35,14 +35,14 @@
 
             <TextBlock
                 x:Name="txtMsg"
-                Margin="8"
+                Margin="{StaticResource Margin8}"
                 HorizontalAlignment="Left"
                 Style="{StaticResource ToolbarTextBlock}" />
         </DockPanel>
 
         <StackPanel>
-            <materialDesign:Card Width="Auto" Margin="8">
-                <Grid Margin="8">
+            <materialDesign:Card Width="Auto" Margin="{StaticResource Margin8}">
+                <Grid Margin="{StaticResource Margin8}">
                     <Grid.RowDefinitions>
                         <RowDefinition Height="Auto" />
                         <RowDefinition Height="Auto" />
@@ -56,14 +56,14 @@
                     <TextBlock
                         Grid.Row="0"
                         Grid.Column="0"
-                        Margin="8"
+                        Margin="{StaticResource Margin8}"
                         Style="{StaticResource ModuleTitle}"
                         Text="{x:Static resx:ResUI.menuLocalBackupAndRestore}" />
 
                     <TextBlock
                         Grid.Row="1"
                         Grid.Column="0"
-                        Margin="8"
+                        Margin="{StaticResource Margin8}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.menuLocalBackup}" />
@@ -71,7 +71,7 @@
                         x:Name="menuLocalBackup"
                         Grid.Row="1"
                         Grid.Column="1"
-                        Margin="8"
+                        Margin="{StaticResource Margin8}"
                         VerticalAlignment="Center"
                         Content="{x:Static resx:ResUI.menuLocalBackup}"
                         Style="{StaticResource DefButton}" />
@@ -84,7 +84,7 @@
                     <TextBlock
                         Grid.Row="3"
                         Grid.Column="0"
-                        Margin="8"
+                        Margin="{StaticResource Margin8}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.menuLocalRestore}" />
@@ -92,14 +92,14 @@
                         x:Name="menuLocalRestore"
                         Grid.Row="3"
                         Grid.Column="1"
-                        Margin="8"
+                        Margin="{StaticResource Margin8}"
                         VerticalAlignment="Center"
                         Content="{x:Static resx:ResUI.menuLocalRestore}"
                         Style="{StaticResource DefButton}" />
                 </Grid>
             </materialDesign:Card>
-            <materialDesign:Card Width="Auto" Margin="8">
-                <Grid Margin="8">
+            <materialDesign:Card Width="Auto" Margin="{StaticResource Margin8}">
+                <Grid Margin="{StaticResource Margin8}">
                     <Grid.RowDefinitions>
                         <RowDefinition Height="Auto" />
                         <RowDefinition Height="Auto" />
@@ -115,7 +115,7 @@
                         <TextBlock
                             Grid.Row="0"
                             Grid.Column="0"
-                            Margin="8"
+                            Margin="{StaticResource Margin8}"
                             Style="{StaticResource ModuleTitle}"
                             Text="{x:Static resx:ResUI.menuRemoteBackupAndRestore}" />
 
@@ -124,7 +124,7 @@
                             HorizontalAlignment="Right"
                             StaysOpen="True"
                             Style="{StaticResource MaterialDesignToolForegroundPopupBox}">
-                            <StackPanel Margin="16">
+                            <StackPanel Margin="{StaticResource Margin8}">
                                 <Grid>
                                     <Grid.RowDefinitions>
                                         <RowDefinition Height="Auto" />
@@ -140,7 +140,7 @@
                                     <TextBlock
                                         Grid.Row="0"
                                         Grid.Column="0"
-                                        Margin="8"
+                                        Margin="{StaticResource Margin8}"
                                         VerticalAlignment="Center"
                                         Style="{StaticResource ToolbarTextBlock}"
                                         Text="{x:Static resx:ResUI.LvWebDavUrl}" />
@@ -149,7 +149,7 @@
                                         x:Name="txtWebDavUrl"
                                         Grid.Row="0"
                                         Grid.Column="1"
-                                        Margin="8"
+                                        Margin="{StaticResource Margin8}"
                                         VerticalAlignment="Center"
                                         Style="{StaticResource DefTextBox}"
                                         TextWrapping="Wrap" />
@@ -157,7 +157,7 @@
                                     <TextBlock
                                         Grid.Row="1"
                                         Grid.Column="0"
-                                        Margin="8"
+                                        Margin="{StaticResource Margin8}"
                                         VerticalAlignment="Center"
                                         Style="{StaticResource ToolbarTextBlock}"
                                         Text="{x:Static resx:ResUI.LvWebDavUserName}" />
@@ -166,14 +166,14 @@
                                         x:Name="txtWebDavUserName"
                                         Grid.Row="1"
                                         Grid.Column="1"
-                                        Margin="8"
+                                        Margin="{StaticResource Margin8}"
                                         VerticalAlignment="Center"
                                         Style="{StaticResource DefTextBox}" />
 
                                     <TextBlock
                                         Grid.Row="2"
                                         Grid.Column="0"
-                                        Margin="8"
+                                        Margin="{StaticResource Margin8}"
                                         VerticalAlignment="Center"
                                         Style="{StaticResource ToolbarTextBlock}"
                                         Text="{x:Static resx:ResUI.LvWebDavPassword}" />
@@ -182,14 +182,14 @@
                                         x:Name="txtWebDavPassword"
                                         Grid.Row="2"
                                         Grid.Column="1"
-                                        Margin="8"
+                                        Margin="{StaticResource Margin8}"
                                         VerticalAlignment="Center"
                                         Style="{StaticResource DefTextBox}" />
 
                                     <TextBlock
                                         Grid.Row="3"
                                         Grid.Column="0"
-                                        Margin="8"
+                                        Margin="{StaticResource Margin8}"
                                         VerticalAlignment="Center"
                                         Style="{StaticResource ToolbarTextBlock}"
                                         Text="{x:Static resx:ResUI.LvWebDavDirName}" />
@@ -198,7 +198,7 @@
                                         x:Name="txtWebDavDirName"
                                         Grid.Row="3"
                                         Grid.Column="1"
-                                        Margin="8"
+                                        Margin="{StaticResource Margin8}"
                                         VerticalAlignment="Center"
                                         Style="{StaticResource DefTextBox}" />
 
@@ -206,7 +206,7 @@
                                         x:Name="menuWebDavCheck"
                                         Grid.Row="4"
                                         Grid.Column="1"
-                                        Margin="8"
+                                        Margin="{StaticResource Margin8}"
                                         VerticalAlignment="Center"
                                         Content="{x:Static resx:ResUI.LvWebDavCheck}"
                                         Style="{StaticResource DefButton}" />
@@ -218,7 +218,7 @@
                     <TextBlock
                         Grid.Row="1"
                         Grid.Column="0"
-                        Margin="8"
+                        Margin="{StaticResource Margin8}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.menuRemoteBackup}" />
@@ -226,7 +226,7 @@
                         x:Name="menuRemoteBackup"
                         Grid.Row="1"
                         Grid.Column="1"
-                        Margin="8"
+                        Margin="{StaticResource Margin8}"
                         VerticalAlignment="Center"
                         Content="{x:Static resx:ResUI.menuRemoteBackup}"
                         Style="{StaticResource DefButton}" />
@@ -238,7 +238,7 @@
                     <TextBlock
                         Grid.Row="3"
                         Grid.Column="0"
-                        Margin="8"
+                        Margin="{StaticResource Margin8}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.menuRemoteRestore}" />
@@ -246,7 +246,7 @@
                         x:Name="menuRemoteRestore"
                         Grid.Row="3"
                         Grid.Column="1"
-                        Margin="8"
+                        Margin="{StaticResource Margin8}"
                         VerticalAlignment="Center"
                         Content="{x:Static resx:ResUI.menuRemoteRestore}"
                         Style="{StaticResource DefButton}" />
diff --git a/v2rayN/v2rayN/Views/CheckUpdateView.xaml b/v2rayN/v2rayN/Views/CheckUpdateView.xaml
index ee55d737..acd8299b 100644
--- a/v2rayN/v2rayN/Views/CheckUpdateView.xaml
+++ b/v2rayN/v2rayN/Views/CheckUpdateView.xaml
@@ -15,27 +15,27 @@
     Style="{StaticResource ViewGlobal}"
     mc:Ignorable="d">
 
-    <DockPanel Margin="16">
+    <DockPanel Margin="{StaticResource Margin8}">
         <StackPanel
-            Margin="8"
+            Margin="{StaticResource Margin8}"
             HorizontalAlignment="Right"
             DockPanel.Dock="Bottom"
             Orientation="Horizontal">
 
             <TextBlock
-                Margin="{StaticResource SettingItemMargin}"
+                Margin="{StaticResource Margin8}"
                 VerticalAlignment="Center"
                 Style="{StaticResource ToolbarTextBlock}"
                 Text="{x:Static resx:ResUI.TbSettingsEnableCheckPreReleaseUpdate}" />
             <ToggleButton
                 x:Name="togEnableCheckPreReleaseUpdate"
-                Margin="{StaticResource SettingItemMargin}"
+                Margin="{StaticResource Margin8}"
                 HorizontalAlignment="Left" />
 
             <Button
                 x:Name="btnCheckUpdate"
                 Width="100"
-                Margin="8"
+                Margin="{StaticResource Margin8}"
                 Content="{x:Static resx:ResUI.menuCheckUpdate}"
                 IsCancel="True"
                 IsDefault="True"
@@ -43,7 +43,7 @@
 
             <Button
                 Width="100"
-                Margin="8"
+                Margin="{StaticResource Margin8}"
                 HorizontalAlignment="Right"
                 Command="{x:Static materialDesign:DialogHost.CloseDialogCommand}"
                 Content="{x:Static resx:ResUI.menuClose}"
@@ -67,7 +67,7 @@
                         <Border
                             Width="500"
                             Height="50"
-                            Margin="8"
+                            Margin="{StaticResource Margin8}"
                             Padding="0"
                             VerticalAlignment="Center">
                             <Grid>
@@ -82,7 +82,7 @@
                                 <ToggleButton
                                     x:Name="togAutoRefresh"
                                     Grid.Column="0"
-                                    Margin="8"
+                                    Margin="{StaticResource Margin8}"
                                     HorizontalAlignment="Left"
                                     IsChecked="{Binding IsSelected}" />
                                 <TextBlock
diff --git a/v2rayN/v2rayN/Views/ClashConnectionsView.xaml b/v2rayN/v2rayN/Views/ClashConnectionsView.xaml
index b9e3ef5e..f83226c0 100644
--- a/v2rayN/v2rayN/Views/ClashConnectionsView.xaml
+++ b/v2rayN/v2rayN/Views/ClashConnectionsView.xaml
@@ -13,9 +13,9 @@
     x:TypeArguments="vms:ClashConnectionsViewModel"
     mc:Ignorable="d">
 
-    <DockPanel Margin="2">
+    <DockPanel Margin="{StaticResource Margin4}">
         <WrapPanel
-            Margin="8"
+            Margin="{StaticResource Margin8}"
             VerticalAlignment="Center"
             DockPanel.Dock="Top"
             Orientation="Horizontal">
@@ -23,21 +23,21 @@
             <TextBox
                 x:Name="txtHostFilter"
                 Width="200"
-                Margin="8,0"
+                Margin="{StaticResource MarginLeftRight8}"
                 VerticalContentAlignment="Center"
                 materialDesign:HintAssist.Hint="{x:Static resx:ResUI.ConnectionsHostFilterTitle}"
                 materialDesign:TextFieldAssist.HasClearButton="True"
                 Style="{StaticResource DefTextBox}" />
 
             <TextBlock
-                Margin="8,0"
+                Margin="{StaticResource MarginLeftRight8}"
                 VerticalAlignment="Center"
                 Style="{StaticResource ToolbarTextBlock}"
                 Text="{x:Static resx:ResUI.TbSorting}" />
             <ComboBox
                 x:Name="cmbSorting"
                 Width="100"
-                Margin="8,0"
+                Margin="{StaticResource MarginLeftRight8}"
                 Style="{StaticResource DefComboBox}">
                 <ComboBoxItem Content="{x:Static resx:ResUI.TbSortingUpSpeed}" />
                 <ComboBoxItem Content="{x:Static resx:ResUI.TbSortingDownSpeed}" />
@@ -51,20 +51,20 @@
                 x:Name="btnConnectionCloseAll"
                 Width="24"
                 Height="24"
-                Margin="8,0"
+                Margin="{StaticResource MarginLeftRight8}"
                 Style="{StaticResource MaterialDesignFloatingActionMiniLightButton}"
                 ToolTip="{x:Static resx:ResUI.menuConnectionCloseAll}">
                 <materialDesign:PackIcon VerticalAlignment="Center" Kind="Close" />
             </Button>
 
             <TextBlock
-                Margin="8,0"
+                Margin="{StaticResource MarginLeftRight8}"
                 VerticalAlignment="Center"
                 Style="{StaticResource ToolbarTextBlock}"
                 Text="{x:Static resx:ResUI.TbAutoRefresh}" />
             <ToggleButton
                 x:Name="togAutoRefresh"
-                Margin="8,0"
+                Margin="{StaticResource MarginLeftRight8}"
                 HorizontalAlignment="Left" />
         </WrapPanel>
 
diff --git a/v2rayN/v2rayN/Views/ClashProxiesView.xaml b/v2rayN/v2rayN/Views/ClashProxiesView.xaml
index 8e964f93..f393a74a 100644
--- a/v2rayN/v2rayN/Views/ClashProxiesView.xaml
+++ b/v2rayN/v2rayN/Views/ClashProxiesView.xaml
@@ -20,22 +20,22 @@
         <converters:DelayColorConverter x:Key="DelayColorConverter" />
     </UserControl.Resources>
 
-    <DockPanel Margin="2">
+    <DockPanel Margin="{StaticResource Margin4}">
         <WrapPanel
-            Margin="8"
+            Margin="{StaticResource Margin8}"
             VerticalAlignment="Center"
             DockPanel.Dock="Top"
             Orientation="Horizontal">
 
             <TextBlock
-                Margin="8,0"
+                Margin="{StaticResource MarginLeftRight8}"
                 VerticalAlignment="Center"
                 Style="{StaticResource ToolbarTextBlock}"
                 Text="{x:Static resx:ResUI.menuRulemode}" />
             <ComboBox
                 x:Name="cmbRulemode"
                 Width="80"
-                Margin="8,0"
+                Margin="{StaticResource MarginLeftRight8}"
                 Style="{StaticResource DefComboBox}">
                 <ComboBoxItem Content="{x:Static resx:ResUI.menuModeRule}" />
                 <ComboBoxItem Content="{x:Static resx:ResUI.menuModeGlobal}" />
@@ -43,14 +43,14 @@
             </ComboBox>
 
             <TextBlock
-                Margin="8,0"
+                Margin="{StaticResource MarginLeftRight8}"
                 VerticalAlignment="Center"
                 Style="{StaticResource ToolbarTextBlock}"
                 Text="{x:Static resx:ResUI.TbSorting}" />
             <ComboBox
                 x:Name="cmbSorting"
                 Width="60"
-                Margin="8,0"
+                Margin="{StaticResource MarginLeftRight8}"
                 Style="{StaticResource DefComboBox}">
                 <ComboBoxItem Content="{x:Static resx:ResUI.TbSortingDelay}" />
                 <ComboBoxItem Content="{x:Static resx:ResUI.TbSortingName}" />
@@ -61,7 +61,7 @@
                 x:Name="menuProxiesReload"
                 Width="24"
                 Height="24"
-                Margin="8,0"
+                Margin="{StaticResource MarginLeftRight8}"
                 Style="{StaticResource MaterialDesignFloatingActionMiniLightButton}"
                 ToolTip="{x:Static resx:ResUI.menuProxiesReload}">
                 <materialDesign:PackIcon VerticalAlignment="Center" Kind="Reload" />
@@ -71,26 +71,26 @@
                 x:Name="menuProxiesDelaytest"
                 Width="24"
                 Height="24"
-                Margin="8,0"
+                Margin="{StaticResource MarginLeftRight8}"
                 Style="{StaticResource MaterialDesignFloatingActionMiniLightButton}"
                 ToolTip="{x:Static resx:ResUI.menuProxiesDelaytest}">
                 <materialDesign:PackIcon VerticalAlignment="Center" Kind="LightningBolt" />
             </Button>
 
             <TextBlock
-                Margin="8,0"
+                Margin="{StaticResource MarginLeftRight8}"
                 VerticalAlignment="Center"
                 Style="{StaticResource ToolbarTextBlock}"
                 Text="{x:Static resx:ResUI.TbAutoRefresh}" />
             <ToggleButton
                 x:Name="togAutoRefresh"
-                Margin="8,0"
+                Margin="{StaticResource MarginLeftRight8}"
                 HorizontalAlignment="Left" />
         </WrapPanel>
         <DockPanel>
             <ListView
                 x:Name="lstProxyGroups"
-                Margin="0,0,5,0"
+                Margin="{StaticResource MarginRight8}"
                 BorderThickness="0"
                 DockPanel.Dock="Left"
                 ItemContainerStyle="{StaticResource lvItemSelected}"
@@ -106,10 +106,10 @@
                     <DataTemplate>
                         <Border
                             Width="160"
-                            Margin="4,0"
+                            Margin="{StaticResource MarginLeftRight4}"
                             Padding="0">
                             <DockPanel>
-                                <Grid Grid.Column="0" Margin="4">
+                                <Grid Grid.Column="0" Margin="{StaticResource Margin4}">
                                     <Grid.RowDefinitions>
                                         <RowDefinition />
                                         <RowDefinition />
@@ -162,7 +162,7 @@
                                     CornerRadius="4"
                                     DockPanel.Dock="Left"
                                     Visibility="{Binding Path=isActive, Converter={StaticResource BoolToVisConverter}}" />
-                                <Grid Margin="4">
+                                <Grid Margin="{StaticResource Margin4}">
                                     <Grid.RowDefinitions>
                                         <RowDefinition Height="2*" />
                                         <RowDefinition Height="1*" />
diff --git a/v2rayN/v2rayN/Views/DNSSettingWindow.xaml b/v2rayN/v2rayN/Views/DNSSettingWindow.xaml
index 0b69f7c9..76a212c9 100644
--- a/v2rayN/v2rayN/Views/DNSSettingWindow.xaml
+++ b/v2rayN/v2rayN/Views/DNSSettingWindow.xaml
@@ -22,9 +22,9 @@
     TextElement.Foreground="{DynamicResource MaterialDesignBody}"
     WindowStartupLocation="CenterScreen"
     mc:Ignorable="d">
-    <DockPanel Margin="8">
+    <DockPanel Margin="{StaticResource Margin8}">
         <StackPanel
-            Margin="4"
+            Margin="{StaticResource Margin4}"
             HorizontalAlignment="Center"
             DockPanel.Dock="Bottom"
             Orientation="Horizontal">
@@ -37,7 +37,7 @@
             <Button
                 x:Name="btnCancel"
                 Width="100"
-                Margin="8,0"
+                Margin="{StaticResource MarginLeftRight8}"
                 Content="{x:Static resx:ResUI.TbCancel}"
                 Cursor="Hand"
                 IsCancel="true"
@@ -47,15 +47,15 @@
         <TabControl HorizontalContentAlignment="Left">
 
             <TabItem Header="{x:Static resx:ResUI.TbSettingsCoreDns}">
-                <DockPanel Margin="{StaticResource SettingItemMargin}">
+                <DockPanel Margin="{StaticResource Margin8}">
                     <StackPanel DockPanel.Dock="Top" Orientation="Horizontal">
                         <TextBlock
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsRemoteDNS}" />
                         <TextBlock
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}">
                             <Hyperlink Click="linkDnsObjectDoc_Click">
@@ -65,7 +65,7 @@
                         </TextBlock>
                         <Button
                             x:Name="btnImportDefConfig4V2ray"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             Content="{x:Static resx:ResUI.TbSettingDnsImportDefConfig}"
                             Cursor="Hand"
                             Style="{StaticResource DefButton}" />
@@ -74,39 +74,39 @@
                     <WrapPanel DockPanel.Dock="Bottom" Orientation="Horizontal">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
-                                Margin="{StaticResource SettingItemMargin}"
+                                Margin="{StaticResource Margin8}"
                                 VerticalAlignment="Center"
                                 Style="{StaticResource ToolbarTextBlock}"
                                 Text="{x:Static resx:ResUI.TbSettingsUseSystemHosts}" />
                             <ToggleButton
                                 x:Name="togUseSystemHosts"
-                                Margin="{StaticResource SettingItemMargin}"
+                                Margin="{StaticResource Margin8}"
                                 HorizontalAlignment="Left" />
                         </StackPanel>
 
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
-                                Margin="{StaticResource SettingItemMargin}"
+                                Margin="{StaticResource Margin8}"
                                 VerticalAlignment="Center"
                                 Style="{StaticResource ToolbarTextBlock}"
                                 Text="{x:Static resx:ResUI.TbSettingsDomainStrategy4Freedom}" />
                             <ComboBox
                                 x:Name="cmbdomainStrategy4Freedom"
                                 Width="150"
-                                Margin="{StaticResource SettingItemMargin}"
+                                Margin="{StaticResource Margin8}"
                                 Style="{StaticResource DefComboBox}" />
                         </StackPanel>
 
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
-                                Margin="{StaticResource SettingItemMargin}"
+                                Margin="{StaticResource Margin8}"
                                 VerticalAlignment="Center"
                                 Style="{StaticResource ToolbarTextBlock}"
                                 Text="{x:Static resx:ResUI.TbSettingsDomainDNSAddress}" />
                             <ComboBox
                                 x:Name="cmbdomainDNSAddress"
                                 Width="150"
-                                Margin="{StaticResource SettingItemMargin}"
+                                Margin="{StaticResource Margin8}"
                                 IsEditable="True"
                                 Style="{StaticResource DefComboBox}" />
                         </StackPanel>
@@ -114,7 +114,7 @@
 
                     <TextBox
                         x:Name="txtnormalDNS"
-                        Margin="{StaticResource SettingItemMargin}"
+                        Margin="{StaticResource Margin8}"
                         VerticalAlignment="Stretch"
                         materialDesign:HintAssist.Hint="HTTP/SOCKS"
                         AcceptsReturn="True"
@@ -126,10 +126,10 @@
             </TabItem>
 
             <TabItem Header="{x:Static resx:ResUI.TbSettingsCoreDnsSingbox}">
-                <DockPanel Margin="{StaticResource SettingItemMargin}">
+                <DockPanel Margin="{StaticResource Margin8}">
                     <StackPanel DockPanel.Dock="Top" Orientation="Horizontal">
                         <TextBlock
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}">
                             <Hyperlink Click="linkDnsSingboxObjectDoc_Click">
@@ -139,7 +139,7 @@
                         </TextBlock>
                         <Button
                             x:Name="btnImportDefConfig4Singbox"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             Content="{x:Static resx:ResUI.TbSettingDnsImportDefConfig}"
                             Cursor="Hand"
                             Style="{StaticResource DefButton}" />
@@ -148,33 +148,33 @@
                     <WrapPanel DockPanel.Dock="Bottom" Orientation="Horizontal">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
-                                Margin="{StaticResource SettingItemMargin}"
+                                Margin="{StaticResource Margin8}"
                                 VerticalAlignment="Center"
                                 Style="{StaticResource ToolbarTextBlock}"
                                 Text="{x:Static resx:ResUI.TbSettingsDomainStrategy4Out}" />
                             <ComboBox
                                 x:Name="cmbdomainStrategy4Out"
                                 Width="150"
-                                Margin="{StaticResource SettingItemMargin}"
+                                Margin="{StaticResource Margin8}"
                                 Style="{StaticResource DefComboBox}" />
                         </StackPanel>
 
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
-                                Margin="{StaticResource SettingItemMargin}"
+                                Margin="{StaticResource Margin8}"
                                 VerticalAlignment="Center"
                                 Style="{StaticResource ToolbarTextBlock}"
                                 Text="{x:Static resx:ResUI.TbSettingsDomainDNSAddress}" />
                             <ComboBox
                                 x:Name="cmbdomainDNSAddress2"
                                 Width="150"
-                                Margin="{StaticResource SettingItemMargin}"
+                                Margin="{StaticResource Margin8}"
                                 IsEditable="True"
                                 Style="{StaticResource DefComboBox}" />
                         </StackPanel>
                     </WrapPanel>
 
-                    <Grid Margin="{StaticResource SettingItemMargin}">
+                    <Grid Margin="{StaticResource Margin8}">
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="1*" />
                             <ColumnDefinition Width="10" />
diff --git a/v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml b/v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml
index 904217d2..90c4957e 100644
--- a/v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml
+++ b/v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml
@@ -23,16 +23,16 @@
     TextElement.Foreground="{DynamicResource MaterialDesignBody}"
     WindowStartupLocation="CenterScreen"
     mc:Ignorable="d">
-    <DockPanel Margin="8">
+    <DockPanel Margin="{StaticResource Margin8}">
         <StackPanel
-            Margin="4"
+            Margin="{StaticResource Margin4}"
             HorizontalAlignment="Center"
             DockPanel.Dock="Bottom"
             Orientation="Horizontal">
             <Button
                 x:Name="btnReset"
                 Width="100"
-                Margin="8,0"
+                Margin="{StaticResource MarginLeftRight8}"
                 Content="{x:Static resx:ResUI.TbReset}"
                 Style="{StaticResource DefButton}" />
             <Button
@@ -44,7 +44,7 @@
             <Button
                 x:Name="btnCancel"
                 Width="100"
-                Margin="8,0"
+                Margin="{StaticResource MarginLeftRight8}"
                 Content="{x:Static resx:ResUI.TbCancel}"
                 Cursor="Hand"
                 IsCancel="true"
@@ -77,14 +77,14 @@
                     <TextBlock
                         Grid.Row="0"
                         Grid.Column="0"
-                        Margin="4"
+                        Margin="{StaticResource Margin4}"
                         Style="{StaticResource ModuleTitle}"
                         Text="{x:Static resx:ResUI.TbGlobalHotkeySetting}" />
 
                     <TextBlock
                         Grid.Row="1"
                         Grid.Column="0"
-                        Margin="4"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbDisplayGUI}" />
@@ -93,7 +93,7 @@
                         x:Name="txtGlobalHotkey0"
                         Grid.Row="1"
                         Grid.Column="1"
-                        Margin="4"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Top"
                         AcceptsReturn="True"
                         IsReadOnly="True"
@@ -103,7 +103,7 @@
                     <TextBlock
                         Grid.Row="2"
                         Grid.Column="0"
-                        Margin="4"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbClearSystemProxy}" />
@@ -111,7 +111,7 @@
                         x:Name="txtGlobalHotkey1"
                         Grid.Row="2"
                         Grid.Column="1"
-                        Margin="4"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Top"
                         AcceptsReturn="True"
                         IsReadOnly="True"
@@ -121,7 +121,7 @@
                     <TextBlock
                         Grid.Row="3"
                         Grid.Column="0"
-                        Margin="4"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbSetSystemProxy}" />
@@ -129,7 +129,7 @@
                         x:Name="txtGlobalHotkey2"
                         Grid.Row="3"
                         Grid.Column="1"
-                        Margin="4"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Top"
                         AcceptsReturn="True"
                         IsReadOnly="True"
@@ -138,7 +138,7 @@
                     <TextBlock
                         Grid.Row="4"
                         Grid.Column="0"
-                        Margin="4"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbNotChangeSystemProxy}" />
@@ -146,7 +146,7 @@
                         x:Name="txtGlobalHotkey3"
                         Grid.Row="4"
                         Grid.Column="1"
-                        Margin="4"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Top"
                         AcceptsReturn="True"
                         IsReadOnly="True"
@@ -155,7 +155,7 @@
                     <TextBlock
                         Grid.Row="5"
                         Grid.Column="0"
-                        Margin="4"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbSystemProxyPac}" />
@@ -163,7 +163,7 @@
                         x:Name="txtGlobalHotkey4"
                         Grid.Row="5"
                         Grid.Column="1"
-                        Margin="4"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Top"
                         AcceptsReturn="True"
                         IsReadOnly="True"
@@ -173,7 +173,7 @@
 
                 <TextBlock
                     Grid.Row="1"
-                    Margin="4"
+                    Margin="{StaticResource Margin4}"
                     VerticalAlignment="Center"
                     Style="{StaticResource ToolbarTextBlock}"
                     Text="{x:Static resx:ResUI.TbGlobalHotkeySettingTip}" />
diff --git a/v2rayN/v2rayN/Views/MainWindow.xaml b/v2rayN/v2rayN/Views/MainWindow.xaml
index 1fff8ded..7757911b 100644
--- a/v2rayN/v2rayN/Views/MainWindow.xaml
+++ b/v2rayN/v2rayN/Views/MainWindow.xaml
@@ -50,7 +50,7 @@
                                 <MenuItem.Header>
                                     <StackPanel Orientation="Horizontal">
                                         <materialDesign:PackIcon
-                                            Margin="0,0,8,0"
+                                            Margin="{StaticResource MarginRight8}"
                                             VerticalAlignment="Center"
                                             Kind="Server" />
                                         <TextBlock Text="{x:Static resx:ResUI.menuServers}" />
@@ -114,7 +114,7 @@
                                 <MenuItem.Header>
                                     <StackPanel Orientation="Horizontal">
                                         <materialDesign:PackIcon
-                                            Margin="0,0,8,0"
+                                            Margin="{StaticResource MarginRight8}"
                                             VerticalAlignment="Center"
                                             Kind="BookClockOutline" />
                                         <TextBlock Text="{x:Static resx:ResUI.menuSubscription}" />
@@ -149,7 +149,7 @@
                                 <MenuItem.Header>
                                     <StackPanel Orientation="Horizontal">
                                         <materialDesign:PackIcon
-                                            Margin="0,0,8,0"
+                                            Margin="{StaticResource MarginRight8}"
                                             VerticalAlignment="Center"
                                             Kind="SettingsOutline" />
                                         <TextBlock Text="{x:Static resx:ResUI.menuSetting}" />
@@ -201,7 +201,7 @@
                                 <MenuItem.Header>
                                     <StackPanel Orientation="Horizontal">
                                         <materialDesign:PackIcon
-                                            Margin="0,0,8,0"
+                                            Margin="{StaticResource MarginRight8}"
                                             VerticalAlignment="Center"
                                             Kind="Reload" />
                                         <TextBlock Text="{x:Static resx:ResUI.menuReload}" />
@@ -215,7 +215,7 @@
                                 <MenuItem.Header>
                                     <StackPanel Orientation="Horizontal">
                                         <materialDesign:PackIcon
-                                            Margin="0,0,8,0"
+                                            Margin="{StaticResource MarginRight8}"
                                             VerticalAlignment="Center"
                                             Kind="Update" />
                                         <TextBlock Text="{x:Static resx:ResUI.menuCheckUpdate}" />
@@ -229,7 +229,7 @@
                                 <MenuItem.Header>
                                     <StackPanel Orientation="Horizontal">
                                         <materialDesign:PackIcon
-                                            Margin="0,0,8,0"
+                                            Margin="{StaticResource MarginRight8}"
                                             VerticalAlignment="Center"
                                             Kind="HelpCircleOutline" />
                                         <TextBlock Text="{x:Static resx:ResUI.menuHelp}" />
@@ -243,7 +243,7 @@
                                 <MenuItem.Header>
                                     <StackPanel Orientation="Horizontal">
                                         <materialDesign:PackIcon
-                                            Margin="0,0,8,0"
+                                            Margin="{StaticResource MarginRight8}"
                                             VerticalAlignment="Center"
                                             Kind="VolumeHigh" />
                                         <TextBlock Text="{x:Static resx:ResUI.menuPromotion}" />
@@ -257,7 +257,7 @@
                                 <MenuItem.Header>
                                     <StackPanel Orientation="Horizontal">
                                         <materialDesign:PackIcon
-                                            Margin="0,0,8,0"
+                                            Margin="{StaticResource MarginRight8}"
                                             VerticalAlignment="Center"
                                             Kind="Minimize" />
                                         <TextBlock Text="{x:Static resx:ResUI.menuClose}" />
@@ -313,11 +313,7 @@
                             <TabItem x:Name="tabMsgView1">
                                 <TabItem.Header>
                                     <StackPanel>
-                                        <materialDesign:PackIcon
-                                            Width="24"
-                                            Height="24"
-                                            HorizontalAlignment="Center"
-                                            Kind="MessageTextOutline" />
+                                        <materialDesign:PackIcon HorizontalAlignment="Center" Kind="MessageTextOutline" />
                                         <TextBlock
                                             HorizontalAlignment="Center"
                                             Style="{StaticResource ToolbarTextBlock}"
@@ -328,11 +324,7 @@
                             <TabItem x:Name="tabClashProxies1">
                                 <TabItem.Header>
                                     <StackPanel>
-                                        <materialDesign:PackIcon
-                                            Width="24"
-                                            Height="24"
-                                            HorizontalAlignment="Center"
-                                            Kind="ArrowDecisionOutline" />
+                                        <materialDesign:PackIcon HorizontalAlignment="Center" Kind="ArrowDecisionOutline" />
                                         <TextBlock
                                             HorizontalAlignment="Center"
                                             Style="{StaticResource ToolbarTextBlock}"
@@ -343,11 +335,7 @@
                             <TabItem x:Name="tabClashConnections1">
                                 <TabItem.Header>
                                     <StackPanel>
-                                        <materialDesign:PackIcon
-                                            Width="24"
-                                            Height="24"
-                                            HorizontalAlignment="Center"
-                                            Kind="LanConnect" />
+                                        <materialDesign:PackIcon HorizontalAlignment="Center" Kind="LanConnect" />
                                         <TextBlock
                                             HorizontalAlignment="Center"
                                             Style="{StaticResource ToolbarTextBlock}"
@@ -366,11 +354,7 @@
                             <TabItem x:Name="tabProfiles2">
                                 <TabItem.Header>
                                     <StackPanel>
-                                        <materialDesign:PackIcon
-                                            Width="24"
-                                            Height="24"
-                                            HorizontalAlignment="Center"
-                                            Kind="Server" />
+                                        <materialDesign:PackIcon HorizontalAlignment="Center" Kind="Server" />
                                         <TextBlock
                                             HorizontalAlignment="Center"
                                             Style="{StaticResource ToolbarTextBlock}"
@@ -381,11 +365,7 @@
                             <TabItem x:Name="tabMsgView2">
                                 <TabItem.Header>
                                     <StackPanel>
-                                        <materialDesign:PackIcon
-                                            Width="24"
-                                            Height="24"
-                                            HorizontalAlignment="Center"
-                                            Kind="MessageTextOutline" />
+                                        <materialDesign:PackIcon HorizontalAlignment="Center" Kind="MessageTextOutline" />
                                         <TextBlock
                                             HorizontalAlignment="Center"
                                             Style="{StaticResource ToolbarTextBlock}"
@@ -396,11 +376,7 @@
                             <TabItem x:Name="tabClashProxies2">
                                 <TabItem.Header>
                                     <StackPanel>
-                                        <materialDesign:PackIcon
-                                            Width="24"
-                                            Height="24"
-                                            HorizontalAlignment="Center"
-                                            Kind="ArrowDecisionOutline" />
+                                        <materialDesign:PackIcon HorizontalAlignment="Center" Kind="ArrowDecisionOutline" />
                                         <TextBlock
                                             HorizontalAlignment="Center"
                                             Style="{StaticResource ToolbarTextBlock}"
@@ -411,11 +387,7 @@
                             <TabItem x:Name="tabClashConnections2">
                                 <TabItem.Header>
                                     <StackPanel>
-                                        <materialDesign:PackIcon
-                                            Width="24"
-                                            Height="24"
-                                            HorizontalAlignment="Center"
-                                            Kind="LanConnect" />
+                                        <materialDesign:PackIcon HorizontalAlignment="Center" Kind="LanConnect" />
                                         <TextBlock
                                             HorizontalAlignment="Center"
                                             Style="{StaticResource ToolbarTextBlock}"
diff --git a/v2rayN/v2rayN/Views/MsgView.xaml b/v2rayN/v2rayN/Views/MsgView.xaml
index 491950d7..ae3a61a7 100644
--- a/v2rayN/v2rayN/Views/MsgView.xaml
+++ b/v2rayN/v2rayN/Views/MsgView.xaml
@@ -13,9 +13,9 @@
     x:TypeArguments="vms:MsgViewModel"
     Style="{StaticResource ViewGlobal}"
     mc:Ignorable="d">
-    <DockPanel Margin="2">
+    <DockPanel Margin="{StaticResource Margin4}">
         <WrapPanel
-            Margin="8"
+            Margin="{StaticResource Margin8}"
             VerticalAlignment="Center"
             DockPanel.Dock="Top"
             Orientation="Horizontal">
@@ -23,7 +23,7 @@
             <ComboBox
                 x:Name="cmbMsgFilter"
                 Width="200"
-                Margin="8,0"
+                Margin="{StaticResource MarginLeftRight8}"
                 materialDesign:HintAssist.Hint="{x:Static resx:ResUI.MsgFilterTitle}"
                 materialDesign:TextFieldAssist.HasClearButton="True"
                 IsEditable="True"
@@ -32,7 +32,7 @@
                 x:Name="btnCopy"
                 Width="24"
                 Height="24"
-                Margin="8,0"
+                Margin="{StaticResource MarginLeftRight8}"
                 Style="{StaticResource MaterialDesignFloatingActionMiniLightButton}"
                 ToolTip="{x:Static resx:ResUI.menuMsgViewCopyAll}">
                 <materialDesign:PackIcon VerticalAlignment="Center" Kind="ContentCopy" />
@@ -41,29 +41,29 @@
                 x:Name="btnClear"
                 Width="24"
                 Height="24"
-                Margin="8,0"
+                Margin="{StaticResource MarginLeftRight8}"
                 Style="{StaticResource MaterialDesignFloatingActionMiniLightButton}"
                 ToolTip="{x:Static resx:ResUI.menuMsgViewClear}">
                 <materialDesign:PackIcon VerticalAlignment="Center" Kind="Delete" />
             </Button>
             <TextBlock
-                Margin="8,0"
+                Margin="{StaticResource MarginLeftRight8}"
                 VerticalAlignment="Center"
                 Style="{StaticResource ToolbarTextBlock}"
                 Text="{x:Static resx:ResUI.TbAutoRefresh}" />
             <ToggleButton
                 x:Name="togAutoRefresh"
-                Margin="8,0"
+                Margin="{StaticResource MarginLeftRight8}"
                 HorizontalAlignment="Left"
                 IsChecked="True" />
             <TextBlock
-                Margin="8,0"
+                Margin="{StaticResource MarginLeftRight8}"
                 VerticalAlignment="Center"
                 Style="{StaticResource ToolbarTextBlock}"
                 Text="{x:Static resx:ResUI.TbAutoScrollToEnd}" />
             <ToggleButton
                 x:Name="togScrollToEnd"
-                Margin="8,0"
+                Margin="{StaticResource MarginLeftRight8}"
                 HorizontalAlignment="Left"
                 IsChecked="True" />
         </WrapPanel>
diff --git a/v2rayN/v2rayN/Views/OptionSettingWindow.xaml b/v2rayN/v2rayN/Views/OptionSettingWindow.xaml
index baa5d8d7..5b256869 100644
--- a/v2rayN/v2rayN/Views/OptionSettingWindow.xaml
+++ b/v2rayN/v2rayN/Views/OptionSettingWindow.xaml
@@ -22,9 +22,9 @@
     TextElement.Foreground="{DynamicResource MaterialDesignBody}"
     WindowStartupLocation="CenterScreen"
     mc:Ignorable="d">
-    <DockPanel Margin="8">
+    <DockPanel Margin="{StaticResource Margin8}">
         <StackPanel
-            Margin="4"
+            Margin="{StaticResource Margin4}"
             HorizontalAlignment="Center"
             DockPanel.Dock="Bottom"
             Orientation="Horizontal">
@@ -37,7 +37,7 @@
             <Button
                 x:Name="btnCancel"
                 Width="100"
-                Margin="8,0"
+                Margin="{StaticResource MarginLeftRight8}"
                 Content="{x:Static resx:ResUI.TbCancel}"
                 Cursor="Hand"
                 IsCancel="true"
@@ -47,7 +47,7 @@
         <TabControl HorizontalContentAlignment="Left">
             <TabItem Header="{x:Static resx:ResUI.TbSettingsCore}">
                 <ScrollViewer VerticalScrollBarVisibility="Visible">
-                    <Grid Margin="{StaticResource SettingItemMargin}">
+                    <Grid Margin="{StaticResource Margin8}">
                         <Grid.RowDefinitions>
                             <RowDefinition Height="Auto" />
                             <RowDefinition Height="Auto" />
@@ -78,7 +78,7 @@
                         <TextBlock
                             Grid.Row="0"
                             Grid.Column="0"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsSocksPort}" />
@@ -87,12 +87,12 @@
                             Grid.Row="0"
                             Grid.Column="1"
                             Width="200"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             Style="{StaticResource DefTextBox}" />
                         <TextBlock
                             Grid.Row="0"
                             Grid.Column="2"
-                            Margin="{StaticResource ServerItemMargin}"
+                            Margin="{StaticResource Margin4}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsSocksPortTip}" />
@@ -100,7 +100,7 @@
                         <TextBlock
                             Grid.Row="1"
                             Grid.Column="0"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsUdpEnabled}" />
@@ -108,13 +108,13 @@
                             x:Name="togudpEnabled"
                             Grid.Row="1"
                             Grid.Column="1"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             HorizontalAlignment="Left" />
 
                         <TextBlock
                             Grid.Row="2"
                             Grid.Column="0"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsSniffingEnabled}" />
@@ -125,11 +125,11 @@
                             Orientation="Horizontal">
                             <ToggleButton
                                 x:Name="togsniffingEnabled"
-                                Margin="{StaticResource SettingItemMargin}"
+                                Margin="{StaticResource Margin8}"
                                 HorizontalAlignment="Left" />
                             <ListBox
                                 x:Name="clbdestOverride"
-                                Margin="4"
+                                Margin="{StaticResource Margin4}"
                                 HorizontalAlignment="Left"
                                 FontSize="{DynamicResource StdFontSize}"
                                 Style="{StaticResource MaterialDesignFilterChipPrimaryListBox}" />
@@ -138,7 +138,7 @@
                         <TextBlock
                             Grid.Row="3"
                             Grid.Column="0"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsRouteOnly}" />
@@ -146,13 +146,13 @@
                             x:Name="togrouteOnly"
                             Grid.Row="3"
                             Grid.Column="1"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             HorizontalAlignment="Left" />
 
                         <TextBlock
                             Grid.Row="4"
                             Grid.Column="0"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsAllowLAN}" />
@@ -160,13 +160,13 @@
                             x:Name="togAllowLANConn"
                             Grid.Row="4"
                             Grid.Column="1"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             HorizontalAlignment="Left" />
 
                         <TextBlock
                             Grid.Row="5"
                             Grid.Column="0"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsNewPort4LAN}" />
@@ -174,13 +174,13 @@
                             x:Name="togNewPort4LAN"
                             Grid.Row="5"
                             Grid.Column="1"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             HorizontalAlignment="Left" />
 
                         <TextBlock
                             Grid.Row="6"
                             Grid.Column="0"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsUser}" />
@@ -189,13 +189,13 @@
                             Grid.Row="6"
                             Grid.Column="1"
                             Width="200"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             Style="{StaticResource DefTextBox}" />
 
                         <TextBlock
                             Grid.Row="7"
                             Grid.Column="0"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsPass}" />
@@ -204,13 +204,13 @@
                             Grid.Row="7"
                             Grid.Column="1"
                             Width="200"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             Style="{StaticResource DefTextBox}" />
 
                         <TextBlock
                             Grid.Row="8"
                             Grid.Column="0"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsMuxEnabled}" />
@@ -218,13 +218,13 @@
                             x:Name="togmuxEnabled"
                             Grid.Row="8"
                             Grid.Column="1"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             HorizontalAlignment="Left" />
 
                         <TextBlock
                             Grid.Row="9"
                             Grid.Column="0"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsLogEnabledToFile}" />
@@ -232,13 +232,13 @@
                             x:Name="toglogEnabled"
                             Grid.Row="9"
                             Grid.Column="1"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             HorizontalAlignment="Left" />
 
                         <TextBlock
                             Grid.Row="10"
                             Grid.Column="0"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsLogLevel}" />
@@ -247,14 +247,14 @@
                             Grid.Row="10"
                             Grid.Column="1"
                             Width="200"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             materialDesign:HintAssist.Hint="Level"
                             Style="{StaticResource DefComboBox}" />
 
                         <TextBlock
                             Grid.Row="11"
                             Grid.Column="0"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsDefAllowInsecure}" />
@@ -262,13 +262,13 @@
                             x:Name="togdefAllowInsecure"
                             Grid.Row="11"
                             Grid.Column="1"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             HorizontalAlignment="Left" />
 
                         <TextBlock
                             Grid.Row="12"
                             Grid.Column="0"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsDefFingerprint}" />
@@ -277,14 +277,14 @@
                             Grid.Row="12"
                             Grid.Column="1"
                             Width="200"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             IsEditable="True"
                             Style="{StaticResource DefComboBox}" />
 
                         <TextBlock
                             Grid.Row="13"
                             Grid.Column="0"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsDefUserAgent}" />
@@ -293,20 +293,20 @@
                             Grid.Row="13"
                             Grid.Column="1"
                             Width="200"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             IsEditable="True"
                             Style="{StaticResource DefComboBox}" />
                         <TextBlock
                             Grid.Row="13"
                             Grid.Column="3"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsDefUserAgentTips}" />
 
                         <TextBlock
                             Grid.Row="14"
                             Grid.Column="0"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsMux4SboxProtocol}" />
@@ -315,13 +315,13 @@
                             Grid.Row="14"
                             Grid.Column="1"
                             Width="200"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             Style="{StaticResource DefComboBox}" />
 
                         <TextBlock
                             Grid.Row="15"
                             Grid.Column="0"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsEnableCacheFile4Sbox}" />
@@ -329,13 +329,13 @@
                             x:Name="togenableCacheFile4Sbox"
                             Grid.Row="15"
                             Grid.Column="1"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             HorizontalAlignment="Left" />
 
                         <TextBlock
                             Grid.Row="16"
                             Grid.Column="0"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsHysteriaBandwidth}" />
@@ -348,13 +348,13 @@
                             <TextBox
                                 x:Name="txtUpMbps"
                                 Width="90"
-                                Margin="{StaticResource SettingItemMargin}"
+                                Margin="{StaticResource Margin8}"
                                 materialDesign:HintAssist.Hint="Up"
                                 Style="{StaticResource DefTextBox}" />
                             <TextBox
                                 x:Name="txtDownMbps"
                                 Width="90"
-                                Margin="{StaticResource SettingItemMargin}"
+                                Margin="{StaticResource Margin8}"
                                 materialDesign:HintAssist.Hint="Down"
                                 Style="{StaticResource DefTextBox}" />
                         </StackPanel>
@@ -362,7 +362,7 @@
                         <TextBlock
                             Grid.Row="17"
                             Grid.Column="0"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsEnableFragment}" />
@@ -370,12 +370,12 @@
                             x:Name="togenableFragment"
                             Grid.Row="17"
                             Grid.Column="1"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             HorizontalAlignment="Left" />
                         <TextBlock
                             Grid.Row="17"
                             Grid.Column="3"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsEnableFragmentTips}" />
                     </Grid>
@@ -383,7 +383,7 @@
             </TabItem>
 
             <!--<TabItem Header="{x:Static resx:ResUI.TbSettingsCoreKcp}">
-                <Grid Margin="{StaticResource SettingItemMargin}">
+                <Grid Margin="{StaticResource Margin8}">
                     <Grid.RowDefinitions>
                         <RowDefinition Height="Auto" />
                         <RowDefinition Height="Auto" />
@@ -405,7 +405,7 @@
                     <TextBlock
                         Grid.Row="1"
                         Grid.Column="0"
-                        Margin="{StaticResource SettingItemMargin}"
+                        Margin="{StaticResource Margin8}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="mtu" />
@@ -414,12 +414,12 @@
                         Grid.Row="1"
                         Grid.Column="1"
                         Width="200"
-                        Margin="{StaticResource SettingItemMargin}" />
+                        Margin="{StaticResource Margin8}" />
 
                     <TextBlock
                         Grid.Row="2"
                         Grid.Column="0"
-                        Margin="{StaticResource SettingItemMargin}"
+                        Margin="{StaticResource Margin8}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="tti" />
@@ -428,12 +428,12 @@
                         Grid.Row="2"
                         Grid.Column="1"
                         Width="200"
-                        Margin="{StaticResource SettingItemMargin}" />
+                        Margin="{StaticResource Margin8}" />
 
                     <TextBlock
                         Grid.Row="3"
                         Grid.Column="0"
-                        Margin="{StaticResource SettingItemMargin}"
+                        Margin="{StaticResource Margin8}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="uplinkCapacity" />
@@ -442,12 +442,12 @@
                         Grid.Row="3"
                         Grid.Column="1"
                         Width="200"
-                        Margin="{StaticResource SettingItemMargin}" />
+                        Margin="{StaticResource Margin8}" />
 
                     <TextBlock
                         Grid.Row="4"
                         Grid.Column="0"
-                        Margin="{StaticResource SettingItemMargin}"
+                        Margin="{StaticResource Margin8}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="downlinkCapacity" />
@@ -456,12 +456,12 @@
                         Grid.Row="4"
                         Grid.Column="1"
                         Width="200"
-                        Margin="{StaticResource SettingItemMargin}" />
+                        Margin="{StaticResource Margin8}" />
 
                     <TextBlock
                         Grid.Row="5"
                         Grid.Column="0"
-                        Margin="{StaticResource SettingItemMargin}"
+                        Margin="{StaticResource Margin8}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="readBufferSize" />
@@ -470,12 +470,12 @@
                         Grid.Row="5"
                         Grid.Column="1"
                         Width="200"
-                        Margin="{StaticResource SettingItemMargin}" />
+                        Margin="{StaticResource Margin8}" />
 
                     <TextBlock
                         Grid.Row="6"
                         Grid.Column="0"
-                        Margin="{StaticResource SettingItemMargin}"
+                        Margin="{StaticResource Margin8}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="writeBufferSize" />
@@ -484,12 +484,12 @@
                         Grid.Row="6"
                         Grid.Column="1"
                         Width="200"
-                        Margin="{StaticResource SettingItemMargin}" />
+                        Margin="{StaticResource Margin8}" />
 
                     <TextBlock
                         Grid.Row="7"
                         Grid.Column="0"
-                        Margin="{StaticResource SettingItemMargin}"
+                        Margin="{StaticResource Margin8}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="congestion" />
@@ -497,14 +497,14 @@
                         x:Name="togKcpcongestion"
                         Grid.Row="7"
                         Grid.Column="1"
-                        Margin="{StaticResource SettingItemMargin}"
+                        Margin="{StaticResource Margin8}"
                         HorizontalAlignment="Left" />
                 </Grid>
             </TabItem>-->
 
             <TabItem Header="{x:Static resx:ResUI.TbSettingsN}">
                 <ScrollViewer VerticalScrollBarVisibility="Visible">
-                    <Grid Grid.Row="2" Margin="{StaticResource SettingItemMargin}">
+                    <Grid Grid.Row="2" Margin="{StaticResource Margin8}">
                         <Grid.RowDefinitions>
                             <RowDefinition Height="Auto" />
                             <RowDefinition Height="Auto" />
@@ -538,7 +538,7 @@
                         <TextBlock
                             Grid.Row="1"
                             Grid.Column="0"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsStartBoot}" />
@@ -546,12 +546,12 @@
                             x:Name="togAutoRun"
                             Grid.Row="1"
                             Grid.Column="1"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             HorizontalAlignment="Left" />
                         <TextBlock
                             Grid.Row="1"
                             Grid.Column="2"
-                            Margin="{StaticResource ServerItemMargin}"
+                            Margin="{StaticResource Margin4}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsStartBootTip}"
@@ -560,7 +560,7 @@
                         <TextBlock
                             Grid.Row="2"
                             Grid.Column="0"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsStatistics}" />
@@ -568,13 +568,13 @@
                             x:Name="togEnableStatistics"
                             Grid.Row="2"
                             Grid.Column="1"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             HorizontalAlignment="Left" />
 
                         <TextBlock
                             Grid.Row="3"
                             Grid.Column="0"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsKeepOlderDedupl}" />
@@ -582,13 +582,13 @@
                             x:Name="togKeepOlderDedupl"
                             Grid.Row="3"
                             Grid.Column="1"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             HorizontalAlignment="Left" />
 
                         <TextBlock
                             Grid.Row="4"
                             Grid.Column="0"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsIgnoreGeoUpdateCore}" />
@@ -596,13 +596,13 @@
                             x:Name="togIgnoreGeoUpdateCore"
                             Grid.Row="4"
                             Grid.Column="1"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             HorizontalAlignment="Left" />
 
                         <TextBlock
                             Grid.Row="5"
                             Grid.Column="0"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsEnableAutoAdjustMainLvColWidth}" />
@@ -610,13 +610,13 @@
                             x:Name="togEnableAutoAdjustMainLvColWidth"
                             Grid.Row="5"
                             Grid.Column="1"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             HorizontalAlignment="Left" />
 
                         <TextBlock
                             Grid.Row="6"
                             Grid.Column="0"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsEnableUpdateSubOnlyRemarksExist}" />
@@ -624,13 +624,13 @@
                             x:Name="togEnableUpdateSubOnlyRemarksExist"
                             Grid.Row="6"
                             Grid.Column="1"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             HorizontalAlignment="Left" />
 
                         <TextBlock
                             Grid.Row="7"
                             Grid.Column="0"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsTLS13}" />
@@ -638,13 +638,13 @@
                             x:Name="togEnableSecurityProtocolTls13"
                             Grid.Row="7"
                             Grid.Column="1"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             HorizontalAlignment="Left" />
 
                         <TextBlock
                             Grid.Row="8"
                             Grid.Column="0"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsAutoHideStartup}" />
@@ -652,13 +652,13 @@
                             x:Name="togAutoHideStartup"
                             Grid.Row="8"
                             Grid.Column="1"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             HorizontalAlignment="Left" />
 
                         <TextBlock
                             Grid.Row="9"
                             Grid.Column="0"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsEnableCheckPreReleaseUpdate}" />
@@ -666,13 +666,13 @@
                             x:Name="togEnableCheckPreReleaseUpdate"
                             Grid.Row="9"
                             Grid.Column="1"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             HorizontalAlignment="Left" />
 
                         <TextBlock
                             Grid.Row="10"
                             Grid.Column="0"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsEnableDragDropSort}" />
@@ -680,13 +680,13 @@
                             x:Name="togEnableDragDropSort"
                             Grid.Row="10"
                             Grid.Column="1"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             HorizontalAlignment="Left" />
 
                         <TextBlock
                             Grid.Row="11"
                             Grid.Column="0"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsDoubleClick2Activate}" />
@@ -694,13 +694,13 @@
                             x:Name="togDoubleClick2Activate"
                             Grid.Row="11"
                             Grid.Column="1"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             HorizontalAlignment="Left" />
 
                         <TextBlock
                             Grid.Row="12"
                             Grid.Column="0"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsEnableHWA}" />
@@ -708,13 +708,13 @@
                             x:Name="togEnableHWA"
                             Grid.Row="12"
                             Grid.Column="1"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             HorizontalAlignment="Left" />
 
                         <TextBlock
                             Grid.Row="14"
                             Grid.Column="0"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsAutoUpdateInterval}" />
@@ -723,14 +723,14 @@
                             Grid.Row="14"
                             Grid.Column="1"
                             Width="200"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             HorizontalAlignment="Left"
                             Style="{StaticResource DefTextBox}" />
 
                         <TextBlock
                             Grid.Row="15"
                             Grid.Column="0"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsTrayMenuServersLimit}" />
@@ -739,14 +739,14 @@
                             Grid.Row="15"
                             Grid.Column="1"
                             Width="200"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             HorizontalAlignment="Left"
                             Style="{StaticResource DefTextBox}" />
 
                         <TextBlock
                             Grid.Row="16"
                             Grid.Column="0"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsCurrentFontFamily}" />
@@ -755,13 +755,13 @@
                             Grid.Row="16"
                             Grid.Column="1"
                             Width="200"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             MaxDropDownHeight="1000"
                             Style="{StaticResource DefComboBox}" />
                         <TextBlock
                             Grid.Row="16"
                             Grid.Column="2"
-                            Margin="{StaticResource ServerItemMargin}"
+                            Margin="{StaticResource Margin4}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsCurrentFontFamilyTip}"
@@ -770,7 +770,7 @@
                         <TextBlock
                             Grid.Row="17"
                             Grid.Column="0"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsSpeedTestTimeout}" />
@@ -779,13 +779,13 @@
                             Grid.Row="17"
                             Grid.Column="1"
                             Width="200"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             Style="{StaticResource DefComboBox}" />
 
                         <TextBlock
                             Grid.Row="18"
                             Grid.Column="0"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsSpeedTestUrl}" />
@@ -794,14 +794,14 @@
                             Grid.Row="18"
                             Grid.Column="1"
                             Width="300"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             IsEditable="True"
                             Style="{StaticResource DefComboBox}" />
 
                         <TextBlock
                             Grid.Row="19"
                             Grid.Column="0"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsSpeedPingTestUrl}" />
@@ -810,14 +810,14 @@
                             Grid.Row="19"
                             Grid.Column="1"
                             Width="300"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             IsEditable="True"
                             Style="{StaticResource DefComboBox}" />
 
                         <TextBlock
                             Grid.Row="20"
                             Grid.Column="0"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsSubConvert}" />
@@ -826,7 +826,7 @@
                             Grid.Row="20"
                             Grid.Column="1"
                             Width="300"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             materialDesign:HintAssist.Hint="Convert Url"
                             IsEditable="True"
                             Style="{StaticResource DefComboBox}" />
@@ -834,7 +834,7 @@
                         <TextBlock
                             Grid.Row="21"
                             Grid.Column="0"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsMainGirdOrientation}" />
@@ -843,37 +843,37 @@
                             Grid.Row="21"
                             Grid.Column="1"
                             Width="300"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             Style="{StaticResource DefComboBox}" />
                     </Grid>
                 </ScrollViewer>
             </TabItem>
 
             <TabItem Header="{x:Static resx:ResUI.TbSettingsSystemproxy}">
-                <DockPanel Margin="{StaticResource SettingItemMargin}">
+                <DockPanel Margin="{StaticResource Margin8}">
                     <StackPanel DockPanel.Dock="Bottom" Orientation="Vertical">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
-                                Margin="{StaticResource SettingItemMargin}"
+                                Margin="{StaticResource Margin8}"
                                 VerticalAlignment="Center"
                                 Style="{StaticResource ToolbarTextBlock}"
                                 Text="{x:Static resx:ResUI.TbSettingsNotProxyLocalAddress}" />
                             <ToggleButton
                                 x:Name="tognotProxyLocalAddress"
-                                Margin="{StaticResource SettingItemMargin}"
+                                Margin="{StaticResource Margin8}"
                                 HorizontalAlignment="Left" />
                         </StackPanel>
 
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
-                                Margin="{StaticResource SettingItemMargin}"
+                                Margin="{StaticResource Margin8}"
                                 VerticalAlignment="Center"
                                 Style="{StaticResource ToolbarTextBlock}"
                                 Text="{x:Static resx:ResUI.TbSettingsAdvancedProtocol}" />
                             <ComboBox
                                 x:Name="cmbsystemProxyAdvancedProtocol"
                                 MinWidth="400"
-                                Margin="{StaticResource SettingItemMargin}"
+                                Margin="{StaticResource Margin8}"
                                 materialDesign:HintAssist.Hint="Protocol"
                                 Style="{StaticResource DefComboBox}" />
                         </StackPanel>
@@ -881,14 +881,14 @@
 
                     <TextBlock
                         Grid.Row="1"
-                        Margin="{StaticResource SettingItemMargin}"
+                        Margin="{StaticResource Margin8}"
                         VerticalAlignment="Center"
                         DockPanel.Dock="Top"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbSettingsExceptionTip}" />
                     <TextBox
                         x:Name="txtsystemProxyExceptions"
-                        Margin="{StaticResource SettingItemMargin}"
+                        Margin="{StaticResource Margin8}"
                         VerticalAlignment="Stretch"
                         AcceptsReturn="True"
                         BorderThickness="1"
@@ -899,8 +899,8 @@
             </TabItem>
 
             <TabItem Header="{x:Static resx:ResUI.TbSettingsTunMode}">
-                <DockPanel Margin="{StaticResource SettingItemMargin}">
-                    <Grid Margin="{StaticResource SettingItemMargin}" DockPanel.Dock="Top">
+                <DockPanel Margin="{StaticResource Margin8}">
+                    <Grid Margin="{StaticResource Margin8}" DockPanel.Dock="Top">
                         <Grid.RowDefinitions>
                             <RowDefinition Height="Auto" />
                             <RowDefinition Height="Auto" />
@@ -919,7 +919,7 @@
                         <TextBlock
                             Grid.Row="2"
                             Grid.Column="0"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="Strict Route" />
@@ -927,13 +927,13 @@
                             x:Name="togStrictRoute"
                             Grid.Row="2"
                             Grid.Column="1"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             HorizontalAlignment="Left" />
 
                         <TextBlock
                             Grid.Row="3"
                             Grid.Column="0"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="Stack" />
@@ -942,14 +942,14 @@
                             Grid.Row="3"
                             Grid.Column="1"
                             Width="200"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             HorizontalAlignment="Left"
                             Style="{StaticResource DefComboBox}" />
 
                         <TextBlock
                             Grid.Row="4"
                             Grid.Column="0"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="Mtu" />
@@ -958,14 +958,14 @@
                             Grid.Row="4"
                             Grid.Column="1"
                             Width="200"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             HorizontalAlignment="Left"
                             Style="{StaticResource DefComboBox}" />
 
                         <TextBlock
                             Grid.Row="5"
                             Grid.Column="0"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsEnableExInbound}" />
@@ -973,13 +973,13 @@
                             x:Name="togEnableExInbound"
                             Grid.Row="5"
                             Grid.Column="1"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             HorizontalAlignment="Left" />
 
                         <TextBlock
                             Grid.Row="6"
                             Grid.Column="0"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsEnableIPv6Address}" />
@@ -987,14 +987,14 @@
                             x:Name="togEnableIPv6Address"
                             Grid.Row="6"
                             Grid.Column="1"
-                            Margin="{StaticResource SettingItemMargin}"
+                            Margin="{StaticResource Margin8}"
                             HorizontalAlignment="Left" />
                     </Grid>
                 </DockPanel>
             </TabItem>
 
             <TabItem Header="{x:Static resx:ResUI.TbSettingsCoreType}">
-                <Grid Margin="{StaticResource SettingItemMargin}">
+                <Grid Margin="{StaticResource Margin8}">
                     <Grid.RowDefinitions>
                         <RowDefinition Height="Auto" />
                         <RowDefinition Height="Auto" />
@@ -1011,7 +1011,7 @@
                     <TextBlock
                         Grid.Row="1"
                         Grid.Column="0"
-                        Margin="{StaticResource SettingItemMargin}"
+                        Margin="{StaticResource Margin8}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="VMess" />
@@ -1020,13 +1020,13 @@
                         Grid.Row="1"
                         Grid.Column="1"
                         Width="200"
-                        Margin="{StaticResource SettingItemMargin}"
+                        Margin="{StaticResource Margin8}"
                         Style="{StaticResource DefComboBox}" />
 
                     <TextBlock
                         Grid.Row="2"
                         Grid.Column="0"
-                        Margin="{StaticResource SettingItemMargin}"
+                        Margin="{StaticResource Margin8}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="Custom" />
@@ -1035,13 +1035,13 @@
                         Grid.Row="2"
                         Grid.Column="1"
                         Width="200"
-                        Margin="{StaticResource SettingItemMargin}"
+                        Margin="{StaticResource Margin8}"
                         Style="{StaticResource DefComboBox}" />
 
                     <TextBlock
                         Grid.Row="3"
                         Grid.Column="0"
-                        Margin="{StaticResource SettingItemMargin}"
+                        Margin="{StaticResource Margin8}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="Shadowsocks" />
@@ -1050,13 +1050,13 @@
                         Grid.Row="3"
                         Grid.Column="1"
                         Width="200"
-                        Margin="{StaticResource SettingItemMargin}"
+                        Margin="{StaticResource Margin8}"
                         Style="{StaticResource DefComboBox}" />
 
                     <TextBlock
                         Grid.Row="4"
                         Grid.Column="0"
-                        Margin="{StaticResource SettingItemMargin}"
+                        Margin="{StaticResource Margin8}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="Socks" />
@@ -1065,13 +1065,13 @@
                         Grid.Row="4"
                         Grid.Column="1"
                         Width="200"
-                        Margin="{StaticResource SettingItemMargin}"
+                        Margin="{StaticResource Margin8}"
                         Style="{StaticResource DefComboBox}" />
 
                     <TextBlock
                         Grid.Row="5"
                         Grid.Column="0"
-                        Margin="{StaticResource SettingItemMargin}"
+                        Margin="{StaticResource Margin8}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="VLESS" />
@@ -1080,13 +1080,13 @@
                         Grid.Row="5"
                         Grid.Column="1"
                         Width="200"
-                        Margin="{StaticResource SettingItemMargin}"
+                        Margin="{StaticResource Margin8}"
                         Style="{StaticResource DefComboBox}" />
 
                     <TextBlock
                         Grid.Row="6"
                         Grid.Column="0"
-                        Margin="{StaticResource SettingItemMargin}"
+                        Margin="{StaticResource Margin8}"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="Trojan" />
@@ -1095,7 +1095,7 @@
                         Grid.Row="6"
                         Grid.Column="1"
                         Width="200"
-                        Margin="{StaticResource SettingItemMargin}"
+                        Margin="{StaticResource Margin8}"
                         Style="{StaticResource DefComboBox}" />
                 </Grid>
             </TabItem>
diff --git a/v2rayN/v2rayN/Views/ProfilesView.xaml b/v2rayN/v2rayN/Views/ProfilesView.xaml
index 8bfe2d98..85427c0f 100644
--- a/v2rayN/v2rayN/Views/ProfilesView.xaml
+++ b/v2rayN/v2rayN/Views/ProfilesView.xaml
@@ -21,7 +21,7 @@
     </UserControl.Resources>
     <Grid>
         <DockPanel>
-            <WrapPanel Margin="2" DockPanel.Dock="Top">
+            <WrapPanel Margin="{StaticResource Margin4}" DockPanel.Dock="Top">
                 <ListBox
                     x:Name="lstGroup"
                     MaxHeight="200"
@@ -39,7 +39,7 @@
                     x:Name="btnEditSub"
                     Width="30"
                     Height="30"
-                    Margin="4,0"
+                    Margin="{StaticResource MarginLeftRight4}"
                     Style="{StaticResource MaterialDesignFloatingActionMiniLightButton}"
                     ToolTip="{x:Static resx:ResUI.menuSubEdit}">
                     <materialDesign:PackIcon VerticalAlignment="Center" Kind="Edit" />
@@ -48,7 +48,7 @@
                     x:Name="btnAddSub"
                     Width="30"
                     Height="30"
-                    Margin="4,0"
+                    Margin="{StaticResource MarginLeftRight4}"
                     Style="{StaticResource MaterialDesignFloatingActionMiniLightButton}"
                     ToolTip="{x:Static resx:ResUI.menuSubAdd}">
                     <materialDesign:PackIcon VerticalAlignment="Center" Kind="Plus" />
@@ -58,7 +58,7 @@
                     x:Name="btnAutofitColumnWidth"
                     Width="30"
                     Height="30"
-                    Margin="20,0"
+                    Margin="{StaticResource MarginLeftRight8}"
                     Style="{StaticResource MaterialDesignFloatingActionMiniLightButton}"
                     ToolTip="{x:Static resx:ResUI.menuProfileAutofitColumnWidth}">
                     <materialDesign:PackIcon VerticalAlignment="Center" Kind="ArrowSplitVertical" />
@@ -66,7 +66,7 @@
                 <TextBox
                     x:Name="txtServerFilter"
                     Width="200"
-                    Margin="4,0"
+                    Margin="{StaticResource MarginLeftRight4}"
                     VerticalContentAlignment="Center"
                     materialDesign:HintAssist.Hint="{x:Static resx:ResUI.MsgServerTitle}"
                     materialDesign:TextFieldAssist.HasClearButton="True"
diff --git a/v2rayN/v2rayN/Views/QrcodeView.xaml b/v2rayN/v2rayN/Views/QrcodeView.xaml
index b24111c2..f1af5ab1 100644
--- a/v2rayN/v2rayN/Views/QrcodeView.xaml
+++ b/v2rayN/v2rayN/Views/QrcodeView.xaml
@@ -10,7 +10,7 @@
     d:DesignWidth="300"
     Style="{StaticResource ViewGlobal}"
     mc:Ignorable="d">
-    <Grid Margin="30">
+    <Grid Margin="32">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
             <RowDefinition Height="Auto" />
@@ -38,7 +38,7 @@
         <Button
             Grid.Row="2"
             Width="100"
-            Margin="8"
+            Margin="{StaticResource Margin8}"
             HorizontalAlignment="Right"
             Command="{x:Static materialDesign:DialogHost.CloseDialogCommand}"
             Content="{x:Static resx:ResUI.TbConfirm}"
diff --git a/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml b/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml
index 75b764ec..cca103a9 100644
--- a/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml
+++ b/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml
@@ -23,7 +23,7 @@
     WindowStartupLocation="CenterScreen"
     mc:Ignorable="d">
     <DockPanel>
-        <Grid Margin="8" DockPanel.Dock="Top">
+        <Grid Margin="{StaticResource Margin8}" DockPanel.Dock="Top">
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="Auto" />
@@ -41,7 +41,7 @@
             <TextBlock
                 Grid.Row="0"
                 Grid.Column="0"
-                Margin="4"
+                Margin="{StaticResource Margin4}"
                 VerticalAlignment="Center"
                 Style="{StaticResource ToolbarTextBlock}"
                 Text="{x:Static resx:ResUI.LvRemarks}" />
@@ -50,20 +50,20 @@
                 Grid.Row="0"
                 Grid.Column="1"
                 Width="200"
-                Margin="4"
+                Margin="{StaticResource Margin4}"
                 HorizontalAlignment="Left"
                 Style="{StaticResource DefTextBox}" />
             <ToggleButton
                 x:Name="togEnabled"
                 Grid.Row="0"
                 Grid.Column="2"
-                Margin="4"
+                Margin="{StaticResource Margin4}"
                 HorizontalAlignment="Left" />
 
             <TextBlock
                 Grid.Row="1"
                 Grid.Column="0"
-                Margin="4"
+                Margin="{StaticResource Margin4}"
                 VerticalAlignment="Center"
                 Style="{StaticResource ToolbarTextBlock}"
                 Text="outboundTag" />
@@ -72,13 +72,13 @@
                 Grid.Row="1"
                 Grid.Column="1"
                 Width="200"
-                Margin="4"
+                Margin="{StaticResource Margin4}"
                 MaxDropDownHeight="1000"
                 Style="{StaticResource DefComboBox}" />
             <TextBlock
                 Grid.Row="1"
                 Grid.Column="2"
-                Margin="4"
+                Margin="{StaticResource Margin4}"
                 HorizontalAlignment="Left"
                 Style="{StaticResource ToolbarTextBlock}"
                 Text="{x:Static resx:ResUI.TbRuleMatchingTips}" />
@@ -86,7 +86,7 @@
             <TextBlock
                 Grid.Row="2"
                 Grid.Column="0"
-                Margin="4"
+                Margin="{StaticResource Margin4}"
                 VerticalAlignment="Center"
                 Style="{StaticResource ToolbarTextBlock}"
                 Text="port" />
@@ -95,13 +95,13 @@
                 Grid.Row="2"
                 Grid.Column="1"
                 Width="200"
-                Margin="4"
+                Margin="{StaticResource Margin4}"
                 HorizontalAlignment="Left"
                 Style="{StaticResource DefTextBox}" />
             <TextBlock
                 Grid.Row="2"
                 Grid.Column="2"
-                Margin="4"
+                Margin="{StaticResource Margin4}"
                 VerticalAlignment="Center"
                 Style="{StaticResource ToolbarTextBlock}">
                 <Hyperlink Click="linkRuleobjectDoc_Click">
@@ -113,7 +113,7 @@
             <TextBlock
                 Grid.Row="3"
                 Grid.Column="0"
-                Margin="4"
+                Margin="{StaticResource Margin4}"
                 VerticalAlignment="Center"
                 Style="{StaticResource ToolbarTextBlock}"
                 Text="protocol" />
@@ -121,7 +121,7 @@
                 x:Name="clbProtocol"
                 Grid.Row="3"
                 Grid.Column="1"
-                Margin="4"
+                Margin="{StaticResource Margin4}"
                 HorizontalAlignment="Left"
                 FontSize="{DynamicResource StdFontSize}"
                 Style="{StaticResource MaterialDesignFilterChipPrimaryListBox}" />
@@ -129,7 +129,7 @@
             <TextBlock
                 Grid.Row="4"
                 Grid.Column="0"
-                Margin="4"
+                Margin="{StaticResource Margin4}"
                 VerticalAlignment="Center"
                 Style="{StaticResource ToolbarTextBlock}"
                 Text="inboundTag" />
@@ -137,14 +137,14 @@
                 x:Name="clbInboundTag"
                 Grid.Row="4"
                 Grid.Column="1"
-                Margin="4"
+                Margin="{StaticResource Margin4}"
                 FontSize="{DynamicResource StdFontSize}"
                 Style="{StaticResource MaterialDesignFilterChipPrimaryListBox}" />
 
             <TextBlock
                 Grid.Row="5"
                 Grid.Column="0"
-                Margin="4"
+                Margin="{StaticResource Margin4}"
                 VerticalAlignment="Center"
                 Style="{StaticResource ToolbarTextBlock}"
                 Text="network" />
@@ -153,21 +153,21 @@
                 Grid.Row="5"
                 Grid.Column="1"
                 Width="200"
-                Margin="4"
+                Margin="{StaticResource Margin4}"
                 MaxDropDownHeight="1000"
                 Style="{StaticResource DefComboBox}" />
 
             <TextBlock
                 Grid.Row="5"
                 Grid.Column="2"
-                Margin="4"
+                Margin="{StaticResource Margin4}"
                 HorizontalAlignment="Left"
                 Style="{StaticResource ToolbarTextBlock}"
                 Text="{x:Static resx:ResUI.TbRoutingTips}" />
         </Grid>
 
         <StackPanel
-            Margin="8"
+            Margin="{StaticResource Margin8}"
             HorizontalAlignment="Right"
             DockPanel.Dock="Bottom"
             Orientation="Horizontal">
@@ -188,14 +188,14 @@
             <Button
                 x:Name="btnCancel"
                 Width="100"
-                Margin="8,0"
+                Margin="{StaticResource MarginLeftRight8}"
                 Content="{x:Static resx:ResUI.TbCancel}"
                 Cursor="Hand"
                 IsCancel="true"
                 Style="{StaticResource DefButton}" />
         </StackPanel>
 
-        <Grid Margin="{StaticResource SettingItemMargin}">
+        <Grid Margin="{StaticResource Margin8}">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="1*" />
                 <ColumnDefinition Width="10" />
diff --git a/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml b/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml
index 9edd2287..98f684c2 100644
--- a/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml
+++ b/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml
@@ -32,7 +32,7 @@
                 <Button x:Name="menuRuleAdd">
                     <StackPanel Orientation="Horizontal">
                         <materialDesign:PackIcon
-                            Margin="0,0,8,0"
+                            Margin="{StaticResource MarginRight8}"
                             VerticalAlignment="Center"
                             Kind="Plus" />
                         <TextBlock Style="{StaticResource ToolbarTextBlock}" Text="{x:Static resx:ResUI.menuRuleAdd}" />
@@ -42,7 +42,7 @@
                 <Button x:Name="menuImportRulesFromFile">
                     <StackPanel Orientation="Horizontal">
                         <materialDesign:PackIcon
-                            Margin="0,0,8,0"
+                            Margin="{StaticResource MarginRight8}"
                             VerticalAlignment="Center"
                             Kind="Import" />
                         <TextBlock Style="{StaticResource ToolbarTextBlock}" Text="{x:Static resx:ResUI.menuImportRulesFromFile}" />
@@ -52,7 +52,7 @@
                 <Button x:Name="menuImportRulesFromClipboard">
                     <StackPanel Orientation="Horizontal">
                         <materialDesign:PackIcon
-                            Margin="0,0,8,0"
+                            Margin="{StaticResource MarginRight8}"
                             VerticalAlignment="Center"
                             Kind="Import" />
                         <TextBlock Style="{StaticResource ToolbarTextBlock}" Text="{x:Static resx:ResUI.menuImportRulesFromClipboard}" />
@@ -62,7 +62,7 @@
                 <Button x:Name="menuImportRulesFromUrl">
                     <StackPanel Orientation="Horizontal">
                         <materialDesign:PackIcon
-                            Margin="0,0,8,0"
+                            Margin="{StaticResource MarginRight8}"
                             VerticalAlignment="Center"
                             Kind="Import" />
                         <TextBlock Style="{StaticResource ToolbarTextBlock}" Text="{x:Static resx:ResUI.menuImportRulesFromUrl}" />
@@ -72,7 +72,7 @@
         </ToolBarTray>
 
         <StackPanel
-            Margin="8"
+            Margin="{StaticResource Margin8}"
             HorizontalAlignment="Right"
             DockPanel.Dock="Bottom"
             Orientation="Horizontal">
@@ -85,14 +85,14 @@
             <Button
                 x:Name="btnCancel"
                 Width="100"
-                Margin="8,0"
+                Margin="{StaticResource MarginLeftRight8}"
                 Content="{x:Static resx:ResUI.TbCancel}"
                 Cursor="Hand"
                 IsCancel="true"
                 Style="{StaticResource DefButton}" />
         </StackPanel>
 
-        <Grid Margin="8" DockPanel.Dock="Top">
+        <Grid Margin="{StaticResource Margin8}" DockPanel.Dock="Top">
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="Auto" />
@@ -109,7 +109,7 @@
             <TextBlock
                 Grid.Row="0"
                 Grid.Column="0"
-                Margin="4"
+                Margin="{StaticResource Margin4}"
                 VerticalAlignment="Center"
                 Style="{StaticResource ToolbarTextBlock}"
                 Text="{x:Static resx:ResUI.LvRemarks}" />
@@ -123,7 +123,7 @@
                     Grid.Row="0"
                     Grid.Column="1"
                     Width="300"
-                    Margin="4"
+                    Margin="{StaticResource Margin4}"
                     HorizontalAlignment="Left"
                     VerticalAlignment="Top"
                     AcceptsReturn="True"
@@ -131,14 +131,14 @@
                     TextWrapping="Wrap" />
 
                 <TextBlock
-                    Margin="4"
+                    Margin="{StaticResource Margin4}"
                     VerticalAlignment="Center"
                     Style="{StaticResource ToolbarTextBlock}"
                     Text="{x:Static resx:ResUI.LvSort}" />
                 <TextBox
                     x:Name="txtSort"
                     Width="100"
-                    Margin="4"
+                    Margin="{StaticResource Margin4}"
                     HorizontalAlignment="Left"
                     AcceptsReturn="True"
                     Style="{StaticResource DefTextBox}" />
@@ -147,7 +147,7 @@
             <TextBlock
                 Grid.Row="1"
                 Grid.Column="0"
-                Margin="4"
+                Margin="{StaticResource Margin4}"
                 VerticalAlignment="Center"
                 Style="{StaticResource ToolbarTextBlock}"
                 Text="{x:Static resx:ResUI.TbdomainStrategy}" />
@@ -158,24 +158,24 @@
                 <ComboBox
                     x:Name="cmbdomainStrategy"
                     Width="200"
-                    Margin="4"
+                    Margin="{StaticResource Margin4}"
                     Style="{StaticResource DefComboBox}" />
                 <TextBlock
-                    Margin="4"
+                    Margin="{StaticResource Margin4}"
                     VerticalAlignment="Center"
                     Style="{StaticResource ToolbarTextBlock}"
                     Text="{x:Static resx:ResUI.TbdomainStrategy4Singbox}" />
                 <ComboBox
                     x:Name="cmbdomainStrategy4Singbox"
                     Width="200"
-                    Margin="4"
+                    Margin="{StaticResource Margin4}"
                     Style="{StaticResource DefComboBox}" />
             </StackPanel>
 
             <TextBlock
                 Grid.Row="2"
                 Grid.Column="0"
-                Margin="4"
+                Margin="{StaticResource Margin4}"
                 VerticalAlignment="Center"
                 Style="{StaticResource ToolbarTextBlock}"
                 Text="{x:Static resx:ResUI.LvUrl}" />
@@ -184,7 +184,7 @@
                 Grid.Row="2"
                 Grid.Column="1"
                 Width="600"
-                Margin="4"
+                Margin="{StaticResource Margin4}"
                 VerticalAlignment="Top"
                 AcceptsReturn="True"
                 Style="{StaticResource DefTextBox}"
@@ -193,7 +193,7 @@
             <TextBlock
                 Grid.Row="3"
                 Grid.Column="0"
-                Margin="4"
+                Margin="{StaticResource Margin4}"
                 VerticalAlignment="Center"
                 Style="{StaticResource ToolbarTextBlock}"
                 Text="{x:Static resx:ResUI.LvCustomIcon}" />
@@ -202,7 +202,7 @@
                 Grid.Row="3"
                 Grid.Column="1"
                 Width="600"
-                Margin="4"
+                Margin="{StaticResource Margin4}"
                 VerticalAlignment="Top"
                 AcceptsReturn="True"
                 Style="{StaticResource DefTextBox}"
@@ -211,14 +211,14 @@
                 x:Name="btnBrowseCustomIcon"
                 Grid.Row="3"
                 Grid.Column="2"
-                Margin="2,0,8,0"
+                Margin="{StaticResource MarginLeftRight4}"
                 Content="{x:Static resx:ResUI.TbBrowse}"
                 Style="{StaticResource DefButton}" />
 
             <TextBlock
                 Grid.Row="4"
                 Grid.Column="0"
-                Margin="4"
+                Margin="{StaticResource Margin4}"
                 VerticalAlignment="Center"
                 Style="{StaticResource ToolbarTextBlock}">
                 <Hyperlink Click="linkCustomRulesetPath4Singbox">
@@ -231,7 +231,7 @@
                 Grid.Row="4"
                 Grid.Column="1"
                 Width="600"
-                Margin="4"
+                Margin="{StaticResource Margin4}"
                 VerticalAlignment="Top"
                 AcceptsReturn="True"
                 Style="{StaticResource DefTextBox}"
@@ -240,7 +240,7 @@
                 x:Name="btnBrowseCustomRulesetPath4Singbox"
                 Grid.Row="4"
                 Grid.Column="2"
-                Margin="2,0,8,0"
+                Margin="{StaticResource MarginLeftRight4}"
                 Content="{x:Static resx:ResUI.TbBrowse}"
                 Style="{StaticResource DefButton}" />
         </Grid>
diff --git a/v2rayN/v2rayN/Views/RoutingSettingWindow.xaml b/v2rayN/v2rayN/Views/RoutingSettingWindow.xaml
index 18bc0168..c49f4c49 100644
--- a/v2rayN/v2rayN/Views/RoutingSettingWindow.xaml
+++ b/v2rayN/v2rayN/Views/RoutingSettingWindow.xaml
@@ -34,12 +34,12 @@
                 VerticalAlignment="Center"
                 ClipToBounds="True"
                 Style="{StaticResource MaterialDesignToolBar}">
-                <Menu Margin="0,8" Style="{StaticResource ToolbarMenu}">
+                <Menu Margin="0,1" Style="{StaticResource ToolbarMenu}">
                     <MenuItem x:Name="menuRoutingBasic" Padding="8,0">
                         <MenuItem.Header>
                             <StackPanel Orientation="Horizontal">
                                 <materialDesign:PackIcon
-                                    Margin="0,0,8,0"
+                                    Margin="{StaticResource MarginRight8}"
                                     VerticalAlignment="Center"
                                     Kind="Server" />
                                 <TextBlock Text="{x:Static resx:ResUI.menuRoutingBasic}" />
@@ -51,12 +51,12 @@
                             Header="{x:Static resx:ResUI.menuRoutingBasicImportRules}" />
                     </MenuItem>
                 </Menu>
-                <Menu Margin="0,8" Style="{StaticResource ToolbarMenu}">
+                <Menu Margin="0,1" Style="{StaticResource ToolbarMenu}">
                     <MenuItem x:Name="menuRoutingAdvanced" Padding="8,0">
                         <MenuItem.Header>
                             <StackPanel Orientation="Horizontal">
                                 <materialDesign:PackIcon
-                                    Margin="0,0,8,0"
+                                    Margin="{StaticResource MarginRight8}"
                                     VerticalAlignment="Center"
                                     Kind="Routes" />
                                 <TextBlock Text="{x:Static resx:ResUI.menuRoutingAdvanced}" />
@@ -74,17 +74,17 @@
                 </Menu>
                 <Separator />
                 <TextBlock
-                    Margin="8,0,0,0"
+                    Margin="{StaticResource MarginLeft8}"
                     VerticalAlignment="Center"
                     Style="{StaticResource ToolbarTextBlock}"
                     Text="{x:Static resx:ResUI.TbenableRoutingAdvanced}" />
                 <ToggleButton
                     x:Name="togenableRoutingAdvanced"
-                    Margin="8,0,0,0"
+                    Margin="{StaticResource MarginLeft8}"
                     HorizontalAlignment="Left" />
                 <Separator />
                 <TextBlock
-                    Margin="8,0,0,0"
+                    Margin="{StaticResource MarginLeft8}"
                     VerticalAlignment="Center"
                     Style="{StaticResource ToolbarTextBlock}">
                     <Hyperlink Click="linkdomainStrategy_Click">
@@ -95,22 +95,22 @@
                 <ComboBox
                     x:Name="cmbdomainStrategy"
                     Width="110"
-                    Margin="8,0,0,0"
+                    Margin="{StaticResource MarginLeft8}"
                     Style="{StaticResource DefComboBox}" />
                 <Separator />
                 <TextBlock
-                    Margin="8,0,0,0"
+                    Margin="{StaticResource MarginLeft8}"
                     VerticalAlignment="Center"
                     Style="{StaticResource ToolbarTextBlock}"
                     Text="{x:Static resx:ResUI.TbdomainMatcher}" />
                 <ComboBox
                     x:Name="cmbdomainMatcher"
                     Width="60"
-                    Margin="8,0,0,0"
+                    Margin="{StaticResource MarginLeft8}"
                     Style="{StaticResource DefComboBox}" />
                 <Separator />
                 <TextBlock
-                    Margin="8,0,0,0"
+                    Margin="{StaticResource MarginLeft8}"
                     VerticalAlignment="Center"
                     Style="{StaticResource ToolbarTextBlock}">
                     <Hyperlink Click="linkdomainStrategy4Singbox_Click">
@@ -121,13 +121,13 @@
                 <ComboBox
                     x:Name="cmbdomainStrategy4Singbox"
                     Width="100"
-                    Margin="8,0,0,0"
+                    Margin="{StaticResource MarginLeft8}"
                     Style="{StaticResource DefComboBox}" />
             </ToolBar>
         </ToolBarTray>
 
         <StackPanel
-            Margin="8"
+            Margin="{StaticResource Margin8}"
             HorizontalAlignment="Right"
             DockPanel.Dock="Bottom"
             Orientation="Horizontal">
@@ -146,7 +146,7 @@
             <Button
                 x:Name="btnCancel"
                 Width="100"
-                Margin="8,0"
+                Margin="{StaticResource MarginLeftRight8}"
                 Content="{x:Static resx:ResUI.TbCancel}"
                 Cursor="Hand"
                 IsCancel="true"
@@ -158,7 +158,6 @@
                 <TabItem HorizontalAlignment="Left" Header="{x:Static resx:ResUI.TbRoutingTabRuleList}">
                     <DataGrid
                         x:Name="lstRoutings"
-                        Margin="2,0"
                         AutoGenerateColumns="False"
                         BorderThickness="1"
                         CanUserAddRows="False"
@@ -233,7 +232,7 @@
 
             <TabControl x:Name="tabBasic">
                 <TabItem Header="{x:Static resx:ResUI.TbRoutingTabProxy}">
-                    <Grid Margin="{StaticResource SettingItemMargin}">
+                    <Grid Margin="{StaticResource Margin8}">
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="1*" />
                             <ColumnDefinition Width="10" />
@@ -266,7 +265,7 @@
                 </TabItem>
 
                 <TabItem Header="{x:Static resx:ResUI.TbRoutingTabDirect}">
-                    <Grid Margin="{StaticResource SettingItemMargin}">
+                    <Grid Margin="{StaticResource Margin8}">
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="1*" />
                             <ColumnDefinition Width="10" />
@@ -299,7 +298,7 @@
                 </TabItem>
 
                 <TabItem Header="{x:Static resx:ResUI.TbRoutingTabBlock}">
-                    <Grid Margin="{StaticResource SettingItemMargin}">
+                    <Grid Margin="{StaticResource Margin8}">
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="1*" />
                             <ColumnDefinition Width="10" />
diff --git a/v2rayN/v2rayN/Views/StatusBarView.xaml b/v2rayN/v2rayN/Views/StatusBarView.xaml
index 71d7090f..3c0d6e5c 100644
--- a/v2rayN/v2rayN/Views/StatusBarView.xaml
+++ b/v2rayN/v2rayN/Views/StatusBarView.xaml
@@ -18,46 +18,46 @@
         <materialDesign:ColorZone Height="50" Mode="Standard">
             <DockPanel>
                 <StackPanel
-                    Margin="8,0"
+                    Margin="{StaticResource MarginLeftRight8}"
                     VerticalAlignment="Center"
                     DockPanel.Dock="Right">
                     <TextBlock x:Name="txtSpeedProxyDisplay" Style="{StaticResource StatusbarItem}" />
-                    <Border Margin="2" />
+                    <Border Margin="{StaticResource Margin4}" />
                     <TextBlock x:Name="txtSpeedDirectDisplay" Style="{StaticResource StatusbarItem}" />
                 </StackPanel>
 
                 <StackPanel
                     Width="240"
-                    Margin="8,0"
+                    Margin="{StaticResource MarginLeftRight8}"
                     VerticalAlignment="Center"
                     DockPanel.Dock="Left">
                     <TextBlock x:Name="txtInboundDisplay" Style="{StaticResource StatusbarItem}" />
-                    <Border Margin="2" />
+                    <Border Margin="{StaticResource Margin4}" />
                     <TextBlock x:Name="txtInboundLanDisplay" Style="{StaticResource StatusbarItem}" />
                 </StackPanel>
 
                 <StackPanel
                     x:Name="spEnableTun"
                     Width="auto"
-                    Margin="8,0"
+                    Margin="{StaticResource MarginLeftRight8}"
                     VerticalAlignment="Center"
                     DockPanel.Dock="Left">
                     <TextBlock Text="{x:Static resx:ResUI.TbEnableTunAs}" />
                     <ToggleButton
                         x:Name="togEnableTun"
-                        Margin="4"
+                        Margin="{StaticResource Margin4}"
                         HorizontalAlignment="Left" />
                 </StackPanel>
 
                 <StackPanel
-                    Margin="8,0"
+                    Margin="{StaticResource MarginLeftRight8}"
                     VerticalAlignment="Center"
                     DockPanel.Dock="Left"
                     Orientation="Horizontal">
                     <ComboBox
                         x:Name="cmbSystemProxy"
                         Width="120"
-                        Margin="8,0"
+                        Margin="{StaticResource MarginLeftRight8}"
                         materialDesign:HintAssist.Hint="{x:Static resx:ResUI.menuSystemproxy}"
                         FontSize="{DynamicResource StdFontSize}"
                         Style="{StaticResource MaterialDesignFloatingHintComboBox}">
@@ -70,16 +70,16 @@
                     <ComboBox
                         x:Name="cmbRoutings2"
                         Width="150"
-                        Margin="8,0"
+                        Margin="{StaticResource MarginLeftRight8}"
                         materialDesign:HintAssist.Hint="{x:Static resx:ResUI.menuRouting}"
                         DisplayMemberPath="remarks"
                         FontSize="{DynamicResource StdFontSize}"
                         Style="{StaticResource MaterialDesignFloatingHintComboBox}" />
                 </StackPanel>
 
-                <StackPanel Margin="8,0" VerticalAlignment="Center">
+                <StackPanel Margin="{StaticResource MarginLeftRight8}" VerticalAlignment="Center">
                     <TextBlock x:Name="txtRunningServerDisplay" Style="{StaticResource StatusbarItem}" />
-                    <Border Margin="2" />
+                    <Border Margin="{StaticResource Margin4}" />
                     <TextBlock x:Name="txtRunningInfoDisplay" Style="{StaticResource StatusbarItem}" />
                 </StackPanel>
             </DockPanel>
@@ -99,7 +99,7 @@
                             <StackPanel Orientation="Horizontal">
                                 <materialDesign:PackIcon
                                     x:Name="menuSystemProxyClear2"
-                                    Margin="0,0,8,0"
+                                    Margin="{StaticResource MarginRight8}"
                                     VerticalAlignment="Center"
                                     Kind="Check" />
                                 <TextBlock Text="{x:Static resx:ResUI.menuSystemProxyClear}" />
@@ -111,7 +111,7 @@
                             <StackPanel Orientation="Horizontal">
                                 <materialDesign:PackIcon
                                     x:Name="menuSystemProxySet2"
-                                    Margin="0,0,8,0"
+                                    Margin="{StaticResource MarginRight8}"
                                     VerticalAlignment="Center"
                                     Kind="Check" />
                                 <TextBlock Text="{x:Static resx:ResUI.menuSystemProxySet}" />
@@ -123,7 +123,7 @@
                             <StackPanel Orientation="Horizontal">
                                 <materialDesign:PackIcon
                                     x:Name="menuSystemProxyNothing2"
-                                    Margin="0,0,8,0"
+                                    Margin="{StaticResource MarginRight8}"
                                     VerticalAlignment="Center"
                                     Kind="Check" />
                                 <TextBlock Text="{x:Static resx:ResUI.menuSystemProxyNothing}" />
@@ -135,7 +135,7 @@
                             <StackPanel Orientation="Horizontal">
                                 <materialDesign:PackIcon
                                     x:Name="menuSystemProxyPac2"
-                                    Margin="0,0,8,0"
+                                    Margin="{StaticResource MarginRight8}"
                                     VerticalAlignment="Center"
                                     Kind="Check" />
                                 <TextBlock Text="{x:Static resx:ResUI.menuSystemProxyPac}" />
diff --git a/v2rayN/v2rayN/Views/SubEditWindow.xaml b/v2rayN/v2rayN/Views/SubEditWindow.xaml
index b571a74d..be43a47a 100644
--- a/v2rayN/v2rayN/Views/SubEditWindow.xaml
+++ b/v2rayN/v2rayN/Views/SubEditWindow.xaml
@@ -29,9 +29,9 @@
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Window.Resources>
-    <DockPanel Margin="8">
+    <DockPanel Margin="{StaticResource Margin8}">
         <StackPanel
-            Margin="4"
+            Margin="{StaticResource Margin4}"
             HorizontalAlignment="Center"
             DockPanel.Dock="Bottom"
             Orientation="Horizontal">
@@ -44,7 +44,7 @@
             <Button
                 x:Name="btnCancel"
                 Width="100"
-                Margin="8,0"
+                Margin="{StaticResource MarginLeftRight8}"
                 Content="{x:Static resx:ResUI.TbCancel}"
                 Cursor="Hand"
                 IsCancel="true"
@@ -79,14 +79,14 @@
                 <TextBlock
                     Grid.Row="0"
                     Grid.Column="0"
-                    Margin="4"
+                    Margin="{StaticResource Margin4}"
                     Style="{StaticResource ModuleTitle}"
                     Text="{x:Static resx:ResUI.menuSubscription}" />
 
                 <TextBlock
                     Grid.Row="1"
                     Grid.Column="0"
-                    Margin="4"
+                    Margin="{StaticResource Margin4}"
                     VerticalAlignment="Center"
                     Style="{StaticResource ToolbarTextBlock}"
                     Text="{x:Static resx:ResUI.LvRemarks}" />
@@ -95,7 +95,7 @@
                     x:Name="txtRemarks"
                     Grid.Row="1"
                     Grid.Column="1"
-                    Margin="4"
+                    Margin="{StaticResource Margin4}"
                     VerticalAlignment="Top"
                     AcceptsReturn="True"
                     Style="{StaticResource MyOutlinedTextBox}"
@@ -104,7 +104,7 @@
                 <TextBlock
                     Grid.Row="2"
                     Grid.Column="0"
-                    Margin="4"
+                    Margin="{StaticResource Margin4}"
                     VerticalAlignment="Center"
                     Style="{StaticResource ToolbarTextBlock}"
                     Text="{x:Static resx:ResUI.LvUrl}" />
@@ -112,7 +112,7 @@
                     x:Name="txtUrl"
                     Grid.Row="2"
                     Grid.Column="1"
-                    Margin="4"
+                    Margin="{StaticResource Margin4}"
                     VerticalAlignment="Top"
                     materialDesign:HintAssist.Hint="{x:Static resx:ResUI.SubUrlTips}"
                     AcceptsReturn="True"
@@ -127,14 +127,14 @@
                     Style="{StaticResource MaterialDesignToolForegroundPopupBox}">
                     <StackPanel>
                         <TextBlock
-                            Margin="4"
+                            Margin="{StaticResource Margin4}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.LvMoreUrl}" />
                         <TextBox
                             x:Name="txtMoreUrl"
                             Width="400"
-                            Margin="4"
+                            Margin="{StaticResource Margin4}"
                             VerticalAlignment="Top"
                             materialDesign:HintAssist.Hint="{x:Static resx:ResUI.SubUrlTips}"
                             AcceptsReturn="True"
@@ -147,7 +147,7 @@
                 <TextBlock
                     Grid.Row="3"
                     Grid.Column="0"
-                    Margin="4"
+                    Margin="{StaticResource Margin4}"
                     VerticalAlignment="Center"
                     Style="{StaticResource ToolbarTextBlock}"
                     Text="{x:Static resx:ResUI.LvEnabled}" />
@@ -155,17 +155,17 @@
                 <DockPanel
                     Grid.Row="3"
                     Grid.Column="1"
-                    Margin="4">
+                    Margin="{StaticResource Margin4}">
                     <ToggleButton
                         x:Name="togEnable"
-                        Margin="4"
+                        Margin="{StaticResource Margin4}"
                         HorizontalAlignment="Left"
                         DockPanel.Dock="Left" />
 
                     <TextBox
                         x:Name="txtAutoUpdateInterval"
                         Width="200"
-                        Margin="4"
+                        Margin="{StaticResource Margin4}"
                         VerticalAlignment="Top"
                         materialDesign:HintAssist.Hint="{x:Static resx:ResUI.SubUrlTips}"
                         AcceptsReturn="True"
@@ -173,7 +173,7 @@
                         Style="{StaticResource MyOutlinedTextBox}" />
 
                     <TextBlock
-                        Margin="4"
+                        Margin="{StaticResource Margin4}"
                         HorizontalAlignment="Center"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
@@ -183,7 +183,7 @@
                 <TextBlock
                     Grid.Row="5"
                     Grid.Column="0"
-                    Margin="4"
+                    Margin="{StaticResource Margin4}"
                     VerticalAlignment="Center"
                     Style="{StaticResource ToolbarTextBlock}"
                     Text="{x:Static resx:ResUI.LvFilter}" />
@@ -191,7 +191,7 @@
                     x:Name="txtFilter"
                     Grid.Row="5"
                     Grid.Column="1"
-                    Margin="4"
+                    Margin="{StaticResource Margin4}"
                     VerticalAlignment="Top"
                     materialDesign:HintAssist.Hint="{x:Static resx:ResUI.SubUrlTips}"
                     AcceptsReturn="True"
@@ -200,7 +200,7 @@
                 <TextBlock
                     Grid.Row="6"
                     Grid.Column="0"
-                    Margin="4"
+                    Margin="{StaticResource Margin4}"
                     VerticalAlignment="Center"
                     Style="{StaticResource ToolbarTextBlock}"
                     Text="{x:Static resx:ResUI.LvConvertTarget}" />
@@ -208,7 +208,7 @@
                     x:Name="cmbConvertTarget"
                     Grid.Row="6"
                     Grid.Column="1"
-                    Margin="4"
+                    Margin="{StaticResource Margin4}"
                     materialDesign:HintAssist.Hint="{x:Static resx:ResUI.LvConvertTargetTip}"
                     MaxDropDownHeight="1000"
                     Style="{StaticResource MyOutlinedTextComboBox}" />
@@ -216,14 +216,14 @@
                 <TextBlock
                     Grid.Row="7"
                     Grid.Column="0"
-                    Margin="4"
+                    Margin="{StaticResource Margin4}"
                     VerticalAlignment="Center"
                     Text="{x:Static resx:ResUI.LvUserAgent}" />
                 <TextBox
                     x:Name="txtUserAgent"
                     Grid.Row="7"
                     Grid.Column="1"
-                    Margin="4"
+                    Margin="{StaticResource Margin4}"
                     VerticalAlignment="Top"
                     materialDesign:HintAssist.Hint="{x:Static resx:ResUI.SubUrlTips}"
                     AcceptsReturn="True"
@@ -233,7 +233,7 @@
                 <TextBlock
                     Grid.Row="8"
                     Grid.Column="0"
-                    Margin="4"
+                    Margin="{StaticResource Margin4}"
                     VerticalAlignment="Center"
                     Style="{StaticResource ToolbarTextBlock}"
                     Text="{x:Static resx:ResUI.LvSort}" />
@@ -242,7 +242,7 @@
                     Grid.Row="8"
                     Grid.Column="1"
                     Width="100"
-                    Margin="4"
+                    Margin="{StaticResource Margin4}"
                     HorizontalAlignment="Left"
                     VerticalAlignment="Top"
                     AcceptsReturn="True"
@@ -251,7 +251,7 @@
                 <TextBlock
                     Grid.Row="9"
                     Grid.Column="0"
-                    Margin="4"
+                    Margin="{StaticResource Margin4}"
                     VerticalAlignment="Center"
                     Style="{StaticResource ToolbarTextBlock}"
                     Text="{x:Static resx:ResUI.LvPrevProfile}" />
@@ -259,7 +259,7 @@
                     x:Name="txtPrevProfile"
                     Grid.Row="9"
                     Grid.Column="1"
-                    Margin="4"
+                    Margin="{StaticResource Margin4}"
                     VerticalAlignment="Top"
                     materialDesign:HintAssist.Hint="{x:Static resx:ResUI.LvPrevProfileTip}"
                     AcceptsReturn="True"
@@ -268,7 +268,7 @@
                 <TextBlock
                     Grid.Row="10"
                     Grid.Column="0"
-                    Margin="4"
+                    Margin="{StaticResource Margin4}"
                     VerticalAlignment="Center"
                     Style="{StaticResource ToolbarTextBlock}"
                     Text="{x:Static resx:ResUI.LvNextProfile}" />
@@ -276,7 +276,7 @@
                     x:Name="txtNextProfile"
                     Grid.Row="10"
                     Grid.Column="1"
-                    Margin="4"
+                    Margin="{StaticResource Margin4}"
                     VerticalAlignment="Top"
                     materialDesign:HintAssist.Hint="{x:Static resx:ResUI.LvPrevProfileTip}"
                     AcceptsReturn="True"
@@ -285,7 +285,7 @@
                 <TextBlock
                     Grid.Row="11"
                     Grid.Column="0"
-                    Margin="4"
+                    Margin="{StaticResource Margin4}"
                     VerticalAlignment="Center"
                     Style="{StaticResource ToolbarTextBlock}"
                     Text="{x:Static resx:ResUI.TbPreSocksPort4Sub}" />
@@ -293,7 +293,7 @@
                     x:Name="txtPreSocksPort"
                     Grid.Row="11"
                     Grid.Column="1"
-                    Margin="4"
+                    Margin="{StaticResource Margin4}"
                     HorizontalAlignment="Left"
                     materialDesign:HintAssist.Hint="{x:Static resx:ResUI.TipPreSocksPort}"
                     AcceptsReturn="True"
diff --git a/v2rayN/v2rayN/Views/SubSettingWindow.xaml b/v2rayN/v2rayN/Views/SubSettingWindow.xaml
index 7042ce32..7a78b8a9 100644
--- a/v2rayN/v2rayN/Views/SubSettingWindow.xaml
+++ b/v2rayN/v2rayN/Views/SubSettingWindow.xaml
@@ -36,7 +36,7 @@
                     <Button x:Name="menuSubAdd">
                         <StackPanel Orientation="Horizontal">
                             <materialDesign:PackIcon
-                                Margin="0,0,8,0"
+                                Margin="{StaticResource MarginRight8}"
                                 VerticalAlignment="Center"
                                 Kind="Plus" />
                             <TextBlock Style="{StaticResource ToolbarTextBlock}" Text="{x:Static resx:ResUI.menuSubAdd}" />
@@ -46,7 +46,7 @@
                     <Button x:Name="menuSubDelete">
                         <StackPanel Orientation="Horizontal">
                             <materialDesign:PackIcon
-                                Margin="0,0,8,0"
+                                Margin="{StaticResource MarginRight8}"
                                 VerticalAlignment="Center"
                                 Kind="Delete" />
                             <TextBlock Style="{StaticResource ToolbarTextBlock}" Text="{x:Static resx:ResUI.menuSubDelete}" />
@@ -56,7 +56,7 @@
                     <Button x:Name="menuSubEdit">
                         <StackPanel Orientation="Horizontal">
                             <materialDesign:PackIcon
-                                Margin="0,0,8,0"
+                                Margin="{StaticResource MarginRight8}"
                                 VerticalAlignment="Center"
                                 Kind="Edit" />
                             <TextBlock Style="{StaticResource ToolbarTextBlock}" Text="{x:Static resx:ResUI.menuSubEdit}" />
@@ -66,7 +66,7 @@
                     <Button x:Name="menuSubShare">
                         <StackPanel Orientation="Horizontal">
                             <materialDesign:PackIcon
-                                Margin="0,0,8,0"
+                                Margin="{StaticResource MarginRight8}"
                                 VerticalAlignment="Center"
                                 Kind="QrcodePlus" />
                             <TextBlock Style="{StaticResource ToolbarTextBlock}" Text="{x:Static resx:ResUI.menuSubShare}" />
@@ -75,7 +75,7 @@
                     <Button x:Name="menuClose" IsCancel="True">
                         <StackPanel Orientation="Horizontal">
                             <materialDesign:PackIcon
-                                Margin="0,0,8,0"
+                                Margin="{StaticResource MarginRight8}"
                                 VerticalAlignment="Center"
                                 Kind="Close" />
                             <TextBlock Style="{StaticResource ToolbarTextBlock}" Text="{x:Static resx:ResUI.menuClose}" />
diff --git a/v2rayN/v2rayN/Views/ThemeSettingView.xaml b/v2rayN/v2rayN/Views/ThemeSettingView.xaml
index 7559e25c..ab3dee3f 100644
--- a/v2rayN/v2rayN/Views/ThemeSettingView.xaml
+++ b/v2rayN/v2rayN/Views/ThemeSettingView.xaml
@@ -12,7 +12,7 @@
     x:TypeArguments="vms:ThemeSettingViewModel"
     Style="{StaticResource ViewGlobal}"
     mc:Ignorable="d">
-    <StackPanel Margin="8">
+    <StackPanel Margin="{StaticResource Margin8}">
         <Grid>
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto" />
@@ -35,7 +35,7 @@
                 x:Name="togDarkMode"
                 Grid.Row="0"
                 Grid.Column="1"
-                Margin="8" />
+                Margin="{StaticResource Margin8}" />
 
             <TextBlock
                 Grid.Row="1"
@@ -47,7 +47,7 @@
                 x:Name="followSystemTheme"
                 Grid.Row="1"
                 Grid.Column="1"
-                Margin="8" />
+                Margin="{StaticResource Margin8}" />
 
             <TextBlock
                 Grid.Row="2"
@@ -60,7 +60,7 @@
                 Grid.Row="2"
                 Grid.Column="1"
                 Width="100"
-                Margin="8"
+                Margin="{StaticResource Margin8}"
                 DisplayMemberPath="Name"
                 Style="{StaticResource DefComboBox}" />
 
@@ -75,7 +75,7 @@
                 Grid.Row="3"
                 Grid.Column="1"
                 Width="100"
-                Margin="8"
+                Margin="{StaticResource Margin8}"
                 Style="{StaticResource DefComboBox}" />
 
             <TextBlock
@@ -89,7 +89,7 @@
                 Grid.Row="4"
                 Grid.Column="1"
                 Width="100"
-                Margin="8"
+                Margin="{StaticResource Margin8}"
                 Style="{StaticResource DefComboBox}" />
         </Grid>
     </StackPanel>