diff --git a/Flow.Launcher.Infrastructure/Constant.cs b/Flow.Launcher.Infrastructure/Constant.cs
index 1503aaf41..99b2bfb50 100644
--- a/Flow.Launcher.Infrastructure/Constant.cs
+++ b/Flow.Launcher.Infrastructure/Constant.cs
@@ -27,5 +27,7 @@ namespace Flow.Launcher.Infrastructure
 
         public static string PythonPath;
         public static string EverythingSDKPath;
+
+        public static readonly string QueryTextBoxIconImagePath = $"{ProgramDirectory}\\Images\\mainsearch.png";
     }
 }
diff --git a/Flow.Launcher/Languages/da.xaml b/Flow.Launcher/Languages/da.xaml
index 4c3d4bd85..24feb61ce 100644
--- a/Flow.Launcher/Languages/da.xaml
+++ b/Flow.Launcher/Languages/da.xaml
@@ -42,7 +42,6 @@
     <!--Setting Theme-->
     <system:String x:Key="theme">Tema</system:String>
     <system:String x:Key="browserMoreThemes">Søg efter flere temaer</system:String>
-    <system:String x:Key="helloFlowLauncher">Hej Flow Launcher</system:String>
     <system:String x:Key="queryBoxFont">Søgefelt skrifttype</system:String>
     <system:String x:Key="resultItemFont">Resultat skrifttype</system:String>
     <system:String x:Key="windowMode">Vindue mode</system:String>
diff --git a/Flow.Launcher/Languages/de.xaml b/Flow.Launcher/Languages/de.xaml
index d1eae3124..08c95208d 100644
--- a/Flow.Launcher/Languages/de.xaml
+++ b/Flow.Launcher/Languages/de.xaml
@@ -42,7 +42,6 @@
     <!--Setting Theme-->
     <system:String x:Key="theme">Theme</system:String>
     <system:String x:Key="browserMoreThemes">Suche nach weiteren Themes</system:String>
-    <system:String x:Key="helloFlowLauncher">Hallo Flow Launcher</system:String>
     <system:String x:Key="queryBoxFont">Abfragebox Schriftart</system:String>
     <system:String x:Key="resultItemFont">Ergebnis Schriftart</system:String>
     <system:String x:Key="windowMode">Fenstermodus</system:String>
diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index 25be19c79..9fb79ff09 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -49,7 +49,7 @@
     <!--Setting Theme-->
     <system:String x:Key="theme">Theme</system:String>
     <system:String x:Key="browserMoreThemes">Browse for more themes</system:String>
-    <system:String x:Key="helloFlowLauncher">Hello Flow Launcher</system:String>
+    <system:String x:Key="hiThere">Hi There</system:String>
     <system:String x:Key="queryBoxFont">Query Box Font</system:String>
     <system:String x:Key="resultItemFont">Result Item Font</system:String>
     <system:String x:Key="windowMode">Window Mode</system:String>
diff --git a/Flow.Launcher/Languages/fr.xaml b/Flow.Launcher/Languages/fr.xaml
index 4ceb06249..a6085c325 100644
--- a/Flow.Launcher/Languages/fr.xaml
+++ b/Flow.Launcher/Languages/fr.xaml
@@ -46,7 +46,6 @@
     <!--Setting Theme-->
     <system:String x:Key="theme">Thèmes</system:String>
     <system:String x:Key="browserMoreThemes">Trouver plus de thèmes</system:String>
-    <system:String x:Key="helloFlowLauncher">Hello Flow Launcher</system:String>
     <system:String x:Key="queryBoxFont">Police (barre de recherche)</system:String>
     <system:String x:Key="resultItemFont">Police (liste des résultats)  </system:String>
     <system:String x:Key="windowMode">Mode fenêtré</system:String>
diff --git a/Flow.Launcher/Languages/it.xaml b/Flow.Launcher/Languages/it.xaml
index 381864f8a..bc8a58c6b 100644
--- a/Flow.Launcher/Languages/it.xaml
+++ b/Flow.Launcher/Languages/it.xaml
@@ -46,7 +46,6 @@
     <!--Setting Theme-->
     <system:String x:Key="theme">Tema</system:String>
     <system:String x:Key="browserMoreThemes">Sfoglia per altri temi</system:String>
-    <system:String x:Key="helloFlowLauncher">Hello Flow Launcher</system:String>
     <system:String x:Key="queryBoxFont">Font campo di ricerca</system:String>
     <system:String x:Key="resultItemFont">Font campo risultati</system:String>
     <system:String x:Key="windowMode">Modalità finestra</system:String>
