diff --git a/Flow.Launcher/CustomQueryHotkeySetting.xaml b/Flow.Launcher/CustomQueryHotkeySetting.xaml
index ddf0d0e45..1113cb24d 100644
--- a/Flow.Launcher/CustomQueryHotkeySetting.xaml
+++ b/Flow.Launcher/CustomQueryHotkeySetting.xaml
@@ -75,10 +75,14 @@
                         Text="{DynamicResource customeQueryHotkeyTips}"
                         TextAlignment="Left"
                         TextWrapping="WrapWithOverflow" />
+                    <Image
+                        Width="478"
+                        Margin="0,20,0,0"
+                        Source="/Images/illustration_01.png" />
                 </StackPanel>
 
                 <StackPanel Margin="0,20,0,0" Orientation="Horizontal">
-                    <Grid Width="470">
+                    <Grid Width="478">
                         <Grid.RowDefinitions>
                             <RowDefinition />
                             <RowDefinition />
@@ -131,6 +135,7 @@
                             LastChildFill="True">
                             <Button
                                 x:Name="btnTestActionKeyword"
+                                Margin="0,0,10,0"
                                 Padding="10,5,10,5"
                                 Click="BtnTestActionKeyword_OnClick"
                                 Content="{DynamicResource preview}"
diff --git a/Flow.Launcher/CustomShortcutSetting.xaml b/Flow.Launcher/CustomShortcutSetting.xaml
index 78b392f3e..bbf6ff9f2 100644
--- a/Flow.Launcher/CustomShortcutSetting.xaml
+++ b/Flow.Launcher/CustomShortcutSetting.xaml
@@ -6,12 +6,12 @@
     Title="{DynamicResource customeQueryShortcutTitle}"
     Width="530"
     Background="{DynamicResource PopuBGColor}"
+    DataContext="{Binding RelativeSource={RelativeSource Self}}"
     Foreground="{DynamicResource PopupTextColor}"
     Icon="Images\app.png"
     ResizeMode="NoResize"
     SizeToContent="Height"
-    WindowStartupLocation="CenterScreen"
-    DataContext="{Binding RelativeSource={RelativeSource Self}}">
+    WindowStartupLocation="CenterScreen">
     <WindowChrome.WindowChrome>
         <WindowChrome CaptionHeight="32" ResizeBorderThickness="{x:Static SystemParameters.WindowResizeBorderThickness}" />
     </WindowChrome.WindowChrome>
@@ -76,10 +76,14 @@
                         Text="{DynamicResource customeQueryShortcutTips}"
                         TextAlignment="Left"
                         TextWrapping="WrapWithOverflow" />
+                    <Image
+                        Width="478"
+                        Margin="0,20,0,0"
+                        Source="/Images/illustration_02.png" />
                 </StackPanel>
 
-                <StackPanel Margin="0,20,0,0" Orientation="Horizontal">
-                    <Grid Width="470">
+                <StackPanel Margin="0,10,0,10" Orientation="Horizontal">
+                    <Grid Width="478">
                         <Grid.RowDefinitions>
                             <RowDefinition />
                             <RowDefinition />
@@ -99,9 +103,10 @@
                         <TextBox
                             Grid.Row="0"
                             Grid.Column="1"
+                            Width="180"
                             Margin="10"
-                            Text="{Binding Key}"
-                            />
+                            HorizontalAlignment="Left"
+                            Text="{Binding Key}" />
                         <TextBlock
                             Grid.Row="1"
                             Grid.Column="0"
@@ -124,10 +129,10 @@
                                 DockPanel.Dock="Right" />
                             <TextBox
                                 x:Name="tbExpand"
-                                Margin="10"
+                                Margin="10,0,10,0"
                                 HorizontalAlignment="Stretch"
-                                Text="{Binding Value}"
-                                VerticalAlignment="Center" />
+                                VerticalAlignment="Center"
+                                Text="{Binding Value}" />
                         </DockPanel>
                     </Grid>
                 </StackPanel>
@@ -135,7 +140,7 @@
         </StackPanel>
         <Border
             Grid.Row="1"
-            Margin="0,14,0,0"
+            Margin="0,10,0,0"
             Background="{DynamicResource PopupButtonAreaBGColor}"
             BorderBrush="{DynamicResource PopupButtonAreaBorderColor}"
             BorderThickness="0,1,0,0">
