diff --git a/src/MaaWpfGui/Views/UserControl/ConfigurationMgrUserControl.xaml b/src/MaaWpfGui/Views/UserControl/ConfigurationMgrUserControl.xaml
index 004670b8d4..702f914e21 100644
--- a/src/MaaWpfGui/Views/UserControl/ConfigurationMgrUserControl.xaml
+++ b/src/MaaWpfGui/Views/UserControl/ConfigurationMgrUserControl.xaml
@@ -7,6 +7,7 @@
     xmlns:controls="clr-namespace:MaaWpfGui.Styles.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:dd="urn:gong-wpf-dragdrop"
+    xmlns:hc="https://handyorg.github.io/handycontrol"
     xmlns:helper="clr-namespace:MaaWpfGui.Helper"
     xmlns:local="clr-namespace:MaaWpfGui"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -23,7 +24,7 @@
         VerticalAlignment="Center"
         Orientation="Vertical">
         <ComboBox
-            Width="200"
+            Width="250"
             Margin="10"
             HorizontalAlignment="Center"
             VerticalAlignment="Center"
@@ -63,11 +64,15 @@
                 <ColumnDefinition Width="*" />
                 <ColumnDefinition Width="Auto" />
             </Grid.ColumnDefinitions>
-            <controls:TextBlock Grid.Column="0" Text="{DynamicResource ConfigurationName}" />
+            <controls:TextBlock
+                Grid.Column="0"
+                Margin="0,0,5,0"
+                hc:InfoElement.Placeholder="Default"
+                Text="{DynamicResource ConfigurationName}" />
             <TextBox
                 Grid.Column="1"
                 Width="Auto"
-                Margin="10"
+                hc:BorderElement.CornerRadius="4,0,0,4"
                 Text="{Binding NewConfigurationName, UpdateSourceTrigger=PropertyChanged}">
                 <TextBox.InputBindings>
                     <KeyBinding Key="Enter" Command="{s:Action AddConfiguration}" />
@@ -76,6 +81,8 @@
             <Button
                 Grid.Column="2"
                 Width="60"
+                hc:BorderElement.CornerRadius="0,4,4,0"
+                BorderThickness="0,1,1,1"
                 Command="{s:Action AddConfiguration}"
                 Content="{DynamicResource AddConfiguration}" />
         </Grid>
diff --git a/src/MaaWpfGui/Views/UserControl/Settings/BackgroundSettings.xaml b/src/MaaWpfGui/Views/UserControl/Settings/BackgroundSettings.xaml
index 7bb5811d05..83af646efc 100644
--- a/src/MaaWpfGui/Views/UserControl/Settings/BackgroundSettings.xaml
+++ b/src/MaaWpfGui/Views/UserControl/Settings/BackgroundSettings.xaml
@@ -18,14 +18,22 @@
     mc:Ignorable="d">
     <StackPanel>
         <StackPanel Margin="10">
-            <controls:TextBlock HorizontalAlignment="Center" Text="{DynamicResource BackgroundImage}" />
+            <controls:TextBlock
+                Margin="0,0,0,5"
+                HorizontalAlignment="Center"
+                Text="{DynamicResource BackgroundImage}" />
             <StackPanel
                 HorizontalAlignment="Center"
                 VerticalAlignment="Center"
                 Orientation="Horizontal">
-                <TextBox Width="350" Text="{Binding BackgroundImagePath}" />
+                <TextBox
+                    Width="350"
+                    hc:BorderElement.CornerRadius="4,0,0,4"
+                    Text="{Binding BackgroundImagePath}" />
                 <Button
                     Width="50"
+                    hc:BorderElement.CornerRadius="0,4,4,0"
+                    BorderThickness="0,1,1,1"
                     Command="{s:Action SelectImagePath}"
                     Content="{DynamicResource Select}" />
             </StackPanel>
@@ -34,7 +42,7 @@
             Margin="10"
             HorizontalAlignment="Center"
             VerticalAlignment="Center">
