diff --git a/CHANGELOG.md b/CHANGELOG.md
index f598cb76..8b91afc1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -58,7 +58,6 @@ Expected release date: 2016-07-16
 - Fixed authentication dialog not working for proxy.
 
 #### Windows
-- Fixed the pixelated app icon on the top left of the main window.
 - Fixed the blurred system tray icon.
 - Fixed a redundant description appearing in the pinned start menu on Windows 7.
 
diff --git a/src/main.js b/src/main.js
index 827902b4..ddcf0a25 100644
--- a/src/main.js
+++ b/src/main.js
@@ -319,7 +319,9 @@ app.on('ready', function() {
     // follow Electron's defaults
     window_options = {};
   }
-  if (process.platform === 'linux') {
+  if (process.platform === 'win32' || process.platform === 'linux') {
+    // On HiDPI(125%) Windows environment, the taskbar icon is pixelated. So this line is necessary. See #192.
+    // As the side effect, #98 reoccurs.
     window_options.icon = path.resolve(__dirname, 'resources/appicon.png');
   }
   window_options.title = app.getName();