diff --git a/dungeon_map/blink_loot.asm b/dungeon_map/blink_loot.asm
index d0e65e1..db8f671 100644
--- a/dungeon_map/blink_loot.asm
+++ b/dungeon_map/blink_loot.asm
@@ -8,7 +8,7 @@ BlinkLoot:
 	BNE .hide
 
 	LDA.b FrameCounter
-	AND.b #$10
+	AND.b #$20
 	BEQ .show
 .hide
 	LDA.b #$01
diff --git a/dungeon_map/data/supertile_shapes.asm b/dungeon_map/data/supertile_shapes.asm
index 8d2434b..ad18f93 100644
--- a/dungeon_map/data/supertile_shapes.asm
+++ b/dungeon_map/data/supertile_shapes.asm
@@ -18,10 +18,10 @@ dw $C340, $8340, $4350, $0340 ; 10
 dw $83B7, $C3AC, $03B7, $438A ; 11
 dw $C354, $8354, $4354, $0354 ; 12
 dw $FFFF, $83B7, $FFFF, $03B7 ; 13
-dw $C351, $8341, $4351, $0351 ; 14
+dw $012E, $012F, $013E, $013F ; 14
 dw $C374, $8340, $4341, $0340 ; 15
-dw $0108, $0109, $C3B2, $83B2 ; 16 - gross (add middle section if feasible)
-dw $C104, $0103, $4104, $0104 ; 17
+dw $0108, $0109, $436B, $036B ; 16
+dw $C114, $0104, $4114, $0114 ; 17
 dw $C3B5, $FFFF, $43B4, $FFFF ; 18 - useless fairy drop
 dw $FFFF, $8369, $FFFF, $035A ; 19
 dw $03E7, $03E8, $03F7, $0361 ; 1A
@@ -37,7 +37,7 @@ dw $FFFF, $FFFF, $FFFF, $039B ; 23
 dw $4365, $0365, $0364, $0365 ; 24
 dw $FFFF, $FFFF, $FFFF, $FFFF ; 25 - unused
 dw $039B, $03E4, $4363, $0382 ; 26
-dw $C104, $0103, $4104, $0104 ; 27
+dw $C114, $0104, $4114, $0114 ; 27
 dw $C3A5, $FFFF, $4358, $0348 ; 28
 dw $FFFF, $FFFF, $FFFF, $0396 ; 29 - Mothula
 dw $C350, $8352, $4350, $03F8 ; 2A
@@ -117,7 +117,7 @@ dw $038F, $038F, $839B, $0366 ; 73
 dw $43B2, $03B2, $43A8, $03A8 ; 74
 dw $038F, $83B4, $0365, $03B5 ; 75
 dw $838A, $03F4, $03B7, $C399 ; 76
-dw $C370, $8340, $43A0, $03A0 ; 77
+dw $0126, $0127, $4137, $0137 ; 77
 dw $FFFF, $FFFF, $FFFF, $FFFF ; 78 - unused
 dw $FFFF, $FFFF, $FFFF, $FFFF ; 79 - unused
 dw $FFFF, $FFFF, $FFFF, $FFFF ; 7A - unused
@@ -133,7 +133,7 @@ dw $038F, $83B5, $4365, $43B7 ; 83
 dw $C344, $8345, $4354, $0354 ; 84
 dw $C38B, $C39B, $03B7, $439B ; 85
 dw $FFFF, $FFFF, $FFFF, $FFFF ; 86 - unused
-dw $8399, $439B, $4394, $838F ; 87
+dw $0136, $0117, $4394, $838F ; 87
 dw $FFFF, $FFFF, $FFFF, $FFFF ; 88 - unused
 dw $C3B0, $83B0, $FFFF, $FFFF ; 89
 dw $FFFF, $FFFF, $FFFF, $FFFF ; 8A - unused
diff --git a/dungeon_map/dungeon_switch.asm b/dungeon_map/dungeon_switch.asm
index 34c1e58..317c65b 100644
--- a/dungeon_map/dungeon_switch.asm
+++ b/dungeon_map/dungeon_switch.asm
@@ -72,6 +72,10 @@ DungeonMapSwitch_Submodule:
 SkipMapSprites:
 	STZ.b $00
 
+	LDA.b $02 : PHA
+	LDA.b $03 : PHA
+	LDA.b $04 : PHA
+
 	LDA.l DRMode
 	BNE +
 	LDA.w $0200
@@ -80,6 +84,10 @@ SkipMapSprites:
 	JSL DrawEntrances
 +
 
+	PLA : STA.b $04
+	PLA : STA.b $03
+	PLA : STA.b $02
+
 	STZ.b $0E
 	STZ.b $0F
 
diff --git a/menu/map_icons.3bpp b/menu/map_icons.3bpp
index a8fa0d5..67e7691 100644
Binary files a/menu/map_icons.3bpp and b/menu/map_icons.3bpp differ
diff --git a/menu/map_icons_1.3bppc b/menu/map_icons_1.3bppc
index a0b7e61..4920ce2 100644
Binary files a/menu/map_icons_1.3bppc and b/menu/map_icons_1.3bppc differ
diff --git a/menu/map_icons_4.3bppc b/menu/map_icons_4.3bppc
index d1509aa..85d7eb4 100644
Binary files a/menu/map_icons_4.3bppc and b/menu/map_icons_4.3bppc differ
diff --git a/menu/map_icons_b.3bpp b/menu/map_icons_b.3bpp
index 5646bdf..5141634 100644
Binary files a/menu/map_icons_b.3bpp and b/menu/map_icons_b.3bpp differ
diff --git a/menu/map_sheet_d4.3bpp b/menu/map_sheet_d4.3bpp
index 1534ef8..8958227 100644
Binary files a/menu/map_sheet_d4.3bpp and b/menu/map_sheet_d4.3bpp differ
diff --git a/menu/map_sheet_d4.3bppc b/menu/map_sheet_d4.3bppc
index 6e4aaee..2b74b23 100644
Binary files a/menu/map_sheet_d4.3bppc and b/menu/map_sheet_d4.3bppc differ