From 1edcc859945bdd85e498911c57695e38e6d612ac Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Mon, 6 Dec 2021 13:03:29 +0900
Subject: [PATCH] Adjust Window Layout and Color Add Select Button Fix Setting
 Item

---
 Flow.Launcher/SelectBrowserWindow.xaml | 431 ++++++++++++++-----------
 Flow.Launcher/SettingWindow.xaml       | 137 ++++----
 2 files changed, 322 insertions(+), 246 deletions(-)

diff --git a/Flow.Launcher/SelectBrowserWindow.xaml b/Flow.Launcher/SelectBrowserWindow.xaml
index e8855f942..a402ddb23 100644
--- a/Flow.Launcher/SelectBrowserWindow.xaml
+++ b/Flow.Launcher/SelectBrowserWindow.xaml
@@ -7,203 +7,266 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:ui="http://schemas.modernwpf.com/2019"
     Title="{DynamicResource defaultBrowserTitle}"
-    Background="#f3f3f3"
+    Width="550"
+    Background="{DynamicResource PopuBGColor}"
     DataContext="{Binding RelativeSource={RelativeSource Self}}"
+    Foreground="{DynamicResource PopupTextColor}"
     ResizeMode="NoResize"
-    SizeToContent="WidthAndHeight"
+    SizeToContent="Height"
     WindowStartupLocation="CenterScreen"
     mc:Ignorable="d">
-    <Grid Width="530">
+    <WindowChrome.WindowChrome>
+        <WindowChrome CaptionHeight="32" ResizeBorderThickness="{x:Static SystemParameters.WindowResizeBorderThickness}" />
+    </WindowChrome.WindowChrome>
+    <Grid>
         <Grid.RowDefinitions>
             <RowDefinition />
             <RowDefinition Height="80" />
         </Grid.RowDefinitions>
-        <Border
-            Padding="26,26,26,0"
-            Background="#ffffff"
-            BorderBrush="#e5e5e5"
-            BorderThickness="0,0,0,1">
-            <Grid>
-                <StackPanel>
-                    <StackPanel Grid.Row="0" Margin="0,0,0,12">
-                        <TextBlock
-                            Grid.Column="0"
-                            Margin="0,0,0,0"
-                            FontFamily="Segoe UI"
-                            FontSize="20"
-                            FontWeight="SemiBold"
-                            Text="{DynamicResource defaultBrowserTitle}"
-                            TextAlignment="Left" />
-                    </StackPanel>
-                    <StackPanel>
-                        <TextBlock
-                            FontSize="14"
-                            Foreground="#1b1b1b"
-                            Text="{DynamicResource defaultBrowser_tips}"
-                            TextAlignment="Left"
-                            TextWrapping="WrapWithOverflow" />
-                    </StackPanel>
 
-                    <StackPanel Margin="14,28,0,0" Orientation="Horizontal">
-                        <TextBlock
-                            Grid.Column="1"
-                            HorizontalAlignment="Left"
-                            VerticalAlignment="Center"
-                            FontSize="14"
-                            Text="{DynamicResource defaultBrowser_name}" />
-                        <ComboBox
-                            Name="comboBox"
-                            Width="200"
-                            Height="35"
-                            Margin="14,0,0,0"
-                            HorizontalAlignment="Left"
-                            VerticalAlignment="Center"
-                            ItemsSource="{Binding CustomBrowsers}"
-                            SelectedIndex="{Binding SelectedCustomBrowserIndex}">
-                            <ComboBox.ItemTemplate>
-                                <DataTemplate>
-                                    <TextBlock Text="{Binding Name}" />
-                                </DataTemplate>
-                            </ComboBox.ItemTemplate>
-                        </ComboBox>
-                        <Button
-                            Margin="10,0,0,0"
-                            Click="btnAdd_Click"
-                            Content="{DynamicResource add}" />
-                        <Button
-                            Margin="10,0,0,0"
-                            Click="btnDelete_Click"
-                            Content="{DynamicResource delete}"
-                            IsEnabled="{Binding CustomExplorer.Editable}" />
-
-                    </StackPanel>
-                    <Rectangle
-                        Height="1"
-                        Margin="0,20,0,12"
-                        Fill="#cecece" />
-                    <StackPanel
+        <StackPanel Grid.Row="0">
+            <StackPanel>
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
+                    <Button
+                        Grid.Column="4"
+                        Click="btnCancel_Click"
+                        Style="{StaticResource TitleBarCloseButtonStyle}">
+                        <Path
+                            Width="46"
+                            Height="32"
+                            Data="M 18,11 27,20 M 18,20 27,11"
+                            Stroke="{Binding Path=Foreground, RelativeSource={RelativeSource AncestorType={x:Type Button}}}"
+                            StrokeThickness="1">
+                            <Path.Style>
+                                <Style TargetType="Path">
+                                    <Style.Triggers>
+                                        <DataTrigger Binding="{Binding Path=IsActive, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}" Value="False">
+                                            <Setter Property="Opacity" Value="0.5" />
+                                        </DataTrigger>
+                                    </Style.Triggers>
+                                </Style>
+                            </Path.Style>
+                        </Path>
+                    </Button>
+                </Grid>
+            </StackPanel>
+            <StackPanel Margin="26,12,26,0">
+                <StackPanel Margin="0,0,0,12">
+                    <TextBlock
+                        Grid.Column="0"
                         Margin="0,0,0,0"
