diff --git a/Server/src/main/content/minigame/barbassault/arena/scenery/ItemMachine.kt b/Server/src/main/content/minigame/barbassault/arena/scenery/ItemMachine.kt
index e058486c0..327a32f02 100644
--- a/Server/src/main/content/minigame/barbassault/arena/scenery/ItemMachine.kt
+++ b/Server/src/main/content/minigame/barbassault/arena/scenery/ItemMachine.kt
@@ -37,31 +37,36 @@ class ItemMachine: InteractionListener {
     private val baseItems_HEAL = intArrayOf(TAKE_POIS_WORMS, TAKE_POIS_TOFU, TAKE_POIS_MEAT)
     private val STOCK_UP_HEAL = IntArray(10 * baseItems_HEAL.size) { i -> baseItems_HEAL[i % baseItems_HEAL.size] }
 
+    private val ATTACKER_ICON = 10556
+    private val DEFENDER_ICON = 10558
+    private val HEALER_ICON = 10559
+    private val COLLECTOR_ICON = 10557
+
     override fun defineListeners() {
         //Attacker//
         on(Scenery.ATTACKER_ITEM_MACHINE_20241, IntType.SCENERY, "Take-runes") { player, node ->
-            handleAddItemMachine(player, node,10556, TAKE_RUNES, 300,DispenserType.RUNES)
+            handleAddItemMachine(player, node,ATTACKER_ICON, TAKE_RUNES, 300,DispenserType.RUNES)
             return@on true
         }
         on(Scenery.ATTACKER_ITEM_MACHINE_20241, IntType.SCENERY, "Take-arrows") { player, node ->
-            handleAddItemMachine(player, node,10556, TAKE_ARROWS, 300,DispenserType.ARROWS)
+            handleAddItemMachine(player, node,ATTACKER_ICON, TAKE_ARROWS, 300,DispenserType.ARROWS)
             return@on true
         }
         //Defender//
         on(Scenery.DEFENDER_ITEM_MACHINE_20242, IntType.SCENERY, "Stock-up") { player, node ->
-            handleAddItemMachine(player, node,10558, STOCK_UP_DEF, 1,DispenserType.FOOD)
+            handleAddItemMachine(player, node,DEFENDER_ICON, STOCK_UP_DEF, 1,DispenserType.FOOD)
             return@on true
         }
         on(Scenery.DEFENDER_ITEM_MACHINE_20242, IntType.SCENERY, "Take-crackers") { player, node ->
-            handleAddItemMachine(player, node,10558, intArrayOf(TAKE_CRACKERS), 5,DispenserType.FOOD)
+            handleAddItemMachine(player, node,DEFENDER_ICON, intArrayOf(TAKE_CRACKERS), 5,DispenserType.FOOD)
             return@on true
         }
         on(Scenery.DEFENDER_ITEM_MACHINE_20242, IntType.SCENERY, "Take-tofu") { player, node ->
-            handleAddItemMachine(player, node,10558, intArrayOf(TAKE_TOFU), 5,DispenserType.FOOD)
+            handleAddItemMachine(player, node,DEFENDER_ICON, intArrayOf(TAKE_TOFU), 5,DispenserType.FOOD)
             return@on true
         }
         on(Scenery.DEFENDER_ITEM_MACHINE_20242, IntType.SCENERY, "Take-worms") { player, node ->
-            handleAddItemMachine(player, node,10558, intArrayOf(TAKE_WORMS), 5,DispenserType.FOOD)
+            handleAddItemMachine(player, node,DEFENDER_ICON, intArrayOf(TAKE_WORMS), 5,DispenserType.FOOD)
             return@on true
         }
         //Healer//
@@ -70,7 +75,7 @@ class ItemMachine: InteractionListener {
             if (!hasAnyVial(player)) {
                 stockUp = intArrayOf(TAKE_VAIL) + STOCK_UP_HEAL
             }
-            handleAddItemMachine(player, node,10559, stockUp, 1,DispenserType.POISONED)
+            handleAddItemMachine(player, node,HEALER_ICON, stockUp, 1,DispenserType.POISONED)
             return@on true
         }
         on(Scenery.HEALER_ITEM_MACHINE_20243, IntType.SCENERY, "Take-vial") { player, node ->
@@ -78,26 +83,26 @@ class ItemMachine: InteractionListener {
                 sendMessage(player, "You can only carry one healing vial at a time.")
                 return@on true
             }
-            handleAddItemMachine(player, node,10559, intArrayOf(TAKE_VAIL), 1,DispenserType.VAIL)
+            handleAddItemMachine(player, node,HEALER_ICON, intArrayOf(TAKE_VAIL), 1,DispenserType.VAIL)
             return@on true
         }
         on(Scenery.HEALER_ITEM_MACHINE_20243, IntType.SCENERY, "Take-worms") { player, node ->
-            handleAddItemMachine(player, node,10559, intArrayOf(TAKE_POIS_WORMS), 5,DispenserType.POISONED)
+            handleAddItemMachine(player, node,HEALER_ICON, intArrayOf(TAKE_POIS_WORMS), 5,DispenserType.POISONED)
             return@on true
         }
         on(Scenery.HEALER_ITEM_MACHINE_20243, IntType.SCENERY, "Take-tofu") { player, node ->
-            handleAddItemMachine(player, node,10559, intArrayOf(TAKE_POIS_TOFU), 5,DispenserType.POISONED)
+            handleAddItemMachine(player, node,HEALER_ICON, intArrayOf(TAKE_POIS_TOFU), 5,DispenserType.POISONED)
             return@on true
         }
         on(Scenery.HEALER_ITEM_MACHINE_20243, IntType.SCENERY, "Take-meat") { player, node ->
-            handleAddItemMachine(player, node,10559, intArrayOf(TAKE_POIS_MEAT), 5,DispenserType.POISONED)
+            handleAddItemMachine(player, node,HEALER_ICON, intArrayOf(TAKE_POIS_MEAT), 5,DispenserType.POISONED)
             return@on true
         }
         //Collector//
         on(Scenery.COLLECTOR_CONVERTER_21250, IntType.SCENERY, "Convert") { player, _ ->
             val bagLevel = BaHornSystem.HornHelper.getCollectorBag(player)
             //todo get players collector level instead of bag level.
-            if (!hasCape(player, 10557))  return@on true
+            if (!hasCape(player, COLLECTOR_ICON))  return@on true
 
                 //Items.RED_EGG_10532
                 //Items.BLUE_EGG_10533