From aa829a66ea42e763deaca24ef1c38a928fbfeb33 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Mon, 16 Sep 2024 18:21:30 +0800
Subject: [PATCH] Improved Style for Desktop version

---
 .../v2rayN.Desktop/Styles/GlobalStyles.axaml  |  16 -
 .../Views/AddServer2Window.axaml              |  28 +-
 .../Views/AddServerWindow.axaml               | 758 +++++++++---------
 .../Views/DNSSettingWindow.axaml              |   8 +-
 .../Views/GlobalHotkeySettingWindow.axaml     |  26 +-
 v2rayN/v2rayN.Desktop/Views/MainWindow.axaml  |   3 +-
 v2rayN/v2rayN.Desktop/Views/MsgView.axaml     |   8 +-
 .../Views/OptionSettingWindow.axaml           |   4 +-
 .../v2rayN.Desktop/Views/ProfilesView.axaml   |   2 +-
 .../Views/RoutingRuleDetailsWindow.axaml      |  30 +-
 .../Views/RoutingRuleSettingWindow.axaml      |  32 +-
 .../v2rayN.Desktop/Views/SubEditWindow.axaml  |  69 +-
 12 files changed, 486 insertions(+), 498 deletions(-)

diff --git a/v2rayN/v2rayN.Desktop/Styles/GlobalStyles.axaml b/v2rayN/v2rayN.Desktop/Styles/GlobalStyles.axaml
index ca5f9081..aaeec2c5 100644
--- a/v2rayN/v2rayN.Desktop/Styles/GlobalStyles.axaml
+++ b/v2rayN/v2rayN.Desktop/Styles/GlobalStyles.axaml
@@ -5,22 +5,6 @@
         </Border>
     </Design.PreviewWith>
 
-    <Style Selector="TextBlock.Margin4">
-        <Setter Property="Margin" Value="8" />
-    </Style>
-    <Style Selector="StackPanel.Margin4">
-        <Setter Property="Margin" Value="8" />
-    </Style>
-    <Style Selector="DockPanel.Margin4">
-        <Setter Property="Margin" Value="8" />
-    </Style>
-    <Style Selector="WrapPanel.Margin4">
-        <Setter Property="Margin" Value="8" />
-    </Style>
-    <Style Selector="Grid.Margin4">
-        <Setter Property="Margin" Value="8" />
-    </Style>
-
     <Style Selector="TextBlock.Margin8">
         <Setter Property="Margin" Value="8" />
     </Style>
diff --git a/v2rayN/v2rayN.Desktop/Views/AddServer2Window.axaml b/v2rayN/v2rayN.Desktop/Views/AddServer2Window.axaml
index 2f54573d..797d8117 100644
--- a/v2rayN/v2rayN.Desktop/Views/AddServer2Window.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/AddServer2Window.axaml
@@ -16,7 +16,7 @@
     <DockPanel Classes="Margin8">
         <StackPanel
             HorizontalAlignment="Center"
-            Classes="Margin4"
+            Classes="Margin8"
             DockPanel.Dock="Bottom"
             Orientation="Horizontal">
             <Button
@@ -57,14 +57,14 @@
                     <TextBlock
                         Grid.Row="0"
                         Grid.Column="0"
-                        Classes="Margin4"
+                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.menuServers}" />
 
                     <TextBlock
                         Grid.Row="1"
                         Grid.Column="0"
                         VerticalAlignment="Center"
-                        Classes="Margin4"
+                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TbRemarks}" />
 
                     <TextBox
@@ -74,13 +74,13 @@
                         Width="400"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
-                        Classes="Margin4" />
+                        Classes="Margin8" />
 
                     <TextBlock
                         Grid.Row="2"
                         Grid.Column="0"
                         VerticalAlignment="Center"
-                        Classes="Margin4"
+                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TbAddress}" />
                     <TextBox
                         x:Name="txtAddress"
@@ -89,7 +89,7 @@
                         Width="400"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
-                        Classes="Margin4"
+                        Classes="Margin8"
                         IsReadOnly="True" />
                     <StackPanel
                         Grid.Row="2"
@@ -110,7 +110,7 @@
                         Grid.Row="3"
                         Grid.Column="0"
                         VerticalAlignment="Center"
-                        Classes="Margin4"
+                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TbCoreType}" />
                     <ComboBox
                         x:Name="cmbCoreType"
@@ -118,24 +118,24 @@
                         Grid.Column="1"
                         Width="200"
                         HorizontalAlignment="Left"
-                        Classes="Margin4"
+                        Classes="Margin8"
                         MaxDropDownHeight="1000" />
 
                     <TextBlock
                         Grid.Row="4"
                         Grid.Column="0"
                         VerticalAlignment="Center"
-                        Classes="Margin4"
+                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TbDisplayLog}" />
                     <StackPanel
                         Grid.Row="4"
                         Grid.Column="1"
-                        Classes="Margin4"
+                        Classes="Margin8"
                         Orientation="Horizontal">
                         <ToggleSwitch
                             x:Name="togDisplayLog"
                             HorizontalAlignment="Left"
-                            Classes="Margin4" />
+                            Classes="Margin8" />
                         <TextBlock
                             Margin="8,0"
                             VerticalAlignment="Center"
@@ -146,7 +146,7 @@
                         Grid.Row="5"
                         Grid.Column="0"
                         VerticalAlignment="Center"
-                        Classes="Margin4"
+                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TbPreSocksPort}" />
                     <TextBox
                         x:Name="txtPreSocksPort"
@@ -154,12 +154,12 @@
                         Grid.Column="1"
                         Width="200"
                         HorizontalAlignment="Left"
-                        Classes="Margin4" />
+                        Classes="Margin8" />
                     <StackPanel
                         Grid.Row="6"
                         Grid.Column="1"
                         Grid.ColumnSpan="2"
-                        Classes="Margin4">
+                        Classes="Margin8">
                         <TextBlock
                             Width="500"
                             VerticalAlignment="Center"
diff --git a/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml b/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml
index 857e7f00..a691685b 100644
--- a/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml
@@ -13,830 +13,830 @@
     ShowInTaskbar="False"
     WindowStartupLocation="CenterScreen"
     mc:Ignorable="d">
-    <DockPanel Classes="Margin8">
-        <StackPanel
-            Classes="Margin4"
+	<DockPanel Classes="Margin8">
+		<StackPanel
             HorizontalAlignment="Center"
+            Classes="Margin8"
             DockPanel.Dock="Bottom"
             Orientation="Horizontal">
-            <Button
+			<Button
                 x:Name="btnSave"
                 Width="100"
                 Content="{x:Static resx:ResUI.TbConfirm}"
                 Cursor="Hand" />
-            <Button
+			<Button
                 x:Name="btnCancel"
                 Width="100"
                 Margin="8,0"
                 Content="{x:Static resx:ResUI.TbCancel}"
                 Cursor="Hand" />
-        </StackPanel>
-        <ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
-            <Grid>
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                </Grid.RowDefinitions>
+		</StackPanel>
+		<ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
+			<Grid>
+				<Grid.RowDefinitions>
+					<RowDefinition Height="Auto" />
+					<RowDefinition Height="Auto" />
+					<RowDefinition Height="Auto" />
+					<RowDefinition Height="Auto" />
+					<RowDefinition Height="Auto" />
+					<RowDefinition Height="Auto" />
+					<RowDefinition Height="Auto" />
+					<RowDefinition Height="Auto" />
+					<RowDefinition Height="Auto" />
+				</Grid.RowDefinitions>
 
-                <Grid Grid.Row="0">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="180" />
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="Auto" />
-                    </Grid.ColumnDefinitions>
+				<Grid Grid.Row="0">
+					<Grid.RowDefinitions>
+						<RowDefinition Height="Auto" />
+						<RowDefinition Height="Auto" />
+						<RowDefinition Height="Auto" />
+						<RowDefinition Height="Auto" />
+					</Grid.RowDefinitions>
+					<Grid.ColumnDefinitions>
+						<ColumnDefinition Width="180" />
+						<ColumnDefinition Width="Auto" />
+						<ColumnDefinition Width="Auto" />
+					</Grid.ColumnDefinitions>
 
