diff --git a/Flow.Launcher/HotkeyControl.xaml b/Flow.Launcher/HotkeyControl.xaml
index bea652d56..2dc051205 100644
--- a/Flow.Launcher/HotkeyControl.xaml
+++ b/Flow.Launcher/HotkeyControl.xaml
@@ -5,7 +5,6 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:input="clr-namespace:System.Windows.Input;assembly=PresentationCore"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    d:DesignHeight="45"
     d:DesignWidth="300"
     mc:Ignorable="d">
     <Grid>
@@ -39,11 +38,16 @@
             </Border>
         </Popup>
 
-        <Button FontSize="13" FontWeight="Bold" Foreground="{DynamicResource Color01B}" Click="OnButtonClicked">
+        <Button
+            Click="OnButtonClicked"
+            FontSize="13"
+            FontWeight="Bold"
+            Foreground="{DynamicResource Color01B}">
             <Button.Template>
                 <ControlTemplate TargetType="Button">
                     <Border
                         x:Name="ButtonBorder"
+                        Padding="5,0,5,0"
                         Background="{DynamicResource Color12B}"
                         BorderBrush="{DynamicResource ButtonInsideBorder}"
                         BorderThickness="1"
@@ -71,12 +75,11 @@
                     <ItemsControl.ItemTemplate>
                         <DataTemplate>
                             <Border
-                                Margin="6"
+                                Margin="2,5,2,5"
                                 Padding="10,5,10,5"
                                 Background="{DynamicResource SystemAccentColorLight2Brush}"
                                 BorderThickness="1"
-                                CornerRadius="5"
-                                Height="30">
+                                CornerRadius="5">
                                 <TextBlock Text="{Binding}" />
                             </Border>
                         </DataTemplate>
diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index e1b42e3d3..04ac507c9 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -738,14 +738,12 @@
                                                 </ComboBox>
                                             </StackPanel>
                                             <TextBlock Style="{StaticResource Glyph}">
-                                            &#xe7f4;
+                                                &#xe7f4;
                                             </TextBlock>
                                         </ItemsControl>
                                     </Border>
 
-                                    <Separator
-                                        Width="Auto"
-                                        BorderThickness="1">
+                                    <Separator Width="Auto" BorderThickness="1">
                                         <Separator.Style>
                                             <Style BasedOn="{StaticResource SettingSeparatorStyle}" TargetType="Separator">
                                                 <Setter Property="Visibility" Value="Visible" />
@@ -758,9 +756,7 @@
                                         </Separator.Style>
                                     </Separator>
 
-                                    <Border
-                                        Margin="0"
-                                        BorderThickness="0">
+                                    <Border Margin="0" BorderThickness="0">
                                         <Border.Style>
                                             <Style BasedOn="{StaticResource SettingGroupBox}" TargetType="Border">
                                                 <Setter Property="Visibility" Value="Visible" />
@@ -786,8 +782,7 @@
                                                     FontSize="14"
                                                     ItemsSource="{Binding SearchWindowAligns}"
                                                     SelectedValue="{Binding Settings.SearchWindowAlign}"
-                                                    SelectedValuePath="Value">
-                                                </ComboBox>
+                                                    SelectedValuePath="Value" />
                                                 <StackPanel Margin="0,0,18,0" Orientation="Horizontal">
                                                     <StackPanel.Style>
                                                         <Style TargetType="StackPanel">
@@ -817,7 +812,7 @@
                                                 </StackPanel>
                                             </StackPanel>
                                             <TextBlock Style="{StaticResource Glyph}">
-                                            &#xe7f4;
+                                                &#xe7f4;
                                             </TextBlock>
                                         </ItemsControl>
                                     </Border>
@@ -2446,8 +2441,7 @@
                                                                 FontSize="14"
                                                                 ItemsSource="{Binding AnimationSpeeds}"
                                                                 SelectedValue="{Binding Settings.AnimationSpeed}"
-                                                                SelectedValuePath="Value">
-                                                            </ComboBox>
+                                                                SelectedValuePath="Value" />
                                                             <StackPanel Margin="0,0,18,0" Orientation="Horizontal">
                                                                 <StackPanel.Style>
                                                                     <Style TargetType="StackPanel">
@@ -2652,13 +2646,11 @@
                                                 x:Name="HotkeyControl"
                                                 Grid.Row="0"
                                                 Grid.Column="2"
-                                                Width="300"
-                                                Height="35"
-                                                Margin="0,0,0,0"
+                                                Margin="0,0,16,0"
                                                 HorizontalAlignment="Right"
                                                 HorizontalContentAlignment="Right"
-                                                Hotkey="{Binding Settings.Hotkey}"
-                                                Action="OnToggleHotkey" />
+                                                Action="OnToggleHotkey"
+                                                Hotkey="{Binding Settings.Hotkey}" />
 
                                             <TextBlock Style="{StaticResource Glyph}">
                                                 &#xeda7;
@@ -2678,9 +2670,7 @@
                                                 x:Name="PreviewHotkeyControl"
                                                 Grid.Row="0"
                                                 Grid.Column="2"
-                                                Width="300"
-                                                Height="35"
-                                                Margin="0,0,0,0"
+                                                Margin="0,0,16,0"
                                                 HorizontalAlignment="Right"
                                                 HorizontalContentAlignment="Right"
                                                 Hotkey="{Binding Settings.PreviewHotkey}"