diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index 56c86dc18..376c4c940 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -2641,11 +2641,11 @@
                                         Title="{DynamicResource flowlauncherHotkey}"
                                         Icon=""
                                         Sub="{DynamicResource flowlauncherHotkeyToolTip}">
-                                        <flowlauncher:HotkeyControl 
+                                        <flowlauncher:HotkeyControl
+                                            ChangeHotkey="{Binding SetTogglingHotkeyCommand}"
                                             DefaultHotkey="Alt+Space"
-                                            ValidateKeyGesture="True"
                                             Hotkey="{Binding Settings.Hotkey}"
-                                            ChangeHotkey="{Binding SetTogglingHotkeyCommand}"/>
+                                            ValidateKeyGesture="True" />
                                     </cc:Card>
                                 </StackPanel>
 
@@ -2654,10 +2654,10 @@
                                         Title="{DynamicResource previewHotkey}"
                                         Icon="&#xe8a1;"
                                         Sub="{DynamicResource previewHotkeyToolTip}">
-                                        <flowlauncher:HotkeyControl 
+                                        <flowlauncher:HotkeyControl
                                             DefaultHotkey="F1"
-                                            ValidateKeyGesture="False"
-                                            Hotkey="{Binding Settings.PreviewHotkey}"/>
+                                            Hotkey="{Binding Settings.PreviewHotkey}"
+                                            ValidateKeyGesture="False" />
                                     </cc:Card>
                                 </StackPanel>
 
@@ -2722,7 +2722,7 @@
                                     <cc:ExCard
                                         Title="{DynamicResource basicHotkey}"
                                         Margin="0,12,0,0"
-                                        Icon="&#xe966;"
+                                        Icon="&#xf0e2;"
                                         Sub="{DynamicResource basicHotkeyToolTip}">
                                         <StackPanel>
                                             <cc:Card
@@ -2747,34 +2747,35 @@
                                         Margin="0,12,0,0"
                                         Icon="&#xe893;"
                                         Sub="{DynamicResource autoCompleteHotkeyToolTip}">
-                                        <flowlauncher:HotkeyControl 
+                                        <flowlauncher:HotkeyControl
                                             DefaultHotkey="Ctrl+Tab"
-                                            ValidateKeyGesture="False"
-                                            Hotkey="{Binding Settings.AutoCompleteHotkey}"/>
+                                            Hotkey="{Binding Settings.AutoCompleteHotkey}"
+                                            ValidateKeyGesture="False" />
                                     </cc:Card>
 
                                     <cc:Card Title="{DynamicResource SelectNextItemHotkey}" Icon="&#xf0ae;">
-                                        <flowlauncher:HotkeyControl 
+                                        <flowlauncher:HotkeyControl
                                             DefaultHotkey="Tab"
-                                            ValidateKeyGesture="False"
-                                            Hotkey="{Binding Settings.Hotkey}"/>
+                                            Hotkey="{Binding Settings.Hotkey}"
+                                            ValidateKeyGesture="False" />
                                     </cc:Card>
 
 
                                     <cc:Card Title="{DynamicResource SelectPrevItemHotkey}" Icon="&#xf0ad;">
                                         <flowlauncher:HotkeyControl
                                             DefaultHotkey="Shift+Tab"
-                                            ValidateKeyGesture="False"
-                                            Hotkey="{Binding Settings.SelectPrevItemHotkey}"/>
+                                            Hotkey="{Binding Settings.SelectPrevItemHotkey}"
+                                            ValidateKeyGesture="False" />
                                     </cc:Card>
 
                                     <cc:ExCard
                                         Title="{DynamicResource customQueryHotkey}"
                                         Margin="0,14,0,0"
-                                        Icon="&#xf0ad;">
+                                        Icon="&#xf26c;">
                                         <StackPanel Margin="0,0,0,0">
                                             <Separator
                                                 Width="Auto"
+                                                Margin="0"
                                                 BorderThickness="1"
                                                 Style="{StaticResource SettingSeparatorStyle}" />
                                             <StackPanel Margin="18,18,18,0">
@@ -2833,102 +2834,109 @@
                                         </StackPanel>
                                     </cc:ExCard>
 