-                    <TextBlock
+					<TextBlock
                         Grid.Row="0"
                         Grid.Column="0"
-                        Classes="Margin4"
+                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.menuServers}" />
-                    <StackPanel
+					<StackPanel
                         Grid.Row="0"
                         Grid.Column="2"
                         Orientation="Horizontal">
-                        <ComboBox
+						<ComboBox
                             x:Name="cmbCoreType"
                             Width="100"
-                            Classes="Margin4"
+                            Classes="Margin8"
                             ToolTip.Tip="{x:Static resx:ResUI.TbCoreType}" />
-                    </StackPanel>
+					</StackPanel>
 
-                    <TextBlock
+					<TextBlock
                         Grid.Row="1"
                         Grid.Column="0"
-                        Classes="Margin4"
                         VerticalAlignment="Center"
+                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TbRemarks}" />
-                    <TextBox
+					<TextBox
                         x:Name="txtRemarks"
                         Grid.Row="1"
                         Grid.Column="1"
                         Width="400"
-                        Classes="Margin4" />
+                        Classes="Margin8" />
 
-                    <TextBlock
+					<TextBlock
                         Grid.Row="2"
                         Grid.Column="0"
-                        Classes="Margin4"
                         VerticalAlignment="Center"
+                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TbAddress}" />
-                    <TextBox
+					<TextBox
                         x:Name="txtAddress"
                         Grid.Row="2"
                         Grid.Column="1"
                         Width="400"
-                        Classes="Margin4" />
+                        Classes="Margin8" />
 
-                    <TextBlock
+					<TextBlock
                         Grid.Row="3"
                         Grid.Column="0"
-                        Classes="Margin4"
                         VerticalAlignment="Center"
+                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TbPort}" />
-                    <TextBox
+					<TextBox
                         x:Name="txtPort"
                         Grid.Row="3"
                         Grid.Column="1"
                         Width="100"
-                        Classes="Margin4"
-                        HorizontalAlignment="Left" />
-                </Grid>
+                        HorizontalAlignment="Left"
+                        Classes="Margin8" />
+				</Grid>
 
-                <Separator Grid.Row="1" Margin="0,2" />
+				<Separator Grid.Row="1" Margin="0,2" />
 
-                <Grid
+				<Grid
                     x:Name="gridVMess"
                     Grid.Row="2"
                     IsVisible="False">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="180" />
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="Auto" />
-                    </Grid.ColumnDefinitions>
+					<Grid.RowDefinitions>
+						<RowDefinition Height="Auto" />
+						<RowDefinition Height="Auto" />
+						<RowDefinition Height="Auto" />
+						<RowDefinition Height="Auto" />
+					</Grid.RowDefinitions>
+					<Grid.ColumnDefinitions>
+						<ColumnDefinition Width="180" />
+						<ColumnDefinition Width="Auto" />
+						<ColumnDefinition Width="Auto" />
+					</Grid.ColumnDefinitions>
 
-                    <TextBlock
+					<TextBlock
                         Grid.Row="1"
                         Grid.Column="0"
-                        Classes="Margin4"
                         VerticalAlignment="Center"
+                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TbId}" />
-                    <TextBox
+					<TextBox
                         x:Name="txtId"
                         Grid.Row="1"
                         Grid.Column="1"
                         Width="400"
-                        Classes="Margin4" />
-                    <Button
+                        Classes="Margin8" />
+					<Button
                         x:Name="btnGUID"
                         Grid.Row="1"
                         Grid.Column="2"
                         Margin="4,0"
                         Content="{x:Static resx:ResUI.TbGUID}" />
 
-                    <TextBlock
+					<TextBlock
                         Grid.Row="2"
                         Grid.Column="0"
-                        Classes="Margin4"
                         VerticalAlignment="Center"
+                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TbAlterId}" />
-                    <TextBox
+					<TextBox
                         x:Name="txtAlterId"
                         Grid.Row="2"
                         Grid.Column="1"
                         Width="100"
-                        Classes="Margin4"
-                        HorizontalAlignment="Left" />
+                        HorizontalAlignment="Left"
+                        Classes="Margin8" />
 
-                    <TextBlock
+					<TextBlock
                         Grid.Row="3"
                         Grid.Column="0"
-                        Classes="Margin4"
                         VerticalAlignment="Center"
+                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TbSecurity}" />
-                    <ComboBox
+					<ComboBox
                         x:Name="cmbSecurity"
                         Grid.Row="3"
                         Grid.Column="1"
                         Width="200"
-                        Classes="Margin4" />
-                </Grid>
-                <Grid
+                        Classes="Margin8" />
+				</Grid>
+				<Grid
                     x:Name="gridSs"
                     Grid.Row="2"
                     IsVisible="False">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="180" />
-                        <ColumnDefinition Width="Auto" />
-                    </Grid.ColumnDefinitions>
+					<Grid.RowDefinitions>
+						<RowDefinition Height="Auto" />
+						<RowDefinition Height="Auto" />
+						<RowDefinition Height="Auto" />
+						<RowDefinition Height="Auto" />
+					</Grid.RowDefinitions>
+					<Grid.ColumnDefinitions>
+						<ColumnDefinition Width="180" />
+						<ColumnDefinition Width="Auto" />
+					</Grid.ColumnDefinitions>
 
-                    <TextBlock
+					<TextBlock
                         Grid.Row="1"
                         Grid.Column="0"
-                        Classes="Margin4"
                         VerticalAlignment="Center"
+                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TbId3}" />
-                    <TextBox
+					<TextBox
                         x:Name="txtId3"
                         Grid.Row="1"
                         Grid.Column="1"
                         Width="400"
-                        Classes="Margin4" />
+                        Classes="Margin8" />
 
-                    <TextBlock
+					<TextBlock
                         Grid.Row="2"
                         Grid.Column="0"
-                        Classes="Margin4"
                         VerticalAlignment="Center"
+                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TbSecurity3}" />
-                    <ComboBox
+					<ComboBox
                         x:Name="cmbSecurity3"
                         Grid.Row="2"
                         Grid.Column="1"
                         Width="300"
-                        Classes="Margin4" />
-                </Grid>
-                <Grid
+                        Classes="Margin8" />
+				</Grid>
+				<Grid
                     x:Name="gridSocks"
                     Grid.Row="2"
                     IsVisible="False">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="180" />
-                        <ColumnDefinition Width="Auto" />
-                    </Grid.ColumnDefinitions>
+					<Grid.RowDefinitions>
+						<RowDefinition Height="Auto" />
+						<RowDefinition Height="Auto" />
+						<RowDefinition Height="Auto" />
+						<RowDefinition Height="Auto" />
+					</Grid.RowDefinitions>
+					<Grid.ColumnDefinitions>
+						<ColumnDefinition Width="180" />
+						<ColumnDefinition Width="Auto" />
+					</Grid.ColumnDefinitions>
 
-                    <TextBlock
+					<TextBlock
                         Grid.Row="1"
                         Grid.Column="0"
-                        Classes="Margin4"
                         VerticalAlignment="Center"
+                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TbSecurity4}" />
-                    <TextBox
+					<TextBox
                         x:Name="txtSecurity4"
                         Grid.Row="1"
                         Grid.Column="1"
                         Width="400"
-                        Classes="Margin4" />
+                        Classes="Margin8" />
 
-                    <TextBlock
+					<TextBlock
                         Grid.Row="2"
                         Grid.Column="0"
-                        Classes="Margin4"
                         VerticalAlignment="Center"
+                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TbId4}" />
-                    <TextBox
+					<TextBox
                         x:Name="txtId4"
                         Grid.Row="2"
                         Grid.Column="1"
                         Width="400"
