diff --git a/resources/data/tree/filtersVanilla.ini b/resources/data/tree/filtersVanilla.ini
index 96b4cfa..dea754b 100644
--- a/resources/data/tree/filtersVanilla.ini
+++ b/resources/data/tree/filtersVanilla.ini
@@ -160,7 +160,13 @@ root.image.item.crops.rabbit = ^ti.rabbit*
 root.image.item.crops = ^ti.reeds | ^ti.nether_wart | ^ti.bowl
 root.image.item.doors = ^ti.door_* | ^ti.boat | ^ti.bed | ^ti.sign | ^ti.stick | ^ti.painting | ^ti.item_frame
 root.image.item.banner = ^ti.banner_*
-root.image.item.armour = ^ti.*_boots* | ^ti.*_helmet* | ^ti.*_chestplate* | ^ti.*_leggings* | ^ti.wooden_armorstand
+root.image.item.armour = ^ti.wooden_armorstand
+root.image.item.armour.set_dia = ^ti.diamond_boots | ^ti.diamond_helmet | ^ti.diamond_chestplate | ^ti.diamond_leggings
+root.image.item.armour.set_gold = ^ti.gold_boots | ^ti.gold_helmet | ^ti.gold_chestplate | ^ti.gold_leggings
+root.image.item.armour.set_iron = ^ti.iron_boots | ^ti.iron_helmet | ^ti.iron_chestplate | ^ti.iron_leggings
+root.image.item.armour.set_leather = ^ti.leather_boots | ^ti.leather_helmet | ^ti.leather_chestplate | ^ti.leather_leggings
+root.image.item.armour.set_chain = ^ti.chainmail_boots | ^ti.chainmail_helmet | ^ti.chainmail_chestplate | ^ti.chainmail_leggings
+root.image.item.armour.set_empty = ^ti.empty_armor_slot_boots | ^ti.empty_armor_slot_helmet | ^ti.empty_armor_slot_chestplate | ^ti.empty_armor_slot_leggings
 root.image.item.tools.clock = ^ti.clock | ^ti.clock_*
 root.image.item.tools.compass = ^ti.compass | ^ti.compass_*
 root.image.item.tools.set_dia = ^ti.diamond_axe | ^ti.diamond_hoe | ^ti.diamond_pickaxe | ^ti.diamond_shovel | ^ti.diamond_sword
diff --git a/resources/data/tree/groupsVanilla.ini b/resources/data/tree/groupsVanilla.ini
index 557166b..8a2d3ab 100644
--- a/resources/data/tree/groupsVanilla.ini
+++ b/resources/data/tree/groupsVanilla.ini
@@ -70,7 +70,7 @@ root.image.block.minerals.cubes = Storage Cubes
 root.image.block.minerals.ores = Ores
 
 # Gui
-root.image.gui = GUI & Menu
+root.image.gui = GUI
 root.image.gui.map = Maps
 root.image.gui.container = Containers & Dialogs
 root.image.gui.container.creative = Creative
@@ -89,11 +89,11 @@ root.image.particle = Particles
 # Items
 root.image.item = Items
 root.image.item.tools = Tools & Weapons
-root.image.item.tools.set_dia = Diamond Tools
-root.image.item.tools.set_gold = Gold Tools
-root.image.item.tools.set_iron = Iron Tools
-root.image.item.tools.set_wood = Wood Tools
-root.image.item.tools.set_stone = Stone Tools
+root.image.item.tools.set_dia = Diamond
+root.image.item.tools.set_gold = Gold
+root.image.item.tools.set_iron = Iron
+root.image.item.tools.set_wood = Wood
+root.image.item.tools.set_stone = Stone
 root.image.item.tools.clock = Clock
 root.image.item.tools.compass = Compass
 root.image.item.tools.archery = Archery
@@ -101,6 +101,12 @@ root.image.item.tools.buckets = Buckets
 root.image.item.doors = Doors & Wood
 root.image.item.banner = Banners
 root.image.item.armour = Armour
+root.image.item.armour.set_dia = Diamond
+root.image.item.armour.set_gold = Gold
+root.image.item.armour.set_iron = Iron
+root.image.item.armour.set_leather = Leather
+root.image.item.armour.set_chain = Chain-mail
+root.image.item.armour.set_empty = Empty Slots
 root.image.item.crops = Food & Crops
 root.image.item.crops.fish = Fish
 root.image.item.crops.seeds = Seeds