diff --git a/data/images/creatures/fatbat/burn-0.png b/data/images/creatures/fatbat/burn-0.png
deleted file mode 100644
index 13086cc35ad..00000000000
Binary files a/data/images/creatures/fatbat/burn-0.png and /dev/null differ
diff --git a/data/images/creatures/fatbat/burn-1.png b/data/images/creatures/fatbat/burn-1.png
deleted file mode 100644
index 0c14b44e1a5..00000000000
Binary files a/data/images/creatures/fatbat/burn-1.png and /dev/null differ
diff --git a/data/images/creatures/fatbat/burn-10.png b/data/images/creatures/fatbat/burn-10.png
deleted file mode 100644
index 071d677bf95..00000000000
Binary files a/data/images/creatures/fatbat/burn-10.png and /dev/null differ
diff --git a/data/images/creatures/fatbat/burn-2.png b/data/images/creatures/fatbat/burn-2.png
deleted file mode 100644
index b7cec5392ec..00000000000
Binary files a/data/images/creatures/fatbat/burn-2.png and /dev/null differ
diff --git a/data/images/creatures/fatbat/burn-3.png b/data/images/creatures/fatbat/burn-3.png
deleted file mode 100644
index 9b24dd4dbe8..00000000000
Binary files a/data/images/creatures/fatbat/burn-3.png and /dev/null differ
diff --git a/data/images/creatures/fatbat/burn-4.png b/data/images/creatures/fatbat/burn-4.png
deleted file mode 100644
index fa7658799f8..00000000000
Binary files a/data/images/creatures/fatbat/burn-4.png and /dev/null differ
diff --git a/data/images/creatures/fatbat/burn-5.png b/data/images/creatures/fatbat/burn-5.png
deleted file mode 100644
index 37dfe5e8f79..00000000000
Binary files a/data/images/creatures/fatbat/burn-5.png and /dev/null differ
diff --git a/data/images/creatures/fatbat/burn-6.png b/data/images/creatures/fatbat/burn-6.png
deleted file mode 100644
index a20895554ea..00000000000
Binary files a/data/images/creatures/fatbat/burn-6.png and /dev/null differ
diff --git a/data/images/creatures/fatbat/burn-7.png b/data/images/creatures/fatbat/burn-7.png
deleted file mode 100644
index bab1f935e51..00000000000
Binary files a/data/images/creatures/fatbat/burn-7.png and /dev/null differ
diff --git a/data/images/creatures/fatbat/burn-8.png b/data/images/creatures/fatbat/burn-8.png
deleted file mode 100644
index 91291ad2cc0..00000000000
Binary files a/data/images/creatures/fatbat/burn-8.png and /dev/null differ
diff --git a/data/images/creatures/fatbat/burn-9.png b/data/images/creatures/fatbat/burn-9.png
deleted file mode 100644
index 1977383ffbc..00000000000
Binary files a/data/images/creatures/fatbat/burn-9.png and /dev/null differ
diff --git a/data/images/creatures/fatbat/fatbat.sprite b/data/images/creatures/fatbat/fatbat.sprite
index 650ebe2d7e5..6be1b0aa08f 100644
--- a/data/images/creatures/fatbat/fatbat.sprite
+++ b/data/images/creatures/fatbat/fatbat.sprite
@@ -62,30 +62,7 @@
     (name "squished-right")
     (hitbox 34 15 32 38)
     (mirror-action "squished-left")
-   )
-  (action
-    (name "burning-left")
-    (fps 15)
-    (hitbox 30 15 32 38)
-    (images "burn-0.png"
-            "burn-1.png"
-            "burn-2.png"
-            "burn-3.png"
-            "burn-4.png"
-            "burn-5.png"
-            "burn-6.png"
-            "burn-7.png"
-            "burn-8.png"
-            "burn-9.png"
-            "burn-10.png"
-   )
-  )
-  (action
-    (name "burning-right")
-    (fps 15)
-    (hitbox 34 15 32 38)
-    (mirror-action "burning-left")
-  )
+   )
 
   (action
   (name "iced-left")
@@ -106,5 +83,16 @@
   (fps 20)
   (loops 1)
   (mirror-action "left"))
+
+  (action
+    (hitbox 15 0 64 64)
+    (name "burning-left")
+    (clone-action "iced-left")
+  )
+  (action
+    (hitbox 15 0 64 64)
+    (name "burning-right")
+    (mirror-action "burning-left")
+  )
 
 )
diff --git a/data/images/creatures/fish/forest/bluefish.sprite b/data/images/creatures/fish/forest/bluefish.sprite
index 180b8a1d058..04bc08322f4 100644
--- a/data/images/creatures/fish/forest/bluefish.sprite
+++ b/data/images/creatures/fish/forest/bluefish.sprite
@@ -26,6 +26,16 @@
   (action
     (name "iced-right")
     (hitbox 2 10 64 43)
-    (mirror-action "iced-left"))
+    (mirror-action "iced-left"))
+
+  (action
+    (hitbox 2 10 64 43)
+    (name "burning-left")
+    (clone-action "iced-left"))
+
+  (action
+    (hitbox 2 10 64 43)
+    (name "burning-right")
+    (mirror-action "burning-left"))
 
 )
diff --git a/data/images/creatures/fish/forest/brownfish.sprite b/data/images/creatures/fish/forest/brownfish.sprite
index e3e59493f3b..48002abef3a 100644
--- a/data/images/creatures/fish/forest/brownfish.sprite
+++ b/data/images/creatures/fish/forest/brownfish.sprite
@@ -61,6 +61,16 @@
   (action
     (name "iced-right")
     (hitbox 1 0 64 64)
+    (mirror-action "iced-left"))
+
+  (action
+    (name "burning-left")
+    (hitbox -1 0 64 64)
+    (images "swim_blue-0.png"))
+
+  (action
+    (name "burning-right")
+    (hitbox 1 0 64 64)
     (mirror-action "iced-left"))
 
 )
diff --git a/data/images/creatures/fish/forest/burning-0.png b/data/images/creatures/fish/forest/burning-0.png
deleted file mode 100644
index bb86f4fc960..00000000000
Binary files a/data/images/creatures/fish/forest/burning-0.png and /dev/null differ
diff --git a/data/images/creatures/fish/forest/burning-1.png b/data/images/creatures/fish/forest/burning-1.png
deleted file mode 100644
index 401284ffcb7..00000000000
Binary files a/data/images/creatures/fish/forest/burning-1.png and /dev/null differ
diff --git a/data/images/creatures/fish/forest/burning-2.png b/data/images/creatures/fish/forest/burning-2.png
deleted file mode 100644
index 77726af9ba5..00000000000
Binary files a/data/images/creatures/fish/forest/burning-2.png and /dev/null differ
diff --git a/data/images/creatures/fish/forest/burning-3.png b/data/images/creatures/fish/forest/burning-3.png
deleted file mode 100644
index eb8a27c89ba..00000000000
Binary files a/data/images/creatures/fish/forest/burning-3.png and /dev/null differ
diff --git a/data/images/creatures/fish/forest/burning-4.png b/data/images/creatures/fish/forest/burning-4.png
deleted file mode 100644
index 662d9b0bdef..00000000000
Binary files a/data/images/creatures/fish/forest/burning-4.png and /dev/null differ
diff --git a/data/images/creatures/fish/forest/burning-5.png b/data/images/creatures/fish/forest/burning-5.png
deleted file mode 100644
index 80e6e490940..00000000000
Binary files a/data/images/creatures/fish/forest/burning-5.png and /dev/null differ
diff --git a/data/images/creatures/fish/forest/burning-6.png b/data/images/creatures/fish/forest/burning-6.png
deleted file mode 100644
index 035c88a0ebd..00000000000
Binary files a/data/images/creatures/fish/forest/burning-6.png and /dev/null differ
diff --git a/data/images/creatures/fish/forest/burning-7.png b/data/images/creatures/fish/forest/burning-7.png
deleted file mode 100644
index 4ec85774b0b..00000000000
Binary files a/data/images/creatures/fish/forest/burning-7.png and /dev/null differ
diff --git a/data/images/creatures/fish/forest/burning-8.png b/data/images/creatures/fish/forest/burning-8.png
deleted file mode 100644
index 40067084d80..00000000000
Binary files a/data/images/creatures/fish/forest/burning-8.png and /dev/null differ
diff --git a/data/images/creatures/fish/forest/burning-9.png b/data/images/creatures/fish/forest/burning-9.png
deleted file mode 100644
index 4b2be2c8105..00000000000
Binary files a/data/images/creatures/fish/forest/burning-9.png and /dev/null differ
diff --git a/data/images/creatures/fish/forest/corrupted/corrupted_bluefish.sprite b/data/images/creatures/fish/forest/corrupted/corrupted_bluefish.sprite
index 233b3de0bc2..f2b225be480 100644
--- a/data/images/creatures/fish/forest/corrupted/corrupted_bluefish.sprite
+++ b/data/images/creatures/fish/forest/corrupted/corrupted_bluefish.sprite
@@ -28,4 +28,14 @@
     (hitbox 8 15 48 35)
     (mirror-action "iced-left"))
 
+  (action
+    (hitbox 8 15 48 35)
+    (name "burning-left")
+    (clone-action "iced-left"))
+
+  (action
+    (hitbox 8 15 48 35)
+    (name "burning-right")
+    (mirror-action "burning-left"))
+
 )
diff --git a/data/images/creatures/fish/forest/corrupted/corrupted_brownfish.sprite b/data/images/creatures/fish/forest/corrupted/corrupted_brownfish.sprite
index 51fd3407587..11610a43bdb 100644
--- a/data/images/creatures/fish/forest/corrupted/corrupted_brownfish.sprite
+++ b/data/images/creatures/fish/forest/corrupted/corrupted_brownfish.sprite
@@ -63,4 +63,14 @@
     (hitbox 12 10 46 46)
     (mirror-action "iced-left"))
 
+  (action
+    (name "burning-left")
+    (hitbox 8 10 46 46)
+    (images "swim_blue-0.png"))
+
+  (action
+    (name "burning-right")
+    (hitbox 12 10 46 46)
+    (mirror-action "iced-left"))
+
 )
diff --git a/data/images/creatures/fish/forest/jumpfish.sprite b/data/images/creatures/fish/forest/jumpfish.sprite
index 48d0654c8f0..9c12fca5ffc 100644
--- a/data/images/creatures/fish/forest/jumpfish.sprite
+++ b/data/images/creatures/fish/forest/jumpfish.sprite
@@ -44,20 +44,11 @@
   (action
     (name "iced-down")
     (hitbox 14 9 45 64)
-    (images "wait_blue-1.png"))
-
+    (images "wait_blue-1.png"))
+
   (action
     (name "burning-left")
-    (fps 15)
-    (hitbox 4 29 32 32)
-    (images "burning-0.png"
-            "burning-1.png"
-            "burning-2.png"
-            "burning-3.png"
-            "burning-4.png"
-            "burning-5.png"
-            "burning-6.png"
-            "burning-7.png"
-            "burning-8.png"
-            "burning-9.png"))
+    (hitbox 9 24 45 64)
+    (images "jump_blue-0.png"))
+
 )
diff --git a/data/images/creatures/fish/ice/bluefish.sprite b/data/images/creatures/fish/ice/bluefish.sprite
index b5d243138f3..f0f70ee8ec4 100644
--- a/data/images/creatures/fish/ice/bluefish.sprite
+++ b/data/images/creatures/fish/ice/bluefish.sprite
@@ -28,4 +28,14 @@
     (hitbox 2 10 64 43)
     (mirror-action "iced-left"))
 
+  (action
+    (hitbox 2 10 64 43)
+    (name "burning-left")
+    (clone-action "iced-left"))
+
+  (action
+    (hitbox 2 10 64 43)
+    (name "burning-right")
+    (mirror-action "burning-left"))
+
 )
diff --git a/data/images/creatures/fish/ice/greenfish.sprite b/data/images/creatures/fish/ice/greenfish.sprite
index f0f49c82555..362bebb8c77 100644
--- a/data/images/creatures/fish/ice/greenfish.sprite
+++ b/data/images/creatures/fish/ice/greenfish.sprite
@@ -62,4 +62,14 @@
     (hitbox 0 0 64 64)
     (mirror-action "iced-left"))
 
+  (action
+    (hitbox 0 0 64 64)
+    (name "burning-left")
+    (clone-action "iced-left"))
+
+  (action
+    (hitbox 0 0 64 64)
+    (name "burning-right")
+    (mirror-action "burning-left"))
+
 )
