Use consistent new icons

https://icons8.com

Plugins/Wox.Plugin.Sys/Sys.cs

@@ -81,7 +81,7 @@ namespace Wox.Plugin.Sys
                 {
                     Title = "Shutdown",
                     SubTitle = context.API.GetTranslation("wox_plugin_sys_shutdown_computer"),
-                    IcoPath = "Images\\exit.png",
+                    IcoPath = "Images\\shutdown.png",
                     Action = c =>
                     {
                         var reuslt = MessageBox.Show("Are you sure you want to shut the computer down?",
@@ -97,7 +97,7 @@ namespace Wox.Plugin.Sys
                 {
                     Title = "Restart",
                     SubTitle = context.API.GetTranslation("wox_plugin_sys_restart_computer"),
-                    IcoPath = "Images\\restartcomp.png",
+                    IcoPath = "Images\\restart.png",
                     Action = c =>
                     {
                         var result = MessageBox.Show("Are you sure you want to restart the computer?",
@@ -169,7 +169,7 @@ namespace Wox.Plugin.Sys
                 {
                     Title = "Restart Wox",
                     SubTitle = context.API.GetTranslation("wox_plugin_sys_restart"),
-                    IcoPath = "Images\\restart.png",
+                    IcoPath = "Images\\app.png",
                     Action = c =>
                     {
                         context.API.RestarApp();

Plugins/Wox.Plugin.Sys/Wox.Plugin.Sys.csproj

@@ -74,9 +74,6 @@
     <Content Include="Images\recyclebin.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Images\restartcomp.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="Images\sleep.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -116,11 +113,6 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="Images\exit.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
   <ItemGroup>
     <None Include="Images\logoff.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -141,6 +133,9 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Images\Images\" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

Wox/ImageLoader/ImageLoader.cs

@@ -40,7 +40,7 @@ namespace Wox.ImageLoader
         };
 
         private readonly ImageCache _cache;
-        private  readonly BinaryStorage<ImageCache> _storage;
+        private readonly BinaryStorage<ImageCache> _storage;
 
         public ImageLoader()
         {
@@ -93,7 +93,7 @@ namespace Wox.ImageLoader
         public ImageSource Load(string path, bool addToCache = true)
         {
             if (string.IsNullOrEmpty(path)) return null;
-            ImageSource img = null;
+            ImageSource image = null;
             Stopwatch.Debug($"Loading image path: {path}", () =>
             {
 
@@ -105,7 +105,7 @@ namespace Wox.ImageLoader
 
                 if (_imageSources.ContainsKey(path))
                 {
-                    img = _imageSources[path];
+                    image = _imageSources[path];
                 }
                 else
                 {
@@ -113,27 +113,43 @@ namespace Wox.ImageLoader
 
                     if (path.StartsWith("data:", StringComparison.OrdinalIgnoreCase))
                     {
-                        img = new BitmapImage(new Uri(path));
+                        image = new BitmapImage(new Uri(path));
                     }
                     else if (SelfExts.Contains(ext) && File.Exists(path))
                     {
-                        img = GetIcon(path);
+                        image = GetIcon(path);
                     }
-                    else if (!string.IsNullOrEmpty(path) && ImageExts.Contains(ext) && File.Exists(path))
+                    else if (!string.IsNullOrEmpty(path) && ImageExts.Contains(ext))
                     {
-                        img = new BitmapImage(new Uri(path));
+                        if (File.Exists(path))
+                        {
+                            image = new BitmapImage(new Uri(path));
+                        }
+                        else
+                        {
+                            path = Path.Combine(WoxDirectroy.Executable, "Images", Path.GetFileName(path));
+                            if (File.Exists(path))
+                            {
+                                image = new BitmapImage(new Uri(path));
+                            }
+                            else
+                            {
+                                path = Path.Combine(WoxDirectroy.Executable, "Images", "app.png");
+                                image = new BitmapImage(new Uri(path));
+                            }
+                        }
                     }
 
-                    if (img != null && addToCache)
+                    if (image != null && addToCache)
                     {
                         if (!_imageSources.ContainsKey(path))
                         {
-                            _imageSources[path] = img;
+                            _imageSources[path] = image;
                         }
                     }
                 }
             });
-            return img;
+            return image;
         }
 
         // http://blogs.msdn.com/b/oldnewthing/archive/2011/01/27/10120844.aspx