diff --git a/data/images/creatures/crystallo/crystallo-editor.png b/data/images/creatures/crystallo/crystallo-editor.png
deleted file mode 100644
index c20cb9070c1..00000000000
Binary files a/data/images/creatures/crystallo/crystallo-editor.png and /dev/null differ
diff --git a/data/images/creatures/crystallo/crystallo-fall-0.png b/data/images/creatures/crystallo/crystallo-fall-0.png
deleted file mode 100644
index 8b128cb71a0..00000000000
Binary files a/data/images/creatures/crystallo/crystallo-fall-0.png and /dev/null differ
diff --git a/data/images/creatures/crystallo/crystallo-fall-1.png b/data/images/creatures/crystallo/crystallo-fall-1.png
deleted file mode 100644
index 0621b6a2d31..00000000000
Binary files a/data/images/creatures/crystallo/crystallo-fall-1.png and /dev/null differ
diff --git a/data/images/creatures/crystallo/crystallo-fall-10.png b/data/images/creatures/crystallo/crystallo-fall-10.png
deleted file mode 100644
index 9d43eb9a340..00000000000
Binary files a/data/images/creatures/crystallo/crystallo-fall-10.png and /dev/null differ
diff --git a/data/images/creatures/crystallo/crystallo-fall-2.png b/data/images/creatures/crystallo/crystallo-fall-2.png
deleted file mode 100644
index 26f5ad2d5d6..00000000000
Binary files a/data/images/creatures/crystallo/crystallo-fall-2.png and /dev/null differ
diff --git a/data/images/creatures/crystallo/crystallo-fall-3.png b/data/images/creatures/crystallo/crystallo-fall-3.png
deleted file mode 100644
index a9bc5dd9b7f..00000000000
Binary files a/data/images/creatures/crystallo/crystallo-fall-3.png and /dev/null differ
diff --git a/data/images/creatures/crystallo/crystallo-fall-4.png b/data/images/creatures/crystallo/crystallo-fall-4.png
deleted file mode 100644
index 14e7816f845..00000000000
Binary files a/data/images/creatures/crystallo/crystallo-fall-4.png and /dev/null differ
diff --git a/data/images/creatures/crystallo/crystallo-fall-5.png b/data/images/creatures/crystallo/crystallo-fall-5.png
deleted file mode 100644
index afd2e4eff34..00000000000
Binary files a/data/images/creatures/crystallo/crystallo-fall-5.png and /dev/null differ
diff --git a/data/images/creatures/crystallo/crystallo-fall-6.png b/data/images/creatures/crystallo/crystallo-fall-6.png
deleted file mode 100644
index 94a98e7ebce..00000000000
Binary files a/data/images/creatures/crystallo/crystallo-fall-6.png and /dev/null differ
diff --git a/data/images/creatures/crystallo/crystallo-fall-7.png b/data/images/creatures/crystallo/crystallo-fall-7.png
deleted file mode 100644
index 9eff7ea9ac3..00000000000
Binary files a/data/images/creatures/crystallo/crystallo-fall-7.png and /dev/null differ
diff --git a/data/images/creatures/crystallo/crystallo-fall-8.png b/data/images/creatures/crystallo/crystallo-fall-8.png
deleted file mode 100644
index 40191a17b91..00000000000
Binary files a/data/images/creatures/crystallo/crystallo-fall-8.png and /dev/null differ
diff --git a/data/images/creatures/crystallo/crystallo-fall-9.png b/data/images/creatures/crystallo/crystallo-fall-9.png
deleted file mode 100644
index ad5746870e2..00000000000
Binary files a/data/images/creatures/crystallo/crystallo-fall-9.png and /dev/null differ
diff --git a/data/images/creatures/crystallo/crystallo-jump-0.png b/data/images/creatures/crystallo/crystallo-jump-0.png
deleted file mode 100644
index 9dc32d4420f..00000000000
Binary files a/data/images/creatures/crystallo/crystallo-jump-0.png and /dev/null differ
diff --git a/data/images/creatures/crystallo/crystallo-jump-1.png b/data/images/creatures/crystallo/crystallo-jump-1.png
deleted file mode 100644
index 04367eeafb4..00000000000
Binary files a/data/images/creatures/crystallo/crystallo-jump-1.png and /dev/null differ
diff --git a/data/images/creatures/crystallo/crystallo-jump-2.png b/data/images/creatures/crystallo/crystallo-jump-2.png
deleted file mode 100644
index dcc2b8fb7a8..00000000000
Binary files a/data/images/creatures/crystallo/crystallo-jump-2.png and /dev/null differ
diff --git a/data/images/creatures/crystallo/crystallo-jump-3.png b/data/images/creatures/crystallo/crystallo-jump-3.png
deleted file mode 100644
index 8fcf69c05c6..00000000000
Binary files a/data/images/creatures/crystallo/crystallo-jump-3.png and /dev/null differ
diff --git a/data/images/creatures/crystallo/crystallo-jump-4.png b/data/images/creatures/crystallo/crystallo-jump-4.png
deleted file mode 100644
index 5c6ba323843..00000000000
Binary files a/data/images/creatures/crystallo/crystallo-jump-4.png and /dev/null differ
diff --git a/data/images/creatures/crystallo/crystallo-jump-5.png b/data/images/creatures/crystallo/crystallo-jump-5.png
deleted file mode 100644
index c159eb6a1c2..00000000000
Binary files a/data/images/creatures/crystallo/crystallo-jump-5.png and /dev/null differ
diff --git a/data/images/creatures/crystallo/crystallo-jump-6.png b/data/images/creatures/crystallo/crystallo-jump-6.png
deleted file mode 100644
index c979d6eb642..00000000000
Binary files a/data/images/creatures/crystallo/crystallo-jump-6.png and /dev/null differ
diff --git a/data/images/creatures/crystallo/crystallo-left-0.png b/data/images/creatures/crystallo/crystallo-left-0.png
deleted file mode 100644
index c97d3d5acf8..00000000000
Binary files a/data/images/creatures/crystallo/crystallo-left-0.png and /dev/null differ
diff --git a/data/images/creatures/crystallo/crystallo-left-1.png b/data/images/creatures/crystallo/crystallo-left-1.png
deleted file mode 100644
index 126ea8d6014..00000000000
Binary files a/data/images/creatures/crystallo/crystallo-left-1.png and /dev/null differ
diff --git a/data/images/creatures/crystallo/crystallo-left-2.png b/data/images/creatures/crystallo/crystallo-left-2.png
deleted file mode 100644
index 9042a02a1bc..00000000000
Binary files a/data/images/creatures/crystallo/crystallo-left-2.png and /dev/null differ
diff --git a/data/images/creatures/crystallo/crystallo-left-3.png b/data/images/creatures/crystallo/crystallo-left-3.png
deleted file mode 100644
index 30e25699553..00000000000
Binary files a/data/images/creatures/crystallo/crystallo-left-3.png and /dev/null differ
diff --git a/data/images/creatures/crystallo/crystallo-left-4.png b/data/images/creatures/crystallo/crystallo-left-4.png
deleted file mode 100644
index 41a85b9b9fb..00000000000
Binary files a/data/images/creatures/crystallo/crystallo-left-4.png and /dev/null differ
diff --git a/data/images/creatures/crystallo/crystallo-left-5.png b/data/images/creatures/crystallo/crystallo-left-5.png
deleted file mode 100644
index 599c4841954..00000000000
Binary files a/data/images/creatures/crystallo/crystallo-left-5.png and /dev/null differ
diff --git a/data/images/creatures/crystallo/crystallo-left-6.png b/data/images/creatures/crystallo/crystallo-left-6.png
deleted file mode 100644
index e1b445338a0..00000000000
Binary files a/data/images/creatures/crystallo/crystallo-left-6.png and /dev/null differ
diff --git a/data/images/creatures/crystallo/crystallo-left-7.png b/data/images/creatures/crystallo/crystallo-left-7.png
deleted file mode 100644
index 77cd17cab71..00000000000
Binary files a/data/images/creatures/crystallo/crystallo-left-7.png and /dev/null differ
diff --git a/data/images/creatures/crystallo/crystallo-preparing-0.png b/data/images/creatures/crystallo/crystallo-preparing-0.png
deleted file mode 100644
index af3741deb27..00000000000
Binary files a/data/images/creatures/crystallo/crystallo-preparing-0.png and /dev/null differ
diff --git a/data/images/creatures/crystallo/crystallo-preparing-1.png b/data/images/creatures/crystallo/crystallo-preparing-1.png
deleted file mode 100644
index bb0aa5e6ed4..00000000000
Binary files a/data/images/creatures/crystallo/crystallo-preparing-1.png and /dev/null differ
diff --git a/data/images/creatures/crystallo/crystallo-sleeping.png b/data/images/creatures/crystallo/crystallo-sleeping.png
deleted file mode 100644
index 606a19076a3..00000000000
Binary files a/data/images/creatures/crystallo/crystallo-sleeping.png and /dev/null differ
diff --git a/data/images/creatures/crystallo/crystallo-waking-0.png b/data/images/creatures/crystallo/crystallo-waking-0.png
deleted file mode 100644
index 04eddb5d590..00000000000
Binary files a/data/images/creatures/crystallo/crystallo-waking-0.png and /dev/null differ
diff --git a/data/images/creatures/crystallo/crystallo-waking-1.png b/data/images/creatures/crystallo/crystallo-waking-1.png
deleted file mode 100644
index 5693eca8174..00000000000
Binary files a/data/images/creatures/crystallo/crystallo-waking-1.png and /dev/null differ
diff --git a/data/images/creatures/crystallo/crystallo.sprite b/data/images/creatures/crystallo/crystallo.sprite
index 251f8328929..158c073b790 100644
--- a/data/images/creatures/crystallo/crystallo.sprite
+++ b/data/images/creatures/crystallo/crystallo.sprite
@@ -2,44 +2,41 @@
   (action
     (name "left")
     (fps 14)
-    (hitbox 8 9 32 20)
-    (images "crystallo-left-0.png"
-            "crystallo-left-1.png"
-            "crystallo-left-2.png"
-            "crystallo-left-3.png"
-            "crystallo-left-4.png"
-            "crystallo-left-5.png"
-            "crystallo-left-6.png"
-            "crystallo-left-7.png"))
+    (hitbox 8 12 32 26)
+    (images "left-0.png"
+            "left-1.png"
+            "left-2.png"
+            "left-3.png"
+            "left-4.png"
+            "left-5.png"
+            "left-6.png"
+            "left-7.png"))
 
   (action
     (name "right")
     (fps 14)
-    (hitbox 8 9 32 20)
+    (hitbox 8 12 32 26)
     (mirror-action "left"))
 
   (action
     (name "slowdown-left")
     (fps 5)
-    (hitbox 8 9 32 20)
+    (hitbox 8 12 32 26)
     (clone-action "left"))
 
   (action
     (name "slowdown-right")
     (fps 5)
-    (hitbox 8 9 32 20)
+    (hitbox 8 12 32 26)
     (clone-action "right"))
 
   (action
     (name "shattered-left")
-    (images "shattered-left.png"))
+	(hitbox 8 12 32 26)
+    (images "squished.png"))
 
   (action
     (name "shattered-right")
+	(hitbox 8 12 32 26)
     (mirror-action "shattered-left"))
-
-  (action
-    (name "editor")
-    (hitbox 100 7 135 20)
-    (images "crystallo-editor.png"))
 )