diff --git a/data/images/creatures/igel/burning-0.png b/data/images/creatures/igel/burning-0.png
deleted file mode 100644
index 94a3de9265d..00000000000
Binary files a/data/images/creatures/igel/burning-0.png and /dev/null differ
diff --git a/data/images/creatures/igel/burning-1.png b/data/images/creatures/igel/burning-1.png
deleted file mode 100644
index 28421472351..00000000000
Binary files a/data/images/creatures/igel/burning-1.png and /dev/null differ
diff --git a/data/images/creatures/igel/burning-2.png b/data/images/creatures/igel/burning-2.png
deleted file mode 100644
index f34ef63e48a..00000000000
Binary files a/data/images/creatures/igel/burning-2.png and /dev/null differ
diff --git a/data/images/creatures/igel/burning-3.png b/data/images/creatures/igel/burning-3.png
deleted file mode 100644
index 77f4cedf1a4..00000000000
Binary files a/data/images/creatures/igel/burning-3.png and /dev/null differ
diff --git a/data/images/creatures/igel/burning-4.png b/data/images/creatures/igel/burning-4.png
deleted file mode 100644
index 32dc69e8f9a..00000000000
Binary files a/data/images/creatures/igel/burning-4.png and /dev/null differ
diff --git a/data/images/creatures/igel/burning-5.png b/data/images/creatures/igel/burning-5.png
deleted file mode 100644
index 5ce98cdadd4..00000000000
Binary files a/data/images/creatures/igel/burning-5.png and /dev/null differ
diff --git a/data/images/creatures/igel/burning-6.png b/data/images/creatures/igel/burning-6.png
deleted file mode 100644
index 5e74ba66a4f..00000000000
Binary files a/data/images/creatures/igel/burning-6.png and /dev/null differ
diff --git a/data/images/creatures/igel/burning-7.png b/data/images/creatures/igel/burning-7.png
deleted file mode 100644
index ad1511cae62..00000000000
Binary files a/data/images/creatures/igel/burning-7.png and /dev/null differ
diff --git a/data/images/creatures/igel/burning-8.png b/data/images/creatures/igel/burning-8.png
deleted file mode 100644
index 0295a7672bf..00000000000
Binary files a/data/images/creatures/igel/burning-8.png and /dev/null differ
diff --git a/data/images/creatures/igel/burning-9.png b/data/images/creatures/igel/burning-9.png
deleted file mode 100644
index e3e435d3ff9..00000000000
Binary files a/data/images/creatures/igel/burning-9.png and /dev/null differ
diff --git a/data/images/creatures/igel/corrupted/corrupted_igel.sprite b/data/images/creatures/igel/corrupted/corrupted_igel.sprite
index 7d81430d37e..6a24044edc8 100644
--- a/data/images/creatures/igel/corrupted/corrupted_igel.sprite
+++ b/data/images/creatures/igel/corrupted/corrupted_igel.sprite
@@ -80,24 +80,13 @@
     (mirror-action "iced-left")
   )
   (action
+    (hitbox 2 18 64 43)
     (name "burning-left")
-    (hitbox 15 10 36 32)
-    (fps 15)
-    (images "../burning-0.png"
-            "../burning-1.png"
-            "../burning-2.png"
-            "../burning-3.png"
-            "../burning-4.png"
-            "../burning-5.png"
-            "../burning-6.png"
-            "../burning-7.png"
-            "../burning-8.png"
-            "../burning-9.png")
+    (clone-action "iced-left")
   )
   (action
+    (hitbox 2 18 64 43)
     (name "burning-right")
-    (fps 15)
-    (hitbox 17 10 36 32)
     (mirror-action "burning-left")
   )
 )
diff --git a/data/images/creatures/igel/igel.sprite b/data/images/creatures/igel/igel.sprite
index f92038c3063..0e038916816 100644
--- a/data/images/creatures/igel/igel.sprite
+++ b/data/images/creatures/igel/igel.sprite
@@ -78,26 +78,15 @@
     (name "iced-right")
     (hitbox 2 4 64 43)
     (mirror-action "iced-left")
-  )
+  )
   (action
+    (hitbox 2 4 64 43)
     (name "burning-left")
-    (hitbox 15 10 36 32)
-    (fps 15)
-    (images "burning-0.png"
-            "burning-1.png"
-            "burning-2.png"
-            "burning-3.png"
-            "burning-4.png"
-            "burning-5.png"
-            "burning-6.png"
-            "burning-7.png"
-            "burning-8.png"
-            "burning-9.png")
+    (clone-action "iced-left")
   )
   (action
+    (hitbox 2 4 64 43)
     (name "burning-right")
-    (fps 15)
-    (hitbox 17 10 36 32)
     (mirror-action "burning-left")
   )
 )
diff --git a/data/images/creatures/jumpy/corruptjumpy.sprite b/data/images/creatures/jumpy/corruptjumpy.sprite
index 61d157db82e..2fcca201587 100644
--- a/data/images/creatures/jumpy/corruptjumpy.sprite
+++ b/data/images/creatures/jumpy/corruptjumpy.sprite
@@ -51,24 +51,13 @@
   (mirror-action "iced-left"))
 
  (action
+  (hitbox 2 8 45 64)
   (name "burning-left")
-  (fps 15)
-  (hitbox 7 8 32 50)
-  (images "wooden-burning-0.png"
-          "wooden-burning-1.png"
-          "wooden-burning-2.png"
-          "wooden-burning-3.png"
-          "wooden-burning-4.png"
-          "wooden-burning-5.png"
-          "wooden-burning-6.png"
-          "wooden-burning-7.png"
-          "wooden-burning-8.png"
-          "wooden-burning-9.png"
-          "wooden-burning-10.png"))
+  (clone-action "iced-left"))
 
  (action
+  (hitbox 4 8 45 64)
   (name "burning-right")
-  (hitbox 9 8 32 50)
   (mirror-action "burning-left"))
 
  (action
diff --git a/data/images/creatures/jumpy/wooden-burning-0.png b/data/images/creatures/jumpy/wooden-burning-0.png
deleted file mode 100644
index 5d52a0f22c0..00000000000
Binary files a/data/images/creatures/jumpy/wooden-burning-0.png and /dev/null differ
diff --git a/data/images/creatures/jumpy/wooden-burning-1.png b/data/images/creatures/jumpy/wooden-burning-1.png
deleted file mode 100644
index d2a2bac58b5..00000000000
Binary files a/data/images/creatures/jumpy/wooden-burning-1.png and /dev/null differ
diff --git a/data/images/creatures/jumpy/wooden-burning-10.png b/data/images/creatures/jumpy/wooden-burning-10.png
deleted file mode 100644
index a29cb68aed0..00000000000
Binary files a/data/images/creatures/jumpy/wooden-burning-10.png and /dev/null differ
diff --git a/data/images/creatures/jumpy/wooden-burning-2.png b/data/images/creatures/jumpy/wooden-burning-2.png
deleted file mode 100644
index b711ecbff8f..00000000000
Binary files a/data/images/creatures/jumpy/wooden-burning-2.png and /dev/null differ
diff --git a/data/images/creatures/jumpy/wooden-burning-3.png b/data/images/creatures/jumpy/wooden-burning-3.png
deleted file mode 100644
index 26474087fa0..00000000000
Binary files a/data/images/creatures/jumpy/wooden-burning-3.png and /dev/null differ
diff --git a/data/images/creatures/jumpy/wooden-burning-4.png b/data/images/creatures/jumpy/wooden-burning-4.png
deleted file mode 100644
index 6e4fb1505d4..00000000000
Binary files a/data/images/creatures/jumpy/wooden-burning-4.png and /dev/null differ
diff --git a/data/images/creatures/jumpy/wooden-burning-5.png b/data/images/creatures/jumpy/wooden-burning-5.png
deleted file mode 100644
index 5b61f128e34..00000000000
Binary files a/data/images/creatures/jumpy/wooden-burning-5.png and /dev/null differ
diff --git a/data/images/creatures/jumpy/wooden-burning-6.png b/data/images/creatures/jumpy/wooden-burning-6.png
deleted file mode 100644
index 25c6265b76e..00000000000
Binary files a/data/images/creatures/jumpy/wooden-burning-6.png and /dev/null differ
diff --git a/data/images/creatures/jumpy/wooden-burning-7.png b/data/images/creatures/jumpy/wooden-burning-7.png
deleted file mode 100644
index d4237323485..00000000000
Binary files a/data/images/creatures/jumpy/wooden-burning-7.png and /dev/null differ
diff --git a/data/images/creatures/jumpy/wooden-burning-8.png b/data/images/creatures/jumpy/wooden-burning-8.png
deleted file mode 100644
index 572059ce50b..00000000000
Binary files a/data/images/creatures/jumpy/wooden-burning-8.png and /dev/null differ
diff --git a/data/images/creatures/jumpy/wooden-burning-9.png b/data/images/creatures/jumpy/wooden-burning-9.png
deleted file mode 100644
index 0d5d6eaf795..00000000000
Binary files a/data/images/creatures/jumpy/wooden-burning-9.png and /dev/null differ
diff --git a/data/images/creatures/jumpy/woodjumpy.sprite b/data/images/creatures/jumpy/woodjumpy.sprite
index d0ec5bf269f..e76a54305ea 100644
--- a/data/images/creatures/jumpy/woodjumpy.sprite
+++ b/data/images/creatures/jumpy/woodjumpy.sprite
@@ -49,26 +49,15 @@
   (name "iced-right")
   (hitbox 4 8 45 64)
   (mirror-action "iced-left"))
-
+
  (action
+  (hitbox 2 8 45 64)
   (name "burning-left")
-  (fps 15)
-  (hitbox 7 8 32 50)
-  (images "wooden-burning-0.png"
-          "wooden-burning-1.png"
-          "wooden-burning-2.png"
-          "wooden-burning-3.png"
-          "wooden-burning-4.png"
-          "wooden-burning-5.png"
-          "wooden-burning-6.png"
-          "wooden-burning-7.png"
-          "wooden-burning-8.png"
-          "wooden-burning-9.png"
-          "wooden-burning-10.png"))
+  (clone-action "iced-left"))
 
  (action
+  (hitbox 4 8 45 64)
   (name "burning-right")
-  (hitbox 9 8 32 50)
   (mirror-action "burning-left"))
 
  (action
diff --git a/data/images/creatures/leafshot/corrupted/rotshot.sprite b/data/images/creatures/leafshot/corrupted/rotshot.sprite
index 1655e5a0cc5..8aab151d49d 100644
--- a/data/images/creatures/leafshot/corrupted/rotshot.sprite
+++ b/data/images/creatures/leafshot/corrupted/rotshot.sprite
@@ -26,6 +26,16 @@
 	(hitbox 23 17 36 26)
     (mirror-action "iced-left")
   )
+  (action
+    (hitbox 5 17 36 26)
+    (name "burning-left")
+    (clone-action "iced-left")
+  )
+  (action
+    (hitbox 23 17 36 26)
+    (name "burning-right")
+    (mirror-action "burning-left")
+  )
   (action
     (name "squished-left")
 	(hitbox 9 12 32 32)
@@ -46,20 +56,4 @@
     (hitbox 23 17 36 26)
     (mirror-action "collision-left")
   )
-  (action
-    (name "burning-left")
-    (hitbox 4 28 36 18)
-    (images "../burning-0.png"
-            "../burning-1.png"
-            "../burning-2.png"
-            "../burning-3.png"
-            "../burning-4.png"
-            "../burning-5.png"
-            "../burning-6.png"
-            "../burning-7.png")
-  )
-  (action
-    (name "burning-right")
-    (mirror-action "burning-left")
-  )
 )
diff --git a/data/images/creatures/leafshot/leafshot.sprite b/data/images/creatures/leafshot/leafshot.sprite
index d36cc01cda8..c98d36425c8 100644
--- a/data/images/creatures/leafshot/leafshot.sprite
+++ b/data/images/creatures/leafshot/leafshot.sprite
@@ -25,6 +25,16 @@
     (name "iced-right")
 	(hitbox 23 17 36 26)
     (mirror-action "iced-left")
+  )
+  (action
+    (hitbox 5 17 36 26)
+    (name "burning-left")
+    (clone-action "iced-left")
+  )
+  (action
+    (hitbox 23 17 36 26)
+    (name "burning-right")
+    (mirror-action "burning-left")
   )
   (action
     (name "squished-left")
@@ -46,20 +56,4 @@
     (hitbox 23 17 36 26)
     (mirror-action "collision-left")
   )
-  (action
-    (name "burning-left")
-    (hitbox 4 28 36 18)
-    (images "burning-0.png"
-            "burning-1.png"
-            "burning-2.png"
-            "burning-3.png"
-            "burning-4.png"
-            "burning-5.png"
-            "burning-6.png"
-            "burning-7.png")
-  )
-  (action
-    (name "burning-right")
-    (mirror-action "burning-left")
-  )
 )
