diff --git a/main/ui/src/main/resources/css/theme.css b/main/ui/src/main/resources/css/theme.css
index 46a2d41e3..e6b9f9eea 100644
--- a/main/ui/src/main/resources/css/theme.css
+++ b/main/ui/src/main/resources/css/theme.css
@@ -13,6 +13,8 @@
 	CONTROL_BORDER_NORMAL: #CFCFCF;
 	CONTROL_BORDER_FOCUSED: #9E9E9E;
 	CONTROL_BG_ARMED: #E1E1E1;
+	SCROLL_BAR_THUMB_NORMAL: #CFCFCF;
+	SCROLL_BAR_THUMB_HOVER: #B1B1B1;
 
 	-fx-background-color: GRAY_LIGHT_BG;
     -fx-text-fill: TEXT_FILL;
@@ -128,6 +130,32 @@
 	-fx-background-color: CONTROL_BORDER_NORMAL, CONTROL_BG_ARMED;
 }
 
+/*******************************************************************************
+ *                                                                             *
+ * ScrollBar                                                                   *
+ *                                                                             *
+ ******************************************************************************/
+
+.scroll-bar > .thumb {
+	-fx-background-color: SCROLL_BAR_THUMB_NORMAL;
+	-fx-background-insets: 1px;
+	-fx-background-radius: 2px;
+}
+
+.scroll-bar > .thumb:hover {
+	-fx-background-color: SCROLL_BAR_THUMB_HOVER;
+}
+
+.scroll-bar:horizontal > .increment-button,
+.scroll-bar:horizontal > .decrement-button {
+	-fx-padding: 3 0 3 0;
+}
+
+.scroll-bar:vertical > .increment-button,
+.scroll-bar:vertical > .decrement-button {
+	-fx-padding: 0 3 0 3;
+}
+
 /*******************************************************************************
  *                                                                             *
  * Tooltip                                                                     *
@@ -162,11 +190,11 @@
 	-fx-background-color: CONTROL_BORDER_FOCUSED, white;
 }
 
-/****************************************************************************
- *																			*
- * Buttons																	*
- *																			*
- ****************************************************************************/
+/*******************************************************************************
+ *                                                                             *
+ * Buttons                                                                     *
+ *                                                                             *
+ ******************************************************************************/
 
 .button {
 	-fx-pref-height: 25px;
@@ -266,57 +294,71 @@
 	-fx-background-color: CONTROL_BG_ARMED;
 }
 
-/****************************************************************************
- *																			*
- * ProgressIndicator														*
- * Derived from aquafx-project.com, (C) Claudine Zillmann, see NOTICE.md	*
- *																			*
- ****************************************************************************/
+/*******************************************************************************
+ *                                                                             *
+ * ProgressIndicator                                                           *
+ * Derived from aquafx-project.com, (C) Claudine Zillmann, see NOTICE.md       *
+ *                                                                             *
+ ******************************************************************************/
 
 .progress-indicator {
 	-fx-indeterminate-segment-count: 12;
 	-fx-spin-enabled: true;
 }
+
 .progress-indicator:indeterminate > .spinner {
 	-fx-padding: 0.083333em; 
 }
+
 .progress-indicator:indeterminate .segment {
 	-fx-background-color: rgb(95.0, 95.0, 98.0), rgb(122.0, 122.0, 125.0);
 	-fx-background-insets:0.0, 0.5;
 }
+
 .progress-indicator:indeterminate .segment0 {
 	-fx-shape:"m 12.007729,4.9541827 c -0.49762,0.7596865 0.893181,1.6216808 1.327833,0.7666252 L 15.456199,2.0477574 C 15.942094,1.2061627 14.61426,0.43953765 14.128365,1.2811324 z";
 }
+
 .progress-indicator:indeterminate .segment1 {
 	-fx-shape:"m 9.2224559,4.62535 c -0.051108,0.9067177 1.5843581,0.957826 1.5332501,0 l 0,-4.24127319 c 0,-0.9717899 -1.5332501,-0.9717899 -1.5332501,0 z";
 }
+
 .progress-indicator:indeterminate .segment2 {
 	-fx-shape:"M 8.0465401,4.9030617 C 8.5441601,5.6627485 7.1533584,6.5247425 6.7187068,5.6696872 L 4.5980702,1.9966363 C 4.1121752,1.1550418 5.4400085,0.38841683 5.9259035,1.2300114 z";
 }
+
 .progress-indicator:indeterminate .segment3 {
 	-fx-shape:"M 5.7330066,6.5305598 C 6.5579512,6.9103162 5.8366865,8.3790371 5.0144939,7.8850315 L 1.2677551,5.8974832 C 0.409277,5.4420823 1.1277888,4.0876101 1.9862674,4.5430105 z";
 }