diff --git a/Flow.Launcher/Languages/ja.xaml b/Flow.Launcher/Languages/ja.xaml
index 0fd5e3e79..72ad872ef 100644
--- a/Flow.Launcher/Languages/ja.xaml
+++ b/Flow.Launcher/Languages/ja.xaml
@@ -47,7 +47,6 @@
     <!--Setting Theme-->
     <system:String x:Key="theme">テーマ</system:String>
     <system:String x:Key="browserMoreThemes">テーマを探す</system:String>
-    <system:String x:Key="helloFlowLauncher">こんにちは Flow Launcher</system:String>
     <system:String x:Key="queryBoxFont">検索ボックスのフォント</system:String>
     <system:String x:Key="resultItemFont">検索結果一覧のフォント</system:String>
     <system:String x:Key="windowMode">ウィンドウモード</system:String>
diff --git a/Flow.Launcher/Languages/ko.xaml b/Flow.Launcher/Languages/ko.xaml
index 2f7d538dc..0352ec9e9 100644
--- a/Flow.Launcher/Languages/ko.xaml
+++ b/Flow.Launcher/Languages/ko.xaml
@@ -46,7 +46,6 @@
     <!--Setting Theme-->
     <system:String x:Key="theme">테마</system:String>
     <system:String x:Key="browserMoreThemes">테마 더 찾아보기</system:String>
-    <system:String x:Key="helloFlowLauncher">Hello Flow Launcher</system:String>
     <system:String x:Key="queryBoxFont">쿼리 상자 글꼴</system:String>
     <system:String x:Key="resultItemFont">결과 항목 글꼴</system:String>
     <system:String x:Key="windowMode">윈도우 모드</system:String>
diff --git a/Flow.Launcher/Languages/nb-NO.xaml b/Flow.Launcher/Languages/nb-NO.xaml
index 035b0cbdf..3081bd0f6 100644
--- a/Flow.Launcher/Languages/nb-NO.xaml
+++ b/Flow.Launcher/Languages/nb-NO.xaml
@@ -46,7 +46,6 @@
     <!--Setting Theme-->
     <system:String x:Key="theme">Tema</system:String>
     <system:String x:Key="browserMoreThemes">Finn flere temaer</system:String>
-    <system:String x:Key="helloFlowLauncher">Hallo Flow Launcher</system:String>
     <system:String x:Key="queryBoxFont">Font for spørringsboks</system:String>
     <system:String x:Key="resultItemFont">Font for resultat</system:String>
     <system:String x:Key="windowMode">Vindusmodus</system:String>
diff --git a/Flow.Launcher/Languages/nl.xaml b/Flow.Launcher/Languages/nl.xaml
index be18beb9c..681c0ade4 100644
--- a/Flow.Launcher/Languages/nl.xaml
+++ b/Flow.Launcher/Languages/nl.xaml
@@ -42,7 +42,6 @@
     <!--Setting Theme-->
     <system:String x:Key="theme">Thema</system:String>
     <system:String x:Key="browserMoreThemes">Zoek meer thema´s</system:String>
-    <system:String x:Key="helloFlowLauncher">Hallo Flow Launcher</system:String>
     <system:String x:Key="queryBoxFont">Query Box lettertype</system:String>
     <system:String x:Key="resultItemFont">Resultaat Item lettertype</system:String>
     <system:String x:Key="windowMode">Window Mode</system:String>
diff --git a/Flow.Launcher/Languages/pl.xaml b/Flow.Launcher/Languages/pl.xaml
index 249878ed3..a430b9cac 100644
--- a/Flow.Launcher/Languages/pl.xaml
+++ b/Flow.Launcher/Languages/pl.xaml
@@ -42,7 +42,6 @@
     <!--Setting Theme-->
     <system:String x:Key="theme">Skórka</system:String>
     <system:String x:Key="browserMoreThemes">Znajdź więcej skórek</system:String>
-    <system:String x:Key="helloFlowLauncher">Witaj Flow Launcher</system:String>
     <system:String x:Key="queryBoxFont">Czcionka okna zapytania</system:String>
     <system:String x:Key="resultItemFont">Czcionka okna wyników</system:String>
     <system:String x:Key="windowMode">Tryb w oknie</system:String>
diff --git a/Flow.Launcher/Languages/pt-br.xaml b/Flow.Launcher/Languages/pt-br.xaml
index 2036744e8..584a73860 100644
--- a/Flow.Launcher/Languages/pt-br.xaml
+++ b/Flow.Launcher/Languages/pt-br.xaml
@@ -46,7 +46,6 @@
     <!--Setting Theme-->
     <system:String x:Key="theme">Tema</system:String>
     <system:String x:Key="browserMoreThemes">Ver mais temas</system:String>