diff --git a/data/images/creatures/mr_tree/burning-0.png b/data/images/creatures/mr_tree/burning-0.png
deleted file mode 100644
index 87e59b379df..00000000000
Binary files a/data/images/creatures/mr_tree/burning-0.png and /dev/null differ
diff --git a/data/images/creatures/mr_tree/burning-1.png b/data/images/creatures/mr_tree/burning-1.png
deleted file mode 100644
index 07d1b857a7e..00000000000
Binary files a/data/images/creatures/mr_tree/burning-1.png and /dev/null differ
diff --git a/data/images/creatures/mr_tree/burning-10.png b/data/images/creatures/mr_tree/burning-10.png
deleted file mode 100644
index 2e635eb0d7f..00000000000
Binary files a/data/images/creatures/mr_tree/burning-10.png and /dev/null differ
diff --git a/data/images/creatures/mr_tree/burning-2.png b/data/images/creatures/mr_tree/burning-2.png
deleted file mode 100644
index f7a62aad9dd..00000000000
Binary files a/data/images/creatures/mr_tree/burning-2.png and /dev/null differ
diff --git a/data/images/creatures/mr_tree/burning-3.png b/data/images/creatures/mr_tree/burning-3.png
deleted file mode 100644
index 23bd7e89d72..00000000000
Binary files a/data/images/creatures/mr_tree/burning-3.png and /dev/null differ
diff --git a/data/images/creatures/mr_tree/burning-4.png b/data/images/creatures/mr_tree/burning-4.png
deleted file mode 100644
index 39b5612f56d..00000000000
Binary files a/data/images/creatures/mr_tree/burning-4.png and /dev/null differ
diff --git a/data/images/creatures/mr_tree/burning-5.png b/data/images/creatures/mr_tree/burning-5.png
deleted file mode 100644
index 2d40a463ddf..00000000000
Binary files a/data/images/creatures/mr_tree/burning-5.png and /dev/null differ
diff --git a/data/images/creatures/mr_tree/burning-6.png b/data/images/creatures/mr_tree/burning-6.png
deleted file mode 100644
index c44ab6767c5..00000000000
Binary files a/data/images/creatures/mr_tree/burning-6.png and /dev/null differ
diff --git a/data/images/creatures/mr_tree/burning-7.png b/data/images/creatures/mr_tree/burning-7.png
deleted file mode 100644
index d0d0e73d4c2..00000000000
Binary files a/data/images/creatures/mr_tree/burning-7.png and /dev/null differ
diff --git a/data/images/creatures/mr_tree/burning-8.png b/data/images/creatures/mr_tree/burning-8.png
deleted file mode 100644
index c45cd4d0e6a..00000000000
Binary files a/data/images/creatures/mr_tree/burning-8.png and /dev/null differ
diff --git a/data/images/creatures/mr_tree/burning-9.png b/data/images/creatures/mr_tree/burning-9.png
deleted file mode 100644
index 08477ee9a4c..00000000000
Binary files a/data/images/creatures/mr_tree/burning-9.png and /dev/null differ
diff --git a/data/images/creatures/mr_tree/corrupted/haunted_tree.sprite b/data/images/creatures/mr_tree/corrupted/haunted_tree.sprite
index ab6ffc3015a..7d6e1527494 100644
--- a/data/images/creatures/mr_tree/corrupted/haunted_tree.sprite
+++ b/data/images/creatures/mr_tree/corrupted/haunted_tree.sprite
@@ -22,30 +22,6 @@
 	(fps 12)
     (mirror-action "left")
   )
-  (action
-    (hitbox 14 10 62 78)
-    (name "burning-left")
-    (fps 15)
-    (images 
-      "../burning-0.png"
-      "../burning-1.png"
-      "../burning-2.png"
-      "../burning-3.png"
-      "../burning-4.png"
-      "../burning-5.png"
-      "../burning-6.png"
-      "../burning-7.png"
-      "../burning-8.png"
-      "../burning-9.png"
-      "../burning-10.png"
-    )
-  )
-  (action
-    (hitbox 14 10 62 78)
-    (fps 15)
-    (name "burning-right")
-    (mirror-action "burning-left")
-  )
   (action
     (hitbox 2 0 96 96)
     (name "iced-left")
@@ -55,5 +31,15 @@
     (hitbox 2 0 96 96)
     (name "iced-right")
     (mirror-action "iced-left")
+  )
+    (action
+    (hitbox 2 0 96 96)
+    (name "burning-left")
+    (clone-action "iced-left")
+  )
+  (action
+    (hitbox 2 0 96 96)
+    (name "burning-right")
+    (mirror-action "burning-left")
   )
 )
diff --git a/data/images/creatures/mr_tree/mr_tree.sprite b/data/images/creatures/mr_tree/mr_tree.sprite
index 3f6cd38b00b..49ceb524b38 100644
--- a/data/images/creatures/mr_tree/mr_tree.sprite
+++ b/data/images/creatures/mr_tree/mr_tree.sprite
@@ -20,28 +20,6 @@
     (fps 15)
     (mirror-action "left")
   )
-  (action
-    (hitbox 0 62 84.8 84.8)
-    (name "burning-left")
-    (fps 15)
-    (images "burning-0.png"
-            "burning-1.png"
-            "burning-2.png"
-            "burning-3.png"
-            "burning-4.png"
-            "burning-5.png"
-            "burning-6.png"
-            "burning-7.png"
-            "burning-8.png"
-            "burning-9.png"
-            "burning-10.png")
-  )
-  (action
-    (hitbox 0 62 84.8 84.8)
-    (fps 15)
-    (name "burning-right")
-    (mirror-action "burning-left")
-  )
   (action
     (hitbox 2 0 96 96)
     (name "iced-left")
@@ -51,5 +29,15 @@
     (hitbox 2 0 96 96)
     (name "iced-right")
     (mirror-action "iced-left")
+  )
+  (action
+    (hitbox 2 0 96 96)
+    (name "burning-left")
+    (clone-action "iced-left")
+  )
+  (action
+    (hitbox 2 0 96 96)
+    (name "burning-right")
+    (mirror-action "burning-left")
   )
 )
diff --git a/data/images/creatures/mr_tree/small-burning-0.png b/data/images/creatures/mr_tree/small-burning-0.png
deleted file mode 100644
index 9617b93be74..00000000000
Binary files a/data/images/creatures/mr_tree/small-burning-0.png and /dev/null differ
diff --git a/data/images/creatures/mr_tree/small-burning-1.png b/data/images/creatures/mr_tree/small-burning-1.png
deleted file mode 100644
index e687f80b5e7..00000000000
Binary files a/data/images/creatures/mr_tree/small-burning-1.png and /dev/null differ
diff --git a/data/images/creatures/mr_tree/small-burning-10.png b/data/images/creatures/mr_tree/small-burning-10.png
deleted file mode 100644
index f23468d2251..00000000000
Binary files a/data/images/creatures/mr_tree/small-burning-10.png and /dev/null differ
diff --git a/data/images/creatures/mr_tree/small-burning-2.png b/data/images/creatures/mr_tree/small-burning-2.png
deleted file mode 100644
index 8d6e25f0cd3..00000000000
Binary files a/data/images/creatures/mr_tree/small-burning-2.png and /dev/null differ
diff --git a/data/images/creatures/mr_tree/small-burning-3.png b/data/images/creatures/mr_tree/small-burning-3.png
deleted file mode 100644
index eae21e79fc5..00000000000
Binary files a/data/images/creatures/mr_tree/small-burning-3.png and /dev/null differ
diff --git a/data/images/creatures/mr_tree/small-burning-4.png b/data/images/creatures/mr_tree/small-burning-4.png
deleted file mode 100644
index aef88c53520..00000000000
Binary files a/data/images/creatures/mr_tree/small-burning-4.png and /dev/null differ
diff --git a/data/images/creatures/mr_tree/small-burning-5.png b/data/images/creatures/mr_tree/small-burning-5.png
deleted file mode 100644
index 5431405b016..00000000000
Binary files a/data/images/creatures/mr_tree/small-burning-5.png and /dev/null differ
diff --git a/data/images/creatures/mr_tree/small-burning-6.png b/data/images/creatures/mr_tree/small-burning-6.png
deleted file mode 100644
index 4c9cc688395..00000000000
Binary files a/data/images/creatures/mr_tree/small-burning-6.png and /dev/null differ
diff --git a/data/images/creatures/mr_tree/small-burning-7.png b/data/images/creatures/mr_tree/small-burning-7.png
deleted file mode 100644
index 7f0fbdd2ce2..00000000000
Binary files a/data/images/creatures/mr_tree/small-burning-7.png and /dev/null differ
diff --git a/data/images/creatures/mr_tree/small-burning-8.png b/data/images/creatures/mr_tree/small-burning-8.png
deleted file mode 100644
index 4e694b2ddf4..00000000000
Binary files a/data/images/creatures/mr_tree/small-burning-8.png and /dev/null differ
diff --git a/data/images/creatures/mr_tree/small-burning-9.png b/data/images/creatures/mr_tree/small-burning-9.png
deleted file mode 100644
index 0e7f07cf9ca..00000000000
Binary files a/data/images/creatures/mr_tree/small-burning-9.png and /dev/null differ
diff --git a/data/images/creatures/mr_tree/stumpy.sprite b/data/images/creatures/mr_tree/stumpy.sprite
index 1c80decf4b5..71df6a22f9f 100644
--- a/data/images/creatures/mr_tree/stumpy.sprite
+++ b/data/images/creatures/mr_tree/stumpy.sprite
@@ -20,28 +20,6 @@
     (fps 15)
     (mirror-action "left")
   )
