diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml b/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml
index 95505165d..c2b23a295 100644
--- a/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml
+++ b/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml
@@ -4,11 +4,11 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:cc="clr-namespace:Flow.Launcher.Resources.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:ext="clr-namespace:Flow.Launcher.Resources.MarkupExtensions"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:settingsViewModels="clr-namespace:Flow.Launcher.SettingPages.ViewModels"
     xmlns:ui="http://schemas.modernwpf.com/2019"
     xmlns:userSettings="clr-namespace:Flow.Launcher.Infrastructure.UserSettings;assembly=Flow.Launcher.Infrastructure"
-    xmlns:ext="clr-namespace:Flow.Launcher.Resources.MarkupExtensions"
     Title="General"
     d:DataContext="{d:DesignInstance settingsViewModels:SettingsPaneGeneralViewModel}"
     d:DesignHeight="450"
@@ -46,58 +46,62 @@
             </cc:Card>
 
             <cc:CardGroup Margin="0 30 0 0">
-                <cc:Card Icon="&#xe7f4;" Title="{DynamicResource SearchWindowPosition}">
+                <cc:Card Title="{DynamicResource SearchWindowPosition}" Icon="&#xe7f4;">
                     <StackPanel Orientation="Horizontal">
                         <ComboBox
                             MinWidth="220"
-                            DisplayMemberPath="Display"
-                            SelectedValuePath="Value"
-                            FontSize="14"
                             VerticalAlignment="Center"
+                            DisplayMemberPath="Display"
+                            FontSize="14"
                             ItemsSource="{Binding SearchWindowScreens}"
-                            SelectedValue="{Binding Settings.SearchWindowScreen}" />
+                            SelectedValue="{Binding Settings.SearchWindowScreen}"
+                            SelectedValuePath="Value" />
                         <ComboBox
                             MinWidth="160"
                             Margin="18 0 0 0"
-                            FontSize="14"
                             VerticalAlignment="Center"
+                            FontSize="14"
                             ItemsSource="{Binding ScreenNumbers}"
                             SelectedValue="{Binding Settings.CustomScreenNumber}"
-                            Visibility="{ext:VisibleWhen
-                                        {Binding Settings.SearchWindowScreen},
-                                        IsEqualTo={x:Static userSettings:SearchWindowScreens.Custom}}"
-                            />
+                            Visibility="{ext:VisibleWhen {Binding Settings.SearchWindowScreen},
+                                                         IsEqualTo={x:Static userSettings:SearchWindowScreens.Custom}}" />
                     </StackPanel>
                 </cc:Card>
 
                 <cc:Card
-                    Icon="&#xe7f4;"
                     Title="{DynamicResource SearchWindowAlign}"
-                    Visibility="{ext:CollapsedWhen
-                                {Binding Settings.SearchWindowScreen},
-                                IsEqualTo={x:Static userSettings:SearchWindowScreens.RememberLastLaunchLocation}}">
+                    Icon="&#xe7f4;"
+                    Visibility="{ext:CollapsedWhen {Binding Settings.SearchWindowScreen},
+                                                   IsEqualTo={x:Static userSettings:SearchWindowScreens.RememberLastLaunchLocation}}">
                     <StackPanel Orientation="Horizontal">
                         <ComboBox
                             MinWidth="160"
-                            DisplayMemberPath="Display"
-                            SelectedValuePath="Value"
-                            FontSize="14"
                             VerticalAlignment="Center"
+                            DisplayMemberPath="Display"
+                            FontSize="14"
                             ItemsSource="{Binding SearchWindowAligns}"
-                            SelectedValue="{Binding Settings.SearchWindowAlign}" />
+                            SelectedValue="{Binding Settings.SearchWindowAlign}"
+                            SelectedValuePath="Value" />
 
                         <StackPanel
                             Margin="18 0 0 0"
-                            Orientation="Horizontal"
                             VerticalAlignment="Center"
