diff --git a/main/ui/src/main/resources/css/dark_theme.css b/main/ui/src/main/resources/css/dark_theme.css
index dfb5b6d4e..51e5f8379 100644
--- a/main/ui/src/main/resources/css/dark_theme.css
+++ b/main/ui/src/main/resources/css/dark_theme.css
@@ -6,9 +6,11 @@
 
 .root {
 	PRIMARY: #79B01A;
+	SECONDARY: #626262;
 	PRIMARY_BG: #598016;
 	MAIN_BG: #3B3B3B;
 	TEXT_FILL: #F7F7F7;
+	TEXT_FILL_PRIMARY: #79B01A;
 	TEXT_FILL_SECONDARY: #9E9E9E;
 	TEXT_FILL_WHITE: white;
 	TEXT_FILL_WHITE_SECONDARY: #7E7E7E;
@@ -24,6 +26,7 @@
 	CONTROL_PRIMARY_BG_NORMAL: #598016;
 	CONTROL_PRIMARY_BG_ARMED: #70A11B;
 	CONTROL_PRIMARY_BG_DISABLED: #4D5E2F;
+	CONTROL_PRIMARY_LIGHT_BG_NORMAL: #3A3B39;
 	CONTROL_WHITE_BG_ARMED: #E1E1E1;
 	SCROLL_BAR_THUMB_NORMAL: #626262;
 	SCROLL_BAR_THUMB_HOVER: #7E7E7E;
@@ -186,24 +189,16 @@
 }
 
 .list-view:focused .list-cell:selected {
-	-fx-background-color: PRIMARY, CONTROL_BG_ARMED;
-	-fx-background-insets: 0, 0 2px;
+	-fx-background-color: PRIMARY_BG, CONTROL_PRIMARY_LIGHT_BG_NORMAL;
+	-fx-background-insets: 0, 0 0 0 3px;
 }
 
 .list-cell:selected {
-	-fx-background-color: CONTROL_BG_ARMED;
+	-fx-background-color: CONTROL_PRIMARY_LIGHT_BG_NORMAL;
 }
 
 .list-cell .glyph-icon {
-	-fx-fill: TEXT_FILL_SECONDARY;
-}
-
-.list-cell:selected .glyph-icon {
-	-fx-fill: PRIMARY;
-}
-
-.list-cell:selected .header-label {
-	-fx-text-fill: PRIMARY;
+	-fx-fill: SECONDARY;
 }
 
 .list-cell .header-label {
@@ -215,6 +210,14 @@
 	-fx-font-size: 0.8em;
 }
 