-  (action
-    (hitbox 20 23 42 62)
-    (fps 15)
-    (name "burning-left")
-    (images "small-burning-0.png"
-            "small-burning-1.png"
-            "small-burning-2.png"
-            "small-burning-3.png"
-            "small-burning-4.png"
-            "small-burning-5.png"
-            "small-burning-6.png"
-            "small-burning-7.png"
-            "small-burning-8.png"
-            "small-burning-9.png"
-            "small-burning-10.png")
-  )
-  (action
-    (hitbox 20 23 42 62)
-    (name "burning-right")
-    (fps 15)
-    (mirror-action "burning-left")
-  )
   (action
     (hitbox 12 30 64 64)
     (name "iced-left")
@@ -51,6 +29,16 @@
     (hitbox 12 30 64 64)
     (name "iced-right")
     (mirror-action "iced-left")
+  )
+  (action
+    (hitbox 12 30 64 64)
+    (name "burning-left")
+    (clone-action "iced-left")
+  )
+  (action
+    (hitbox 12 30 64 64)
+    (name "burning-right")
+    (mirror-action "burning-left")
   )
   (action
     (hitbox 22 38 46 50)
diff --git a/data/images/creatures/overlays/fireoverlay/fireoverlay-1x1-0.png b/data/images/creatures/overlays/fireoverlay/fireoverlay-1x1-0.png
new file mode 100644
index 00000000000..fc93d17e808
Binary files /dev/null and b/data/images/creatures/overlays/fireoverlay/fireoverlay-1x1-0.png differ
diff --git a/data/images/creatures/overlays/fireoverlay/fireoverlay-1x1-1.png b/data/images/creatures/overlays/fireoverlay/fireoverlay-1x1-1.png
new file mode 100644
index 00000000000..7ef40cac17e
Binary files /dev/null and b/data/images/creatures/overlays/fireoverlay/fireoverlay-1x1-1.png differ
diff --git a/data/images/creatures/overlays/fireoverlay/fireoverlay-1x1-2.png b/data/images/creatures/overlays/fireoverlay/fireoverlay-1x1-2.png
new file mode 100644
index 00000000000..bb9fae2c23c
Binary files /dev/null and b/data/images/creatures/overlays/fireoverlay/fireoverlay-1x1-2.png differ
diff --git a/data/images/creatures/overlays/fireoverlay/fireoverlay-1x1-3.png b/data/images/creatures/overlays/fireoverlay/fireoverlay-1x1-3.png
new file mode 100644
index 00000000000..58997a15fd3
Binary files /dev/null and b/data/images/creatures/overlays/fireoverlay/fireoverlay-1x1-3.png differ
diff --git a/data/images/creatures/overlays/fireoverlay/fireoverlay-1x1-4.png b/data/images/creatures/overlays/fireoverlay/fireoverlay-1x1-4.png
new file mode 100644
index 00000000000..6d93fa07140
Binary files /dev/null and b/data/images/creatures/overlays/fireoverlay/fireoverlay-1x1-4.png differ
diff --git a/data/images/creatures/overlays/fireoverlay/fireoverlay-1x1-5.png b/data/images/creatures/overlays/fireoverlay/fireoverlay-1x1-5.png
new file mode 100644
index 00000000000..f4be47a7891
Binary files /dev/null and b/data/images/creatures/overlays/fireoverlay/fireoverlay-1x1-5.png differ
diff --git a/data/images/creatures/overlays/fireoverlay/fireoverlay-1x1-6.png b/data/images/creatures/overlays/fireoverlay/fireoverlay-1x1-6.png
new file mode 100644
index 00000000000..60ef1e10d40
Binary files /dev/null and b/data/images/creatures/overlays/fireoverlay/fireoverlay-1x1-6.png differ
diff --git a/data/images/creatures/overlays/fireoverlay/fireoverlay-1x1-7.png b/data/images/creatures/overlays/fireoverlay/fireoverlay-1x1-7.png
new file mode 100644
index 00000000000..5927bb1e378
Binary files /dev/null and b/data/images/creatures/overlays/fireoverlay/fireoverlay-1x1-7.png differ
diff --git a/data/images/creatures/overlays/fireoverlay/fireoverlay-1x1-8.png b/data/images/creatures/overlays/fireoverlay/fireoverlay-1x1-8.png
new file mode 100644
index 00000000000..ce2f16a4d35
Binary files /dev/null and b/data/images/creatures/overlays/fireoverlay/fireoverlay-1x1-8.png differ
diff --git a/data/images/creatures/overlays/fireoverlay/fireoverlay-1x1-9.png b/data/images/creatures/overlays/fireoverlay/fireoverlay-1x1-9.png
new file mode 100644
index 00000000000..067ae2f3a0f
Binary files /dev/null and b/data/images/creatures/overlays/fireoverlay/fireoverlay-1x1-9.png differ
diff --git a/data/images/creatures/overlays/fireoverlay/fireoverlay-1x2-0.png b/data/images/creatures/overlays/fireoverlay/fireoverlay-1x2-0.png
new file mode 100644
index 00000000000..86daf19b819
Binary files /dev/null and b/data/images/creatures/overlays/fireoverlay/fireoverlay-1x2-0.png differ
diff --git a/data/images/creatures/overlays/fireoverlay/fireoverlay-1x2-1.png b/data/images/creatures/overlays/fireoverlay/fireoverlay-1x2-1.png
new file mode 100644
index 00000000000..8e8561d8464
Binary files /dev/null and b/data/images/creatures/overlays/fireoverlay/fireoverlay-1x2-1.png differ
diff --git a/data/images/creatures/overlays/fireoverlay/fireoverlay-1x2-2.png b/data/images/creatures/overlays/fireoverlay/fireoverlay-1x2-2.png
new file mode 100644
index 00000000000..3b240498125
Binary files /dev/null and b/data/images/creatures/overlays/fireoverlay/fireoverlay-1x2-2.png differ
diff --git a/data/images/creatures/overlays/fireoverlay/fireoverlay-1x2-3.png b/data/images/creatures/overlays/fireoverlay/fireoverlay-1x2-3.png
new file mode 100644
index 00000000000..2eaf174e368
Binary files /dev/null and b/data/images/creatures/overlays/fireoverlay/fireoverlay-1x2-3.png differ
diff --git a/data/images/creatures/overlays/fireoverlay/fireoverlay-1x2-4.png b/data/images/creatures/overlays/fireoverlay/fireoverlay-1x2-4.png
new file mode 100644
index 00000000000..fa70c46f91d
Binary files /dev/null and b/data/images/creatures/overlays/fireoverlay/fireoverlay-1x2-4.png differ
diff --git a/data/images/creatures/overlays/fireoverlay/fireoverlay-1x2-5.png b/data/images/creatures/overlays/fireoverlay/fireoverlay-1x2-5.png
new file mode 100644
index 00000000000..d6f9b5c1bdf
Binary files /dev/null and b/data/images/creatures/overlays/fireoverlay/fireoverlay-1x2-5.png differ
diff --git a/data/images/creatures/overlays/fireoverlay/fireoverlay-1x2-6.png b/data/images/creatures/overlays/fireoverlay/fireoverlay-1x2-6.png
new file mode 100644
index 00000000000..a41a0106bbb
Binary files /dev/null and b/data/images/creatures/overlays/fireoverlay/fireoverlay-1x2-6.png differ
diff --git a/data/images/creatures/overlays/fireoverlay/fireoverlay-1x2-7.png b/data/images/creatures/overlays/fireoverlay/fireoverlay-1x2-7.png
new file mode 100644
index 00000000000..77be159007f
Binary files /dev/null and b/data/images/creatures/overlays/fireoverlay/fireoverlay-1x2-7.png differ
diff --git a/data/images/creatures/overlays/fireoverlay/fireoverlay-1x2-8.png b/data/images/creatures/overlays/fireoverlay/fireoverlay-1x2-8.png
new file mode 100644
index 00000000000..40e5b4aa3f2
Binary files /dev/null and b/data/images/creatures/overlays/fireoverlay/fireoverlay-1x2-8.png differ
diff --git a/data/images/creatures/overlays/fireoverlay/fireoverlay-1x2-9.png b/data/images/creatures/overlays/fireoverlay/fireoverlay-1x2-9.png
new file mode 100644
index 00000000000..ca9059ec02c
Binary files /dev/null and b/data/images/creatures/overlays/fireoverlay/fireoverlay-1x2-9.png differ
diff --git a/data/images/creatures/overlays/fireoverlay/fireoverlay-2x1-0.png b/data/images/creatures/overlays/fireoverlay/fireoverlay-2x1-0.png
new file mode 100644
index 00000000000..48f907bb20b
Binary files /dev/null and b/data/images/creatures/overlays/fireoverlay/fireoverlay-2x1-0.png differ
diff --git a/data/images/creatures/overlays/fireoverlay/fireoverlay-2x1-1.png b/data/images/creatures/overlays/fireoverlay/fireoverlay-2x1-1.png
new file mode 100644
index 00000000000..9c521e113fc
Binary files /dev/null and b/data/images/creatures/overlays/fireoverlay/fireoverlay-2x1-1.png differ
diff --git a/data/images/creatures/overlays/fireoverlay/fireoverlay-2x1-2.png b/data/images/creatures/overlays/fireoverlay/fireoverlay-2x1-2.png
new file mode 100644
index 00000000000..d67ad7c6872
Binary files /dev/null and b/data/images/creatures/overlays/fireoverlay/fireoverlay-2x1-2.png differ
diff --git a/data/images/creatures/overlays/fireoverlay/fireoverlay-2x1-3.png b/data/images/creatures/overlays/fireoverlay/fireoverlay-2x1-3.png
new file mode 100644
index 00000000000..950b64bb472
Binary files /dev/null and b/data/images/creatures/overlays/fireoverlay/fireoverlay-2x1-3.png differ
diff --git a/data/images/creatures/overlays/fireoverlay/fireoverlay-2x1-4.png b/data/images/creatures/overlays/fireoverlay/fireoverlay-2x1-4.png
new file mode 100644
index 00000000000..0ad40365d59
Binary files /dev/null and b/data/images/creatures/overlays/fireoverlay/fireoverlay-2x1-4.png differ
diff --git a/data/images/creatures/overlays/fireoverlay/fireoverlay-2x1-5.png b/data/images/creatures/overlays/fireoverlay/fireoverlay-2x1-5.png
new file mode 100644
index 00000000000..ed367372cba
Binary files /dev/null and b/data/images/creatures/overlays/fireoverlay/fireoverlay-2x1-5.png differ
diff --git a/data/images/creatures/overlays/fireoverlay/fireoverlay-2x1-6.png b/data/images/creatures/overlays/fireoverlay/fireoverlay-2x1-6.png
new file mode 100644
index 00000000000..8cebff90e5f
Binary files /dev/null and b/data/images/creatures/overlays/fireoverlay/fireoverlay-2x1-6.png differ
diff --git a/data/images/creatures/overlays/fireoverlay/fireoverlay-2x1-7.png b/data/images/creatures/overlays/fireoverlay/fireoverlay-2x1-7.png
new file mode 100644
index 00000000000..21ed5ca4f33
Binary files /dev/null and b/data/images/creatures/overlays/fireoverlay/fireoverlay-2x1-7.png differ
diff --git a/data/images/creatures/overlays/fireoverlay/fireoverlay-2x1-8.png b/data/images/creatures/overlays/fireoverlay/fireoverlay-2x1-8.png
new file mode 100644
index 00000000000..9977b0c055d
Binary files /dev/null and b/data/images/creatures/overlays/fireoverlay/fireoverlay-2x1-8.png differ
diff --git a/data/images/creatures/overlays/fireoverlay/fireoverlay-2x1-9.png b/data/images/creatures/overlays/fireoverlay/fireoverlay-2x1-9.png
new file mode 100644
index 00000000000..29ecd9c2e3f
Binary files /dev/null and b/data/images/creatures/overlays/fireoverlay/fireoverlay-2x1-9.png differ
diff --git a/data/images/creatures/overlays/fireoverlay/fireoverlay-2x2-0.png b/data/images/creatures/overlays/fireoverlay/fireoverlay-2x2-0.png
new file mode 100644
index 00000000000..9bd8cbe181a
Binary files /dev/null and b/data/images/creatures/overlays/fireoverlay/fireoverlay-2x2-0.png differ
diff --git a/data/images/creatures/overlays/fireoverlay/fireoverlay-2x2-1.png b/data/images/creatures/overlays/fireoverlay/fireoverlay-2x2-1.png
new file mode 100644
index 00000000000..095528d1801
Binary files /dev/null and b/data/images/creatures/overlays/fireoverlay/fireoverlay-2x2-1.png differ
diff --git a/data/images/creatures/overlays/fireoverlay/fireoverlay-2x2-2.png b/data/images/creatures/overlays/fireoverlay/fireoverlay-2x2-2.png
new file mode 100644
index 00000000000..8b7bc0d6cc9
Binary files /dev/null and b/data/images/creatures/overlays/fireoverlay/fireoverlay-2x2-2.png differ
diff --git a/data/images/creatures/overlays/fireoverlay/fireoverlay-2x2-3.png b/data/images/creatures/overlays/fireoverlay/fireoverlay-2x2-3.png
new file mode 100644
index 00000000000..a2bb5c06c02
Binary files /dev/null and b/data/images/creatures/overlays/fireoverlay/fireoverlay-2x2-3.png differ
diff --git a/data/images/creatures/overlays/fireoverlay/fireoverlay-2x2-4.png b/data/images/creatures/overlays/fireoverlay/fireoverlay-2x2-4.png
new file mode 100644
index 00000000000..26ce414dba5
Binary files /dev/null and b/data/images/creatures/overlays/fireoverlay/fireoverlay-2x2-4.png differ
diff --git a/data/images/creatures/overlays/fireoverlay/fireoverlay-2x2-5.png b/data/images/creatures/overlays/fireoverlay/fireoverlay-2x2-5.png
new file mode 100644
index 00000000000..9e97acc6e69
Binary files /dev/null and b/data/images/creatures/overlays/fireoverlay/fireoverlay-2x2-5.png differ
diff --git a/data/images/creatures/overlays/fireoverlay/fireoverlay-2x2-6.png b/data/images/creatures/overlays/fireoverlay/fireoverlay-2x2-6.png
new file mode 100644
index 00000000000..37abefeb610
Binary files /dev/null and b/data/images/creatures/overlays/fireoverlay/fireoverlay-2x2-6.png differ
diff --git a/data/images/creatures/overlays/fireoverlay/fireoverlay-2x2-7.png b/data/images/creatures/overlays/fireoverlay/fireoverlay-2x2-7.png
new file mode 100644
index 00000000000..e345755d88f
Binary files /dev/null and b/data/images/creatures/overlays/fireoverlay/fireoverlay-2x2-7.png differ
diff --git a/data/images/creatures/overlays/fireoverlay/fireoverlay-2x2-8.png b/data/images/creatures/overlays/fireoverlay/fireoverlay-2x2-8.png
new file mode 100644
index 00000000000..dcba6d926ef
Binary files /dev/null and b/data/images/creatures/overlays/fireoverlay/fireoverlay-2x2-8.png differ
diff --git a/data/images/creatures/overlays/fireoverlay/fireoverlay-2x2-9.png b/data/images/creatures/overlays/fireoverlay/fireoverlay-2x2-9.png
new file mode 100644
index 00000000000..90703cccfae
Binary files /dev/null and b/data/images/creatures/overlays/fireoverlay/fireoverlay-2x2-9.png differ
diff --git a/data/images/creatures/overlays/fireoverlay/fireoverlay-3x3-0.png b/data/images/creatures/overlays/fireoverlay/fireoverlay-3x3-0.png
new file mode 100644
index 00000000000..89c0c8110bf
Binary files /dev/null and b/data/images/creatures/overlays/fireoverlay/fireoverlay-3x3-0.png differ
diff --git a/data/images/creatures/overlays/fireoverlay/fireoverlay-3x3-1.png b/data/images/creatures/overlays/fireoverlay/fireoverlay-3x3-1.png
new file mode 100644
index 00000000000..ad09f0d301c
Binary files /dev/null and b/data/images/creatures/overlays/fireoverlay/fireoverlay-3x3-1.png differ
diff --git a/data/images/creatures/overlays/fireoverlay/fireoverlay-3x3-2.png b/data/images/creatures/overlays/fireoverlay/fireoverlay-3x3-2.png
new file mode 100644
index 00000000000..9c18612521a
Binary files /dev/null and b/data/images/creatures/overlays/fireoverlay/fireoverlay-3x3-2.png differ
diff --git a/data/images/creatures/overlays/fireoverlay/fireoverlay-3x3-3.png b/data/images/creatures/overlays/fireoverlay/fireoverlay-3x3-3.png
new file mode 100644
index 00000000000..71d90c5cd3f
Binary files /dev/null and b/data/images/creatures/overlays/fireoverlay/fireoverlay-3x3-3.png differ
diff --git a/data/images/creatures/overlays/fireoverlay/fireoverlay-3x3-4.png b/data/images/creatures/overlays/fireoverlay/fireoverlay-3x3-4.png
new file mode 100644
index 00000000000..611f02c180b
Binary files /dev/null and b/data/images/creatures/overlays/fireoverlay/fireoverlay-3x3-4.png differ
diff --git a/data/images/creatures/overlays/fireoverlay/fireoverlay-3x3-5.png b/data/images/creatures/overlays/fireoverlay/fireoverlay-3x3-5.png
new file mode 100644
index 00000000000..91172438f11
Binary files /dev/null and b/data/images/creatures/overlays/fireoverlay/fireoverlay-3x3-5.png differ
diff --git a/data/images/creatures/overlays/fireoverlay/fireoverlay-3x3-6.png b/data/images/creatures/overlays/fireoverlay/fireoverlay-3x3-6.png
new file mode 100644
index 00000000000..6fcdb647df4
Binary files /dev/null and b/data/images/creatures/overlays/fireoverlay/fireoverlay-3x3-6.png differ
diff --git a/data/images/creatures/overlays/fireoverlay/fireoverlay-3x3-7.png b/data/images/creatures/overlays/fireoverlay/fireoverlay-3x3-7.png
new file mode 100644
index 00000000000..dd9e4c294d1
Binary files /dev/null and b/data/images/creatures/overlays/fireoverlay/fireoverlay-3x3-7.png differ
diff --git a/data/images/creatures/overlays/fireoverlay/fireoverlay-3x3-8.png b/data/images/creatures/overlays/fireoverlay/fireoverlay-3x3-8.png
new file mode 100644
index 00000000000..b78753c4d4a
Binary files /dev/null and b/data/images/creatures/overlays/fireoverlay/fireoverlay-3x3-8.png differ
diff --git a/data/images/creatures/overlays/fireoverlay/fireoverlay-3x3-9.png b/data/images/creatures/overlays/fireoverlay/fireoverlay-3x3-9.png
new file mode 100644
index 00000000000..c3516658393
Binary files /dev/null and b/data/images/creatures/overlays/fireoverlay/fireoverlay-3x3-9.png differ
diff --git a/data/images/creatures/overlays/fireoverlay/fireoverlay.sprite b/data/images/creatures/overlays/fireoverlay/fireoverlay.sprite
new file mode 100644
index 00000000000..5feaac068eb
--- /dev/null
+++ b/data/images/creatures/overlays/fireoverlay/fireoverlay.sprite
@@ -0,0 +1,89 @@
+(supertux-sprite
+  (action
+    (name "default")
+    (loops 1)
+    (fps 1)
+    (hitbox 6 9 45 45)
+    (images "fireoverlay-1x1-1.png"))
+
+  (action
+    (name "1x1")
+    (loops 1)
+    (fps 20)
+    (hitbox 6 9 45 45)
+    (images "fireoverlay-1x1-0.png"
+            "fireoverlay-1x1-1.png"
+            "fireoverlay-1x1-2.png"
+            "fireoverlay-1x1-3.png"
+            "fireoverlay-1x1-4.png"
+			"fireoverlay-1x1-5.png"
+			"fireoverlay-1x1-6.png"
+			"fireoverlay-1x1-7.png"
+			"fireoverlay-1x1-8.png"
+			"fireoverlay-1x1-9.png"))
+
+
+  (action
+    (name "2x1")
+    (loops 1)
+    (fps 20)
+    (hitbox 6 9 64 45)
+    (images "fireoverlay-2x1-0.png"
+            "fireoverlay-2x1-1.png"
+            "fireoverlay-2x1-2.png"
+            "fireoverlay-2x1-3.png"
+            "fireoverlay-2x1-4.png"
+			"fireoverlay-2x1-5.png"
+			"fireoverlay-2x1-6.png"
+			"fireoverlay-2x1-7.png"
+			"fireoverlay-2x1-8.png"
+			"fireoverlay-2x1-9.png"))
+
+  (action
+    (name "1x2")
+    (loops 1)
+    (fps 20)
+    (hitbox 6 9 45 64)
+    (images "fireoverlay-1x2-0.png"
+            "fireoverlay-1x2-1.png"
+            "fireoverlay-1x2-2.png"
+            "fireoverlay-1x2-3.png"
+            "fireoverlay-1x2-4.png"
+			"fireoverlay-1x2-5.png"
+			"fireoverlay-1x2-6.png"
+			"fireoverlay-1x2-7.png"
+			"fireoverlay-1x2-8.png"
+			"fireoverlay-1x2-9.png"))
+
+  (action
+    (name "2x2")
+    (loops 1)
+    (fps 20)
+    (hitbox 6 9 64 64)
+    (images "fireoverlay-2x2-0.png"
+            "fireoverlay-2x2-1.png"
+            "fireoverlay-2x2-2.png"
+            "fireoverlay-2x2-3.png"
+            "fireoverlay-2x2-4.png"
+			"fireoverlay-2x2-5.png"
+			"fireoverlay-2x2-6.png"
+			"fireoverlay-2x2-7.png"
+			"fireoverlay-2x2-8.png"
+			"fireoverlay-2x2-9.png"))
+
+  (action
+    (name "3x3")
+    (loops 1)
+    (fps 20)
+    (hitbox 4 8 96 96)
+    (images "fireoverlay-3x3-0.png"
+            "fireoverlay-3x3-1.png"
+            "fireoverlay-3x3-2.png"
+            "fireoverlay-3x3-3.png"
+            "fireoverlay-3x3-4.png"
+			"fireoverlay-3x3-5.png"
+			"fireoverlay-3x3-6.png"
+			"fireoverlay-3x3-7.png"
+			"fireoverlay-3x3-8.png"
+			"fireoverlay-3x3-9.png"))
+)
diff --git a/data/images/creatures/owl/burning-0.png b/data/images/creatures/owl/burning-0.png
deleted file mode 100644
index 6afd2512d5b..00000000000
Binary files a/data/images/creatures/owl/burning-0.png and /dev/null differ
diff --git a/data/images/creatures/owl/burning-1.png b/data/images/creatures/owl/burning-1.png
deleted file mode 100644
index ad8cf22e994..00000000000
Binary files a/data/images/creatures/owl/burning-1.png and /dev/null differ
diff --git a/data/images/creatures/owl/burning-2.png b/data/images/creatures/owl/burning-2.png
deleted file mode 100644
index 3242b1ba7dd..00000000000
Binary files a/data/images/creatures/owl/burning-2.png and /dev/null differ
diff --git a/data/images/creatures/owl/burning-3.png b/data/images/creatures/owl/burning-3.png
deleted file mode 100644
index 42e03404bbf..00000000000
Binary files a/data/images/creatures/owl/burning-3.png and /dev/null differ
diff --git a/data/images/creatures/owl/burning-4.png b/data/images/creatures/owl/burning-4.png
deleted file mode 100644
index fa1cc7946c9..00000000000
Binary files a/data/images/creatures/owl/burning-4.png and /dev/null differ
diff --git a/data/images/creatures/owl/burning-5.png b/data/images/creatures/owl/burning-5.png
deleted file mode 100644
index 72ba95decc5..00000000000
Binary files a/data/images/creatures/owl/burning-5.png and /dev/null differ
diff --git a/data/images/creatures/owl/burning-6.png b/data/images/creatures/owl/burning-6.png
deleted file mode 100644
index 06c26e2363a..00000000000
Binary files a/data/images/creatures/owl/burning-6.png and /dev/null differ
diff --git a/data/images/creatures/owl/burning-7.png b/data/images/creatures/owl/burning-7.png
deleted file mode 100644
index 1b7d5347909..00000000000
Binary files a/data/images/creatures/owl/burning-7.png and /dev/null differ
diff --git a/data/images/creatures/owl/burning-8.png b/data/images/creatures/owl/burning-8.png
deleted file mode 100644
index d5c605e0877..00000000000
Binary files a/data/images/creatures/owl/burning-8.png and /dev/null differ
diff --git a/data/images/creatures/owl/burning-9.png b/data/images/creatures/owl/burning-9.png
deleted file mode 100644
index 77df7cdb1fd..00000000000
Binary files a/data/images/creatures/owl/burning-9.png and /dev/null differ
diff --git a/data/images/creatures/owl/owl.sprite b/data/images/creatures/owl/owl.sprite
index 0f2b05a7828..5655b006a83 100644
--- a/data/images/creatures/owl/owl.sprite
+++ b/data/images/creatures/owl/owl.sprite
@@ -49,5 +49,15 @@
  (action
   (name "iced-right")
   (hitbox 20 15 64 64)
-  (mirror-action "iced-left"))
+  (mirror-action "iced-left"))
+
+ (action
+  (hitbox 20 15 64 64)
+  (name "burning-left")
+  (clone-action "iced-left"))
+
+ (action
+  (hitbox 20 15 64 64)
+  (name "burning-right")
+  (mirror-action "burning-left"))
 )
