diff --git a/main/ui/src/main/resources/fxml/vault_list.fxml b/main/ui/src/main/resources/fxml/vault_list.fxml
index f0dc86d89..7843d1dab 100644
--- a/main/ui/src/main/resources/fxml/vault_list.fxml
+++ b/main/ui/src/main/resources/fxml/vault_list.fxml
@@ -12,6 +12,7 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.shape.Arc?>
 <?import org.cryptomator.ui.controls.FontAwesome5IconView?>
+<?import java.lang.Double?>
 <VBox xmlns="http://javafx.com/javafx"
 	  xmlns:fx="http://javafx.com/fxml"
 	  fx:controller="org.cryptomator.ui.mainwindow.VaultListController"
@@ -35,22 +36,17 @@
 			<Arc styleClass="onboarding-overlay-arc" AnchorPane.bottomAnchor="5" type="OPEN" centerX="-10" centerY="0" radiusY="100" radiusX="60" startAngle="0" length="-60" strokeWidth="1"/>
 		</AnchorPane>
 	</StackPane>
-	<HBox styleClass="toolbar-container" VBox.vgrow="NEVER" alignment="CENTER_LEFT">
-		<Button contentDisplay="GRAPHIC_ONLY" mnemonicParsing="false" onAction="#didClickAddVault">
+	<HBox HBox.hgrow="ALWAYS" alignment="CENTER">
+		<Button contentDisplay="GRAPHIC_ONLY" mnemonicParsing="false" onAction="#didClickAddVault" HBox.hgrow="ALWAYS" alignment="BASELINE_CENTER" minHeight="60">
 			<graphic>
-				<FontAwesome5IconView glyph="PLUS"/>
+				<FontAwesome5IconView glyph="PLUS" glyphSize="15"/>
 			</graphic>
 			<tooltip>
-				<Tooltip text="Add Vault"/>
-			</tooltip>
-		</Button>
-		<Button contentDisplay="GRAPHIC_ONLY" mnemonicParsing="false" onAction="#didClickRemoveVault">
-			<graphic>
-				<FontAwesome5IconView glyph="MINUS"/>
-			</graphic>
-			<tooltip>
-				<Tooltip text="Remove Vault"/>
+				<Tooltip text="%main.vaultlist.addVaultBtn.tooltip"/>
 			</tooltip>
+			<maxWidth>
+				<Double fx:constant="MAX_VALUE"/>
+			</maxWidth>
 		</Button>
 	</HBox>
 </VBox>
diff --git a/main/ui/src/main/resources/i18n/strings.properties b/main/ui/src/main/resources/i18n/strings.properties
index 013968acd..056a9a936 100644
--- a/main/ui/src/main/resources/i18n/strings.properties
+++ b/main/ui/src/main/resources/i18n/strings.properties
@@ -106,6 +106,7 @@ main.preferencesBtn.tooltip=Preferences
 main.vaultlist.emptyList.onboardingInstruction=Click here to add a vault
 main.vaultlist.contextMenu.add=Add Vault
 main.vaultlist.contextMenu.remove=Remove Vault
+main.vaultlist.addVaultBtn.tooltip=Add Vault
 ## Vault Detail
 main.vaultDetail.lockedStatus=LOCKED
 main.vaultDetail.unlockedStatus=UNLOCKED
diff --git a/main/ui/src/main/resources/i18n/strings_de.properties b/main/ui/src/main/resources/i18n/strings_de.properties
index d691777e4..4acda5558 100644
--- a/main/ui/src/main/resources/i18n/strings_de.properties
+++ b/main/ui/src/main/resources/i18n/strings_de.properties
@@ -104,6 +104,9 @@ main.closeBtn.tooltip=Schließen
 main.preferencesBtn.tooltip=Einstellungen
 ## Vault List
 main.vaultlist.emptyList.onboardingInstruction=Klicke hier, um einen Tresor hinzuzufügen
+main.vaultlist.contextMenu.add=Tresor hinzufügen
+main.vaultlist.contextMenu.remove=Tresor entfernen
+main.vaultlist.addVaultBtn.tooltip=Tresor hinzufügen
 ## Vault Detail
 main.vaultDetail.lockedStatus=GESPERRT
 main.vaultDetail.unlockedStatus=ENTSPERRT