-                        Classes="Margin4" />
-                </Grid>
-                <Grid
+                        Classes="Margin8" />
+				</Grid>
+				<Grid
                     x:Name="gridVLESS"
                     Grid.Row="2"
                     IsVisible="False">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="180" />
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="Auto" />
-                    </Grid.ColumnDefinitions>
+					<Grid.RowDefinitions>
+						<RowDefinition Height="Auto" />
+						<RowDefinition Height="Auto" />
+						<RowDefinition Height="Auto" />
+						<RowDefinition Height="Auto" />
+					</Grid.RowDefinitions>
+					<Grid.ColumnDefinitions>
+						<ColumnDefinition Width="180" />
+						<ColumnDefinition Width="Auto" />
+						<ColumnDefinition Width="Auto" />
+					</Grid.ColumnDefinitions>
 
-                    <TextBlock
+					<TextBlock
                         Grid.Row="1"
                         Grid.Column="0"
-                        Classes="Margin4"
                         VerticalAlignment="Center"
+                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TbId5}" />
-                    <TextBox
+					<TextBox
                         x:Name="txtId5"
                         Grid.Row="1"
                         Grid.Column="1"
                         Width="400"
-                        Classes="Margin4" />
-                    <Button
+                        Classes="Margin8" />
+					<Button
                         x:Name="btnGUID5"
                         Grid.Row="1"
                         Grid.Column="2"
                         Margin="4,0"
                         Content="{x:Static resx:ResUI.TbGUID}" />
 
-                    <TextBlock
+					<TextBlock
                         Grid.Row="2"
                         Grid.Column="0"
-                        Classes="Margin4"
                         VerticalAlignment="Center"
+                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TbFlow5}" />
-                    <ComboBox
+					<ComboBox
                         x:Name="cmbFlow5"
                         Grid.Row="2"
                         Grid.Column="1"
                         Width="200"
-                        Classes="Margin4" />
+                        Classes="Margin8" />
 
-                    <TextBlock
+					<TextBlock
                         Grid.Row="3"
                         Grid.Column="0"
-                        Classes="Margin4"
                         VerticalAlignment="Center"
+                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TbSecurity5}" />
-                    <TextBox
+					<TextBox
                         x:Name="txtSecurity5"
                         Grid.Row="3"
                         Grid.Column="1"
                         Width="200"
-                        Classes="Margin4"
-                        HorizontalAlignment="Left" />
-                </Grid>
-                <Grid
+                        HorizontalAlignment="Left"
+                        Classes="Margin8" />
+				</Grid>
+				<Grid
                     x:Name="gridTrojan"
                     Grid.Row="2"
                     IsVisible="False">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="180" />
-                        <ColumnDefinition Width="Auto" />
-                    </Grid.ColumnDefinitions>
+					<Grid.RowDefinitions>
+						<RowDefinition Height="Auto" />
+						<RowDefinition Height="Auto" />
+						<RowDefinition Height="Auto" />
+						<RowDefinition Height="Auto" />
+					</Grid.RowDefinitions>
+					<Grid.ColumnDefinitions>
+						<ColumnDefinition Width="180" />
+						<ColumnDefinition Width="Auto" />
+					</Grid.ColumnDefinitions>
 
-                    <TextBlock
+					<TextBlock
                         Grid.Row="1"
                         Grid.Column="0"
-                        Classes="Margin4"
                         VerticalAlignment="Center"
+                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TbId3}" />
-                    <TextBox
+					<TextBox
                         x:Name="txtId6"
                         Grid.Row="1"
                         Grid.Column="1"
                         Width="400"
-                        Classes="Margin4" />
+                        Classes="Margin8" />
 
-                    <TextBlock
+					<TextBlock
                         Grid.Row="2"
                         Grid.Column="0"
-                        Classes="Margin4"
                         VerticalAlignment="Center"
+                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TbFlow5}" />
-                    <ComboBox
+					<ComboBox
                         x:Name="cmbFlow6"
                         Grid.Row="2"
                         Grid.Column="1"
                         Width="200"
-                        Classes="Margin4" />
-                </Grid>
-                <Grid
+                        Classes="Margin8" />
+				</Grid>
+				<Grid
                     x:Name="gridHysteria2"
                     Grid.Row="2"
                     IsVisible="False">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="180" />
-                        <ColumnDefinition Width="Auto" />
-                    </Grid.ColumnDefinitions>
+					<Grid.RowDefinitions>
+						<RowDefinition Height="Auto" />
+						<RowDefinition Height="Auto" />
+						<RowDefinition Height="Auto" />
+						<RowDefinition Height="Auto" />
+					</Grid.RowDefinitions>
+					<Grid.ColumnDefinitions>
+						<ColumnDefinition Width="180" />
+						<ColumnDefinition Width="Auto" />
+					</Grid.ColumnDefinitions>
 
-                    <TextBlock
+					<TextBlock
                         Grid.Row="1"
                         Grid.Column="0"
-                        Classes="Margin4"
                         VerticalAlignment="Center"
+                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TbId3}" />
-                    <TextBox
+					<TextBox
                         x:Name="txtId7"
                         Grid.Row="1"
                         Grid.Column="1"
                         Width="400"
-                        Classes="Margin4" />
+                        Classes="Margin8" />
 
-                    <TextBlock
+					<TextBlock
                         Grid.Row="2"
                         Grid.Column="0"
-                        Classes="Margin4"
                         VerticalAlignment="Center"
+                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TbPath7}" />
-                    <TextBox
+					<TextBox
                         x:Name="txtPath7"
                         Grid.Row="2"
                         Grid.Column="1"
                         Width="400"
-                        Classes="Margin4" />
-                </Grid>
-                <Grid
+                        Classes="Margin8" />
+				</Grid>
+				<Grid
                     x:Name="gridTuic"
                     Grid.Row="2"
                     IsVisible="False">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="180" />
-                        <ColumnDefinition Width="Auto" />
-                    </Grid.ColumnDefinitions>
+					<Grid.RowDefinitions>
+						<RowDefinition Height="Auto" />
+						<RowDefinition Height="Auto" />
+						<RowDefinition Height="Auto" />
+						<RowDefinition Height="Auto" />
+					</Grid.RowDefinitions>
+					<Grid.ColumnDefinitions>
+						<ColumnDefinition Width="180" />
+						<ColumnDefinition Width="Auto" />
+					</Grid.ColumnDefinitions>
 
-                    <TextBlock
+					<TextBlock
                         Grid.Row="1"
                         Grid.Column="0"
-                        Classes="Margin4"
                         VerticalAlignment="Center"
+                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TbId}" />
-                    <TextBox
+					<TextBox
                         x:Name="txtId8"
                         Grid.Row="1"
                         Grid.Column="1"
                         Width="400"
-                        Classes="Margin4" />
+                        Classes="Margin8" />
 
-                    <TextBlock
+					<TextBlock
                         Grid.Row="2"
                         Grid.Column="0"
-                        Classes="Margin4"
                         VerticalAlignment="Center"
+                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TbId3}" />
-                    <TextBox
+					<TextBox
                         x:Name="txtSecurity8"
                         Grid.Row="2"
                         Grid.Column="1"
                         Width="400"
-                        Classes="Margin4" />
+                        Classes="Margin8" />
 
-                    <TextBlock
+					<TextBlock
                         Grid.Row="3"
                         Grid.Column="0"
-                        Classes="Margin4"
                         VerticalAlignment="Center"
+                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TbHeaderType8}" />
-                    <ComboBox
+					<ComboBox
                         x:Name="cmbHeaderType8"
                         Grid.Row="3"
                         Grid.Column="1"
                         Width="100"
-                        Classes="Margin4" />
-                </Grid>
-                <Grid
+                        Classes="Margin8" />
+				</Grid>
+				<Grid
                     x:Name="gridWireguard"
                     Grid.Row="2"
                     IsVisible="False">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="180" />
-                        <ColumnDefinition Width="Auto" />
-                    </Grid.ColumnDefinitions>
+					<Grid.RowDefinitions>
+						<RowDefinition Height="Auto" />
+						<RowDefinition Height="Auto" />
+						<RowDefinition Height="Auto" />
+						<RowDefinition Height="Auto" />
+						<RowDefinition Height="Auto" />
+						<RowDefinition Height="Auto" />
+					</Grid.RowDefinitions>
+					<Grid.ColumnDefinitions>
+						<ColumnDefinition Width="180" />
+						<ColumnDefinition Width="Auto" />
+					</Grid.ColumnDefinitions>
 
