diff --git a/data/images/game/creatureicons/CreatureIcons.png b/data/images/game/creatureicons/CreatureIcons.png
new file mode 100644
index 0000000000..f5b50d4d15
Binary files /dev/null and b/data/images/game/creatureicons/CreatureIcons.png differ
diff --git a/data/images/game/creatureicons/monsterIcons.png b/data/images/game/creatureicons/monsterIcons.png
new file mode 100644
index 0000000000..997e44e0d8
Binary files /dev/null and b/data/images/game/creatureicons/monsterIcons.png differ
diff --git a/src/client/protocolgame.h b/src/client/protocolgame.h
index 2444df2267..9a773f6bf1 100644
--- a/src/client/protocolgame.h
+++ b/src/client/protocolgame.h
@@ -230,7 +230,7 @@ class ProtocolGame : public Protocol
     void parseItemClasses(const InputMessagePtr& msg);
     void parseCreatureMark(const InputMessagePtr& msg);
     void parseTrappers(const InputMessagePtr& msg);
-    void addCreatureIcon(const InputMessagePtr& msg);
+    void addCreatureIcon(const InputMessagePtr& msg) const;
     void parseCloseForgeWindow(const InputMessagePtr& msg);
     void parseCreatureData(const InputMessagePtr& msg);
     void parseCreatureHealth(const InputMessagePtr& msg);
diff --git a/src/client/protocolgameparse.cpp b/src/client/protocolgameparse.cpp
index caf257752f..7aa8455603 100644
--- a/src/client/protocolgameparse.cpp
+++ b/src/client/protocolgameparse.cpp
@@ -1835,7 +1835,7 @@ void ProtocolGame::parseTrappers(const InputMessagePtr& msg)
     }
 }
 
-void ProtocolGame::addCreatureIcon(const InputMessagePtr& msg)
+void ProtocolGame::addCreatureIcon(const InputMessagePtr& msg) const
 {
     const uint8_t sizeIcons = msg->getU8();
     for (auto i = 0; i < sizeIcons; ++i) {
@@ -3368,12 +3368,7 @@ CreaturePtr ProtocolGame::getCreature(const InputMessagePtr& msg, int type) cons
         const uint16_t speed = msg->getU16();
 
         if (g_game.getClientVersion() >= 1281) {
-            const uint8_t iconDebuff = msg->getU8(); // creature debuffs
-            if (iconDebuff != 0) {
-                msg->getU8(); // Icon
-                msg->getU8(); // Update (?)
-                msg->getU16(); // Counter text
-            }
+            addCreatureIcon(msg);
         }
 
         const uint8_t skull = msg->getU8();