diff --git a/main/ui/src/main/resources/fxml/changepassword.fxml b/main/ui/src/main/resources/fxml/changepassword.fxml
index 03eb4c180..f5f5937cf 100644
--- a/main/ui/src/main/resources/fxml/changepassword.fxml
+++ b/main/ui/src/main/resources/fxml/changepassword.fxml
@@ -2,7 +2,6 @@
 
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
-<?import javafx.scene.control.ButtonBar?>
 <?import javafx.scene.control.CheckBox?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.layout.HBox?>
@@ -11,8 +10,8 @@
 <?import javafx.scene.text.Text?>
 <?import javafx.scene.text.TextFlow?>
 <?import org.cryptomator.ui.controls.FontAwesome5IconView?>
-<?import org.cryptomator.ui.controls.SecPasswordField?>
 <?import org.cryptomator.ui.controls.PasswordStrengthIndicator?>
+<?import org.cryptomator.ui.controls.SecPasswordField?>
 <VBox xmlns="http://javafx.com/javafx"
 	  xmlns:fx="http://javafx.com/fxml"
 	  fx:controller="org.cryptomator.ui.changepassword.ChangePasswordController"
@@ -56,11 +55,9 @@
 
 		<Region VBox.vgrow="ALWAYS"/>
 
-		<ButtonBar buttonOrder="+CI">
-			<buttons>
-				<Button text="%generic.button.cancel" ButtonBar.buttonData="CANCEL_CLOSE" onAction="#cancel"/>
-				<Button fx:id="finishButton" text="%generic.button.change" ButtonBar.buttonData="FINISH" onAction="#finish" defaultButton="true"/>
-			</buttons>
-		</ButtonBar>
+		<HBox alignment="CENTER_RIGHT" spacing="9">
+			<Button text="%generic.button.cancel" cancelButton="true" onAction="#cancel"/>
+			<Button fx:id="finishButton" text="%generic.button.change" defaultButton="true" onAction="#finish"/>
+		</HBox>
 	</children>
 </VBox>
diff --git a/main/ui/src/main/resources/fxml/preferences_volume.fxml b/main/ui/src/main/resources/fxml/preferences_volume.fxml
index 945cfeb1a..b5fc82330 100644
--- a/main/ui/src/main/resources/fxml/preferences_volume.fxml
+++ b/main/ui/src/main/resources/fxml/preferences_volume.fxml
@@ -15,19 +15,19 @@
 		<Insets bottom="12" left="12" right="12" top="12"/>
 	</padding>
 	<children>
-		<HBox spacing="6" alignment="BASELINE_LEFT">
+		<HBox spacing="6" alignment="CENTER_LEFT">
 			<Label text="%preferences.general.volumeType"/>
 			<ChoiceBox fx:id="volumeTypeChoicBox"/>
 		</HBox>
 
-		<HBox spacing="6" alignment="BASELINE_LEFT" visible="${controller.showWebDavSettings}">
-			<Label text="TODO WebDAV Port"/>
+		<HBox spacing="6" alignment="CENTER_LEFT" visible="${controller.showWebDavSettings}">
+			<Label text="%preferences.volume.webdav.port"/>
 			<NumericTextField fx:id="webDavPortField"/>
-			<Button text="TODO Apply" fx:id="changeWebDavPortButton" onAction="#doChangeWebDavPort"/>
+			<Button text="%generic.button.apply" fx:id="changeWebDavPortButton" onAction="#doChangeWebDavPort"/>
 		</HBox>
 
-		<HBox spacing="6" alignment="BASELINE_LEFT" visible="${controller.showWebDavSettings}">
-			<Label text="TODO WebDAV Scheme"/>
+		<HBox spacing="6" alignment="CENTER_LEFT" visible="${controller.showWebDavSettings}">
+			<Label text="%preferences.volume.webdav.scheme"/>
 			<ChoiceBox fx:id="webDavUrlSchemeChoiceBox" maxWidth="Infinity"/>
 		</HBox>
 	</children>
diff --git a/main/ui/src/main/resources/fxml/unlock2.fxml b/main/ui/src/main/resources/fxml/unlock2.fxml
index 2d7c81d6e..7ac312618 100644
--- a/main/ui/src/main/resources/fxml/unlock2.fxml
+++ b/main/ui/src/main/resources/fxml/unlock2.fxml
@@ -4,11 +4,11 @@
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.CheckBox?>
 <?import javafx.scene.control.ProgressIndicator?>
+<?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Text?>
 <?import javafx.scene.text.TextFlow?>
 <?import org.cryptomator.ui.controls.SecPasswordField?>
-<?import javafx.scene.control.ButtonBar?>
 <VBox xmlns="http://javafx.com/javafx"
 	  xmlns:fx="http://javafx.com/fxml"
 	  fx:controller="org.cryptomator.ui.unlock.UnlockController"
@@ -27,15 +27,13 @@
 		</TextFlow>
 		<SecPasswordField fx:id="passwordField"/>
 		<CheckBox fx:id="savePassword" text="%unlock.savePassword" onAction="#didClickSavePasswordCheckbox"/>