-                        HorizontalAlignment="Stretch"
-                        DataContext="{Binding CustomExplorer}"
-                        Orientation="Horizontal">
-                        <Grid Width="480">
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="150" />
-                                <ColumnDefinition />
-                            </Grid.ColumnDefinitions>
-                            <Grid.RowDefinitions>
-                                <RowDefinition />
-                                <RowDefinition />
-                                <RowDefinition />
-                                <RowDefinition />
-                            </Grid.RowDefinitions>
-                            <TextBlock Grid.Row="0"
-                                       Grid.Column="0"
-                                       Margin="14,5,0,0"
-                                       HorizontalAlignment="Left"
-                                       VerticalAlignment="Center"
-                                       FontSize="14"
-                                       Text="{DynamicResource defaultBrowser_profile_name}" />
-                            <TextBox x:Name="ProfileTextBox"
-                                     Grid.Row="0"
-                                     Grid.Column="1"
-                                     Width="Auto"
-                                     Margin="10,5,15,0"
-                                     HorizontalAlignment="Stretch"
-                                     VerticalAlignment="Center"
-                                     IsEnabled="{Binding Editable}"
-                                     Text="{Binding Name}" />
-                            <TextBlock Grid.Row="1"
-                                       Grid.Column="0"
-                                       Margin="14,10,0,0"
-                                       HorizontalAlignment="Left"
-                                       VerticalAlignment="Center"
-                                       FontSize="14"
-                                       Text="{DynamicResource defaultBrowser_path}" />
-                            <TextBox x:Name="PathTextBox"
-                                     Grid.Row="1"
-                                     Grid.Column="1"
-                                     Width="Auto"
-                                     Margin="10,10,15,0"
-                                     HorizontalAlignment="Stretch"
-                                     VerticalAlignment="Center"
-                                     IsEnabled="{Binding Editable}"
-                                     Text="{Binding Path}" />
-                            <StackPanel Grid.Row="2"
-                                        Grid.Column="1"
-                                        Margin="14,10,14,0"
-                                        HorizontalAlignment="Left"
-                                        VerticalAlignment="Center"
-                                        Orientation="Horizontal">
-                                <RadioButton GroupName="browser" IsChecked="{Binding OpenInTab}">New Tab</RadioButton>
-                                <RadioButton GroupName="browser" IsChecked="{Binding OpenInNewWindow, Mode=OneWay}">New Window</RadioButton>
-                            </StackPanel>
-                            <TextBlock
-                                Grid.Row="3"
-                                Grid.Column="0"
-                                Margin="14,10,0,20"
-                                HorizontalAlignment="Left"
-                                VerticalAlignment="Center"
-                                FontSize="14"
-                                Text="{DynamicResource defaultBrowser_parameter}" />
-                            <StackPanel
-                                Grid.Row="3"
-                                Grid.Column="1"
-                                Margin="0,10,0,15"
+                        FontFamily="Segoe UI"
+                        FontSize="20"
+                        FontWeight="SemiBold"
+                        Text="{DynamicResource defaultBrowserTitle}"
+                        TextAlignment="Left" />
+                </StackPanel>
+                <StackPanel>
+                    <TextBlock
+                        FontSize="14"
+                        Text="{DynamicResource defaultBrowser_tips}"
+                        TextAlignment="Left"
+                        TextWrapping="WrapWithOverflow" />
+                </StackPanel>
+
+
+                <StackPanel Margin="14,28,0,0" Orientation="Horizontal">
+                    <TextBlock
+                        Grid.Column="1"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
+                        FontSize="14"
+                        Text="{DynamicResource defaultBrowser_name}" />
+                    <ComboBox
+                        Name="comboBox"
+                        Width="200"
+                        Height="35"
+                        Margin="14,0,0,0"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
+                        ItemsSource="{Binding CustomBrowsers}"
+                        SelectedIndex="{Binding SelectedCustomBrowserIndex}">
+                        <ComboBox.ItemTemplate>
+                            <DataTemplate>
+                                <TextBlock Text="{Binding Name}" />
+                            </DataTemplate>
+                        </ComboBox.ItemTemplate>
+                    </ComboBox>
+                    <Button
+                        Margin="10,0,0,0"
+                        Click="btnAdd_Click"
+                        Content="{DynamicResource add}" />
+                    <Button
+                        Margin="10,0,0,0"
+                        Click="btnDelete_Click"
+                        Content="{DynamicResource delete}"
+                        IsEnabled="{Binding CustomExplorer.Editable}" />
+
+                </StackPanel>
+                <Rectangle
+                    Height="1"
+                    Margin="0,20,0,12"
+                    Fill="{DynamicResource SeparatorForeground}" />
+                <StackPanel
+                    Margin="0,0,0,0"
+                    HorizontalAlignment="Stretch"
+                    DataContext="{Binding CustomExplorer}"
+                    Orientation="Horizontal">
+                    <Grid Width="480">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="150" />
+                            <ColumnDefinition />
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                            <RowDefinition />
+                            <RowDefinition />
+                            <RowDefinition />
+                            <RowDefinition />
+                        </Grid.RowDefinitions>
+                        <TextBlock
+                            Grid.Row="0"
+                            Grid.Column="0"
+                            Margin="14,5,0,0"
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Center"
+                            FontSize="14"
+                            Text="{DynamicResource defaultBrowser_profile_name}" />
+                        <TextBox
+                            x:Name="ProfileTextBox"
+                            Grid.Row="0"
+                            Grid.Column="1"
+                            Width="Auto"
+                            Margin="10,5,15,0"
+                            HorizontalAlignment="Stretch"
+                            VerticalAlignment="Center"
+                            IsEnabled="{Binding Editable}"
+                            Text="{Binding Name}" />
+                        <TextBlock
+                            Grid.Row="1"
+                            Grid.Column="0"
+                            Margin="14,10,0,0"
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Center"
+                            FontSize="14"
+                            Text="{DynamicResource defaultBrowser_path}" />
+                        <StackPanel
+                            Grid.Row="1"
+                            Grid.Column="1"
+                            Orientation="Horizontal">
+                            <TextBox
+                                x:Name="PathTextBox"
+                                Width="220"
+                                Margin="10,10,5,0"
                                 HorizontalAlignment="Stretch"
                                 VerticalAlignment="Center"