-                    <TextBlock
+					<TextBlock
                         Grid.Row="1"
                         Grid.Column="0"
-                        Classes="Margin4"
                         VerticalAlignment="Center"
+                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TbPrivateKey}" />
-                    <TextBox
+					<TextBox
                         x:Name="txtId9"
                         Grid.Row="1"
                         Grid.Column="1"
                         Width="400"
-                        Classes="Margin4" />
+                        Classes="Margin8" />
 
-                    <TextBlock
+					<TextBlock
                         Grid.Row="2"
                         Grid.Column="0"
-                        Classes="Margin4"
                         VerticalAlignment="Center"
+                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TbPublicKey}" />
-                    <TextBox
+					<TextBox
                         x:Name="txtPublicKey9"
                         Grid.Row="2"
                         Grid.Column="1"
                         Width="400"
-                        Classes="Margin4"
-                        HorizontalAlignment="Left" />
+                        HorizontalAlignment="Left"
+                        Classes="Margin8" />
 
-                    <TextBlock
+					<TextBlock
                         Grid.Row="3"
                         Grid.Column="0"
-                        Classes="Margin4"
                         VerticalAlignment="Center"
+                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TbReserved}" />
-                    <TextBox
+					<TextBox
                         x:Name="txtPath9"
                         Grid.Row="3"
                         Grid.Column="1"
                         Width="400"
-                        Classes="Margin4" />
+                        Classes="Margin8" />
 
-                    <TextBlock
+					<TextBlock
                         Grid.Row="4"
                         Grid.Column="0"
-                        Classes="Margin4"
                         VerticalAlignment="Center"
+                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TbLocalAddress}" />
-                    <TextBox
+					<TextBox
                         x:Name="txtRequestHost9"
                         Grid.Row="4"
                         Grid.Column="1"
                         Width="400"
-                        Classes="Margin4" />
+                        Classes="Margin8" />
 
-                    <TextBlock
+					<TextBlock
                         Grid.Row="5"
                         Grid.Column="0"
-                        Classes="Margin4"
                         VerticalAlignment="Center"
+                        Classes="Margin8"
                         Text="Mtu" />
-                    <TextBox
+					<TextBox
                         x:Name="txtShortId9"
                         Grid.Row="5"
                         Grid.Column="1"
                         Width="100"
-                        Classes="Margin4"
-                        HorizontalAlignment="Left" />
-                </Grid>
+                        HorizontalAlignment="Left"
+                        Classes="Margin8" />
+				</Grid>
 
-                <Separator
+				<Separator
                     x:Name="sepa2"
                     Grid.Row="3"
                     Margin="0,2" />
 
-                <Grid x:Name="gridTransport" Grid.Row="4">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="180" />
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="Auto" />
-                    </Grid.ColumnDefinitions>
+				<Grid x:Name="gridTransport" Grid.Row="4">
+					<Grid.RowDefinitions>
+						<RowDefinition Height="Auto" />
+						<RowDefinition Height="Auto" />
+						<RowDefinition Height="Auto" />
+						<RowDefinition Height="Auto" />
+						<RowDefinition Height="Auto" />
+						<RowDefinition Height="Auto" />
+						<RowDefinition Height="Auto" />
+						<RowDefinition Height="Auto" />
+					</Grid.RowDefinitions>
+					<Grid.ColumnDefinitions>
+						<ColumnDefinition Width="180" />
+						<ColumnDefinition Width="Auto" />
+						<ColumnDefinition Width="Auto" />
+					</Grid.ColumnDefinitions>
 
-                    <TextBlock
+					<TextBlock
                         Grid.Row="0"
                         Grid.ColumnSpan="2"
-                        Classes="Margin4"
+                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.GbTransport}" />
 
-                    <TextBlock
+					<TextBlock
                         Grid.Row="1"
                         Grid.Column="0"
-                        Classes="Margin4"
                         VerticalAlignment="Center"
+                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TbNetwork}" />
-                    <ComboBox
+					<ComboBox
                         x:Name="cmbNetwork"
                         Grid.Row="1"
                         Grid.Column="1"
                         Width="100"
-                        Classes="Margin4" />
-                    <TextBlock
+                        Classes="Margin8" />
+					<TextBlock
                         Grid.Row="1"
                         Grid.Column="2"
-                        Classes="Margin4"
                         VerticalAlignment="Center"
+                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TipNetwork}" />
 
-                    <TextBlock
+					<TextBlock
                         x:Name="labHeaderType"
                         Grid.Row="2"
                         Grid.Column="0"
-                        Classes="Margin4"
                         VerticalAlignment="Center"
+                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TbHeaderType}" />
-                    <ComboBox
+					<ComboBox
                         x:Name="cmbHeaderType"
                         Grid.Row="2"
                         Grid.Column="1"
                         Width="100"
-                        Classes="Margin4" />
-                    <TextBlock
+                        Classes="Margin8" />
+					<TextBlock
                         x:Name="tipHeaderType"
                         Grid.Row="2"
                         Grid.Column="2"
-                        Classes="Margin4"
                         VerticalAlignment="Center"
+                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TbHeaderType}" />
 
-                    <TextBlock
+					<TextBlock
                         Grid.Row="3"
                         Grid.Column="0"
-                        Classes="Margin4"
                         VerticalAlignment="Center"
+                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TbRequestHost}" />
-                    <TextBox
+					<TextBox
                         x:Name="txtRequestHost"
                         Grid.Row="3"
                         Grid.Column="1"
                         Width="400"
-                        Classes="Margin4" />
-                    <TextBlock
+                        Classes="Margin8" />
+					<TextBlock
                         x:Name="tipRequestHost"
                         Grid.Row="3"
                         Grid.Column="2"
-                        Classes="Margin4"
                         VerticalAlignment="Center"
+                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TbRequestHost}" />
 
-                    <TextBlock
+					<TextBlock
                         Grid.Row="4"
                         Grid.Column="0"
-                        Classes="Margin4"
                         VerticalAlignment="Center"
+                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TbPath}" />
-                    <TextBox
+					<TextBox
                         x:Name="txtPath"
                         Grid.Row="4"
                         Grid.Column="1"
                         Width="400"
-                        Classes="Margin4" />
-                    <TextBlock
+                        Classes="Margin8" />
+					<TextBlock
                         x:Name="tipPath"
                         Grid.Row="4"
                         Grid.Column="2"
-                        Classes="Margin4"
                         VerticalAlignment="Center"
+                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TbPath}" />
-                </Grid>
+				</Grid>
 
-                <Separator Grid.Row="5" Margin="0,2" />
+				<Separator Grid.Row="5" Margin="0,2" />
 
-                <Grid x:Name="gridTls" Grid.Row="6">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="180" />
-                        <ColumnDefinition Width="Auto" />
-                    </Grid.ColumnDefinitions>
+				<Grid x:Name="gridTls" Grid.Row="6">
+					<Grid.RowDefinitions>
+						<RowDefinition Height="Auto" />
+						<RowDefinition Height="Auto" />
+						<RowDefinition Height="Auto" />
+						<RowDefinition Height="Auto" />
+						<RowDefinition Height="Auto" />
+					</Grid.RowDefinitions>
+					<Grid.ColumnDefinitions>
+						<ColumnDefinition Width="180" />
+						<ColumnDefinition Width="Auto" />
+					</Grid.ColumnDefinitions>
 
-                    <TextBlock
+					<TextBlock
                         Grid.Row="0"
                         Grid.Column="0"
-                        Classes="Margin4"
                         VerticalAlignment="Center"
+                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TbStreamSecurity}" />
-                    <ComboBox
+					<ComboBox
                         x:Name="cmbStreamSecurity"
                         Grid.Row="0"
                         Grid.Column="1"
                         Width="100"
-                        Classes="Margin4" />
-                </Grid>
-                <Grid
+                        Classes="Margin8" />
+				</Grid>
+				<Grid
                     x:Name="gridTlsMore"
                     Grid.Row="7"
                     IsVisible="False">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="180" />
