diff --git a/Flow.Launcher/MainWindow.xaml b/Flow.Launcher/MainWindow.xaml
index 54c577f84..136a90fcf 100644
--- a/Flow.Launcher/MainWindow.xaml
+++ b/Flow.Launcher/MainWindow.xaml
@@ -313,7 +313,7 @@
                         Visibility="Collapsed">
                         <Border Style="{DynamicResource PreviewBorderStyle}" Visibility="{Binding ShowDefaultPreview}">
                             <Grid
-                                Margin="10,0,10,0"
+                                Margin="20,0,10,0"
                                 VerticalAlignment="Center"
                                 Background="Transparent">
                                 <Grid.RowDefinitions>
@@ -325,8 +325,9 @@
                                     x:Name="ImageIcon"
                                     Grid.Row="0"
                                     Grid.Column="0"
-                                    Height="128"
-                                    Margin="0,0,0,8"
+                                    MaxWidth="{Binding ActualWidth, ElementName=Preview}"
+                                    MaxHeight="400"
+                                    Margin="0,10,0,8"
                                     HorizontalAlignment="Center"
                                     Source="{Binding PreviewImage}"
                                     Visibility="{Binding ShowIcon}" />
@@ -343,10 +344,10 @@
                                 <TextBlock
                                     x:Name="SubTitle"
                                     Grid.Row="2"
-                                    Margin="0,12,0,0"
+                                    Margin="0,2,0,10"
                                     HorizontalAlignment="Stretch"
                                     FontSize="13"
-                                    LineHeight="22"
+                                    LineHeight="18"
                                     Style="{DynamicResource ItemSubTitleStyle}"
                                     Text="{Binding Result.SubTitle}"
                                     TextAlignment="Center"
diff --git a/Flow.Launcher/ViewModel/ResultViewModel.cs b/Flow.Launcher/ViewModel/ResultViewModel.cs
index 6feb9d501..2ea116029 100644
--- a/Flow.Launcher/ViewModel/ResultViewModel.cs
+++ b/Flow.Launcher/ViewModel/ResultViewModel.cs
@@ -190,7 +190,7 @@ namespace Flow.Launcher.ViewModel
             var imagePath = Result.PreviewImage ?? Result.IcoPath;
             // We need to modify the property not field here to trigger the OnPropertyChanged event
             //PreviewImage = await Task.Run(() => ImageLoader.Load(imagePath, true)).ConfigureAwait(false);
-            PreviewImage = ShellFile.FromFilePath(imagePath).Thumbnail.LargeBitmapSource;
+            PreviewImage = ShellFile.FromFilePath(imagePath).Thumbnail.ExtraLargeBitmapSource;
         }
 
         public Result Result { get; }