diff --git a/main/ui/src/main/resources/fxml/wrongfilealert.fxml b/main/ui/src/main/resources/fxml/wrongfilealert.fxml
index 54988b5c3..8251e1024 100644
--- a/main/ui/src/main/resources/fxml/wrongfilealert.fxml
+++ b/main/ui/src/main/resources/fxml/wrongfilealert.fxml
@@ -12,7 +12,7 @@
 <VBox xmlns="http://javafx.com/javafx"
 	  xmlns:fx="http://javafx.com/fxml"
 	  fx:controller="org.cryptomator.ui.wrongfilealert.WrongFileAlertController"
-	  maxHeight="400"
+	  minWidth="400"
 	  maxWidth="400"
 	  minHeight="145"
 	  spacing="12">
@@ -29,7 +29,11 @@
 		</HBox>
 
 		<VBox alignment="BOTTOM_CENTER" VBox.vgrow="ALWAYS">
-		   <Button text="%wrongFileAlert.btn" ButtonBar.buttonData="CANCEL_CLOSE" cancelButton="true" onAction="#close"/>
+			<ButtonBar buttonMinWidth="120" buttonOrder="+CI">
+				<buttons>
+					<Button text="%wrongFileAlert.btn" ButtonBar.buttonData="FINISH" defaultButton="true" cancelButton="true" onAction="#close"/>
+				</buttons>
+			</ButtonBar>
 		</VBox>
 	</children>
 </VBox>
diff --git a/main/ui/src/main/resources/i18n/strings.properties b/main/ui/src/main/resources/i18n/strings.properties
index 557fccf57..df7fa36e0 100644
--- a/main/ui/src/main/resources/i18n/strings.properties
+++ b/main/ui/src/main/resources/i18n/strings.properties
@@ -68,10 +68,10 @@ changepassword.passwordsMatch=Passwords match!
 changepassword.passwordsDoNotMatch=Passwords do not match
 changepassword.finalConfirmation=I understand that I will not be able to recover my data if I forget my password
 
-# Forget password
+# Forget Password
 forgetPassword.title=Forget Password
-forgetPassword.information=TODO Yalla Yalla
-forgetPassword.confirmBtn=Ok, forget
+forgetPassword.information=This will delete the saved password of this vault from your system keychain.
+forgetPassword.confirmBtn=Forget Password
 
 # Unlock
 unlock.title=Unlock Vault
@@ -81,10 +81,6 @@ unlock.unlockBtn=Unlock
 ## Success
 unlock.success.message=Unlocked "%s" successfully! Your vault is now accessible.
 unlock.success.revealBtn=Reveal Vault
-## Delete Saved Password Dialog
-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.
 
 # Migration
 migration.title=Upgrade Vault
@@ -139,9 +135,9 @@ main.vaultDetail.throughput.kbps=%.1f kiB/s
 main.vaultDetail.throughput.mbps=%.1f MiB/s
 
 # Wrong File Alert
-wrongFileAlert.title=Ooopsie
-wrongFileAlert.btn=Ok, understood!
-wrongFileAlert.information=TODO Wrong place
+wrongFileAlert.title=Unknown File
+wrongFileAlert.btn=Okay
+wrongFileAlert.information=You have tried to add a file or folder that does not seem to be a Cryptomator vault. To encrypt your data, create and unlock a vault.
 
 # Vault Options
 vaultOptions.general=General