diff --git a/main/ui/src/main/resources/css/theme.css b/main/ui/src/main/resources/css/theme.css
index 234f5c37d..1d1e5b5cc 100644
--- a/main/ui/src/main/resources/css/theme.css
+++ b/main/ui/src/main/resources/css/theme.css
@@ -85,6 +85,15 @@
 	-fx-border-width: 1px 0 0 0;
 }
 
+.toolbar-container .button {
+	-fx-pref-height: 30px;
+	-fx-pref-width: 30px;
+	-fx-background-color: transparent;
+	-fx-background-insets: 0;
+	-fx-border-color: transparent CONTROL_BORDER transparent transparent;
+    -fx-border-width: 1;
+}
+
 /*******************************************************************************
  *                                                                             *
  * Tooltip                                                                     *
diff --git a/main/ui/src/main/resources/fxml/vault_list.fxml b/main/ui/src/main/resources/fxml/vault_list.fxml
index 77d3227ba..84072e878 100644
--- a/main/ui/src/main/resources/fxml/vault_list.fxml
+++ b/main/ui/src/main/resources/fxml/vault_list.fxml
@@ -24,27 +24,22 @@
 			<Arc styleClass="onboarding-overlay-arc" AnchorPane.bottomAnchor="5.0" type="OPEN" centerX="-10.0" centerY="0.0" radiusY="100.0" radiusX="60.0" startAngle="0" length="-60.0" strokeWidth="1"/>
 		</AnchorPane>
 	</StackPane>
-	<HBox styleClass="toolbar-container" VBox.vgrow="NEVER" spacing="6" alignment="CENTER_LEFT">
-		<padding>
-			<Insets bottom="6" left="6" right="6" top="6"/>
-		</padding>
-		<children>
-			<Button contentDisplay="GRAPHIC_ONLY" mnemonicParsing="false" onAction="#didClickAddVault">
-				<graphic>
-					<FontAwesomeIconView glyphName="PLUS"/>
-				</graphic>
-				<tooltip>
-					<Tooltip text="Add Vault"/>
-				</tooltip>
-			</Button>
-			<Button contentDisplay="GRAPHIC_ONLY" mnemonicParsing="false" onAction="#didClickRemoveVault">
-				<graphic>
-					<FontAwesomeIconView glyphName="MINUS"/>
-				</graphic>
-				<tooltip>
-					<Tooltip text="Remove Vault"/>
-				</tooltip>
-			</Button>
-		</children>
+	<HBox styleClass="toolbar-container" VBox.vgrow="NEVER" alignment="CENTER_LEFT">
+		<Button contentDisplay="GRAPHIC_ONLY" mnemonicParsing="false" onAction="#didClickAddVault">
+			<graphic>
+				<FontAwesomeIconView glyphName="PLUS"/>
+			</graphic>
+			<tooltip>
+				<Tooltip text="Add Vault"/>
+			</tooltip>
+		</Button>
+		<Button contentDisplay="GRAPHIC_ONLY" mnemonicParsing="false" onAction="#didClickRemoveVault">
+			<graphic>
+				<FontAwesomeIconView glyphName="MINUS"/>
+			</graphic>
+			<tooltip>
+				<Tooltip text="Remove Vault"/>
+			</tooltip>
+		</Button>
 	</HBox>
 </VBox>