+.list-cell:selected .glyph-icon {
+	-fx-fill: PRIMARY;
+}
+
+.list-cell:selected .header-label {
+	-fx-text-fill: TEXT_FILL_PRIMARY;
+}
+
 .list-cell.drop-above {
 	-fx-border-color: CONTROL_BG_ARMED transparent transparent transparent;
 	-fx-border-width: 3px 0 0 0;
diff --git a/main/ui/src/main/resources/css/light_theme.css b/main/ui/src/main/resources/css/light_theme.css
index 7494e0a8b..1cdd8ff22 100644
--- a/main/ui/src/main/resources/css/light_theme.css
+++ b/main/ui/src/main/resources/css/light_theme.css
@@ -6,9 +6,11 @@
 
 .root {
 	PRIMARY: #79B01A;
+	SECONDARY: #9E9E9E;
 	PRIMARY_BG: #70A11B;
 	MAIN_BG: #F7F7F7;
 	TEXT_FILL: #222;
+	TEXT_FILL_PRIMARY: #6B9B17;
 	TEXT_FILL_SECONDARY: #7E7E7E;
 	TEXT_FILL_WHITE: white;
 	TEXT_FILL_WHITE_SECONDARY: #B1B1B1;
@@ -24,6 +26,7 @@
 	CONTROL_PRIMARY_BG_NORMAL: #70A11B;
 	CONTROL_PRIMARY_BG_ARMED: #598016;
 	CONTROL_PRIMARY_BG_DISABLED: #83A150;
+	CONTROL_PRIMARY_LIGHT_BG_NORMAL: #F6F7F2;
 	CONTROL_WHITE_BG_ARMED: #E1E1E1;
 	SCROLL_BAR_THUMB_NORMAL: #CFCFCF;
 	SCROLL_BAR_THUMB_HOVER: #B1B1B1;
@@ -186,24 +189,16 @@
 }
 
 .list-view:focused .list-cell:selected {
-	-fx-background-color: CONTROL_PRIMARY_BG_NORMAL, #f3f5f0; /* TODO define constant */
-	-fx-background-insets: 0, 0 2px;
+	-fx-background-color: PRIMARY_BG, CONTROL_PRIMARY_LIGHT_BG_NORMAL;
+	-fx-background-insets: 0, 0 0 0 3px;
 }
 
 .list-cell:selected {
-	-fx-background-color: #f3f5f0; /* TODO define constant */
+	-fx-background-color: CONTROL_PRIMARY_LIGHT_BG_NORMAL;
 }
 
 .list-cell .glyph-icon {
-	-fx-fill: TEXT_FILL_SECONDARY;
-}
-
-.list-cell:selected .glyph-icon {
-	-fx-fill: CONTROL_PRIMARY_BG_NORMAL;
-}
-
-.list-cell:selected .header-label {
-	-fx-text-fill: CONTROL_PRIMARY_BG_NORMAL;
+	-fx-fill: SECONDARY;
 }
 
 .list-cell .header-label {
@@ -215,6 +210,14 @@
 	-fx-font-size: 0.8em;
 }
 
+.list-cell:selected .glyph-icon {
+	-fx-fill: PRIMARY;
+}
+
+.list-cell:selected .header-label {
+	-fx-text-fill: TEXT_FILL_PRIMARY;
+}
+
 .list-cell.drop-above {
 	-fx-border-color: CONTROL_BG_ARMED transparent transparent transparent;
 	-fx-border-width: 3px 0 0 0;
diff --git a/main/ui/src/main/resources/fxml/vault_detail.fxml b/main/ui/src/main/resources/fxml/vault_detail.fxml
index 7c0e54d5a..b1cd0f789 100644
--- a/main/ui/src/main/resources/fxml/vault_detail.fxml
+++ b/main/ui/src/main/resources/fxml/vault_detail.fxml
@@ -2,6 +2,7 @@
 
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Label?>
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Text?>
 <?import javafx.scene.text.TextFlow?>
@@ -14,20 +15,20 @@
 	</padding>
 	<children>
 		<!--TODO: add caption style class -->
-		<Text text="${controller.vault.displayableName}"/>
-		<TextFlow visible="${controller.anyVaultSelected}"><!--TODO: add visibility of the textflows -->
+		<Label text="${controller.vault.displayableName}"/>
+		<TextFlow styleClass="text-flow" visible="${controller.anyVaultSelected}"><!--TODO: add visibility of the textflows -->
 			<Text text="%vaultDetail.info.storageLocation"/>
 			<Text text="&quot;"/>
 			<Text text="${controller.vault.displayablePath}"/>
 			<Text text="&quot;"/>
 		</TextFlow>
-		<TextFlow visible="${controller.anyVaultSelected}">
+		<TextFlow styleClass="text-flow" visible="${controller.anyVaultSelected}">
 			<Text text="%vaultDetail.info.accessLocation"/>
 			<Text text="&quot;"/>
 			<Text text="${controller.vault.customMountPath}"/>
 			<Text text="&quot;"/>
 		</TextFlow>
-		<TextFlow visible="${controller.anyVaultSelected}">
+		<TextFlow styleClass="text-flow" visible="${controller.anyVaultSelected}">
 			<Text text="%vaultDetail.info.currentState"/>
 			<Text text="LOCKED" visible="${controller.vault.locked}" managed="${controller.vault.locked}"/><!-- hacky but working -->
 			<Text text="UNLOCKED" visible="${controller.vault.unlocked}" managed="${controller.vault.unlocked}"/>
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 723e0e00e..e6e35fe81 100644
--- a/main/ui/src/main/resources/fxml/vault_list_cell.fxml
+++ b/main/ui/src/main/resources/fxml/vault_list_cell.fxml
@@ -16,7 +16,9 @@
 		<Insets top="12" right="6" bottom="12" left="12"/>
 	</padding>
 	<children>
-		<FontAwesome5IconView glyph="${controller.glyph}" HBox.hgrow="NEVER" glyphSize="18"/>
+		<VBox alignment="CENTER" minWidth="20.0">
+			<FontAwesome5IconView glyph="${controller.glyph}" HBox.hgrow="NEVER" glyphSize="16"/>
+		</VBox>
 		<VBox spacing="4" HBox.hgrow="ALWAYS">
 			<Label styleClass="header-label" text="${controller.vault.displayableName}"/>
 			<Label styleClass="detail-label" text="${controller.vault.displayablePath}" textOverrun="CENTER_ELLIPSIS"/>