diff --git a/doc/script_commands.txt b/doc/script_commands.txt
index 0a7445f3b0..d88ef1e6a2 100644
--- a/doc/script_commands.txt
+++ b/doc/script_commands.txt
@@ -8893,8 +8893,13 @@ No Icon			: QTYPE_NONE
 ? Job Icon		: QTYPE_JOB2
 ! Event Icon	: QTYPE_EVENT
 ? Event Icon	: QTYPE_EVENT2
-Warg			: QTYPE_WARG
-Warg Face		: QTYPE_WARG2 (Only for packetver >= 20120410)
+Warg			: QTYPE_WARG (Only for packetver < 20170315)
+Warg Face		: QTYPE_WARG2 (Only for packetver >= 20120410 and < 20170315)
+Click Me		: QTYPE_CLICKME (Only for packetver >= 20170315)
+Daily Quest		: QTYPE_DAILYQUEST (Only for packetver >= 20170315)
+! Event Icon	: QTYPE_EVENT3 (Only for packetver >= 20170315)
+Job Quest		: QTYPE_JOBQUEST (Only for packetver >= 20170315)
+Jumping Poring	: QTYPE_JUMPING_PORING (Only for packetver >= 20170315)
 
 Map Mark Color, when used, creates a mark in the user's mini map on the position of the NPC,
 the available color values are:
diff --git a/src/map/script.cpp b/src/map/script.cpp
index e102932efc..f57acdb048 100644
--- a/src/map/script.cpp
+++ b/src/map/script.cpp
@@ -19002,8 +19002,17 @@ BUILDIN_FUNC(questinfo)
 		case QTYPE_JOB2:
 		case QTYPE_EVENT:
 		case QTYPE_EVENT2:
+		// Warg icons were replaced in this client
+#if PACKETVER < 20170315
 		case QTYPE_WARG:
 		case QTYPE_WARG2:
+#else
+		case QTYPE_CLICKME:
+		case QTYPE_DAILYQUEST:
+		case QTYPE_EVENT3:
+		case QTYPE_JOBQUEST:
+		case QTYPE_JUMPING_PORING:
+#endif
 			// Leave everything as it is
 			break;
 		case QTYPE_NONE:
diff --git a/src/map/script.hpp b/src/map/script.hpp
index cbfac014d0..dc7ef161d2 100644
--- a/src/map/script.hpp
+++ b/src/map/script.hpp
@@ -392,9 +392,13 @@ enum questinfo_types {
 	QTYPE_EVENT,
 	QTYPE_EVENT2,
 	QTYPE_WARG,
-	// 7 = free
-	QTYPE_WARG2 = 8,
-	// 9 - 9998 = free
+	QTYPE_CLICKME = QTYPE_WARG,
+	QTYPE_DAILYQUEST,
+	QTYPE_WARG2,
+	QTYPE_EVENT3 = QTYPE_WARG2,
+	QTYPE_JOBQUEST,
+	QTYPE_JUMPING_PORING,
+	// 11 - 9998 = free
 	QTYPE_NONE = 9999
 };
 
diff --git a/src/map/script_constants.hpp b/src/map/script_constants.hpp
index 186a3a25c8..e03f7ab09d 100644
--- a/src/map/script_constants.hpp
+++ b/src/map/script_constants.hpp
@@ -4013,7 +4013,12 @@
 	export_constant(QTYPE_EVENT);
 	export_constant(QTYPE_EVENT2);
 	export_constant(QTYPE_WARG);
+	export_constant(QTYPE_CLICKME);
+	export_constant(QTYPE_DAILYQUEST);
 	export_constant(QTYPE_WARG2);
+	export_constant(QTYPE_EVENT3);
+	export_constant(QTYPE_JOBQUEST);
+	export_constant(QTYPE_JUMPING_PORING);
 	export_constant(QTYPE_NONE);
 
 	/* font weight types */