diff --git a/main/ui/src/main/resources/css/dark_theme.css b/main/ui/src/main/resources/css/dark_theme.css
index ddaa50544..0eaeac596 100644
--- a/main/ui/src/main/resources/css/dark_theme.css
+++ b/main/ui/src/main/resources/css/dark_theme.css
@@ -45,6 +45,10 @@
 	GRAY_8: #E1E1E1;
 	GRAY_9: #F7F7F7;
 
+	RED_5: #E74C3C;
+	ORANGE_5: #E67E22;
+	YELLOW_5: #F1C40F;
+
 	PRIMARY_BG: GREEN_3;
 	SECONDARY_BG: GRAY_3;
 	MAIN_BG: GRAY_1;
@@ -69,15 +73,15 @@
 	CONTROL_WHITE_BG_ARMED: GRAY_8;
 	SCROLL_BAR_THUMB_NORMAL: GRAY_3;
 	SCROLL_BAR_THUMB_HOVER: GRAY_4;
-	INDICATOR_BG: #C74234;
+	INDICATOR_BG: RED_5;
 	PROGRESS_INDICATOR_BEGIN: GRAY_7;
 	PROGRESS_INDICATOR_END: GRAY_5;
-	PASSWORD_STRENGTH_INDICATOR_BG: white;
-	PASSWORD_STRENGTH_INDICATOR_BG_STRENGTH_0: #E74C3C;
-	PASSWORD_STRENGTH_INDICATOR_BG_STRENGTH_1: #E67E22;
-	PASSWORD_STRENGTH_INDICATOR_BG_STRENGTH_2: #F1C40F;
-	PASSWORD_STRENGTH_INDICATOR_BG_STRENGTH_3: #40F47E;
-	PASSWORD_STRENGTH_INDICATOR_BG_STRENGTH_4: #27AE60;
+	PASSWORD_STRENGTH_INDICATOR_BG: GRAY_3;
+	PASSWORD_STRENGTH_INDICATOR_BG_STRENGTH_0: RED_5;
+	PASSWORD_STRENGTH_INDICATOR_BG_STRENGTH_1: ORANGE_5;
+	PASSWORD_STRENGTH_INDICATOR_BG_STRENGTH_2: YELLOW_5;
+	PASSWORD_STRENGTH_INDICATOR_BG_STRENGTH_3: GREEN_6;
+	PASSWORD_STRENGTH_INDICATOR_BG_STRENGTH_4: GREEN_5;
 
 	-fx-background-color: MAIN_BG;
     -fx-text-fill: TEXT_FILL;
diff --git a/main/ui/src/main/resources/css/light_theme.css b/main/ui/src/main/resources/css/light_theme.css
index 090f1007d..092d5327c 100644
--- a/main/ui/src/main/resources/css/light_theme.css
+++ b/main/ui/src/main/resources/css/light_theme.css
@@ -45,6 +45,10 @@
 	GRAY_8: #E1E1E1;
 	GRAY_9: #F7F7F7;
 
+	RED_5: #E74C3C;
+	ORANGE_5: #E67E22;
+	YELLOW_5: #F1C40F;
+
 	PRIMARY_BG: GREEN_5;
 	SECONDARY_BG: GRAY_5;
 	MAIN_BG: GRAY_9;
@@ -69,15 +73,15 @@
 	CONTROL_WHITE_BG_ARMED: GRAY_8;
 	SCROLL_BAR_THUMB_NORMAL: GRAY_7;
 	SCROLL_BAR_THUMB_HOVER: GRAY_6;
-	INDICATOR_BG: #E74C3C;
+	INDICATOR_BG: RED_5;
 	PROGRESS_INDICATOR_BEGIN: GRAY_2;
 	PROGRESS_INDICATOR_END: GRAY_4;
-	PASSWORD_STRENGTH_INDICATOR_BG: white;
-	PASSWORD_STRENGTH_INDICATOR_BG_STRENGTH_0: #E74C3C;
-	PASSWORD_STRENGTH_INDICATOR_BG_STRENGTH_1: #E67E22;
-	PASSWORD_STRENGTH_INDICATOR_BG_STRENGTH_2: #F1C40F;
-	PASSWORD_STRENGTH_INDICATOR_BG_STRENGTH_3: #40F47E;
-	PASSWORD_STRENGTH_INDICATOR_BG_STRENGTH_4: #27AE60;
+	PASSWORD_STRENGTH_INDICATOR_BG: GRAY_5;
+	PASSWORD_STRENGTH_INDICATOR_BG_STRENGTH_0: RED_5;
+	PASSWORD_STRENGTH_INDICATOR_BG_STRENGTH_1: ORANGE_5;
+	PASSWORD_STRENGTH_INDICATOR_BG_STRENGTH_2: YELLOW_5;
+	PASSWORD_STRENGTH_INDICATOR_BG_STRENGTH_3: GREEN_6;
+	PASSWORD_STRENGTH_INDICATOR_BG_STRENGTH_4: GREEN_5;
 
 	-fx-background-color: MAIN_BG;
 	-fx-text-fill: TEXT_FILL;