diff --git a/data/images/creatures/pumpkin/bumpkin.sprite b/data/images/creatures/pumpkin/bumpkin.sprite
index beb452425ee..af1511a041e 100644
--- a/data/images/creatures/pumpkin/bumpkin.sprite
+++ b/data/images/creatures/pumpkin/bumpkin.sprite
@@ -29,28 +29,7 @@
     (name "squished-right")
     (hitbox 6 15 40 40)
     (mirror-action "squished-left")
-  )
-  (action
-    (name "burning-left")
-    (fps 15)
-    (hitbox 8 44 38 38)
-    (images "burning-0.png"
-            "burning-1.png"
-            "burning-2.png"
-            "burning-3.png"
-            "burning-4.png"
-            "burning-5.png"
-            "burning-6.png"
-            "burning-7.png"
-            "burning-8.png"
-            "burning-9.png"
-   )
-  )
-  (action
-    (name "burning-right")
-    (fps 15)
-    (hitbox 8 44 38 38)
-    (mirror-action "burning-left"))
+  )
 
   (action
     (name "iced-left")
@@ -63,5 +42,15 @@
     (fps 12)
     (hitbox 6 10 45 43)
     (mirror-action "iced-left"))
+
+  (action
+    (hitbox 6 10 45 43)
+    (name "burning-left")
+    (clone-action "iced-left"))
+
+  (action
+    (hitbox 6 10 45 43)
+    (name "burning-right")
+    (mirror-action "burning-left"))
 
 )
diff --git a/data/images/creatures/pumpkin/burning-0.png b/data/images/creatures/pumpkin/burning-0.png
deleted file mode 100644
index 019aa107b3b..00000000000
Binary files a/data/images/creatures/pumpkin/burning-0.png and /dev/null differ
diff --git a/data/images/creatures/pumpkin/burning-1.png b/data/images/creatures/pumpkin/burning-1.png
deleted file mode 100644
index 9d094ef13da..00000000000
Binary files a/data/images/creatures/pumpkin/burning-1.png and /dev/null differ
diff --git a/data/images/creatures/pumpkin/burning-2.png b/data/images/creatures/pumpkin/burning-2.png
deleted file mode 100644
index 55c1c29790e..00000000000
Binary files a/data/images/creatures/pumpkin/burning-2.png and /dev/null differ
diff --git a/data/images/creatures/pumpkin/burning-3.png b/data/images/creatures/pumpkin/burning-3.png
deleted file mode 100644
index 33c68e25a79..00000000000
Binary files a/data/images/creatures/pumpkin/burning-3.png and /dev/null differ
diff --git a/data/images/creatures/pumpkin/burning-4.png b/data/images/creatures/pumpkin/burning-4.png
deleted file mode 100644
index b841a61fd88..00000000000
Binary files a/data/images/creatures/pumpkin/burning-4.png and /dev/null differ
diff --git a/data/images/creatures/pumpkin/burning-5.png b/data/images/creatures/pumpkin/burning-5.png
deleted file mode 100644
index ae334f855d4..00000000000
Binary files a/data/images/creatures/pumpkin/burning-5.png and /dev/null differ
diff --git a/data/images/creatures/pumpkin/burning-6.png b/data/images/creatures/pumpkin/burning-6.png
deleted file mode 100644
index f7a1aaccd2a..00000000000
Binary files a/data/images/creatures/pumpkin/burning-6.png and /dev/null differ
diff --git a/data/images/creatures/pumpkin/burning-7.png b/data/images/creatures/pumpkin/burning-7.png
deleted file mode 100644
index 498c71a209e..00000000000
Binary files a/data/images/creatures/pumpkin/burning-7.png and /dev/null differ
diff --git a/data/images/creatures/pumpkin/burning-8.png b/data/images/creatures/pumpkin/burning-8.png
deleted file mode 100644
index 3e49683167f..00000000000
Binary files a/data/images/creatures/pumpkin/burning-8.png and /dev/null differ
diff --git a/data/images/creatures/pumpkin/burning-9.png b/data/images/creatures/pumpkin/burning-9.png
deleted file mode 100644
index 4cd21d34025..00000000000
Binary files a/data/images/creatures/pumpkin/burning-9.png and /dev/null differ
diff --git a/data/images/creatures/pumpkin/pumpkin.sprite b/data/images/creatures/pumpkin/pumpkin.sprite
index bfa2983aaeb..0e7763c09f4 100644
--- a/data/images/creatures/pumpkin/pumpkin.sprite
+++ b/data/images/creatures/pumpkin/pumpkin.sprite
@@ -29,28 +29,7 @@
     (name "squished-right")
     (hitbox 6 15 40 40)
     (mirror-action "squished-left")