-                        <ColumnDefinition Width="Auto" />
-                    </Grid.ColumnDefinitions>
+					<Grid.RowDefinitions>
+						<RowDefinition Height="Auto" />
+						<RowDefinition Height="Auto" />
+						<RowDefinition Height="Auto" />
+						<RowDefinition Height="Auto" />
+						<RowDefinition Height="Auto" />
+					</Grid.RowDefinitions>
+					<Grid.ColumnDefinitions>
+						<ColumnDefinition Width="180" />
+						<ColumnDefinition Width="Auto" />
+					</Grid.ColumnDefinitions>
 
-                    <TextBlock
+					<TextBlock
                         Grid.Row="1"
                         Grid.Column="0"
-                        Classes="Margin4"
                         VerticalAlignment="Center"
+                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TbSNI}" />
-                    <TextBox
+					<TextBox
                         x:Name="txtSNI"
                         Grid.Row="1"
                         Grid.Column="1"
                         Width="400"
-                        Classes="Margin4"
-                        HorizontalAlignment="Left" />
+                        HorizontalAlignment="Left"
+                        Classes="Margin8" />
 
-                    <TextBlock
+					<TextBlock
                         Grid.Row="2"
                         Grid.Column="0"
-                        Classes="Margin4"
                         VerticalAlignment="Center"
+                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TbFingerprint}" />
-                    <ComboBox
+					<ComboBox
                         x:Name="cmbFingerprint"
                         Grid.Row="2"
                         Grid.Column="1"
                         Width="200"
-                        Classes="Margin4" />
+                        Classes="Margin8" />
 
-                    <TextBlock
+					<TextBlock
                         Grid.Row="3"
                         Grid.Column="0"
-                        Classes="Margin4"
                         VerticalAlignment="Center"
+                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TbAlpn}" />
-                    <ComboBox
+					<ComboBox
                         x:Name="cmbAlpn"
                         Grid.Row="3"
                         Grid.Column="1"
                         Width="200"
-                        Classes="Margin4" />
+                        Classes="Margin8" />
 
-                    <TextBlock
+					<TextBlock
                         Grid.Row="4"
                         Grid.Column="0"
-                        Classes="Margin4"
                         VerticalAlignment="Center"
+                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TbAllowInsecure}" />
-                    <ComboBox
+					<ComboBox
                         x:Name="cmbAllowInsecure"
                         Grid.Row="4"
                         Grid.Column="1"
                         Width="100"
-                        Classes="Margin4" />
-                </Grid>
-                <Grid
+                        Classes="Margin8" />
+				</Grid>
+				<Grid
                     x:Name="gridRealityMore"
                     Grid.Row="7"
                     IsVisible="False">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="180" />
-                        <ColumnDefinition Width="Auto" />
-                    </Grid.ColumnDefinitions>
+					<Grid.RowDefinitions>
+						<RowDefinition Height="Auto" />
+						<RowDefinition Height="Auto" />
+						<RowDefinition Height="Auto" />
+						<RowDefinition Height="Auto" />
+						<RowDefinition Height="Auto" />
+					</Grid.RowDefinitions>
+					<Grid.ColumnDefinitions>
+						<ColumnDefinition Width="180" />
+						<ColumnDefinition Width="Auto" />
+					</Grid.ColumnDefinitions>
 
-                    <TextBlock
+					<TextBlock
                         Grid.Row="0"
                         Grid.Column="0"
-                        Classes="Margin4"
                         VerticalAlignment="Center"
+                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TbSNI}" />
-                    <TextBox
+					<TextBox
                         x:Name="txtSNI2"
                         Grid.Row="0"
                         Grid.Column="1"
                         Width="400"
-                        Classes="Margin4"
-                        HorizontalAlignment="Left" />
+                        HorizontalAlignment="Left"
+                        Classes="Margin8" />
 
-                    <TextBlock
+					<TextBlock
                         Grid.Row="1"
                         Grid.Column="0"
-                        Classes="Margin4"
                         VerticalAlignment="Center"
+                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TbFingerprint}" />
-                    <ComboBox
+					<ComboBox
                         x:Name="cmbFingerprint2"
                         Grid.Row="1"
                         Grid.Column="1"
                         Width="200"
-                        Classes="Margin4" />
+                        Classes="Margin8" />
 
-                    <TextBlock
+					<TextBlock
                         Grid.Row="2"
                         Grid.Column="0"
-                        Classes="Margin4"
                         VerticalAlignment="Center"
+                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TbPublicKey}" />
-                    <TextBox
+					<TextBox
                         x:Name="txtPublicKey"
                         Grid.Row="2"
                         Grid.Column="1"
                         Width="400"
-                        Classes="Margin4"
-                        HorizontalAlignment="Left" />
+                        HorizontalAlignment="Left"
+                        Classes="Margin8" />
 
-                    <TextBlock
+					<TextBlock
                         Grid.Row="3"
                         Grid.Column="0"
-                        Classes="Margin4"
                         VerticalAlignment="Center"
+                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TbShortId}" />
-                    <TextBox
+					<TextBox
                         x:Name="txtShortId"
                         Grid.Row="3"
                         Grid.Column="1"
                         Width="200"
-                        Classes="Margin4"
-                        HorizontalAlignment="Left" />
+                        HorizontalAlignment="Left"
+                        Classes="Margin8" />
 
-                    <TextBlock
+					<TextBlock
                         Grid.Row="4"
                         Grid.Column="0"
-                        Classes="Margin4"
                         VerticalAlignment="Center"
+                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TbSpiderX}" />
-                    <TextBox
+					<TextBox
                         x:Name="txtSpiderX"
                         Grid.Row="4"
                         Grid.Column="1"
                         Width="400"
-                        Classes="Margin4"
-                        HorizontalAlignment="Left" />
-                </Grid>
-                <Separator Grid.Row="8" Margin="0,2" />
-            </Grid>
-        </ScrollViewer>
-    </DockPanel>
+                        HorizontalAlignment="Left"
+                        Classes="Margin8" />
+				</Grid>
+				<Separator Grid.Row="8" Margin="0,2" />
+			</Grid>
+		</ScrollViewer>
+	</DockPanel>
 </Window>
\ No newline at end of file
diff --git a/v2rayN/v2rayN.Desktop/Views/DNSSettingWindow.axaml b/v2rayN/v2rayN.Desktop/Views/DNSSettingWindow.axaml
index dda0ad4e..846b16a3 100644
--- a/v2rayN/v2rayN.Desktop/Views/DNSSettingWindow.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/DNSSettingWindow.axaml
@@ -16,7 +16,7 @@
     <DockPanel Classes="Margin8">
         <StackPanel
             HorizontalAlignment="Center"
-            Classes="Margin4"
+            Classes="Margin8"
             DockPanel.Dock="Bottom"
             Orientation="Horizontal">
             <Button
@@ -95,7 +95,7 @@
                         BorderThickness="1"
                         Classes="TextArea Margin8"
                         TextWrapping="Wrap"
-                        ToolTip.Tip="Http/Socks" />
+                        Watermark="Http/Socks" />
                 </DockPanel>
             </TabItem>
 
@@ -153,7 +153,7 @@
                             BorderThickness="1"
                             Classes="TextArea Margin8"
                             TextWrapping="Wrap"
-                            ToolTip.Tip="Http/Socks" />
+                            Watermark="Http/Socks" />
 
                         <GridSplitter Grid.Column="1" HorizontalAlignment="Stretch" />
 
@@ -165,7 +165,7 @@
                             BorderThickness="1"
                             Classes="TextArea Margin8"
                             TextWrapping="Wrap"
-                            ToolTip.Tip="{x:Static resx:ResUI.TbSettingsTunMode}" />
+                            Watermark="{x:Static resx:ResUI.TbSettingsTunMode}" />
                     </Grid>
                 </DockPanel>
             </TabItem>
