diff --git a/src/main/java/io/bitsquare/app/gui/BitsquareApp.java b/src/main/java/io/bitsquare/app/gui/BitsquareApp.java
index 4ad164e288..7ba831bac1 100644
--- a/src/main/java/io/bitsquare/app/gui/BitsquareApp.java
+++ b/src/main/java/io/bitsquare/app/gui/BitsquareApp.java
@@ -129,8 +129,10 @@ public class BitsquareApp extends Application {
         String iconPath;
         if (Utilities.isOSX())
             iconPath = ImageUtil.isRetina() ? "/images/window_icon@2x.png" : "/images/window_icon.png";
+        else if (Utilities.isWindows())
+            iconPath = "/images/taskbar_icon_windows.png";
         else
-            iconPath = "/images/taskbar_icon.png";
+            iconPath = "/images/taskbar_icon_linux.png";
 
         if (iconPath != null)
             primaryStage.getIcons().add(new Image(getClass().getResourceAsStream(iconPath)));
diff --git a/src/main/resources/images/taskbar_icon_linux.png b/src/main/resources/images/taskbar_icon_linux.png
new file mode 100644
index 0000000000..bc04a6bd4b
Binary files /dev/null and b/src/main/resources/images/taskbar_icon_linux.png differ
diff --git a/src/main/resources/images/taskbar_icon.png b/src/main/resources/images/taskbar_icon_windows.png
similarity index 100%
rename from src/main/resources/images/taskbar_icon.png
rename to src/main/resources/images/taskbar_icon_windows.png