diff --git a/data/images/creatures/crystallo/fall-0.png b/data/images/creatures/crystallo/fall-0.png
new file mode 100644
index 00000000000..2dd10c49cec
Binary files /dev/null and b/data/images/creatures/crystallo/fall-0.png differ
diff --git a/data/images/creatures/crystallo/fall-1.png b/data/images/creatures/crystallo/fall-1.png
new file mode 100644
index 00000000000..86204347d8f
Binary files /dev/null and b/data/images/creatures/crystallo/fall-1.png differ
diff --git a/data/images/creatures/crystallo/fall-10.png b/data/images/creatures/crystallo/fall-10.png
new file mode 100644
index 00000000000..12a0e052bbb
Binary files /dev/null and b/data/images/creatures/crystallo/fall-10.png differ
diff --git a/data/images/creatures/crystallo/fall-11.png b/data/images/creatures/crystallo/fall-11.png
new file mode 100644
index 00000000000..5c78e7e9db8
Binary files /dev/null and b/data/images/creatures/crystallo/fall-11.png differ
diff --git a/data/images/creatures/crystallo/fall-2.png b/data/images/creatures/crystallo/fall-2.png
new file mode 100644
index 00000000000..eaa83c6e569
Binary files /dev/null and b/data/images/creatures/crystallo/fall-2.png differ
diff --git a/data/images/creatures/crystallo/fall-3.png b/data/images/creatures/crystallo/fall-3.png
new file mode 100644
index 00000000000..8c92bf2fc55
Binary files /dev/null and b/data/images/creatures/crystallo/fall-3.png differ
diff --git a/data/images/creatures/crystallo/fall-4.png b/data/images/creatures/crystallo/fall-4.png
new file mode 100644
index 00000000000..c7e374d03e3
Binary files /dev/null and b/data/images/creatures/crystallo/fall-4.png differ
diff --git a/data/images/creatures/crystallo/fall-5.png b/data/images/creatures/crystallo/fall-5.png
new file mode 100644
index 00000000000..be126d2868e
Binary files /dev/null and b/data/images/creatures/crystallo/fall-5.png differ
diff --git a/data/images/creatures/crystallo/fall-6.png b/data/images/creatures/crystallo/fall-6.png
new file mode 100644
index 00000000000..188a6ea05f5
Binary files /dev/null and b/data/images/creatures/crystallo/fall-6.png differ
diff --git a/data/images/creatures/crystallo/fall-7.png b/data/images/creatures/crystallo/fall-7.png
new file mode 100644
index 00000000000..b13a3f8ed86
Binary files /dev/null and b/data/images/creatures/crystallo/fall-7.png differ
diff --git a/data/images/creatures/crystallo/fall-8.png b/data/images/creatures/crystallo/fall-8.png
new file mode 100644
index 00000000000..eaf728b5789
Binary files /dev/null and b/data/images/creatures/crystallo/fall-8.png differ
diff --git a/data/images/creatures/crystallo/fall-9.png b/data/images/creatures/crystallo/fall-9.png
new file mode 100644
index 00000000000..d24e88d4ad2
Binary files /dev/null and b/data/images/creatures/crystallo/fall-9.png differ
diff --git a/data/images/creatures/crystallo/jump-0.png b/data/images/creatures/crystallo/jump-0.png
new file mode 100644
index 00000000000..fbef9628ca5
Binary files /dev/null and b/data/images/creatures/crystallo/jump-0.png differ
diff --git a/data/images/creatures/crystallo/jump-1.png b/data/images/creatures/crystallo/jump-1.png
new file mode 100644
index 00000000000..1b17c656d91
Binary files /dev/null and b/data/images/creatures/crystallo/jump-1.png differ
diff --git a/data/images/creatures/crystallo/jump-2.png b/data/images/creatures/crystallo/jump-2.png
new file mode 100644
index 00000000000..b111650a465
Binary files /dev/null and b/data/images/creatures/crystallo/jump-2.png differ
diff --git a/data/images/creatures/crystallo/jump-3.png b/data/images/creatures/crystallo/jump-3.png
new file mode 100644
index 00000000000..03c59683e67
Binary files /dev/null and b/data/images/creatures/crystallo/jump-3.png differ
diff --git a/data/images/creatures/crystallo/jump-4.png b/data/images/creatures/crystallo/jump-4.png
new file mode 100644
index 00000000000..a3a48ed51ae
Binary files /dev/null and b/data/images/creatures/crystallo/jump-4.png differ
diff --git a/data/images/creatures/crystallo/jump-5.png b/data/images/creatures/crystallo/jump-5.png
new file mode 100644
index 00000000000..c16034f3adc
Binary files /dev/null and b/data/images/creatures/crystallo/jump-5.png differ
diff --git a/data/images/creatures/crystallo/left-0.png b/data/images/creatures/crystallo/left-0.png
new file mode 100644
index 00000000000..071585277e2
Binary files /dev/null and b/data/images/creatures/crystallo/left-0.png differ
diff --git a/data/images/creatures/crystallo/left-1.png b/data/images/creatures/crystallo/left-1.png
new file mode 100644
index 00000000000..5ca65e642df
Binary files /dev/null and b/data/images/creatures/crystallo/left-1.png differ
diff --git a/data/images/creatures/crystallo/left-2.png b/data/images/creatures/crystallo/left-2.png
new file mode 100644
index 00000000000..c8ad73102d0
Binary files /dev/null and b/data/images/creatures/crystallo/left-2.png differ
diff --git a/data/images/creatures/crystallo/left-3.png b/data/images/creatures/crystallo/left-3.png
new file mode 100644
index 00000000000..49b27348ee0
Binary files /dev/null and b/data/images/creatures/crystallo/left-3.png differ
diff --git a/data/images/creatures/crystallo/left-4.png b/data/images/creatures/crystallo/left-4.png
new file mode 100644
index 00000000000..c6529b8bd2d
Binary files /dev/null and b/data/images/creatures/crystallo/left-4.png differ
diff --git a/data/images/creatures/crystallo/left-5.png b/data/images/creatures/crystallo/left-5.png
new file mode 100644
index 00000000000..7badb6eb77a
Binary files /dev/null and b/data/images/creatures/crystallo/left-5.png differ
diff --git a/data/images/creatures/crystallo/left-6.png b/data/images/creatures/crystallo/left-6.png
new file mode 100644
index 00000000000..c15f7f31323
Binary files /dev/null and b/data/images/creatures/crystallo/left-6.png differ
diff --git a/data/images/creatures/crystallo/left-7.png b/data/images/creatures/crystallo/left-7.png
new file mode 100644
index 00000000000..587b3fb0e87
Binary files /dev/null and b/data/images/creatures/crystallo/left-7.png differ
diff --git a/data/images/creatures/crystallo/rcrystallo-editor.png b/data/images/creatures/crystallo/rcrystallo-editor.png
deleted file mode 100644
index 089d01c8442..00000000000
Binary files a/data/images/creatures/crystallo/rcrystallo-editor.png and /dev/null differ
diff --git a/data/images/creatures/crystallo/rcrystallo.sprite b/data/images/creatures/crystallo/rcrystallo.sprite
index 48d15c5f6f0..d5e45a10bcb 100644
--- a/data/images/creatures/crystallo/rcrystallo.sprite
+++ b/data/images/creatures/crystallo/rcrystallo.sprite
@@ -2,80 +2,81 @@
   (action
     (name "left-upright")
     (fps 14)
-    (hitbox 8 1 32 25)
-    (images "crystallo-left-0.png"
-            "crystallo-left-1.png"
-            "crystallo-left-2.png"
-            "crystallo-left-3.png"
-            "crystallo-left-4.png"
-            "crystallo-left-5.png"
-            "crystallo-left-6.png"
-            "crystallo-left-7.png")
+    (hitbox 8 12 32 26)
+    (images "left-0.png"
+            "left-1.png"
+            "left-2.png"
+            "left-3.png"
+            "left-4.png"
+            "left-5.png"
+            "left-6.png"
+            "left-7.png")
   )
   (action
     (name "left")
-    (hitbox 8 1 32 25)
-    (flip-action "left-upright")
-  )
+	(fps 14)
+    (hitbox 8 12 32 26)
+    (flip-action "left-upright"))
   (action
     (name "right")
     (fps 14)
-    (hitbox 8 1 32 25)
-    (mirror-action "left")
-  )
+    (hitbox 8 12 32 26)
+    (mirror-action "left"))
+
   (action
     (name "slowdown-left")
     (fps 5)
-    (hitbox 8 1 32 25)
-    (clone-action "left")
-  )
+    (hitbox 8 12 32 26)
+    (clone-action "left"))
+
   (action
     (name "slowdown-right")
     (fps 5)
-    (hitbox 8 1 32 25)
-    (clone-action "right")
-  )
+    (hitbox 8 12 32 26)
+    (clone-action "right"))
+
   (action
     (name "shattered-left")
-    (images "shattered-left.png")
-  )
+	(hitbox 8 12 32 26)
+    (images "squished.png"))
+
   (action
     (name "shattered-right")
-    (mirror-action "shattered-left")
-  )
+	(hitbox 8 12 32 26)
+    (mirror-action "shattered-left"))
+
   (action
     (name "detected-left")
     (fps 15)
-    (hitbox 45 2 20 35)
+    (hitbox 17 2 24 36)
     (loops 1)
-    (images "crystallo-fall-0.png"
-            "crystallo-fall-1.png"
-            "crystallo-fall-2.png"
-            "crystallo-fall-3.png"
-            "crystallo-fall-4.png"
-            "crystallo-fall-5.png"
-            "crystallo-fall-6.png"
-            "crystallo-fall-7.png"
-            "crystallo-fall-6.png"
-            "crystallo-fall-8.png"
-            "crystallo-fall-9.png"
-            "crystallo-fall-8.png")
-  )
+    (images "fall-0.png"
+            "fall-1.png"
+            "fall-2.png"
+            "fall-3.png"
+            "fall-4.png"
+            "fall-5.png"
+            "fall-6.png"
+            "fall-7.png"
+            "fall-8.png"
+            "fall-9.png"
+            "fall-10.png"
+			"fall-11.png"))
+
   (action
     (name "detected-right")
     (fps 15)
-    (hitbox 35 2 20 35)
+    (hitbox 19 2 24 36)
     (loops 1)
-    (mirror-action "detected-left")
-  )
+    (mirror-action "detected-left"))
+
   (action
     (name "fall-left")
-    (hitbox 45 2 20 35)
-    (images "crystallo-fall-10.png")
-  )
+    (hitbox 17 2 24 36)
+    (images "fall-11.png"))
+
   (action
     (name "fall-right")
-    (hitbox 35 2 20 35)
-    (mirror-action "fall-left")
-  )
+    (hitbox 19 2 24 36)
+    (mirror-action "fall-left"))
 )
