diff --git a/main/ui/src/main/java/org/cryptomator/ui/controllers/MainController.java b/main/ui/src/main/java/org/cryptomator/ui/controllers/MainController.java
index 05b3b8a44..0f6010eec 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/controllers/MainController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/controllers/MainController.java
@@ -194,6 +194,7 @@ public class MainController implements ViewController {
 	public void initStage(Stage stage) {
 		stage.setScene(new Scene(getRoot()));
 		stage.sizeToScene();
+		stage.setTitle(localization.getString("app.name")); // set once before bind to avoid display bugs with Linux window managers
 		stage.titleProperty().bind(windowTitle());
 		stage.setResizable(false);
 		loadFont("/css/ionicons.ttf");
@@ -203,9 +204,10 @@ public class MainController implements ViewController {
 			subs = subs.and(EasyBind.includeWhen(mainWindow.getScene().getRoot().getStyleClass(), INACTIVE_WINDOW_STYLE_CLASS, mainWindow.focusedProperty().not()));
 			Application.setUserAgentStylesheet(getClass().getResource("/css/mac_theme.css").toString());
 		} else if (SystemUtils.IS_OS_LINUX) {
+			stage.getIcons().add(new Image(getClass().getResourceAsStream("/window_icon_512.png")));
 			Application.setUserAgentStylesheet(getClass().getResource("/css/linux_theme.css").toString());
 		} else if (SystemUtils.IS_OS_WINDOWS) {
-			stage.getIcons().add(new Image(getClass().getResourceAsStream("/window_icon.png")));
+			stage.getIcons().add(new Image(getClass().getResourceAsStream("/window_icon_32.png")));
 			Application.setUserAgentStylesheet(getClass().getResource("/css/win_theme.css").toString());
 		}
 		exitUtil.initExitHandler(this::gracefulShutdown);
diff --git a/main/ui/src/main/resources/window_icon.png b/main/ui/src/main/resources/window_icon.png
deleted file mode 100644
index 766b601e0..000000000
Binary files a/main/ui/src/main/resources/window_icon.png and /dev/null differ
diff --git a/main/ui/src/main/resources/window_icon_32.png b/main/ui/src/main/resources/window_icon_32.png
new file mode 100644
index 000000000..07f2fd241
Binary files /dev/null and b/main/ui/src/main/resources/window_icon_32.png differ
diff --git a/main/ui/src/main/resources/window_icon_512.png b/main/ui/src/main/resources/window_icon_512.png
new file mode 100644
index 000000000..1e0832c42
Binary files /dev/null and b/main/ui/src/main/resources/window_icon_512.png differ