-    <system:String x:Key="helloFlowLauncher">Olá Flow Launcher</system:String>
     <system:String x:Key="queryBoxFont">Fonte da caixa de Consulta</system:String>
     <system:String x:Key="resultItemFont">Fonte do Resultado</system:String>
     <system:String x:Key="windowMode">Modo Janela</system:String>
diff --git a/Flow.Launcher/Languages/ru.xaml b/Flow.Launcher/Languages/ru.xaml
index 66a463dcb..17e90e5c5 100644
--- a/Flow.Launcher/Languages/ru.xaml
+++ b/Flow.Launcher/Languages/ru.xaml
@@ -42,7 +42,6 @@
     <!--Setting Theme-->
     <system:String x:Key="theme">Темы</system:String>
     <system:String x:Key="browserMoreThemes">Найти больше тем</system:String>
-    <system:String x:Key="helloFlowLauncher">Привет Flow Launcher</system:String>
     <system:String x:Key="queryBoxFont">Шрифт запросов</system:String>
     <system:String x:Key="resultItemFont">Шрифт результатов</system:String>
     <system:String x:Key="windowMode">Оконный режим</system:String>
diff --git a/Flow.Launcher/Languages/sk.xaml b/Flow.Launcher/Languages/sk.xaml
index 824096c4c..a2417386d 100644
--- a/Flow.Launcher/Languages/sk.xaml
+++ b/Flow.Launcher/Languages/sk.xaml
@@ -47,7 +47,6 @@
     <!--Setting Theme-->
     <system:String x:Key="theme">Motív</system:String>
     <system:String x:Key="browserMoreThemes">Prehliadať viac motívov</system:String>
-    <system:String x:Key="helloFlowLauncher">Ahoj Flow Launcher</system:String>
     <system:String x:Key="queryBoxFont">Písmo poľa pre dopyt</system:String>
     <system:String x:Key="resultItemFont">Písmo výsledkov</system:String>
     <system:String x:Key="windowMode">Režim okno</system:String>
diff --git a/Flow.Launcher/Languages/sr.xaml b/Flow.Launcher/Languages/sr.xaml
index 22aabb37f..a1860e1bf 100644
--- a/Flow.Launcher/Languages/sr.xaml
+++ b/Flow.Launcher/Languages/sr.xaml
@@ -46,7 +46,6 @@
     <!--Setting Theme-->
     <system:String x:Key="theme">Tema</system:String>
     <system:String x:Key="browserMoreThemes">Pretražite još tema</system:String>
-    <system:String x:Key="helloFlowLauncher">Zdravo Flow Launcher</system:String>
     <system:String x:Key="queryBoxFont">Font upita</system:String>
     <system:String x:Key="resultItemFont">Font rezultata</system:String>
     <system:String x:Key="windowMode">Režim prozora</system:String>
diff --git a/Flow.Launcher/Languages/tr.xaml b/Flow.Launcher/Languages/tr.xaml
index cc287f372..67704c75e 100644
--- a/Flow.Launcher/Languages/tr.xaml
+++ b/Flow.Launcher/Languages/tr.xaml
@@ -48,7 +48,6 @@
     <!--Setting Theme-->
     <system:String x:Key="theme">Temalar</system:String>
     <system:String x:Key="browserMoreThemes">Daha fazla tema bul</system:String>
-    <system:String x:Key="helloFlowLauncher">Merhaba Flow Launcher</system:String>
     <system:String x:Key="queryBoxFont">Pencere Yazı Tipi</system:String>
     <system:String x:Key="resultItemFont">Sonuç Yazı Tipi</system:String>
     <system:String x:Key="windowMode">Pencere Modu</system:String>
diff --git a/Flow.Launcher/Languages/uk-UA.xaml b/Flow.Launcher/Languages/uk-UA.xaml
index c7e84c231..c3ca9d514 100644
--- a/Flow.Launcher/Languages/uk-UA.xaml
+++ b/Flow.Launcher/Languages/uk-UA.xaml
@@ -42,7 +42,6 @@
     <!--Setting Theme-->
     <system:String x:Key="theme">Теми</system:String>
     <system:String x:Key="browserMoreThemes">Знайти більше тем</system:String>
-    <system:String x:Key="helloFlowLauncher">Привіт Flow Launcher</system:String>
     <system:String x:Key="queryBoxFont">Шрифт запитів</system:String>
     <system:String x:Key="resultItemFont">Шрифт результатів</system:String>
     <system:String x:Key="windowMode">Віконний режим</system:String>
