diff --git a/trunk/dist/game/config/Custom.properties b/trunk/dist/game/config/Custom.properties
index d98c8314e4..33c5e8466d 100644
--- a/trunk/dist/game/config/Custom.properties
+++ b/trunk/dist/game/config/Custom.properties
@@ -321,8 +321,8 @@ StoreOfflineTradeInRealtime = True
 # ---------------------------------------------------------------------------
 
 # This option will enable core support for:
-# Mana Drug (item ID 726), using skill ID 10000.
-# Mana Potion (item ID 728), using skill ID 10001.
+# Mana Drug (item ID 726), using skill ID 24000.
+# Mana Potion (item ID 728), using skill ID 24001.
 EnableManaPotionSupport = False
 
 
diff --git a/trunk/dist/game/data/stats/items/00700-00799.xml b/trunk/dist/game/data/stats/items/00700-00799.xml
index 7301ece6b0..7d5b7fe4c3 100644
--- a/trunk/dist/game/data/stats/items/00700-00799.xml
+++ b/trunk/dist/game/data/stats/items/00700-00799.xml
@@ -361,10 +361,11 @@
 		<set name="material" val="LIQUID" />
 		<set name="weight" val="180" />
 		<set name="price" val="80" />
+		<set name="reuse_delay" val="10000" />
 		<set name="is_stackable" val="true" />
 		<set name="is_oly_restricted" val="true" />
 		<set name="handler" val="ManaPotion" />
-		<set name="item_skill" val="10000-1" />
+		<set name="item_skill" val="24000-1" />
 		<set name="for_npc" val="true" />
 		<cond msgId="113" addName="1">
 			<player flyMounted="false" />
@@ -395,7 +396,7 @@
 		<set name="is_stackable" val="true" />
 		<set name="is_oly_restricted" val="true" />
 		<set name="handler" val="ManaPotion" />
-		<set name="item_skill" val="10001-1" />
+		<set name="item_skill" val="24001-1" />
 		<set name="for_npc" val="true" />
 		<cond msgId="113" addName="1">
 			<player flyMounted="false" />
diff --git a/trunk/dist/game/data/stats/skills/custom/10000-10099.xml b/trunk/dist/game/data/stats/skills/custom/24000-24099.xml
similarity index 79%
rename from trunk/dist/game/data/stats/skills/custom/10000-10099.xml
rename to trunk/dist/game/data/stats/skills/custom/24000-24099.xml
index 4050a045c1..673f886bbc 100644
--- a/trunk/dist/game/data/stats/skills/custom/10000-10099.xml
+++ b/trunk/dist/game/data/stats/skills/custom/24000-24099.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../xsd/skills.xsd">
-	<skill id="10000" levels="1" name="Mana Drug">
+	<skill id="24000" levels="1" name="Mana Drug">
 		<set name="abnormalTime" val="15" />
-		<set name="displayId" val="2288" />
+		<set name="displayId" val="26030" />
 		<set name="isMagic" val="2" /> <!-- Static Skill -->
 		<set name="itemConsumeCount" val="1" />
 		<set name="itemConsumeId" val="726" />
 		<set name="magicLvl" val="1" />
-		<set name="operateType" val="ACTIVE_INSTANT" />
+		<set name="operateType" val="ACTIVE_CONTINUOUS" />
 		<set name="reuseDelay" val="10000" />
 		<set name="targetType" val="SELF" />
 		<for>
@@ -16,8 +16,8 @@
 			</effect>
 		</for>
 	</skill>
-	<skill id="10001" levels="1" name="Mana Potion">
-		<set name="displayId" val="2288" />
+	<skill id="24001" levels="1" name="Mana Potion">
+		<set name="displayId" val="26030" />
 		<set name="isMagic" val="2" /> <!-- Static Skill -->
 		<set name="itemConsumeCount" val="1" />
 		<set name="itemConsumeId" val="728" />
@@ -31,7 +31,7 @@
 			</effect>
 		</for>
 	</skill>
-	<skill id="10002" levels="1" name="Custom Trap skill">
+	<skill id="24002" levels="1" name="Custom Trap skill">
 		<!-- Use this skill if you want to handle trap activation in scripts(example Seed of Destruction Spawn Traps) -->
 		<set name="targetType" val="AURA" />
 		<set name="isMagic" val="1" /> <!-- Magic Skill -->
