diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/skills/SkillOperateType.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/skills/SkillOperateType.java
index 9b6824f25e..5f24e613b1 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/skills/SkillOperateType.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/skills/SkillOperateType.java
@@ -220,7 +220,7 @@ public enum SkillOperateType
 	 */
 	public boolean isHidingMesseges()
 	{
-		return (this == A5) || (this == A6) || (this == TG) || (this == P);
+		return (this == P) || (this == A5) || (this == A6) || (this == TG);
 	}
 	
 	/**
@@ -228,7 +228,7 @@ public enum SkillOperateType
 	 */
 	public boolean isNotBroadcastable()
 	{
-		return (this == A5) || (this == A6) || (this == AU) || (this == TG);
+		return (this == AU) || (this == A5) || (this == A6) || (this == TG) || (this == T);
 	}
 	
 	/**
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/skills/SkillOperateType.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/skills/SkillOperateType.java
index 9b6824f25e..5f24e613b1 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/skills/SkillOperateType.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/skills/SkillOperateType.java
@@ -220,7 +220,7 @@ public enum SkillOperateType
 	 */
 	public boolean isHidingMesseges()
 	{
-		return (this == A5) || (this == A6) || (this == TG) || (this == P);
+		return (this == P) || (this == A5) || (this == A6) || (this == TG);
 	}
 	
 	/**
@@ -228,7 +228,7 @@ public enum SkillOperateType
 	 */
 	public boolean isNotBroadcastable()
 	{
-		return (this == A5) || (this == A6) || (this == AU) || (this == TG);
+		return (this == AU) || (this == A5) || (this == A6) || (this == TG) || (this == T);
 	}
 	
 	/**
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/skills/SkillOperateType.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/skills/SkillOperateType.java
index 9b6824f25e..5f24e613b1 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/skills/SkillOperateType.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/skills/SkillOperateType.java
@@ -220,7 +220,7 @@ public enum SkillOperateType
 	 */
 	public boolean isHidingMesseges()
 	{
-		return (this == A5) || (this == A6) || (this == TG) || (this == P);
+		return (this == P) || (this == A5) || (this == A6) || (this == TG);
 	}
 	
 	/**
@@ -228,7 +228,7 @@ public enum SkillOperateType
 	 */
 	public boolean isNotBroadcastable()
 	{
-		return (this == A5) || (this == A6) || (this == AU) || (this == TG);
+		return (this == AU) || (this == A5) || (this == A6) || (this == TG) || (this == T);
 	}
 	
 	/**
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/skills/SkillOperateType.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/skills/SkillOperateType.java
index 9b6824f25e..5f24e613b1 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/skills/SkillOperateType.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/skills/SkillOperateType.java
@@ -220,7 +220,7 @@ public enum SkillOperateType
 	 */
 	public boolean isHidingMesseges()
 	{
-		return (this == A5) || (this == A6) || (this == TG) || (this == P);
+		return (this == P) || (this == A5) || (this == A6) || (this == TG);
 	}
 	
 	/**
@@ -228,7 +228,7 @@ public enum SkillOperateType
 	 */
 	public boolean isNotBroadcastable()
 	{
-		return (this == A5) || (this == A6) || (this == AU) || (this == TG);
+		return (this == AU) || (this == A5) || (this == A6) || (this == TG) || (this == T);
 	}
 	
 	/**
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/skills/SkillOperateType.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/skills/SkillOperateType.java
index 9b6824f25e..5f24e613b1 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/skills/SkillOperateType.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/skills/SkillOperateType.java
@@ -220,7 +220,7 @@ public enum SkillOperateType
 	 */
 	public boolean isHidingMesseges()
 	{
-		return (this == A5) || (this == A6) || (this == TG) || (this == P);
+		return (this == P) || (this == A5) || (this == A6) || (this == TG);
 	}
 	
 	/**
@@ -228,7 +228,7 @@ public enum SkillOperateType
 	 */
 	public boolean isNotBroadcastable()
 	{
-		return (this == A5) || (this == A6) || (this == AU) || (this == TG);
+		return (this == AU) || (this == A5) || (this == A6) || (this == TG) || (this == T);
 	}
 	
 	/**
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/skills/SkillOperateType.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/skills/SkillOperateType.java
index 9b6824f25e..5f24e613b1 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/skills/SkillOperateType.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/skills/SkillOperateType.java
@@ -220,7 +220,7 @@ public enum SkillOperateType
 	 */
 	public boolean isHidingMesseges()
 	{
-		return (this == A5) || (this == A6) || (this == TG) || (this == P);
+		return (this == P) || (this == A5) || (this == A6) || (this == TG);
 	}
 	
 	/**
@@ -228,7 +228,7 @@ public enum SkillOperateType
 	 */
 	public boolean isNotBroadcastable()
 	{
-		return (this == A5) || (this == A6) || (this == AU) || (this == TG);
+		return (this == AU) || (this == A5) || (this == A6) || (this == TG) || (this == T);
 	}
 	
 	/**
diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/L2Character.java
index a63ed309f5..ba010f3dcb 100644
--- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/L2Character.java
+++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/L2Character.java
@@ -1793,8 +1793,8 @@ public abstract class L2Character extends L2Object implements ISkillsHolder
 		// To turn local player in target direction
 		setHeading(Util.calculateHeadingFrom(getX(), getY(), target.getX(), target.getY()));
 		
-		// Like L2OFF after a skill the player must stop the movement, also with toggle
-		if (!skill.isPotion() && (this instanceof L2PcInstance))
+		// Like L2OFF after a skill the player must stop the movement, unless it is toggle or potion.
+		if (!skill.isToggle() && !skill.isPotion() && (this instanceof L2PcInstance))
 		{
 			((L2PcInstance) this).stopMove(null);
 		}
@@ -1805,9 +1805,12 @@ public abstract class L2Character extends L2Object implements ISkillsHolder
 			callSkill(skill, targets);
 		}
 		
-		// Send a Server->Client packet MagicSkillUse with target, displayId, level, skillTime, reuseDelay
-		// to the L2Character AND to all L2PcInstance in the _KnownPlayers of the L2Character
-		broadcastPacket(new MagicSkillUse(this, target, displayId, level, hitTime, reuseDelay));
+		if (!skill.isToggle())
+		{
+			// Send a Server->Client packet MagicSkillUse with target, displayId, level, skillTime, reuseDelay
+			// to the L2Character AND to all L2PcInstance in the _KnownPlayers of the L2Character
+			broadcastPacket(new MagicSkillUse(this, target, displayId, level, hitTime, reuseDelay));
+		}
 		
 		// Send a system message USE_S1 to the L2Character
 		if ((activeChar instanceof L2PcInstance) && (magicId != 1312))
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Character.java
index c3c787f5b7..657bf1ccfe 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Character.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Character.java
@@ -1831,9 +1831,12 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 			}
 		}
 		
-		// Send a Server->Client packet MagicSkillUser with target, displayId, level, skillTime, reuseDelay
-		// to the L2Character AND to all L2PcInstance in the _KnownPlayers of the L2Character
-		broadcastPacket(new MagicSkillUse(this, target, skill.getDisplayId(), skill.getDisplayLevel(), skillTime, reuseDelay));
+		if (!skill.isToggle())
+		{
+			// Send a Server->Client packet MagicSkillUser with target, displayId, level, skillTime, reuseDelay
+			// to the L2Character AND to all L2PcInstance in the _KnownPlayers of the L2Character
+			broadcastPacket(new MagicSkillUse(this, target, skill.getDisplayId(), skill.getDisplayLevel(), skillTime, reuseDelay));
+		}
 		
 		// Send a system message to the player.
 		if (isPlayer() && !skill.isAbnormalInstant())
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/skills/SkillOperateType.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/skills/SkillOperateType.java
index 9b6824f25e..5f24e613b1 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/skills/SkillOperateType.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/skills/SkillOperateType.java
@@ -220,7 +220,7 @@ public enum SkillOperateType
 	 */
 	public boolean isHidingMesseges()
 	{
-		return (this == A5) || (this == A6) || (this == TG) || (this == P);
+		return (this == P) || (this == A5) || (this == A6) || (this == TG);
 	}
 	
 	/**
@@ -228,7 +228,7 @@ public enum SkillOperateType
 	 */
 	public boolean isNotBroadcastable()
 	{
-		return (this == A5) || (this == A6) || (this == AU) || (this == TG);
+		return (this == AU) || (this == A5) || (this == A6) || (this == TG) || (this == T);
 	}
 	
 	/**
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/skills/SkillOperateType.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/skills/SkillOperateType.java
index 9b6824f25e..5f24e613b1 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/skills/SkillOperateType.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/skills/SkillOperateType.java
@@ -220,7 +220,7 @@ public enum SkillOperateType
 	 */
 	public boolean isHidingMesseges()
 	{
-		return (this == A5) || (this == A6) || (this == TG) || (this == P);
+		return (this == P) || (this == A5) || (this == A6) || (this == TG);
 	}
 	
 	/**
@@ -228,7 +228,7 @@ public enum SkillOperateType
 	 */
 	public boolean isNotBroadcastable()
 	{
-		return (this == A5) || (this == A6) || (this == AU) || (this == TG);
+		return (this == AU) || (this == A5) || (this == A6) || (this == TG) || (this == T);
 	}
 	
 	/**
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/skills/SkillOperateType.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/skills/SkillOperateType.java
index 9b6824f25e..5f24e613b1 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/skills/SkillOperateType.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/skills/SkillOperateType.java
@@ -220,7 +220,7 @@ public enum SkillOperateType
 	 */
 	public boolean isHidingMesseges()
 	{
-		return (this == A5) || (this == A6) || (this == TG) || (this == P);
+		return (this == P) || (this == A5) || (this == A6) || (this == TG);
 	}
 	
 	/**
@@ -228,7 +228,7 @@ public enum SkillOperateType
 	 */
 	public boolean isNotBroadcastable()
 	{
-		return (this == A5) || (this == A6) || (this == AU) || (this == TG);
+		return (this == AU) || (this == A5) || (this == A6) || (this == TG) || (this == T);
 	}
 	
 	/**
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/skills/SkillOperateType.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/skills/SkillOperateType.java
index 9b6824f25e..5f24e613b1 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/skills/SkillOperateType.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/skills/SkillOperateType.java
@@ -220,7 +220,7 @@ public enum SkillOperateType
 	 */
 	public boolean isHidingMesseges()
 	{
-		return (this == A5) || (this == A6) || (this == TG) || (this == P);
+		return (this == P) || (this == A5) || (this == A6) || (this == TG);
 	}
 	
 	/**
@@ -228,7 +228,7 @@ public enum SkillOperateType
 	 */
 	public boolean isNotBroadcastable()
 	{
-		return (this == A5) || (this == A6) || (this == AU) || (this == TG);
+		return (this == AU) || (this == A5) || (this == A6) || (this == TG) || (this == T);
 	}
 	
 	/**