diff --git a/Flow.Launcher/Images/Error.png b/Flow.Launcher/Images/Error.png
index 74acc5d0e..4bdcd80f9 100644
Binary files a/Flow.Launcher/Images/Error.png and b/Flow.Launcher/Images/Error.png differ
diff --git a/Flow.Launcher/Images/Exclamation.png b/Flow.Launcher/Images/Exclamation.png
index f9fed80ee..a9d99362c 100644
Binary files a/Flow.Launcher/Images/Exclamation.png and b/Flow.Launcher/Images/Exclamation.png differ
diff --git a/Flow.Launcher/Images/Information.png b/Flow.Launcher/Images/Information.png
index 4043ed98a..779e22dc1 100644
Binary files a/Flow.Launcher/Images/Information.png and b/Flow.Launcher/Images/Information.png differ
diff --git a/Flow.Launcher/Images/Question.png b/Flow.Launcher/Images/Question.png
index 4cb539230..6ca093f6d 100644
Binary files a/Flow.Launcher/Images/Question.png and b/Flow.Launcher/Images/Question.png differ
diff --git a/Flow.Launcher/MessageBoxEx.xaml b/Flow.Launcher/MessageBoxEx.xaml
index 5869fb4bc..8a155a282 100644
--- a/Flow.Launcher/MessageBoxEx.xaml
+++ b/Flow.Launcher/MessageBoxEx.xaml
@@ -72,8 +72,11 @@
                     Grid.Column="0"
                     Width="18"
                     Height="18"
-                    Margin="30,0,10,0"
+                    Margin="30,10,0,0"
                     HorizontalAlignment="Left"
+                    VerticalAlignment="Top"
+                    RenderOptions.BitmapScalingMode="Fant"
+                    Stretch="UniformToFill"
                     Visibility="Collapsed" />
                 <TextBlock
                     x:Name="TitleTextBlock"
@@ -117,19 +120,19 @@
                     MinWidth="140"
                     Margin="5,0,5,0"
                     Click="Button_Click"
-                    Content="{DynamicResource cancel}" />
+                    Content="No" />
                 <Button
                     x:Name="btnOk"
                     MinWidth="140"
                     Margin="5,0,5,0"
                     Click="Button_Click"
-                    Content="{DynamicResource done}" />
+                    Content="OK" />
                 <Button
                     x:Name="btnYes"
                     MinWidth="140"
                     Margin="5,0,5,0"
                     Click="Button_Click"
-                    Content="{DynamicResource done}" />
+                    Content="Yes" />
             </WrapPanel>
         </Border>
     </Grid>
diff --git a/Flow.Launcher/MessageBoxEx.xaml.cs b/Flow.Launcher/MessageBoxEx.xaml.cs
index be3f1fd99..ea30165d7 100644
--- a/Flow.Launcher/MessageBoxEx.xaml.cs
+++ b/Flow.Launcher/MessageBoxEx.xaml.cs
@@ -13,6 +13,8 @@ using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Shapes;
 using Flow.Launcher.Core.Resource;
+using Flow.Launcher.Infrastructure;
+using Flow.Launcher.Infrastructure.Image;
 using YamlDotNet.Core.Tokens;
 
 namespace Flow.Launcher
@@ -145,15 +147,19 @@ namespace Flow.Launcher
             {
                 case MessageBoxImage.Warning:
                     msgBox.SetImage("Warning.png");
+                    msgBox.Img.Visibility = Visibility.Visible;
                     break;
                 case MessageBoxImage.Question:
                     msgBox.SetImage("Question.png");
+                    msgBox.Img.Visibility = Visibility.Visible;
                     break;
                 case MessageBoxImage.Information:
                     msgBox.SetImage("Information.png");
+                    msgBox.Img.Visibility = Visibility.Visible;
                     break;
                 case MessageBoxImage.Error:
                     msgBox.SetImage("Error.png");
+                    msgBox.Img.Visibility = Visibility.Visible;
                     break;
                 default:
                     msgBox.Img.Visibility = Visibility.Collapsed;
@@ -162,7 +168,8 @@ namespace Flow.Launcher
         }
         private void SetImage(string imageName)
         {
-            string uri = string.Format("/Images/{0}", imageName);
+            //string uri = string.Format("/Resources/Images/{0}", imageName);
+            string uri = Constant.ProgramDirectory + "/Images/" + imageName;
             var uriSource = new Uri(uri, UriKind.RelativeOrAbsolute);
             Img.Source = new BitmapImage(uriSource);
         }
diff --git a/Flow.Launcher/SettingWindow.xaml.cs b/Flow.Launcher/SettingWindow.xaml.cs
index f133f5593..da374a125 100644
--- a/Flow.Launcher/SettingWindow.xaml.cs
+++ b/Flow.Launcher/SettingWindow.xaml.cs
@@ -20,6 +20,7 @@ using System.Windows.Input;
 using System.Windows.Interop;
 using System.Windows.Media;
 using System.Windows.Navigation;
+using static Flow.Launcher.MessageBoxEx;
 using static System.Windows.Forms.VisualStyles.VisualStyleElement.Window;
 using Button = System.Windows.Controls.Button;
 using Control = System.Windows.Controls.Control;
@@ -280,7 +281,7 @@ namespace Flow.Launcher
         }
         private void OpenTestBtn(object sender, RoutedEventArgs e)
         {
-            var messageBoxResult = MessageBoxEx.Show("The TitleBarBackground property can be used to set the background for the Title bar. ... The following screen shots illustrate the title bar background changes.", "This is Title Part This is Title Part This is Title Part This is Title Part");                
+            var messageBoxResult = MessageBoxEx.Show("Yes, This is sucks", "MessageBox is bad?", MessageBoxType.ConfirmationWithYesNo);                
         }
         private void OpenLogFolder(object sender, RoutedEventArgs e)
         {