-                            Visibility="{ext:VisibleWhen
-                                        {Binding Settings.SearchWindowAlign},
-                                        IsEqualTo={x:Static userSettings:SearchWindowAligns.Custom}}">
-                            <TextBox VerticalAlignment="Center" MinWidth="80"
-                                     Text="{Binding Settings.CustomWindowLeft}" />
-                            <TextBlock VerticalAlignment="Center" Margin="10" Text="x" />
-                            <TextBox VerticalAlignment="Center" MinWidth="80" Text="{Binding Settings.CustomWindowTop}"
-                                     TextWrapping="NoWrap" />
+                            Orientation="Horizontal"
+                            Visibility="{ext:VisibleWhen {Binding Settings.SearchWindowAlign},
+                                                         IsEqualTo={x:Static userSettings:SearchWindowAligns.Custom}}">
+                            <TextBox
+                                MinWidth="80"
+                                VerticalAlignment="Center"
+                                Text="{Binding Settings.CustomWindowLeft}" />
+                            <TextBlock
+                                Margin="10"
+                                VerticalAlignment="Center"
+                                Text="x" />
+                            <TextBox
+                                MinWidth="80"
+                                VerticalAlignment="Center"
+                                Text="{Binding Settings.CustomWindowTop}"
+                                TextWrapping="NoWrap" />
                         </StackPanel>
                     </StackPanel>
                 </cc:Card>
@@ -133,8 +137,7 @@
             </cc:Card>
 
             <cc:CardGroup Margin="0 30 0 0">
-                <cc:Card Title="{DynamicResource querySearchPrecision}"
-                         Sub="{DynamicResource querySearchPrecisionToolTip}">
+                <cc:Card Title="{DynamicResource querySearchPrecision}" Sub="{DynamicResource querySearchPrecisionToolTip}">
                     <ComboBox
                         MaxWidth="200"
                         ItemsSource="{Binding QuerySearchPrecisionStrings}"
@@ -144,17 +147,9 @@
                 <cc:Card Title="{DynamicResource lastQueryMode}" Sub="{DynamicResource lastQueryModeToolTip}">
                     <ComboBox
                         DisplayMemberPath="Display"
-                        SelectedValuePath="Value"
                         ItemsSource="{Binding LastQueryModes}"
-                        SelectedValue="{Binding Settings.LastQueryMode}" />
-                </cc:Card>
-
-                <cc:Card Icon="&#xe8fd;" Title="{DynamicResource maxShowResults}"
-                         Sub="{DynamicResource maxShowResultsToolTip}">
-                    <ComboBox
-                        Width="100"
-                        ItemsSource="{Binding MaxResultsRange}"
-                        SelectedItem="{Binding Settings.MaxResultsToShow}" />
+                        SelectedValue="{Binding Settings.LastQueryMode}"
+                        SelectedValuePath="Value" />
                 </cc:Card>
             </cc:CardGroup>
 
@@ -223,8 +218,7 @@
                 Title="{DynamicResource ShouldUsePinyin}"
                 Icon="&#xe98a;"
                 Sub="{DynamicResource ShouldUsePinyinToolTip}">
-                <ui:ToggleSwitch IsOn="{Binding Settings.ShouldUsePinyin}"
-                                 ToolTip="{DynamicResource ShouldUsePinyinToolTip}" />
+                <ui:ToggleSwitch IsOn="{Binding Settings.ShouldUsePinyin}" ToolTip="{DynamicResource ShouldUsePinyinToolTip}" />
             </cc:Card>
 
             <cc:Card
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml b/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml
index 75853118f..c8425f822 100644
--- a/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml
+++ b/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml
@@ -354,31 +354,6 @@
                     OnContent="{DynamicResource enable}" />
             </cc:Card>
 
-            <!--  Window width size  -->
-            <cc:Card
-                Title="{DynamicResource windowWidthSize}"
-                Icon="&#xe740;"
-                Sub="{DynamicResource windowWidthSizeToolTip}">
-                <StackPanel Orientation="Horizontal">
-                    <TextBlock
-                        Width="Auto"
-                        Margin="0 0 8 2"
-                        VerticalAlignment="Center"
-                        Foreground="{DynamicResource Color05B}"
-                        Text="{Binding WindowWidthSize}"
-                        TextAlignment="Right" />
-                    <Slider
-                        Width="250"
-                        VerticalAlignment="Center"
-                        IsMoveToPointEnabled="True"
-                        IsSnapToTickEnabled="True"
-                        Maximum="1920"
-                        Minimum="400"
-                        TickFrequency="10"
-                        Value="{Binding WindowWidthSize}" />
-                </StackPanel>
-            </cc:Card>
-
             <!--  Theme  -->
             <Border
                 Height="64"