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 9fa560f43..2854190f3 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
@@ -27,9 +27,9 @@ abstract class PreferencesModule {
 	@Provides
 	@PreferencesWindow
 	@PreferencesScoped
-	static Stage provideStage() {
+	static Stage provideStage(ResourceBundle resourceBundle) {
 		Stage stage = new Stage();
-		stage.setTitle("Preferences");
+		stage.setTitle(resourceBundle.getString("preferences.title"));
 		stage.setMinWidth(400);
 		stage.setMinHeight(300);
 		stage.initModality(Modality.APPLICATION_MODAL);
diff --git a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockController.java b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockController.java
index 7b8d0aa70..434daf09d 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockController.java
@@ -101,9 +101,9 @@ public class UnlockController implements FxController {
 	private void didClickSavePasswordCheckbox() {
 		if (!savePassword.isSelected() && hasStoredPassword()) {
 			Alert confirmDialog = DialogBuilderUtil.buildConfirmationDialog( //
-					resourceBundle.getString("unlock.savePassword.delete.confirmation.title"), //
-					resourceBundle.getString("unlock.savePassword.delete.confirmation.header"), //
-					resourceBundle.getString("unlock.savePassword.delete.confirmation.content"), //
+					resourceBundle.getString("unlock.deleteSavedPasswordDialog.title"), //
+					resourceBundle.getString("unlock.deleteSavedPasswordDialog.header"), //
+					resourceBundle.getString("unlock.deleteSavedPasswordDialog.content"), //
 					SystemUtils.IS_OS_MAC_OSX ? ButtonType.CANCEL : ButtonType.OK);
 			Optional<ButtonType> choice = confirmDialog.showAndWait();
 			if (ButtonType.OK.equals(choice.get())) {
diff --git a/main/ui/src/main/resources/css/dark_theme.css b/main/ui/src/main/resources/css/dark_theme.css
index 5b86a58bb..b77354d99 100644
--- a/main/ui/src/main/resources/css/dark_theme.css
+++ b/main/ui/src/main/resources/css/dark_theme.css
@@ -32,6 +32,10 @@
 	-fx-text-fill: TEXT_FILL;
 }
 
+.text-flow > * {
+	-fx-fill: TEXT_FILL;
+}
+
 /*******************************************************************************
  *                                                                             *
  * Main Window                                                                 *
diff --git a/main/ui/src/main/resources/css/light_theme.css b/main/ui/src/main/resources/css/light_theme.css
index f1ab3d736..7ced499e1 100644
--- a/main/ui/src/main/resources/css/light_theme.css
+++ b/main/ui/src/main/resources/css/light_theme.css
@@ -32,6 +32,10 @@
 	-fx-text-fill: TEXT_FILL;
 }
 
+.text-flow > * {
+	-fx-fill: TEXT_FILL;
+}
+
 /*******************************************************************************
  *                                                                             *
  * Main Window                                                                 *
diff --git a/main/ui/src/main/resources/i18n/strings.properties b/main/ui/src/main/resources/i18n/strings.properties
index c4bf3eebe..8352dd9c3 100644
--- a/main/ui/src/main/resources/i18n/strings.properties
+++ b/main/ui/src/main/resources/i18n/strings.properties
@@ -2,11 +2,12 @@ addvaultwizard.existing.instruction=Please choose the masterkey.cryptomator file
 addvaultwizard.existing.filePickerTitle=Open Masterkey File
 main.closeBtn.tooltip=Close
 main.settingsBtn.tooltip=Settings
+preferences.title=Preferences
 preferences.autoUpdateCheck=Check for updates automatically
 preferences.debugLogging=Enable debug logging
 preferences.theme=Look & Feel
 preferences.volumeType=Volume type
-unlock.savePassword.delete.confirmation.title=Delete Saved Password
-unlock.savePassword.delete.confirmation.header=Do you really want to delete the saved password of this vault?
-unlock.savePassword.delete.confirmation.content=The saved password of this vault will be immediately deleted from your system keychain. If you'd like to save your password again, you'd have to unlock your vault with the "Save Password" option enabled.
+unlock.deleteSavedPasswordDialog.title=Delete Saved Password
+unlock.deleteSavedPasswordDialog.header=Do you really want to delete the saved password of this vault?
+unlock.deleteSavedPasswordDialog.content=The saved password of this vault will be immediately deleted from your system keychain. If you'd like to save your password again, you'd have to unlock your vault with the "Save Password" option enabled.
 vaultlist.emptyList.onboardingInstruction=Click here to add a vault
\ No newline at end of file