+
 .progress-indicator:indeterminate .segment4 {
 	-fx-shape:"m 0.42171041,9.2083842 c -0.90671825,-0.051108 -0.95782608,1.5843588 0,1.5332498 l 4.24127319,0 c 0.9717899,0 0.9717899,-1.5332498 0,-1.5332498 z";
 }
+
 .progress-indicator:indeterminate .segment5 {
 	-fx-shape:"M 5.7330066,13.443113 C 6.5579512,13.063356 5.8366865,11.594635 5.0144939,12.088641 L 1.2677551,14.076189 C 0.409277,14.53159 1.1277888,15.886062 1.9862674,15.430662 z";
 }
+
 .progress-indicator:indeterminate .segment6 {
 	-fx-shape:"M 8.0465401,15.070611 C 8.5441601,14.310924 7.1533584,13.44893 6.7187068,14.303985 l -2.1206366,3.673051 c -0.485895,0.841595 0.8419383,1.60822 1.3278333,0.766625 z";
 }
+
 .progress-indicator:indeterminate .segment7 {
 	-fx-shape:"m 9.2224559,19.539943 c -0.051108,0.906718 1.5843581,0.957826 1.5332501,0 l 0,-4.241273 c 0,-0.97179 -1.5332501,-0.97179 -1.5332501,0 z";
 }
+
 .progress-indicator:indeterminate .segment8 {
 	-fx-shape:"m 12.10997,15.070611 c -0.49762,-0.759687 0.893182,-1.621681 1.327834,-0.766626 l 2.120636,3.673051 c 0.485895,0.841595 -0.841938,1.60822 -1.327833,0.766625 z";
 }
+
 .progress-indicator:indeterminate .segment9 {
 	-fx-shape:"m 14.423504,13.443113 c -0.824945,-0.379757 -0.10368,-1.848478 0.718512,-1.354472 l 3.746739,1.987548 c 0.858478,0.455401 0.139967,1.809873 -0.718512,1.354473 z";
 }
+
 .progress-indicator:indeterminate .segment10 {
 	-fx-shape:"m 15.372451,9.2445322 c -0.906719,-0.051108 -0.957826,1.5843588 0,1.5332498 l 4.241273,0 c 0.97179,0 0.97179,-1.5332498 0,-1.5332498 z";
 }
+
 .progress-indicator:indeterminate .segment11 {
 	-fx-shape:"m 14.321262,6.5816808 c -0.824944,0.3797564 -0.10368,1.8484772 0.718513,1.3544717 L 18.786514,5.9486042 C 19.644992,5.4932031 18.92648,4.1387308 18.068001,4.5941315 z";
-}
\ No newline at end of file
+}
diff --git a/main/ui/src/main/resources/fxml/vault_list.fxml b/main/ui/src/main/resources/fxml/vault_list.fxml
index 143760606..c2082a39c 100644
--- a/main/ui/src/main/resources/fxml/vault_list.fxml
+++ b/main/ui/src/main/resources/fxml/vault_list.fxml
@@ -13,7 +13,7 @@
 <VBox xmlns="http://javafx.com/javafx"
 	  xmlns:fx="http://javafx.com/fxml"
 	  fx:controller="org.cryptomator.ui.mainwindow.VaultListController"
-	  minWidth="200">
+	  minWidth="206">
 	<StackPane VBox.vgrow="ALWAYS">
 		<ListView fx:id="vaultList" editable="true"/>
 		<AnchorPane fx:id="onboardingOverlay">
diff --git a/main/ui/src/main/resources/fxml/vault_list_cell.fxml b/main/ui/src/main/resources/fxml/vault_list_cell.fxml
index 14e0093f0..40c6b354c 100644
--- a/main/ui/src/main/resources/fxml/vault_list_cell.fxml
+++ b/main/ui/src/main/resources/fxml/vault_list_cell.fxml
@@ -10,10 +10,10 @@
 	  fx:controller="org.cryptomator.ui.mainwindow.VaultListCellController"
 	  prefHeight="46.0"
 	  prefWidth="200.0"
-	  spacing="12"
+	  spacing="10"
 	  alignment="CENTER_LEFT">
 	<padding>
-		<Insets top="6" right="8" bottom="6" left="12"/>
+		<Insets top="6" right="8" bottom="6" left="10"/>
 	</padding>
 	<children>
 		<FontAwesomeIconView styleClass="lock-icon" glyphName="${controller.glyph}" HBox.hgrow="NEVER" glyphSize="16"/>