-                                Orientation="Horizontal">
-                                <TextBox
-                                    x:Name="fileArgTextBox"
-                                    Width="180"
-                                    Margin="10,0,0,0"
-                                    Text="{Binding PrivateArg}" />
-                                <CheckBox
-                                    Margin="12,0,0,0"
-                                    VerticalAlignment="Center"
-                                    IsChecked="{Binding EnablePrivate}" />
-                            </StackPanel>
-                        </Grid>
-                    </StackPanel>
+                                IsEnabled="{Binding Editable}"
+                                Text="{Binding Path}" />
+                            <Button
+                                Name="btnBrowseFile"
+                                Width="80"
+                                Margin="0,10,0,0"
+                                HorizontalAlignment="Right"
+                                VerticalAlignment="Center"
+                                Click="btnBrowseFile_Click"
+                                Content="{DynamicResource selectPythonDirectory}"
+                                DockPanel.Dock="Right">
+                                <Button.Style>
+                                    <Style BasedOn="{StaticResource DefaultButtonStyle}" TargetType="{x:Type Button}">
+                                        <Style.Triggers>
+                                            <DataTrigger Binding="{Binding ElementName=PathTextBox, UpdateSourceTrigger=PropertyChanged, Path=IsEnabled}" Value="False">
+                                                <Setter Property="IsEnabled" Value="False" />
+                                            </DataTrigger>
+                                        </Style.Triggers>
+                                    </Style>
+                                </Button.Style>
+                            </Button>
+                        </StackPanel>
+
+                        <StackPanel
+                            Grid.Row="2"
+                            Grid.Column="1"
+                            Margin="14,10,14,0"
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Center"
+                            Orientation="Horizontal">
+                            <RadioButton GroupName="browser" IsChecked="{Binding OpenInTab}">New Tab</RadioButton>
+                            <RadioButton GroupName="browser" IsChecked="{Binding OpenInNewWindow, Mode=OneWay}">New Window</RadioButton>
+                        </StackPanel>
+                        <TextBlock
+                            Grid.Row="3"
+                            Grid.Column="0"
+                            Margin="14,10,0,20"
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Center"
+                            FontSize="14"
+                            Text="{DynamicResource defaultBrowser_parameter}" />
+                        <StackPanel
+                            Grid.Row="3"
+                            Grid.Column="1"
+                            Margin="0,10,0,15"
+                            HorizontalAlignment="Stretch"
+                            VerticalAlignment="Center"
+                            Orientation="Horizontal">
+                            <TextBox
+                                x:Name="fileArgTextBox"
+                                Width="180"
+                                Margin="10,0,0,0"
+                                Text="{Binding PrivateArg}" />
+                            <CheckBox
+                                Margin="12,0,0,0"
+                                VerticalAlignment="Center"
+                                IsChecked="{Binding EnablePrivate}" />
+                        </StackPanel>
+                    </Grid>
                 </StackPanel>
