diff --git a/Client/src/main/java/org/runite/client/ClientLoader.java b/Client/src/main/java/org/runite/client/ClientLoader.java
index 0b28f7631..09323a1c1 100644
--- a/Client/src/main/java/org/runite/client/ClientLoader.java
+++ b/Client/src/main/java/org/runite/client/ClientLoader.java
@@ -1,8 +1,8 @@
 package org.runite.client;
-import javax.swing.*;
-
 import org.rs09.client.config.GameConfig;
 
+import javax.imageio.ImageIO;
+import javax.swing.*;
 import java.applet.Applet;
 import java.awt.*;
 import java.net.MalformedURLException;
@@ -77,6 +77,7 @@ public class ClientLoader extends Applet {
 			ClientLoader.world = "" + GameConfig.SERVER_NAME;
 			//System.out.println(GameLaunch.SETTINGS.getWorld());
 			this.frame = new JFrame(GameConfig.SERVER_NAME);
+			this.frame.setIconImage(ImageIO.read(getClass().getClassLoader().getResource("09logo.png")));
 			this.frame.setLayout(new BorderLayout());
 			this.frame.setSize(300,500);
 			this.frame.setBackground(Color.BLACK);
diff --git a/Client/src/main/resources/09logo.png b/Client/src/main/resources/09logo.png
new file mode 100644
index 000000000..c512e2a4a
Binary files /dev/null and b/Client/src/main/resources/09logo.png differ
diff --git a/Server/src/main/java/core/game/interaction/item/QuestCapePlugin.java b/Server/src/main/java/core/game/interaction/item/QuestCapePlugin.java
deleted file mode 100644
index 7c424f81c..000000000
--- a/Server/src/main/java/core/game/interaction/item/QuestCapePlugin.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package core.game.interaction.item;
-
-import core.cache.def.impl.ItemDefinition;
-import core.game.interaction.OptionHandler;
-import core.game.node.Node;
-import core.game.node.entity.player.Player;
-import core.plugin.Initializable;
-import core.plugin.Plugin;
-import rs09.game.interaction.Listeners;
-
-/**
- * Represents the plugin used for the quest cape and hood item.
- * @author 'Vexia
- */
-@Initializable
-public final class QuestCapePlugin extends OptionHandler {
-	final int MAX_QP = 72;
-
-	@Override
-	public Plugin<Object> newInstance(Object arg) throws Throwable {
-		ItemDefinition.forId(9813).getHandlers().put("option:wear", this);
-		ItemDefinition.forId(9814).getHandlers().put("option:wear", this);
-		return this;
-	}
-
-	@Override
-	public boolean handle(Player player, Node node, String option) {
-		if (!(player.getQuestRepository().getPoints() >= MAX_QP)) {
-			player.getPacketDispatch().sendMessage("You cannot wear this " + node.getName().toLowerCase() + " yet.");
-			return true;
-		}
-		return Listeners.run(node.getId(),0,"equip",player,node);
-	}
-
-	@Override
-	public boolean isWalk() {
-		return false;
-	}
-}
diff --git a/Server/src/main/java/core/game/node/entity/skill/summoning/SummoningTrainingRoom.java b/Server/src/main/java/core/game/node/entity/skill/summoning/SummoningTrainingRoom.java
index 18f8f0c02..2831fe9d6 100644
--- a/Server/src/main/java/core/game/node/entity/skill/summoning/SummoningTrainingRoom.java
+++ b/Server/src/main/java/core/game/node/entity/skill/summoning/SummoningTrainingRoom.java
@@ -330,7 +330,6 @@ public final class SummoningTrainingRoom extends OptionHandler {
 
 			@Override
 			public boolean handle(int interfaceId, int buttonId) {
-				player.sendMessage("ButtonId=" + buttonId + ", stage=" + stage);
 				switch (quest.getStage(player)) {
 				case 10:
 					switch (stage) {
diff --git a/Server/src/main/kotlin/rs09/game/interaction/item/QuestCapeListener.kt b/Server/src/main/kotlin/rs09/game/interaction/item/QuestCapeListener.kt
new file mode 100644
index 000000000..330b4ffa0
--- /dev/null
+++ b/Server/src/main/kotlin/rs09/game/interaction/item/QuestCapeListener.kt
@@ -0,0 +1,21 @@
+package rs09.game.interaction.item
+
+import core.game.node.entity.player.link.quest.QuestRepository
+import rs09.game.interaction.InteractionListener
+import rs09.game.interaction.Listeners.run
+
+class QuestCapeListener : InteractionListener() {
+
+    val IDs = intArrayOf(9813,9814)
+
+    override fun defineListeners() {
+        on(IDs,ITEM,"wear"){ player, item ->
+            val MAX_QP = QuestRepository.getQuests().values.sumBy { it.questPoints }
+            if (player.questRepository.points < MAX_QP) {
+                player.packetDispatch.sendMessage("You cannot wear this " + item.name.toLowerCase() + " yet.")
+                return@on true
+            }
+            return@on run(item.id, 0, "equip", player, item)
+        }
+    }
+}
\ No newline at end of file