diff --git a/data/images/creatures/crystallo/roof_crystallo-editor.png b/data/images/creatures/crystallo/roof_crystallo-editor.png
new file mode 100644
index 00000000000..000f55c40e7
Binary files /dev/null and b/data/images/creatures/crystallo/roof_crystallo-editor.png differ
diff --git a/data/images/creatures/crystallo/scrystallo.sprite b/data/images/creatures/crystallo/scrystallo.sprite
index adaf4767973..a18a6b57a5f 100644
--- a/data/images/creatures/crystallo/scrystallo.sprite
+++ b/data/images/creatures/crystallo/scrystallo.sprite
@@ -2,100 +2,104 @@
   (action
     (name "editor-left")
     (fps 14)
-    (hitbox 8 13 32 14)
+    (hitbox 8 12 32 26)
     (loops 1)
-    (images "crystallo-sleeping.png"))
+    (images "sleep-0.png"))
 
   (action
     (name "editor-right")
     (fps 14)
-    (hitbox 9 13 32 14)
+    (hitbox 8 12 32 26)
     (loops 1)
     (mirror-action "editor-left"))
 
   (action
     (name "left")
     (fps 14)
-    (hitbox 8 9 32 20)
-    (images "crystallo-left-0.png"
-            "crystallo-left-1.png"
-            "crystallo-left-2.png"
-            "crystallo-left-3.png"
-            "crystallo-left-4.png"
-            "crystallo-left-5.png"
-            "crystallo-left-6.png"
-            "crystallo-left-7.png"))
+    (hitbox 8 12 32 26)
+    (images "left-0.png"
+            "left-1.png"
+            "left-2.png"
+            "left-3.png"
+            "left-4.png"
+            "left-5.png"
+            "left-6.png"
+            "left-7.png"))
 
   (action
     (name "right")
     (fps 14)
-    (hitbox 8 9 32 20)
+    (hitbox 8 12 32 26)
     (mirror-action "left"))
 
   (action
     (name "slowdown-left")
     (fps 5)
-    (hitbox 8 9 32 20)
+    (hitbox 8 12 32 26)
     (clone-action "left"))
 
   (action
     (name "slowdown-right")
     (fps 5)
-    (hitbox 8 9 32 20)
+    (hitbox 8 12 32 26)
     (clone-action "right"))
 
   (action
     (name "shattered-left")
-    (images "shattered-left.png"))
+	(hitbox 8 12 32 26)
+    (images "squished.png"))
 
   (action
     (name "shattered-right")
+	(hitbox 8 12 32 26)
     (mirror-action "shattered-left"))
 
   (action
     (name "waking-left")
     (fps 14)
-    (hitbox 8 13 32 14)
+    (hitbox 8 12 32 26)
     (loops 1)
-    (images "crystallo-waking-0.png"
-            "crystallo-waking-1.png"
-            "crystallo-sleeping.png"
-            "crystallo-waking-0.png"
-            "crystallo-waking-1.png"
-            "crystallo-waking-1.png"
-            "crystallo-waking-1.png"
-            "crystallo-waking-1.png"
-            "crystallo-preparing-0.png"
-            "crystallo-preparing-1.png"
-            "crystallo-preparing-0.png"
-            "crystallo-preparing-1.png"
-            "crystallo-preparing-0.png"
-            "crystallo-preparing-1.png"
-            "crystallo-preparing-0.png"))
+    (images "sleep-0.png"
+            "sleep-1.png"
+			"sleep-2.png"
+            "sleep-0.png"
+            "sleep-1.png"
+            "sleep-3.png"
+            "sleep-3.png"
+            "sleep-3.png"
+            "sleep-3.png"
+            "sleep-4.png"
+            "sleep-5.png"
+            "sleep-4.png"
+            "sleep-5.png"
+            "sleep-4.png"
+            "sleep-5.png"
+            "sleep-4.png"
+			"sleep-5.png"))
 
   (action
     (name "waking-right")
     (fps 14)
-    (hitbox 9 13 32 14)
+    (hitbox 8 12 32 26)
     (loops 1)
     (mirror-action "waking-left"))
 
   (action
     (name "jumping-left")
     (fps 14)
-    (hitbox 8 9 32 20)
+    (hitbox 10 12 32 26)
     (loops 1)
-    (images "crystallo-jump-1.png"
-            "crystallo-jump-2.png"
-            "crystallo-jump-3.png"
-            "crystallo-jump-4.png"
-            "crystallo-jump-5.png"
-            "crystallo-jump-6.png"))
+    (images "jump-0.png"
+            "jump-1.png"
+            "jump-2.png"
+            "jump-3.png"
+            "jump-4.png"
+            "jump-5.png"))
 
   (action
     (name "jumping-right")
     (fps 14)
-    (hitbox 8 9 32 20)
+    (hitbox 8 12 32 26)
     (loops 1)
     (mirror-action "jumping-left"))
 )