-            <controls:TextBlock HorizontalAlignment="Center" Text="{DynamicResource BackgroundOpacity}" />
+            <controls:TextBlock HorizontalAlignment="Center" Text="{DynamicResource BackgroundOpacity}" Margin="0,0,0,5"/>
             <hc:PreviewSlider
                 Width="400"
                 d:Value="50"
@@ -51,7 +59,10 @@
             Margin="10"
             HorizontalAlignment="Center"
             VerticalAlignment="Center">
-            <controls:TextBlock HorizontalAlignment="Center" Text="{DynamicResource BackgroundBlurRadius}" />
+            <controls:TextBlock
+                Margin="0,0,0,5"
+                HorizontalAlignment="Center"
+                Text="{DynamicResource BackgroundBlurRadius}" />
             <hc:PreviewSlider
                 Width="400"
                 d:Value="5"
@@ -68,10 +79,10 @@
             Margin="10"
             HorizontalAlignment="Center"
             VerticalAlignment="Center">
-            <controls:TextBlock HorizontalAlignment="Center" Text="{DynamicResource BackgroundImageStretchMode}" />
+            <controls:TextBlock HorizontalAlignment="Center" Text="{DynamicResource BackgroundImageStretchMode}" Margin="0,0,0,5"/>
             <hc:ComboBox
                 Width="200"
-                Margin="10"
+
                 HorizontalContentAlignment="Stretch"
                 DisplayMemberPath="Display"
                 IsEditable="True"
diff --git a/src/MaaWpfGui/Views/UserControl/Settings/ConnectSettingsUserControl.xaml b/src/MaaWpfGui/Views/UserControl/Settings/ConnectSettingsUserControl.xaml
index a6c4b2b30c..e0238bb321 100644
--- a/src/MaaWpfGui/Views/UserControl/Settings/ConnectSettingsUserControl.xaml
+++ b/src/MaaWpfGui/Views/UserControl/Settings/ConnectSettingsUserControl.xaml
@@ -52,21 +52,23 @@
         </StackPanel>
         <StackPanel
             Grid.Row="1"
+            Margin="10"
             HorizontalAlignment="Center"
             IsEnabled="{c:Binding !AutoDetectConnection}"
             Orientation="Horizontal">
             <hc:TextBox
-                Width="420"
                 Height="30"
-                Margin="10"
+                Width="380"
+                hc:BorderElement.CornerRadius="4,0,0,4"
                 hc:TitleElement.Title="{DynamicResource AdbPath}"
                 hc:TitleElement.TitlePlacement="Left"
                 Text="{Binding AdbPath}" />
             <Button
                 Width="60"
                 Height="30"
-                Margin="10"
                 HorizontalAlignment="Right"
+                hc:BorderElement.CornerRadius="0,4,4,0"
+                BorderThickness="0,1,1,1"
                 Command="{s:Action SelectFile}"
                 Content="{DynamicResource Select}" />
         </StackPanel>
diff --git a/src/MaaWpfGui/Views/UserControl/Settings/ExternalNotificationSettingsUserControl.xaml b/src/MaaWpfGui/Views/UserControl/Settings/ExternalNotificationSettingsUserControl.xaml
index b53442e2c2..50d047000f 100644
--- a/src/MaaWpfGui/Views/UserControl/Settings/ExternalNotificationSettingsUserControl.xaml
+++ b/src/MaaWpfGui/Views/UserControl/Settings/ExternalNotificationSettingsUserControl.xaml
@@ -38,26 +38,30 @@
             TextWrapping="Wrap" />-->
 
         <StackPanel Grid.Row="1">
