diff --git a/src/main/resources/css/dark_theme.css b/src/main/resources/css/dark_theme.css
index 87cf44510..87e5ee15e 100644
--- a/src/main/resources/css/dark_theme.css
+++ b/src/main/resources/css/dark_theme.css
@@ -127,30 +127,35 @@
 	-fx-fill: TEXT_FILL;
 }
 
+.glyph-icon-primary,
 .glyph-icon.glyph-icon-primary,
 .list-cell .glyph-icon.glyph-icon-primary,
 .list-cell:selected .glyph-icon.glyph-icon-primary {
 	-fx-fill: PRIMARY;
 }
 
+.glyph-icon-muted,
 .glyph-icon.glyph-icon-muted,
 .list-cell .glyph-icon.glyph-icon-muted,
 .list-cell:selected .glyph-icon.glyph-icon-muted {
 	-fx-fill: TEXT_FILL_MUTED;
 }
 
+.glyph-icon-white,
 .glyph-icon.glyph-icon-white,
 .list-cell .glyph-icon.glyph-icon-white,
 .list-cell:selected .glyph-icon.glyph-icon-white {
 	-fx-fill: white;
 }
 
+.glyph-icon-red,
 .glyph-icon.glyph-icon-red,
 .list-cell .glyph-icon.glyph-icon-red,
 .list-cell:selected .glyph-icon.glyph-icon-red {
 	-fx-fill: RED_5;
 }
 
+.glyph-icon-orange,
 .glyph-icon.glyph-icon-orange,
 .list-cell .glyph-icon.glyph-icon-orange,
 .list-cell:selected .glyph-icon.glyph-icon-orange {
diff --git a/src/main/resources/css/light_theme.css b/src/main/resources/css/light_theme.css
index 00d6abf07..37d5f666e 100644
--- a/src/main/resources/css/light_theme.css
+++ b/src/main/resources/css/light_theme.css
@@ -127,30 +127,35 @@
 	-fx-fill: TEXT_FILL;
 }
 
+.glyph-icon-primary,
 .glyph-icon.glyph-icon-primary,
 .list-cell .glyph-icon.glyph-icon-primary,
 .list-cell:selected .glyph-icon.glyph-icon-primary {
 	-fx-fill: PRIMARY;
 }
 
+.glyph-icon-muted,
 .glyph-icon.glyph-icon-muted,
 .list-cell .glyph-icon.glyph-icon-muted,
 .list-cell:selected .glyph-icon.glyph-icon-muted {
 	-fx-fill: TEXT_FILL_MUTED;
 }
 
+.glyph-icon-white,
 .glyph-icon.glyph-icon-white,
 .list-cell .glyph-icon.glyph-icon-white,
 .list-cell:selected .glyph-icon.glyph-icon-white {
 	-fx-fill: white;
 }
 
+.glyph-icon-red,
 .glyph-icon.glyph-icon-red,
 .list-cell .glyph-icon.glyph-icon-red,
 .list-cell:selected .glyph-icon.glyph-icon-red {
 	-fx-fill: RED_5;
 }
 
+.glyph-icon-orange,
 .glyph-icon.glyph-icon-orange,
 .list-cell .glyph-icon.glyph-icon-orange,
 .list-cell:selected .glyph-icon.glyph-icon-orange {