diff --git a/src/main/java/org/cryptomator/ui/controls/FontAwesome5Icon.java b/src/main/java/org/cryptomator/ui/controls/FontAwesome5Icon.java
index 60f37719b..77c3cb042 100644
--- a/src/main/java/org/cryptomator/ui/controls/FontAwesome5Icon.java
+++ b/src/main/java/org/cryptomator/ui/controls/FontAwesome5Icon.java
@@ -18,6 +18,7 @@ public enum FontAwesome5Icon {
 	COPY("\uF0C5"), //
 	CROWN("\uF521"), //
 	EDIT("\uF044"), //
+	EXCHANGE_ALT("\uF362"), //
 	EXCLAMATION("\uF12A"), //
 	EXCLAMATION_CIRCLE("\uF06A"), //
 	EXCLAMATION_TRIANGLE("\uF071"), //
diff --git a/src/main/java/org/cryptomator/ui/convertvault/ConvertVaultModule.java b/src/main/java/org/cryptomator/ui/convertvault/ConvertVaultModule.java
index 7e4e2ff27..54f90d04e 100644
--- a/src/main/java/org/cryptomator/ui/convertvault/ConvertVaultModule.java
+++ b/src/main/java/org/cryptomator/ui/convertvault/ConvertVaultModule.java
@@ -66,7 +66,7 @@ abstract class ConvertVaultModule {
 		stage.setResizable(false);
 		stage.initModality(Modality.WINDOW_MODAL);
 		stage.initOwner(owner);
-		stage.setTitle("TODO recovery");
+		stage.setTitle(resourceBundle.getString("convertVault.title"));
 		return stage;
 	}
 
diff --git a/src/main/resources/fxml/convertvault_hubtolocal_convert.fxml b/src/main/resources/fxml/convertvault_hubtolocal_convert.fxml
index 729295321..9cc5f0f80 100644
--- a/src/main/resources/fxml/convertvault_hubtolocal_convert.fxml
+++ b/src/main/resources/fxml/convertvault_hubtolocal_convert.fxml
@@ -25,7 +25,7 @@
 			<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="FINISH" defaultButton="true" onAction="#convert" disable="${!controller.newPasswordController.goodPassword}"/>
+					<Button text="%convertVault.convert.convertBtn" ButtonBar.buttonData="FINISH" defaultButton="true" onAction="#convert" disable="${!controller.newPasswordController.goodPassword}"/>
 				</buttons>
 			</ButtonBar>
 		</VBox>
diff --git a/src/main/resources/fxml/convertvault_hubtolocal_success.fxml b/src/main/resources/fxml/convertvault_hubtolocal_success.fxml
index 66461a2db..cc5e58426 100644
--- a/src/main/resources/fxml/convertvault_hubtolocal_success.fxml
+++ b/src/main/resources/fxml/convertvault_hubtolocal_success.fxml
@@ -35,13 +35,13 @@
 		</Group>
 
 		<VBox HBox.hgrow="ALWAYS">
-			<Label styleClass="label-large" text="TODO Conversion success" wrapText="true" textAlignment="LEFT">
+			<Label styleClass="label-large" text="%convertVault.success.message" wrapText="true" textAlignment="LEFT">
 				<padding>
 					<Insets bottom="6" top="6"/>
 				</padding>
 			</Label>
 
-			<Label text="TODO unlock with password now. Pleas keep in mind..." wrapText="true" textAlignment="LEFT"/>
+			<Label text="%convertVault.success.description" wrapText="true" textAlignment="LEFT"/>
 
 			<Region VBox.vgrow="ALWAYS" minHeight="18"/>
 			<ButtonBar buttonMinWidth="120" buttonOrder="+C">
diff --git a/src/main/resources/fxml/vault_options.fxml b/src/main/resources/fxml/vault_options.fxml
index 46babe41c..e3465a481 100644
--- a/src/main/resources/fxml/vault_options.fxml
+++ b/src/main/resources/fxml/vault_options.fxml
@@ -36,7 +36,7 @@
 				<fx:include source="vault_options_masterkey.fxml"/>
 			</content>
 		</Tab>
-		<Tab fx:id="hubTab" id="HUB" text="Recovery"> <!-- is removed in controller, when config.keyid.scheme is not cryptomator-hub -->
+		<Tab fx:id="hubTab" id="HUB" text="%vaultOptions.hub"> <!-- is removed in controller, when config.keyid.scheme is not cryptomator-hub -->
 			<graphic>
 				<FontAwesome5IconView glyph="KEY"/>
 			</graphic>
diff --git a/src/main/resources/fxml/vault_options_hub.fxml b/src/main/resources/fxml/vault_options_hub.fxml
index 94a0723df..83686ce2c 100644
--- a/src/main/resources/fxml/vault_options_hub.fxml
+++ b/src/main/resources/fxml/vault_options_hub.fxml
@@ -14,11 +14,11 @@
 		<Insets topRightBottomLeft="12"/>
 	</padding>
 
-	<Label maxWidth="-Infinity" text="TODO some explanation" wrapText="true"/>
+	<Label maxWidth="-Infinity" text="%vaultOptions.hub.convertInfo" wrapText="true"/>
 	<VBox spacing="6" alignment="CENTER">
-		<Button fx:id="convertToLocalButton" text="TODO Convert" onAction="#startConversion">
+		<Button fx:id="convertToLocalButton" text="%vaultOptions.hub.convertBtn" onAction="#startConversion" maxWidth="Infinity">
 			<graphic>
-				<FontAwesome5IconView glyph="ANCHOR"/>
+				<FontAwesome5IconView glyph="EXCHANGE_ALT"/>
 			</graphic>
 		</Button>
 	</VBox>
diff --git a/src/main/resources/i18n/strings.properties b/src/main/resources/i18n/strings.properties
index 06baefce6..05c2d6387 100644
--- a/src/main/resources/i18n/strings.properties
+++ b/src/main/resources/i18n/strings.properties
@@ -434,7 +434,10 @@ vaultOptions.masterkey.forgetSavedPasswordBtn=Forget Saved Password
 vaultOptions.masterkey.recoveryKeyExplanation=A recovery key is your only means to restore access to a vault if you lose your password.
 vaultOptions.masterkey.showRecoveryKeyBtn=Display Recovery Key
 vaultOptions.masterkey.recoverPasswordBtn=Reset Password
-
+## Hub
+vaultOptions.hub=Recovery
+vaultOptions.hub.convertInfo=With the vault recovery key you can change this vaults unlock method to using a password instead of connecting to the hub instance.
+vaultOptions.hub.convertBtn=Change to offline access
 
 # Recovery Key
 ## Display Recovery Key
@@ -457,6 +460,12 @@ recoveryKey.recover.resetBtn=Reset
 recoveryKey.recover.resetSuccess.message=Password reset successful
 recoveryKey.recover.resetSuccess.description=You can unlock your vault with the new password.
 
+# Convert Vault
+convertVault.title=Convert vault
+convertVault.convert.convertBtn=Convert vault
+convertVault.success.message=Conversion successful
+convertVault.success.description=You can now unlock the vault with the chosen password without requiring authentication or internet access.
+
 # New Password
 newPassword.promptText=Enter a new password
 newPassword.reenterPassword=Confirm the new password