diff --git a/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/ChooseExistingVaultController.java b/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/ChooseExistingVaultController.java
index 3717a844f..7fc644f0d 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/ChooseExistingVaultController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/ChooseExistingVaultController.java
@@ -18,7 +18,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javax.inject.Inject;
-import javax.inject.Named;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -57,7 +56,7 @@ public class ChooseExistingVaultController implements FxController {
 
 	@FXML
 	public void initialize() {
-		final String resource = SystemUtils.IS_OS_MAC ? "/select-masterkey-mac.png" : "/select-masterkey-win.png";
+		final String resource = SystemUtils.IS_OS_MAC ? "/img/select-masterkey-mac.png" : "/img/select-masterkey-win.png";
 		try (InputStream in = getClass().getResourceAsStream(resource)) {
 			this.screenshot = new Image(in);
 		} catch (IOException e) {
diff --git a/main/ui/src/main/java/org/cryptomator/ui/fxapp/FxApplicationModule.java b/main/ui/src/main/java/org/cryptomator/ui/fxapp/FxApplicationModule.java
index 9b72548fd..b52d64ad3 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/fxapp/FxApplicationModule.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/fxapp/FxApplicationModule.java
@@ -9,14 +9,11 @@ import dagger.Binds;
 import dagger.Module;
 import dagger.Provides;
 import javafx.application.Application;
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.SimpleObjectProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableSet;
 import javafx.scene.image.Image;
 import javafx.stage.Stage;
 import org.apache.commons.lang3.SystemUtils;
-import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.ui.common.ErrorComponent;
 import org.cryptomator.ui.common.StageFactory;
 import org.cryptomator.ui.mainwindow.MainWindowComponent;
@@ -49,8 +46,8 @@ abstract class FxApplicationModule {
 		}
 		try {
 			return List.of( //
-					createImageFromResource("/window_icon_32.png"), //
-					createImageFromResource("/window_icon_512.png") //
+					createImageFromResource("/img/window_icon_32.png"), //
+					createImageFromResource("/img/window_icon_512.png") //
 			);
 		} catch (IOException e) {
 			throw new UncheckedIOException("Failed to load embedded resource.", e);
diff --git a/main/ui/src/main/java/org/cryptomator/ui/traymenu/TrayImageFactory.java b/main/ui/src/main/java/org/cryptomator/ui/traymenu/TrayImageFactory.java
index a76c8b1e3..cbdf651b4 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/traymenu/TrayImageFactory.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/traymenu/TrayImageFactory.java
@@ -30,13 +30,13 @@ class TrayImageFactory {
 				.map(MacApplicationUiAppearance::getCurrentInterfaceStyle) //
 				.orElse(MacApplicationUiInterfaceStyle.LIGHT);
 		return switch (interfaceStyle) {
-			case DARK -> "/tray_icon_mac_white.png";
-			case LIGHT -> "/tray_icon_mac_black.png";
+			case DARK -> "/img/tray_icon_mac_white.png";
+			case LIGHT -> "/img/tray_icon_mac_black.png";
 		};
 	}
 
 	private String getWinOrLinuxResourceName() {
-		return "/tray_icon.png";
+		return "/img/tray_icon.png";
 	}
 
 }
diff --git a/main/ui/src/main/java/org/cryptomator/ui/wrongfilealert/WrongFileAlertController.java b/main/ui/src/main/java/org/cryptomator/ui/wrongfilealert/WrongFileAlertController.java
index 6a11a9eba..292486a6a 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/wrongfilealert/WrongFileAlertController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/wrongfilealert/WrongFileAlertController.java
@@ -30,7 +30,7 @@ public class WrongFileAlertController implements FxController {
 
 	@FXML
 	public void initialize() {
-		final String resource = SystemUtils.IS_OS_MAC ? "/vault-volume-mac.png" : "/vault-volume-win.png";
+		final String resource = SystemUtils.IS_OS_MAC ? "/img/vault-volume-mac.png" : "/img/vault-volume-win.png";
 		try (InputStream in = getClass().getResourceAsStream(resource)) {
 			this.screenshot = new Image(in);
 		} catch (IOException e) {
diff --git a/main/ui/src/main/resources/fxml/addvault_welcome.fxml b/main/ui/src/main/resources/fxml/addvault_welcome.fxml
index faa974931..78fef4647 100644
--- a/main/ui/src/main/resources/fxml/addvault_welcome.fxml
+++ b/main/ui/src/main/resources/fxml/addvault_welcome.fxml
@@ -21,7 +21,7 @@
 		<Region VBox.vgrow="ALWAYS"/>
 
 		<ImageView VBox.vgrow="ALWAYS" fitHeight="128" preserveRatio="true" smooth="true" cache="true">
-			<Image url="/bot.png"/>
+			<Image url="/img/bot.png"/>
 		</ImageView>
 
 		<Region VBox.vgrow="ALWAYS"/>
diff --git a/main/ui/src/main/resources/fxml/preferences_about.fxml b/main/ui/src/main/resources/fxml/preferences_about.fxml
index f214f5df2..d388663e5 100644
--- a/main/ui/src/main/resources/fxml/preferences_about.fxml
+++ b/main/ui/src/main/resources/fxml/preferences_about.fxml
@@ -18,7 +18,7 @@
 	<children>
 		<HBox spacing="12" VBox.vgrow="NEVER">
 			<ImageView VBox.vgrow="ALWAYS" fitHeight="64" preserveRatio="true" smooth="true" cache="true">
-				<Image url="/bot.png"/>
+				<Image url="/img/bot.png"/>
 			</ImageView>
 			<VBox spacing="3" HBox.hgrow="ALWAYS" alignment="CENTER_LEFT">
 				<FormattedLabel styleClass="label-large" format="Cryptomator %s" arg1="${controller.applicationVersion}"/>
diff --git a/main/ui/src/main/resources/fxml/vault_detail_welcome.fxml b/main/ui/src/main/resources/fxml/vault_detail_welcome.fxml
index 31e5f174c..50ba0c3c6 100644
--- a/main/ui/src/main/resources/fxml/vault_detail_welcome.fxml
+++ b/main/ui/src/main/resources/fxml/vault_detail_welcome.fxml
@@ -11,8 +11,8 @@
 	  spacing="24">
 	<children>
 		<ImageView VBox.vgrow="ALWAYS" fitHeight="128" preserveRatio="true" smooth="true" cache="true">
-			<Image url="/bot.png"/>
 		</ImageView>
+						<Image url="/img/bot.png"/>
 
 		<TextFlow styleClass="text-flow" prefWidth="-Infinity" visible="${controller.noVaultPresent}" managed="${controller.noVaultPresent}">
 			<Text text="%main.vaultDetail.welcomeOnboarding"/>
diff --git a/main/ui/src/main/resources/bot.png b/main/ui/src/main/resources/img/bot.png
similarity index 100%
rename from main/ui/src/main/resources/bot.png
rename to main/ui/src/main/resources/img/bot.png
diff --git a/main/ui/src/main/resources/bot@2x.png b/main/ui/src/main/resources/img/bot@2x.png
similarity index 100%
rename from main/ui/src/main/resources/bot@2x.png
rename to main/ui/src/main/resources/img/bot@2x.png
diff --git a/main/ui/src/main/resources/select-masterkey-mac.png b/main/ui/src/main/resources/img/select-masterkey-mac.png
similarity index 100%
rename from main/ui/src/main/resources/select-masterkey-mac.png
rename to main/ui/src/main/resources/img/select-masterkey-mac.png
diff --git a/main/ui/src/main/resources/select-masterkey-win.png b/main/ui/src/main/resources/img/select-masterkey-win.png
similarity index 100%
rename from main/ui/src/main/resources/select-masterkey-win.png
rename to main/ui/src/main/resources/img/select-masterkey-win.png
diff --git a/main/ui/src/main/resources/tray_icon.png b/main/ui/src/main/resources/img/tray_icon.png
similarity index 100%
rename from main/ui/src/main/resources/tray_icon.png
rename to main/ui/src/main/resources/img/tray_icon.png
diff --git a/main/ui/src/main/resources/tray_icon_mac_black.png b/main/ui/src/main/resources/img/tray_icon_mac_black.png
similarity index 100%
rename from main/ui/src/main/resources/tray_icon_mac_black.png
rename to main/ui/src/main/resources/img/tray_icon_mac_black.png
diff --git a/main/ui/src/main/resources/tray_icon_mac_black@2x.png b/main/ui/src/main/resources/img/tray_icon_mac_black@2x.png
similarity index 100%
rename from main/ui/src/main/resources/tray_icon_mac_black@2x.png
rename to main/ui/src/main/resources/img/tray_icon_mac_black@2x.png
diff --git a/main/ui/src/main/resources/tray_icon_mac_white.png b/main/ui/src/main/resources/img/tray_icon_mac_white.png
similarity index 100%
rename from main/ui/src/main/resources/tray_icon_mac_white.png
rename to main/ui/src/main/resources/img/tray_icon_mac_white.png
diff --git a/main/ui/src/main/resources/tray_icon_mac_white@2x.png b/main/ui/src/main/resources/img/tray_icon_mac_white@2x.png
similarity index 100%
rename from main/ui/src/main/resources/tray_icon_mac_white@2x.png
rename to main/ui/src/main/resources/img/tray_icon_mac_white@2x.png
diff --git a/main/ui/src/main/resources/vault-volume-mac.png b/main/ui/src/main/resources/img/vault-volume-mac.png
similarity index 100%
rename from main/ui/src/main/resources/vault-volume-mac.png
rename to main/ui/src/main/resources/img/vault-volume-mac.png
diff --git a/main/ui/src/main/resources/vault-volume-win.png b/main/ui/src/main/resources/img/vault-volume-win.png
similarity index 100%
rename from main/ui/src/main/resources/vault-volume-win.png
rename to main/ui/src/main/resources/img/vault-volume-win.png
diff --git a/main/ui/src/main/resources/window_icon_32.png b/main/ui/src/main/resources/img/window_icon_32.png
similarity index 100%
rename from main/ui/src/main/resources/window_icon_32.png
rename to main/ui/src/main/resources/img/window_icon_32.png
diff --git a/main/ui/src/main/resources/window_icon_512.png b/main/ui/src/main/resources/img/window_icon_512.png
similarity index 100%
rename from main/ui/src/main/resources/window_icon_512.png
rename to main/ui/src/main/resources/img/window_icon_512.png