diff --git a/src/main/java/org/cryptomator/ui/convertvault/ConvertVaultModule.java b/src/main/java/org/cryptomator/ui/convertvault/ConvertVaultModule.java
index 4ba11b7a7..7e4e2ff27 100644
--- a/src/main/java/org/cryptomator/ui/convertvault/ConvertVaultModule.java
+++ b/src/main/java/org/cryptomator/ui/convertvault/ConvertVaultModule.java
@@ -66,6 +66,7 @@ abstract class ConvertVaultModule {
 		stage.setResizable(false);
 		stage.initModality(Modality.WINDOW_MODAL);
 		stage.initOwner(owner);
+		stage.setTitle("TODO recovery");
 		return stage;
 	}
 
diff --git a/src/main/resources/fxml/convertvault_hubtolocal_convert.fxml b/src/main/resources/fxml/convertvault_hubtolocal_convert.fxml
index 3a370555c..729295321 100644
--- a/src/main/resources/fxml/convertvault_hubtolocal_convert.fxml
+++ b/src/main/resources/fxml/convertvault_hubtolocal_convert.fxml
@@ -8,10 +8,11 @@
 <VBox xmlns:fx="http://javafx.com/fxml"
 	  xmlns="http://javafx.com/javafx"
 	  fx:controller="org.cryptomator.ui.convertvault.HubToLocalConvertController"
-	  minWidth="350"
-	  minHeight="280"
+	  minWidth="400"
+	  maxWidth="400"
+	  minHeight="145"
 	  spacing="12"
-	  alignment="TOP_LEFT">
+	  alignment="TOP_CENTER">
 	<padding>
 		<Insets topRightBottomLeft="24"/>
 	</padding>
@@ -21,10 +22,10 @@
 		<Region VBox.vgrow="ALWAYS"/>
 
 		<VBox alignment="BOTTOM_CENTER" VBox.vgrow="ALWAYS">
-			<ButtonBar buttonMinWidth="120" buttonOrder="+CX">
+			<ButtonBar buttonMinWidth="120" buttonOrder="+CI">
 				<buttons>
 					<Button text="%generic.button.cancel" ButtonBar.buttonData="CANCEL_CLOSE" cancelButton="true" onAction="#close"/>
-					<Button text="TODO Convert" ButtonBar.buttonData="NEXT_FORWARD" defaultButton="true" onAction="#convert" disable="${!controller.newPasswordController.goodPassword}"/>
+					<Button text="TODO Convert" ButtonBar.buttonData="FINISH" defaultButton="true" onAction="#convert" disable="${!controller.newPasswordController.goodPassword}"/>
 				</buttons>
 			</ButtonBar>
 		</VBox>
diff --git a/src/main/resources/fxml/convertvault_hubtolocal_start.fxml b/src/main/resources/fxml/convertvault_hubtolocal_start.fxml
index 1a07b13c4..be387ff13 100644
--- a/src/main/resources/fxml/convertvault_hubtolocal_start.fxml
+++ b/src/main/resources/fxml/convertvault_hubtolocal_start.fxml
@@ -8,10 +8,11 @@
 <VBox xmlns:fx="http://javafx.com/fxml"
 	  xmlns="http://javafx.com/javafx"
 	  fx:controller="org.cryptomator.ui.convertvault.HubToLocalStartController"
-	  minWidth="350"
-	  minHeight="280"
+	  minWidth="400"
+	  maxWidth="400"
+	  minHeight="145"
 	  spacing="12"
-	  alignment="TOP_LEFT">
+	  alignment="TOP_CENTER">
 	<padding>
 		<Insets topRightBottomLeft="24"/>
 	</padding>
diff --git a/src/main/resources/fxml/convertvault_hubtolocal_success.fxml b/src/main/resources/fxml/convertvault_hubtolocal_success.fxml
index db9d84589..ac188ec40 100644
--- a/src/main/resources/fxml/convertvault_hubtolocal_success.fxml
+++ b/src/main/resources/fxml/convertvault_hubtolocal_success.fxml
@@ -21,7 +21,7 @@
 	  spacing="12"
 	  alignment="TOP_LEFT">
 	<padding>
-		<Insets topRightBottomLeft="24"/>
+		<Insets topRightBottomLeft="12"/>
 	</padding>
 	<children>
 		<Region VBox.vgrow="ALWAYS"/>
@@ -45,10 +45,9 @@
 			<Label text="TODO unlock with password now. Pleas keep in mind..." wrapText="true" textAlignment="LEFT"/>
 
 			<Region VBox.vgrow="ALWAYS" minHeight="18"/>
-			<ButtonBar buttonMinWidth="120" buttonOrder="+IU">
+			<ButtonBar buttonMinWidth="120" buttonOrder="+C">
 				<buttons>
-					<Button text="%generic.button.done" ButtonBar.buttonData="FINISH" onAction="#close" defaultButton="${!controller.vault.locked}"/>
-					<Button text="TODO unlockNow" ButtonBar.buttonData="OTHER" onAction="#unlockAndClose" defaultButton="${controller.vault.locked}" visible="${controller.vault.locked}" managed="${controller.vault.locked}"/>
+					<Button text="%generic.button.done" ButtonBar.buttonData="FINISH" onAction="#close" defaultButton="true" cancelButton="true"/>
 				</buttons>
 			</ButtonBar>
 		</VBox>
diff --git a/src/main/resources/fxml/vault_options_hub.fxml b/src/main/resources/fxml/vault_options_hub.fxml
index 151a7938c..94a0723df 100644
--- a/src/main/resources/fxml/vault_options_hub.fxml
+++ b/src/main/resources/fxml/vault_options_hub.fxml
@@ -4,6 +4,7 @@
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.layout.VBox?>
+<?import javafx.scene.control.Label?>
 <VBox xmlns:fx="http://javafx.com/fxml"
 	  xmlns="http://javafx.com/javafx"
 	  fx:controller="org.cryptomator.ui.vaultoptions.HubOptionsController"
@@ -13,9 +14,12 @@
 		<Insets topRightBottomLeft="12"/>
 	</padding>
 
-	<Button fx:id="convertToLocalButton" text="TODO Convert" onAction="#startConversion">
-		<graphic>
-			<FontAwesome5IconView glyph="ANCHOR"/>
-		</graphic>
-	</Button>
+	<Label maxWidth="-Infinity" text="TODO some explanation" wrapText="true"/>
+	<VBox spacing="6" alignment="CENTER">
+		<Button fx:id="convertToLocalButton" text="TODO Convert" onAction="#startConversion">
+			<graphic>
+				<FontAwesome5IconView glyph="ANCHOR"/>
+			</graphic>
+		</Button>
+	</VBox>
 </VBox>