diff --git a/main/ui/src/main/resources/css/dark_theme.css b/main/ui/src/main/resources/css/dark_theme.css
index 7ab552e10..eb76a57d1 100644
--- a/main/ui/src/main/resources/css/dark_theme.css
+++ b/main/ui/src/main/resources/css/dark_theme.css
@@ -35,6 +35,10 @@
     -fx-text-fill: TEXT_FILL;
 }
 
+.fa-icon {
+	-fx-fill: TEXT_FILL;
+}
+
 /*******************************************************************************
  *                                                                             *
  * Labels                                                                      *
@@ -239,10 +243,6 @@
 	-fx-background-color: CONTROL_BG_ARMED;
 }
 
-.toolbar-container .button .fa-icon {
-	-fx-fill: TEXT_FILL;
-}
-
 /*******************************************************************************
  *                                                                             *
  * ScrollBar                                                                   *
diff --git a/main/ui/src/main/resources/css/light_theme.css b/main/ui/src/main/resources/css/light_theme.css
index deda6b7f1..7403fc441 100644
--- a/main/ui/src/main/resources/css/light_theme.css
+++ b/main/ui/src/main/resources/css/light_theme.css
@@ -35,6 +35,10 @@
 	-fx-text-fill: TEXT_FILL;
 }
 
+.fa-icon {
+	-fx-fill: TEXT_FILL;
+}
+
 /*******************************************************************************
  *                                                                             *
  * Labels                                                                      *
@@ -239,10 +243,6 @@
 	-fx-background-color: CONTROL_BG_ARMED;
 }
 
-.toolbar-container .button .fa-icon {
-	-fx-fill: TEXT_FILL;
-}
-
 /*******************************************************************************
  *                                                                             *
  * ScrollBar                                                                   *