diff --git a/v2rayN/v2rayN.Desktop/Views/GlobalHotkeySettingWindow.axaml b/v2rayN/v2rayN.Desktop/Views/GlobalHotkeySettingWindow.axaml
index 73fbc239..743c9c62 100644
--- a/v2rayN/v2rayN.Desktop/Views/GlobalHotkeySettingWindow.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/GlobalHotkeySettingWindow.axaml
@@ -15,7 +15,7 @@
     mc:Ignorable="d">
     <DockPanel Classes="Margin8">
         <StackPanel
-            Classes="Margin4"
+            Classes="Margin8"
             HorizontalAlignment="Center"
             DockPanel.Dock="Bottom"
             Orientation="Horizontal">
@@ -60,13 +60,13 @@
                     <TextBlock
                         Grid.Row="0"
                         Grid.Column="0"
-                        Classes="Margin4"
+                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TbGlobalHotkeySetting}" />
 
                     <TextBlock
                         Grid.Row="1"
                         Grid.Column="0"
-                        Classes="Margin4"
+                        Classes="Margin8"
                         VerticalAlignment="Center"
                         Text="{x:Static resx:ResUI.TbDisplayGUI}" />
 
@@ -74,68 +74,68 @@
                         x:Name="txtGlobalHotkey0"
                         Grid.Row="1"
                         Grid.Column="1"
-                        Classes="Margin4"
+                        Classes="Margin8"
                         VerticalAlignment="Center"
                         IsReadOnly="True" />
 
                     <TextBlock
                         Grid.Row="2"
                         Grid.Column="0"
-                        Classes="Margin4"
+                        Classes="Margin8"
                         VerticalAlignment="Center"
                         Text="{x:Static resx:ResUI.TbClearSystemProxy}" />
                     <TextBox
                         x:Name="txtGlobalHotkey1"
                         Grid.Row="2"
                         Grid.Column="1"
-                        Classes="Margin4"
+                        Classes="Margin8"
                         VerticalAlignment="Center"
                         IsReadOnly="True" />
 
                     <TextBlock
                         Grid.Row="3"
                         Grid.Column="0"
-                        Classes="Margin4"
+                        Classes="Margin8"
                         VerticalAlignment="Center"
                         Text="{x:Static resx:ResUI.TbSetSystemProxy}" />
                     <TextBox
                         x:Name="txtGlobalHotkey2"
                         Grid.Row="3"
                         Grid.Column="1"
-                        Classes="Margin4"
+                        Classes="Margin8"
                         VerticalAlignment="Center"
                         IsReadOnly="True" />
                     <TextBlock
                         Grid.Row="4"
                         Grid.Column="0"
-                        Classes="Margin4"
+                        Classes="Margin8"
                         VerticalAlignment="Center"
                         Text="{x:Static resx:ResUI.TbNotChangeSystemProxy}" />
                     <TextBox
                         x:Name="txtGlobalHotkey3"
                         Grid.Row="4"
                         Grid.Column="1"
-                        Classes="Margin4"
+                        Classes="Margin8"
                         VerticalAlignment="Center"
                         IsReadOnly="True" />
                     <TextBlock
                         Grid.Row="5"
                         Grid.Column="0"
-                        Classes="Margin4"
+                        Classes="Margin8"
                         VerticalAlignment="Center"
                         Text="{x:Static resx:ResUI.TbSystemProxyPac}" />
                     <TextBox
                         x:Name="txtGlobalHotkey4"
                         Grid.Row="5"
                         Grid.Column="1"
-                        Classes="Margin4"
+                        Classes="Margin8"
                         VerticalAlignment="Center"
                         IsReadOnly="True" />
                 </Grid>
 
                 <TextBlock
                     Grid.Row="1"
-                    Classes="Margin4"
+                    Classes="Margin8"
                     VerticalAlignment="Center"
                     Text="{x:Static resx:ResUI.TbGlobalHotkeySettingTip}" />
             </Grid>
diff --git a/v2rayN/v2rayN.Desktop/Views/MainWindow.axaml b/v2rayN/v2rayN.Desktop/Views/MainWindow.axaml
index 67aa020b..76eb5766 100644
--- a/v2rayN/v2rayN.Desktop/Views/MainWindow.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/MainWindow.axaml
@@ -148,7 +148,8 @@
                     <ToggleSwitch
                         x:Name="togEnableTun"
                         HorizontalAlignment="Left"
-                        Classes="Margin4" />
+                        Classes="Margin4"
+                        Theme="{StaticResource SimpleToggleSwitch}" />
                 </StackPanel>
 
                 <StackPanel
diff --git a/v2rayN/v2rayN.Desktop/Views/MsgView.axaml b/v2rayN/v2rayN.Desktop/Views/MsgView.axaml
index 7d50fc3b..2418015b 100644
--- a/v2rayN/v2rayN.Desktop/Views/MsgView.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/MsgView.axaml
@@ -20,7 +20,7 @@
                 Width="200"
                 Margin="8,0"
                 VerticalContentAlignment="Center"
-                ToolTip.Tip="{x:Static resx:ResUI.MsgFilterTitle}" />
+                Watermark="{x:Static resx:ResUI.MsgFilterTitle}" />
 
             <Button
                 x:Name="btnCopy"
@@ -62,7 +62,8 @@
                 x:Name="togAutoRefresh"
                 Margin="8,0"
                 HorizontalAlignment="Left"
-                IsChecked="True" />
+                IsChecked="True"
+                Theme="{StaticResource SimpleToggleSwitch}" />
             <TextBlock
                 Margin="8,0"
                 VerticalAlignment="Center"
@@ -71,7 +72,8 @@
                 x:Name="togScrollToEnd"
                 Margin="8,0"
                 HorizontalAlignment="Left"
-                IsChecked="True" />
+                IsChecked="True"
+                Theme="{StaticResource SimpleToggleSwitch}" />
         </WrapPanel>
         <TextBox
             Name="txtMsg"
diff --git a/v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml b/v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml
index 931c85a7..ed33f9fc 100644
--- a/v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml
@@ -309,12 +309,12 @@
                                 x:Name="txtUpMbps"
                                 Width="90"
                                 Classes="Margin8"
-                                ToolTip.Tip="Up" />
+                                Watermark="Up" />
                             <TextBox
                                 x:Name="txtDownMbps"
                                 Width="90"
                                 Classes="Margin8"
-                                ToolTip.Tip="Down" />
+                                Watermark="Down" />
                         </StackPanel>
 
                         <TextBlock
diff --git a/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml b/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml
index a37eb6e2..6592642c 100644
--- a/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml
@@ -75,7 +75,7 @@
                     Width="200"
                     Margin="4,0"
                     VerticalContentAlignment="Center"
-                    ToolTip.Tip="{x:Static resx:ResUI.MsgServerTitle}" />
+                    Watermark="{x:Static resx:ResUI.MsgServerTitle}" />
             </WrapPanel>
             <DataGrid
                 x:Name="lstProfiles"
diff --git a/v2rayN/v2rayN.Desktop/Views/RoutingRuleDetailsWindow.axaml b/v2rayN/v2rayN.Desktop/Views/RoutingRuleDetailsWindow.axaml
index aea97b7c..2c421708 100644
--- a/v2rayN/v2rayN.Desktop/Views/RoutingRuleDetailsWindow.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/RoutingRuleDetailsWindow.axaml
@@ -32,27 +32,27 @@
                 Grid.Row="0"
                 Grid.Column="0"
                 VerticalAlignment="Center"
-                Classes="Margin4"
+                Classes="Margin8"
                 Text="outboundTag" />
             <ComboBox
                 x:Name="cmbOutboundTag"
                 Grid.Row="0"
                 Grid.Column="1"
                 Width="200"
-                Classes="Margin4"
+                Classes="Margin8"
                 MaxDropDownHeight="1000" />
             <TextBlock
                 Grid.Row="0"
                 Grid.Column="2"
                 HorizontalAlignment="Left"
-                Classes="Margin4"
+                Classes="Margin8"
                 Text="{x:Static resx:ResUI.TbRuleMatchingTips}" />
 
             <TextBlock
                 Grid.Row="1"
                 Grid.Column="0"
                 VerticalAlignment="Center"
