diff --git a/main/ui/src/main/resources/css/dark_theme.css b/main/ui/src/main/resources/css/dark_theme.css
index e11fd0703..ddaa50544 100644
--- a/main/ui/src/main/resources/css/dark_theme.css
+++ b/main/ui/src/main/resources/css/dark_theme.css
@@ -112,8 +112,8 @@
 	-fx-fill: TEXT_FILL;
 }
 
-.glyph-icon-main-bg {
-	-fx-fill: MAIN_BG;
+.glyph-icon-white {
+	-fx-fill: white;
 }
 
 .glyph-icon-primary {
diff --git a/main/ui/src/main/resources/css/light_theme.css b/main/ui/src/main/resources/css/light_theme.css
index 3ccd21af3..090f1007d 100644
--- a/main/ui/src/main/resources/css/light_theme.css
+++ b/main/ui/src/main/resources/css/light_theme.css
@@ -112,8 +112,8 @@
 	-fx-fill: TEXT_FILL;
 }
 
-.glyph-icon-main-bg {
-	-fx-fill: MAIN_BG;
+.glyph-icon-white {
+	-fx-fill: white;
 }
 
 .glyph-icon-primary {
diff --git a/main/ui/src/main/resources/fxml/addvault_success.fxml b/main/ui/src/main/resources/fxml/addvault_success.fxml
index 663fa8ff3..5bd60aa60 100644
--- a/main/ui/src/main/resources/fxml/addvault_success.fxml
+++ b/main/ui/src/main/resources/fxml/addvault_success.fxml
@@ -26,7 +26,7 @@
 				<Insets topRightBottomLeft="24"/>
 			</VBox.margin>
 			<Circle styleClass="glyph-icon-primary" radius="36"/>
-			<FontAwesome5IconView styleClass="glyph-icon-main-bg" glyph="CHECK" glyphSize="36"/>
+			<FontAwesome5IconView styleClass="glyph-icon-white" glyph="CHECK" glyphSize="36"/>
 		</StackPane>
 
 		<FormattedLabel format="%addvaultwizard.success.nextStepsInstructions" arg1="${controller.vault.displayableName}" wrapText="true" textAlignment="LEFT" HBox.hgrow="ALWAYS"/>
diff --git a/main/ui/src/main/resources/fxml/remove_vault.fxml b/main/ui/src/main/resources/fxml/remove_vault.fxml
index d0ae78fe3..65ff75d49 100644
--- a/main/ui/src/main/resources/fxml/remove_vault.fxml
+++ b/main/ui/src/main/resources/fxml/remove_vault.fxml
@@ -27,7 +27,7 @@
 					<Insets topRightBottomLeft="12"/>
 				</VBox.margin>
 				<Circle styleClass="glyph-icon-primary" radius="24"/>
-				<FontAwesome5IconView styleClass="glyph-icon-main-bg" glyph="QUESTION" glyphSize="24"/>
+				<FontAwesome5IconView styleClass="glyph-icon-white" glyph="QUESTION" glyphSize="24"/>
 			</StackPane>
 
 			<Label text="%removeVault.information" wrapText="true" textAlignment="LEFT" HBox.hgrow="ALWAYS"/>
diff --git a/main/ui/src/main/resources/fxml/unlock_success.fxml b/main/ui/src/main/resources/fxml/unlock_success.fxml
index a43b85ac4..388078568 100644
--- a/main/ui/src/main/resources/fxml/unlock_success.fxml
+++ b/main/ui/src/main/resources/fxml/unlock_success.fxml
@@ -28,7 +28,7 @@
 					<Insets topRightBottomLeft="12"/>
 				</VBox.margin>
 				<Circle styleClass="glyph-icon-primary" radius="24"/>
-				<FontAwesome5IconView styleClass="glyph-icon-main-bg" glyph="CHECK" glyphSize="24"/>
+				<FontAwesome5IconView styleClass="glyph-icon-white" glyph="CHECK" glyphSize="24"/>
 			</StackPane>
 
 			<FormattedLabel format="%unlock.success.message" arg1="${controller.vault.displayableName}" wrapText="true" textAlignment="LEFT" HBox.hgrow="ALWAYS"/>
diff --git a/main/ui/src/main/resources/fxml/vault_detail.fxml b/main/ui/src/main/resources/fxml/vault_detail.fxml
index 6d2718a1f..62e7292b7 100644
--- a/main/ui/src/main/resources/fxml/vault_detail.fxml
+++ b/main/ui/src/main/resources/fxml/vault_detail.fxml
@@ -29,7 +29,7 @@
 			<children>
 				<StackPane alignment="CENTER">
 					<Circle styleClass="glyph-icon-primary" radius="16"/>
-					<FontAwesome5IconView styleClass="glyph-icon-main-bg" glyph="${controller.glyph}" HBox.hgrow="NEVER" glyphSize="16"/>
+					<FontAwesome5IconView styleClass="glyph-icon-white" glyph="${controller.glyph}" HBox.hgrow="NEVER" glyphSize="16"/>
 				</StackPane>
 				<VBox spacing="4" HBox.hgrow="ALWAYS">
 					<HBox spacing="12">