-  )
-  (action
-    (name "burning-left")
-    (fps 15)
-    (hitbox 8 44 38 38)
-    (images "burning-0.png"
-            "burning-1.png"
-            "burning-2.png"
-            "burning-3.png"
-            "burning-4.png"
-            "burning-5.png"
-            "burning-6.png"
-            "burning-7.png"
-            "burning-8.png"
-            "burning-9.png"
-   )
-  )
-  (action
-    (name "burning-right")
-    (fps 15)
-    (hitbox 8 44 38 38)
-    (mirror-action "burning-left"))
+  )
 
   (action
     (name "iced-left")
@@ -62,5 +41,15 @@
     (name "iced-right")
     (fps 12)
     (hitbox 6 10 45 43)
-    (mirror-action "iced-left"))
+    (mirror-action "iced-left"))
+
+  (action
+    (hitbox 6 10 45 43)
+    (name "burning-left")
+    (clone-action "iced-left"))
+
+  (action
+    (hitbox 6 10 45 43)
+    (name "burning-right")
+    (mirror-action "burning-left"))
 )
diff --git a/data/images/creatures/skullyhop/burning-0.png b/data/images/creatures/skullyhop/burning-0.png
deleted file mode 100644
index 53bde4029e1..00000000000
Binary files a/data/images/creatures/skullyhop/burning-0.png and /dev/null differ
diff --git a/data/images/creatures/skullyhop/burning-1.png b/data/images/creatures/skullyhop/burning-1.png
deleted file mode 100644
index 889324b3cc0..00000000000
Binary files a/data/images/creatures/skullyhop/burning-1.png and /dev/null differ
diff --git a/data/images/creatures/skullyhop/burning-2.png b/data/images/creatures/skullyhop/burning-2.png
deleted file mode 100644
index 0458b1485ee..00000000000
Binary files a/data/images/creatures/skullyhop/burning-2.png and /dev/null differ
diff --git a/data/images/creatures/skullyhop/burning-3.png b/data/images/creatures/skullyhop/burning-3.png
deleted file mode 100644
index 2021d8f1f4d..00000000000
Binary files a/data/images/creatures/skullyhop/burning-3.png and /dev/null differ
diff --git a/data/images/creatures/skullyhop/burning-4.png b/data/images/creatures/skullyhop/burning-4.png
deleted file mode 100644
index 01f4534b787..00000000000
Binary files a/data/images/creatures/skullyhop/burning-4.png and /dev/null differ
diff --git a/data/images/creatures/skullyhop/burning-5.png b/data/images/creatures/skullyhop/burning-5.png
deleted file mode 100644
index 2a70c02887e..00000000000
Binary files a/data/images/creatures/skullyhop/burning-5.png and /dev/null differ
diff --git a/data/images/creatures/skullyhop/burning-6.png b/data/images/creatures/skullyhop/burning-6.png
deleted file mode 100644
index badc05e84d1..00000000000
Binary files a/data/images/creatures/skullyhop/burning-6.png and /dev/null differ
diff --git a/data/images/creatures/skullyhop/burning-7.png b/data/images/creatures/skullyhop/burning-7.png
deleted file mode 100644
index 198ad484434..00000000000
Binary files a/data/images/creatures/skullyhop/burning-7.png and /dev/null differ
diff --git a/data/images/creatures/skullyhop/burning-8.png b/data/images/creatures/skullyhop/burning-8.png
deleted file mode 100644
index bba2fe2f04e..00000000000
Binary files a/data/images/creatures/skullyhop/burning-8.png and /dev/null differ
diff --git a/data/images/creatures/skullyhop/burning-9.png b/data/images/creatures/skullyhop/burning-9.png
deleted file mode 100644
index 4bdcce218cc..00000000000
Binary files a/data/images/creatures/skullyhop/burning-9.png and /dev/null differ
diff --git a/data/images/creatures/skullyhop/skullyhop.sprite b/data/images/creatures/skullyhop/skullyhop.sprite
index 88f93eff114..67b13e1fb18 100644
--- a/data/images/creatures/skullyhop/skullyhop.sprite
+++ b/data/images/creatures/skullyhop/skullyhop.sprite
@@ -46,7 +46,7 @@
 	  (fps 20)
 	  (mirror-action "jumping-left"))
 	
-    (action
+  (action
 	  (name "iced-left")
 	  (hitbox 9 8 32 38)
 	  (images "stand-0.png"))
@@ -54,7 +54,17 @@
 	(action
 	  (name "iced-right")
 	  (hitbox 9 8 32 38)
-	  (mirror-action "iced-left"))
+	  (mirror-action "iced-left"))
+
+  (action
+    (hitbox 9 8 32 38)
+    (name "burning-left")
+    (clone-action "iced-left"))
+
+  (action
+    (hitbox 9 8 32 38)
+    (name "burning-right")
+    (mirror-action "burning-left"))
 	
 	(action
 	  (name "squished-left")
@@ -66,23 +76,4 @@
 	  (hitbox 9 8 32 38)
 	  (mirror-action "squished-left"))
 	
-	(action
-	  (name "burning-left")
-	  (fps 20)
-	  (hitbox 9 8 32 38)
-	  (images "burning-0.png"
-            "burning-1.png"
-            "burning-2.png"
-            "burning-3.png"
-            "burning-4.png"
-            "burning-5.png"
-            "burning-6.png"
-            "burning-7.png"
-            "burning-8.png"
-            "burning-9.png"))
-	(action
-	  (name "burning-right")
-	  (fps 20)
-	  (hitbox 9 8 32 38)
-	  (mirror-action "burning-left"))
 )
diff --git a/data/images/creatures/snail/burning-0.png b/data/images/creatures/snail/burning-0.png
deleted file mode 100644
index fd86a1cf320..00000000000
Binary files a/data/images/creatures/snail/burning-0.png and /dev/null differ
diff --git a/data/images/creatures/snail/burning-1.png b/data/images/creatures/snail/burning-1.png
deleted file mode 100644
index e1ae12f8df3..00000000000
Binary files a/data/images/creatures/snail/burning-1.png and /dev/null differ
diff --git a/data/images/creatures/snail/burning-2.png b/data/images/creatures/snail/burning-2.png
deleted file mode 100644
index 4d2cb04616f..00000000000
Binary files a/data/images/creatures/snail/burning-2.png and /dev/null differ
diff --git a/data/images/creatures/snail/burning-3.png b/data/images/creatures/snail/burning-3.png
deleted file mode 100644
index fcd65213509..00000000000
Binary files a/data/images/creatures/snail/burning-3.png and /dev/null differ
diff --git a/data/images/creatures/snail/burning-4.png b/data/images/creatures/snail/burning-4.png
deleted file mode 100644
index acc95ac425d..00000000000
Binary files a/data/images/creatures/snail/burning-4.png and /dev/null differ
diff --git a/data/images/creatures/snail/burning-5.png b/data/images/creatures/snail/burning-5.png
deleted file mode 100644
index 588ccf61deb..00000000000
Binary files a/data/images/creatures/snail/burning-5.png and /dev/null differ
diff --git a/data/images/creatures/snail/burning-6.png b/data/images/creatures/snail/burning-6.png
deleted file mode 100644
index 1dd28a987fd..00000000000
Binary files a/data/images/creatures/snail/burning-6.png and /dev/null differ
diff --git a/data/images/creatures/snail/burning-7.png b/data/images/creatures/snail/burning-7.png
deleted file mode 100644
index 80ba5fc7b97..00000000000
Binary files a/data/images/creatures/snail/burning-7.png and /dev/null differ
diff --git a/data/images/creatures/snail/burning-8.png b/data/images/creatures/snail/burning-8.png
deleted file mode 100644
index 55675dbdd06..00000000000
Binary files a/data/images/creatures/snail/burning-8.png and /dev/null differ
diff --git a/data/images/creatures/snail/corrupted/corrupted_snail.sprite b/data/images/creatures/snail/corrupted/corrupted_snail.sprite
index db86c9f6735..512b18babcd 100644
--- a/data/images/creatures/snail/corrupted/corrupted_snail.sprite
+++ b/data/images/creatures/snail/corrupted/corrupted_snail.sprite
@@ -48,28 +48,19 @@
 	  (name "iced-right")
 	  (hitbox -1 2 45 43)
 	  (mirror-action "iced-left")