-		<ButtonBar buttonOrder="+CI">
-			<buttons>
-				<Button text="%generic.button.cancel" ButtonBar.buttonData="CANCEL_CLOSE" cancelButton="true" onAction="#cancel"/>
-				<Button text="%unlock.unlockBtn" defaultButton="true" ButtonBar.buttonData="FINISH" onAction="#unlock" contentDisplay="${controller.unlockButtonState}" disable="${controller.unlockButtonDisabled}">
-					<graphic>
-						<ProgressIndicator progress="-1" prefWidth="12" prefHeight="12"/>
-					</graphic>
-				</Button>
-			</buttons>
-		</ButtonBar>
+		<HBox alignment="CENTER_RIGHT" spacing="9">
+			<Button text="%generic.button.cancel" cancelButton="true" onAction="#cancel"/>
+			<Button text="%unlock.unlockBtn" defaultButton="true" onAction="#unlock" contentDisplay="${controller.unlockButtonState}" disable="${controller.unlockButtonDisabled}">
+				<graphic>
+					<ProgressIndicator progress="-1" prefWidth="12" prefHeight="12"/>
+				</graphic>
+			</Button>
+		</HBox>
 	</children>
 </VBox>
diff --git a/main/ui/src/main/resources/fxml/unlock_success.fxml b/main/ui/src/main/resources/fxml/unlock_success.fxml
index 34dade046..f9e43c458 100644
--- a/main/ui/src/main/resources/fxml/unlock_success.fxml
+++ b/main/ui/src/main/resources/fxml/unlock_success.fxml
@@ -4,7 +4,6 @@
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.ProgressIndicator?>
 <?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.Region?>
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Text?>
 <?import javafx.scene.text.TextFlow?>
@@ -12,19 +11,20 @@
 	  xmlns:fx="http://javafx.com/fxml"
 	  fx:controller="org.cryptomator.ui.unlock.UnlockSuccessController"
 	  minWidth="300"
+	  maxWidth="300"
 	  spacing="6">
 	<padding>
-		<Insets bottom="6.0" left="6.0" right="6.0" top="6.0"/>
+		<Insets bottom="12.0" left="12.0" right="12.0" top="12.0"/>
 	</padding>
 	<children>
 		<TextFlow styleClass="text-flow">
+			<Text text="TODO Unlocked &quot;"/>
 			<Text text="${controller.vault.displayableName}"/>
-			<Text text="TODO unlocked successfully! "/>
+			<Text text="&quot; successfully! Your vault is now accessible at &quot;TODO&quot;."/>
 		</TextFlow>
-		<HBox>
-			<Button text="TODO done" cancelButton="true" onAction="#close"/>
-			<Region HBox.hgrow="ALWAYS"/>
-			<Button text="TODO show me!" defaultButton="true" onAction="#revealAndClose" contentDisplay="${controller.revealButtonState}">
+		<HBox alignment="CENTER_RIGHT" spacing="9">
+			<Button text="%generic.button.done" cancelButton="true" onAction="#close"/>
+			<Button text="%unlock.success.reveal" defaultButton="true" onAction="#revealAndClose" contentDisplay="${controller.revealButtonState}">
 				<graphic>
 					<ProgressIndicator progress="-1" prefWidth="12" prefHeight="12"/>
 				</graphic>
diff --git a/main/ui/src/main/resources/fxml/vault_detail.fxml b/main/ui/src/main/resources/fxml/vault_detail.fxml
index f5ae169a9..5f1861091 100644
--- a/main/ui/src/main/resources/fxml/vault_detail.fxml
+++ b/main/ui/src/main/resources/fxml/vault_detail.fxml
@@ -75,7 +75,7 @@
 
 		<Region prefHeight="24" VBox.vgrow="NEVER"/>
 
-		<HBox alignment="CENTER" spacing="12" visible="${controller.vault.locked}" managed="${controller.vault.locked}">
+		<HBox alignment="CENTER" spacing="9" visible="${controller.vault.locked}" managed="${controller.vault.locked}">
 			<Button styleClass="button-large" text="%vaultDetail.unlockBtn" onAction="#unlock" defaultButton="${controller.vault.locked}">
 				<graphic>
 					<FontAwesome5IconView glyph="LOCK_OPEN_ALT" glyphSize="15"/>
@@ -87,7 +87,7 @@
 				</graphic>
 			</Button>
 		</HBox>
-		<VBox alignment="CENTER" spacing="12" visible="${controller.vault.unlocked}" managed="${controller.vault.unlocked}">
+		<VBox alignment="CENTER" spacing="9" visible="${controller.vault.unlocked}" managed="${controller.vault.unlocked}">
 			<Button styleClass="button-large" text="%vaultDetail.lockBtn" onAction="#lock" defaultButton="${controller.vault.unlocked}">
 				<graphic>
 					<FontAwesome5IconView glyph="LOCK_ALT" glyphSize="15"/>
diff --git a/main/ui/src/main/resources/i18n/strings.properties b/main/ui/src/main/resources/i18n/strings.properties
index 0cee69640..36ee2a850 100644
--- a/main/ui/src/main/resources/i18n/strings.properties
+++ b/main/ui/src/main/resources/i18n/strings.properties
@@ -1,9 +1,11 @@
 # Generics
 ## Button
+generic.button.apply=Apply
 generic.button.back=Back
 generic.button.cancel=Cancel
 generic.button.change=Change
 generic.button.create=Create
+generic.button.done=Done
 generic.button.next=Next
 
 # Add Vault Wizard
@@ -46,6 +48,8 @@ unlock.title=Unlock Vault
 unlock.passwordPrompt=Enter Password for
 unlock.savePassword=Save Password
 unlock.unlockBtn=Unlock
+## Success
+unlock.success.reveal=Reveal
 ## 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?
@@ -61,6 +65,8 @@ preferences.general.debugLogging=Enable debug logging
 preferences.general.volumeType=Volume Type
 ## Volume
 preferences.volume=Virtual Drive
+preferences.volume.webdav.port=WebDAV Port
+preferences.volume.webdav.scheme=WebDAV Scheme
 ## Updates
 preferences.updates=Updates
 preferences.updates.autoUpdateCheck=Check for updates automatically