diff --git a/Flow.Launcher/Languages/zh-cn.xaml b/Flow.Launcher/Languages/zh-cn.xaml
index 5801b678a..d667df621 100644
--- a/Flow.Launcher/Languages/zh-cn.xaml
+++ b/Flow.Launcher/Languages/zh-cn.xaml
@@ -47,7 +47,6 @@
     <!--设置，主题-->
     <system:String x:Key="theme">主题</system:String>
     <system:String x:Key="browserMoreThemes">浏览更多主题</system:String>
-    <system:String x:Key="helloFlowLauncher">你好，Flow Launcher</system:String>
     <system:String x:Key="queryBoxFont">查询框字体</system:String>
     <system:String x:Key="resultItemFont">结果项字体</system:String>
     <system:String x:Key="windowMode">窗口模式</system:String>
diff --git a/Flow.Launcher/Languages/zh-tw.xaml b/Flow.Launcher/Languages/zh-tw.xaml
index f1df1a6d5..b929f57be 100644
--- a/Flow.Launcher/Languages/zh-tw.xaml
+++ b/Flow.Launcher/Languages/zh-tw.xaml
@@ -42,7 +42,6 @@
     <!--設定，主題-->
     <system:String x:Key="theme">主題</system:String>
     <system:String x:Key="browserMoreThemes">瀏覽更多主題</system:String>
-    <system:String x:Key="helloFlowLauncher">你好，Flow Launcher</system:String>
     <system:String x:Key="queryBoxFont">查詢框字體</system:String>
     <system:String x:Key="resultItemFont">結果項字體</system:String>
     <system:String x:Key="windowMode">視窗模式</system:String>
diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index 2c4d13f27..eb643c366 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -222,14 +222,16 @@
                     <StackPanel Background="{Binding PreviewBackground}" Grid.Row="0" Margin="0">
                         <StackPanel Orientation="Horizontal" Margin="10"
                                     HorizontalAlignment="Center" VerticalAlignment="Center">
-                            <Border Width="500" Style="{DynamicResource WindowBorderStyle}">
+                            <Border Width="500" Style="{DynamicResource WindowBorderStyle}" CornerRadius="5">
                                 <Grid>
                                     <Grid.RowDefinitions>
                                         <RowDefinition Height="50" />
                                         <RowDefinition />
                                     </Grid.RowDefinitions>
-                                    <TextBox Text="{DynamicResource helloFlowLauncher}" IsReadOnly="True"
-                                             Style="{DynamicResource QueryBoxStyle}" Grid.Row="0" />
+                                    <TextBox Text="{DynamicResource hiThere}" IsReadOnly="True"
+                                             Style="{DynamicResource QueryBoxStyle}" Grid.Row="0" 
+                                             Margin="18 0 56 0" />
+                                    <Image Source="{Binding ThemeImage}" HorizontalAlignment="Right" />
                                     <ContentControl Visibility="Visible" Grid.Row="1">
                                         <flowlauncher:ResultListBox DataContext="{Binding PreviewResults}" />
                                     </ContentControl>
diff --git a/Flow.Launcher/ViewModel/MainViewModel.cs b/Flow.Launcher/ViewModel/MainViewModel.cs
index 8c6e251e9..b63dc0fca 100644
--- a/Flow.Launcher/ViewModel/MainViewModel.cs
+++ b/Flow.Launcher/ViewModel/MainViewModel.cs
@@ -279,7 +279,7 @@ namespace Flow.Launcher.ViewModel
         public ICommand LoadHistoryCommand { get; set; }
         public ICommand OpenResultCommand { get; set; }
 
-        public ImageSource Image => ImageLoader.Load($"{Constant.ProgramDirectory}\\Images\\mainsearch.png");
+        public ImageSource Image => ImageLoader.Load(Constant.QueryTextBoxIconImagePath);
 
         #endregion
 
diff --git a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
index 34dc4b9e9..8f82cb52e 100644
--- a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
+++ b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
@@ -13,6 +13,7 @@ using Flow.Launcher.Core.Plugin;
 using Flow.Launcher.Core.Resource;
 using Flow.Launcher.Helper;
 using Flow.Launcher.Infrastructure;
+using Flow.Launcher.Infrastructure.Image;
 using Flow.Launcher.Infrastructure.Storage;
 using Flow.Launcher.Infrastructure.UserSettings;
 using Flow.Launcher.Plugin;
@@ -424,6 +425,8 @@ namespace Flow.Launcher.ViewModel
             }
         }
 
+        public ImageSource ThemeImage => ImageLoader.Load(Constant.QueryTextBoxIconImagePath);
+
         #endregion
 
         #region hotkey