Merge branch 'develop' into feature/dialog-builder

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">

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}"/>

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">

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}">

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"/>

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