diff --git a/src/main/java/de/hysky/skyblocker/config/configs/GeneralConfig.java b/src/main/java/de/hysky/skyblocker/config/configs/GeneralConfig.java
index 7d5ca97c30b..9ec29af55a6 100644
--- a/src/main/java/de/hysky/skyblocker/config/configs/GeneralConfig.java
+++ b/src/main/java/de/hysky/skyblocker/config/configs/GeneralConfig.java
@@ -202,6 +202,7 @@ public static class ItemProtection {
 		public boolean protectValuableConsumables = true;
 	}
 
+	//TODO Add an option for no icon at all
 	public enum SlotLockStyle {
 		CLASSIC(SkyblockerMod.id("textures/gui/slot_lock.png")),
 		FANCY(SkyblockerMod.id("textures/gui/fancy_slot_lock.png"));
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/itemlist/recipebook/FilterOption.java b/src/main/java/de/hysky/skyblocker/skyblock/itemlist/recipebook/FilterOption.java
index 882ea2849a7..8f682a39c24 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/itemlist/recipebook/FilterOption.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/itemlist/recipebook/FilterOption.java
@@ -8,15 +8,14 @@
 public enum FilterOption implements Supplier<Identifier>, Predicate<String> {
 
 	ALL(_ -> true, SkyblockerMod.id("textures/gui/filter/all.png")),
-	ENTITIES(query -> query.endsWith("(monster)") || query.endsWith("(miniboss)") || query.endsWith("(boss)")
-			|| query.endsWith("(animal)") || query.endsWith("(pest)") || query.endsWith("(sea creature)"),
-			SkyblockerMod.id("textures/gui/filter/entities.png")),
+	ENTITIES(query -> query.endsWith("(monster)") || query.endsWith("(miniboss)") || query.endsWith("(boss)") || query.endsWith("(animal)") || query.endsWith("(pest)") || query.endsWith("(sea creature)"), SkyblockerMod.id("textures/gui/filter/entities.png")),
 	NPCS(query -> query.endsWith("(npc)") || query.endsWith("(rift npc)"), SkyblockerMod.id("textures/gui/filter/npcs.png")),
 	MAYORS(query -> query.endsWith("(mayor)") || query.endsWith("(retired mayor)"), SkyblockerMod.id("textures/gui/filter/mayors.png")),
 
 	// Basically a negation on everything else.
-	ITEMS(query -> !ENTITIES.test(query) && !NPCS.test(query) && !MAYORS.test(query),
-			SkyblockerMod.id("textures/gui/filter/items.png"));
+	ATTRIBUTES(query -> query.endsWith("shard") && !query.contains("prismarine"), SkyblockerMod.id("textures/gui/filter/attributes_shards.png")),
+	TOOLS(query -> query.endsWith("axe") || query.endsWith("pickaxe") || query.contains("drill") || query.contains("fuel tank") || query.contains("goblin omelette") || query.contains("starfall seasoning") || query.contains("tungsten regulator") || query.contains("mk.") || query.endsWith("hoe") || query.startsWith("hoe") || query.contains("spore harvester") || query.contains("thornleaf scythe") || query.contains("farming toolkit") || query.contains("hunting toolkit") && !query.contains("drill motor"), SkyblockerMod.id("textures/gui/filter/items.png")),
+	ITEMS(query -> !ENTITIES.test(query) && !NPCS.test(query) && !MAYORS.test(query), SkyblockerMod.id("textures/gui/filter/items.png"));
 
 	private	final Predicate<String> matchingPredicate;
 	private final Identifier texture;
diff --git a/src/main/resources/assets/skyblocker/textures/gui/slot_lock.png b/src/main/resources/assets/skyblocker/textures/gui/classic_slot_lock.png
similarity index 100%
rename from src/main/resources/assets/skyblocker/textures/gui/slot_lock.png
rename to src/main/resources/assets/skyblocker/textures/gui/classic_slot_lock.png
diff --git a/src/main/resources/assets/skyblocker/textures/gui/filter/attributes_shards.png b/src/main/resources/assets/skyblocker/textures/gui/filter/attributes_shards.png
new file mode 100644
index 00000000000..ae62d10ab40
Binary files /dev/null and b/src/main/resources/assets/skyblocker/textures/gui/filter/attributes_shards.png differ
diff --git a/src/main/resources/assets/skyblocker/textures/gui/filter/items.png b/src/main/resources/assets/skyblocker/textures/gui/filter/items.png
index c5ceb51fb62..4c213a3a9b0 100644
Binary files a/src/main/resources/assets/skyblocker/textures/gui/filter/items.png and b/src/main/resources/assets/skyblocker/textures/gui/filter/items.png differ