diff --git a/Flow.Launcher/HotkeyControlDialog.xaml b/Flow.Launcher/HotkeyControlDialog.xaml
index 1edce6d0634..d416f1bdcda 100644
--- a/Flow.Launcher/HotkeyControlDialog.xaml
+++ b/Flow.Launcher/HotkeyControlDialog.xaml
@@ -125,12 +125,12 @@
             BorderThickness="0 1 0 0"
             CornerRadius="0 0 8 8">
             <StackPanel
-                Margin="10"
+                Margin="10 9 10 10"
                 HorizontalAlignment="Center"
                 Orientation="Horizontal">
                 <Button
                     x:Name="OverwriteBtn"
-                    Height="30"
+                    MinHeight="36"
                     MinWidth="100"
                     Margin="0 0 4 0"
                     Click="Overwrite"
@@ -139,26 +139,26 @@
                     Visibility="Collapsed" />
                 <Button
                     x:Name="SaveBtn"
-                    Height="30"
+                    MinHeight="36"
                     MinWidth="100"
                     Margin="0 0 4 0"
                     Click="Save"
                     Content="{DynamicResource commonSave}"
                     Style="{StaticResource AccentButtonStyle}" />
                 <Button
-                    Height="30"
+                    MinHeight="36"
                     MinWidth="100"
                     Margin="4 0 4 0"
                     Click="Reset"
                     Content="{DynamicResource commonReset}" />
                 <Button
-                    Height="30"
+                    MinHeight="36"
                     MinWidth="100"
                     Margin="4 0 4 0"
                     Click="Delete"
                     Content="{DynamicResource commonDelete}" />
                 <Button
-                    Height="30"
+                    MinHeight="36"
                     MinWidth="100"
                     Margin="4 0 0 0"
                     Click="Cancel"
diff --git a/Flow.Launcher/Resources/Pages/WelcomePage1.xaml b/Flow.Launcher/Resources/Pages/WelcomePage1.xaml
index b6a99d9e993..ea651d4ee7e 100644
--- a/Flow.Launcher/Resources/Pages/WelcomePage1.xaml
+++ b/Flow.Launcher/Resources/Pages/WelcomePage1.xaml
@@ -103,7 +103,7 @@
         <Grid>
             <Grid.RowDefinitions>
                 <RowDefinition Height="250" />
-                <RowDefinition />
+                <RowDefinition Height="340"/>
             </Grid.RowDefinitions>
 
             <Border Grid.Row="0" HorizontalAlignment="Stretch">
@@ -140,7 +140,7 @@
             </Border>
 
 
-            <Canvas Grid.Row="1" Height="288">
+            <Canvas Grid.Row="1" Height="338">
                 <Image
                     Name="wizard"
                     Canvas.Right="30"
@@ -156,7 +156,7 @@
                         <TextBlock
                             FontSize="20"
                             FontWeight="SemiBold"
-                            Text="{DynamicResource Welcome_Page1_Title}" />
+                            Text="{DynamicResource Welcome_Page1_Title}" TextWrapping="WrapWithOverflow"/>
                         <TextBlock
                             Margin="0 10 24 0"
                             FontSize="14"
diff --git a/Flow.Launcher/Resources/Pages/WelcomePage2.xaml b/Flow.Launcher/Resources/Pages/WelcomePage2.xaml
index ca00091f5e3..cf0dff9ab37 100644
--- a/Flow.Launcher/Resources/Pages/WelcomePage2.xaml
+++ b/Flow.Launcher/Resources/Pages/WelcomePage2.xaml
@@ -38,7 +38,7 @@
         <Grid>
             <Grid.RowDefinitions>
                 <RowDefinition Height="250" />
-                <RowDefinition />
+                <RowDefinition Height="340"/>
             </Grid.RowDefinitions>
 
             <Border Grid.Row="0" HorizontalAlignment="Stretch">
@@ -89,12 +89,12 @@
                 </StackPanel>
             </Border>
 
-            <StackPanel Grid.Row="1" Margin="24 20 24 20">
-                <StackPanel>
+            <ScrollViewer Grid.Row="1" VerticalScrollBarVisibility="Visible">
+                <StackPanel  Margin="24 20 24 20">
                     <TextBlock
                         FontSize="20"
                         FontWeight="SemiBold"
-                        Text="{DynamicResource Welcome_Page2_Title}" />
+                        Text="{DynamicResource Welcome_Page2_Title}" TextWrapping="WrapWithOverflow"/>
                     <TextBlock
                         Margin="0 10 0 0"
                         FontSize="14"
@@ -119,7 +119,7 @@
                         WindowTitle="{DynamicResource flowlauncherHotkey}" />
                 </StackPanel>
 
-            </StackPanel>
+            </ScrollViewer>
         </Grid>
     </ScrollViewer>
 </ui:Page>
diff --git a/Flow.Launcher/Resources/Pages/WelcomePage4.xaml b/Flow.Launcher/Resources/Pages/WelcomePage4.xaml
index e57718775c1..c319d7c6e16 100644
--- a/Flow.Launcher/Resources/Pages/WelcomePage4.xaml
+++ b/Flow.Launcher/Resources/Pages/WelcomePage4.xaml
@@ -93,7 +93,7 @@
                     <TextBlock
                         FontSize="20"
                         FontWeight="SemiBold"