-	)
-	
-	(action
-	  (name "burning-left")
-	  (hitbox 2 35 31.8 31.8)
-	  (fps 15)
-	  (images "../burning-0.png"
-            "../burning-1.png"
-            "../burning-2.png"
-            "../burning-3.png"
-            "../burning-4.png"
-            "../burning-5.png"
-            "../burning-6.png"
-            "../burning-7.png"
-            "../burning-8.png")
-	)
-	(action
-	  (name "burning-right")
-	  (hitbox 2 35 31.8 31.8)
-	  (fps 15)
-	  (mirror-action "burning-left")
-	)
+	)
+
+  (action
+    (hitbox -1 2 45 43)
+    (name "burning-left")
+    (clone-action "iced-left")
+  )
+
+  (action
+    (hitbox -1 2 45 43)
+    (name "burning-right")
+    (mirror-action "burning-left")
+  )
 	
 	(action
 	  (name "waking-left")
diff --git a/data/images/creatures/snail/snail.sprite b/data/images/creatures/snail/snail.sprite
index 1cabb8a5386..7ea79a8aeff 100644
--- a/data/images/creatures/snail/snail.sprite
+++ b/data/images/creatures/snail/snail.sprite
@@ -48,27 +48,19 @@
 	  (name "iced-right")
 	  (hitbox -1 2 45 43)
 	  (mirror-action "iced-left")
-	)
-	(action
-	  (name "burning-left")
-	  (hitbox 2 35 31.8 31.8)
-	  (fps 15)
-	  (images "burning-0.png"
-            "burning-1.png"
-            "burning-2.png"
-            "burning-3.png"
-            "burning-4.png"
-            "burning-5.png"
-            "burning-6.png"
-            "burning-7.png"
-            "burning-8.png")
-	)
-	(action
-	  (name "burning-right")
-	  (hitbox 2 35 31.8 31.8)
-	  (fps 15)
-	  (mirror-action "burning-left")
-	)
+	)
+
+  (action
+    (hitbox -1 2 45 43)
+    (name "burning-left")
+    (clone-action "iced-left")
+  )
+
+  (action
+    (hitbox -1 2 45 43)
+    (name "burning-right")
+    (mirror-action "burning-left")
+  )
 	
 	(action
 	  (name "waking-left")
diff --git a/data/images/creatures/vicious_ivy/burning-0.png b/data/images/creatures/vicious_ivy/burning-0.png
deleted file mode 100644
index aed0390a73c..00000000000
Binary files a/data/images/creatures/vicious_ivy/burning-0.png and /dev/null differ
diff --git a/data/images/creatures/vicious_ivy/burning-1.png b/data/images/creatures/vicious_ivy/burning-1.png
deleted file mode 100644
index 3a51b520395..00000000000
Binary files a/data/images/creatures/vicious_ivy/burning-1.png and /dev/null differ
diff --git a/data/images/creatures/vicious_ivy/burning-2.png b/data/images/creatures/vicious_ivy/burning-2.png
deleted file mode 100644
index 64e7c9a4939..00000000000
Binary files a/data/images/creatures/vicious_ivy/burning-2.png and /dev/null differ
diff --git a/data/images/creatures/vicious_ivy/burning-3.png b/data/images/creatures/vicious_ivy/burning-3.png
deleted file mode 100644
index 1e022c3f9aa..00000000000
Binary files a/data/images/creatures/vicious_ivy/burning-3.png and /dev/null differ
diff --git a/data/images/creatures/vicious_ivy/burning-4.png b/data/images/creatures/vicious_ivy/burning-4.png
deleted file mode 100644
index 0de1f981f63..00000000000
Binary files a/data/images/creatures/vicious_ivy/burning-4.png and /dev/null differ
diff --git a/data/images/creatures/vicious_ivy/burning-5.png b/data/images/creatures/vicious_ivy/burning-5.png
deleted file mode 100644
index e875a26a1ab..00000000000
Binary files a/data/images/creatures/vicious_ivy/burning-5.png and /dev/null differ
diff --git a/data/images/creatures/vicious_ivy/burning-6.png b/data/images/creatures/vicious_ivy/burning-6.png
deleted file mode 100644
index 7e5b934e41f..00000000000
Binary files a/data/images/creatures/vicious_ivy/burning-6.png and /dev/null differ
diff --git a/data/images/creatures/vicious_ivy/burning-7.png b/data/images/creatures/vicious_ivy/burning-7.png
deleted file mode 100644
index 92164bdfb0e..00000000000
Binary files a/data/images/creatures/vicious_ivy/burning-7.png and /dev/null differ
diff --git a/data/images/creatures/vicious_ivy/burning-8.png b/data/images/creatures/vicious_ivy/burning-8.png
deleted file mode 100644
index b678ba83dbc..00000000000
Binary files a/data/images/creatures/vicious_ivy/burning-8.png and /dev/null differ
diff --git a/data/images/creatures/vicious_ivy/burning-9.png b/data/images/creatures/vicious_ivy/burning-9.png
deleted file mode 100644
index f1dbf0481e1..00000000000
Binary files a/data/images/creatures/vicious_ivy/burning-9.png and /dev/null differ
diff --git a/data/images/creatures/vicious_ivy/corrupted/rotten_ivy.sprite b/data/images/creatures/vicious_ivy/corrupted/rotten_ivy.sprite
index e187f3f916e..0da0381941b 100644
--- a/data/images/creatures/vicious_ivy/corrupted/rotten_ivy.sprite
+++ b/data/images/creatures/vicious_ivy/corrupted/rotten_ivy.sprite
@@ -64,27 +64,17 @@
   (name "squished-right")
   (hitbox 19 12 32 32)
   (mirror-action "squished-left")
- )
-
+ )
+
  (action
-  (name "burning-left")
-  (hitbox 9 12 32 32)
-  (fps 15)
-  (images "../burning-0.png"
-		  "../burning-1.png"
-		  "../burning-2.png"
-		  "../burning-3.png"
-		  "../burning-4.png"
-		  "../burning-5.png"
-		  "../burning-6.png"
-		  "../burning-7.png"
-		  "../burning-8.png"
-		  "../burning-9.png"))
-
+    (hitbox 3 6 64 43)
+    (name "burning-left")
+    (clone-action "iced-left")
+ )
  (action
-  (name "burning-right")
-  (hitbox 9 12 32 32)
-  (mirror-action "burning-left")
+    (hitbox 3 6 64 43)
+    (name "burning-right")
+    (mirror-action "burning-left")
  )
 
 ; Cutscenes And Extras
diff --git a/data/images/creatures/vicious_ivy/vicious_ivy.sprite b/data/images/creatures/vicious_ivy/vicious_ivy.sprite
index 95cdaff5d83..422268cf89f 100644
--- a/data/images/creatures/vicious_ivy/vicious_ivy.sprite
+++ b/data/images/creatures/vicious_ivy/vicious_ivy.sprite
@@ -65,25 +65,14 @@
   (hitbox 19 12 32 32)
   (mirror-action "squished-left")
  )
-
  (action
-  (name "burning-left")
-  (hitbox 9 12 32 32)
-  (fps 15)
-  (images "burning-0.png"
-		  "burning-1.png"
-		  "burning-2.png"
-		  "burning-3.png"
-		  "burning-4.png"
-		  "burning-5.png"
-		  "burning-6.png"
-		  "burning-7.png"
-		  "burning-8.png"
-		  "burning-9.png"))
-
+    (hitbox 3 6 64 43)
+    (name "burning-left")
+    (clone-action "iced-left")
+ )
  (action
-  (name "burning-right")
-  (hitbox 9 12 32 32)
-  (mirror-action "burning-left")
+    (hitbox 3 6 64 43)
+    (name "burning-right")
+    (mirror-action "burning-left")
  )
 )
diff --git a/data/images/creatures/walkingleaf/burning-0.png b/data/images/creatures/walkingleaf/burning-0.png
deleted file mode 100644
index 82d1e172fcc..00000000000
Binary files a/data/images/creatures/walkingleaf/burning-0.png and /dev/null differ
diff --git a/data/images/creatures/walkingleaf/burning-1.png b/data/images/creatures/walkingleaf/burning-1.png
deleted file mode 100644
index 8b1bd10fb52..00000000000
Binary files a/data/images/creatures/walkingleaf/burning-1.png and /dev/null differ
diff --git a/data/images/creatures/walkingleaf/burning-2.png b/data/images/creatures/walkingleaf/burning-2.png
deleted file mode 100644
index 4a7f2ebade2..00000000000
Binary files a/data/images/creatures/walkingleaf/burning-2.png and /dev/null differ
diff --git a/data/images/creatures/walkingleaf/burning-3.png b/data/images/creatures/walkingleaf/burning-3.png
deleted file mode 100644
index 1d501306ffe..00000000000
Binary files a/data/images/creatures/walkingleaf/burning-3.png and /dev/null differ
diff --git a/data/images/creatures/walkingleaf/burning-4.png b/data/images/creatures/walkingleaf/burning-4.png
deleted file mode 100644
index 09b97c46c26..00000000000
Binary files a/data/images/creatures/walkingleaf/burning-4.png and /dev/null differ
diff --git a/data/images/creatures/walkingleaf/burning-5.png b/data/images/creatures/walkingleaf/burning-5.png
deleted file mode 100644
index 9ac76e6cc98..00000000000
Binary files a/data/images/creatures/walkingleaf/burning-5.png and /dev/null differ
diff --git a/data/images/creatures/walkingleaf/burning-6.png b/data/images/creatures/walkingleaf/burning-6.png
deleted file mode 100644
index 6b3500c7164..00000000000
Binary files a/data/images/creatures/walkingleaf/burning-6.png and /dev/null differ
diff --git a/data/images/creatures/walkingleaf/burning-7.png b/data/images/creatures/walkingleaf/burning-7.png
deleted file mode 100644
index c561899a992..00000000000
Binary files a/data/images/creatures/walkingleaf/burning-7.png and /dev/null differ
diff --git a/data/images/creatures/walkingleaf/burning-8.png b/data/images/creatures/walkingleaf/burning-8.png
deleted file mode 100644
index febe7ac9c99..00000000000
Binary files a/data/images/creatures/walkingleaf/burning-8.png and /dev/null differ
diff --git a/data/images/creatures/walkingleaf/burning-9.png b/data/images/creatures/walkingleaf/burning-9.png
deleted file mode 100644
index ce282b06a74..00000000000
Binary files a/data/images/creatures/walkingleaf/burning-9.png and /dev/null differ
diff --git a/data/images/creatures/walkingleaf/corrupted/rotten_leaf.sprite b/data/images/creatures/walkingleaf/corrupted/rotten_leaf.sprite
index 55dfb6b812b..d7e416b4c4a 100644
--- a/data/images/creatures/walkingleaf/corrupted/rotten_leaf.sprite
+++ b/data/images/creatures/walkingleaf/corrupted/rotten_leaf.sprite
@@ -65,25 +65,14 @@
   (hitbox 19 12 32 32)
   (mirror-action "squished-left")
  )
-
  (action
+  (hitbox 3 6 64 43)
   (name "burning-left")
-  (hitbox 9 12 32 32)
-  (fps 15)
-  (images "../burning-0.png"
-		  "../burning-1.png"
-		  "../burning-2.png"
-		  "../burning-3.png"
-		  "../burning-4.png"
-		  "../burning-5.png"
-		  "../burning-6.png"
-		  "../burning-7.png"
-		  "../burning-8.png"
-		  "../burning-9.png"))
-
+  (clone-action "iced-left")
+  )
  (action
+  (hitbox 3 6 64 43)
   (name "burning-right")
-  (hitbox 9 12 32 32)
   (mirror-action "burning-left")
  )
 )
diff --git a/data/images/creatures/walkingleaf/walkingleaf.sprite b/data/images/creatures/walkingleaf/walkingleaf.sprite
index 59b13b125e3..a80f7a834cf 100644
--- a/data/images/creatures/walkingleaf/walkingleaf.sprite
+++ b/data/images/creatures/walkingleaf/walkingleaf.sprite
@@ -51,6 +51,18 @@
   (name "iced-right")
   (hitbox 3 6 64 43)
   (mirror-action "iced-left")
+ )
+
+ (action
+  (hitbox 3 6 64 43)
+  (name "burning-left")
+  (clone-action "iced-left")
+  )
+
+ (action
+  (hitbox 3 6 64 43)
+  (name "burning-right")
+  (mirror-action "burning-left")
  )
  
  (action
@@ -58,7 +70,6 @@
   (hitbox 9 12 32 32)
   (images "squished.png")
  )
-
  
  (action
   (name "squished-right")
@@ -66,24 +77,4 @@
   (mirror-action "squished-left")
  )
 
- (action
-  (name "burning-left")
-  (hitbox 9 12 32 32)
-  (fps 15)
-  (images "burning-0.png"
-		  "burning-1.png"
-		  "burning-2.png"
-		  "burning-3.png"
-		  "burning-4.png"
-		  "burning-5.png"
-		  "burning-6.png"
-		  "burning-7.png"
-		  "burning-8.png"
-		  "burning-9.png"))
-
- (action
-  (name "burning-right")
-  (hitbox 9 12 32 32)
-  (mirror-action "burning-left")
- )
 )
diff --git a/data/images/creatures/zeekling/burning-0.png b/data/images/creatures/zeekling/burning-0.png
deleted file mode 100644
index 9b3f8ae5098..00000000000
Binary files a/data/images/creatures/zeekling/burning-0.png and /dev/null differ
diff --git a/data/images/creatures/zeekling/burning-1.png b/data/images/creatures/zeekling/burning-1.png
deleted file mode 100644
index c32738296f8..00000000000
Binary files a/data/images/creatures/zeekling/burning-1.png and /dev/null differ
diff --git a/data/images/creatures/zeekling/burning-2.png b/data/images/creatures/zeekling/burning-2.png
deleted file mode 100644
index 04b687719a5..00000000000
Binary files a/data/images/creatures/zeekling/burning-2.png and /dev/null differ
diff --git a/data/images/creatures/zeekling/burning-3.png b/data/images/creatures/zeekling/burning-3.png
deleted file mode 100644
index 91c359c7028..00000000000
Binary files a/data/images/creatures/zeekling/burning-3.png and /dev/null differ
diff --git a/data/images/creatures/zeekling/burning-4.png b/data/images/creatures/zeekling/burning-4.png
deleted file mode 100644
index c88ca2e444c..00000000000
Binary files a/data/images/creatures/zeekling/burning-4.png and /dev/null differ
diff --git a/data/images/creatures/zeekling/burning-5.png b/data/images/creatures/zeekling/burning-5.png
deleted file mode 100644
index fbb8e8fd5f0..00000000000
Binary files a/data/images/creatures/zeekling/burning-5.png and /dev/null differ
diff --git a/data/images/creatures/zeekling/burning-6.png b/data/images/creatures/zeekling/burning-6.png
deleted file mode 100644
index e5114e9cb8c..00000000000
Binary files a/data/images/creatures/zeekling/burning-6.png and /dev/null differ
diff --git a/data/images/creatures/zeekling/burning-7.png b/data/images/creatures/zeekling/burning-7.png
deleted file mode 100644
index 45b1d975210..00000000000
Binary files a/data/images/creatures/zeekling/burning-7.png and /dev/null differ
diff --git a/data/images/creatures/zeekling/zeekling.sprite b/data/images/creatures/zeekling/zeekling.sprite
index 4a8bd9edef3..d61eb26a000 100644
--- a/data/images/creatures/zeekling/zeekling.sprite
+++ b/data/images/creatures/zeekling/zeekling.sprite
@@ -11,7 +11,8 @@
 		  "zeekling-5.png"
 		  "zeekling-6.png"
 		  "zeekling-7.png")
- )
+ )
+
  (action
   (name "right")
   (hitbox 36 25 44 34)
@@ -29,7 +30,8 @@
 		  "charge-2.png"
 		  "charge-3.png"
 		  "charge-4.png")