diff --git a/trunk/dist/game/data_classic/stats/items/00700-00799.xml b/trunk/dist/game/data_classic/stats/items/00700-00799.xml
index 53674a50b2..b607ee0db2 100644
--- a/trunk/dist/game/data_classic/stats/items/00700-00799.xml
+++ b/trunk/dist/game/data_classic/stats/items/00700-00799.xml
@@ -317,6 +317,43 @@
 			<add order="0" stat="pDef" val="36" />
 		</for>
 	</item>
+	<item id="726" type="EtcItem" name="Mana Potion">
+		<set name="displayId" val="734" />
+		<set name="icon" val="icon.etc_potion_blue_i00" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="POTION" />
+		<set name="immediate_effect" val="true" />
+		<set name="material" val="LIQUID" />
+		<set name="weight" val="180" />
+		<set name="price" val="80" />
+		<set name="reuse_delay" val="10000" />
+		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="ManaPotion" />
+		<set name="item_skill" val="24000-1" />
+		<set name="for_npc" val="true" />
+		<cond msgId="113" addName="1">
+			<player flyMounted="false" />
+		</cond>
+	</item>
+	<item id="728" type="EtcItem" name="Mana Potion">
+		<set name="displayId" val="735" />
+		<set name="icon" val="icon.etc_reagent_blue_i00" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="POTION" />
+		<set name="immediate_effect" val="true" />
+		<set name="material" val="LIQUID" />
+		<set name="weight" val="180" />
+		<set name="price" val="2000" />
+		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="ManaPotion" />
+		<set name="item_skill" val="24001-1" />
+		<set name="for_npc" val="true" />
+		<cond msgId="113" addName="1">
+			<player flyMounted="false" />
+		</cond>
+	</item>
 	<item id="734" type="EtcItem" name="Wind Walk Potion">
 		<set name="icon" val="icon.etc_potion_green_i00" />
 		<set name="default_action" val="SKILL_REDUCE" />
diff --git a/trunk/dist/game/data_classic/stats/skills/custom/10000-10099.xml b/trunk/dist/game/data_classic/stats/skills/custom/24000-24099.xml
similarity index 79%
rename from trunk/dist/game/data_classic/stats/skills/custom/10000-10099.xml
rename to trunk/dist/game/data_classic/stats/skills/custom/24000-24099.xml
index 4050a045c1..673f886bbc 100644
--- a/trunk/dist/game/data_classic/stats/skills/custom/10000-10099.xml
+++ b/trunk/dist/game/data_classic/stats/skills/custom/24000-24099.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../xsd/skills.xsd">
-	<skill id="10000" levels="1" name="Mana Drug">
+	<skill id="24000" levels="1" name="Mana Drug">
 		<set name="abnormalTime" val="15" />
-		<set name="displayId" val="2288" />
+		<set name="displayId" val="26030" />
 		<set name="isMagic" val="2" /> <!-- Static Skill -->
 		<set name="itemConsumeCount" val="1" />
 		<set name="itemConsumeId" val="726" />
 		<set name="magicLvl" val="1" />
-		<set name="operateType" val="ACTIVE_INSTANT" />
+		<set name="operateType" val="ACTIVE_CONTINUOUS" />
 		<set name="reuseDelay" val="10000" />
 		<set name="targetType" val="SELF" />
 		<for>
@@ -16,8 +16,8 @@
 			</effect>
 		</for>
 	</skill>
-	<skill id="10001" levels="1" name="Mana Potion">
-		<set name="displayId" val="2288" />
+	<skill id="24001" levels="1" name="Mana Potion">
+		<set name="displayId" val="26030" />
 		<set name="isMagic" val="2" /> <!-- Static Skill -->
 		<set name="itemConsumeCount" val="1" />
 		<set name="itemConsumeId" val="728" />
@@ -31,7 +31,7 @@
 			</effect>
 		</for>
 	</skill>
-	<skill id="10002" levels="1" name="Custom Trap skill">
+	<skill id="24002" levels="1" name="Custom Trap skill">
 		<!-- Use this skill if you want to handle trap activation in scripts(example Seed of Destruction Spawn Traps) -->
 		<set name="targetType" val="AURA" />
 		<set name="isMagic" val="1" /> <!-- Magic Skill -->