diff --git a/src/main/java/org/cryptomator/ui/error/ErrorComponent.java b/src/main/java/org/cryptomator/ui/error/ErrorComponent.java
index 554aa65f1..47798c920 100644
--- a/src/main/java/org/cryptomator/ui/error/ErrorComponent.java
+++ b/src/main/java/org/cryptomator/ui/error/ErrorComponent.java
@@ -20,6 +20,8 @@ public interface ErrorComponent {
 	default Stage show() {
 		Stage stage = window();
 		stage.setScene(scene());
+		stage.setMinWidth(420);
+		stage.setMinHeight(300);
 		stage.show();
 		return stage;
 	}
diff --git a/src/main/java/org/cryptomator/ui/health/HealthCheckComponent.java b/src/main/java/org/cryptomator/ui/health/HealthCheckComponent.java
index aa69e0828..3903734c9 100644
--- a/src/main/java/org/cryptomator/ui/health/HealthCheckComponent.java
+++ b/src/main/java/org/cryptomator/ui/health/HealthCheckComponent.java
@@ -25,6 +25,8 @@ public interface HealthCheckComponent {
 	default Stage showHealthCheckWindow() {
 		Stage stage = window();
 		stage.setScene(startScene().get());
+		stage.setMinWidth(420);
+		stage.setMinHeight(300);
 		stage.show();
 		return stage;
 	}
diff --git a/src/main/java/org/cryptomator/ui/mainwindow/VaultListController.java b/src/main/java/org/cryptomator/ui/mainwindow/VaultListController.java
index 37b9841d0..4b9732e19 100644
--- a/src/main/java/org/cryptomator/ui/mainwindow/VaultListController.java
+++ b/src/main/java/org/cryptomator/ui/mainwindow/VaultListController.java
@@ -112,6 +112,10 @@ public class VaultListController implements FxController {
 		vaultList.setItems(vaults);
 		vaultList.setCellFactory(cellFactory);
 
+		vaultList.prefHeightProperty().bind(
+				vaultList.fixedCellSizeProperty().multiply(Bindings.size(vaultList.getItems()))
+		);
+
 		selectedVault.bind(vaultList.getSelectionModel().selectedItemProperty());
 		vaults.addListener((ListChangeListener.Change<? extends Vault> c) -> {
 			while (c.next()) {
diff --git a/src/main/resources/fxml/health_start.fxml b/src/main/resources/fxml/health_start.fxml
index cc65aaaaa..56c38f740 100644
--- a/src/main/resources/fxml/health_start.fxml
+++ b/src/main/resources/fxml/health_start.fxml
@@ -25,8 +25,8 @@
 	<children>
 		<HBox VBox.vgrow="ALWAYS">
 			<VBox alignment="CENTER" minWidth="175" maxWidth="175">
-				<ImageView VBox.vgrow="ALWAYS" fitHeight="128" preserveRatio="true" smooth="true" cache="true">
-					<Image url="@../img/logo.png"/>
+				<ImageView VBox.vgrow="ALWAYS" fitHeight="128" preserveRatio="true" cache="true">
+					<Image url="@../img/logo128.png"/>
 				</ImageView>
 			</VBox>
 			<VBox HBox.hgrow="ALWAYS" alignment="CENTER">
diff --git a/src/main/resources/fxml/preferences_about.fxml b/src/main/resources/fxml/preferences_about.fxml
index 1555de504..55577426f 100644
--- a/src/main/resources/fxml/preferences_about.fxml
+++ b/src/main/resources/fxml/preferences_about.fxml
@@ -17,8 +17,8 @@
 	</padding>
 	<children>
 		<HBox spacing="12" VBox.vgrow="NEVER">
-			<ImageView VBox.vgrow="ALWAYS" fitHeight="64" preserveRatio="true" smooth="true" cache="true">
-				<Image url="@../img/logo.png"/>
+			<ImageView VBox.vgrow="ALWAYS" fitHeight="64" preserveRatio="true" cache="true">
+				<Image url="@../img/logo64.png"/>
 			</ImageView>
 			<VBox spacing="3" HBox.hgrow="ALWAYS" alignment="CENTER_LEFT">
 				<FormattedLabel styleClass="label-extra-large" format="Cryptomator %s" arg1="${controller.fullApplicationVersion}"/>
diff --git a/src/main/resources/fxml/remove_cert.fxml b/src/main/resources/fxml/remove_cert.fxml
index 833a96400..63b44bc70 100644
--- a/src/main/resources/fxml/remove_cert.fxml
+++ b/src/main/resources/fxml/remove_cert.fxml
@@ -43,7 +43,7 @@
 			<ButtonBar buttonMinWidth="120" buttonOrder="+CI">
 				<buttons>
 					<Button text="%generic.button.cancel" ButtonBar.buttonData="CANCEL_CLOSE" defaultButton="true" cancelButton="true" onAction="#close"/>
-					<Button text="%removeCert.confirmBtn" ButtonBar.buttonData="FINISH" onAction="#remove"/>
+					<Button text="%generic.button.remove" ButtonBar.buttonData="FINISH" onAction="#remove"/>
 				</buttons>
 			</ButtonBar>
 		</VBox>
diff --git a/src/main/resources/fxml/remove_vault.fxml b/src/main/resources/fxml/remove_vault.fxml
index 57a36576e..8a48d31f3 100644
--- a/src/main/resources/fxml/remove_vault.fxml
+++ b/src/main/resources/fxml/remove_vault.fxml
@@ -44,7 +44,7 @@
 			<ButtonBar buttonMinWidth="120" buttonOrder="+CI">
 				<buttons>
 					<Button text="%generic.button.cancel" ButtonBar.buttonData="CANCEL_CLOSE" defaultButton="true" cancelButton="true" onAction="#close"/>
-					<Button text="%removeVault.confirmBtn" ButtonBar.buttonData="FINISH" onAction="#finish"/>
+					<Button text="%generic.button.remove" ButtonBar.buttonData="FINISH" onAction="#finish"/>
 				</buttons>
 			</ButtonBar>
 		</VBox>
diff --git a/src/main/resources/fxml/vault_detail_missing.fxml b/src/main/resources/fxml/vault_detail_missing.fxml
index 6f78b8064..8721496f5 100644
--- a/src/main/resources/fxml/vault_detail_missing.fxml
+++ b/src/main/resources/fxml/vault_detail_missing.fxml
@@ -9,7 +9,7 @@
 	  xmlns="http://javafx.com/javafx"
 	  fx:controller="org.cryptomator.ui.mainwindow.VaultDetailMissingVaultController"
 	  alignment="TOP_CENTER"
-	  spacing="24">
+	  spacing="9">
 	<children>
 		<VBox spacing="9" alignment="CENTER">
 			<StackPane alignment="CENTER">
diff --git a/src/main/resources/fxml/vault_detail_welcome.fxml b/src/main/resources/fxml/vault_detail_welcome.fxml
index 8fdcf85eb..132ec33fc 100644
--- a/src/main/resources/fxml/vault_detail_welcome.fxml
+++ b/src/main/resources/fxml/vault_detail_welcome.fxml
@@ -8,10 +8,10 @@
 	  xmlns="http://javafx.com/javafx"
 	  fx:controller="org.cryptomator.ui.mainwindow.WelcomeController"
 	  alignment="CENTER"
-	  spacing="24">
+	  spacing="9">
 	<children>
-		<ImageView VBox.vgrow="ALWAYS" fitHeight="128" preserveRatio="true" smooth="true" cache="true">
-			<Image url="@../img/logo.png"/>
+		<ImageView VBox.vgrow="ALWAYS" fitHeight="128" preserveRatio="true" cache="true">
+			<Image url="@../img/logo128.png"/>
 		</ImageView>
 
 		<TextFlow styleClass="text-flow" prefWidth="-Infinity" visible="${controller.noVaultPresent}" managed="${controller.noVaultPresent}">
diff --git a/src/main/resources/fxml/vault_list.fxml b/src/main/resources/fxml/vault_list.fxml
index ae0905d4e..267148d3e 100644
--- a/src/main/resources/fxml/vault_list.fxml
+++ b/src/main/resources/fxml/vault_list.fxml
@@ -18,11 +18,14 @@
 		   minWidth="206">
 	<VBox>
 		<StackPane VBox.vgrow="ALWAYS">
-			<ListView fx:id="vaultList" editable="true" fixedCellSize="${controller.cellSize}">
-				<contextMenu>
-					<fx:include source="vault_list_contextmenu.fxml"/>
-				</contextMenu>
-			</ListView>
+			<VBox>
+				<ListView fx:id="vaultList" editable="true" fixedCellSize="${controller.cellSize}">
+					<contextMenu>
+						<fx:include source="vault_list_contextmenu.fxml"/>
+					</contextMenu>
+				</ListView>
+				<Region VBox.vgrow="ALWAYS" styleClass="list-view"/>
+			</VBox>
 			<VBox visible="${controller.emptyVaultList}" spacing="6" alignment="CENTER">
 				<Region VBox.vgrow="ALWAYS"/>
 				<Label VBox.vgrow="NEVER" text="%main.vaultlist.emptyList.onboardingInstruction" textAlignment="CENTER" wrapText="true"/>
diff --git a/src/main/resources/i18n/strings.properties b/src/main/resources/i18n/strings.properties
index 7d13efcd8..1df6bc244 100644
--- a/src/main/resources/i18n/strings.properties
+++ b/src/main/resources/i18n/strings.properties
@@ -14,6 +14,7 @@ generic.button.copied=Copied!
 generic.button.done=Done
 generic.button.next=Next
 generic.button.print=Print
+generic.button.remove=Remove
 
 # Error
 error.message=An error occurred
@@ -106,7 +107,6 @@ addvaultwizard.success.unlockNow=Unlock Now
 removeVault.title=Remove "%s"
 removeVault.message=Remove vault?
 removeVault.description=This will only make Cryptomator forget about this vault. You can add it again. No encrypted files will be deleted from your hard drive.
-removeVault.confirmBtn=Remove Vault
 
 # Change Password
 changepassword.title=Change Password
@@ -344,7 +344,6 @@ preferences.contribute.sponsor=Sponsor
 removeCert.title=Remove Certificate
 removeCert.message=Remove supporter certificate?
 removeCert.description=Cryptomator's core features are not affected by this. Neither access to your vaults is restricted nor the level of security is lowered.
-removeCert.confirmBtn=Remove
 #<-- Add entries for donations and code/translation/documentation contribution -->
 
 ## About
diff --git a/src/main/resources/img/logo.png b/src/main/resources/img/logo.png
deleted file mode 100644
index cdbecfa1a..000000000
Binary files a/src/main/resources/img/logo.png and /dev/null differ
diff --git a/src/main/resources/img/logo128.png b/src/main/resources/img/logo128.png
new file mode 100644
index 000000000..785c1e804
Binary files /dev/null and b/src/main/resources/img/logo128.png differ
diff --git a/src/main/resources/img/logo128@2x.png b/src/main/resources/img/logo128@2x.png
new file mode 100644
index 000000000..ebfe07c70
Binary files /dev/null and b/src/main/resources/img/logo128@2x.png differ
diff --git a/src/main/resources/img/logo64.png b/src/main/resources/img/logo64.png
new file mode 100644
index 000000000..7af35f43a
Binary files /dev/null and b/src/main/resources/img/logo64.png differ
diff --git a/src/main/resources/img/logo64@2x.png b/src/main/resources/img/logo64@2x.png
new file mode 100644
index 000000000..785c1e804
Binary files /dev/null and b/src/main/resources/img/logo64@2x.png differ
diff --git a/src/main/resources/img/logo@2x.png b/src/main/resources/img/logo@2x.png
deleted file mode 100644
index de8f79ded..000000000
Binary files a/src/main/resources/img/logo@2x.png and /dev/null differ