-                Classes="Margin4"
+                Classes="Margin8"
                 Text="port" />
             <TextBox
                 x:Name="txtPort"
@@ -60,12 +60,12 @@
                 Grid.Column="1"
                 Width="200"
                 HorizontalAlignment="Left"
-                Classes="Margin4" />
+                Classes="Margin8" />
             <TextBlock
                 Grid.Row="1"
                 Grid.Column="2"
                 VerticalAlignment="Center"
-                Classes="Margin4">
+                Classes="Margin8">
                 <Button Click="linkRuleobjectDoc_Click">
                     <TextBlock Text="{x:Static resx:ResUI.TbRuleobjectDoc}" />
                 </Button>
@@ -75,14 +75,14 @@
                 Grid.Row="2"
                 Grid.Column="0"
                 VerticalAlignment="Center"
-                Classes="Margin4"
+                Classes="Margin8"
                 Text="protocol" />
             <ListBox
                 x:Name="clbProtocol"
                 Grid.Row="2"
                 Grid.Column="1"
                 HorizontalAlignment="Left"
-                Classes="Margin4"
+                Classes="Margin8"
                 SelectionMode="Multiple"
                 Theme="{DynamicResource PureCardRadioGroupListBox}" />
 
@@ -90,13 +90,13 @@
                 Grid.Row="3"
                 Grid.Column="0"
                 VerticalAlignment="Center"
-                Classes="Margin4"
+                Classes="Margin8"
                 Text="inboundTag" />
             <ListBox
                 x:Name="clbInboundTag"
                 Grid.Row="3"
                 Grid.Column="1"
-                Classes="Margin4"
+                Classes="Margin8"
                 SelectionMode="Multiple"
                 Theme="{DynamicResource PureCardRadioGroupListBox}" />
 
@@ -104,34 +104,34 @@
                 Grid.Row="4"
                 Grid.Column="0"
                 VerticalAlignment="Center"
-                Classes="Margin4"
+                Classes="Margin8"
                 Text="network" />
             <ComboBox
                 x:Name="cmbNetwork"
                 Grid.Row="4"
                 Grid.Column="1"
                 Width="200"
-                Classes="Margin4"
+                Classes="Margin8"
                 MaxDropDownHeight="1000" />
 
             <TextBlock
                 Grid.Row="5"
                 Grid.Column="0"
                 VerticalAlignment="Center"
-                Classes="Margin4"
+                Classes="Margin8"
                 Text="enabled" />
             <ToggleSwitch
                 x:Name="togEnabled"
                 Grid.Row="5"
                 Grid.Column="1"
                 HorizontalAlignment="Left"
-                Classes="Margin4" />
+                Classes="Margin8" />
 
             <TextBlock
                 Grid.Row="5"
                 Grid.Column="2"
                 HorizontalAlignment="Left"
-                Classes="Margin4"
+                Classes="Margin8"
                 Text="{x:Static resx:ResUI.TbRoutingTips}" />
         </Grid>
 
diff --git a/v2rayN/v2rayN.Desktop/Views/RoutingRuleSettingWindow.axaml b/v2rayN/v2rayN.Desktop/Views/RoutingRuleSettingWindow.axaml
index 27a76c06..0f56a2a0 100644
--- a/v2rayN/v2rayN.Desktop/Views/RoutingRuleSettingWindow.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/RoutingRuleSettingWindow.axaml
@@ -62,7 +62,7 @@
                 Grid.Row="0"
                 Grid.Column="0"
                 VerticalAlignment="Center"
-                Classes="Margin4"
+                Classes="Margin8"
                 Text="{x:Static resx:ResUI.LvRemarks}" />
             <StackPanel
                 Grid.Row="0"
@@ -76,25 +76,25 @@
                     Width="300"
                     HorizontalAlignment="Left"
                     VerticalAlignment="Center"
-                    Classes="Margin4"
+                    Classes="Margin8"
                     TextWrapping="Wrap" />
 
                 <TextBlock
                     VerticalAlignment="Center"
-                    Classes="Margin4"
+                    Classes="Margin8"
                     Text="{x:Static resx:ResUI.LvSort}" />
                 <TextBox
                     x:Name="txtSort"
                     Width="100"
                     HorizontalAlignment="Left"
-                    Classes="Margin4" />
+                    Classes="Margin8" />
             </StackPanel>
 
             <TextBlock
                 Grid.Row="1"
                 Grid.Column="0"
                 VerticalAlignment="Center"
-                Classes="Margin4"
+                Classes="Margin8"
                 Text="{x:Static resx:ResUI.TbdomainStrategy}" />
             <StackPanel
                 Grid.Row="1"
@@ -103,22 +103,22 @@
                 <ComboBox
                     x:Name="cmbdomainStrategy"
                     Width="200"
-                    Classes="Margin4" />
+                    Classes="Margin8" />
                 <TextBlock
                     VerticalAlignment="Center"
-                    Classes="Margin4"
+                    Classes="Margin8"
                     Text="{x:Static resx:ResUI.TbdomainStrategy4Singbox}" />
                 <ComboBox
                     x:Name="cmbdomainStrategy4Singbox"
                     Width="200"
-                    Classes="Margin4" />
+                    Classes="Margin8" />
             </StackPanel>
 
             <TextBlock
                 Grid.Row="2"
                 Grid.Column="0"
                 VerticalAlignment="Center"
-                Classes="Margin4"
+                Classes="Margin8"
                 Text="{x:Static resx:ResUI.LvUrl}" />
             <TextBox
                 x:Name="txtUrl"
@@ -127,14 +127,14 @@
                 Width="600"
                 HorizontalAlignment="Left"
                 VerticalAlignment="Center"
-                Classes="Margin4"
+                Classes="Margin8"
                 TextWrapping="Wrap" />
 
             <TextBlock
                 Grid.Row="3"
                 Grid.Column="0"
                 VerticalAlignment="Center"
-                Classes="Margin4"
+                Classes="Margin8"
                 Text="{x:Static resx:ResUI.LvCustomIcon}" />
             <TextBox
                 x:Name="txtCustomIcon"
@@ -143,20 +143,20 @@
                 Width="600"
                 HorizontalAlignment="Left"
                 VerticalAlignment="Center"
-                Classes="Margin4"
+                Classes="Margin8"
                 TextWrapping="Wrap" />
             <Button
                 x:Name="btnBrowseCustomIcon"
                 Grid.Row="3"
                 Grid.Column="2"
-                Classes="Margin4"
+                Classes="Margin8"
                 Content="{x:Static resx:ResUI.TbBrowse}" />
 
             <TextBlock
                 Grid.Row="4"
                 Grid.Column="0"
                 VerticalAlignment="Center"
-                Classes="Margin4">
+                Classes="Margin8">
                 <Button Click="linkCustomRulesetPath4Singbox">
                     <TextBlock Text="{x:Static resx:ResUI.LvCustomRulesetPath4Singbox}" />
                 </Button>
@@ -168,13 +168,13 @@
                 Width="600"
                 HorizontalAlignment="Left"
                 VerticalAlignment="Center"
-                Classes="Margin4"
+                Classes="Margin8"
                 TextWrapping="Wrap" />
             <Button
                 x:Name="btnBrowseCustomRulesetPath4Singbox"
                 Grid.Row="4"
                 Grid.Column="2"
-                Classes="Margin4"
+                Classes="Margin8"
                 Content="{x:Static resx:ResUI.TbBrowse}" />
         </Grid>
 
diff --git a/v2rayN/v2rayN.Desktop/Views/SubEditWindow.axaml b/v2rayN/v2rayN.Desktop/Views/SubEditWindow.axaml
index a8a05b1b..bd1f91f3 100644
--- a/v2rayN/v2rayN.Desktop/Views/SubEditWindow.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/SubEditWindow.axaml
@@ -17,7 +17,7 @@
     <DockPanel Classes="Margin8">
         <StackPanel
             HorizontalAlignment="Center"
-            Classes="Margin4"
+            Classes="Margin8"
             DockPanel.Dock="Bottom"
             Orientation="Horizontal">
             <Button
