diff --git a/Wox.Plugin.SystemPlugins/CMD/CMDSetting.xaml b/Wox.Plugin.SystemPlugins/CMD/CMDSetting.xaml
index 593e6a02a8..a86f62bbe2 100644
--- a/Wox.Plugin.SystemPlugins/CMD/CMDSetting.xaml
+++ b/Wox.Plugin.SystemPlugins/CMD/CMDSetting.xaml
@@ -14,11 +14,11 @@
             </Grid.RowDefinitions>
             <StackPanel Grid.Row="0" Orientation="Horizontal">
                 <CheckBox x:Name="cbReplaceWinR" />
-                <TextBlock Text="Replace Win+R" />
+                <TextBlock Margin="5 -2 0 0" Text="Replace Win+R" />
             </StackPanel>
             <StackPanel Grid.Row="1" Orientation="Horizontal" Margin="0 10 0 0">
                 <CheckBox x:Name="cbLeaveCmdOpen" />
-                <TextBlock Text="Do not close Command Prompt after command execution" />
+                <TextBlock Margin="5 -2 0 0" Text="Do not close Command Prompt after command execution" />
             </StackPanel>
         </Grid>
     </Border>
diff --git a/Wox.Plugin.SystemPlugins/Program/ProgramSetting.xaml b/Wox.Plugin.SystemPlugins/Program/ProgramSetting.xaml
index ad3b05f08b..f8d7623d0b 100644
--- a/Wox.Plugin.SystemPlugins/Program/ProgramSetting.xaml
+++ b/Wox.Plugin.SystemPlugins/Program/ProgramSetting.xaml
@@ -51,6 +51,6 @@
             <Button x:Name="btnEditProgramSource" Click="btnEditProgramSource_OnClick" Width="100" Margin="10" Content="Edit"/>
             <Button x:Name="btnAddProgramSource" Click="btnAddProgramSource_OnClick" Width="100" Margin="10" Content="Add"/>
         </StackPanel>
-        <TextBlock Grid.Row="1" Margin="10" HorizontalAlignment="Left" Text="* Restarting required" VerticalAlignment="Center" />
+        <TextBlock Grid.Row="1" Margin="10" HorizontalAlignment="Left" Text="* Restart required" VerticalAlignment="Center" />
     </Grid>
 </UserControl>
