diff --git a/src/main/java/org/jabref/logic/groups/DefaultGroupsFactory.java b/src/main/java/org/jabref/logic/groups/DefaultGroupsFactory.java
index 525d716d20a..f544aff90d7 100644
--- a/src/main/java/org/jabref/logic/groups/DefaultGroupsFactory.java
+++ b/src/main/java/org/jabref/logic/groups/DefaultGroupsFactory.java
@@ -1,17 +1,18 @@
 package org.jabref.logic.groups;
 
-import org.jabref.gui.icon.IconTheme;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.groups.AllEntriesGroup;
 
 public class DefaultGroupsFactory {
 
+    private static String ALL_ENTRIES_GROUP_DEFAULT_ICON = "ALL_ENTRIES_GROUP_ICON";
+
     private DefaultGroupsFactory() {
     }
 
     public static AllEntriesGroup getAllEntriesGroup() {
         AllEntriesGroup group = new AllEntriesGroup(Localization.lang("All entries"));
-        group.setIconName(IconTheme.JabRefIcons.ALL_ENTRIES_GROUP_ICON.name());
+        group.setIconName(ALL_ENTRIES_GROUP_DEFAULT_ICON);
         return group;
     }
 }
diff --git a/src/test/java/org/jabref/architecture/MainArchitectureTestsWithArchUnit.java b/src/test/java/org/jabref/architecture/MainArchitectureTestsWithArchUnit.java
index cd56a07e905..dc7308e77f4 100644
--- a/src/test/java/org/jabref/architecture/MainArchitectureTestsWithArchUnit.java
+++ b/src/test/java/org/jabref/architecture/MainArchitectureTestsWithArchUnit.java
@@ -41,7 +41,12 @@ public static void doNotUseJGoodies(JavaClasses classes) {
     public static void doNotUseGlazedLists(JavaClasses classes) {
         noClasses().should().accessClassesThat().resideInAPackage("ca.odell.glazedlists..").check(classes);
     }
-    
+
+    @ArchTest
+    public static void doNotUseGlyphsDirectly(JavaClasses classes) {
+        noClasses().that().resideOutsideOfPackage("org.jabref.gui.icon").should().accessClassesThat().resideInAnyPackage("de.jensd.fx.glyphs", "de.jensd.fx.glyphs.materialdesignicons").check(classes);
+    }
+
     //"Currently disabled as there is no alternative for the rest of classes who need awt"
     @ArchIgnore
     @ArchTest