diff --git a/src/main/java/org/jabref/gui/IconTheme.java b/src/main/java/org/jabref/gui/IconTheme.java
index ed6d8132d09..e1f99c82a3e 100644
--- a/src/main/java/org/jabref/gui/IconTheme.java
+++ b/src/main/java/org/jabref/gui/IconTheme.java
@@ -32,8 +32,9 @@
 
 public class IconTheme {
 
-    /* Colors */
-    // JabRef's default colors
+    /**
+     * JabRef's default color
+     */
     public static final Color DEFAULT_COLOR = JabRefPreferences.getInstance().getColor(JabRefPreferences.ICON_ENABLED_COLOR);
     public static final Color DEFAULT_DISABLED_COLOR = JabRefPreferences.getInstance().getColor(JabRefPreferences.ICON_DISABLED_COLOR);
     private static final String DEFAULT_ICON_PATH = "/images/external/red.png";
@@ -45,8 +46,8 @@ public class IconTheme {
     // Christmas edition
     //public static final Color DEFAULT_COLOR = new Color(0x155115);
     //public static final Color DEFAULT_DISABLED_COLOR = new Color(0x990000);
-    public static Font FONT_16;
-    public static javafx.scene.text.Font FX_FONT;
+    private static Font FONT_16;
+    private static javafx.scene.text.Font FX_FONT;
 
     static {
         try (InputStream stream = FontBasedIcon.class.getResourceAsStream("/fonts/materialdesignicons-webfont.ttf")) {
diff --git a/src/main/java/org/jabref/logic/groups/DefaultGroupsFactory.java b/src/main/java/org/jabref/logic/groups/DefaultGroupsFactory.java
index 23c7a2a2bd6..702f5053069 100644
--- a/src/main/java/org/jabref/logic/groups/DefaultGroupsFactory.java
+++ b/src/main/java/org/jabref/logic/groups/DefaultGroupsFactory.java
@@ -1,13 +1,13 @@
 package org.jabref.logic.groups;
 
-import org.jabref.gui.IconTheme;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.groups.AllEntriesGroup;
 
 public class DefaultGroupsFactory {
+
     public static AllEntriesGroup getAllEntriesGroup() {
         AllEntriesGroup group = new AllEntriesGroup(Localization.lang("All entries"));
-        group.setIconCode(IconTheme.JabRefIcon.ALL_ENTRIES_GROUP_ICON.getCode());
+        group.setIconCode(org.jabref.gui.IconTheme.JabRefIcon.ALL_ENTRIES_GROUP_ICON.getCode());
         return group;
     }
 }
diff --git a/src/main/java/org/jabref/logic/importer/util/GroupsParser.java b/src/main/java/org/jabref/logic/importer/util/GroupsParser.java
index 90207b413a5..4fa19f0c9b5 100644
--- a/src/main/java/org/jabref/logic/importer/util/GroupsParser.java
+++ b/src/main/java/org/jabref/logic/importer/util/GroupsParser.java
@@ -8,7 +8,6 @@
 import org.jabref.logic.util.MetadataSerializationConfiguration;
 import org.jabref.logic.util.strings.QuotedStringTokenizer;
 import org.jabref.model.groups.AbstractGroup;
-import org.jabref.model.groups.AllEntriesGroup;
 import org.jabref.model.groups.ExplicitGroup;
 import org.jabref.model.groups.GroupHierarchyType;
 import org.jabref.model.groups.GroupTreeNode;
diff --git a/src/main/resources/l10n/JabRef_da.properties b/src/main/resources/l10n/JabRef_da.properties
index 364c671539e..df5376df405 100644
--- a/src/main/resources/l10n/JabRef_da.properties
+++ b/src/main/resources/l10n/JabRef_da.properties
@@ -2356,3 +2356,4 @@ Size_of_large_icons=
 Size_of_small_icons=
 Default_table_font_size=
 Escape_underscores=
+Color=
diff --git a/src/main/resources/l10n/JabRef_de.properties b/src/main/resources/l10n/JabRef_de.properties
index 753a6021e99..64fae71d7e3 100644
--- a/src/main/resources/l10n/JabRef_de.properties
+++ b/src/main/resources/l10n/JabRef_de.properties
@@ -2356,3 +2356,4 @@ Size_of_large_icons=Größe_für_große_Icons
 Size_of_small_icons=Größe_für_kleine_Icon
 Default_table_font_size=Standard_Tabellenschriftgröße
 Escape_underscores=Unterstriche_maskieren
+Color=
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index 3d1ce55bf67..5e41df8970d 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -2356,3 +2356,4 @@ Size_of_large_icons=Size_of_large_icons
 Size_of_small_icons=Size_of_small_icons
 Default_table_font_size=Default_table_font_size
 Escape_underscores=Escape_underscores
+Color=Color
diff --git a/src/main/resources/l10n/JabRef_es.properties b/src/main/resources/l10n/JabRef_es.properties
index 20fc17a8989..a9c14d6abcd 100644
--- a/src/main/resources/l10n/JabRef_es.properties
+++ b/src/main/resources/l10n/JabRef_es.properties
@@ -2356,3 +2356,4 @@ Size_of_large_icons=
 Size_of_small_icons=
 Default_table_font_size=
 Escape_underscores=
+Color=
diff --git a/src/main/resources/l10n/JabRef_fa.properties b/src/main/resources/l10n/JabRef_fa.properties
index 4bd1e8549b2..68d4720e7f1 100644
--- a/src/main/resources/l10n/JabRef_fa.properties
+++ b/src/main/resources/l10n/JabRef_fa.properties
@@ -2356,3 +2356,4 @@ Size_of_large_icons=
 Size_of_small_icons=
 Default_table_font_size=
 Escape_underscores=
+Color=
diff --git a/src/main/resources/l10n/JabRef_fr.properties b/src/main/resources/l10n/JabRef_fr.properties
index 6e352e031d4..e8341a93bdc 100644
--- a/src/main/resources/l10n/JabRef_fr.properties
+++ b/src/main/resources/l10n/JabRef_fr.properties
@@ -2356,3 +2356,4 @@ Size_of_large_icons=Taille_des_grands_icones
 Size_of_small_icons=Taille_des_petits_icones
 Default_table_font_size=Taille_par_défaut_des_police_du_tableau
 Escape_underscores=Echapper_les_soulignements
+Color=
diff --git a/src/main/resources/l10n/JabRef_in.properties b/src/main/resources/l10n/JabRef_in.properties
index f5ff714aab2..0584ec68936 100644
--- a/src/main/resources/l10n/JabRef_in.properties
+++ b/src/main/resources/l10n/JabRef_in.properties
@@ -2356,3 +2356,4 @@ Size_of_large_icons=
 Size_of_small_icons=
 Default_table_font_size=
 Escape_underscores=
+Color=
diff --git a/src/main/resources/l10n/JabRef_it.properties b/src/main/resources/l10n/JabRef_it.properties
index 3d3e431b169..cce3426abf6 100644
--- a/src/main/resources/l10n/JabRef_it.properties
+++ b/src/main/resources/l10n/JabRef_it.properties
@@ -2356,3 +2356,4 @@ Size_of_large_icons=
 Size_of_small_icons=
 Default_table_font_size=
 Escape_underscores=
+Color=
diff --git a/src/main/resources/l10n/JabRef_ja.properties b/src/main/resources/l10n/JabRef_ja.properties
index 7fba66f0e8e..fc5af5b0f0c 100644
--- a/src/main/resources/l10n/JabRef_ja.properties
+++ b/src/main/resources/l10n/JabRef_ja.properties
@@ -2356,3 +2356,4 @@ Size_of_large_icons=
 Size_of_small_icons=
 Default_table_font_size=
 Escape_underscores=
+Color=
diff --git a/src/main/resources/l10n/JabRef_nl.properties b/src/main/resources/l10n/JabRef_nl.properties
index 282b7b24bed..8d31c3e37e6 100644
--- a/src/main/resources/l10n/JabRef_nl.properties
+++ b/src/main/resources/l10n/JabRef_nl.properties
@@ -2356,3 +2356,4 @@ Size_of_large_icons=
 Size_of_small_icons=
 Default_table_font_size=
 Escape_underscores=
+Color=
diff --git a/src/main/resources/l10n/JabRef_no.properties b/src/main/resources/l10n/JabRef_no.properties
index 8f9f291140a..36889da582d 100644
--- a/src/main/resources/l10n/JabRef_no.properties
+++ b/src/main/resources/l10n/JabRef_no.properties
@@ -2356,3 +2356,4 @@ Size_of_large_icons=
 Size_of_small_icons=
 Default_table_font_size=
 Escape_underscores=
+Color=
diff --git a/src/main/resources/l10n/JabRef_pt_BR.properties b/src/main/resources/l10n/JabRef_pt_BR.properties
index 4b1fa023303..6bbb8360f3e 100644
--- a/src/main/resources/l10n/JabRef_pt_BR.properties
+++ b/src/main/resources/l10n/JabRef_pt_BR.properties
@@ -2356,3 +2356,4 @@ Size_of_large_icons=
 Size_of_small_icons=
 Default_table_font_size=
 Escape_underscores=
+Color=
diff --git a/src/main/resources/l10n/JabRef_ru.properties b/src/main/resources/l10n/JabRef_ru.properties
index 70343569f7a..66f64ebdaa0 100644
--- a/src/main/resources/l10n/JabRef_ru.properties
+++ b/src/main/resources/l10n/JabRef_ru.properties
@@ -2356,3 +2356,4 @@ Size_of_large_icons=
 Size_of_small_icons=
 Default_table_font_size=
 Escape_underscores=
+Color=
diff --git a/src/main/resources/l10n/JabRef_sv.properties b/src/main/resources/l10n/JabRef_sv.properties
index 998a93f4302..da0639a3a35 100644
--- a/src/main/resources/l10n/JabRef_sv.properties
+++ b/src/main/resources/l10n/JabRef_sv.properties
@@ -2356,3 +2356,4 @@ Size_of_large_icons=
 Size_of_small_icons=
 Default_table_font_size=
 Escape_underscores=Maskera_understreck
+Color=
diff --git a/src/main/resources/l10n/JabRef_tr.properties b/src/main/resources/l10n/JabRef_tr.properties
index 61770323740..0b948828617 100644
--- a/src/main/resources/l10n/JabRef_tr.properties
+++ b/src/main/resources/l10n/JabRef_tr.properties
@@ -2356,3 +2356,4 @@ Size_of_large_icons=
 Size_of_small_icons=
 Default_table_font_size=
 Escape_underscores=
+Color=
diff --git a/src/main/resources/l10n/JabRef_vi.properties b/src/main/resources/l10n/JabRef_vi.properties
index 6f9601a172c..ab4690d2630 100644
--- a/src/main/resources/l10n/JabRef_vi.properties
+++ b/src/main/resources/l10n/JabRef_vi.properties
@@ -2356,3 +2356,4 @@ Size_of_large_icons=
 Size_of_small_icons=
 Default_table_font_size=
 Escape_underscores=
+Color=
diff --git a/src/main/resources/l10n/JabRef_zh.properties b/src/main/resources/l10n/JabRef_zh.properties
index 44a84d5e503..3ebd3423d99 100644
--- a/src/main/resources/l10n/JabRef_zh.properties
+++ b/src/main/resources/l10n/JabRef_zh.properties
@@ -2356,3 +2356,4 @@ Size_of_large_icons=
 Size_of_small_icons=
 Default_table_font_size=
 Escape_underscores=
+Color=