diff --git a/Spigot-API-Patches/PotionEffect-clone-methods.patch b/Spigot-API-Patches/PotionEffect-clone-methods.patch
index 0dee522fe9..29f3d327a0 100644
--- a/Spigot-API-Patches/PotionEffect-clone-methods.patch
+++ b/Spigot-API-Patches/PotionEffect-clone-methods.patch
@@ -5,11 +5,11 @@ Subject: [PATCH] PotionEffect clone methods
 
 
 diff --git a/src/main/java/org/bukkit/potion/PotionEffect.java b/src/main/java/org/bukkit/potion/PotionEffect.java
-index e7b86f85..53fb428f 100644
+index 86616f1b8..35984ef6c 100644
 --- a/src/main/java/org/bukkit/potion/PotionEffect.java
 +++ b/src/main/java/org/bukkit/potion/PotionEffect.java
 @@ -0,0 +0,0 @@ public class PotionEffect implements ConfigurationSerializable {
-         this(getEffectType(map), getInt(map, DURATION), getInt(map, AMPLIFIER), getBool(map, AMBIENT, false), getBool(map, PARTICLES, true));
+         this(getEffectType(map), getInt(map, DURATION), getInt(map, AMPLIFIER), getBool(map, AMBIENT, false), getBool(map, PARTICLES, true), getBool(map, ICON, getBool(map, PARTICLES, true)));
      }
  
 +    // Paper start
diff --git a/work/Bukkit b/work/Bukkit
index 14527e6623..e07c383258 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit 14527e6623aa40fa6fbb74013cb16e8a6bfff737
+Subproject commit e07c38325891cfaf6915881b4998c39b830ab6ea
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 69970127c1..ec2095d9c6 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 69970127c11e52c579cc17d4ce263a344735940a
+Subproject commit ec2095d9c6dc466bf9be6b515fc7cc40739f89d8