diff --git a/main/ui/src/main/java/org/cryptomator/ui/FxApplicationModule.java b/main/ui/src/main/java/org/cryptomator/ui/FxApplicationModule.java
index a9d24bba1..04a3bc03d 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/FxApplicationModule.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/FxApplicationModule.java
@@ -17,6 +17,8 @@ import org.cryptomator.ui.model.Vault;
 import org.cryptomator.ui.model.VaultList;
 import org.cryptomator.ui.preferences.PreferencesComponent;
 
+import java.util.ResourceBundle;
+
 @Module(includes = {UiModule.class}, subcomponents = {MainWindowComponent.class, PreferencesComponent.class})
 abstract class FxApplicationModule {
 
@@ -32,5 +34,11 @@ abstract class FxApplicationModule {
 	static ObjectProperty<Vault> provideSelectedVault() {
 		return new SimpleObjectProperty<>();
 	}
+	
+	@Provides
+	@FxApplicationScoped
+	static ResourceBundle provideLocalization() {
+		return ResourceBundle.getBundle("i18n.strings");
+	}
 
 }
diff --git a/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultModule.java b/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultModule.java
index 8f96d536b..a4ce7dfde 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultModule.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultModule.java
@@ -19,6 +19,7 @@ import org.cryptomator.ui.model.Vault;
 import javax.inject.Provider;
 import java.nio.file.Path;
 import java.util.Map;
+import java.util.ResourceBundle;
 
 @Module
 public abstract class AddVaultModule {
@@ -26,8 +27,8 @@ public abstract class AddVaultModule {
 	@Provides
 	@AddVaultWizard
 	@AddVaultWizardScoped
-	static FXMLLoaderFactory provideFxmlLoaderFactory(Map<Class<? extends FxController>, Provider<FxController>> factories) {
-		return new FXMLLoaderFactory(factories);
+	static FXMLLoaderFactory provideFxmlLoaderFactory(Map<Class<? extends FxController>, Provider<FxController>> factories, ResourceBundle resourceBundle) {
+		return new FXMLLoaderFactory(factories, resourceBundle);
 	}
 
 	@Provides
diff --git a/main/ui/src/main/java/org/cryptomator/ui/common/FXMLLoaderFactory.java b/main/ui/src/main/java/org/cryptomator/ui/common/FXMLLoaderFactory.java
index b8b4a9745..e4c7c5799 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/common/FXMLLoaderFactory.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/common/FXMLLoaderFactory.java
@@ -17,9 +17,9 @@ public class FXMLLoaderFactory {
 	private final Map<Class<? extends FxController>, Provider<FxController>> factories;
 	private final ResourceBundle resourceBundle;
 
-	public FXMLLoaderFactory(Map<Class<? extends FxController>, Provider<FxController>> factories) {
+	public FXMLLoaderFactory(Map<Class<? extends FxController>, Provider<FxController>> factories, ResourceBundle resourceBundle) {
 		this.factories = factories;
-		this.resourceBundle = ResourceBundle.getBundle("i18n.strings");
+		this.resourceBundle = resourceBundle;
 	}
 
 	/**
diff --git a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/MainWindowModule.java b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/MainWindowModule.java
index d4be46c4d..db25681c9 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/MainWindowModule.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/MainWindowModule.java
@@ -14,6 +14,7 @@ import org.cryptomator.ui.unlock.UnlockComponent;
 
 import javax.inject.Provider;
 import java.util.Map;
+import java.util.ResourceBundle;
 
 @Module(subcomponents = {AddVaultWizardComponent.class, UnlockComponent.class})
 abstract class MainWindowModule {
@@ -21,8 +22,8 @@ abstract class MainWindowModule {
 	@Provides
 	@MainWindow
 	@MainWindowScoped
-	static FXMLLoaderFactory provideFxmlLoaderFactory(Map<Class<? extends FxController>, Provider<FxController>> factories) {
-		return new FXMLLoaderFactory(factories);
+	static FXMLLoaderFactory provideFxmlLoaderFactory(Map<Class<? extends FxController>, Provider<FxController>> factories, ResourceBundle resourceBundle) {
+		return new FXMLLoaderFactory(factories, resourceBundle);
 	}
 
 	@Provides
diff --git a/main/ui/src/main/java/org/cryptomator/ui/preferences/PreferencesModule.java b/main/ui/src/main/java/org/cryptomator/ui/preferences/PreferencesModule.java
index c85766ff4..9fa560f43 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/preferences/PreferencesModule.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/preferences/PreferencesModule.java
@@ -12,6 +12,7 @@ import org.cryptomator.ui.common.FxControllerKey;
 
 import javax.inject.Provider;
 import java.util.Map;
+import java.util.ResourceBundle;
 
 @Module
 abstract class PreferencesModule {
@@ -19,8 +20,8 @@ abstract class PreferencesModule {
 	@Provides
 	@PreferencesWindow
 	@PreferencesScoped
-	static FXMLLoaderFactory provideFxmlLoaderFactory(Map<Class<? extends FxController>, Provider<FxController>> factories) {
-		return new FXMLLoaderFactory(factories);
+	static FXMLLoaderFactory provideFxmlLoaderFactory(Map<Class<? extends FxController>, Provider<FxController>> factories, ResourceBundle resourceBundle) {
+		return new FXMLLoaderFactory(factories, resourceBundle);
 	}
 
 	@Provides
diff --git a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockModule.java b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockModule.java
index b925e404d..eeee3b127 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockModule.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockModule.java
@@ -15,6 +15,7 @@ import org.cryptomator.ui.model.Vault;
 
 import javax.inject.Provider;
 import java.util.Map;
+import java.util.ResourceBundle;
 
 @Module
 abstract class UnlockModule {
@@ -22,8 +23,8 @@ abstract class UnlockModule {
 	@Provides
 	@UnlockWindow
 	@UnlockScoped
-	static FXMLLoaderFactory provideFxmlLoaderFactory(Map<Class<? extends FxController>, Provider<FxController>> factories) {
-		return new FXMLLoaderFactory(factories);
+	static FXMLLoaderFactory provideFxmlLoaderFactory(Map<Class<? extends FxController>, Provider<FxController>> factories, ResourceBundle resourceBundle) {
+		return new FXMLLoaderFactory(factories, resourceBundle);
 	}
 
 	@Provides