-            </Grid>
-        </Border>
-        <StackPanel
-            Grid.Row="1"
-            HorizontalAlignment="Center"
-            Orientation="Horizontal">
-            <Button
-                x:Name="btnCancel"
-                Width="145"
-                Margin="0,0,5,0"
-                Click="btnCancel_Click"
-                Content="{DynamicResource cancel}" />
-            <Button
-                x:Name="btnDone"
-                Width="145"
-                Margin="5,0,0,0"
-                Click="btnDone_Click"
-                Content="{DynamicResource done}"
-                ForceCursor="True">
-                <Button.Style>
-                    <Style BasedOn="{StaticResource AccentButtonStyle}" TargetType="{x:Type Button}">
-                        <Style.Triggers>
-                            <DataTrigger Binding="{Binding Text.Length, ElementName=ProfileTextBox, UpdateSourceTrigger=PropertyChanged}" Value="0">
-                                <Setter Property="IsEnabled" Value="False" />
-                            </DataTrigger>
-                            <DataTrigger Binding="{Binding Text.Length, ElementName=PathTextBox, UpdateSourceTrigger=PropertyChanged}" Value="0">
-                                <Setter Property="IsEnabled" Value="False" />
-                            </DataTrigger>
-                            <DataTrigger Binding="{Binding Text.Length, ElementName=directoryArgTextBox, UpdateSourceTrigger=PropertyChanged}" Value="0">
-                                <Setter Property="IsEnabled" Value="False" />
-                            </DataTrigger>
-                            <DataTrigger Binding="{Binding Text.Length, ElementName=fileArgTextBox, UpdateSourceTrigger=PropertyChanged}" Value="0">
-                                <Setter Property="IsEnabled" Value="False" />
-                            </DataTrigger>
-                        </Style.Triggers>
-                    </Style>
-                </Button.Style>
-            </Button>
+            </StackPanel>
         </StackPanel>