diff --git a/data/images/creatures/crystallo/shard.png b/data/images/creatures/crystallo/shard.png
index c3010659c72..b686138c29e 100644
Binary files a/data/images/creatures/crystallo/shard.png and b/data/images/creatures/crystallo/shard.png differ
diff --git a/data/images/creatures/crystallo/shattered-left.png b/data/images/creatures/crystallo/shattered-left.png
deleted file mode 100644
index 530bae9df24..00000000000
Binary files a/data/images/creatures/crystallo/shattered-left.png and /dev/null differ
diff --git a/data/images/creatures/crystallo/sleep-0.png b/data/images/creatures/crystallo/sleep-0.png
new file mode 100644
index 00000000000..8e9dde70dea
Binary files /dev/null and b/data/images/creatures/crystallo/sleep-0.png differ
diff --git a/data/images/creatures/crystallo/sleep-1.png b/data/images/creatures/crystallo/sleep-1.png
new file mode 100644
index 00000000000..ea879b1c1c5
Binary files /dev/null and b/data/images/creatures/crystallo/sleep-1.png differ
diff --git a/data/images/creatures/crystallo/sleep-2.png b/data/images/creatures/crystallo/sleep-2.png
new file mode 100644
index 00000000000..2df81f581d9
Binary files /dev/null and b/data/images/creatures/crystallo/sleep-2.png differ
diff --git a/data/images/creatures/crystallo/sleep-3.png b/data/images/creatures/crystallo/sleep-3.png
new file mode 100644
index 00000000000..fce738db060
Binary files /dev/null and b/data/images/creatures/crystallo/sleep-3.png differ
diff --git a/data/images/creatures/crystallo/sleep-4.png b/data/images/creatures/crystallo/sleep-4.png
new file mode 100644
index 00000000000..ea9b2f81354
Binary files /dev/null and b/data/images/creatures/crystallo/sleep-4.png differ
diff --git a/data/images/creatures/crystallo/sleep-5.png b/data/images/creatures/crystallo/sleep-5.png
new file mode 100644
index 00000000000..b0ec377971c
Binary files /dev/null and b/data/images/creatures/crystallo/sleep-5.png differ
diff --git a/data/images/creatures/crystallo/squished.png b/data/images/creatures/crystallo/squished.png
new file mode 100644
index 00000000000..13936f5bed2
Binary files /dev/null and b/data/images/creatures/crystallo/squished.png differ
diff --git a/data/images/creatures/dart/flying-down.png b/data/images/creatures/dart/flying-down.png
deleted file mode 100644
index e2452125de2..00000000000
Binary files a/data/images/creatures/dart/flying-down.png and /dev/null differ
diff --git a/data/images/creatures/dart/flying-left.png b/data/images/creatures/dart/flying-left.png
deleted file mode 100644
index 48c854fba24..00000000000
Binary files a/data/images/creatures/dart/flying-left.png and /dev/null differ
diff --git a/data/images/creatures/darttrap/charge_down-0.png b/data/images/creatures/darttrap/charge_down-0.png
new file mode 100644
index 00000000000..76b896dcdf7
Binary files /dev/null and b/data/images/creatures/darttrap/charge_down-0.png differ
diff --git a/data/images/creatures/darttrap/charge_down-1.png b/data/images/creatures/darttrap/charge_down-1.png
new file mode 100644
index 00000000000..17b736cb6c0
Binary files /dev/null and b/data/images/creatures/darttrap/charge_down-1.png differ
diff --git a/data/images/creatures/darttrap/charge_down-2.png b/data/images/creatures/darttrap/charge_down-2.png
new file mode 100644
index 00000000000..57a8f60997b
Binary files /dev/null and b/data/images/creatures/darttrap/charge_down-2.png differ
diff --git a/data/images/creatures/darttrap/charge_down-3.png b/data/images/creatures/darttrap/charge_down-3.png
new file mode 100644
index 00000000000..eb9e12bad4e
Binary files /dev/null and b/data/images/creatures/darttrap/charge_down-3.png differ
diff --git a/data/images/creatures/darttrap/charge_left-0.png b/data/images/creatures/darttrap/charge_left-0.png
new file mode 100644
index 00000000000..b7e06fca76b
Binary files /dev/null and b/data/images/creatures/darttrap/charge_left-0.png differ
diff --git a/data/images/creatures/darttrap/charge_left-1.png b/data/images/creatures/darttrap/charge_left-1.png
new file mode 100644
index 00000000000..9370ab19a82
Binary files /dev/null and b/data/images/creatures/darttrap/charge_left-1.png differ
diff --git a/data/images/creatures/darttrap/charge_left-2.png b/data/images/creatures/darttrap/charge_left-2.png
new file mode 100644
index 00000000000..a4b8cba4f2b
Binary files /dev/null and b/data/images/creatures/darttrap/charge_left-2.png differ
diff --git a/data/images/creatures/darttrap/charge_left-3.png b/data/images/creatures/darttrap/charge_left-3.png
new file mode 100644
index 00000000000..03cd491b8bf
Binary files /dev/null and b/data/images/creatures/darttrap/charge_left-3.png differ
diff --git a/data/images/creatures/darttrap/dart_light.png b/data/images/creatures/darttrap/dart_light.png
new file mode 100644
index 00000000000..8f3d852d064
Binary files /dev/null and b/data/images/creatures/darttrap/dart_light.png differ
diff --git a/data/images/creatures/darttrap/darttrap.sprite b/data/images/creatures/darttrap/darttrap.sprite
index 837fa68127f..68682a20b2f 100644
--- a/data/images/creatures/darttrap/darttrap.sprite
+++ b/data/images/creatures/darttrap/darttrap.sprite
@@ -1,76 +1,75 @@
 (supertux-sprite
   (action
-    (hitbox 21 13 11 54)
+    (hitbox -13 2 32 38)
     (name "idle-left")
     (loops 1)
-    (images "left-3.png"
-      "left-3.png"
-      "left-3.png"
-      "left-3.png"
-      "left-4.png"
-      "left-idle.png"
-    )
+    (fps 10)
+    (images "empty_left-0.png"
+			"empty_left-1.png"
+			"empty_left-2.png"
+			"empty_left-3.png"
+			"empty_left-4.png")
   )
   (action
-    (hitbox 13 21 54 11)
+    (hitbox 2 19 38 32)
     (name "idle-down")
     (loops 1)
-    (images "down-3.png"
-      "down-3.png"
-      "down-3.png"
-      "down-3.png"
-      "down-4.png"
-      "down-idle.png"
-    )
+    (fps 10)
+    (images "empty_down-0.png"
+			"empty_down-1.png"
+			"empty_down-2.png"
+			"empty_down-3.png"
+			"empty_down-4.png")
   )
   (action
-    (hitbox 21 13 11 54)
+    (hitbox 19 2 32 38)
     (name "idle-right")
     (loops 1)
+	(fps 10)
     (mirror-action "idle-left")
   )
   (action
-    (hitbox 13 18 54 11)
+    (hitbox 2 -13 38 32)
     (name "idle-up")
+	(loops 1)
+	(fps 10)
     (flip-action "idle-down")
   )
+
   (action
-    (hitbox 21 13 11 54)
+    (hitbox -13 2 32 38)
     (name "loading-left")
-    (fps 10)
-    (images 
-      "left-idle.png"
-      "left-1.png"
-      "left-2.png"
-      "left-3.png"
-      "left-3.png"
-      "left-3.png"
-      "left-3.png"
-    )
+    (loops 1)
+	(fps 10)
+    (images "empty_left-4.png"
+			"charge_left-0.png"
+			"charge_left-1.png"
+			"charge_left-2.png"
+			"charge_left-3.png")
   )
   (action
-    (hitbox 13 21 54 11)
+    (hitbox 2 19 38 32)
     (name "loading-down")
-    (fps 10)
-    (images 
-      "down-idle.png"
-      "down-1.png"
-      "down-2.png"
-      "down-3.png"
-      "down-3.png"
-      "down-3.png"
-      "down-3.png"
-    )
+    (loops 1)
+	(fps 10)
+    (images "empty_down-4.png"
+			"charge_down-0.png"
+			"charge_down-1.png"
+			"charge_down-2.png"
+			"charge_down-3.png")
   )
   (action
-    (hitbox 21 13 11 54)
+    (hitbox 19 2 32 38)
     (name "loading-right")
-    (fps 10)
+    (loops 1)
+	(fps 10)
     (mirror-action "loading-left")
   )
   (action
-    (hitbox 13 18 54 11)
+    (hitbox 2 -13 38 32)
     (name "loading-up")
+	(loops 1)
+	(fps 10)
     (flip-action "loading-down")
   )
-)
+)
\ No newline at end of file
diff --git a/data/images/creatures/darttrap/down-1.png b/data/images/creatures/darttrap/down-1.png
deleted file mode 100644
index 9e8e7f0008f..00000000000
Binary files a/data/images/creatures/darttrap/down-1.png and /dev/null differ
diff --git a/data/images/creatures/darttrap/down-2.png b/data/images/creatures/darttrap/down-2.png
deleted file mode 100644
index 06fd8edec4d..00000000000
Binary files a/data/images/creatures/darttrap/down-2.png and /dev/null differ
diff --git a/data/images/creatures/darttrap/down-3.png b/data/images/creatures/darttrap/down-3.png
deleted file mode 100644
index b516cfa38a6..00000000000
Binary files a/data/images/creatures/darttrap/down-3.png and /dev/null differ
diff --git a/data/images/creatures/darttrap/down-4.png b/data/images/creatures/darttrap/down-4.png
deleted file mode 100644
index 976cd3282f5..00000000000
Binary files a/data/images/creatures/darttrap/down-4.png and /dev/null differ
diff --git a/data/images/creatures/darttrap/down-idle.png b/data/images/creatures/darttrap/down-idle.png
deleted file mode 100644
index 87588aeb743..00000000000
Binary files a/data/images/creatures/darttrap/down-idle.png and /dev/null differ
diff --git a/data/images/creatures/darttrap/empty_down-0.png b/data/images/creatures/darttrap/empty_down-0.png
new file mode 100644
index 00000000000..7a23ec7967d
Binary files /dev/null and b/data/images/creatures/darttrap/empty_down-0.png differ
diff --git a/data/images/creatures/darttrap/empty_down-1.png b/data/images/creatures/darttrap/empty_down-1.png
new file mode 100644
index 00000000000..f98d38f913e
Binary files /dev/null and b/data/images/creatures/darttrap/empty_down-1.png differ
diff --git a/data/images/creatures/darttrap/empty_down-2.png b/data/images/creatures/darttrap/empty_down-2.png
new file mode 100644
index 00000000000..e36a4646f88
Binary files /dev/null and b/data/images/creatures/darttrap/empty_down-2.png differ
diff --git a/data/images/creatures/darttrap/empty_down-3.png b/data/images/creatures/darttrap/empty_down-3.png
new file mode 100644
index 00000000000..9a47febad43
Binary files /dev/null and b/data/images/creatures/darttrap/empty_down-3.png differ
diff --git a/data/images/creatures/darttrap/empty_down-4.png b/data/images/creatures/darttrap/empty_down-4.png
new file mode 100644
index 00000000000..ea977d9086b
Binary files /dev/null and b/data/images/creatures/darttrap/empty_down-4.png differ
diff --git a/data/images/creatures/darttrap/empty_left-0.png b/data/images/creatures/darttrap/empty_left-0.png
new file mode 100644
index 00000000000..80c4c7d596d
Binary files /dev/null and b/data/images/creatures/darttrap/empty_left-0.png differ
diff --git a/data/images/creatures/darttrap/empty_left-1.png b/data/images/creatures/darttrap/empty_left-1.png
new file mode 100644
index 00000000000..c432584da67
Binary files /dev/null and b/data/images/creatures/darttrap/empty_left-1.png differ
diff --git a/data/images/creatures/darttrap/empty_left-2.png b/data/images/creatures/darttrap/empty_left-2.png
new file mode 100644
index 00000000000..c3e9e629f5a
Binary files /dev/null and b/data/images/creatures/darttrap/empty_left-2.png differ
diff --git a/data/images/creatures/darttrap/empty_left-3.png b/data/images/creatures/darttrap/empty_left-3.png
new file mode 100644
index 00000000000..3b0e796343d
Binary files /dev/null and b/data/images/creatures/darttrap/empty_left-3.png differ
diff --git a/data/images/creatures/darttrap/empty_left-4.png b/data/images/creatures/darttrap/empty_left-4.png
new file mode 100644
index 00000000000..afd75806415
Binary files /dev/null and b/data/images/creatures/darttrap/empty_left-4.png differ
diff --git a/data/images/creatures/darttrap/left-1.png b/data/images/creatures/darttrap/left-1.png
deleted file mode 100644
index 3c1d334ee55..00000000000
Binary files a/data/images/creatures/darttrap/left-1.png and /dev/null differ
diff --git a/data/images/creatures/darttrap/left-2.png b/data/images/creatures/darttrap/left-2.png
deleted file mode 100644
index 0595206376c..00000000000
Binary files a/data/images/creatures/darttrap/left-2.png and /dev/null differ
diff --git a/data/images/creatures/darttrap/left-3.png b/data/images/creatures/darttrap/left-3.png
deleted file mode 100644
index eff690a953d..00000000000
Binary files a/data/images/creatures/darttrap/left-3.png and /dev/null differ
diff --git a/data/images/creatures/darttrap/left-4.png b/data/images/creatures/darttrap/left-4.png
deleted file mode 100644
index 01e7b498e39..00000000000
Binary files a/data/images/creatures/darttrap/left-4.png and /dev/null differ
diff --git a/data/images/creatures/darttrap/left-idle.png b/data/images/creatures/darttrap/left-idle.png
deleted file mode 100644
index 87d67fe5e8d..00000000000
Binary files a/data/images/creatures/darttrap/left-idle.png and /dev/null differ
diff --git a/data/images/creatures/dart/dart.sprite b/data/images/creatures/darttrap/skull_dart.sprite
similarity index 59%
rename from data/images/creatures/dart/dart.sprite
rename to data/images/creatures/darttrap/skull_dart.sprite
index 3c91b5ee706..ffae418de3d 100644
--- a/data/images/creatures/dart/dart.sprite
+++ b/data/images/creatures/darttrap/skull_dart.sprite
@@ -1,22 +1,22 @@
 (supertux-sprite
   (action
     (name "flying-left")
-    (hitbox 10 6 12 7)
-    (images "flying-left.png")
+    (hitbox 6 12 22 9)
+    (images "skull_dart_left.png")
   )
   (action
     (name "flying-right")
-    (hitbox 10 6 12 7)
+    (hitbox 4 12 22 9)
     (mirror-action "flying-left")
   )
   (action
     (name "flying-down")
-    (hitbox 6 10 7 12)
-    (images "flying-down.png")
+    (hitbox 12 4 9 22)
+    (images "skull_dart_down.png")
   )
   (action
     (name "flying-up")
-    (hitbox 6 10 7 12)
+    (hitbox 12 6 9 22)
     (flip-action "flying-down")
   )
-)
+)
\ No newline at end of file
diff --git a/data/images/creatures/darttrap/skull_dart_down.png b/data/images/creatures/darttrap/skull_dart_down.png
new file mode 100644
index 00000000000..655016d2770
Binary files /dev/null and b/data/images/creatures/darttrap/skull_dart_down.png differ
diff --git a/data/images/creatures/darttrap/skull_dart_left.png b/data/images/creatures/darttrap/skull_dart_left.png
new file mode 100644
index 00000000000..1fa3580ff3e
Binary files /dev/null and b/data/images/creatures/darttrap/skull_dart_left.png differ
diff --git a/data/images/creatures/jumpy/corrupt_down-0.png b/data/images/creatures/jumpy/corrupt_down-0.png
new file mode 100644
index 00000000000..3c3aec15cdc
Binary files /dev/null and b/data/images/creatures/jumpy/corrupt_down-0.png differ
diff --git a/data/images/creatures/jumpy/corrupt_down-1.png b/data/images/creatures/jumpy/corrupt_down-1.png
new file mode 100644
index 00000000000..fc9e2a00e84
Binary files /dev/null and b/data/images/creatures/jumpy/corrupt_down-1.png differ
diff --git a/data/images/creatures/jumpy/corrupt_down-2.png b/data/images/creatures/jumpy/corrupt_down-2.png
new file mode 100644
index 00000000000..e6a415f1ed5
Binary files /dev/null and b/data/images/creatures/jumpy/corrupt_down-2.png differ
diff --git a/data/images/creatures/jumpy/corrupt_up-0.png b/data/images/creatures/jumpy/corrupt_up-0.png
new file mode 100644
index 00000000000..b41445ca096
Binary files /dev/null and b/data/images/creatures/jumpy/corrupt_up-0.png differ
diff --git a/data/images/creatures/jumpy/corrupt_up-1.png b/data/images/creatures/jumpy/corrupt_up-1.png
new file mode 100644
index 00000000000..0a9fb676108
Binary files /dev/null and b/data/images/creatures/jumpy/corrupt_up-1.png differ
diff --git a/data/images/creatures/jumpy/corrupt_up-2.png b/data/images/creatures/jumpy/corrupt_up-2.png
new file mode 100644
index 00000000000..9508710e5a0
Binary files /dev/null and b/data/images/creatures/jumpy/corrupt_up-2.png differ
diff --git a/data/images/creatures/jumpy/corrupt_up-3.png b/data/images/creatures/jumpy/corrupt_up-3.png
new file mode 100644
index 00000000000..ec9ef7e7d8d
Binary files /dev/null and b/data/images/creatures/jumpy/corrupt_up-3.png differ
diff --git a/data/images/creatures/jumpy/corruptjumpy.sprite b/data/images/creatures/jumpy/corruptjumpy.sprite
new file mode 100644
index 00000000000..49fd46881c2
--- /dev/null
+++ b/data/images/creatures/jumpy/corruptjumpy.sprite
@@ -0,0 +1,83 @@
+(supertux-sprite
+ (action
+  (name "left-up")
+  (loops 1)
+  (fps 25)
+  (hitbox 7 8 32 50)
+  (images "corrupt_up-2.png"
+		  "corrupt_up-1.png"
+		  "corrupt_down-1.png"
+		  "corrupt_down-2.png"
+		  "corrupt_down-2.png"
+		  "corrupt_down-1.png"
+		  "corrupt_down-0.png"
+		  "corrupt_up-0.png"))
+
+ (action
+  (name "right-up")
+  (loops 1)
+  (fps 25)
+  (hitbox 9 8 32 50)
+  (mirror-action "left-up"))
+
+ (action
+  (name "left-down")
+  (hitbox 7 8 32 50)
+  (images "corrupt_up-3.png"))
+
+ (action
+  (name "right-down")
+  (hitbox 9 8 32 50)
+  (mirror-action "left-down"))
+
+ (action
+  (name "left-middle")
+  (hitbox 7 8 32 50)
+  (images "corrupt_up-3.png"))
+
+ (action
+  (name "right-middle")
+  (hitbox 9 8 32 50)
+  (mirror-action "left-middle"))
+
+ (action
+  (name "iced-left")
+  (hitbox 7 8 32 50)
+  (images "corrupt_up-0.png"))
+
+ (action
+  (name "iced-right")
+  (hitbox 9 8 32 50)
+  (mirror-action "iced-left"))
+
+ (action
+  (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"))
+
+ (action
+  (name "burning-right")
+  (hitbox 9 8 32 50)
+  (mirror-action "burning-left"))
+
+ (action
+  (name "editor-left")
+  (hitbox 7 8 32 50)
+  (images "corrupt_up-0.png"))
+
+ (action
+  (name "editor-right")
+  (hitbox 9 8 32 50)
+  (mirror-action "editor-left"))
+)
diff --git a/data/images/creatures/jumpy/metal_down-0.png b/data/images/creatures/jumpy/metal_down-0.png
index aff138b138c..c92f8322212 100644
Binary files a/data/images/creatures/jumpy/metal_down-0.png and b/data/images/creatures/jumpy/metal_down-0.png differ
diff --git a/data/images/creatures/jumpy/metal_down-1.png b/data/images/creatures/jumpy/metal_down-1.png
index a7ee9ca05de..23752d7d936 100644
Binary files a/data/images/creatures/jumpy/metal_down-1.png and b/data/images/creatures/jumpy/metal_down-1.png differ
diff --git a/data/images/creatures/jumpy/metal_down-2.png b/data/images/creatures/jumpy/metal_down-2.png
index 9f39de33c84..da8b60ef953 100644
Binary files a/data/images/creatures/jumpy/metal_down-2.png and b/data/images/creatures/jumpy/metal_down-2.png differ
diff --git a/data/images/creatures/jumpy/metal_up-0.png b/data/images/creatures/jumpy/metal_up-0.png
index 9f2c7ef60cd..78f272241ec 100644
Binary files a/data/images/creatures/jumpy/metal_up-0.png and b/data/images/creatures/jumpy/metal_up-0.png differ
diff --git a/data/images/creatures/jumpy/metal_up-1.png b/data/images/creatures/jumpy/metal_up-1.png
index 6d7d4a761ce..4a88057eb54 100644
Binary files a/data/images/creatures/jumpy/metal_up-1.png and b/data/images/creatures/jumpy/metal_up-1.png differ
diff --git a/data/images/creatures/jumpy/metal_up-2.png b/data/images/creatures/jumpy/metal_up-2.png
index 27176637634..f814a146ef1 100644
Binary files a/data/images/creatures/jumpy/metal_up-2.png and b/data/images/creatures/jumpy/metal_up-2.png differ
diff --git a/data/images/creatures/jumpy/metal_up-3.png b/data/images/creatures/jumpy/metal_up-3.png
index 3d42c3e3872..b72e2c95848 100644
Binary files a/data/images/creatures/jumpy/metal_up-3.png and b/data/images/creatures/jumpy/metal_up-3.png differ
diff --git a/data/images/creatures/jumpy/metaljumpy.sprite b/data/images/creatures/jumpy/metaljumpy.sprite
index c9a6e119bb5..a8d71e405ee 100644
--- a/data/images/creatures/jumpy/metaljumpy.sprite
+++ b/data/images/creatures/jumpy/metaljumpy.sprite
@@ -3,7 +3,7 @@
   (name "left-up")
   (loops 1)
   (fps 25)
-  (hitbox 8 11 32 32)
+  (hitbox 9 8 32 43)
   (images "metal_up-2.png"
 		  "metal_up-1.png"
 		  "metal_down-1.png"
@@ -17,46 +17,46 @@
   (name "right-up")
   (loops 1)
   (fps 25)
-  (hitbox 10 11 32 32)
+  (hitbox 11 8 32 43)
   (mirror-action "left-up"))
 
  (action
   (name "left-down")
-  (hitbox 8 11 32 32)
+  (hitbox 9 8 32 43)
   (images "metal_up-3.png"))
 
  (action
   (name "right-down")
-  (hitbox 10 11 32 32)
+  (hitbox 11 8 32 43)
   (mirror-action "left-down"))
 
  (action
   (name "left-middle")
-  (hitbox 8 11 32 32)
+  (hitbox 9 8 32 43)
   (images "metal_up-3.png"))
 
  (action
   (name "right-middle")
-  (hitbox 10 11 32 32)
+  (hitbox 11 8 32 43)
   (mirror-action "left-middle"))
 
-(action
+ (action
   (name "iced-left")
-  (hitbox 2 5 31.8 31.8)
-  (images "metal_up-1.png"))
- 
+  (hitbox 9 8 32 43)
+  (images "metal_up-0.png"))
+
  (action
   (name "iced-right")
-  (hitbox 2 5 31.8 31.8)
+  (hitbox 11 8 32 43)
   (mirror-action "iced-left"))
 
  (action
   (name "editor-left")
-  (hitbox 8 11 32 32)
+  (hitbox 9 8 32 43)
   (images "metal_up-0.png"))
 
  (action
   (name "editor-right")
-  (hitbox 10 11 32 32)
+  (hitbox 11 8 32 43)
   (mirror-action "editor-left"))
 )
diff --git a/data/images/creatures/leafshot/collision-left.png b/data/images/creatures/leafshot/collision-left.png
index 95507cab24a..4baa81e06f4 100644
Binary files a/data/images/creatures/leafshot/collision-left.png and b/data/images/creatures/leafshot/collision-left.png differ
diff --git a/data/images/creatures/leafshot/corrupted/collision-left.png b/data/images/creatures/leafshot/corrupted/collision-left.png
new file mode 100644
index 00000000000..5f3155a513e
Binary files /dev/null and b/data/images/creatures/leafshot/corrupted/collision-left.png differ
diff --git a/data/images/creatures/leafshot/corrupted/rotshot-0.png b/data/images/creatures/leafshot/corrupted/rotshot-0.png
new file mode 100644
index 00000000000..56a4f3fe870
Binary files /dev/null and b/data/images/creatures/leafshot/corrupted/rotshot-0.png differ
diff --git a/data/images/creatures/leafshot/corrupted/rotshot-1.png b/data/images/creatures/leafshot/corrupted/rotshot-1.png
new file mode 100644
index 00000000000..00e067cb901
Binary files /dev/null and b/data/images/creatures/leafshot/corrupted/rotshot-1.png differ
diff --git a/data/images/creatures/leafshot/corrupted/rotshot-2.png b/data/images/creatures/leafshot/corrupted/rotshot-2.png
new file mode 100644
index 00000000000..d08ec5c5e67
Binary files /dev/null and b/data/images/creatures/leafshot/corrupted/rotshot-2.png differ
diff --git a/data/images/creatures/leafshot/corrupted/rotshot-3.png b/data/images/creatures/leafshot/corrupted/rotshot-3.png
new file mode 100644
index 00000000000..7f24ae332ba
Binary files /dev/null and b/data/images/creatures/leafshot/corrupted/rotshot-3.png differ
diff --git a/data/images/creatures/leafshot/corrupted/rotshot-4.png b/data/images/creatures/leafshot/corrupted/rotshot-4.png
new file mode 100644
index 00000000000..c0ce28f13c8
Binary files /dev/null and b/data/images/creatures/leafshot/corrupted/rotshot-4.png differ
diff --git a/data/images/creatures/leafshot/corrupted/rotshot-5.png b/data/images/creatures/leafshot/corrupted/rotshot-5.png
new file mode 100644
index 00000000000..ec5769de673
Binary files /dev/null and b/data/images/creatures/leafshot/corrupted/rotshot-5.png differ
diff --git a/data/images/creatures/leafshot/corrupted/rotshot.sprite b/data/images/creatures/leafshot/corrupted/rotshot.sprite
new file mode 100644
index 00000000000..1655e5a0cc5
--- /dev/null
+++ b/data/images/creatures/leafshot/corrupted/rotshot.sprite
@@ -0,0 +1,65 @@
+(supertux-sprite
+  (action
+    (name "left")
+	(fps 15)
+    (hitbox 5 17 36 26)
+    (images "rotshot-0.png"
+            "rotshot-1.png"
+            "rotshot-2.png"
+            "rotshot-3.png"
+            "rotshot-4.png"
+            "rotshot-5.png")
+  )
+  (action
+    (name "right")
+	(fps 15)
+    (hitbox 23 17 36 26)
+    (mirror-action "left")
+  )
+  (action
+    (name "iced-left")
+    (hitbox 5 17 36 26)
+    (images "rotshot-0.png")
+  )
+  (action
+    (name "iced-right")
+	(hitbox 23 17 36 26)
+    (mirror-action "iced-left")
+  )
+  (action
+    (name "squished-left")
+	(hitbox 9 12 32 32)
+    (images "../../vicious_ivy/corrupted/squished.png")
+  )
+  (action
+    (name "squished-right")
+	(hitbox 19 12 32 32)
+    (mirror-action "squished-left")
+  )
+  (action
+    (name "collision-left")
+	(hitbox 5 17 36 26)
+    (images "collision-left.png")
+  )
+  (action
+    (name "collision-right")
+    (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-0.png b/data/images/creatures/leafshot/leafshot-0.png
index 2fb07195675..fb5a7115367 100644
Binary files a/data/images/creatures/leafshot/leafshot-0.png and b/data/images/creatures/leafshot/leafshot-0.png differ
diff --git a/data/images/creatures/leafshot/leafshot-1.png b/data/images/creatures/leafshot/leafshot-1.png
index f18eb3a97c6..efa67f5746a 100644
Binary files a/data/images/creatures/leafshot/leafshot-1.png and b/data/images/creatures/leafshot/leafshot-1.png differ
diff --git a/data/images/creatures/leafshot/leafshot-2.png b/data/images/creatures/leafshot/leafshot-2.png
index 1194200dd1f..cac115d0365 100644
Binary files a/data/images/creatures/leafshot/leafshot-2.png and b/data/images/creatures/leafshot/leafshot-2.png differ
diff --git a/data/images/creatures/leafshot/leafshot-3.png b/data/images/creatures/leafshot/leafshot-3.png
index 2c6fc444b38..4f7feb420a4 100644
Binary files a/data/images/creatures/leafshot/leafshot-3.png and b/data/images/creatures/leafshot/leafshot-3.png differ
diff --git a/data/images/creatures/leafshot/leafshot-4.png b/data/images/creatures/leafshot/leafshot-4.png
index e98b6bb7d2a..020a131ba0c 100644
Binary files a/data/images/creatures/leafshot/leafshot-4.png and b/data/images/creatures/leafshot/leafshot-4.png differ
diff --git a/data/images/creatures/leafshot/leafshot-5.png b/data/images/creatures/leafshot/leafshot-5.png
index deb10ccba7d..2c5004972ff 100644
Binary files a/data/images/creatures/leafshot/leafshot-5.png and b/data/images/creatures/leafshot/leafshot-5.png differ
diff --git a/data/images/creatures/leafshot/leafshot.sprite b/data/images/creatures/leafshot/leafshot.sprite
index cb433970dc9..d36cc01cda8 100644
--- a/data/images/creatures/leafshot/leafshot.sprite
+++ b/data/images/creatures/leafshot/leafshot.sprite
@@ -2,7 +2,7 @@
   (action
     (name "left")
 	(fps 15)
-    (hitbox 5 15 50 25)
+    (hitbox 5 17 36 26)
     (images "leafshot-0.png"
             "leafshot-1.png"
             "leafshot-2.png"
@@ -13,36 +13,37 @@
   (action
     (name "right")
 	(fps 15)
-    (hitbox 9 15 50 25)
+    (hitbox 23 17 36 26)
     (mirror-action "left")
   )
   (action
     (name "iced-left")
-    (hitbox -1 8 36 18)
+    (hitbox 5 17 36 26)
     (images "leafshot-0.png")
   )
   (action
     (name "iced-right")
+	(hitbox 23 17 36 26)
     (mirror-action "iced-left")
   )
   (action
     (name "squished-left")
-	(hitbox 1 -21 32 32)
+	(hitbox 9 12 32 32)
     (images "../vicious_ivy/squished.png")
   )
   (action
     (name "squished-right")
-	(hitbox -1 -21 32 32)
+	(hitbox 19 12 32 32)
     (mirror-action "squished-left")
   )
   (action
     (name "collision-left")
-	(hitbox 2 1 21 25)
+	(hitbox 5 17 36 26)
     (images "collision-left.png")
   )
   (action
     (name "collision-right")
-    (hitbox 2 1 21 25)
+    (hitbox 23 17 36 26)
     (mirror-action "collision-left")
   )
   (action
diff --git a/data/images/creatures/mole/center.png b/data/images/creatures/mole/center.png
index 581474eb053..885f0d87fd9 100644
Binary files a/data/images/creatures/mole/center.png and b/data/images/creatures/mole/center.png differ
diff --git a/data/images/creatures/mole/down-0.png b/data/images/creatures/mole/down-0.png
index 6229118dded..cf0f9c4ac2c 100644
Binary files a/data/images/creatures/mole/down-0.png and b/data/images/creatures/mole/down-0.png differ
diff --git a/data/images/creatures/mole/down-1.png b/data/images/creatures/mole/down-1.png
index 63b5eeb3123..99d031b9b22 100644
Binary files a/data/images/creatures/mole/down-1.png and b/data/images/creatures/mole/down-1.png differ
diff --git a/data/images/creatures/mole/down-2.png b/data/images/creatures/mole/down-2.png
index a9a6a2b83c6..3a5cb07744b 100644
Binary files a/data/images/creatures/mole/down-2.png and b/data/images/creatures/mole/down-2.png differ
diff --git a/data/images/creatures/mole/fire1.png b/data/images/creatures/mole/fire1.png
deleted file mode 100644
index 9e909a9d050..00000000000
Binary files a/data/images/creatures/mole/fire1.png and /dev/null differ
diff --git a/data/images/creatures/mole/fire2.png b/data/images/creatures/mole/fire2.png
deleted file mode 100644
index 5d43449f5a2..00000000000
Binary files a/data/images/creatures/mole/fire2.png and /dev/null differ
diff --git a/data/images/creatures/mole/fire3.png b/data/images/creatures/mole/fire3.png
deleted file mode 100644
index b84296a780f..00000000000
Binary files a/data/images/creatures/mole/fire3.png and /dev/null differ
diff --git a/data/images/creatures/mole/fire4.png b/data/images/creatures/mole/fire4.png
deleted file mode 100644
index 606bdd9f8c2..00000000000
Binary files a/data/images/creatures/mole/fire4.png and /dev/null differ
diff --git a/data/images/creatures/mole/fire5.png b/data/images/creatures/mole/fire5.png
deleted file mode 100644
index 54413833444..00000000000
Binary files a/data/images/creatures/mole/fire5.png and /dev/null differ
diff --git a/data/images/creatures/mole/mole.sprite b/data/images/creatures/mole/mole.sprite
index 7463567c93b..fa847ee8354 100644
--- a/data/images/creatures/mole/mole.sprite
+++ b/data/images/creatures/mole/mole.sprite
@@ -1,70 +1,64 @@
 (supertux-sprite
   (action
     (name "idle")
-    (hitbox 17 15 30 44)
+    (hitbox 18 22 32 40)
 	(fps 12)
     (images "mole_hill.png"
     )
   )
   (action
     (name "peeking")
-    (hitbox 17 15 30 44)
+    (hitbox 18 22 32 40)
     (fps 12)
-    (images 
-	  "mole_hill.png"
-	  "up-0.png"
-	  "up-1.png"
-      "up-2.png"
-	  "up-3.png"
-	  "center.png"
-	  "center.png"
-	  "center.png"
-	  "peek_left-0.png"
-	  "peek_left-1.png"
-	  "peek_left-2.png"
-	  "peek_left-2.png"
-	  "peek_left-2.png"
-	  "peek_left-1.png"
-	  "peek_left-0.png"
-	  "center.png"
-	  "peek_right-0.png"
-	  "peek_right-1.png"
-	  "peek_right-2.png"
-	  "peek_right-2.png"
-	  "peek_right-2.png"
-	  "peek_right-1.png"
-	  "peek_right-0.png"
-	  "center.png"
-	  "center.png"
-	  "center.png"
-	  "down-0.png"
-	  "down-1.png"
-	  "down-2.png"
-	  "mole_hill.png"
+    (images "mole_hill.png"
+			"up-0.png"
+			"up-1.png"
+			"up-2.png"
+			"up-3.png"
+			"center.png"
+			"center.png"
+			"center.png"
+			"peek_left-0.png"
+			"peek_left-1.png"
+			"peek_left-2.png"
+			"peek_left-2.png"
+			"peek_left-2.png"
+			"peek_left-1.png"
+			"peek_left-0.png"
+			"center.png"
+			"peek_right-0.png"
+			"peek_right-1.png"
+			"peek_right-2.png"
+			"peek_right-2.png"
+			"peek_right-2.png"
+			"peek_right-1.png"
+			"peek_right-0.png"
+			"center.png"
+			"center.png"
+			"center.png"
+			"down-0.png"
+			"down-1.png"
+			"down-2.png"
+			"mole_hill.png"
     )
   )
   (action
     (name "burning")
-    (hitbox 17 15 30 44)
+    (hitbox 18 22 32 40)
     (fps 15)
-    (images 
-      "fire1.png"
-	  "fire2.png"
-	  "fire3.png"
-	  "fire4.png"
-	  "fire5.png"
+	(loops 1)
+    (images "mole_hill.png"
     )
   )
   (action
 	(name "squished")
 	(fps 12)
 	(loops 1)
-	(hitbox 17 15 30 44)
-	(images "center.png"
-	  "down-0.png"
-	  "down-1.png"
-	  "down-2.png"
-	  "mole_hill.png"
+	(hitbox 18 22 32 40)
+	(images "down-0.png"
+			"down-1.png"
+			"down-2.png"
+			"mole_hill.png"
     )
   )
 )
diff --git a/data/images/creatures/mole/mole_hill.png b/data/images/creatures/mole/mole_hill.png
index e8aaaebec31..6bc441a44d1 100644
Binary files a/data/images/creatures/mole/mole_hill.png and b/data/images/creatures/mole/mole_hill.png differ
diff --git a/data/images/creatures/mole/peek_left-0.png b/data/images/creatures/mole/peek_left-0.png
index b193cafce09..3d7a437f903 100644
Binary files a/data/images/creatures/mole/peek_left-0.png and b/data/images/creatures/mole/peek_left-0.png differ
diff --git a/data/images/creatures/mole/peek_left-1.png b/data/images/creatures/mole/peek_left-1.png
index 8c5b613662c..5a86c103685 100644
Binary files a/data/images/creatures/mole/peek_left-1.png and b/data/images/creatures/mole/peek_left-1.png differ
diff --git a/data/images/creatures/mole/peek_left-2.png b/data/images/creatures/mole/peek_left-2.png
index 2055cec62d7..7a8316129ab 100644
Binary files a/data/images/creatures/mole/peek_left-2.png and b/data/images/creatures/mole/peek_left-2.png differ
diff --git a/data/images/creatures/mole/peek_right-0.png b/data/images/creatures/mole/peek_right-0.png
index e32461ccf74..f639633efa3 100644
Binary files a/data/images/creatures/mole/peek_right-0.png and b/data/images/creatures/mole/peek_right-0.png differ
diff --git a/data/images/creatures/mole/peek_right-1.png b/data/images/creatures/mole/peek_right-1.png
index 00d71bfe9ac..fa1ada2075a 100644
Binary files a/data/images/creatures/mole/peek_right-1.png and b/data/images/creatures/mole/peek_right-1.png differ
diff --git a/data/images/creatures/mole/peek_right-2.png b/data/images/creatures/mole/peek_right-2.png
index e65a2e537a7..aebf84f52c4 100644
Binary files a/data/images/creatures/mole/peek_right-2.png and b/data/images/creatures/mole/peek_right-2.png differ
diff --git a/data/images/creatures/mole/up-0.png b/data/images/creatures/mole/up-0.png
index d672fe208a6..296b3b35f62 100644
Binary files a/data/images/creatures/mole/up-0.png and b/data/images/creatures/mole/up-0.png differ
diff --git a/data/images/creatures/mole/up-1.png b/data/images/creatures/mole/up-1.png
index e97bc6ed8cd..256232c1c0d 100644
Binary files a/data/images/creatures/mole/up-1.png and b/data/images/creatures/mole/up-1.png differ
diff --git a/data/images/creatures/mole/up-2.png b/data/images/creatures/mole/up-2.png
index 8d173fd40ab..89544fe1960 100644
Binary files a/data/images/creatures/mole/up-2.png and b/data/images/creatures/mole/up-2.png differ
diff --git a/data/images/creatures/mole/up-3.png b/data/images/creatures/mole/up-3.png
index 2c9dfb0c423..9d509a4fde2 100644
Binary files a/data/images/creatures/mole/up-3.png and b/data/images/creatures/mole/up-3.png differ
diff --git a/data/images/creatures/mr_tree/squished-left.png b/data/images/creatures/mr_tree/squished-left.png
deleted file mode 100644
index 6f3dfef3c92..00000000000
Binary files a/data/images/creatures/mr_tree/squished-left.png and /dev/null differ
diff --git a/data/images/creatures/mr_tree/squished.png b/data/images/creatures/mr_tree/squished.png
new file mode 100644
index 00000000000..417fd0a105d
Binary files /dev/null and b/data/images/creatures/mr_tree/squished.png differ
diff --git a/data/images/creatures/mr_tree/stumpy.sprite b/data/images/creatures/mr_tree/stumpy.sprite
index 4c4c802c6ef..d6525396ebe 100644
--- a/data/images/creatures/mr_tree/stumpy.sprite
+++ b/data/images/creatures/mr_tree/stumpy.sprite
@@ -73,12 +73,12 @@
     (mirror-action "dizzy-left")
   )
   (action
-    (hitbox 20 23 42 42)
+    (hitbox 22 38 46 32)
     (name "squished-left")
-    (images "squished-left.png")
+    (images "squished.png")
   )
   (action
-    (hitbox 20 23 42 42)
+    (hitbox 22 38 46 32)
     (name "squished-right")
     (mirror-action "squished-left")
   )
diff --git a/data/images/creatures/owl/carry-0.png b/data/images/creatures/owl/carry-0.png
new file mode 100644
index 00000000000..81705b17016
Binary files /dev/null and b/data/images/creatures/owl/carry-0.png differ
diff --git a/data/images/creatures/owl/carry-1.png b/data/images/creatures/owl/carry-1.png
new file mode 100644
index 00000000000..c7faf9a60af
Binary files /dev/null and b/data/images/creatures/owl/carry-1.png differ
diff --git a/data/images/creatures/owl/carry-2.png b/data/images/creatures/owl/carry-2.png
new file mode 100644
index 00000000000..a6facb1674f
Binary files /dev/null and b/data/images/creatures/owl/carry-2.png differ
diff --git a/data/images/creatures/owl/carry-3.png b/data/images/creatures/owl/carry-3.png
new file mode 100644
index 00000000000..f3ab422c8da
Binary files /dev/null and b/data/images/creatures/owl/carry-3.png differ
diff --git a/data/images/creatures/owl/carry-4.png b/data/images/creatures/owl/carry-4.png
new file mode 100644
index 00000000000..992744fbb83
Binary files /dev/null and b/data/images/creatures/owl/carry-4.png differ
diff --git a/data/images/creatures/owl/carry-5.png b/data/images/creatures/owl/carry-5.png
new file mode 100644
index 00000000000..2937ee1073a
Binary files /dev/null and b/data/images/creatures/owl/carry-5.png differ
diff --git a/data/images/creatures/owl/carry-6.png b/data/images/creatures/owl/carry-6.png
new file mode 100644
index 00000000000..8e974cbc7aa
Binary files /dev/null and b/data/images/creatures/owl/carry-6.png differ
diff --git a/data/images/creatures/owl/carry-7.png b/data/images/creatures/owl/carry-7.png
new file mode 100644
index 00000000000..7b7ba526e03
Binary files /dev/null and b/data/images/creatures/owl/carry-7.png differ
diff --git a/data/images/creatures/owl/carry-8.png b/data/images/creatures/owl/carry-8.png
new file mode 100644
index 00000000000..80bd154fbbd
Binary files /dev/null and b/data/images/creatures/owl/carry-8.png differ
diff --git a/data/images/creatures/owl/carry-9.png b/data/images/creatures/owl/carry-9.png
new file mode 100644
index 00000000000..aa644c11497
Binary files /dev/null and b/data/images/creatures/owl/carry-9.png differ
diff --git a/data/images/creatures/owl/fly-0.png b/data/images/creatures/owl/fly-0.png
new file mode 100644
index 00000000000..c0dbd5be27e
Binary files /dev/null and b/data/images/creatures/owl/fly-0.png differ
diff --git a/data/images/creatures/owl/fly-1.png b/data/images/creatures/owl/fly-1.png
new file mode 100644
index 00000000000..9093d382cf0
Binary files /dev/null and b/data/images/creatures/owl/fly-1.png differ
diff --git a/data/images/creatures/owl/fly-2.png b/data/images/creatures/owl/fly-2.png
new file mode 100644
index 00000000000..92e11cb3923
Binary files /dev/null and b/data/images/creatures/owl/fly-2.png differ
diff --git a/data/images/creatures/owl/fly-3.png b/data/images/creatures/owl/fly-3.png
new file mode 100644
index 00000000000..e56e5589b65
Binary files /dev/null and b/data/images/creatures/owl/fly-3.png differ
diff --git a/data/images/creatures/owl/fly-4.png b/data/images/creatures/owl/fly-4.png
new file mode 100644
index 00000000000..98eb72c7e92
Binary files /dev/null and b/data/images/creatures/owl/fly-4.png differ
diff --git a/data/images/creatures/owl/fly-5.png b/data/images/creatures/owl/fly-5.png
new file mode 100644
index 00000000000..c80a7f2c651
Binary files /dev/null and b/data/images/creatures/owl/fly-5.png differ
diff --git a/data/images/creatures/owl/fly-6.png b/data/images/creatures/owl/fly-6.png
new file mode 100644
index 00000000000..4393420ca67
Binary files /dev/null and b/data/images/creatures/owl/fly-6.png differ
diff --git a/data/images/creatures/owl/fly-7.png b/data/images/creatures/owl/fly-7.png
new file mode 100644
index 00000000000..3d3235200bf
Binary files /dev/null and b/data/images/creatures/owl/fly-7.png differ
diff --git a/data/images/creatures/owl/fly-8.png b/data/images/creatures/owl/fly-8.png
new file mode 100644
index 00000000000..0ae88117082
Binary files /dev/null and b/data/images/creatures/owl/fly-8.png differ
diff --git a/data/images/creatures/owl/fly-9.png b/data/images/creatures/owl/fly-9.png
new file mode 100644
index 00000000000..1b30726decf
Binary files /dev/null and b/data/images/creatures/owl/fly-9.png differ
diff --git a/data/images/creatures/owl/left-0.png b/data/images/creatures/owl/left-0.png
deleted file mode 100644
index 8d348018881..00000000000
Binary files a/data/images/creatures/owl/left-0.png and /dev/null differ
diff --git a/data/images/creatures/owl/left-1.png b/data/images/creatures/owl/left-1.png
deleted file mode 100644
index 898f51c23f0..00000000000
Binary files a/data/images/creatures/owl/left-1.png and /dev/null differ
diff --git a/data/images/creatures/owl/left-2.png b/data/images/creatures/owl/left-2.png
deleted file mode 100644
index 40ef13d95d2..00000000000
Binary files a/data/images/creatures/owl/left-2.png and /dev/null differ
diff --git a/data/images/creatures/owl/left-3.png b/data/images/creatures/owl/left-3.png
deleted file mode 100644
index 9fc0883a1dc..00000000000
Binary files a/data/images/creatures/owl/left-3.png and /dev/null differ
diff --git a/data/images/creatures/owl/left-4.png b/data/images/creatures/owl/left-4.png
deleted file mode 100644
index 5cdd3d6b0c5..00000000000
Binary files a/data/images/creatures/owl/left-4.png and /dev/null differ
diff --git a/data/images/creatures/owl/left-5.png b/data/images/creatures/owl/left-5.png
deleted file mode 100644
index d67fdc1ba3d..00000000000
Binary files a/data/images/creatures/owl/left-5.png and /dev/null differ
diff --git a/data/images/creatures/owl/left-6.png b/data/images/creatures/owl/left-6.png
deleted file mode 100644
index aafcf9aa55e..00000000000
Binary files a/data/images/creatures/owl/left-6.png and /dev/null differ
diff --git a/data/images/creatures/owl/owl.sprite b/data/images/creatures/owl/owl.sprite
index e44281a6de4..28a89f51831 100644
--- a/data/images/creatures/owl/owl.sprite
+++ b/data/images/creatures/owl/owl.sprite
@@ -1,49 +1,32 @@
 (supertux-sprite
  (action
   (name "left")
-  (fps 10.0)
-  (hitbox 14 7 35 45)
-  (images "left-0.png"
-          "left-1.png"
-          "left-2.png"
-          "left-3.png"
-          "left-4.png"
-          "left-5.png"
-          "left-6.png"))
+  (fps 15)
+  (hitbox 24 15 45 44)
+  (images "carry-0.png"
+          "carry-1.png"
+          "carry-2.png"
+          "carry-3.png"
+          "carry-4.png"
+          "carry-5.png"
+          "carry-6.png"
+		  "carry-7.png"
+		  "carry-8.png"
+		  "carry-9.png"))
 
  (action
   (name "right")
-  (fps 10.0)
-  (hitbox 14 7 35 45)
+  (fps 15)
+  (hitbox 31 15 45 44)
   (mirror-action "left"))
+  
  (action
-  (name "burning-left")
-  (fps 15.0)
-  (hitbox 14 39 35 45)
-  (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 "iced-left")
-	  (hitbox 1 0 35 45)
-	  (images "left-0.png"))
-
-	(action
-	  (name "iced-right")
-	  (hitbox -1 0 35 45)
-	  (mirror-action "iced-left"))
+  (name "iced-left")
+  (hitbox 24 15 45 44)
+  (images "carry-8.png"))
 
  (action
-  (name "burning-right")
-  (fps 15.0)
-  (hitbox 14 39 35 45)
-  (mirror-action "burning-left"))
+  (name "iced-right")
+  (hitbox 31 15 45 44)
+  (mirror-action "iced-left"))
 )
diff --git a/data/images/creatures/skydive/skydive-0.png b/data/images/creatures/skydive/skydive-0.png
new file mode 100644
index 00000000000..2877d1ef5fb
Binary files /dev/null and b/data/images/creatures/skydive/skydive-0.png differ
diff --git a/data/images/creatures/skydive/skydive-1.png b/data/images/creatures/skydive/skydive-1.png
new file mode 100644
index 00000000000..50a675ff2a8
Binary files /dev/null and b/data/images/creatures/skydive/skydive-1.png differ
diff --git a/data/images/creatures/skydive/skydive-2.png b/data/images/creatures/skydive/skydive-2.png
new file mode 100644
index 00000000000..5948be22d3c
Binary files /dev/null and b/data/images/creatures/skydive/skydive-2.png differ
diff --git a/data/images/creatures/skydive/skydive-3.png b/data/images/creatures/skydive/skydive-3.png
new file mode 100644
index 00000000000..a27fee3e63c
Binary files /dev/null and b/data/images/creatures/skydive/skydive-3.png differ
diff --git a/data/images/creatures/skydive/skydive-4.png b/data/images/creatures/skydive/skydive-4.png
new file mode 100644
index 00000000000..5526236f1af
Binary files /dev/null and b/data/images/creatures/skydive/skydive-4.png differ
diff --git a/data/images/creatures/skydive/skydive.sprite b/data/images/creatures/skydive/skydive.sprite
index 7440cc909bd..6ed32afc1a1 100644
--- a/data/images/creatures/skydive/skydive.sprite
+++ b/data/images/creatures/skydive/skydive.sprite
@@ -1,23 +1,26 @@
 (supertux-sprite
   (action
     (name "normal")
-    (hitbox 21 5 28 43)
-    (images "skydive1.png"))
+	(fps 15)
+    (hitbox 14 7 32 44)
+    (images "skydive-0.png"
+            "skydive-1.png"
+            "skydive-2.png"
+            "skydive-3.png"
+			"skydive-4.png"
+			"skydive-3.png"
+            "skydive-2.png"
+            "skydive-1.png"))
 
   (action
     (name "falling")
-    (fps 15.0)
-    (hitbox 21 5 28 43)
-    (images "skydive1.png"
-            "skydive1.png"
-            "skydive1.png"
-            "skydive2.png"
-            "skydive3.png"
-            "skydive4.png"
-            "skydive5.png"))
+    (fps 15)
+    (hitbox 14 7 32 44)
+    (images "skydive-0.png"
+			"skydive-4.png"))
 
   (action
     (name "iced")
-    (hitbox 2 -3 28 43)
-    (images "skydive1.png"))
+    (hitbox 14 7 32 44)
+    (images "skydive-0.png"))
 )
diff --git a/data/images/creatures/skydive/skydive1.png b/data/images/creatures/skydive/skydive1.png
deleted file mode 100644
index 78ba3168343..00000000000
Binary files a/data/images/creatures/skydive/skydive1.png and /dev/null differ
diff --git a/data/images/creatures/skydive/skydive2.png b/data/images/creatures/skydive/skydive2.png
deleted file mode 100644
index 3e9754b4c26..00000000000
Binary files a/data/images/creatures/skydive/skydive2.png and /dev/null differ
diff --git a/data/images/creatures/skydive/skydive3.png b/data/images/creatures/skydive/skydive3.png
deleted file mode 100644
index e5c58db6f45..00000000000
Binary files a/data/images/creatures/skydive/skydive3.png and /dev/null differ
diff --git a/data/images/creatures/skydive/skydive4.png b/data/images/creatures/skydive/skydive4.png
deleted file mode 100644
index 864c7ed81bf..00000000000
Binary files a/data/images/creatures/skydive/skydive4.png and /dev/null differ
diff --git a/data/images/creatures/skydive/skydive5.png b/data/images/creatures/skydive/skydive5.png
deleted file mode 100644
index c99b46357ea..00000000000
Binary files a/data/images/creatures/skydive/skydive5.png and /dev/null differ
diff --git a/data/images/creatures/stalactite/broken.png b/data/images/creatures/stalactite/broken.png
deleted file mode 100644
index db8d3f12d79..00000000000
Binary files a/data/images/creatures/stalactite/broken.png and /dev/null differ
diff --git a/data/images/creatures/stalactite/broken_ice.png b/data/images/creatures/stalactite/broken_ice.png
new file mode 100644
index 00000000000..e82538d0f14
Binary files /dev/null and b/data/images/creatures/stalactite/broken_ice.png differ
diff --git a/data/images/creatures/stalactite/broken_rock.png b/data/images/creatures/stalactite/broken_rock.png
new file mode 100644
index 00000000000..97d026923ad
Binary files /dev/null and b/data/images/creatures/stalactite/broken_rock.png differ
diff --git a/data/images/creatures/stalactite/falling.png b/data/images/creatures/stalactite/falling.png
deleted file mode 100644
index 697c6391f00..00000000000
Binary files a/data/images/creatures/stalactite/falling.png and /dev/null differ
diff --git a/data/images/creatures/stalactite/rock_broken.png b/data/images/creatures/stalactite/rock_broken.png
deleted file mode 100644
index 03825090a2e..00000000000
Binary files a/data/images/creatures/stalactite/rock_broken.png and /dev/null differ
diff --git a/data/images/creatures/stalactite/rock_falling.png b/data/images/creatures/stalactite/rock_falling.png
deleted file mode 100644
index 6b6f6a477f2..00000000000
Binary files a/data/images/creatures/stalactite/rock_falling.png and /dev/null differ
diff --git a/data/images/creatures/stalactite/rock_stalactite.sprite b/data/images/creatures/stalactite/rock_stalactite.sprite
deleted file mode 100644
index 2ab13806689..00000000000
--- a/data/images/creatures/stalactite/rock_stalactite.sprite
+++ /dev/null
@@ -1,9 +0,0 @@
-(supertux-sprite
-	(action
-	  (name "normal")
-	  (hitbox 0 4 32 39)
-	  (images "rock_falling.png"))
-	(action
-	  (name "squished")
-	  (hitbox 0 9 32 39)
-	  (images "rock_broken.png")))
diff --git a/data/images/creatures/stalactite/stalactite.sprite b/data/images/creatures/stalactite/stalactite.sprite
deleted file mode 100644
index 80a1e5ba2d5..00000000000
--- a/data/images/creatures/stalactite/stalactite.sprite
+++ /dev/null
@@ -1,13 +0,0 @@
-(supertux-sprite
-	(action
-	  (name "normal")
-	  (hitbox 0 4 32 39)
-	  (images "falling.png"))
-	(action
-	  (name "yeti-stalactite")
-	  (hitbox 0 4 32 39)
-	  (images "../../engine/editor/stalactite_yeti.png"))
-	(action
-	  (name "squished")
-	  (hitbox 0 9 32 39)
-	  (images "broken.png")))
diff --git a/data/images/creatures/stalactite/stalactite_ice.png b/data/images/creatures/stalactite/stalactite_ice.png
new file mode 100644
index 00000000000..bd868f11376
Binary files /dev/null and b/data/images/creatures/stalactite/stalactite_ice.png differ
diff --git a/data/images/creatures/stalactite/stalactite_ice.sprite b/data/images/creatures/stalactite/stalactite_ice.sprite
new file mode 100644
index 00000000000..10c8b02bbf8
--- /dev/null
+++ b/data/images/creatures/stalactite/stalactite_ice.sprite
@@ -0,0 +1,13 @@
+(supertux-sprite
+	(action
+	  (name "normal")
+	  (hitbox 0 15 32 48)
+	  (images "stalactite_ice.png"))
+	(action
+	  (name "yeti-stalactite")
+	  (hitbox 0 15 32 48)
+	  (images "../../engine/editor/stalactite_ice_yeti.png"))
+	(action
+	  (name "squished")
+	  (hitbox 0 15 32 48)
+	  (images "broken_ice.png")))
diff --git a/data/images/creatures/stalactite/stalactite_rock.png b/data/images/creatures/stalactite/stalactite_rock.png
new file mode 100644
index 00000000000..4be3fb2a47b
Binary files /dev/null and b/data/images/creatures/stalactite/stalactite_rock.png differ
diff --git a/data/images/creatures/stalactite/stalactite_rock.sprite b/data/images/creatures/stalactite/stalactite_rock.sprite
new file mode 100644
index 00000000000..10dffc977f7
--- /dev/null
+++ b/data/images/creatures/stalactite/stalactite_rock.sprite
@@ -0,0 +1,13 @@
+(supertux-sprite
+	(action
+	  (name "normal")
+	  (hitbox 4 15 32 48)
+	  (images "stalactite_rock.png"))
+	(action
+	  (name "yeti-stalactite")
+	  (hitbox 4 15 32 48)
+	  (images "../../engine/editor/stalactite_rock_yeti.png"))
+	(action
+	  (name "squished")
+	  (hitbox 4 15 32 48)
+	  (images "broken_rock.png")))
diff --git a/data/images/engine/editor/objects.stoi b/data/images/engine/editor/objects.stoi
index 0880d34252b..e9cd2d3a1fc 100644
--- a/data/images/engine/editor/objects.stoi
+++ b/data/images/engine/editor/objects.stoi
@@ -62,19 +62,19 @@
     (icon "images/creatures/livefire/sleeping8.png"))
   (object
     (class "crystallo")
-    (icon "images/creatures/crystallo/crystallo-left-0.png"))
+    (icon "images/creatures/crystallo/left-2.png"))
   (object
     (class "scrystallo")
-    (icon "images/creatures/crystallo/crystallo-sleeping.png"))
+    (icon "images/creatures/crystallo/sleep-0.png"))
   (object
     (class "rcrystallo")
-    (icon "images/creatures/crystallo/rcrystallo-editor.png"))
+    (icon "images/creatures/crystallo/roof_crystallo-editor.png"))
   (object
     (class "crusher")
     (icon "images/creatures/crusher/krush_ice_hit.png"))
   (object
     (class "stalactite")
-    (icon "images/creatures/stalactite/falling.png"))
+    (icon "images/creatures/stalactite/stalactite_ice.png"))
   (object
     (class "willowisp")
     (icon "images/creatures/willowisp/editor.png"))
