diff --git a/main/ui/src/main/resources/fxml/addvault_new_location.fxml b/main/ui/src/main/resources/fxml/addvault_new_location.fxml
index 10e91afc7..053a3312f 100644
--- a/main/ui/src/main/resources/fxml/addvault_new_location.fxml
+++ b/main/ui/src/main/resources/fxml/addvault_new_location.fxml
@@ -18,16 +18,16 @@
 	</padding>
 	<children>
 		<Region VBox.vgrow="ALWAYS"/>
-		<Label text="%addvaultwizard.new.selectLocation"/>
+		<Label text="%addvaultwizard.new.locationInstruction"/>
 		<HBox spacing="18">
-			<TextField promptText="TODO path" text="${controller.vaultPath}" disable="true" HBox.hgrow="ALWAYS"/>
-			<Button text="TODO directorypicker" onAction="#chooseDirectory" HBox.hgrow="NEVER" prefWidth="120"/>
+			<TextField promptText="%addvaultwizard.new.locationPrompt" text="${controller.vaultPath}" disable="true" HBox.hgrow="ALWAYS"/>
+			<Button text="%addvaultwizard.new.directoryPickerButton" onAction="#chooseDirectory" HBox.hgrow="NEVER" prefWidth="120"/>
 		</HBox>
 		<Region VBox.vgrow="ALWAYS"/>
 		<ButtonBar buttonMinWidth="120" buttonOrder="B+X">
 			<buttons>
-				<Button text="TODO Back" ButtonBar.buttonData="BACK_PREVIOUS" onAction="#back"/>
-				<Button text="TODO Next" ButtonBar.buttonData="NEXT_FORWARD" onAction="#next" defaultButton="true" disable="${controller.vaultPathIsNull}"/>
+				<Button text="%generic.button.back" ButtonBar.buttonData="BACK_PREVIOUS" onAction="#back"/>
+				<Button text="%generic.button.next" ButtonBar.buttonData="NEXT_FORWARD" onAction="#next" defaultButton="true" disable="${controller.vaultPathIsNull}"/>
 			</buttons>
 		</ButtonBar>
 	</children>
diff --git a/main/ui/src/main/resources/i18n/strings.properties b/main/ui/src/main/resources/i18n/strings.properties
index d7e1eedfd..6ad1eeb69 100644
--- a/main/ui/src/main/resources/i18n/strings.properties
+++ b/main/ui/src/main/resources/i18n/strings.properties
@@ -17,7 +17,9 @@ addvaultwizard.existing.filePickerTitle=Open Masterkey File
 ##New
 addvaultwizard.new.nameInstruction=Please enter a name for the vault:
 addvaultwizard.new.namePrompt=TODO vault name
-addvaultwizard.new.selectLocation=Please pick a directory where your vault is stored:
+addvaultwizard.new.locationInstruction=Please pick a directory where your vault will be stored:
+addvaultwizard.new.locationPrompt=TODO location
+addvaultwizard.new.directoryPickerButton=TODO DirPicker
 addvaultwizard.new.directoryPickerTitle=Select Directory
 addvaultwizard.new.enterPassword=Please enter a Password for your vault:
 addvaultwizard.new.reenterPassword=Please retype the password: