diff --git a/main/ui/src/main/resources/fxml/vault_detail_locked.fxml b/main/ui/src/main/resources/fxml/vault_detail_locked.fxml
index aa4f5e855..d86defdf6 100644
--- a/main/ui/src/main/resources/fxml/vault_detail_locked.fxml
+++ b/main/ui/src/main/resources/fxml/vault_detail_locked.fxml
@@ -2,7 +2,6 @@
 
 <?import org.cryptomator.ui.controls.FontAwesome5IconView?>
 <?import javafx.scene.control.Button?>
-<?import javafx.scene.control.Hyperlink?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.Region?>
@@ -25,18 +24,20 @@
 				<FontAwesome5IconView glyph="KEY" glyphSize="15"/>
 			</graphic>
 		</Button>
-		<Hyperlink text="%main.vaultDetail.optionsBtn" onAction="#showVaultOptions">
+		<Label styleClass="label-small,label-muted" text="%main.vaultDetail.passwordSavedInKeychain" visible="${controller.passwordSaved}">
 			<graphic>
-				<FontAwesome5IconView glyph="COG"/>
+				<FontAwesome5IconView styleClass="glyph-icon-muted" glyph="LOCK"/>
 			</graphic>
-		</Hyperlink>
+		</Label>
+
 		<Region VBox.vgrow="ALWAYS"/>
-		<HBox alignment="CENTER_RIGHT" spacing="6">
-			<Label styleClass="label-small,label-muted" text="%main.vaultDetail.passwordSavedInKeychain" visible="${controller.passwordSaved}">
+
+		<HBox alignment="BOTTOM_RIGHT">
+			<Button text="%main.vaultDetail.optionsBtn" minWidth="120" onAction="#showVaultOptions">
 				<graphic>
-					<FontAwesome5IconView styleClass="glyph-icon-muted" glyph="LOCK"/>
+					<FontAwesome5IconView glyph="COG"/>
 				</graphic>
-			</Label>
+			</Button>
 		</HBox>
 	</children>
 </VBox>
diff --git a/main/ui/src/main/resources/i18n/strings.properties b/main/ui/src/main/resources/i18n/strings.properties
index 8ab40defa..20aa17a14 100644
--- a/main/ui/src/main/resources/i18n/strings.properties
+++ b/main/ui/src/main/resources/i18n/strings.properties
@@ -96,7 +96,7 @@ forgetPassword.confirmBtn=Forget Password
 # Unlock
 unlock.title=Unlock Vault
 unlock.passwordPrompt=Enter password for "%s":
-unlock.savePassword=Save Password
+unlock.savePassword=Remember Password
 unlock.unlockBtn=Unlock
 ## Success
 unlock.success.message=Unlocked "%s" successfully! Your vault is now accessible.