diff --git a/Data/Actors.rxdata b/Data/Actors.rxdata
index 7967a5432..41edc8e26 100644
Binary files a/Data/Actors.rxdata and b/Data/Actors.rxdata differ
diff --git a/Data/Animations.rxdata b/Data/Animations.rxdata
index 8e67182ba..826e1e8a6 100644
Binary files a/Data/Animations.rxdata and b/Data/Animations.rxdata differ
diff --git a/Data/Armors.rxdata b/Data/Armors.rxdata
index 2249bec14..901f2bb2b 100644
Binary files a/Data/Armors.rxdata and b/Data/Armors.rxdata differ
diff --git a/Data/CommonEvents.rxdata b/Data/CommonEvents.rxdata
index 86c848c5e..7bb619832 100644
Binary files a/Data/CommonEvents.rxdata and b/Data/CommonEvents.rxdata differ
diff --git a/Data/Enemies.rxdata b/Data/Enemies.rxdata
index 004ee903d..be622f513 100644
Binary files a/Data/Enemies.rxdata and b/Data/Enemies.rxdata differ
diff --git a/Data/Items.rxdata b/Data/Items.rxdata
index 3e62ba6d2..fe767fa0b 100644
Binary files a/Data/Items.rxdata and b/Data/Items.rxdata differ
diff --git a/Data/Map647.rxdata b/Data/Map647.rxdata
index b1dff2820..461126bd2 100644
Binary files a/Data/Map647.rxdata and b/Data/Map647.rxdata differ
diff --git a/Data/Map648.rxdata b/Data/Map648.rxdata
index 4daf38017..ca168bfe2 100644
Binary files a/Data/Map648.rxdata and b/Data/Map648.rxdata differ
diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata
index ceb9682b8..c480460ca 100644
Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ
diff --git a/Data/Scripts/010_Data/002_PBS data/009_Species_Files.rb b/Data/Scripts/010_Data/002_PBS data/009_Species_Files.rb
index a937969d9..3f6e75f28 100644
--- a/Data/Scripts/010_Data/002_PBS data/009_Species_Files.rb	
+++ b/Data/Scripts/010_Data/002_PBS data/009_Species_Files.rb	
@@ -137,6 +137,10 @@ module GameData
     end
 
     def self.icon_filename_from_pokemon(pkmn)
+      if pkmn.isFusion?
+        return  pbResolveBitmap(sprintf("Graphics/Icons/iconDNA"))
+      end
+
       return self.icon_filename(pkmn.species, pkmn.form, pkmn.gender, pkmn.shiny?, pkmn.shadowPokemon?, pkmn.egg?)
     end
 
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 eaacf8737..de46a0875 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
@@ -161,7 +161,7 @@ class PokemonIconSprite < SpriteWrapper
     dexNum = getDexNumberForSpecies(species)
     return true if dexNum <= Settings::NB_POKEMON
     return false if $game_variables == nil
-    return true if $game_variables[220] != 0
+    return true if $game_variables[VAR_FUSION_ICON_STYLE] != 0
     bitmapFileName = sprintf("Graphics/Icons/icon%03d", dexNum)
     return true if pbResolveBitmap(bitmapFileName)
     return false
diff --git a/Data/Scripts/016_UI/015_UI_Options.rb b/Data/Scripts/016_UI/015_UI_Options.rb
index 3842ef7bf..75fc20aa5 100644
--- a/Data/Scripts/016_UI/015_UI_Options.rb
+++ b/Data/Scripts/016_UI/015_UI_Options.rb
@@ -530,7 +530,14 @@ class PokemonOption_Scene
                               ["Enter text by selecting letters on the screen",
                                "Enter text by typing on the keyboard"]
       )
-      EnumOption.new(_INTL("Screen Size"), [_INTL("S"), _INTL("M"), _INTL("L"), _INTL("XL"), _INTL("Full")],
+    options << EnumOption.new(_INTL("Fusion icons"), [_INTL("Combined"), _INTL("DNA")],
+                              proc { $game_variables[VAR_FUSION_ICON_STYLE]},
+                              proc { |value| $game_variables[VAR_FUSION_ICON_STYLE]=value },
+                              ["Combines both Pokémon's party icons",
+                               "Uses the same party icon for all fusions"]
+    )
+
+    options << EnumOption.new(_INTL("Screen Size"), [_INTL("S"), _INTL("M"), _INTL("L"), _INTL("XL"), _INTL("Full")],
                      proc { [$PokemonSystem.screensize, 4].min },
                      proc { |value|
                        if $PokemonSystem.screensize != value
diff --git a/Data/Scripts/016_UI/017_UI_PokemonStorage.rb b/Data/Scripts/016_UI/017_UI_PokemonStorage.rb
index b66b3005a..aeeb13e45 100644
--- a/Data/Scripts/016_UI/017_UI_PokemonStorage.rb
+++ b/Data/Scripts/016_UI/017_UI_PokemonStorage.rb
@@ -18,7 +18,7 @@ class PokemonBoxIcon < IconSprite
     dexNum = getDexNumberForSpecies(species)
     return true if dexNum <= Settings::NB_POKEMON
     return false if $game_variables == nil
-    return true if $game_variables[220] != 0
+    return true if $game_variables[VAR_FUSION_ICON_STYLE] != 0
     bitmapFileName = sprintf("Graphics/Icons/icon%03d", dexNum)
     return true if pbResolveBitmap(bitmapFileName)
     return false
diff --git a/Data/Scripts/049_Compatibility/Constants.rb b/Data/Scripts/049_Compatibility/Constants.rb
index 84e0ffec0..d90dc31fe 100644
--- a/Data/Scripts/049_Compatibility/Constants.rb
+++ b/Data/Scripts/049_Compatibility/Constants.rb
@@ -92,6 +92,8 @@ VAR_STANDARD_WONDERTRADE_LEFT=248
 VAR_PREMIUM_WONDERTRADE_LEFT=111
 VAR_PREMIUM_WONDERTRADE_LEFT=111
 VAR_RIVAL_STARTER=250
+VAR_FUSION_ICON_STYLE=220
+
 #Randomizer
 VAR_RANDOMIZER_WILD_POKE_BST=197
 VAR_RANDOMIZER_TRAINER_BST=195
diff --git a/Data/Skills.rxdata b/Data/Skills.rxdata
index 61cba7ea2..a45219f5e 100644
Binary files a/Data/Skills.rxdata and b/Data/Skills.rxdata differ
diff --git a/Data/States.rxdata b/Data/States.rxdata
index 0f9b4ae5d..868d49e59 100644
Binary files a/Data/States.rxdata and b/Data/States.rxdata differ
diff --git a/Data/System.rxdata b/Data/System.rxdata
index 2035b7320..61f3939ea 100644
Binary files a/Data/System.rxdata and b/Data/System.rxdata differ
diff --git a/Data/Tilesets.rxdata b/Data/Tilesets.rxdata
index a005fc327..ba9820343 100644
Binary files a/Data/Tilesets.rxdata and b/Data/Tilesets.rxdata differ
diff --git a/Data/Weapons.rxdata b/Data/Weapons.rxdata
index d9bd35260..c7ea19a7a 100644
Binary files a/Data/Weapons.rxdata and b/Data/Weapons.rxdata differ