diff --git a/main/ui/src/main/resources/css/dark_theme.css b/main/ui/src/main/resources/css/dark_theme.css
index 69a2ba0e5..bda984e14 100644
--- a/main/ui/src/main/resources/css/dark_theme.css
+++ b/main/ui/src/main/resources/css/dark_theme.css
@@ -68,6 +68,8 @@
 }
 
 .main-window .title .button {
+	-fx-pref-height: 30px;
+	-fx-pref-width: 30px;
 	-fx-background-color: none;
 }
 
@@ -75,6 +77,15 @@
 	-fx-fill: white;
 }
 
+.main-window .title .button:focused {
+	-fx-background-color: white, PRIMARY_BG;
+	-fx-background-insets: 0, 1px;
+}
+
+.main-window .title .button:armed {
+	-fx-background-color: none;
+}
+
 .main-window .title .button:armed .fa-icon {
 	-fx-fill: CONTROL_WHITE_BG_ARMED;
 }
@@ -168,6 +179,11 @@
 	-fx-background-color: CONTROL_BG_NORMAL;
 }
 
+.list-view:focused .list-cell:selected {
+	-fx-background-color: CONTROL_BORDER_FOCUSED, CONTROL_BG_ARMED;
+	-fx-background-insets: 0, 1px;
+}
+
 .list-cell:selected {
 	-fx-background-color: CONTROL_BG_ARMED;
 }
@@ -211,8 +227,13 @@
 	-fx-border-width: 1;
 }
 
+.toolbar-container .button:focused {
+	-fx-background-color: CONTROL_BORDER_FOCUSED, MAIN_BG;
+	-fx-background-insets: 0, 1px 2px 1px 1px;
+}
+
 .toolbar-container .button:armed {
-	-fx-background-color: CONTROL_BORDER_NORMAL, CONTROL_BG_ARMED;
+	-fx-background-color: CONTROL_BG_ARMED;
 }
 
 .toolbar-container .button .fa-icon {
diff --git a/main/ui/src/main/resources/css/light_theme.css b/main/ui/src/main/resources/css/light_theme.css
index ab76a6ec5..973a87563 100644
--- a/main/ui/src/main/resources/css/light_theme.css
+++ b/main/ui/src/main/resources/css/light_theme.css
@@ -68,6 +68,8 @@
 }
 
 .main-window .title .button {
+	-fx-pref-height: 30px;
+	-fx-pref-width: 30px;
 	-fx-background-color: none;
 }
 
@@ -75,6 +77,15 @@
 	-fx-fill: white;
 }
 
+.main-window .title .button:focused {
+	-fx-background-color: white, PRIMARY_BG;
+	-fx-background-insets: 0, 1px;
+}
+
+.main-window .title .button:armed {
+	-fx-background-color: none;
+}
+
 .main-window .title .button:armed .fa-icon {
 	-fx-fill: CONTROL_WHITE_BG_ARMED;
 }
@@ -168,6 +179,11 @@
 	-fx-background-color: CONTROL_BG_NORMAL;
 }
 
+.list-view:focused .list-cell:selected {
+	-fx-background-color: CONTROL_BORDER_FOCUSED, CONTROL_BG_ARMED;
+	-fx-background-insets: 0, 1px;
+}
+
 .list-cell:selected {
 	-fx-background-color: CONTROL_BG_ARMED;
 }
@@ -211,8 +227,13 @@
 	-fx-border-width: 1;
 }
 
+.toolbar-container .button:focused {
+	-fx-background-color: CONTROL_BORDER_FOCUSED, MAIN_BG;
+	-fx-background-insets: 0, 1px 2px 1px 1px;
+}
+
 .toolbar-container .button:armed {
-	-fx-background-color: CONTROL_BORDER_NORMAL, CONTROL_BG_ARMED;
+	-fx-background-color: CONTROL_BG_ARMED;
 }
 
 .toolbar-container .button .fa-icon {
diff --git a/main/ui/src/main/resources/fxml/main_window.fxml b/main/ui/src/main/resources/fxml/main_window.fxml
index 73f266892..e1dde4ffd 100644
--- a/main/ui/src/main/resources/fxml/main_window.fxml
+++ b/main/ui/src/main/resources/fxml/main_window.fxml
@@ -14,7 +14,7 @@
 	  xmlns:fx="http://javafx.com/fxml"
 	  fx:controller="org.cryptomator.ui.mainwindow.MainWindowController"
 	  styleClass="main-window">
-	<HBox styleClass="title" fx:id="titleBar" alignment="CENTER" minHeight="50" maxHeight="50" VBox.vgrow="NEVER" spacing="12">
+	<HBox styleClass="title" fx:id="titleBar" alignment="CENTER" minHeight="50" maxHeight="50" VBox.vgrow="NEVER" spacing="6">
 		<padding>
 			<Insets bottom="6" left="12" right="12" top="6"/>
 		</padding>