+        <Border
+            Grid.Row="1"
+            Background="{DynamicResource PopupButtonAreaBGColor}"
+            BorderBrush="{DynamicResource PopupButtonAreaBorderColor}"
+            BorderThickness="0,1,0,0">
+            <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
+                <Button
+                    x:Name="btnCancel"
+                    Width="145"
+                    Margin="0,0,5,0"
+                    Click="btnCancel_Click"
+                    Content="{DynamicResource cancel}" />
+                <Button
+                    x:Name="btnDone"
+                    Width="145"
+                    Margin="5,0,0,0"
+                    Click="btnDone_Click"
+                    Content="{DynamicResource done}"
+                    ForceCursor="True">
+                    <Button.Style>
+                        <Style BasedOn="{StaticResource AccentButtonStyle}" TargetType="{x:Type Button}">
+                            <Style.Triggers>
+                                <DataTrigger Binding="{Binding Text.Length, ElementName=ProfileTextBox, UpdateSourceTrigger=PropertyChanged}" Value="0">
+                                    <Setter Property="IsEnabled" Value="False" />
+                                </DataTrigger>
+                                <DataTrigger Binding="{Binding Text.Length, ElementName=PathTextBox, UpdateSourceTrigger=PropertyChanged}" Value="0">
+                                    <Setter Property="IsEnabled" Value="False" />
+                                </DataTrigger>
+                                <DataTrigger Binding="{Binding Text.Length, ElementName=directoryArgTextBox, UpdateSourceTrigger=PropertyChanged}" Value="0">
+                                    <Setter Property="IsEnabled" Value="False" />
+                                </DataTrigger>
+                                <DataTrigger Binding="{Binding Text.Length, ElementName=fileArgTextBox, UpdateSourceTrigger=PropertyChanged}" Value="0">
+                                    <Setter Property="IsEnabled" Value="False" />
+                                </DataTrigger>
+                            </Style.Triggers>
+                        </Style>
+                    </Button.Style>
+                </Button>
+            </StackPanel>
+        </Border>
     </Grid>
 </Window>
diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index 8c7b34e9c..11d48235e 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -52,9 +52,15 @@
                     <ItemsPanelTemplate>
                         <Grid>
                             <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="auto" MinWidth="20" MaxWidth="60" />
+                                <ColumnDefinition
+                                    Width="auto"
+                                    MinWidth="20"
+                                    MaxWidth="60" />
                                 <ColumnDefinition Width="8*" />
-                                <ColumnDefinition Width="Auto" MinWidth="40" MaxWidth="550" />
+                                <ColumnDefinition
+                                    Width="Auto"
+                                    MinWidth="40"
+                                    MaxWidth="550" />
                             </Grid.ColumnDefinitions>
                         </Grid>
                     </ItemsPanelTemplate>
@@ -90,7 +96,10 @@
             <Setter Property="VerticalAlignment" Value="Center" />
             <Setter Property="HorizontalAlignment" Value="Left" />
         </Style>
-        <Style x:Key="SideControlCheckBox" BasedOn="{StaticResource DefaultCheckBoxStyle}" TargetType="{x:Type CheckBox}">
+        <Style
+            x:Key="SideControlCheckBox"
+            BasedOn="{StaticResource DefaultCheckBoxStyle}"
+            TargetType="{x:Type CheckBox}">
             <Setter Property="Width" Value="24" />
             <Setter Property="Grid.Column" Value="2" />
             <Setter Property="Margin" Value="0,4,0,4" />
@@ -101,7 +110,10 @@
             </Setter>
         </Style>
 
-        <Style x:Key="SideToggleSwitch" BasedOn="{StaticResource DefaultToggleSwitch}" TargetType="{x:Type ui:ToggleSwitch}">
+        <Style
+            x:Key="SideToggleSwitch"
+            BasedOn="{StaticResource DefaultToggleSwitch}"
+            TargetType="{x:Type ui:ToggleSwitch}">
             <Setter Property="Grid.Column" Value="2" />
             <Setter Property="Margin" Value="0,4,0,4" />
         </Style>
@@ -241,19 +253,21 @@
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate TargetType="{x:Type ListBoxItem}">
-                        <Border x:Name="Bd"
-                                Padding="{TemplateBinding Padding}"
-                                Background="{TemplateBinding Background}"
-                                BorderBrush="{TemplateBinding BorderBrush}"
-                                BorderThickness="{TemplateBinding BorderThickness}"
-                                CornerRadius="5"
-                                SnapsToDevicePixels="True">
-                            <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                              Content="{TemplateBinding Content}"
-                                              ContentStringFormat="{TemplateBinding ContentStringFormat}"
-                                              ContentTemplate="{TemplateBinding ContentTemplate}"
-                                              SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                        <Border
+                            x:Name="Bd"
+                            Padding="{TemplateBinding Padding}"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="5"
+                            SnapsToDevicePixels="True">
+                            <ContentPresenter
+                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                Content="{TemplateBinding Content}"
+                                ContentStringFormat="{TemplateBinding ContentStringFormat}"
+                                ContentTemplate="{TemplateBinding ContentTemplate}"
+                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                         </Border>
                         <ControlTemplate.Triggers>
                             <MultiTrigger>