@@ -107,7 +107,7 @@
     (icon "images/creatures/mr_tree/stumpy-8.png"))
   (object
     (class "owl")
-    (icon "images/creatures/owl/left-0.png"))
+    (icon "images/creatures/owl/carry-0.png"))
   (object
     (class "zeekling")
     (icon "images/creatures/zeekling/zeekling-0.png"))
@@ -155,7 +155,7 @@
     (icon "images/creatures/angrystone/charging-0.png"))
   (object
     (class "darttrap")
-    (icon "images/creatures/darttrap/left-1.png"))
+    (icon "images/creatures/darttrap/charge_left-1.png"))
   (object
     (class "dispenser")
     (icon "images/creatures/dispenser/cannon_left.png"))
@@ -186,13 +186,13 @@
   (worldmap #f)
   (object
     (class "yeti_stalactite")
-    (icon "images/engine/editor/stalactite_yeti.png"))
+    (icon "images/engine/editor/stalactite_ice_yeti.png"))
   (object
     (class "skydive")
-    (icon "images/creatures/skydive/skydive1.png"))
+    (icon "images/creatures/skydive/skydive-0.png"))
   (object
     (class "dart")
-    (icon "images/creatures/dart/flying-left.png"))
+    (icon "images/creatures/darttrap/skull_dart_left.png"))
  )
 
  (objectgroup
diff --git a/data/images/engine/editor/stalactite_ice_yeti.png b/data/images/engine/editor/stalactite_ice_yeti.png
new file mode 100644
index 00000000000..3a36d60c747
Binary files /dev/null and b/data/images/engine/editor/stalactite_ice_yeti.png differ
diff --git a/data/images/engine/editor/stalactite_rock_yeti.png b/data/images/engine/editor/stalactite_rock_yeti.png
new file mode 100644
index 00000000000..013738a2edb
Binary files /dev/null and b/data/images/engine/editor/stalactite_rock_yeti.png differ
diff --git a/data/images/engine/editor/stalactite_yeti.png b/data/images/engine/editor/stalactite_yeti.png
deleted file mode 100644
index 467c65d8484..00000000000
Binary files a/data/images/engine/editor/stalactite_yeti.png and /dev/null differ
diff --git a/src/badguy/dart.cpp b/src/badguy/dart.cpp
index e62a09d6c2e..ef1d0a1557a 100644
--- a/src/badguy/dart.cpp
+++ b/src/badguy/dart.cpp
@@ -28,7 +28,7 @@ const float DART_SPEED = 200;
 static const std::string DART_SOUND = "sounds/flame.wav";
 
 Dart::Dart(const ReaderMapping& reader) :
-  BadGuy(reader, "images/creatures/dart/dart.sprite"),
+  BadGuy(reader, "images/creatures/darttrap/skull_dart.sprite"),
   parent(nullptr),
   sound_source()
 {
diff --git a/src/badguy/darttrap.cpp b/src/badguy/darttrap.cpp
index 10d50b9c5e5..dac6a70fd49 100644
--- a/src/badguy/darttrap.cpp
+++ b/src/badguy/darttrap.cpp
@@ -40,7 +40,7 @@ DartTrap::DartTrap(const ReaderMapping& reader) :
   reader.get("initial-delay", m_initial_delay, 0.0f);
   reader.get("fire-delay", m_fire_delay, 2.0f);
   reader.get("ammo", m_ammo, -1);
-  reader.get("dart-sprite", m_dart_sprite, "images/creatures/dart/dart.sprite");
+  reader.get("dart-sprite", m_dart_sprite, "images/creatures/darttrap/skull_dart.sprite");
   m_countMe = false;
   SoundManager::current()->preload("sounds/dartfire.wav");
   if (m_start_dir == Direction::AUTO) { log_warning << "Setting a DartTrap's direction to AUTO is no good idea" << std::endl; }
@@ -146,7 +146,7 @@ DartTrap::get_settings()
   result.add_bool(_("Enabled"), &m_enabled, "enabled", true);
   result.add_float(_("Fire delay"), &m_fire_delay, "fire-delay");
   result.add_int(_("Ammo"), &m_ammo, "ammo");
-  result.add_sprite(_("Dart sprite"), &m_dart_sprite, "dart-sprite", "images/creatures/dart/dart.sprite");
+  result.add_sprite(_("Dart sprite"), &m_dart_sprite, "dart-sprite", "images/creatures/darttrap/skull_dart.sprite");
 
   result.reorder({"initial-delay", "fire-delay", "ammo", "direction", "x", "y", "dart-sprite"});
 
diff --git a/src/badguy/stalactite.cpp b/src/badguy/stalactite.cpp
index ff66d1d50ce..aa66150cd8b 100644
--- a/src/badguy/stalactite.cpp
+++ b/src/badguy/stalactite.cpp
@@ -31,7 +31,7 @@ static const float SHAKE_TIME = .8f;
 static const float SHAKE_RANGE_Y = 400;
 
 Stalactite::Stalactite(const ReaderMapping& mapping) :
-  BadGuy(mapping, "images/creatures/stalactite/stalactite.sprite", LAYER_TILES - 1),
+  BadGuy(mapping, "images/creatures/stalactite/stalactite_ice.sprite", LAYER_TILES - 1),
   timer(),
   state(STALACTITE_HANGING),
   shake_delta(0.0f, 0.0f)
@@ -163,7 +163,7 @@ void
 Stalactite::on_type_change(int old_type)
 {
   if (!has_found_sprite()) // Change sprite only if a custom sprite has not just been loaded.
-    change_sprite("images/creatures/stalactite/" + std::string(m_type == StalactiteType::ROCK ? "rock_" : "") + "stalactite.sprite");
+    change_sprite("images/creatures/stalactite/stalactite_" + std::string(m_type == StalactiteType::ROCK ? "rock" : "") + ".sprite");
 }
 
 void