diff --git a/Data/Map239.rxdata b/Data/Map239.rxdata
index 548b923a3..49b7ce17a 100644
Binary files a/Data/Map239.rxdata and b/Data/Map239.rxdata differ
diff --git a/Data/Map248.rxdata b/Data/Map248.rxdata
index 60ff6110b..880f23d61 100644
Binary files a/Data/Map248.rxdata and b/Data/Map248.rxdata differ
diff --git a/Data/Scripts/013_Items/004_1_PokeradarUI.rb b/Data/Scripts/013_Items/004_1_PokeradarUI.rb
index f9721783b..86232ba01 100644
--- a/Data/Scripts/013_Items/004_1_PokeradarUI.rb
+++ b/Data/Scripts/013_Items/004_1_PokeradarUI.rb
@@ -112,7 +112,7 @@ class PokeRadar_UI
     bitmap1 = AnimatedBitmap.new(GameData::Species.icon_filename(headPoke))
     bitmap2 = AnimatedBitmap.new(GameData::Species.icon_filename(bodyPoke))
     ensureFusionIconExists()
-    bitmapFileName = sprintf("Graphics/Pokemon/FusionIcons/icon%03d", pokemonId)
+    bitmapFileName = sprintf("Graphics/Pokemon/FusionIcons/icon%03d", headPoke_number)
     headPokeFileName = GameData::Species.icon_filename(headPoke)
     bitmapPath = sprintf("%s.png", bitmapFileName)
     IO.copy_stream(headPokeFileName, bitmapPath)
diff --git a/Data/Scripts/014_Pokemon/001_Pokemon-related/003_Pokemon_Sprites.rb b/Data/Scripts/014_Pokemon/001_Pokemon-related/003_Pokemon_Sprites.rb
index da25ddfcf..65ce4b18a 100644
--- a/Data/Scripts/014_Pokemon/001_Pokemon-related/003_Pokemon_Sprites.rb
+++ b/Data/Scripts/014_Pokemon/001_Pokemon-related/003_Pokemon_Sprites.rb
@@ -187,9 +187,8 @@ class PokemonIconSprite < SpriteWrapper
     icon1 = AnimatedBitmap.new(GameData::Species.icon_filename(headPoke))
     icon2 = AnimatedBitmap.new(GameData::Species.icon_filename(bodyPoke))
 
-    dexNum = getDexNumberForSpecies(@pokemon.species)
     ensureFusionIconExists
-    bitmapFileName = sprintf("Graphics/Pokemon/FusionIcons/icon%03d", dexNum)
+    bitmapFileName = sprintf("Graphics/Pokemon/FusionIcons/icon%03d", headPoke_number)
     headPokeFileName = GameData::Species.icon_filename(headPoke)
     bitmapPath = sprintf("%s.png", bitmapFileName)
     IO.copy_stream(headPokeFileName, bitmapPath)
diff --git a/Data/Scripts/016_UI/017_UI_PokemonStorage.rb b/Data/Scripts/016_UI/017_UI_PokemonStorage.rb
index 783cf08ee..ef8d3ad6e 100644
--- a/Data/Scripts/016_UI/017_UI_PokemonStorage.rb
+++ b/Data/Scripts/016_UI/017_UI_PokemonStorage.rb
@@ -33,10 +33,8 @@ class PokemonBoxIcon < IconSprite
 
     icon1 = AnimatedBitmap.new(GameData::Species.icon_filename(headPoke))
     icon2 = AnimatedBitmap.new(GameData::Species.icon_filename(bodyPoke))
-
-    dexNum = getDexNumberForSpecies(species)
     ensureFusionIconExists
-    bitmapFileName = sprintf("Graphics/Pokemon/FusionIcons/icon%03d", dexNum)
+    bitmapFileName = sprintf("Graphics/Pokemon/FusionIcons/icon%03d", headPoke_number)
     headPokeFileName = GameData::Species.icon_filename(headPoke)
     bitmapPath = sprintf("%s.png", bitmapFileName)
     IO.copy_stream(headPokeFileName, bitmapPath)
diff --git a/Data/System.rxdata b/Data/System.rxdata
index 7339e2c82..2c9eea9ec 100644
Binary files a/Data/System.rxdata and b/Data/System.rxdata differ