-                                    <cc:ExCard Title="{DynamicResource customQueryShortcut}">
+                                    <cc:ExCard
+                                        Title="{DynamicResource customQueryShortcut}"
+                                        Margin="0,4,0,0"
+                                        Icon="&#xf26b;" />
+
+                                    <cc:ExCard
+                                        Title="{DynamicResource builtinShortcuts}"
+                                        Margin="0,4,0,0"
+                                        Icon="&#xf158;">
                                         <StackPanel>
-                                            <ListView
-                                                Name="customShortcutView"
-                                                Grid.Row="8"
-                                                MinHeight="160"
-                                                Margin="0,6,0,0"
-                                                Background="{DynamicResource Color02B}"
-                                                BorderBrush="DarkGray"
-                                                BorderThickness="1"
-                                                ItemsSource="{Binding CustomShortcuts}"
-                                                SelectedItem="{Binding SelectedCustomShortcut}"
-                                                Style="{StaticResource {x:Static GridView.GridViewStyleKey}}">
-                                                <ListView.View>
-                                                    <GridView>
-                                                        <GridViewColumn Width="180" Header="{DynamicResource customShortcut}">
-                                                            <GridViewColumn.CellTemplate>
-                                                                <DataTemplate>
-                                                                    <TextBlock Text="{Binding Key}" />
-                                                                </DataTemplate>
-                                                            </GridViewColumn.CellTemplate>
-                                                        </GridViewColumn>
-                                                        <GridViewColumn Width="430" Header="{DynamicResource customShortcutExpansion}">
-                                                            <GridViewColumn.CellTemplate>
-                                                                <DataTemplate>
-                                                                    <TextBlock Text="{Binding Value}" />
-                                                                </DataTemplate>
-                                                            </GridViewColumn.CellTemplate>
-                                                        </GridViewColumn>
-                                                    </GridView>
-                                                </ListView.View>
-                                            </ListView>
-                                            <StackPanel
-                                                Grid.Row="9"
+                                            <Separator
+                                                Width="Auto"
                                                 Margin="0"
-                                                HorizontalAlignment="Right"
-                                                VerticalAlignment="Top"
-                                                Orientation="Horizontal">
-                                                <Button
-                                                    MinWidth="100"
-                                                    Margin="10"
-                                                    Click="OnDeleteCustomShortCutClick"
-                                                    Content="{DynamicResource delete}" />
-                                                <Button
-                                                    MinWidth="100"
-                                                    Margin="10"
-                                                    Click="OnEditCustomShortCutClick"
-                                                    Content="{DynamicResource edit}" />
-                                                <Button
-                                                    MinWidth="100"
-                                                    Margin="10,10,0,10"
-                                                    Click="OnAddCustomShortCutClick"
-                                                    Content="{DynamicResource add}" />
+                                                BorderThickness="1"
+                                                Style="{StaticResource SettingSeparatorStyle}" />
+                                            <StackPanel Margin="16,8,16,0">
+                                                <ListView
+                                                    Grid.Row="11"
+                                                    MinHeight="160"
+                                                    Margin="0,6,0,16"
+                                                    Background="{DynamicResource Color02B}"
+                                                    BorderBrush="DarkGray"
+                                                    BorderThickness="1"
+                                                    ItemsSource="{Binding BuiltinShortcuts}"
+                                                    Style="{StaticResource {x:Static GridView.GridViewStyleKey}}">
+                                                    <ListView.View>
+                                                        <GridView>
+                                                            <GridViewColumn Width="180" Header="{DynamicResource customShortcut}">
+                                                                <GridViewColumn.CellTemplate>
+                                                                    <DataTemplate>
+                                                                        <TextBlock Text="{Binding Key}" />
+                                                                    </DataTemplate>
+                                                                </GridViewColumn.CellTemplate>
+                                                            </GridViewColumn>
+                                                            <GridViewColumn Width="430" Header="{DynamicResource builtinShortcutDescription}">
+                                                                <GridViewColumn.CellTemplate>
+                                                                    <DataTemplate>
+                                                                        <TextBlock Text="{Binding Description, Converter={StaticResource TranslationConverter}}" />
+                                                                    </DataTemplate>
+                                                                </GridViewColumn.CellTemplate>
+                                                            </GridViewColumn>
+                                                        </GridView>
+                                                    </ListView.View>
+                                                </ListView>
                                             </StackPanel>
                                         </StackPanel>
                                     </cc:ExCard>
                                 </StackPanel>
