diff --git a/tools/Data/bin/MkLevel.ini b/tools/Data/bin/MkLevel.ini
index ca421a83b..e4994b876 100644
--- a/tools/Data/bin/MkLevel.ini
+++ b/tools/Data/bin/MkLevel.ini
@@ -113,8 +113,9 @@ Ch1L1_Plat2=1
 ################################################
 # Hazards
 [Hazard]
-Acorn=0
+RockShard=0
 HeartPendulum=1
 Tugboat=2
+Acorn=0
 
 
diff --git a/tools/MapEdit/Hazard.ini b/tools/MapEdit/Hazard.ini
index 0611c98a2..7d75e2c11 100644
--- a/tools/MapEdit/Hazard.ini
+++ b/tools/MapEdit/Hazard.ini
@@ -10,8 +10,8 @@
 # Health=0-255
 ################################################
 
-[Acorn]
-Gfx=..\..\graphics\hazards\+acorn.bmp
+[RockShard]
+Gfx=..\..\graphics\hazards\rockshard\rockshard.gin
 WayPoints=0
 Speed=0
 TurnRate=0
@@ -40,3 +40,13 @@ Health=0
 AttackStrength=0
 Respawn=3
 
+[Acorn]
+Gfx=..\..\graphics\hazards\acorn\acorn.gin
+WayPoints=0
+Speed=0
+TurnRate=0
+Collision=0
+Health=0
+AttackStrength=0
+Respawn=1
+