-                        Text="{DynamicResource Welcome_Page4_Title}" />
+                        Text="{DynamicResource Welcome_Page4_Title}" TextWrapping="WrapWithOverflow"/>
                     <TextBlock
                         Margin="0 10 0 10"
                         FontSize="14"
diff --git a/Flow.Launcher/Resources/Pages/WelcomePage5.xaml b/Flow.Launcher/Resources/Pages/WelcomePage5.xaml
index 7495231aece..997f724b9ed 100644
--- a/Flow.Launcher/Resources/Pages/WelcomePage5.xaml
+++ b/Flow.Launcher/Resources/Pages/WelcomePage5.xaml
@@ -53,7 +53,7 @@
         <Grid>
             <Grid.RowDefinitions>
                 <RowDefinition Height="250" />
-                <RowDefinition />
+                <RowDefinition Height="340"/>
             </Grid.RowDefinitions>
 
             <Border Grid.Row="0" HorizontalAlignment="Stretch">
@@ -79,18 +79,18 @@
                 </StackPanel>
             </Border>
 
-            <StackPanel Grid.Row="1" Margin="24 20 24 20">
+            <StackPanel Grid.Row="1" Margin="24 20 24 20" >
                 <StackPanel>
                     <TextBlock
                         FontSize="20"
                         FontWeight="SemiBold"
-                        Text="{DynamicResource Welcome_Page5_Title}" />
+                        Text="{DynamicResource Welcome_Page5_Title}" TextWrapping="WrapWithOverflow"/>
                     <TextBlock
                         Margin="0 10 0 0"
                         FontSize="14"
                         Text="{DynamicResource Welcome_Page5_Text01}"
                         TextWrapping="WrapWithOverflow" />
-                    <StackPanel Margin="0 30 0 0" Orientation="Horizontal">
+                    <StackPanel Margin="0 20 0 0" Orientation="Horizontal">
                         <CheckBox
                             Checked="OnAutoStartupChecked"
                             Content="{DynamicResource startFlowLauncherOnSystemStartup}"
@@ -109,7 +109,7 @@
                     <Button
                         Width="150"
                         Height="40"
-                        Margin="0 60 0 0"
+                        Margin="0 102 0 0"
                         HorizontalAlignment="Right"
                         Click="BtnCancel_OnClick"
                         Content="{DynamicResource done}"
diff --git a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneGeneralViewModel.cs b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneGeneralViewModel.cs
index eac40099bfb..bec59a2b187 100644
--- a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneGeneralViewModel.cs
+++ b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneGeneralViewModel.cs
@@ -177,6 +177,8 @@ private void UpdateEnumDropdownLocalizations()
         DropdownDataGeneric<SearchWindowAligns>.UpdateLabels(SearchWindowAligns);
         DropdownDataGeneric<SearchPrecisionScore>.UpdateLabels(SearchPrecisionScores);
         DropdownDataGeneric<LastQueryMode>.UpdateLabels(LastQueryModes);
+        // Since we are using Binding instead of DynamicResource, we need to manually trigger the update
+        OnPropertyChanged(nameof(AlwaysPreviewToolTip));
     }
 
     public string Language
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml b/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml
index 7ca9941e692..c3901a7462c 100644
--- a/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml
+++ b/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml
@@ -154,7 +154,7 @@
                 Title="{DynamicResource AlwaysPreview}"
                 Margin="0 14 0 0"
                 Icon="&#xe8a1;"
-                Sub="{DynamicResource AlwaysPreviewToolTip}">
+                Sub="{Binding AlwaysPreviewToolTip}">
                 <ui:ToggleSwitch
                     IsOn="{Binding Settings.AlwaysPreview}"
                     OffContent="{DynamicResource disable}"
@@ -352,7 +352,6 @@
                     Title="{DynamicResource KoreanImeTitle}"
                     Margin="0 14 0 0"
                     Closable="False"
-                    DataContext="{Binding RelativeSource={RelativeSource AncestorType=Border}, Path=DataContext}"
                     IsIconVisible="True"
                     Length="Long"
                     Message="{DynamicResource KoreanImeGuide}"
diff --git a/Flow.Launcher/WelcomeWindow.xaml b/Flow.Launcher/WelcomeWindow.xaml
index 5d91db749f6..f008827daea 100644
--- a/Flow.Launcher/WelcomeWindow.xaml
+++ b/Flow.Launcher/WelcomeWindow.xaml
@@ -10,11 +10,11 @@
     Name="FlowWelcomeWindow"
     Title="{DynamicResource Welcome_Page1_Title}"
     Width="550"
-    Height="650"
+    Height="700"
     MinWidth="550"
-    MinHeight="650"
+    MinHeight="700"
     MaxWidth="550"
-    MaxHeight="650"
+    MaxHeight="700"
     d:DataContext="{d:DesignInstance Type=vm:WelcomeViewModel}"
     Activated="OnActivated"
     Background="{DynamicResource Color00B}"