@@ -60,14 +60,14 @@
                 <TextBlock
                     Grid.Row="0"
                     Grid.Column="0"
-                    Classes="Margin4"
+                    Classes="Margin8"
                     Text="{x:Static resx:ResUI.menuSubscription}" />
 
                 <TextBlock
                     Grid.Row="1"
                     Grid.Column="0"
                     VerticalAlignment="Center"
-                    Classes="Margin4"
+                    Classes="Margin8"
                     Text="{x:Static resx:ResUI.LvRemarks}" />
 
                 <TextBox
@@ -75,53 +75,53 @@
                     Grid.Row="1"
                     Grid.Column="1"
                     VerticalAlignment="Center"
-                    Classes="Margin4"
+                    Classes="Margin8"
                     TextWrapping="Wrap" />
 
                 <TextBlock
                     Grid.Row="2"
                     Grid.Column="0"
                     VerticalAlignment="Center"
-                    Classes="Margin4"
+                    Classes="Margin8"
                     Text="{x:Static resx:ResUI.LvUrl}" />
                 <TextBox
                     x:Name="txtUrl"
                     Grid.Row="2"
                     Grid.Column="1"
                     VerticalAlignment="Center"
-                    Classes="Margin4"
+                    Classes="Margin8"
                     TextWrapping="Wrap"
-                    ToolTip.Tip="{x:Static resx:ResUI.SubUrlTips}" />
+                    Watermark="{x:Static resx:ResUI.SubUrlTips}" />
 
                 <TextBlock
                     Grid.Row="3"
                     Grid.Column="0"
                     VerticalAlignment="Center"
-                    Classes="Margin4"
+                    Classes="Margin8"
                     Text="{x:Static resx:ResUI.LvEnabled}" />
 
                 <DockPanel
                     Grid.Row="3"
                     Grid.Column="1"
-                    Classes="Margin4">
+                    Classes="Margin8">
                     <ToggleSwitch
                         x:Name="togEnable"
                         HorizontalAlignment="Center"
-                        Classes="Margin4"
+                        Classes="Margin8"
                         DockPanel.Dock="Left" />
 
                     <TextBox
                         x:Name="txtAutoUpdateInterval"
                         Width="200"
                         VerticalAlignment="Center"
-                        Classes="Margin4"
+                        Classes="Margin8"
                         DockPanel.Dock="Right"
-                        ToolTip.Tip="{x:Static resx:ResUI.SubUrlTips}" />
+                        Watermark="{x:Static resx:ResUI.SubUrlTips}" />
 
                     <TextBlock
                         HorizontalAlignment="Center"
                         VerticalAlignment="Center"
-                        Classes="Margin4"
+                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.LvAutoUpdateInterval}" />
                 </DockPanel>
 
@@ -129,21 +129,21 @@
                     Grid.Row="5"
                     Grid.Column="0"
                     VerticalAlignment="Center"
-                    Classes="Margin4"
+                    Classes="Margin8"
                     Text="{x:Static resx:ResUI.LvFilter}" />
                 <TextBox
                     x:Name="txtFilter"
                     Grid.Row="5"
                     Grid.Column="1"
                     VerticalAlignment="Center"
-                    Classes="Margin4"
-                    ToolTip.Tip="{x:Static resx:ResUI.SubUrlTips}" />
+                    Classes="Margin8"
+                    Watermark="{x:Static resx:ResUI.SubUrlTips}" />
 
                 <TextBlock
                     Grid.Row="6"
                     Grid.Column="0"
                     VerticalAlignment="Center"
-                    Classes="Margin4"
+                    Classes="Margin8"
                     Text="{x:Static resx:ResUI.LvConvertTarget}" />
                 <ComboBox
                     x:Name="cmbConvertTarget"
@@ -151,29 +151,29 @@
                     Grid.Column="1"
                     Width="200"
                     VerticalAlignment=" "
-                    Classes="Margin4"
+                    Classes="Margin8"
                     ToolTip.Tip="{x:Static resx:ResUI.LvConvertTargetTip}" />
 
                 <TextBlock
                     Grid.Row="7"
                     Grid.Column="0"
                     VerticalAlignment="Center"
-                    Classes="Margin4"
+                    Classes="Margin8"
                     Text="{x:Static resx:ResUI.LvUserAgent}" />
                 <TextBox
                     x:Name="txtUserAgent"
                     Grid.Row="7"
                     Grid.Column="1"
                     VerticalAlignment="Center"
-                    Classes="Margin4"
+                    Classes="Margin8"
                     TextWrapping="Wrap"
-                    ToolTip.Tip="{x:Static resx:ResUI.SubUrlTips}" />
+                    Watermark="{x:Static resx:ResUI.SubUrlTips}" />
 
                 <TextBlock
                     Grid.Row="8"
                     Grid.Column="0"
                     VerticalAlignment="Center"
-                    Classes="Margin4"
+                    Classes="Margin8"
                     Text="{x:Static resx:ResUI.LvSort}" />
                 <TextBox
                     x:Name="txtSort"
@@ -181,42 +181,42 @@
                     Grid.Column="1"
                     Width="100"
                     HorizontalAlignment="Left"
-                    Classes="Margin4" />
+                    Classes="Margin8" />
 
                 <TextBlock
                     Grid.Row="9"
                     Grid.Column="0"
                     VerticalAlignment="Center"
-                    Classes="Margin4"
+                    Classes="Margin8"
                     Text="{x:Static resx:ResUI.LvPrevProfile}" />
                 <TextBox
                     x:Name="txtPrevProfile"
                     Grid.Row="9"
                     Grid.Column="1"
                     VerticalAlignment="Center"
-                    Classes="Margin4"
-                    ToolTip.Tip="{x:Static resx:ResUI.LvPrevProfileTip}" />
+                    Classes="Margin8"
+                    Watermark="{x:Static resx:ResUI.LvPrevProfileTip}" />
 
                 <TextBlock
                     Grid.Row="10"
                     Grid.Column="0"
                     VerticalAlignment="Center"
-                    Classes="Margin4"
+                    Classes="Margin8"
                     Text="{x:Static resx:ResUI.LvNextProfile}" />
                 <TextBox
                     x:Name="txtNextProfile"
                     Grid.Row="10"
                     Grid.Column="1"
                     VerticalAlignment="Center"
-                    Classes="Margin4"
-                    ToolTip.Tip="{x:Static resx:ResUI.LvPrevProfileTip}" />
+                    Classes="Margin8"
+                    Watermark="{x:Static resx:ResUI.LvPrevProfileTip}" />
 
                 <TextBlock
                     Grid.Row="11"
                     Grid.Column="0"
                     Margin="4"
                     VerticalAlignment="Center"
-                    Classes="Margin4"
+                    Classes="Margin8"
                     Text="{x:Static resx:ResUI.TbPreSocksPort4Sub}" />
                 <TextBox
                     x:Name="txtPreSocksPort"
@@ -225,15 +225,16 @@
                     Width="200"
                     Margin="4"
                     HorizontalAlignment="Left"
-                    Classes="Margin4"
-                    ToolTip.Tip="{x:Static resx:ResUI.TipPreSocksPort}" />
+                    Classes="Margin8"
+                    ToolTip.Tip="{x:Static resx:ResUI.TipPreSocksPort}"
+                    Watermark="{x:Static resx:ResUI.TipPreSocksPort}" />
 
                 <TextBlock
                     Grid.Row="12"
                     Grid.Column="0"
                     Grid.ColumnSpan="2"
                     VerticalAlignment="Center"
-                    Classes="Margin4"
+                    Classes="Margin8"
                     Text="{x:Static resx:ResUI.LvMoreUrl}" />
                 <TextBox
                     x:Name="txtMoreUrl"
@@ -245,7 +246,7 @@
                     Classes="TextArea Margin4"
                     MinLines="4"
                     TextWrapping="Wrap"
-                    ToolTip.Tip="{x:Static resx:ResUI.SubUrlTips}" />
+                    Watermark="{x:Static resx:ResUI.SubUrlTips}" />
             </Grid>
         </ScrollViewer>
     </DockPanel>