-            <StackPanel
-                Margin="5"
-                HorizontalAlignment="Center"
-                Orientation="Horizontal">
-                <StackPanel>
-                    <controls:TextBlock Margin="0,0,0,5" Text="{DynamicResource ExternalNotificationEnabled}" />
-                    <hc:CheckComboBox
-                        Width="200"
-                        HorizontalContentAlignment="Center"
-                        hc:InfoElement.TitleWidth="0"
-                        hc:ListBoxAttach.SelectedItems="{Binding EnabledExternalNotificationProviders}"
-                        ItemsSource="{Binding ExternalNotificationProvidersShow}" />
-                </StackPanel>
-                <Button
-                    Margin="10,0,0,0"
-                    VerticalAlignment="Bottom"
-                    Command="{s:Action ExternalNotificationSendTest,
-                                       Target={x:Type viewModels:ExternalNotificationSettingsUserControlModel}}"
-                    Content="{DynamicResource ExternalNotificationSendTest}"
-                    IsEnabled="{c:Binding 'EnabledExternalNotificationProviderCount > 0'}" />
+            <controls:TextBlock Margin="0,0,0,5" Text="{DynamicResource ExternalNotificationEnabled}" />
+            <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
+                <hc:CheckComboBox
+                    Width="250"
+                    HorizontalContentAlignment="Center"
+                    hc:BorderElement.CornerRadius="4,0,0,4"
+                    hc:InfoElement.TitleWidth="0"
+                    hc:ListBoxAttach.SelectedItems="{Binding EnabledExternalNotificationProviders}"
+                    ItemsSource="{Binding ExternalNotificationProvidersShow}" />
+                <Grid>
+                    <Button
+                        hc:BorderElement.CornerRadius="0,4,4,0"
+                        BorderThickness="0,1,1,1"
+                        Content="{DynamicResource ExternalNotificationSendTest}"
+                        Foreground="Transparent"
+                        Visibility="{c:Binding 'EnabledExternalNotificationProviderCount == 0'}" />
+                    <Button
+                        hc:BorderElement.CornerRadius="0,4,4,0"
+                        BorderThickness="0,1,1,1"
+                        Command="{s:Action ExternalNotificationSendTest,
+                                           Target={x:Type viewModels:ExternalNotificationSettingsUserControlModel}}"
+                        Content="{DynamicResource ExternalNotificationSendTest}"
+                        IsEnabled="{c:Binding 'EnabledExternalNotificationProviderCount > 0'}" />
+                </Grid>
             </StackPanel>
             <StackPanel HorizontalAlignment="Center" Visibility="{c:Binding 'EnabledExternalNotificationProviderCount > 0'}">
                 <StackPanel HorizontalAlignment="Left" VerticalAlignment="Top">
diff --git a/src/MaaWpfGui/Views/UserControl/Settings/RemoteControlUserControl.xaml b/src/MaaWpfGui/Views/UserControl/Settings/RemoteControlUserControl.xaml
index 8776298f47..24bad2dae7 100644
--- a/src/MaaWpfGui/Views/UserControl/Settings/RemoteControlUserControl.xaml
+++ b/src/MaaWpfGui/Views/UserControl/Settings/RemoteControlUserControl.xaml
@@ -96,11 +96,13 @@
             Grid.Row="4"
             Grid.Column="1"
             Margin="0,5,0,5"
+            hc:BorderElement.CornerRadius="4,0,0,4"
             Text="{Binding RemoteControlUserIdentity}" />
         <Button
             Grid.Row="4"
             Grid.Column="2"
-            Margin="5"
+            hc:BorderElement.CornerRadius="0,4,4,0"
+            BorderThickness="0,1,1,1"
             Command="{s:Action ConnectionTest,
                                Target={x:Type remoteControl:RemoteControlService}}"
             Content="{DynamicResource RemoteControlConnectionTest}" />
@@ -117,13 +119,15 @@
             Grid.Row="5"
             Grid.Column="1"
             Margin="0,5,0,5"
+            hc:BorderElement.CornerRadius="4,0,0,4"
             ContextMenuService.IsEnabled="False"
             IsReadOnly="True"
             Text="{Binding RemoteControlDeviceIdentity}" />
         <Button
             Grid.Row="5"
             Grid.Column="2"
-            Margin="5"
+            BorderThickness="0,1,1,1"
+            hc:BorderElement.CornerRadius="0,4,4,0"
             Command="{s:Action RegenerateDeviceIdentity,
                                Target={x:Type remoteControl:RemoteControlService}}"
             Content="{DynamicResource RemoteControlRegenerateDeviceIdentity}" />