diff --git a/main/ui/src/main/resources/css/dark_theme.css b/main/ui/src/main/resources/css/dark_theme.css
index 93327c09b..7ab552e10 100644
--- a/main/ui/src/main/resources/css/dark_theme.css
+++ b/main/ui/src/main/resources/css/dark_theme.css
@@ -364,6 +364,7 @@
 .check-box {
 	-fx-text-fill: TEXT_FILL;
 	-fx-label-padding: 0 0 0 6px;
+	-fx-padding: 4px;
 }
 
 .check-box > .box {
@@ -396,6 +397,7 @@
 .radio-button {
 	-fx-text-fill: TEXT_FILL;
 	-fx-label-padding: 0 0 0 6px;
+	-fx-padding: 4px;
 }
 .radio-button > .radio {
 	-fx-border-color: CONTROL_BORDER_NORMAL;
diff --git a/main/ui/src/main/resources/css/light_theme.css b/main/ui/src/main/resources/css/light_theme.css
index dfd03e1b0..deda6b7f1 100644
--- a/main/ui/src/main/resources/css/light_theme.css
+++ b/main/ui/src/main/resources/css/light_theme.css
@@ -364,6 +364,7 @@
 .check-box {
 	-fx-text-fill: TEXT_FILL;
 	-fx-label-padding: 0 0 0 6px;
+	-fx-padding: 4px;
 }
 
 .check-box > .box {
@@ -396,6 +397,7 @@
 .radio-button {
 	-fx-text-fill: TEXT_FILL;
 	-fx-label-padding: 0 0 0 6px;
+	-fx-padding: 4px;
 }
 .radio-button > .radio {
 	-fx-border-color: CONTROL_BORDER_NORMAL;
diff --git a/main/ui/src/main/resources/fxml/addvault_new_location.fxml b/main/ui/src/main/resources/fxml/addvault_new_location.fxml
index 69ba3689b..8539ceb8e 100644
--- a/main/ui/src/main/resources/fxml/addvault_new_location.fxml
+++ b/main/ui/src/main/resources/fxml/addvault_new_location.fxml
@@ -15,8 +15,8 @@
 	  xmlns:fx="http://javafx.com/fxml"
 	  fx:controller="org.cryptomator.ui.addvaultwizard.CreateNewVaultLocationController"
 	  prefHeight="400.0" prefWidth="600.0"
-	  alignment="BASELINE_LEFT"
-	  spacing="12">
+	  alignment="CENTER_LEFT"
+	  spacing="6">
 	<fx:define>
 		<ToggleGroup fx:id="predefinedLocationToggler"/>
 	</fx:define>
@@ -31,7 +31,7 @@
 
 		<RadioButton fx:id="dropboxRadioButton" toggleGroup="${predefinedLocationToggler}" text="TODO dropbox" visible="${controller.locationPresets.foundDropbox}"/>
 		<RadioButton fx:id="gdriveRadioButton" toggleGroup="${predefinedLocationToggler}" text="TODO google drive" visible="${controller.locationPresets.foundGdrive}"/>
-		<HBox spacing="12" alignment="BASELINE_LEFT">
+		<HBox spacing="12" alignment="CENTER_LEFT">
 			<RadioButton fx:id="customRadioButton" toggleGroup="${predefinedLocationToggler}" text="TODO custom location"/>
 			<Button contentDisplay="LEFT" text="%addvaultwizard.new.directoryPickerButton" onAction="#chooseCustomVaultPath" disable="${controller.usePresetPath}">
 				<graphic>