diff --git a/main/ui/src/main/resources/choose_existing_vault.png b/main/ui/src/main/resources/choose_existing_vault.png
new file mode 100644
index 000000000..1447d33c5
Binary files /dev/null and b/main/ui/src/main/resources/choose_existing_vault.png differ
diff --git a/main/ui/src/main/resources/fxml/addvault_existing.fxml b/main/ui/src/main/resources/fxml/addvault_existing.fxml
index 645904523..8862ddc1d 100644
--- a/main/ui/src/main/resources/fxml/addvault_existing.fxml
+++ b/main/ui/src/main/resources/fxml/addvault_existing.fxml
@@ -6,6 +6,8 @@
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.layout.Region?>
 <?import javafx.scene.layout.VBox?>
+<?import javafx.scene.image.ImageView?>
+<?import javafx.scene.image.Image?>
 <VBox xmlns="http://javafx.com/javafx"
 	  xmlns:fx="http://javafx.com/fxml"
 	  fx:controller="org.cryptomator.ui.addvaultwizard.ChooseExistingVaultController"
@@ -17,7 +19,12 @@
 		<Insets top="24" right="24" bottom="24" left="24"/>
 	</padding>
 	<children>
-		<Region VBox.vgrow="ALWAYS"/>
+		<ImageView VBox.vgrow="ALWAYS" fitHeight="200.0" preserveRatio="true" smooth="true" cache="true">
+			<VBox.margin>
+				<Insets top="24"/>
+			</VBox.margin>
+			<Image url="/choose_existing_vault.png"/> <!-- TODO replace mockup -->
+		</ImageView>
 
 		<Label text="%addvaultwizard.existing.instruction" wrapText="true" labelFor="$finishButton"/>
 
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 18125a009..dc3b30715 100644
--- a/main/ui/src/main/resources/fxml/addvault_new_location.fxml
+++ b/main/ui/src/main/resources/fxml/addvault_new_location.fxml
@@ -27,8 +27,6 @@
 		<Insets top="24" right="24" bottom="24" left="24"/>
 	</padding>
 	<children>
-		<Region VBox.vgrow="ALWAYS"/>
-
 		<Label wrapText="true" text="%addvaultwizard.new.locationInstruction"/>
 
 		<VBox spacing="6">
@@ -44,7 +42,7 @@
 			</HBox>
 		</VBox>
 
-		<Region VBox.vgrow="NEVER"/>
+		<Region VBox.vgrow="ALWAYS"/>
 
 		<Label text="%addvaultwizard.new.locationLabel" labelFor="$locationTextField"/>
 		<TextField fx:id="locationTextField" promptText="%addvaultwizard.new.locationPrompt" text="${controller.vaultPath}" disable="true" HBox.hgrow="ALWAYS"/>
diff --git a/main/ui/src/main/resources/fxml/addvault_welcome.fxml b/main/ui/src/main/resources/fxml/addvault_welcome.fxml
index de0df65d1..3a5eb4039 100644
--- a/main/ui/src/main/resources/fxml/addvault_welcome.fxml
+++ b/main/ui/src/main/resources/fxml/addvault_welcome.fxml
@@ -28,14 +28,14 @@
 		<Region VBox.vgrow="ALWAYS"/>
 
 		<VBox alignment="CENTER" spacing="9">
-			<Button styleClass="button-large" text="%addvaultwizard.welcome.newButton" onAction="#createNewVault">
+			<Button styleClass="button-large" text="%addvaultwizard.welcome.newButton" onAction="#createNewVault" prefWidth="Infinity">
 				<graphic>
 					<FontAwesome5IconView glyph="PLUS" glyphSize="15"/>
 				</graphic>
 			</Button>
-			<Button styleClass="button-large" text="%addvaultwizard.welcome.existingButton" onAction="#chooseExistingVault">
+			<Button styleClass="button-large" text="%addvaultwizard.welcome.existingButton" onAction="#chooseExistingVault" prefWidth="Infinity">
 				<graphic>
-					<FontAwesome5IconView glyph="SEARCH" glyphSize="15"/>
+					<FontAwesome5IconView glyph="FOLDER_OPEN" glyphSize="15"/>
 				</graphic>
 			</Button>
 		</VBox>
diff --git a/main/ui/src/main/resources/i18n/strings.properties b/main/ui/src/main/resources/i18n/strings.properties
index d0a3f7d58..7b7b6c3a9 100644
--- a/main/ui/src/main/resources/i18n/strings.properties
+++ b/main/ui/src/main/resources/i18n/strings.properties
@@ -25,7 +25,7 @@ addvaultwizard.welcome.existingButton=Add Existing Vault
 ## New
 addvaultwizard.new.nameInstruction=Choose a name for the vault
 addvaultwizard.new.namePrompt=Vault Name
-addvaultwizard.new.locationInstruction=Pick a location to store your vault
+addvaultwizard.new.locationInstruction=Where should Cryptomator store the encrypted files of your vault?
 addvaultwizard.new.locationLabel=Storage location
 addvaultwizard.new.locationPrompt=…
 addvaultwizard.new.directoryPickerLabel=Custom Location
diff --git a/main/ui/src/main/resources/i18n/strings_de.properties b/main/ui/src/main/resources/i18n/strings_de.properties
index 6ef540bf1..5d626f7a2 100644
--- a/main/ui/src/main/resources/i18n/strings_de.properties
+++ b/main/ui/src/main/resources/i18n/strings_de.properties
@@ -25,7 +25,7 @@ addvaultwizard.welcome.existingButton=Vorhandenen Tresor hinzufügen
 ## New
 addvaultwizard.new.nameInstruction=Wähle einen Namen für den Tresor
 addvaultwizard.new.namePrompt=Tresorname
-addvaultwizard.new.locationInstruction=Wo soll dein Tresor gespeichert werden?
+addvaultwizard.new.locationInstruction=Wo soll Cryptomator die verschlüsselten Daten deines Tresors ablegen?
 addvaultwizard.new.locationLabel=Speicherort
 addvaultwizard.new.locationPrompt=…
 addvaultwizard.new.directoryPickerLabel=Eigenen Ort wählen…