@@ -311,19 +325,21 @@
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate TargetType="{x:Type ListBoxItem}">
-                        <Border x:Name="Bd"
-                                Padding="{TemplateBinding Padding}"
-                                Background="{TemplateBinding Background}"
-                                BorderBrush="{TemplateBinding BorderBrush}"
-                                BorderThickness="{TemplateBinding BorderThickness}"
-                                CornerRadius="5"
-                                SnapsToDevicePixels="True">
-                            <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                              Content="{TemplateBinding Content}"
-                                              ContentStringFormat="{TemplateBinding ContentStringFormat}"
-                                              ContentTemplate="{TemplateBinding ContentTemplate}"
-                                              SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                        <Border
+                            x:Name="Bd"
+                            Padding="{TemplateBinding Padding}"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="5"
+                            SnapsToDevicePixels="True">
+                            <ContentPresenter
+                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                Content="{TemplateBinding Content}"
+                                ContentStringFormat="{TemplateBinding ContentStringFormat}"
+                                ContentTemplate="{TemplateBinding ContentTemplate}"
+                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                         </Border>
                         <ControlTemplate.Triggers>
                             <MultiTrigger>
@@ -796,38 +812,35 @@
                                             Content="{Binding Settings.CustomExplorer.Name}" />
                                     </StackPanel>
 
-                            <TextBlock Grid.Column="0"
-                                       Margin="24,0,16,0"
-                                       VerticalAlignment="Center"
-                                       FontFamily="/Resources/#Segoe Fluent Icons"
-                                       FontSize="20">
-                                &#xe838;
-                            </TextBlock>
-                        </ItemsControl>
-                    </Border>
-                    <Separator Width="Auto" BorderBrush="#e5e5e5" BorderThickness="1" />
-                    <Border Margin="0,0,0,0" BorderThickness="0" Style="{DynamicResource SettingGroupBox}">
-                        <ItemsControl Style="{StaticResource SettingGrid}">
-                            <StackPanel Style="{StaticResource TextPanel}">
-                                <TextBlock Grid.Column="1" VerticalAlignment="Center" Text="{DynamicResource defaultBrowser}" />
-                                <TextBlock Style="{DynamicResource SettingSubTitleLabel}" Text="{DynamicResource defaultBrowserToolTip}" />
-                            </StackPanel>
-                            <StackPanel Grid.Column="2" Orientation="Horizontal">
-                                <Button Width="160"
-                                        MaxWidth="250"
-                                        Margin="10,0,18,0"
-                                        Click="OnSelectDefaultBrowserClick"
-                                        Content="{Binding Settings.CustomBrowser.Name}" />
-                            </StackPanel>
-                            <TextBlock Grid.Column="0"
-                                       Margin="24,0,16,0"
-                                       VerticalAlignment="Center"
-                                       FontFamily="/Resources/#Segoe Fluent Icons"
-                                       FontSize="20">
-                                &#xf6fa;
-                            </TextBlock>
-                        </ItemsControl>
-                    </Border>
+                                    <TextBlock Style="{StaticResource Glyph}">
+                                        &#xe838;
+                                    </TextBlock>
+                                </ItemsControl>
+                            </Border>
+
+                            <Border Margin="0,4,0,0" Style="{DynamicResource SettingGroupBox}">
+                                <ItemsControl Style="{StaticResource SettingGrid}">
+                                    <StackPanel Style="{StaticResource TextPanel}">
+                                        <TextBlock
+                                            Grid.Column="1"
+                                            VerticalAlignment="Center"
+                                            Style="{DynamicResource SettingTitleLabel}"
+                                            Text="{DynamicResource defaultBrowser}" />
+                                        <TextBlock Style="{DynamicResource SettingSubTitleLabel}" Text="{DynamicResource defaultBrowserToolTip}" />
+                                    </StackPanel>
+                                    <StackPanel Grid.Column="2" Orientation="Horizontal">
+                                        <Button
+                                            Width="160"
+                                            MaxWidth="250"
+                                            Margin="10,0,18,0"
+                                            Click="OnSelectDefaultBrowserClick"
+                                            Content="{Binding Settings.CustomBrowser.Name}" />
+                                    </StackPanel>
+                                    <TextBlock Style="{StaticResource Glyph}">
+                                        &#xf6fa;
+                                    </TextBlock>
+                                </ItemsControl>
+                            </Border>
 
                             <Border Margin="0,30,0,0" Style="{DynamicResource SettingGroupBox}">
                                 <ItemsControl Style="{StaticResource SettingGrid}">