diff --git a/Niv.csproj b/Niv.csproj
index be7b42c..3082cd6 100644
--- a/Niv.csproj
+++ b/Niv.csproj
@@ -51,6 +51,9 @@
   <PropertyGroup>
     <StartupObject>Niv.App</StartupObject>
   </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>res\Niv.ico</ApplicationIcon>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Data" />
@@ -101,10 +104,10 @@
     <Compile Include="prop\AssemblyInfo.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="resx\Languages.en-US.Designer.cs">
+    <Compile Include="resx\Languages.Designer.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
-      <DependentUpon>Languages.en-US.resx</DependentUpon>
+      <DependentUpon>Languages.resx</DependentUpon>
     </Compile>
     <Compile Include="prop\Settings.Designer.cs">
       <AutoGen>True</AutoGen>
@@ -123,9 +126,9 @@
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Languages.zh-CN.Designer.cs</LastGenOutput>
     </EmbeddedResource>
-    <EmbeddedResource Include="resx\Languages.en-US.resx">
+    <EmbeddedResource Include="resx\Languages.resx">
       <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Languages.en-US.Designer.cs</LastGenOutput>
+      <LastGenOutput>Languages.Designer.cs</LastGenOutput>
     </EmbeddedResource>
     <None Include="prop\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
@@ -142,7 +145,7 @@
   </ItemGroup>
   <ItemGroup />
   <ItemGroup>
-    <Resource Include="res\Niv.png" />
+    <Resource Include="res\Niv.ico" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/exe/Niv.exe b/exe/Niv.exe
new file mode 100644
index 0000000..27c6aaa
Binary files /dev/null and b/exe/Niv.exe differ
diff --git a/prop/AssemblyInfo.cs b/prop/AssemblyInfo.cs
index 9cf63d2..b00b021 100644
--- a/prop/AssemblyInfo.cs
+++ b/prop/AssemblyInfo.cs
@@ -8,9 +8,9 @@
 [assembly: AssemblyDescription("A fast compact image viewer on Windows")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Jarvis Niu")]
-[assembly: AssemblyProduct("Niv")]
+[assembly: AssemblyProduct("Niv - Niu Image Viewer")]
 [assembly: AssemblyCopyright("Copyright ©  2016")]
-[assembly: AssemblyTrademark("")]
+[assembly: AssemblyTrademark("Niv")]
 [assembly: AssemblyCulture("")]
 
 [assembly: ComVisible(false)]
diff --git a/res/Niv.ico b/res/Niv.ico
new file mode 100644
index 0000000..bc673ca
Binary files /dev/null and b/res/Niv.ico differ
diff --git a/res/Niv.png b/res/Niv.png
deleted file mode 100644
index 522d671..0000000
Binary files a/res/Niv.png and /dev/null differ
diff --git a/resx/Languages.Designer.cs b/resx/Languages.Designer.cs
new file mode 100644
index 0000000..ba91238
--- /dev/null
+++ b/resx/Languages.Designer.cs
@@ -0,0 +1,81 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码由工具生成。
+//     运行时版本:4.0.30319.42000
+//
+//     对此文件的更改可能会导致不正确的行为，并且如果
+//     重新生成代码，这些更改将会丢失。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Niv.resx {
+    using System;
+    
+    
+    /// <summary>
+    ///   一个强类型的资源类，用于查找本地化的字符串等。
+    /// </summary>
+    // 此类是由 StronglyTypedResourceBuilder
+    // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
+    // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen
+    // (以 /str 作为命令选项)，或重新生成 VS 项目。
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Languages {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Languages() {
+        }
+        
+        /// <summary>
+        ///   返回此类使用的缓存的 ResourceManager 实例。
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Niv.resx.Languages", typeof(Languages).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   使用此强类型资源类，为所有资源查找
+        ///   重写当前线程的 CurrentUICulture 属性。
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 [DATA MISSING] 的本地化字符串。
+        /// </summary>
+        internal static string _missing {
+            get {
+                return ResourceManager.GetString("_missing", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Niv 的本地化字符串。
+        /// </summary>
+        internal static string appName {
+            get {
+                return ResourceManager.GetString("appName", resourceCulture);
+            }
+        }
+    }
+}
diff --git a/resx/Languages.en-US.Designer.cs b/resx/Languages.en-US.Designer.cs
deleted file mode 100644
index e69de29..0000000
diff --git a/resx/Languages.en-US.resx b/resx/Languages.resx
similarity index 99%
rename from resx/Languages.en-US.resx
rename to resx/Languages.resx
index 1758411..04ee5c8 100644
--- a/resx/Languages.en-US.resx
+++ b/resx/Languages.resx
@@ -118,7 +118,7 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="appName" xml:space="preserve">
-    <value>Niv Image Viewer</value>
+    <value>Niv</value>
   </data>
   <data name="_missing" xml:space="preserve">
     <value>[DATA MISSING]</value>
diff --git a/resx/Resources.Designer.cs b/resx/Resources.Designer.cs
index 1d75296..c12a10e 100644
--- a/resx/Resources.Designer.cs
+++ b/resx/Resources.Designer.cs
@@ -59,15 +59,5 @@ internal Resources() {
                 resourceCulture = value;
             }
         }
-        
-        /// <summary>
-        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
-        /// </summary>
-        internal static System.Drawing.Bitmap Niv {
-            get {
-                object obj = ResourceManager.GetObject("Niv", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
     }
 }
diff --git a/resx/Resources.resx b/resx/Resources.resx
index 33be117..7080a7d 100644
--- a/resx/Resources.resx
+++ b/resx/Resources.resx
@@ -117,8 +117,4 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="Niv" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\res\Niv.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
 </root>
\ No newline at end of file
diff --git a/src/I18N.cs b/src/I18N.cs
index ef62611..8740379 100644
--- a/src/I18N.cs
+++ b/src/I18N.cs
@@ -22,8 +22,15 @@ static I18N()
             currLang = Thread.CurrentThread.CurrentCulture.Name;
             if (currLang != "zh-CN" && currLang != "zh-TW") currLang = "en-US";
             // currLang = "zh-TW";
-
-            cultureInfo = new CultureInfo(currLang, true);
+            try
+            {
+                cultureInfo = new CultureInfo(currLang, true);
+            }
+            catch (Exception ex)
+            {
+                currLang = "en-US";
+                cultureInfo = new CultureInfo(currLang, true);
+            }
             resManager = new ResourceManager("Niv.resx.Languages", Assembly.GetExecutingAssembly());
         }
 
diff --git a/win/Niv.xaml b/win/Niv.xaml
index bad67e1..3b89d4d 100644
--- a/win/Niv.xaml
+++ b/win/Niv.xaml
@@ -5,6 +5,6 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:Niv"
         mc:Ignorable="d"
-        Title="MainWindow" Height="350" Width="525" Loaded="window_Loaded" WindowStartupLocation="CenterScreen" WindowState="Maximized">
+        Title="MainWindow" Height="350" Width="525" Loaded="window_Loaded" WindowStartupLocation="CenterScreen" WindowState="Maximized" Icon="/Niv;component/res/Niv.ico">
     <Grid/>
 </Window>