+                                <StackPanel>
+                                    <ListView
+                                        Name="customShortcutView"
+                                        Grid.Row="8"
+                                        MinHeight="160"
+                                        Margin="0,6,0,0"
+                                        Background="{DynamicResource Color02B}"
+                                        BorderBrush="DarkGray"
+                                        BorderThickness="1"
+                                        ItemsSource="{Binding CustomShortcuts}"
+                                        SelectedItem="{Binding SelectedCustomShortcut}"
+                                        Style="{StaticResource {x:Static GridView.GridViewStyleKey}}">
+                                        <ListView.View>
+                                            <GridView>
+                                                <GridViewColumn Width="180" Header="{DynamicResource customShortcut}">
+                                                    <GridViewColumn.CellTemplate>
+                                                        <DataTemplate>
+                                                            <TextBlock Text="{Binding Key}" />
+                                                        </DataTemplate>
+                                                    </GridViewColumn.CellTemplate>
+                                                </GridViewColumn>
+                                                <GridViewColumn Width="430" Header="{DynamicResource customShortcutExpansion}">
+                                                    <GridViewColumn.CellTemplate>
+                                                        <DataTemplate>
+                                                            <TextBlock Text="{Binding Value}" />
+                                                        </DataTemplate>
+                                                    </GridViewColumn.CellTemplate>
+                                                </GridViewColumn>
+                                            </GridView>
+                                        </ListView.View>
+                                    </ListView>
+                                    <StackPanel
+                                        Grid.Row="9"
+                                        Margin="0"
+                                        HorizontalAlignment="Right"
+                                        VerticalAlignment="Top"
+                                        Orientation="Horizontal">
+                                        <Button
+                                            MinWidth="100"
+                                            Margin="10"
+                                            Click="OnDeleteCustomShortCutClick"
+                                            Content="{DynamicResource delete}" />
+                                        <Button
+                                            MinWidth="100"
+                                            Margin="10"
+                                            Click="OnEditCustomShortCutClick"
+                                            Content="{DynamicResource edit}" />
+                                        <Button
+                                            MinWidth="100"
+                                            Margin="10,10,0,10"
+                                            Click="OnAddCustomShortCutClick"
+                                            Content="{DynamicResource add}" />
+                                    </StackPanel>
+                                </StackPanel>
 
-
-
-                                <TextBlock
-                                    Grid.Row="10"
-                                    Margin="0,0,12,2"
-                                    Padding="0,12,0,0"
-                                    VerticalAlignment="Center"
-                                    FontSize="14"
-                                    Foreground="{DynamicResource Color05B}"
-                                    Text="{DynamicResource builtinShortcuts}" />
-                                <ListView
-                                    Grid.Row="11"
-                                    MinHeight="160"
-                                    Margin="0,6,0,20"
-                                    Background="{DynamicResource Color02B}"
-                                    BorderBrush="DarkGray"
-                                    BorderThickness="1"
-                                    ItemsSource="{Binding BuiltinShortcuts}"
-                                    Style="{StaticResource {x:Static GridView.GridViewStyleKey}}">
-                                    <ListView.View>
-                                        <GridView>
-                                            <GridViewColumn Width="180" Header="{DynamicResource customShortcut}">
-                                                <GridViewColumn.CellTemplate>
-                                                    <DataTemplate>
-                                                        <TextBlock Text="{Binding Key}" />
-                                                    </DataTemplate>
-                                                </GridViewColumn.CellTemplate>
-                                            </GridViewColumn>
-                                            <GridViewColumn Width="430" Header="{DynamicResource builtinShortcutDescription}">
-                                                <GridViewColumn.CellTemplate>
-                                                    <DataTemplate>
-                                                        <TextBlock Text="{Binding Description, Converter={StaticResource TranslationConverter}}" />
-                                                    </DataTemplate>
-                                                </GridViewColumn.CellTemplate>
-                                            </GridViewColumn>
-                                        </GridView>
-                                    </ListView.View>
-                                </ListView>
                             </StackPanel>
                         </Border>
                     </ScrollViewer>