diff --git a/Wox/MainWindow.xaml.cs b/Wox/MainWindow.xaml.cs
index c83d82073d..aab2eb84a3 100644
--- a/Wox/MainWindow.xaml.cs
+++ b/Wox/MainWindow.xaml.cs
@@ -223,7 +223,7 @@ namespace Wox {
 			notifyIcon.Click += (o, e) => ShowWox();
 			var open = new MenuItem("Open");
 			open.Click += (o, e) => ShowWox();
-			var setting = new MenuItem("Setting");
+			var setting = new MenuItem("Settings");
 			setting.Click += (o, e) => OpenSettingDialog();
 			var exit = new MenuItem("Exit");
 			exit.Click += (o, e) => CloseApp();
diff --git a/Wox/SettingWindow.xaml b/Wox/SettingWindow.xaml
index 37bae70fe9..129ccecb36 100644
--- a/Wox/SettingWindow.xaml
+++ b/Wox/SettingWindow.xaml
@@ -24,11 +24,11 @@
             <StackPanel Orientation="Vertical" Margin="10">
                 <StackPanel Orientation="Horizontal" Margin="10">
                     <CheckBox x:Name="cbStartWithWindows" Unchecked="CbStartWithWindows_OnUnchecked" Checked="CbStartWithWindows_OnChecked" />
-                    <TextBlock Text="Start Wox on system startup" />
+                    <TextBlock Margin="5 -2 0 0" Text="Start Wox on system startup" />
                 </StackPanel>
                 <StackPanel Orientation="Horizontal" Margin="10">
                     <CheckBox x:Name="cbHideWhenDeactive" />
-                    <TextBlock Text="Hide Wox when loses focus" />
+                    <TextBlock Margin="5 -2 0 0" Text="Hide Wox when loses focus" />
                 </StackPanel>
             </StackPanel>
         </TabItem>
@@ -118,9 +118,10 @@
                                 </DockPanel>
                                 <TextBlock Grid.Row="1" x:Name="pluginSubTitle" Opacity="0.5" ToolTip="{Binding Source=pluginSubTitle, Path=Text}" Visibility="{Binding Source=pluginSubTitle, Path=Text, Converter={converters:StringNullOrEmptyToVisibilityConverter}}" ></TextBlock>
                                 <StackPanel Grid.Row="2" Orientation="Horizontal" Margin="0 8 0 0">
-                                    <CheckBox Margin="0 0 50 0" x:Name="cbDisablePlugin" Click="CbDisablePlugin_OnClick">Disable</CheckBox>
-                                    <TextBlock x:Name="pluginActionKeywordTitle" Margin="0 0 10 0">ActionKeyword:</TextBlock>
-                                    <TextBlock Margin="0 0 10 0" ToolTip="Change Action Keyword" Cursor="Hand" MouseUp="PluginActionKeyword_OnMouseUp" Foreground="Blue" Text="key" x:Name="pluginActionKeyword"></TextBlock>
+                                    <CheckBox x:Name="cbDisablePlugin" Click="CbDisablePlugin_OnClick"></CheckBox>
+                                    <TextBlock x:Name="pluginDisableTitle" Margin="3 -2 0 0">Disable</TextBlock>
+                                    <TextBlock x:Name="pluginActionKeywordTitle" Margin="50 -2 0 0">ActionKeyword:</TextBlock>
+                                    <TextBlock Margin="5 -2 0 0" ToolTip="Change Action Keyword" Cursor="Hand" MouseUp="PluginActionKeyword_OnMouseUp" Foreground="Blue" Text="key" x:Name="pluginActionKeyword"></TextBlock>
                                 </StackPanel>
                             </Grid>
                         </Grid>
@@ -169,8 +170,8 @@
                     <StackPanel Grid.Row="1" Grid.Column="0"  Margin="10" Orientation="Vertical">
                         <StackPanel Orientation="Horizontal" Margin="2">
                             <TextBlock Text="Query Box Font:" />
-                            <ComboBox x:Name="cbQueryBoxFont" ItemsSource="{x:Static Fonts.SystemFontFamilies}" SelectionChanged="CbQueryBoxFont_OnSelectionChanged" HorizontalAlignment="Left" VerticalAlignment="Top" Width="160"/>
-                            <ComboBox
+                            <ComboBox Margin="10 -2 5 0" x:Name="cbQueryBoxFont" ItemsSource="{x:Static Fonts.SystemFontFamilies}" SelectionChanged="CbQueryBoxFont_OnSelectionChanged" HorizontalAlignment="Left" VerticalAlignment="Top" Width="160"/>
+                            <ComboBox Margin="0 -2 0 0"
 								x:Name="cbQueryBoxFontFaces"
 								ItemsSource="{Binding SelectedValue.FamilyTypefaces, ElementName=cbQueryBoxFont}" SelectionChanged="CbQueryBoxFontFaces_OnSelectionChanged" HorizontalAlignment="Left" VerticalAlignment="Top" Width="120">
                                 <ComboBox.ItemTemplate>
@@ -188,8 +189,8 @@
                         </StackPanel>
                         <StackPanel Orientation="Horizontal" Margin="2">
                             <TextBlock Text="Result Item Font:" />
-                            <ComboBox x:Name="cbResultItemFont" ItemsSource="{x:Static Fonts.SystemFontFamilies}" SelectionChanged="CbResultItemFont_OnSelectionChanged" HorizontalAlignment="Left" VerticalAlignment="Top" Width="160"/>
-                            <ComboBox
+                            <ComboBox Margin="5.5 -2 5 0" x:Name="cbResultItemFont" ItemsSource="{x:Static Fonts.SystemFontFamilies}" SelectionChanged="CbResultItemFont_OnSelectionChanged" HorizontalAlignment="Left" VerticalAlignment="Top" Width="160"/>
+                            <ComboBox Margin="0 -2 0 0"
 								x:Name="cbResultItemFontFaces"
 								ItemsSource="{Binding SelectedValue.FamilyTypefaces, ElementName=cbResultItemFont}" SelectionChanged="CbResultItemFontFaces_OnSelectionChanged" HorizontalAlignment="Left" VerticalAlignment="Top" Width="120">
                                 <ComboBox.ItemTemplate>