- )
+ )
+
  (action
   (name "charge-right")
   (hitbox 36 42 44 34)
@@ -50,7 +52,8 @@
 		  "dive-4.png"
 		  "dive-5.png"
 		  "dive-6.png")
- )
+ )
+
  (action
   (name "dive-right")
   (hitbox 36 42 44 34)
@@ -68,7 +71,8 @@
 		  "recover-1.png"
 		  "recover-2.png"
 		  "recover-3.png")
- )
+ )
+
  (action
   (name "recover-right")
   (hitbox 36 42 44 34)
@@ -81,42 +85,37 @@
   (name "squished-left")
   (hitbox 12 25 44 34)
   (images "squished.png")
- )
+ )
+
  (action
   (name "squished-right")
   (hitbox 36 25 44 34)
   (mirror-action "squished-left")
  )
  
-  (action
+ (action
   (name "iced-left")
   (hitbox 9 42 64 43)
   (images "charge-4.png")
- )
+ )
+
  (action
   (name "iced-right")
   (hitbox 18 42 64 43)
   (mirror-action "iced-left")
- )
- 
+ )
+
  (action
+  (hitbox 9 42 64 43)
   (name "burning-left")
-  (hitbox 12 25 44 34)
-  (fps 15)
-  (images "burning-0.png"
-		  "burning-1.png"
-		  "burning-2.png"
-		  "burning-3.png"
-		  "burning-4.png"
-		  "burning-5.png"
-		  "burning-6.png"
-		  "burning-7.png")
- )
- (action
+  (clone-action "iced-left")
+ )
+
+  (action
+  (hitbox 18 42 64 43)
   (name "burning-right")
-  (hitbox 36 25 44 34)
-  (fps 15)
   (mirror-action "burning-left")
  )
+ 
 )
 
diff --git a/src/badguy/badguy.cpp b/src/badguy/badguy.cpp
index 3c69ecf2798..27671f5b81e 100644
--- a/src/badguy/badguy.cpp
+++ b/src/badguy/badguy.cpp
@@ -46,13 +46,15 @@ static const float X_OFFSCREEN_DISTANCE = 1280;
 static const float Y_OFFSCREEN_DISTANCE = 800;
 
 BadGuy::BadGuy(const Vector& pos, const std::string& sprite_name, int layer,
-               const std::string& light_sprite_name, const std::string& ice_sprite_name) :
+               const std::string& light_sprite_name, const std::string& ice_sprite_name,
+               const std::string& fire_sprite_name) :
   BadGuy(pos, Direction::LEFT, sprite_name, layer, light_sprite_name)
 {
 }
 
 BadGuy::BadGuy(const Vector& pos, Direction direction, const std::string& sprite_name, int layer,
-               const std::string& light_sprite_name, const std::string& ice_sprite_name) :
+               const std::string& light_sprite_name, const std::string& ice_sprite_name,
+               const std::string& fire_sprite_name) :
   MovingSprite(pos, sprite_name, layer, COLGROUP_DISABLED),
   m_physic(),
   m_countMe(true),
@@ -67,6 +69,7 @@ BadGuy::BadGuy(const Vector& pos, Direction direction, const std::string& sprite
   m_melting_time(0),
   m_lightsprite(SpriteManager::current()->create(light_sprite_name)),
   m_freezesprite(SpriteManager::current()->create(ice_sprite_name)),
+  m_firesprite(SpriteManager::current()->create(fire_sprite_name)),
   m_glowing(false),
   m_water_affected(true),
   m_unfreeze_timer(),
@@ -75,7 +78,9 @@ BadGuy::BadGuy(const Vector& pos, Direction direction, const std::string& sprite
   m_state_timer(),
   m_on_ground_flag(false),
   m_floor_normal(0.0f, 0.0f),
-  m_colgroup_active(COLGROUP_MOVING)
+  m_colgroup_active(COLGROUP_MOVING),
+  m_flame_color(1.f, 0.5f, 0.2f, 1.f),
+  m_flame_timer()
 {
   SoundManager::current()->preload("sounds/squish.wav");
   SoundManager::current()->preload("sounds/fall.wav");
@@ -85,17 +90,21 @@ BadGuy::BadGuy(const Vector& pos, Direction direction, const std::string& sprite
 
   m_dir = (m_start_dir == Direction::AUTO) ? Direction::LEFT : m_start_dir;
   m_lightsprite->set_blend(Blend::ADD);
+  m_lightsprite->set_color(m_flame_color);
 }
 
 BadGuy::BadGuy(const ReaderMapping& reader, const std::string& sprite_name, int layer,
-               const std::string& light_sprite_name, const std::string& ice_sprite_name) :
-  BadGuy(reader, sprite_name, Direction::AUTO, layer, light_sprite_name, ice_sprite_name)
+               const std::string& light_sprite_name, const std::string& ice_sprite_name,
+               const std::string& fire_sprite_name) :
+  BadGuy(reader, sprite_name, Direction::AUTO, layer, light_sprite_name, ice_sprite_name,
+         fire_sprite_name)
 {
 }
 
 BadGuy::BadGuy(const ReaderMapping& reader, const std::string& sprite_name,
                Direction default_direction, int layer,
-               const std::string& light_sprite_name, const std::string& ice_sprite_name) :
+               const std::string& light_sprite_name, const std::string& ice_sprite_name,
+               const std::string& fire_sprite_name) :
   MovingSprite(reader, sprite_name, layer, COLGROUP_DISABLED),
   m_physic(),
   m_countMe(true),
@@ -110,6 +119,7 @@ BadGuy::BadGuy(const ReaderMapping& reader, const std::string& sprite_name,
   m_melting_time(0),
   m_lightsprite(SpriteManager::current()->create(light_sprite_name)),
   m_freezesprite(SpriteManager::current()->create(ice_sprite_name)),
+  m_firesprite(SpriteManager::current()->create(fire_sprite_name)),
   m_glowing(false),
   m_water_affected(true),
   m_unfreeze_timer(),
@@ -118,7 +128,9 @@ BadGuy::BadGuy(const ReaderMapping& reader, const std::string& sprite_name,
   m_state_timer(),
   m_on_ground_flag(false),
   m_floor_normal(0.0f, 0.0f),
-  m_colgroup_active(COLGROUP_MOVING)
+  m_colgroup_active(COLGROUP_MOVING),
+  m_flame_color(1.f, 0.5f, 0.2f, 1.f),
+  m_flame_timer()
 {
   std::string dir_str;
   if (reader.get("direction", dir_str))
@@ -135,6 +147,7 @@ BadGuy::BadGuy(const ReaderMapping& reader, const std::string& sprite_name,
 
   m_dir = (m_start_dir == Direction::AUTO) ? Direction::LEFT : m_start_dir;
   m_lightsprite->set_blend(Blend::ADD);
+  m_lightsprite->set_color(m_flame_color);
 }
 
 void
@@ -170,11 +183,24 @@ BadGuy::draw(DrawingContext& context)
       }
       else
       {
-        if (m_frozen && is_portable())
+        if (m_frozen && is_portable()) {
           m_freezesprite->draw(context.color(), draw_pos, m_layer);
+        }
+
+        if (m_state != STATE_BURNING || m_firesprite->get_current_frame() < 5)
         m_sprite->draw(context.color(), draw_pos, m_layer - (m_frozen ? 1 : 0), m_flip);
       }
 
+      if (m_state == STATE_BURNING) {
+        // draw the flame sprite
+        m_firesprite->draw(context.color(), draw_pos, m_layer);
+        m_firesprite->set_action(get_overlay_size(), 1);
+      }
+      else {
+        m_firesprite->set_frame(0);
+        m_firesprite->pause_animation();
+      }
+
       if (m_glowing)
       {
         m_lightsprite->draw(context.light(), m_col.m_bbox.get_middle() + draw_offset, 0);
@@ -302,8 +328,24 @@ BadGuy::update(float dt_sec)
 
     case STATE_BURNING: {
       m_is_active_flag = false;
+      // char the enemy
+      m_sprite->set_color(Color(std::max(m_sprite->get_color().red - (5.f * dt_sec), 0.f),
+                                std::max(m_sprite->get_color().green - (5.f * dt_sec), 0.f),
+                                std::max(m_sprite->get_color().blue - (5.f * dt_sec), 0.f),
+                                m_sprite->get_alpha()));
+
+      if (!m_flame_timer.started()) {
+        m_lightsprite->set_alpha(std::min(m_lightsprite->get_alpha() + (10.f * dt_sec), 1.f));
+        if (m_lightsprite->get_alpha() >= 1.f) {
+          m_flame_timer.start(1.5f);
+        }
+      }
+      else {
+        m_lightsprite->set_alpha(std::max(0.f, 1 - m_flame_timer.get_progress()));
+      }
+
       m_col.set_movement(m_physic.get_movement(dt_sec));
-      if ( m_sprite->animation_done() ) {
+      if (m_firesprite->animation_done() && m_flame_timer.check()) {
         remove_me();
       }
     } break;
@@ -1094,7 +1136,10 @@ BadGuy::ignite()
     m_glowing = true;
     SoundManager::current()->play("sounds/fire.ogg", get_pos());
     set_action("burning", m_dir, 1);
+    m_lightsprite->set_alpha(0.05f);
     set_state(STATE_BURNING);
+    //m_firesprite->set_action(get_overlay_size(), 1);
+    //m_firesprite->set_frame(0);
     run_dead_script();
   } else if (m_sprite->has_action("inside-melting-left")) {
     // melt it inside!
diff --git a/src/badguy/badguy.hpp b/src/badguy/badguy.hpp
index ca3578e0e24..aa496997f96 100644
--- a/src/badguy/badguy.hpp
+++ b/src/badguy/badguy.hpp
@@ -44,16 +44,20 @@ class BadGuy : public MovingSprite,
 public:
   BadGuy(const Vector& pos, const std::string& sprite_name, int layer = LAYER_OBJECTS,
          const std::string& light_sprite_name = "images/objects/lightmap_light/lightmap_light-medium.sprite",
-         const std::string& ice_sprite_name = "images/creatures/overlays/iceoverlay/iceoverlay.sprite");
+         const std::string& ice_sprite_name = "images/creatures/overlays/iceoverlay/iceoverlay.sprite",
+         const std::string& fire_sprite_name = "images/creatures/overlays/fireoverlay/fireoverlay.sprite");
   BadGuy(const Vector& pos, Direction direction, const std::string& sprite_name, int layer = LAYER_OBJECTS,
          const std::string& light_sprite_name = "images/objects/lightmap_light/lightmap_light-medium.sprite",
-         const std::string& ice_sprite_name = "images/creatures/overlays/iceoverlay/iceoverlay.sprite");
+         const std::string& ice_sprite_name = "images/creatures/overlays/iceoverlay/iceoverlay.sprite",
+         const std::string& fire_sprite_name = "images/creatures/overlays/fireoverlay/fireoverlay.sprite");
   BadGuy(const ReaderMapping& reader, const std::string& sprite_name, int layer = LAYER_OBJECTS,
          const std::string& light_sprite_name = "images/objects/lightmap_light/lightmap_light-medium.sprite",
-         const std::string& ice_sprite_name = "images/creatures/overlays/iceoverlay/iceoverlay.sprite");
+         const std::string& ice_sprite_name = "images/creatures/overlays/iceoverlay/iceoverlay.sprite",
+         const std::string& fire_sprite_name = "images/creatures/overlays/fireoverlay/fireoverlay.sprite");
   BadGuy(const ReaderMapping& reader, const std::string& sprite_name, Direction default_direction, int layer = LAYER_OBJECTS,
          const std::string& light_sprite_name = "images/objects/lightmap_light/lightmap_light-medium.sprite",
-         const std::string& ice_sprite_name = "images/creatures/overlays/iceoverlay/iceoverlay.sprite");
+         const std::string& ice_sprite_name = "images/creatures/overlays/iceoverlay/iceoverlay.sprite",
+         const std::string & fire_sprite_name = "images/creatures/overlays/fireoverlay/fireoverlay.sprite");
 
   /** Called when the badguy is drawn. The default implementation
       simply draws the badguy sprite on screen */
@@ -289,6 +293,7 @@ class BadGuy : public MovingSprite,
 
   SpritePtr m_lightsprite;
   SpritePtr m_freezesprite;
+  SpritePtr m_firesprite;
   bool m_glowing;
   bool m_water_affected;
 
@@ -314,6 +319,9 @@ class BadGuy : public MovingSprite,
   /** CollisionGroup the badguy should be in while active */
   CollisionGroup m_colgroup_active;
 
+  Color m_flame_color;
+  Timer m_flame_timer;
+
 private:
   BadGuy(const BadGuy&) = delete;
   BadGuy& operator=(const BadGuy&) = delete;