diff --git a/main/ui/src/main/resources/css/dark_theme.css b/main/ui/src/main/resources/css/dark_theme.css
index 0eaeac596..97ebbef7c 100644
--- a/main/ui/src/main/resources/css/dark_theme.css
+++ b/main/ui/src/main/resources/css/dark_theme.css
@@ -116,10 +116,6 @@
 	-fx-fill: TEXT_FILL;
 }
 
-.glyph-icon-white {
-	-fx-fill: white;
-}
-
 .glyph-icon-primary {
 	-fx-fill: PRIMARY_BG;
 }
@@ -128,6 +124,14 @@
 	-fx-fill: SECONDARY_BG;
 }
 
+.glyph-icon-white {
+	-fx-fill: white;
+}
+
+.glyph-icon-red {
+	-fx-fill: RED_5;
+}
+
 /*******************************************************************************
  *                                                                             *
  * Main Window                                                                 *
diff --git a/main/ui/src/main/resources/css/light_theme.css b/main/ui/src/main/resources/css/light_theme.css
index 092d5327c..67def5b23 100644
--- a/main/ui/src/main/resources/css/light_theme.css
+++ b/main/ui/src/main/resources/css/light_theme.css
@@ -116,10 +116,6 @@
 	-fx-fill: TEXT_FILL;
 }
 
-.glyph-icon-white {
-	-fx-fill: white;
-}
-
 .glyph-icon-primary {
 	-fx-fill: PRIMARY_BG;
 }
@@ -128,6 +124,14 @@
 	-fx-fill: SECONDARY_BG;
 }
 
+.glyph-icon-white {
+	-fx-fill: white;
+}
+
+.glyph-icon-red {
+	-fx-fill: RED_5;
+}
+
 /*******************************************************************************
  *                                                                             *
  * Main Window                                                                 *
diff --git a/main/ui/src/main/resources/fxml/addvault_new_password.fxml b/main/ui/src/main/resources/fxml/addvault_new_password.fxml
index 1c6fd1f0d..65195a6bb 100644
--- a/main/ui/src/main/resources/fxml/addvault_new_password.fxml
+++ b/main/ui/src/main/resources/fxml/addvault_new_password.fxml
@@ -37,8 +37,8 @@
 		<Label text="%addvaultwizard.new.reenterPassword" labelFor="$reenterField"/>
 		<SecPasswordField fx:id="reenterField"/>
 		<HBox fx:id="passwordMatchBox" spacing="6" alignment="BASELINE_RIGHT">
-			<FontAwesome5IconView fx:id="checkmark" styleClass="glyph-icon-secondary" glyph="CHECK"/>
-			<FontAwesome5IconView fx:id="cross" styleClass="glyph-icon-secondary" glyph="TIMES"/>
+			<FontAwesome5IconView fx:id="checkmark" styleClass="glyph-icon-primary" glyph="CHECK"/>
+			<FontAwesome5IconView fx:id="cross" styleClass="glyph-icon-red" glyph="TIMES"/>
 			<Label fx:id="passwordMatchLabel" styleClass="label-secondary" labelFor="$reenterField"/>
 		</HBox>
 
diff --git a/main/ui/src/main/resources/fxml/changepassword.fxml b/main/ui/src/main/resources/fxml/changepassword.fxml
index f0d325b57..f77c70691 100644
--- a/main/ui/src/main/resources/fxml/changepassword.fxml
+++ b/main/ui/src/main/resources/fxml/changepassword.fxml
@@ -38,8 +38,8 @@
 		<Label labelFor="$reenterPasswordField" text="%changepassword.reenterNewPassword"/>
 		<SecPasswordField fx:id="reenterPasswordField"/>
 		<HBox fx:id="passwordMatchBox" spacing="6" alignment="BASELINE_RIGHT">
-			<FontAwesome5IconView fx:id="checkmark" styleClass="glyph-icon-secondary" glyph="CHECK"/>
-			<FontAwesome5IconView fx:id="cross" styleClass="glyph-icon-secondary" glyph="TIMES"/>
+			<FontAwesome5IconView fx:id="checkmark" styleClass="glyph-icon-primary" glyph="CHECK"/>
+			<FontAwesome5IconView fx:id="cross" styleClass="glyph-icon-red" glyph="TIMES"/>
 			<Label fx:id="passwordMatchLabel" styleClass="label-secondary" labelFor="$reenterPasswordField"/>
 		</HBox>