diff --git a/main/ui/src/main/java/org/cryptomator/ui/MainApplication.java b/main/ui/src/main/java/org/cryptomator/ui/MainApplication.java
index b0c4acd24..23a10293c 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/MainApplication.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/MainApplication.java
@@ -28,6 +28,7 @@ import org.slf4j.LoggerFactory;
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.fxml.FXMLLoader;
+import javafx.scene.image.Image;
 import javafx.stage.Stage;
 
 public class MainApplication extends Application {
@@ -69,6 +70,7 @@ public class MainApplication extends Application {
 		final ResourceBundle rb = ResourceBundle.getBundle("localization");
 		primaryStage.setTitle(rb.getString("app.name"));
 		primaryStage.setResizable(false);
+		primaryStage.getIcons().add(new Image(MainApplication.class.getResourceAsStream("/window_icon.png"))); 
 		primaryStage.show();
 
 		ActiveWindowStyleSupport.startObservingFocus(primaryStage);
diff --git a/main/ui/src/main/resources/window_icon.png b/main/ui/src/main/resources/window_icon.png
new file mode 100644
index 000000000..f7a10f8ed
Binary files /dev/null and b/main/ui/src/main/resources/window_icon.png differ