diff --git a/Flow.Launcher/Images/illustration_01.png b/Flow.Launcher/Images/illustration_01.png
new file mode 100644
index 000000000..aaeab3d35
Binary files /dev/null and b/Flow.Launcher/Images/illustration_01.png differ
diff --git a/Flow.Launcher/Images/illustration_02.png b/Flow.Launcher/Images/illustration_02.png
new file mode 100644
index 000000000..dd210f99a
Binary files /dev/null and b/Flow.Launcher/Images/illustration_02.png differ
diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index a8511bb4e..d18d30a78 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -36,8 +36,7 @@
     <system:String x:Key="hideFlowLauncherWhenLoseFocus">Hide Flow Launcher when focus is lost</system:String>
     <system:String x:Key="dontPromptUpdateMsg">Do not show new version notifications</system:String>
     <system:String x:Key="SearchWindowPosition">Search Window Position</system:String>
-    <system:String x:Key="rememberLastLocation">Remember last launch location</system:String>
-    <system:String x:Key="SearchWindowPositionRememberLastLaunchLocation">Remember Last Location</system:String>
+    <system:String x:Key="SearchWindowPositionRememberLastLaunchLocation">Remember Last Position</system:String>
     <system:String x:Key="SearchWindowPositionMouseScreenCenter">Mouse Focused Screen - Center</system:String>
     <system:String x:Key="SearchWindowPositionMouseScreenCenterTop">Mouse Focused Screen - Center Top</system:String>
     <system:String x:Key="SearchWindowPositionMouseScreenLeftTop">Mouse Focused Screen - Left Top</system:String>
@@ -148,7 +147,7 @@
     <system:String x:Key="showOpenResultHotkeyToolTip">Show result selection hotkey with results.</system:String>
     <system:String x:Key="customQueryHotkey">Custom Query Hotkey</system:String>
     <system:String x:Key="customQueryShortcut">Custom Query Shortcut</system:String>
-    <system:String x:Key="builtinShortcuts">Built-in Shortcuts</system:String>
+    <system:String x:Key="builtinShortcuts">Built-in Shortcut</system:String>
     <system:String x:Key="customQuery">Query</system:String>
     <system:String x:Key="customShortcut">Shortcut</system:String>
     <system:String x:Key="customShortcutExpansion">Expansion</system:String>
@@ -248,7 +247,7 @@
 
     <!--  Custom Query Hotkey Dialog  -->
     <system:String x:Key="customeQueryHotkeyTitle">Custom Query Hotkey</system:String>
-    <system:String x:Key="customeQueryHotkeyTips">Press the custom hotkey to automatically insert the specified query.</system:String>
+    <system:String x:Key="customeQueryHotkeyTips">Press a custom hotkey to open Flow Laucher and input the specified query automatically.</system:String>
     <system:String x:Key="preview">Preview</system:String>
     <system:String x:Key="hotkeyIsNotUnavailable">Hotkey is unavailable, please select a new hotkey</system:String>
     <system:String x:Key="invalidPluginHotkey">Invalid plugin hotkey</system:String>
diff --git a/Plugins/Flow.Launcher.Plugin.Program/Languages/en.xaml b/Plugins/Flow.Launcher.Plugin.Program/Languages/en.xaml
index 6d9f916e1..654322805 100644
--- a/Plugins/Flow.Launcher.Plugin.Program/Languages/en.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Program/Languages/en.xaml
@@ -39,7 +39,7 @@
 
     <system:String x:Key="flowlauncher_plugin_program_pls_select_program_source">Please select a program source</system:String>
     <system:String x:Key="flowlauncher_plugin_program_delete_program_source">Are you sure you want to delete the selected program sources?</system:String>
-    <system:String x:Key="flowlauncher_plugin_program_duplicate_program_source">Another program source with the same location alreaday exists.</system:String>
+    <system:String x:Key="flowlauncher_plugin_program_duplicate_program_source">Another program source with the same location already exists.</system:String>
 
     <system:String x:Key="flowlauncher_plugin_program_edit_program_source_title">Program Source</system:String>
     <system:String x:Key="flowlauncher_plugin_program_edit_program_source_tips">Edit directory and status of this program source.</system:String>