diff --git a/android/ImagesToPackSeparately/BuildingIcons/Alhambra.png b/android/Images.Construction/BuildingIcons/Alhambra.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Alhambra.png
rename to android/Images.Construction/BuildingIcons/Alhambra.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Amphitheater.png b/android/Images.Construction/BuildingIcons/Amphitheater.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Amphitheater.png
rename to android/Images.Construction/BuildingIcons/Amphitheater.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Angkor Wat.png b/android/Images.Construction/BuildingIcons/Angkor Wat.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Angkor Wat.png
rename to android/Images.Construction/BuildingIcons/Angkor Wat.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Apollo Program.png b/android/Images.Construction/BuildingIcons/Apollo Program.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Apollo Program.png
rename to android/Images.Construction/BuildingIcons/Apollo Program.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Aqueduct.png b/android/Images.Construction/BuildingIcons/Aqueduct.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Aqueduct.png
rename to android/Images.Construction/BuildingIcons/Aqueduct.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Armory.png b/android/Images.Construction/BuildingIcons/Armory.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Armory.png
rename to android/Images.Construction/BuildingIcons/Armory.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Arsenal.png b/android/Images.Construction/BuildingIcons/Arsenal.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Arsenal.png
rename to android/Images.Construction/BuildingIcons/Arsenal.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Bank.png b/android/Images.Construction/BuildingIcons/Bank.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Bank.png
rename to android/Images.Construction/BuildingIcons/Bank.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Barracks.png b/android/Images.Construction/BuildingIcons/Barracks.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Barracks.png
rename to android/Images.Construction/BuildingIcons/Barracks.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Bazaar.png b/android/Images.Construction/BuildingIcons/Bazaar.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Bazaar.png
rename to android/Images.Construction/BuildingIcons/Bazaar.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Big Ben.png b/android/Images.Construction/BuildingIcons/Big Ben.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Big Ben.png
rename to android/Images.Construction/BuildingIcons/Big Ben.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Bomb Shelter.png b/android/Images.Construction/BuildingIcons/Bomb Shelter.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Bomb Shelter.png
rename to android/Images.Construction/BuildingIcons/Bomb Shelter.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Brandenburg Gate.png b/android/Images.Construction/BuildingIcons/Brandenburg Gate.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Brandenburg Gate.png
rename to android/Images.Construction/BuildingIcons/Brandenburg Gate.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Broadcast Tower.png b/android/Images.Construction/BuildingIcons/Broadcast Tower.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Broadcast Tower.png
rename to android/Images.Construction/BuildingIcons/Broadcast Tower.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Burial Tomb.png b/android/Images.Construction/BuildingIcons/Burial Tomb.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Burial Tomb.png
rename to android/Images.Construction/BuildingIcons/Burial Tomb.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/CN Tower.png b/android/Images.Construction/BuildingIcons/CN Tower.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/CN Tower.png
rename to android/Images.Construction/BuildingIcons/CN Tower.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Castle.png b/android/Images.Construction/BuildingIcons/Castle.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Castle.png
rename to android/Images.Construction/BuildingIcons/Castle.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Cathedral.png b/android/Images.Construction/BuildingIcons/Cathedral.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Cathedral.png
rename to android/Images.Construction/BuildingIcons/Cathedral.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Chichen Itza.png b/android/Images.Construction/BuildingIcons/Chichen Itza.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Chichen Itza.png
rename to android/Images.Construction/BuildingIcons/Chichen Itza.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Circus Maximus.png b/android/Images.Construction/BuildingIcons/Circus Maximus.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Circus Maximus.png
rename to android/Images.Construction/BuildingIcons/Circus Maximus.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Circus.png b/android/Images.Construction/BuildingIcons/Circus.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Circus.png
rename to android/Images.Construction/BuildingIcons/Circus.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Colosseum.png b/android/Images.Construction/BuildingIcons/Colosseum.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Colosseum.png
rename to android/Images.Construction/BuildingIcons/Colosseum.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Colossus.png b/android/Images.Construction/BuildingIcons/Colossus.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Colossus.png
rename to android/Images.Construction/BuildingIcons/Colossus.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Courthouse.png b/android/Images.Construction/BuildingIcons/Courthouse.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Courthouse.png
rename to android/Images.Construction/BuildingIcons/Courthouse.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Cristo Redentor.png b/android/Images.Construction/BuildingIcons/Cristo Redentor.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Cristo Redentor.png
rename to android/Images.Construction/BuildingIcons/Cristo Redentor.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Eiffel Tower.png b/android/Images.Construction/BuildingIcons/Eiffel Tower.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Eiffel Tower.png
rename to android/Images.Construction/BuildingIcons/Eiffel Tower.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Factory.png b/android/Images.Construction/BuildingIcons/Factory.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Factory.png
rename to android/Images.Construction/BuildingIcons/Factory.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Floating Gardens.png b/android/Images.Construction/BuildingIcons/Floating Gardens.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Floating Gardens.png
rename to android/Images.Construction/BuildingIcons/Floating Gardens.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Forbidden Palace.png b/android/Images.Construction/BuildingIcons/Forbidden Palace.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Forbidden Palace.png
rename to android/Images.Construction/BuildingIcons/Forbidden Palace.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Forge.png b/android/Images.Construction/BuildingIcons/Forge.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Forge.png
rename to android/Images.Construction/BuildingIcons/Forge.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Garden.png b/android/Images.Construction/BuildingIcons/Garden.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Garden.png
rename to android/Images.Construction/BuildingIcons/Garden.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Granary.png b/android/Images.Construction/BuildingIcons/Granary.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Granary.png
rename to android/Images.Construction/BuildingIcons/Granary.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Great Wall.png b/android/Images.Construction/BuildingIcons/Great Wall.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Great Wall.png
rename to android/Images.Construction/BuildingIcons/Great Wall.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Hagia Sophia.png b/android/Images.Construction/BuildingIcons/Hagia Sophia.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Hagia Sophia.png
rename to android/Images.Construction/BuildingIcons/Hagia Sophia.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Hanging Gardens.png b/android/Images.Construction/BuildingIcons/Hanging Gardens.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Hanging Gardens.png
rename to android/Images.Construction/BuildingIcons/Hanging Gardens.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Hanse.png b/android/Images.Construction/BuildingIcons/Hanse.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Hanse.png
rename to android/Images.Construction/BuildingIcons/Hanse.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Harbor.png b/android/Images.Construction/BuildingIcons/Harbor.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Harbor.png
rename to android/Images.Construction/BuildingIcons/Harbor.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Hermitage.png b/android/Images.Construction/BuildingIcons/Hermitage.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Hermitage.png
rename to android/Images.Construction/BuildingIcons/Hermitage.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Heroic Epic.png b/android/Images.Construction/BuildingIcons/Heroic Epic.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Heroic Epic.png
rename to android/Images.Construction/BuildingIcons/Heroic Epic.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Himeji Castle.png b/android/Images.Construction/BuildingIcons/Himeji Castle.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Himeji Castle.png
rename to android/Images.Construction/BuildingIcons/Himeji Castle.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Hospital.png b/android/Images.Construction/BuildingIcons/Hospital.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Hospital.png
rename to android/Images.Construction/BuildingIcons/Hospital.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Hubble Space Telescope.png b/android/Images.Construction/BuildingIcons/Hubble Space Telescope.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Hubble Space Telescope.png
rename to android/Images.Construction/BuildingIcons/Hubble Space Telescope.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Hydro Plant.png b/android/Images.Construction/BuildingIcons/Hydro Plant.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Hydro Plant.png
rename to android/Images.Construction/BuildingIcons/Hydro Plant.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Ironworks.png b/android/Images.Construction/BuildingIcons/Ironworks.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Ironworks.png
rename to android/Images.Construction/BuildingIcons/Ironworks.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Kremlin.png b/android/Images.Construction/BuildingIcons/Kremlin.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Kremlin.png
rename to android/Images.Construction/BuildingIcons/Kremlin.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Krepost.png b/android/Images.Construction/BuildingIcons/Krepost.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Krepost.png
rename to android/Images.Construction/BuildingIcons/Krepost.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Leaning Tower of Pisa.png b/android/Images.Construction/BuildingIcons/Leaning Tower of Pisa.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Leaning Tower of Pisa.png
rename to android/Images.Construction/BuildingIcons/Leaning Tower of Pisa.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Library.png b/android/Images.Construction/BuildingIcons/Library.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Library.png
rename to android/Images.Construction/BuildingIcons/Library.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Lighthouse.png b/android/Images.Construction/BuildingIcons/Lighthouse.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Lighthouse.png
rename to android/Images.Construction/BuildingIcons/Lighthouse.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Longhouse.png b/android/Images.Construction/BuildingIcons/Longhouse.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Longhouse.png
rename to android/Images.Construction/BuildingIcons/Longhouse.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Machu Picchu.png b/android/Images.Construction/BuildingIcons/Machu Picchu.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Machu Picchu.png
rename to android/Images.Construction/BuildingIcons/Machu Picchu.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Manhattan Project.png b/android/Images.Construction/BuildingIcons/Manhattan Project.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Manhattan Project.png
rename to android/Images.Construction/BuildingIcons/Manhattan Project.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Market.png b/android/Images.Construction/BuildingIcons/Market.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Market.png
rename to android/Images.Construction/BuildingIcons/Market.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Mausoleum of Halicarnassus.png b/android/Images.Construction/BuildingIcons/Mausoleum of Halicarnassus.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Mausoleum of Halicarnassus.png
rename to android/Images.Construction/BuildingIcons/Mausoleum of Halicarnassus.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Medical Lab.png b/android/Images.Construction/BuildingIcons/Medical Lab.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Medical Lab.png
rename to android/Images.Construction/BuildingIcons/Medical Lab.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Military Academy.png b/android/Images.Construction/BuildingIcons/Military Academy.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Military Academy.png
rename to android/Images.Construction/BuildingIcons/Military Academy.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Military Base.png b/android/Images.Construction/BuildingIcons/Military Base.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Military Base.png
rename to android/Images.Construction/BuildingIcons/Military Base.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Mint.png b/android/Images.Construction/BuildingIcons/Mint.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Mint.png
rename to android/Images.Construction/BuildingIcons/Mint.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Monastery.png b/android/Images.Construction/BuildingIcons/Monastery.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Monastery.png
rename to android/Images.Construction/BuildingIcons/Monastery.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Monument.png b/android/Images.Construction/BuildingIcons/Monument.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Monument.png
rename to android/Images.Construction/BuildingIcons/Monument.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Mosque.png b/android/Images.Construction/BuildingIcons/Mosque.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Mosque.png
rename to android/Images.Construction/BuildingIcons/Mosque.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Mud Pyramid Mosque.png b/android/Images.Construction/BuildingIcons/Mud Pyramid Mosque.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Mud Pyramid Mosque.png
rename to android/Images.Construction/BuildingIcons/Mud Pyramid Mosque.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Mughal Fort.png b/android/Images.Construction/BuildingIcons/Mughal Fort.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Mughal Fort.png
rename to android/Images.Construction/BuildingIcons/Mughal Fort.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Museum.png b/android/Images.Construction/BuildingIcons/Museum.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Museum.png
rename to android/Images.Construction/BuildingIcons/Museum.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/National College.png b/android/Images.Construction/BuildingIcons/National College.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/National College.png
rename to android/Images.Construction/BuildingIcons/National College.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/National Epic.png b/android/Images.Construction/BuildingIcons/National Epic.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/National Epic.png
rename to android/Images.Construction/BuildingIcons/National Epic.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/National Treasury.png b/android/Images.Construction/BuildingIcons/National Treasury.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/National Treasury.png
rename to android/Images.Construction/BuildingIcons/National Treasury.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Neuschwanstein.png b/android/Images.Construction/BuildingIcons/Neuschwanstein.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Neuschwanstein.png
rename to android/Images.Construction/BuildingIcons/Neuschwanstein.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Notre Dame.png b/android/Images.Construction/BuildingIcons/Notre Dame.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Notre Dame.png
rename to android/Images.Construction/BuildingIcons/Notre Dame.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Nuclear Plant.png b/android/Images.Construction/BuildingIcons/Nuclear Plant.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Nuclear Plant.png
rename to android/Images.Construction/BuildingIcons/Nuclear Plant.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Observatory.png b/android/Images.Construction/BuildingIcons/Observatory.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Observatory.png
rename to android/Images.Construction/BuildingIcons/Observatory.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Opera House.png b/android/Images.Construction/BuildingIcons/Opera House.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Opera House.png
rename to android/Images.Construction/BuildingIcons/Opera House.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Oxford University.png b/android/Images.Construction/BuildingIcons/Oxford University.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Oxford University.png
rename to android/Images.Construction/BuildingIcons/Oxford University.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Pagoda.png b/android/Images.Construction/BuildingIcons/Pagoda.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Pagoda.png
rename to android/Images.Construction/BuildingIcons/Pagoda.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Palace.png b/android/Images.Construction/BuildingIcons/Palace.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Palace.png
rename to android/Images.Construction/BuildingIcons/Palace.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Paper Maker.png b/android/Images.Construction/BuildingIcons/Paper Maker.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Paper Maker.png
rename to android/Images.Construction/BuildingIcons/Paper Maker.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Pentagon.png b/android/Images.Construction/BuildingIcons/Pentagon.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Pentagon.png
rename to android/Images.Construction/BuildingIcons/Pentagon.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Petra.png b/android/Images.Construction/BuildingIcons/Petra.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Petra.png
rename to android/Images.Construction/BuildingIcons/Petra.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Porcelain Tower.png b/android/Images.Construction/BuildingIcons/Porcelain Tower.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Porcelain Tower.png
rename to android/Images.Construction/BuildingIcons/Porcelain Tower.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Public School.png b/android/Images.Construction/BuildingIcons/Public School.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Public School.png
rename to android/Images.Construction/BuildingIcons/Public School.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Research Lab.png b/android/Images.Construction/BuildingIcons/Research Lab.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Research Lab.png
rename to android/Images.Construction/BuildingIcons/Research Lab.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/SS Booster.png b/android/Images.Construction/BuildingIcons/SS Booster.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/SS Booster.png
rename to android/Images.Construction/BuildingIcons/SS Booster.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/SS Cockpit.png b/android/Images.Construction/BuildingIcons/SS Cockpit.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/SS Cockpit.png
rename to android/Images.Construction/BuildingIcons/SS Cockpit.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/SS Engine.png b/android/Images.Construction/BuildingIcons/SS Engine.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/SS Engine.png
rename to android/Images.Construction/BuildingIcons/SS Engine.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/SS Stasis Chamber.png b/android/Images.Construction/BuildingIcons/SS Stasis Chamber.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/SS Stasis Chamber.png
rename to android/Images.Construction/BuildingIcons/SS Stasis Chamber.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Satrap's Court.png b/android/Images.Construction/BuildingIcons/Satrap's Court.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Satrap's Court.png
rename to android/Images.Construction/BuildingIcons/Satrap's Court.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Seaport.png b/android/Images.Construction/BuildingIcons/Seaport.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Seaport.png
rename to android/Images.Construction/BuildingIcons/Seaport.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Shrine.png b/android/Images.Construction/BuildingIcons/Shrine.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Shrine.png
rename to android/Images.Construction/BuildingIcons/Shrine.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Sistine Chapel.png b/android/Images.Construction/BuildingIcons/Sistine Chapel.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Sistine Chapel.png
rename to android/Images.Construction/BuildingIcons/Sistine Chapel.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Solar Plant.png b/android/Images.Construction/BuildingIcons/Solar Plant.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Solar Plant.png
rename to android/Images.Construction/BuildingIcons/Solar Plant.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Spaceship Factory.png b/android/Images.Construction/BuildingIcons/Spaceship Factory.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Spaceship Factory.png
rename to android/Images.Construction/BuildingIcons/Spaceship Factory.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Stable.png b/android/Images.Construction/BuildingIcons/Stable.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Stable.png
rename to android/Images.Construction/BuildingIcons/Stable.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Stadium.png b/android/Images.Construction/BuildingIcons/Stadium.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Stadium.png
rename to android/Images.Construction/BuildingIcons/Stadium.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Statue of Liberty.png b/android/Images.Construction/BuildingIcons/Statue of Liberty.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Statue of Liberty.png
rename to android/Images.Construction/BuildingIcons/Statue of Liberty.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Statue of Zeus.png b/android/Images.Construction/BuildingIcons/Statue of Zeus.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Statue of Zeus.png
rename to android/Images.Construction/BuildingIcons/Statue of Zeus.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Stock Exchange.png b/android/Images.Construction/BuildingIcons/Stock Exchange.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Stock Exchange.png
rename to android/Images.Construction/BuildingIcons/Stock Exchange.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Stone Works.png b/android/Images.Construction/BuildingIcons/Stone Works.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Stone Works.png
rename to android/Images.Construction/BuildingIcons/Stone Works.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Stonehenge.png b/android/Images.Construction/BuildingIcons/Stonehenge.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Stonehenge.png
rename to android/Images.Construction/BuildingIcons/Stonehenge.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Sydney Opera House.png b/android/Images.Construction/BuildingIcons/Sydney Opera House.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Sydney Opera House.png
rename to android/Images.Construction/BuildingIcons/Sydney Opera House.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Taj Mahal.png b/android/Images.Construction/BuildingIcons/Taj Mahal.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Taj Mahal.png
rename to android/Images.Construction/BuildingIcons/Taj Mahal.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Temple of Artemis.png b/android/Images.Construction/BuildingIcons/Temple of Artemis.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Temple of Artemis.png
rename to android/Images.Construction/BuildingIcons/Temple of Artemis.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Temple.png b/android/Images.Construction/BuildingIcons/Temple.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Temple.png
rename to android/Images.Construction/BuildingIcons/Temple.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Terracotta Army.png b/android/Images.Construction/BuildingIcons/Terracotta Army.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Terracotta Army.png
rename to android/Images.Construction/BuildingIcons/Terracotta Army.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/The Great Library.png b/android/Images.Construction/BuildingIcons/The Great Library.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/The Great Library.png
rename to android/Images.Construction/BuildingIcons/The Great Library.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/The Great Lighthouse.png b/android/Images.Construction/BuildingIcons/The Great Lighthouse.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/The Great Lighthouse.png
rename to android/Images.Construction/BuildingIcons/The Great Lighthouse.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/The Louvre.png b/android/Images.Construction/BuildingIcons/The Louvre.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/The Louvre.png
rename to android/Images.Construction/BuildingIcons/The Louvre.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/The Oracle.png b/android/Images.Construction/BuildingIcons/The Oracle.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/The Oracle.png
rename to android/Images.Construction/BuildingIcons/The Oracle.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/The Pyramids.png b/android/Images.Construction/BuildingIcons/The Pyramids.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/The Pyramids.png
rename to android/Images.Construction/BuildingIcons/The Pyramids.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Theatre.png b/android/Images.Construction/BuildingIcons/Theatre.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Theatre.png
rename to android/Images.Construction/BuildingIcons/Theatre.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/United Nations.png b/android/Images.Construction/BuildingIcons/United Nations.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/United Nations.png
rename to android/Images.Construction/BuildingIcons/United Nations.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/University.png b/android/Images.Construction/BuildingIcons/University.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/University.png
rename to android/Images.Construction/BuildingIcons/University.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Utopia Project.png b/android/Images.Construction/BuildingIcons/Utopia Project.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Utopia Project.png
rename to android/Images.Construction/BuildingIcons/Utopia Project.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Walls of Babylon.png b/android/Images.Construction/BuildingIcons/Walls of Babylon.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Walls of Babylon.png
rename to android/Images.Construction/BuildingIcons/Walls of Babylon.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Walls.png b/android/Images.Construction/BuildingIcons/Walls.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Walls.png
rename to android/Images.Construction/BuildingIcons/Walls.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Wat.png b/android/Images.Construction/BuildingIcons/Wat.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Wat.png
rename to android/Images.Construction/BuildingIcons/Wat.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Water Mill.png b/android/Images.Construction/BuildingIcons/Water Mill.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Water Mill.png
rename to android/Images.Construction/BuildingIcons/Water Mill.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Windmill.png b/android/Images.Construction/BuildingIcons/Windmill.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Windmill.png
rename to android/Images.Construction/BuildingIcons/Windmill.png
diff --git a/android/ImagesToPackSeparately/BuildingIcons/Workshop.png b/android/Images.Construction/BuildingIcons/Workshop.png
similarity index 100%
rename from android/ImagesToPackSeparately/BuildingIcons/Workshop.png
rename to android/Images.Construction/BuildingIcons/Workshop.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Anti-Aircraft Gun.png b/android/Images.Construction/UnitIcons/Anti-Aircraft Gun.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Anti-Aircraft Gun.png
rename to android/Images.Construction/UnitIcons/Anti-Aircraft Gun.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Anti-Tank Gun.png b/android/Images.Construction/UnitIcons/Anti-Tank Gun.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Anti-Tank Gun.png
rename to android/Images.Construction/UnitIcons/Anti-Tank Gun.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Archer.png b/android/Images.Construction/UnitIcons/Archer.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Archer.png
rename to android/Images.Construction/UnitIcons/Archer.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Artillery.png b/android/Images.Construction/UnitIcons/Artillery.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Artillery.png
rename to android/Images.Construction/UnitIcons/Artillery.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Atomic Bomb.png b/android/Images.Construction/UnitIcons/Atomic Bomb.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Atomic Bomb.png
rename to android/Images.Construction/UnitIcons/Atomic Bomb.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/B17.png b/android/Images.Construction/UnitIcons/B17.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/B17.png
rename to android/Images.Construction/UnitIcons/B17.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Ballista.png b/android/Images.Construction/UnitIcons/Ballista.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Ballista.png
rename to android/Images.Construction/UnitIcons/Ballista.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Battering Ram.png b/android/Images.Construction/UnitIcons/Battering Ram.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Battering Ram.png
rename to android/Images.Construction/UnitIcons/Battering Ram.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Battleship.png b/android/Images.Construction/UnitIcons/Battleship.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Battleship.png
rename to android/Images.Construction/UnitIcons/Battleship.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Berserker.png b/android/Images.Construction/UnitIcons/Berserker.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Berserker.png
rename to android/Images.Construction/UnitIcons/Berserker.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Bomber.png b/android/Images.Construction/UnitIcons/Bomber.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Bomber.png
rename to android/Images.Construction/UnitIcons/Bomber.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Bowman.png b/android/Images.Construction/UnitIcons/Bowman.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Bowman.png
rename to android/Images.Construction/UnitIcons/Bowman.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Brute.png b/android/Images.Construction/UnitIcons/Brute.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Brute.png
rename to android/Images.Construction/UnitIcons/Brute.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Camel Archer.png b/android/Images.Construction/UnitIcons/Camel Archer.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Camel Archer.png
rename to android/Images.Construction/UnitIcons/Camel Archer.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Cannon.png b/android/Images.Construction/UnitIcons/Cannon.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Cannon.png
rename to android/Images.Construction/UnitIcons/Cannon.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Caravel.png b/android/Images.Construction/UnitIcons/Caravel.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Caravel.png
rename to android/Images.Construction/UnitIcons/Caravel.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Carolean.png b/android/Images.Construction/UnitIcons/Carolean.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Carolean.png
rename to android/Images.Construction/UnitIcons/Carolean.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Carrier.png b/android/Images.Construction/UnitIcons/Carrier.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Carrier.png
rename to android/Images.Construction/UnitIcons/Carrier.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Catapult.png b/android/Images.Construction/UnitIcons/Catapult.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Catapult.png
rename to android/Images.Construction/UnitIcons/Catapult.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Cavalry.png b/android/Images.Construction/UnitIcons/Cavalry.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Cavalry.png
rename to android/Images.Construction/UnitIcons/Cavalry.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Chariot Archer.png b/android/Images.Construction/UnitIcons/Chariot Archer.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Chariot Archer.png
rename to android/Images.Construction/UnitIcons/Chariot Archer.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Chu-Ko-Nu.png b/android/Images.Construction/UnitIcons/Chu-Ko-Nu.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Chu-Ko-Nu.png
rename to android/Images.Construction/UnitIcons/Chu-Ko-Nu.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Companion Cavalry.png b/android/Images.Construction/UnitIcons/Companion Cavalry.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Companion Cavalry.png
rename to android/Images.Construction/UnitIcons/Companion Cavalry.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Composite Bowman.png b/android/Images.Construction/UnitIcons/Composite Bowman.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Composite Bowman.png
rename to android/Images.Construction/UnitIcons/Composite Bowman.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Conquistador.png b/android/Images.Construction/UnitIcons/Conquistador.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Conquistador.png
rename to android/Images.Construction/UnitIcons/Conquistador.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Cossack.png b/android/Images.Construction/UnitIcons/Cossack.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Cossack.png
rename to android/Images.Construction/UnitIcons/Cossack.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Crossbowman.png b/android/Images.Construction/UnitIcons/Crossbowman.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Crossbowman.png
rename to android/Images.Construction/UnitIcons/Crossbowman.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Destroyer.png b/android/Images.Construction/UnitIcons/Destroyer.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Destroyer.png
rename to android/Images.Construction/UnitIcons/Destroyer.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Fighter.png b/android/Images.Construction/UnitIcons/Fighter.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Fighter.png
rename to android/Images.Construction/UnitIcons/Fighter.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Foreign Legion.png b/android/Images.Construction/UnitIcons/Foreign Legion.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Foreign Legion.png
rename to android/Images.Construction/UnitIcons/Foreign Legion.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Frigate.png b/android/Images.Construction/UnitIcons/Frigate.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Frigate.png
rename to android/Images.Construction/UnitIcons/Frigate.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Galleass.png b/android/Images.Construction/UnitIcons/Galleass.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Galleass.png
rename to android/Images.Construction/UnitIcons/Galleass.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Gatling Gun.png b/android/Images.Construction/UnitIcons/Gatling Gun.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Gatling Gun.png
rename to android/Images.Construction/UnitIcons/Gatling Gun.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Giant Death Robot.png b/android/Images.Construction/UnitIcons/Giant Death Robot.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Giant Death Robot.png
rename to android/Images.Construction/UnitIcons/Giant Death Robot.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Great Artist.png b/android/Images.Construction/UnitIcons/Great Artist.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Great Artist.png
rename to android/Images.Construction/UnitIcons/Great Artist.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Great Engineer.png b/android/Images.Construction/UnitIcons/Great Engineer.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Great Engineer.png
rename to android/Images.Construction/UnitIcons/Great Engineer.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Great General.png b/android/Images.Construction/UnitIcons/Great General.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Great General.png
rename to android/Images.Construction/UnitIcons/Great General.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Great Merchant.png b/android/Images.Construction/UnitIcons/Great Merchant.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Great Merchant.png
rename to android/Images.Construction/UnitIcons/Great Merchant.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Great Prophet.png b/android/Images.Construction/UnitIcons/Great Prophet.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Great Prophet.png
rename to android/Images.Construction/UnitIcons/Great Prophet.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Great Scientist.png b/android/Images.Construction/UnitIcons/Great Scientist.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Great Scientist.png
rename to android/Images.Construction/UnitIcons/Great Scientist.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Great War Bomber.png b/android/Images.Construction/UnitIcons/Great War Bomber.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Great War Bomber.png
rename to android/Images.Construction/UnitIcons/Great War Bomber.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Great War Infantry.png b/android/Images.Construction/UnitIcons/Great War Infantry.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Great War Infantry.png
rename to android/Images.Construction/UnitIcons/Great War Infantry.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Guided Missile.png b/android/Images.Construction/UnitIcons/Guided Missile.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Guided Missile.png
rename to android/Images.Construction/UnitIcons/Guided Missile.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Hakkapeliitta.png b/android/Images.Construction/UnitIcons/Hakkapeliitta.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Hakkapeliitta.png
rename to android/Images.Construction/UnitIcons/Hakkapeliitta.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Helicopter Gunship.png b/android/Images.Construction/UnitIcons/Helicopter Gunship.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Helicopter Gunship.png
rename to android/Images.Construction/UnitIcons/Helicopter Gunship.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Hoplite.png b/android/Images.Construction/UnitIcons/Hoplite.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Hoplite.png
rename to android/Images.Construction/UnitIcons/Hoplite.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Horse Archer.png b/android/Images.Construction/UnitIcons/Horse Archer.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Horse Archer.png
rename to android/Images.Construction/UnitIcons/Horse Archer.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Horseman.png b/android/Images.Construction/UnitIcons/Horseman.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Horseman.png
rename to android/Images.Construction/UnitIcons/Horseman.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Hwach'a.png b/android/Images.Construction/UnitIcons/Hwach'a.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Hwach'a.png
rename to android/Images.Construction/UnitIcons/Hwach'a.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Infantry.png b/android/Images.Construction/UnitIcons/Infantry.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Infantry.png
rename to android/Images.Construction/UnitIcons/Infantry.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Inquisitor.png b/android/Images.Construction/UnitIcons/Inquisitor.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Inquisitor.png
rename to android/Images.Construction/UnitIcons/Inquisitor.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Ironclad.png b/android/Images.Construction/UnitIcons/Ironclad.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Ironclad.png
rename to android/Images.Construction/UnitIcons/Ironclad.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Jaguar.png b/android/Images.Construction/UnitIcons/Jaguar.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Jaguar.png
rename to android/Images.Construction/UnitIcons/Jaguar.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Janissary.png b/android/Images.Construction/UnitIcons/Janissary.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Janissary.png
rename to android/Images.Construction/UnitIcons/Janissary.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Jet Fighter.png b/android/Images.Construction/UnitIcons/Jet Fighter.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Jet Fighter.png
rename to android/Images.Construction/UnitIcons/Jet Fighter.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Keshik.png b/android/Images.Construction/UnitIcons/Keshik.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Keshik.png
rename to android/Images.Construction/UnitIcons/Keshik.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Khan.png b/android/Images.Construction/UnitIcons/Khan.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Khan.png
rename to android/Images.Construction/UnitIcons/Khan.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Knight.png b/android/Images.Construction/UnitIcons/Knight.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Knight.png
rename to android/Images.Construction/UnitIcons/Knight.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Lancer.png b/android/Images.Construction/UnitIcons/Lancer.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Lancer.png
rename to android/Images.Construction/UnitIcons/Lancer.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Landship.png b/android/Images.Construction/UnitIcons/Landship.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Landship.png
rename to android/Images.Construction/UnitIcons/Landship.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Landsknecht.png b/android/Images.Construction/UnitIcons/Landsknecht.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Landsknecht.png
rename to android/Images.Construction/UnitIcons/Landsknecht.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Legion.png b/android/Images.Construction/UnitIcons/Legion.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Legion.png
rename to android/Images.Construction/UnitIcons/Legion.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Longbowman.png b/android/Images.Construction/UnitIcons/Longbowman.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Longbowman.png
rename to android/Images.Construction/UnitIcons/Longbowman.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Longswordsman.png b/android/Images.Construction/UnitIcons/Longswordsman.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Longswordsman.png
rename to android/Images.Construction/UnitIcons/Longswordsman.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Machine Gun.png b/android/Images.Construction/UnitIcons/Machine Gun.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Machine Gun.png
rename to android/Images.Construction/UnitIcons/Machine Gun.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Mandekalu Cavalry.png b/android/Images.Construction/UnitIcons/Mandekalu Cavalry.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Mandekalu Cavalry.png
rename to android/Images.Construction/UnitIcons/Mandekalu Cavalry.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Maori Warrior.png b/android/Images.Construction/UnitIcons/Maori Warrior.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Maori Warrior.png
rename to android/Images.Construction/UnitIcons/Maori Warrior.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Marine.png b/android/Images.Construction/UnitIcons/Marine.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Marine.png
rename to android/Images.Construction/UnitIcons/Marine.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Mechanized Infantry.png b/android/Images.Construction/UnitIcons/Mechanized Infantry.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Mechanized Infantry.png
rename to android/Images.Construction/UnitIcons/Mechanized Infantry.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Minuteman.png b/android/Images.Construction/UnitIcons/Minuteman.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Minuteman.png
rename to android/Images.Construction/UnitIcons/Minuteman.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Missile Cruiser.png b/android/Images.Construction/UnitIcons/Missile Cruiser.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Missile Cruiser.png
rename to android/Images.Construction/UnitIcons/Missile Cruiser.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Missionary.png b/android/Images.Construction/UnitIcons/Missionary.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Missionary.png
rename to android/Images.Construction/UnitIcons/Missionary.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Mobile SAM.png b/android/Images.Construction/UnitIcons/Mobile SAM.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Mobile SAM.png
rename to android/Images.Construction/UnitIcons/Mobile SAM.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Modern Armor.png b/android/Images.Construction/UnitIcons/Modern Armor.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Modern Armor.png
rename to android/Images.Construction/UnitIcons/Modern Armor.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Mohawk Warrior.png b/android/Images.Construction/UnitIcons/Mohawk Warrior.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Mohawk Warrior.png
rename to android/Images.Construction/UnitIcons/Mohawk Warrior.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Musketeer.png b/android/Images.Construction/UnitIcons/Musketeer.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Musketeer.png
rename to android/Images.Construction/UnitIcons/Musketeer.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Musketman.png b/android/Images.Construction/UnitIcons/Musketman.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Musketman.png
rename to android/Images.Construction/UnitIcons/Musketman.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Naresuan's Elephant.png b/android/Images.Construction/UnitIcons/Naresuan's Elephant.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Naresuan's Elephant.png
rename to android/Images.Construction/UnitIcons/Naresuan's Elephant.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Norwegian Ski Infantry.png b/android/Images.Construction/UnitIcons/Norwegian Ski Infantry.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Norwegian Ski Infantry.png
rename to android/Images.Construction/UnitIcons/Norwegian Ski Infantry.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Nuclear Missile.png b/android/Images.Construction/UnitIcons/Nuclear Missile.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Nuclear Missile.png
rename to android/Images.Construction/UnitIcons/Nuclear Missile.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Nuclear Submarine.png b/android/Images.Construction/UnitIcons/Nuclear Submarine.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Nuclear Submarine.png
rename to android/Images.Construction/UnitIcons/Nuclear Submarine.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Panzer.png b/android/Images.Construction/UnitIcons/Panzer.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Panzer.png
rename to android/Images.Construction/UnitIcons/Panzer.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Paratrooper.png b/android/Images.Construction/UnitIcons/Paratrooper.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Paratrooper.png
rename to android/Images.Construction/UnitIcons/Paratrooper.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Persian Immortal.png b/android/Images.Construction/UnitIcons/Persian Immortal.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Persian Immortal.png
rename to android/Images.Construction/UnitIcons/Persian Immortal.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Pikeman.png b/android/Images.Construction/UnitIcons/Pikeman.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Pikeman.png
rename to android/Images.Construction/UnitIcons/Pikeman.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Privateer.png b/android/Images.Construction/UnitIcons/Privateer.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Privateer.png
rename to android/Images.Construction/UnitIcons/Privateer.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Rifleman.png b/android/Images.Construction/UnitIcons/Rifleman.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Rifleman.png
rename to android/Images.Construction/UnitIcons/Rifleman.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Rocket Artillery.png b/android/Images.Construction/UnitIcons/Rocket Artillery.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Rocket Artillery.png
rename to android/Images.Construction/UnitIcons/Rocket Artillery.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Samurai.png b/android/Images.Construction/UnitIcons/Samurai.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Samurai.png
rename to android/Images.Construction/UnitIcons/Samurai.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Scout.png b/android/Images.Construction/UnitIcons/Scout.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Scout.png
rename to android/Images.Construction/UnitIcons/Scout.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Sea Beggar.png b/android/Images.Construction/UnitIcons/Sea Beggar.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Sea Beggar.png
rename to android/Images.Construction/UnitIcons/Sea Beggar.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Settler.png b/android/Images.Construction/UnitIcons/Settler.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Settler.png
rename to android/Images.Construction/UnitIcons/Settler.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Ship of the Line.png b/android/Images.Construction/UnitIcons/Ship of the Line.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Ship of the Line.png
rename to android/Images.Construction/UnitIcons/Ship of the Line.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Sipahi.png b/android/Images.Construction/UnitIcons/Sipahi.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Sipahi.png
rename to android/Images.Construction/UnitIcons/Sipahi.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Slinger.png b/android/Images.Construction/UnitIcons/Slinger.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Slinger.png
rename to android/Images.Construction/UnitIcons/Slinger.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Spearman.png b/android/Images.Construction/UnitIcons/Spearman.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Spearman.png
rename to android/Images.Construction/UnitIcons/Spearman.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Stealth Bomber.png b/android/Images.Construction/UnitIcons/Stealth Bomber.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Stealth Bomber.png
rename to android/Images.Construction/UnitIcons/Stealth Bomber.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Submarine.png b/android/Images.Construction/UnitIcons/Submarine.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Submarine.png
rename to android/Images.Construction/UnitIcons/Submarine.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Swordsman.png b/android/Images.Construction/UnitIcons/Swordsman.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Swordsman.png
rename to android/Images.Construction/UnitIcons/Swordsman.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Tank.png b/android/Images.Construction/UnitIcons/Tank.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Tank.png
rename to android/Images.Construction/UnitIcons/Tank.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Tercio.png b/android/Images.Construction/UnitIcons/Tercio.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Tercio.png
rename to android/Images.Construction/UnitIcons/Tercio.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Trebuchet.png b/android/Images.Construction/UnitIcons/Trebuchet.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Trebuchet.png
rename to android/Images.Construction/UnitIcons/Trebuchet.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Triplane.png b/android/Images.Construction/UnitIcons/Triplane.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Triplane.png
rename to android/Images.Construction/UnitIcons/Triplane.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Trireme.png b/android/Images.Construction/UnitIcons/Trireme.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Trireme.png
rename to android/Images.Construction/UnitIcons/Trireme.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Turtle Ship.png b/android/Images.Construction/UnitIcons/Turtle Ship.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Turtle Ship.png
rename to android/Images.Construction/UnitIcons/Turtle Ship.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/War Chariot.png b/android/Images.Construction/UnitIcons/War Chariot.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/War Chariot.png
rename to android/Images.Construction/UnitIcons/War Chariot.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/War Elephant.png b/android/Images.Construction/UnitIcons/War Elephant.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/War Elephant.png
rename to android/Images.Construction/UnitIcons/War Elephant.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Warrior.png b/android/Images.Construction/UnitIcons/Warrior.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Warrior.png
rename to android/Images.Construction/UnitIcons/Warrior.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Work Boats.png b/android/Images.Construction/UnitIcons/Work Boats.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Work Boats.png
rename to android/Images.Construction/UnitIcons/Work Boats.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Worker.png b/android/Images.Construction/UnitIcons/Worker.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Worker.png
rename to android/Images.Construction/UnitIcons/Worker.png
diff --git a/android/ImagesToPackSeparately/UnitIcons/Zero.png b/android/Images.Construction/UnitIcons/Zero.png
similarity index 100%
rename from android/ImagesToPackSeparately/UnitIcons/Zero.png
rename to android/Images.Construction/UnitIcons/Zero.png
diff --git a/android/ImagesToPackSeparately/FlagIcons/Brazilian_Portuguese.png b/android/Images.Flags/FlagIcons/Brazilian_Portuguese.png
similarity index 100%
rename from android/ImagesToPackSeparately/FlagIcons/Brazilian_Portuguese.png
rename to android/Images.Flags/FlagIcons/Brazilian_Portuguese.png
diff --git a/android/ImagesToPackSeparately/FlagIcons/Bulgarian.png b/android/Images.Flags/FlagIcons/Bulgarian.png
similarity index 100%
rename from android/ImagesToPackSeparately/FlagIcons/Bulgarian.png
rename to android/Images.Flags/FlagIcons/Bulgarian.png
diff --git a/android/ImagesToPackSeparately/FlagIcons/Czech.png b/android/Images.Flags/FlagIcons/Czech.png
similarity index 100%
rename from android/ImagesToPackSeparately/FlagIcons/Czech.png
rename to android/Images.Flags/FlagIcons/Czech.png
diff --git a/android/ImagesToPackSeparately/FlagIcons/Dutch.png b/android/Images.Flags/FlagIcons/Dutch.png
similarity index 100%
rename from android/ImagesToPackSeparately/FlagIcons/Dutch.png
rename to android/Images.Flags/FlagIcons/Dutch.png
diff --git a/android/ImagesToPackSeparately/FlagIcons/English.png b/android/Images.Flags/FlagIcons/English.png
similarity index 100%
rename from android/ImagesToPackSeparately/FlagIcons/English.png
rename to android/Images.Flags/FlagIcons/English.png
diff --git a/android/ImagesToPackSeparately/FlagIcons/Finnish.png b/android/Images.Flags/FlagIcons/Finnish.png
similarity index 100%
rename from android/ImagesToPackSeparately/FlagIcons/Finnish.png
rename to android/Images.Flags/FlagIcons/Finnish.png
diff --git a/android/ImagesToPackSeparately/FlagIcons/French.png b/android/Images.Flags/FlagIcons/French.png
similarity index 100%
rename from android/ImagesToPackSeparately/FlagIcons/French.png
rename to android/Images.Flags/FlagIcons/French.png
diff --git a/android/ImagesToPackSeparately/FlagIcons/German.png b/android/Images.Flags/FlagIcons/German.png
similarity index 100%
rename from android/ImagesToPackSeparately/FlagIcons/German.png
rename to android/Images.Flags/FlagIcons/German.png
diff --git a/android/ImagesToPackSeparately/FlagIcons/Hungarian.png b/android/Images.Flags/FlagIcons/Hungarian.png
similarity index 100%
rename from android/ImagesToPackSeparately/FlagIcons/Hungarian.png
rename to android/Images.Flags/FlagIcons/Hungarian.png
diff --git a/android/ImagesToPackSeparately/FlagIcons/Indonesian.png b/android/Images.Flags/FlagIcons/Indonesian.png
similarity index 100%
rename from android/ImagesToPackSeparately/FlagIcons/Indonesian.png
rename to android/Images.Flags/FlagIcons/Indonesian.png
diff --git a/android/ImagesToPackSeparately/FlagIcons/Italian.png b/android/Images.Flags/FlagIcons/Italian.png
similarity index 100%
rename from android/ImagesToPackSeparately/FlagIcons/Italian.png
rename to android/Images.Flags/FlagIcons/Italian.png
diff --git a/android/ImagesToPackSeparately/FlagIcons/Japanese.png b/android/Images.Flags/FlagIcons/Japanese.png
similarity index 100%
rename from android/ImagesToPackSeparately/FlagIcons/Japanese.png
rename to android/Images.Flags/FlagIcons/Japanese.png
diff --git a/android/ImagesToPackSeparately/FlagIcons/Korean.png b/android/Images.Flags/FlagIcons/Korean.png
similarity index 100%
rename from android/ImagesToPackSeparately/FlagIcons/Korean.png
rename to android/Images.Flags/FlagIcons/Korean.png
diff --git a/android/ImagesToPackSeparately/FlagIcons/Lithuanian.png b/android/Images.Flags/FlagIcons/Lithuanian.png
similarity index 100%
rename from android/ImagesToPackSeparately/FlagIcons/Lithuanian.png
rename to android/Images.Flags/FlagIcons/Lithuanian.png
diff --git a/android/ImagesToPackSeparately/FlagIcons/Malay.png b/android/Images.Flags/FlagIcons/Malay.png
similarity index 100%
rename from android/ImagesToPackSeparately/FlagIcons/Malay.png
rename to android/Images.Flags/FlagIcons/Malay.png
diff --git a/android/ImagesToPackSeparately/FlagIcons/Persian_(Pinglish-DIN).png b/android/Images.Flags/FlagIcons/Persian_(Pinglish-DIN).png
similarity index 100%
rename from android/ImagesToPackSeparately/FlagIcons/Persian_(Pinglish-DIN).png
rename to android/Images.Flags/FlagIcons/Persian_(Pinglish-DIN).png
diff --git a/android/ImagesToPackSeparately/FlagIcons/Persian_(Pinglish-UN).png b/android/Images.Flags/FlagIcons/Persian_(Pinglish-UN).png
similarity index 100%
rename from android/ImagesToPackSeparately/FlagIcons/Persian_(Pinglish-UN).png
rename to android/Images.Flags/FlagIcons/Persian_(Pinglish-UN).png
diff --git a/android/ImagesToPackSeparately/FlagIcons/Polish.png b/android/Images.Flags/FlagIcons/Polish.png
similarity index 100%
rename from android/ImagesToPackSeparately/FlagIcons/Polish.png
rename to android/Images.Flags/FlagIcons/Polish.png
diff --git a/android/ImagesToPackSeparately/FlagIcons/Portuguese.png b/android/Images.Flags/FlagIcons/Portuguese.png
similarity index 100%
rename from android/ImagesToPackSeparately/FlagIcons/Portuguese.png
rename to android/Images.Flags/FlagIcons/Portuguese.png
diff --git a/android/ImagesToPackSeparately/FlagIcons/Romanian.png b/android/Images.Flags/FlagIcons/Romanian.png
similarity index 100%
rename from android/ImagesToPackSeparately/FlagIcons/Romanian.png
rename to android/Images.Flags/FlagIcons/Romanian.png
diff --git a/android/ImagesToPackSeparately/FlagIcons/Russian.png b/android/Images.Flags/FlagIcons/Russian.png
similarity index 100%
rename from android/ImagesToPackSeparately/FlagIcons/Russian.png
rename to android/Images.Flags/FlagIcons/Russian.png
diff --git a/android/ImagesToPackSeparately/FlagIcons/Simplified_Chinese.png b/android/Images.Flags/FlagIcons/Simplified_Chinese.png
similarity index 100%
rename from android/ImagesToPackSeparately/FlagIcons/Simplified_Chinese.png
rename to android/Images.Flags/FlagIcons/Simplified_Chinese.png
diff --git a/android/ImagesToPackSeparately/FlagIcons/Spanish.png b/android/Images.Flags/FlagIcons/Spanish.png
similarity index 100%
rename from android/ImagesToPackSeparately/FlagIcons/Spanish.png
rename to android/Images.Flags/FlagIcons/Spanish.png
diff --git a/android/ImagesToPackSeparately/FlagIcons/Swedish.png b/android/Images.Flags/FlagIcons/Swedish.png
similarity index 100%
rename from android/ImagesToPackSeparately/FlagIcons/Swedish.png
rename to android/Images.Flags/FlagIcons/Swedish.png
diff --git a/android/ImagesToPackSeparately/FlagIcons/Thai.png b/android/Images.Flags/FlagIcons/Thai.png
similarity index 100%
rename from android/ImagesToPackSeparately/FlagIcons/Thai.png
rename to android/Images.Flags/FlagIcons/Thai.png
diff --git a/android/ImagesToPackSeparately/FlagIcons/Traditional_Chinese.png b/android/Images.Flags/FlagIcons/Traditional_Chinese.png
similarity index 100%
rename from android/ImagesToPackSeparately/FlagIcons/Traditional_Chinese.png
rename to android/Images.Flags/FlagIcons/Traditional_Chinese.png
diff --git a/android/ImagesToPackSeparately/FlagIcons/Turkish.png b/android/Images.Flags/FlagIcons/Turkish.png
similarity index 100%
rename from android/ImagesToPackSeparately/FlagIcons/Turkish.png
rename to android/Images.Flags/FlagIcons/Turkish.png
diff --git a/android/ImagesToPackSeparately/FlagIcons/Ukrainian.png b/android/Images.Flags/FlagIcons/Ukrainian.png
similarity index 100%
rename from android/ImagesToPackSeparately/FlagIcons/Ukrainian.png
rename to android/Images.Flags/FlagIcons/Ukrainian.png
diff --git a/android/ImagesToPackSeparately/FlagIcons/Vietnamese.png b/android/Images.Flags/FlagIcons/Vietnamese.png
similarity index 100%
rename from android/ImagesToPackSeparately/FlagIcons/Vietnamese.png
rename to android/Images.Flags/FlagIcons/Vietnamese.png
diff --git a/android/Images/TechIcons/Acoustics.png b/android/Images.Tech/TechIcons/Acoustics.png
similarity index 100%
rename from android/Images/TechIcons/Acoustics.png
rename to android/Images.Tech/TechIcons/Acoustics.png
diff --git a/android/Images/TechIcons/Advanced Ballistics.png b/android/Images.Tech/TechIcons/Advanced Ballistics.png
similarity index 100%
rename from android/Images/TechIcons/Advanced Ballistics.png
rename to android/Images.Tech/TechIcons/Advanced Ballistics.png
diff --git a/android/Images/TechIcons/Agriculture.png b/android/Images.Tech/TechIcons/Agriculture.png
similarity index 100%
rename from android/Images/TechIcons/Agriculture.png
rename to android/Images.Tech/TechIcons/Agriculture.png
diff --git a/android/Images/TechIcons/Animal Husbandry.png b/android/Images.Tech/TechIcons/Animal Husbandry.png
similarity index 100%
rename from android/Images/TechIcons/Animal Husbandry.png
rename to android/Images.Tech/TechIcons/Animal Husbandry.png
diff --git a/android/Images/TechIcons/Archaeology.png b/android/Images.Tech/TechIcons/Archaeology.png
similarity index 100%
rename from android/Images/TechIcons/Archaeology.png
rename to android/Images.Tech/TechIcons/Archaeology.png
diff --git a/android/Images/TechIcons/Archery.png b/android/Images.Tech/TechIcons/Archery.png
similarity index 100%
rename from android/Images/TechIcons/Archery.png
rename to android/Images.Tech/TechIcons/Archery.png
diff --git a/android/Images/TechIcons/Architecture.png b/android/Images.Tech/TechIcons/Architecture.png
similarity index 100%
rename from android/Images/TechIcons/Architecture.png
rename to android/Images.Tech/TechIcons/Architecture.png
diff --git a/android/Images/TechIcons/Astronomy.png b/android/Images.Tech/TechIcons/Astronomy.png
similarity index 100%
rename from android/Images/TechIcons/Astronomy.png
rename to android/Images.Tech/TechIcons/Astronomy.png
diff --git a/android/Images/TechIcons/Atomic Theory.png b/android/Images.Tech/TechIcons/Atomic Theory.png
similarity index 100%
rename from android/Images/TechIcons/Atomic Theory.png
rename to android/Images.Tech/TechIcons/Atomic Theory.png
diff --git a/android/Images/TechIcons/Ballistics.png b/android/Images.Tech/TechIcons/Ballistics.png
similarity index 100%
rename from android/Images/TechIcons/Ballistics.png
rename to android/Images.Tech/TechIcons/Ballistics.png
diff --git a/android/Images/TechIcons/Banking.png b/android/Images.Tech/TechIcons/Banking.png
similarity index 100%
rename from android/Images/TechIcons/Banking.png
rename to android/Images.Tech/TechIcons/Banking.png
diff --git a/android/Images/TechIcons/Biology.png b/android/Images.Tech/TechIcons/Biology.png
similarity index 100%
rename from android/Images/TechIcons/Biology.png
rename to android/Images.Tech/TechIcons/Biology.png
diff --git a/android/Images/TechIcons/Bronze Working.png b/android/Images.Tech/TechIcons/Bronze Working.png
similarity index 100%
rename from android/Images/TechIcons/Bronze Working.png
rename to android/Images.Tech/TechIcons/Bronze Working.png
diff --git a/android/Images/TechIcons/Calendar.png b/android/Images.Tech/TechIcons/Calendar.png
similarity index 100%
rename from android/Images/TechIcons/Calendar.png
rename to android/Images.Tech/TechIcons/Calendar.png
diff --git a/android/Images/TechIcons/Chemistry.png b/android/Images.Tech/TechIcons/Chemistry.png
similarity index 100%
rename from android/Images/TechIcons/Chemistry.png
rename to android/Images.Tech/TechIcons/Chemistry.png
diff --git a/android/Images/TechIcons/Chivalry.png b/android/Images.Tech/TechIcons/Chivalry.png
similarity index 100%
rename from android/Images/TechIcons/Chivalry.png
rename to android/Images.Tech/TechIcons/Chivalry.png
diff --git a/android/Images/TechIcons/Civil Service.png b/android/Images.Tech/TechIcons/Civil Service.png
similarity index 100%
rename from android/Images/TechIcons/Civil Service.png
rename to android/Images.Tech/TechIcons/Civil Service.png
diff --git a/android/Images/TechIcons/Combined Arms.png b/android/Images.Tech/TechIcons/Combined Arms.png
similarity index 100%
rename from android/Images/TechIcons/Combined Arms.png
rename to android/Images.Tech/TechIcons/Combined Arms.png
diff --git a/android/Images/TechIcons/Combustion.png b/android/Images.Tech/TechIcons/Combustion.png
similarity index 100%
rename from android/Images/TechIcons/Combustion.png
rename to android/Images.Tech/TechIcons/Combustion.png
diff --git a/android/Images/TechIcons/Compass.png b/android/Images.Tech/TechIcons/Compass.png
similarity index 100%
rename from android/Images/TechIcons/Compass.png
rename to android/Images.Tech/TechIcons/Compass.png
diff --git a/android/Images/TechIcons/Computers.png b/android/Images.Tech/TechIcons/Computers.png
similarity index 100%
rename from android/Images/TechIcons/Computers.png
rename to android/Images.Tech/TechIcons/Computers.png
diff --git a/android/Images/TechIcons/Construction.png b/android/Images.Tech/TechIcons/Construction.png
similarity index 100%
rename from android/Images/TechIcons/Construction.png
rename to android/Images.Tech/TechIcons/Construction.png
diff --git a/android/Images/TechIcons/Currency.png b/android/Images.Tech/TechIcons/Currency.png
similarity index 100%
rename from android/Images/TechIcons/Currency.png
rename to android/Images.Tech/TechIcons/Currency.png
diff --git a/android/Images/TechIcons/Drama and Poetry.png b/android/Images.Tech/TechIcons/Drama and Poetry.png
similarity index 100%
rename from android/Images/TechIcons/Drama and Poetry.png
rename to android/Images.Tech/TechIcons/Drama and Poetry.png
diff --git a/android/Images/TechIcons/Dynamite.png b/android/Images.Tech/TechIcons/Dynamite.png
similarity index 100%
rename from android/Images/TechIcons/Dynamite.png
rename to android/Images.Tech/TechIcons/Dynamite.png
diff --git a/android/Images/TechIcons/Ecology.png b/android/Images.Tech/TechIcons/Ecology.png
similarity index 100%
rename from android/Images/TechIcons/Ecology.png
rename to android/Images.Tech/TechIcons/Ecology.png
diff --git a/android/Images/TechIcons/Economics.png b/android/Images.Tech/TechIcons/Economics.png
similarity index 100%
rename from android/Images/TechIcons/Economics.png
rename to android/Images.Tech/TechIcons/Economics.png
diff --git a/android/Images/TechIcons/Education.png b/android/Images.Tech/TechIcons/Education.png
similarity index 100%
rename from android/Images/TechIcons/Education.png
rename to android/Images.Tech/TechIcons/Education.png
diff --git a/android/Images/TechIcons/Electricity.png b/android/Images.Tech/TechIcons/Electricity.png
similarity index 100%
rename from android/Images/TechIcons/Electricity.png
rename to android/Images.Tech/TechIcons/Electricity.png
diff --git a/android/Images/TechIcons/Electronics.png b/android/Images.Tech/TechIcons/Electronics.png
similarity index 100%
rename from android/Images/TechIcons/Electronics.png
rename to android/Images.Tech/TechIcons/Electronics.png
diff --git a/android/Images/TechIcons/Engineering.png b/android/Images.Tech/TechIcons/Engineering.png
similarity index 100%
rename from android/Images/TechIcons/Engineering.png
rename to android/Images.Tech/TechIcons/Engineering.png
diff --git a/android/Images/TechIcons/Fertilizer.png b/android/Images.Tech/TechIcons/Fertilizer.png
similarity index 100%
rename from android/Images/TechIcons/Fertilizer.png
rename to android/Images.Tech/TechIcons/Fertilizer.png
diff --git a/android/Images/TechIcons/Flight.png b/android/Images.Tech/TechIcons/Flight.png
similarity index 100%
rename from android/Images/TechIcons/Flight.png
rename to android/Images.Tech/TechIcons/Flight.png
diff --git a/android/Images/TechIcons/Future Tech.png b/android/Images.Tech/TechIcons/Future Tech.png
similarity index 100%
rename from android/Images/TechIcons/Future Tech.png
rename to android/Images.Tech/TechIcons/Future Tech.png
diff --git a/android/Images/TechIcons/Globalization.png b/android/Images.Tech/TechIcons/Globalization.png
similarity index 100%
rename from android/Images/TechIcons/Globalization.png
rename to android/Images.Tech/TechIcons/Globalization.png
diff --git a/android/Images/TechIcons/Guilds.png b/android/Images.Tech/TechIcons/Guilds.png
similarity index 100%
rename from android/Images/TechIcons/Guilds.png
rename to android/Images.Tech/TechIcons/Guilds.png
diff --git a/android/Images/TechIcons/Gunpowder.png b/android/Images.Tech/TechIcons/Gunpowder.png
similarity index 100%
rename from android/Images/TechIcons/Gunpowder.png
rename to android/Images.Tech/TechIcons/Gunpowder.png
diff --git a/android/Images/TechIcons/Horseback Riding.png b/android/Images.Tech/TechIcons/Horseback Riding.png
similarity index 100%
rename from android/Images/TechIcons/Horseback Riding.png
rename to android/Images.Tech/TechIcons/Horseback Riding.png
diff --git a/android/Images/TechIcons/Industrialization.png b/android/Images.Tech/TechIcons/Industrialization.png
similarity index 100%
rename from android/Images/TechIcons/Industrialization.png
rename to android/Images.Tech/TechIcons/Industrialization.png
diff --git a/android/Images/TechIcons/Iron Working.png b/android/Images.Tech/TechIcons/Iron Working.png
similarity index 100%
rename from android/Images/TechIcons/Iron Working.png
rename to android/Images.Tech/TechIcons/Iron Working.png
diff --git a/android/Images/TechIcons/Lasers.png b/android/Images.Tech/TechIcons/Lasers.png
similarity index 100%
rename from android/Images/TechIcons/Lasers.png
rename to android/Images.Tech/TechIcons/Lasers.png
diff --git a/android/Images/TechIcons/Machinery.png b/android/Images.Tech/TechIcons/Machinery.png
similarity index 100%
rename from android/Images/TechIcons/Machinery.png
rename to android/Images.Tech/TechIcons/Machinery.png
diff --git a/android/Images/TechIcons/Masonry.png b/android/Images.Tech/TechIcons/Masonry.png
similarity index 100%
rename from android/Images/TechIcons/Masonry.png
rename to android/Images.Tech/TechIcons/Masonry.png
diff --git a/android/Images/TechIcons/Mass Media.png b/android/Images.Tech/TechIcons/Mass Media.png
similarity index 100%
rename from android/Images/TechIcons/Mass Media.png
rename to android/Images.Tech/TechIcons/Mass Media.png
diff --git a/android/Images/TechIcons/Mathematics.png b/android/Images.Tech/TechIcons/Mathematics.png
similarity index 100%
rename from android/Images/TechIcons/Mathematics.png
rename to android/Images.Tech/TechIcons/Mathematics.png
diff --git a/android/Images/TechIcons/Metal Casting.png b/android/Images.Tech/TechIcons/Metal Casting.png
similarity index 100%
rename from android/Images/TechIcons/Metal Casting.png
rename to android/Images.Tech/TechIcons/Metal Casting.png
diff --git a/android/Images/TechIcons/Metallurgy.png b/android/Images.Tech/TechIcons/Metallurgy.png
similarity index 100%
rename from android/Images/TechIcons/Metallurgy.png
rename to android/Images.Tech/TechIcons/Metallurgy.png
diff --git a/android/Images/TechIcons/Military Science.png b/android/Images.Tech/TechIcons/Military Science.png
similarity index 100%
rename from android/Images/TechIcons/Military Science.png
rename to android/Images.Tech/TechIcons/Military Science.png
diff --git a/android/Images/TechIcons/Mining.png b/android/Images.Tech/TechIcons/Mining.png
similarity index 100%
rename from android/Images/TechIcons/Mining.png
rename to android/Images.Tech/TechIcons/Mining.png
diff --git a/android/Images/TechIcons/Mobile Tactics.png b/android/Images.Tech/TechIcons/Mobile Tactics.png
similarity index 100%
rename from android/Images/TechIcons/Mobile Tactics.png
rename to android/Images.Tech/TechIcons/Mobile Tactics.png
diff --git a/android/Images/TechIcons/Nanotechnology.png b/android/Images.Tech/TechIcons/Nanotechnology.png
similarity index 100%
rename from android/Images/TechIcons/Nanotechnology.png
rename to android/Images.Tech/TechIcons/Nanotechnology.png
diff --git a/android/Images/TechIcons/Navigation.png b/android/Images.Tech/TechIcons/Navigation.png
similarity index 100%
rename from android/Images/TechIcons/Navigation.png
rename to android/Images.Tech/TechIcons/Navigation.png
diff --git a/android/Images/TechIcons/Nuclear Fission.png b/android/Images.Tech/TechIcons/Nuclear Fission.png
similarity index 100%
rename from android/Images/TechIcons/Nuclear Fission.png
rename to android/Images.Tech/TechIcons/Nuclear Fission.png
diff --git a/android/Images/TechIcons/Nuclear Fusion.png b/android/Images.Tech/TechIcons/Nuclear Fusion.png
similarity index 100%
rename from android/Images/TechIcons/Nuclear Fusion.png
rename to android/Images.Tech/TechIcons/Nuclear Fusion.png
diff --git a/android/Images/TechIcons/Optics.png b/android/Images.Tech/TechIcons/Optics.png
similarity index 100%
rename from android/Images/TechIcons/Optics.png
rename to android/Images.Tech/TechIcons/Optics.png
diff --git a/android/Images/TechIcons/Particle Physics.png b/android/Images.Tech/TechIcons/Particle Physics.png
similarity index 100%
rename from android/Images/TechIcons/Particle Physics.png
rename to android/Images.Tech/TechIcons/Particle Physics.png
diff --git a/android/Images/TechIcons/Pharmaceuticals.png b/android/Images.Tech/TechIcons/Pharmaceuticals.png
similarity index 100%
rename from android/Images/TechIcons/Pharmaceuticals.png
rename to android/Images.Tech/TechIcons/Pharmaceuticals.png
diff --git a/android/Images/TechIcons/Philosophy.png b/android/Images.Tech/TechIcons/Philosophy.png
similarity index 100%
rename from android/Images/TechIcons/Philosophy.png
rename to android/Images.Tech/TechIcons/Philosophy.png
diff --git a/android/Images/TechIcons/Physics.png b/android/Images.Tech/TechIcons/Physics.png
similarity index 100%
rename from android/Images/TechIcons/Physics.png
rename to android/Images.Tech/TechIcons/Physics.png
diff --git a/android/Images/TechIcons/Plastics.png b/android/Images.Tech/TechIcons/Plastics.png
similarity index 100%
rename from android/Images/TechIcons/Plastics.png
rename to android/Images.Tech/TechIcons/Plastics.png
diff --git a/android/Images/TechIcons/Pottery.png b/android/Images.Tech/TechIcons/Pottery.png
similarity index 100%
rename from android/Images/TechIcons/Pottery.png
rename to android/Images.Tech/TechIcons/Pottery.png
diff --git a/android/Images/TechIcons/Printing Press.png b/android/Images.Tech/TechIcons/Printing Press.png
similarity index 100%
rename from android/Images/TechIcons/Printing Press.png
rename to android/Images.Tech/TechIcons/Printing Press.png
diff --git a/android/Images/TechIcons/Radar.png b/android/Images.Tech/TechIcons/Radar.png
similarity index 100%
rename from android/Images/TechIcons/Radar.png
rename to android/Images.Tech/TechIcons/Radar.png
diff --git a/android/Images/TechIcons/Radio.png b/android/Images.Tech/TechIcons/Radio.png
similarity index 100%
rename from android/Images/TechIcons/Radio.png
rename to android/Images.Tech/TechIcons/Radio.png
diff --git a/android/Images/TechIcons/Railroads.png b/android/Images.Tech/TechIcons/Railroads.png
similarity index 100%
rename from android/Images/TechIcons/Railroads.png
rename to android/Images.Tech/TechIcons/Railroads.png
diff --git a/android/Images/TechIcons/Refrigeration.png b/android/Images.Tech/TechIcons/Refrigeration.png
similarity index 100%
rename from android/Images/TechIcons/Refrigeration.png
rename to android/Images.Tech/TechIcons/Refrigeration.png
diff --git a/android/Images/TechIcons/Replaceable Parts.png b/android/Images.Tech/TechIcons/Replaceable Parts.png
similarity index 100%
rename from android/Images/TechIcons/Replaceable Parts.png
rename to android/Images.Tech/TechIcons/Replaceable Parts.png
diff --git a/android/Images/TechIcons/Rifling.png b/android/Images.Tech/TechIcons/Rifling.png
similarity index 100%
rename from android/Images/TechIcons/Rifling.png
rename to android/Images.Tech/TechIcons/Rifling.png
diff --git a/android/Images/TechIcons/Robotics.png b/android/Images.Tech/TechIcons/Robotics.png
similarity index 100%
rename from android/Images/TechIcons/Robotics.png
rename to android/Images.Tech/TechIcons/Robotics.png
diff --git a/android/Images/TechIcons/Rocketry.png b/android/Images.Tech/TechIcons/Rocketry.png
similarity index 100%
rename from android/Images/TechIcons/Rocketry.png
rename to android/Images.Tech/TechIcons/Rocketry.png
diff --git a/android/Images/TechIcons/Sailing.png b/android/Images.Tech/TechIcons/Sailing.png
similarity index 100%
rename from android/Images/TechIcons/Sailing.png
rename to android/Images.Tech/TechIcons/Sailing.png
diff --git a/android/Images/TechIcons/Satellites.png b/android/Images.Tech/TechIcons/Satellites.png
similarity index 100%
rename from android/Images/TechIcons/Satellites.png
rename to android/Images.Tech/TechIcons/Satellites.png
diff --git a/android/Images/TechIcons/Scientific Theory.png b/android/Images.Tech/TechIcons/Scientific Theory.png
similarity index 100%
rename from android/Images/TechIcons/Scientific Theory.png
rename to android/Images.Tech/TechIcons/Scientific Theory.png
diff --git a/android/Images/TechIcons/Stealth.png b/android/Images.Tech/TechIcons/Stealth.png
similarity index 100%
rename from android/Images/TechIcons/Stealth.png
rename to android/Images.Tech/TechIcons/Stealth.png
diff --git a/android/Images/TechIcons/Steam Power.png b/android/Images.Tech/TechIcons/Steam Power.png
similarity index 100%
rename from android/Images/TechIcons/Steam Power.png
rename to android/Images.Tech/TechIcons/Steam Power.png
diff --git a/android/Images/TechIcons/Steel.png b/android/Images.Tech/TechIcons/Steel.png
similarity index 100%
rename from android/Images/TechIcons/Steel.png
rename to android/Images.Tech/TechIcons/Steel.png
diff --git a/android/Images/TechIcons/Telecommunications.png b/android/Images.Tech/TechIcons/Telecommunications.png
similarity index 100%
rename from android/Images/TechIcons/Telecommunications.png
rename to android/Images.Tech/TechIcons/Telecommunications.png
diff --git a/android/Images/TechIcons/The Wheel.png b/android/Images.Tech/TechIcons/The Wheel.png
similarity index 100%
rename from android/Images/TechIcons/The Wheel.png
rename to android/Images.Tech/TechIcons/The Wheel.png
diff --git a/android/Images/TechIcons/Theology.png b/android/Images.Tech/TechIcons/Theology.png
similarity index 100%
rename from android/Images/TechIcons/Theology.png
rename to android/Images.Tech/TechIcons/Theology.png
diff --git a/android/Images/TechIcons/Trapping.png b/android/Images.Tech/TechIcons/Trapping.png
similarity index 100%
rename from android/Images/TechIcons/Trapping.png
rename to android/Images.Tech/TechIcons/Trapping.png
diff --git a/android/Images/TechIcons/Writing.png b/android/Images.Tech/TechIcons/Writing.png
similarity index 100%
rename from android/Images/TechIcons/Writing.png
rename to android/Images.Tech/TechIcons/Writing.png
diff --git a/android/assets/BuildingIcons.png b/android/assets/BuildingIcons.png
deleted file mode 100644
index cc8d629588..0000000000
Binary files a/android/assets/BuildingIcons.png and /dev/null differ
diff --git a/android/assets/Construction.atlas b/android/assets/Construction.atlas
new file mode 100644
index 0000000000..707ecf7c2d
--- /dev/null
+++ b/android/assets/Construction.atlas
@@ -0,0 +1,1609 @@
+
+Construction.png
+size: 2048, 2048
+format: RGBA8888
+filter: MipMapLinearLinear, MipMapLinearLinear
+repeat: none
+BuildingIcons/Alhambra
+  rotate: false
+  xy: 4, 1840
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Amphitheater
+  rotate: false
+  xy: 4, 1732
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Angkor Wat
+  rotate: false
+  xy: 112, 1840
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Apollo Program
+  rotate: false
+  xy: 220, 1840
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Aqueduct
+  rotate: false
+  xy: 4, 1516
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Armory
+  rotate: false
+  xy: 220, 1732
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Arsenal
+  rotate: false
+  xy: 328, 1840
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Bank
+  rotate: false
+  xy: 436, 1840
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Barracks
+  rotate: false
+  xy: 4, 1300
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Bazaar
+  rotate: false
+  xy: 328, 1624
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Big Ben
+  rotate: false
+  xy: 544, 1840
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Bomb Shelter
+  rotate: false
+  xy: 4, 1192
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Brandenburg Gate
+  rotate: false
+  xy: 328, 1516
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Broadcast Tower
+  rotate: false
+  xy: 436, 1624
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Burial Tomb
+  rotate: false
+  xy: 652, 1840
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/CN Tower
+  rotate: false
+  xy: 4, 1084
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Castle
+  rotate: false
+  xy: 652, 1732
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Cathedral
+  rotate: false
+  xy: 4, 976
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Chichen Itza
+  rotate: false
+  xy: 328, 1300
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Circus
+  rotate: false
+  xy: 544, 1516
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Circus Maximus
+  rotate: false
+  xy: 652, 1624
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Colosseum
+  rotate: false
+  xy: 760, 1732
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Colossus
+  rotate: false
+  xy: 868, 1840
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Courthouse
+  rotate: false
+  xy: 436, 1300
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Cristo Redentor
+  rotate: false
+  xy: 544, 1408
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Eiffel Tower
+  rotate: false
+  xy: 868, 1732
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Factory
+  rotate: false
+  xy: 976, 1840
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Floating Gardens
+  rotate: false
+  xy: 112, 868
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Forbidden Palace
+  rotate: false
+  xy: 220, 976
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Forge
+  rotate: false
+  xy: 436, 1192
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Garden
+  rotate: false
+  xy: 760, 1516
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Granary
+  rotate: false
+  xy: 1084, 1840
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Great Wall
+  rotate: false
+  xy: 652, 1300
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Hagia Sophia
+  rotate: false
+  xy: 1084, 1732
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Hanging Gardens
+  rotate: false
+  xy: 4, 544
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Hanse
+  rotate: false
+  xy: 112, 652
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Harbor
+  rotate: false
+  xy: 220, 766
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Hermitage
+  rotate: false
+  xy: 436, 976
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Heroic Epic
+  rotate: false
+  xy: 544, 1084
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Himeji Castle
+  rotate: false
+  xy: 652, 1192
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Hospital
+  rotate: false
+  xy: 1084, 1624
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Hubble Space Telescope
+  rotate: false
+  xy: 1192, 1732
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Hydro Plant
+  rotate: false
+  xy: 4, 436
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Ironworks
+  rotate: false
+  xy: 436, 868
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Kremlin
+  rotate: false
+  xy: 1192, 1624
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Krepost
+  rotate: false
+  xy: 1300, 1732
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Leaning Tower of Pisa
+  rotate: false
+  xy: 220, 550
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Library
+  rotate: false
+  xy: 436, 760
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Lighthouse
+  rotate: false
+  xy: 544, 868
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Longhouse
+  rotate: false
+  xy: 760, 1084
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Machu Picchu
+  rotate: false
+  xy: 1084, 1408
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Manhattan Project
+  rotate: false
+  xy: 1300, 1624
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Market
+  rotate: false
+  xy: 4, 220
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Mausoleum of Halicarnassus
+  rotate: false
+  xy: 112, 328
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Medical Lab
+  rotate: false
+  xy: 328, 544
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Military Academy
+  rotate: false
+  xy: 436, 652
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Military Base
+  rotate: false
+  xy: 544, 760
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Mint
+  rotate: false
+  xy: 652, 868
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Monastery
+  rotate: false
+  xy: 1408, 1624
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Monument
+  rotate: false
+  xy: 1516, 1732
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Mosque
+  rotate: false
+  xy: 1624, 1840
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Mud Pyramid Mosque
+  rotate: false
+  xy: 4, 112
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Mughal Fort
+  rotate: false
+  xy: 112, 220
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Museum
+  rotate: false
+  xy: 220, 334
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/National College
+  rotate: false
+  xy: 652, 760
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/National Epic
+  rotate: false
+  xy: 760, 868
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/National Treasury
+  rotate: false
+  xy: 868, 976
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Neuschwanstein
+  rotate: false
+  xy: 976, 1084
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Notre Dame
+  rotate: false
+  xy: 1192, 1300
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Nuclear Plant
+  rotate: false
+  xy: 1408, 1516
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Observatory
+  rotate: false
+  xy: 1624, 1732
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Opera House
+  rotate: false
+  xy: 1732, 1840
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Oxford University
+  rotate: false
+  xy: 4, 4
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Pagoda
+  rotate: false
+  xy: 112, 112
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Palace
+  rotate: false
+  xy: 220, 226
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Paper Maker
+  rotate: false
+  xy: 436, 437
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Pentagon
+  rotate: false
+  xy: 652, 652
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Petra
+  rotate: false
+  xy: 868, 868
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Porcelain Tower
+  rotate: false
+  xy: 1084, 1084
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Public School
+  rotate: false
+  xy: 1300, 1300
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Research Lab
+  rotate: false
+  xy: 1408, 1408
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/SS Booster
+  rotate: false
+  xy: 1732, 1732
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/SS Cockpit
+  rotate: false
+  xy: 1840, 1840
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/SS Engine
+  rotate: false
+  xy: 112, 4
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/SS Stasis Chamber
+  rotate: false
+  xy: 220, 118
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Satrap's Court
+  rotate: false
+  xy: 436, 329
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Seaport
+  rotate: false
+  xy: 760, 652
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Shrine
+  rotate: false
+  xy: 1084, 976
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Sistine Chapel
+  rotate: false
+  xy: 1300, 1192
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Solar Plant
+  rotate: false
+  xy: 1516, 1408
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Spaceship Factory
+  rotate: false
+  xy: 1624, 1516
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Stable
+  rotate: false
+  xy: 1840, 1732
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Stadium
+  rotate: false
+  xy: 220, 10
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Statue of Liberty
+  rotate: false
+  xy: 328, 112
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Statue of Zeus
+  rotate: false
+  xy: 436, 221
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Stock Exchange
+  rotate: false
+  xy: 652, 436
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Stone Works
+  rotate: false
+  xy: 760, 544
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Stonehenge
+  rotate: false
+  xy: 868, 652
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Sydney Opera House
+  rotate: false
+  xy: 1192, 976
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Taj Mahal
+  rotate: false
+  xy: 1300, 1084
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Temple
+  rotate: false
+  xy: 1516, 1300
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Temple of Artemis
+  rotate: false
+  xy: 1624, 1408
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Terracotta Army
+  rotate: false
+  xy: 1840, 1624
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/The Great Library
+  rotate: false
+  xy: 436, 113
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/The Great Lighthouse
+  rotate: false
+  xy: 544, 220
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/The Louvre
+  rotate: false
+  xy: 652, 328
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/The Oracle
+  rotate: false
+  xy: 760, 436
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/The Pyramids
+  rotate: false
+  xy: 868, 544
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Theatre
+  rotate: false
+  xy: 976, 652
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/United Nations
+  rotate: false
+  xy: 1516, 1192
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/University
+  rotate: false
+  xy: 1624, 1300
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Utopia Project
+  rotate: false
+  xy: 1732, 1408
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Walls
+  rotate: false
+  xy: 1840, 1516
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Walls of Babylon
+  rotate: false
+  xy: 652, 220
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Wat
+  rotate: false
+  xy: 1084, 652
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Water Mill
+  rotate: false
+  xy: 1192, 760
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Windmill
+  rotate: false
+  xy: 1300, 867
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Workshop
+  rotate: false
+  xy: 1624, 1192
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Anti-Aircraft Gun
+  rotate: false
+  xy: 4, 1624
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Anti-Tank Gun
+  rotate: false
+  xy: 112, 1732
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Archer
+  rotate: false
+  xy: 112, 1624
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Artillery
+  rotate: false
+  xy: 4, 1408
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Atomic Bomb
+  rotate: false
+  xy: 112, 1516
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/B17
+  rotate: false
+  xy: 220, 1624
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Ballista
+  rotate: false
+  xy: 328, 1732
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Battering Ram
+  rotate: false
+  xy: 112, 1408
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Battleship
+  rotate: false
+  xy: 220, 1516
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Berserker
+  rotate: false
+  xy: 436, 1732
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Bomber
+  rotate: false
+  xy: 112, 1300
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Bowman
+  rotate: false
+  xy: 220, 1408
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Brute
+  rotate: false
+  xy: 544, 1732
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Camel Archer
+  rotate: false
+  xy: 112, 1192
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Cannon
+  rotate: false
+  xy: 220, 1300
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Caravel
+  rotate: false
+  xy: 328, 1408
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Carolean
+  rotate: false
+  xy: 436, 1516
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Carrier
+  rotate: false
+  xy: 544, 1624
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Catapult
+  rotate: false
+  xy: 760, 1840
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Cavalry
+  rotate: false
+  xy: 112, 1084
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Chariot Archer
+  rotate: false
+  xy: 220, 1192
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Chu-Ko-Nu
+  rotate: false
+  xy: 436, 1408
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Companion Cavalry
+  rotate: false
+  xy: 4, 868
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Composite Bowman
+  rotate: false
+  xy: 112, 976
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Conquistador
+  rotate: false
+  xy: 220, 1084
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Cossack
+  rotate: false
+  xy: 328, 1192
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Crossbowman
+  rotate: false
+  xy: 652, 1516
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Destroyer
+  rotate: false
+  xy: 760, 1624
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Fighter
+  rotate: false
+  xy: 4, 760
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Foreign Legion
+  rotate: false
+  xy: 328, 1084
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Frigate
+  rotate: false
+  xy: 544, 1300
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Galleass
+  rotate: false
+  xy: 652, 1408
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Gatling Gun
+  rotate: false
+  xy: 868, 1624
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Giant Death Robot
+  rotate: false
+  xy: 976, 1732
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Great Artist
+  rotate: false
+  xy: 4, 652
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Great Engineer
+  rotate: false
+  xy: 112, 760
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Great General
+  rotate: false
+  xy: 220, 874
+  size: 100, 94
+  orig: 100, 94
+  offset: 0, 0
+  index: -1
+UnitIcons/Great Merchant
+  rotate: false
+  xy: 328, 976
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Great Prophet
+  rotate: false
+  xy: 436, 1084
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Great Scientist
+  rotate: false
+  xy: 544, 1192
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Great War Bomber
+  rotate: false
+  xy: 760, 1408
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Great War Infantry
+  rotate: false
+  xy: 868, 1516
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Guided Missile
+  rotate: false
+  xy: 976, 1624
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Hakkapeliitta
+  rotate: false
+  xy: 1192, 1840
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Helicopter Gunship
+  rotate: false
+  xy: 328, 868
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Hoplite
+  rotate: false
+  xy: 760, 1300
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Horse Archer
+  rotate: false
+  xy: 868, 1408
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Horseman
+  rotate: false
+  xy: 976, 1516
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Hwach'a
+  rotate: false
+  xy: 1300, 1840
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Infantry
+  rotate: false
+  xy: 112, 544
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Inquisitor
+  rotate: false
+  xy: 220, 658
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Ironclad
+  rotate: false
+  xy: 328, 760
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Jaguar
+  rotate: false
+  xy: 544, 976
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Janissary
+  rotate: false
+  xy: 652, 1084
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Jet Fighter
+  rotate: false
+  xy: 760, 1192
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Keshik
+  rotate: false
+  xy: 868, 1300
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Khan
+  rotate: false
+  xy: 976, 1408
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Knight
+  rotate: false
+  xy: 1084, 1516
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Lancer
+  rotate: false
+  xy: 1408, 1840
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Landship
+  rotate: false
+  xy: 4, 328
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Landsknecht
+  rotate: false
+  xy: 112, 436
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Legion
+  rotate: false
+  xy: 328, 652
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Longbowman
+  rotate: false
+  xy: 652, 976
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Longswordsman
+  rotate: false
+  xy: 868, 1192
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Machine Gun
+  rotate: false
+  xy: 976, 1300
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Mandekalu Cavalry
+  rotate: false
+  xy: 1192, 1516
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Maori Warrior
+  rotate: false
+  xy: 1408, 1732
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Marine
+  rotate: false
+  xy: 1516, 1840
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Mechanized Infantry
+  rotate: false
+  xy: 220, 442
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Minuteman
+  rotate: false
+  xy: 760, 976
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Missile Cruiser
+  rotate: false
+  xy: 868, 1084
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Missionary
+  rotate: false
+  xy: 976, 1192
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Mobile SAM
+  rotate: false
+  xy: 1084, 1300
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Modern Armor
+  rotate: false
+  xy: 1192, 1408
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Mohawk Warrior
+  rotate: false
+  xy: 1300, 1516
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Musketeer
+  rotate: false
+  xy: 328, 436
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Musketman
+  rotate: false
+  xy: 436, 545
+  size: 100, 99
+  orig: 100, 99
+  offset: 0, 0
+  index: -1
+UnitIcons/Naresuan's Elephant
+  rotate: false
+  xy: 544, 652
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Norwegian Ski Infantry
+  rotate: false
+  xy: 1084, 1192
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Nuclear Missile
+  rotate: false
+  xy: 1300, 1408
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Nuclear Submarine
+  rotate: false
+  xy: 1516, 1624
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Panzer
+  rotate: false
+  xy: 328, 328
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Paratrooper
+  rotate: false
+  xy: 544, 544
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Persian Immortal
+  rotate: false
+  xy: 760, 760
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Pikeman
+  rotate: false
+  xy: 976, 976
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Privateer
+  rotate: false
+  xy: 1192, 1192
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Rifleman
+  rotate: false
+  xy: 1516, 1516
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Rocket Artillery
+  rotate: false
+  xy: 1624, 1624
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Samurai
+  rotate: false
+  xy: 328, 220
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Scout
+  rotate: false
+  xy: 544, 436
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Sea Beggar
+  rotate: false
+  xy: 652, 544
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Settler
+  rotate: false
+  xy: 868, 760
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Ship of the Line
+  rotate: false
+  xy: 976, 868
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Sipahi
+  rotate: false
+  xy: 1192, 1084
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Slinger
+  rotate: false
+  xy: 1408, 1300
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Spearman
+  rotate: false
+  xy: 1732, 1624
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Stealth Bomber
+  rotate: false
+  xy: 544, 328
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Submarine
+  rotate: false
+  xy: 976, 760
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Swordsman
+  rotate: false
+  xy: 1084, 868
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Tank
+  rotate: false
+  xy: 1408, 1192
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Tercio
+  rotate: false
+  xy: 1732, 1516
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Trebuchet
+  rotate: false
+  xy: 1084, 760
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Triplane
+  rotate: false
+  xy: 1192, 868
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Trireme
+  rotate: false
+  xy: 1300, 975
+  size: 100, 101
+  orig: 100, 101
+  offset: 0, 0
+  index: -1
+UnitIcons/Turtle Ship
+  rotate: false
+  xy: 1408, 1084
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/War Chariot
+  rotate: false
+  xy: 760, 328
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/War Elephant
+  rotate: false
+  xy: 868, 436
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Warrior
+  rotate: false
+  xy: 976, 544
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Work Boats
+  rotate: false
+  xy: 1408, 976
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Worker
+  rotate: false
+  xy: 1516, 1084
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+UnitIcons/Zero
+  rotate: false
+  xy: 1732, 1300
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
diff --git a/android/assets/Construction.png b/android/assets/Construction.png
new file mode 100644
index 0000000000..289d43a476
Binary files /dev/null and b/android/assets/Construction.png differ
diff --git a/android/assets/FlagIcons.atlas b/android/assets/Flags.atlas
similarity index 81%
rename from android/assets/FlagIcons.atlas
rename to android/assets/Flags.atlas
index 65edce43a8..ad34d5d6cd 100644
--- a/android/assets/FlagIcons.atlas
+++ b/android/assets/Flags.atlas
@@ -1,206 +1,206 @@
 
-FlagIcons.png
+Flags.png
 size: 2048, 512
 format: RGBA8888
 filter: MipMapLinearLinear, MipMapLinearLinear
 repeat: none
-Brazilian_Portuguese
+FlagIcons/Brazilian_Portuguese
   rotate: false
   xy: 4, 276
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
-Bulgarian
+FlagIcons/Bulgarian
   rotate: false
   xy: 4, 140
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
-Czech
+FlagIcons/Czech
   rotate: false
   xy: 140, 276
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
-Dutch
+FlagIcons/Dutch
   rotate: false
   xy: 4, 4
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
-English
+FlagIcons/English
   rotate: false
   xy: 140, 140
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
-Finnish
+FlagIcons/Finnish
   rotate: false
   xy: 276, 276
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
-French
+FlagIcons/French
   rotate: false
   xy: 140, 4
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
-German
+FlagIcons/German
   rotate: false
   xy: 276, 140
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
-Hungarian
+FlagIcons/Hungarian
   rotate: false
   xy: 412, 276
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
-Indonesian
+FlagIcons/Indonesian
   rotate: false
   xy: 276, 4
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
-Italian
+FlagIcons/Italian
   rotate: false
   xy: 412, 140
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
-Japanese
+FlagIcons/Japanese
   rotate: false
   xy: 548, 276
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
-Korean
+FlagIcons/Korean
   rotate: false
   xy: 412, 4
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
-Lithuanian
+FlagIcons/Lithuanian
   rotate: false
   xy: 548, 140
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
-Malay
+FlagIcons/Malay
   rotate: false
   xy: 684, 276
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
-Persian_(Pinglish-DIN)
+FlagIcons/Persian_(Pinglish-DIN)
   rotate: false
   xy: 548, 4
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
-Persian_(Pinglish-UN)
+FlagIcons/Persian_(Pinglish-UN)
   rotate: false
   xy: 548, 4
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
-Polish
+FlagIcons/Polish
   rotate: false
   xy: 684, 140
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
-Portuguese
+FlagIcons/Portuguese
   rotate: false
   xy: 820, 276
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
-Romanian
+FlagIcons/Romanian
   rotate: false
   xy: 684, 4
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
-Russian
+FlagIcons/Russian
   rotate: false
   xy: 820, 140
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
-Simplified_Chinese
+FlagIcons/Simplified_Chinese
   rotate: false
   xy: 956, 276
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
-Spanish
+FlagIcons/Spanish
   rotate: false
   xy: 820, 4
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
-Swedish
+FlagIcons/Swedish
   rotate: false
   xy: 956, 140
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
-Thai
+FlagIcons/Thai
   rotate: false
   xy: 1092, 276
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
-Traditional_Chinese
+FlagIcons/Traditional_Chinese
   rotate: false
   xy: 956, 4
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
-Turkish
+FlagIcons/Turkish
   rotate: false
   xy: 1092, 140
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
-Ukrainian
+FlagIcons/Ukrainian
   rotate: false
   xy: 1228, 276
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
-Vietnamese
+FlagIcons/Vietnamese
   rotate: false
   xy: 1092, 4
   size: 128, 128
diff --git a/android/assets/FlagIcons.png b/android/assets/Flags.png
similarity index 100%
rename from android/assets/FlagIcons.png
rename to android/assets/Flags.png
diff --git a/android/assets/BuildingIcons.atlas b/android/assets/Tech.atlas
similarity index 60%
rename from android/assets/BuildingIcons.atlas
rename to android/assets/Tech.atlas
index 415c50cc66..afb721488c 100644
--- a/android/assets/BuildingIcons.atlas
+++ b/android/assets/Tech.atlas
@@ -1,832 +1,573 @@
 
-BuildingIcons.png
-size: 2048, 1024
+Tech.png
+size: 1024, 1024
 format: RGBA8888
 filter: MipMapLinearLinear, MipMapLinearLinear
 repeat: none
-Alhambra
+TechIcons/Acoustics
   rotate: false
   xy: 4, 868
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
-Amphitheater
+TechIcons/Advanced Ballistics
   rotate: false
   xy: 4, 760
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
-Angkor Wat
+TechIcons/Agriculture
   rotate: false
   xy: 112, 868
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
-Apollo Program
+TechIcons/Animal Husbandry
   rotate: false
   xy: 4, 652
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
-Aqueduct
+TechIcons/Archaeology
   rotate: false
   xy: 112, 760
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
-Armory
+TechIcons/Archery
   rotate: false
   xy: 220, 868
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
-Arsenal
+TechIcons/Architecture
   rotate: false
   xy: 4, 544
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
-Bank
+TechIcons/Astronomy
   rotate: false
   xy: 112, 652
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
-Barracks
+TechIcons/Atomic Theory
   rotate: false
   xy: 220, 760
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
-Bazaar
+TechIcons/Ballistics
   rotate: false
   xy: 328, 868
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
-Big Ben
+TechIcons/Banking
   rotate: false
   xy: 4, 436
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
-Bomb Shelter
+TechIcons/Biology
   rotate: false
   xy: 112, 544
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
-Brandenburg Gate
+TechIcons/Bronze Working
   rotate: false
   xy: 220, 652
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
-Broadcast Tower
+TechIcons/Calendar
   rotate: false
   xy: 328, 760
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
-Burial Tomb
+TechIcons/Chemistry
   rotate: false
   xy: 436, 868
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
-CN Tower
+TechIcons/Chivalry
   rotate: false
   xy: 4, 328
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
-Castle
+TechIcons/Civil Service
   rotate: false
   xy: 112, 436
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
-Cathedral
+TechIcons/Combined Arms
   rotate: false
   xy: 220, 544
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
-Chichen Itza
+TechIcons/Combustion
   rotate: false
   xy: 328, 652
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
-Circus
+TechIcons/Compass
   rotate: false
   xy: 436, 760
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
-Circus Maximus
+TechIcons/Computers
   rotate: false
   xy: 544, 868
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
-Colosseum
+TechIcons/Construction
   rotate: false
   xy: 4, 220
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
-Colossus
+TechIcons/Currency
   rotate: false
   xy: 112, 328
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
-Courthouse
+TechIcons/Drama and Poetry
   rotate: false
   xy: 220, 436
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
-Cristo Redentor
+TechIcons/Dynamite
   rotate: false
   xy: 328, 544
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
-Eiffel Tower
+TechIcons/Ecology
   rotate: false
   xy: 436, 652
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
-Factory
+TechIcons/Economics
   rotate: false
   xy: 544, 760
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
-Floating Gardens
+TechIcons/Education
   rotate: false
   xy: 652, 868
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
-Forbidden Palace
+TechIcons/Electricity
   rotate: false
   xy: 4, 112
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
-Forge
+TechIcons/Electronics
   rotate: false
   xy: 112, 220
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
-Garden
+TechIcons/Engineering
   rotate: false
   xy: 220, 328
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
-Granary
+TechIcons/Fertilizer
   rotate: false
   xy: 328, 436
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
-Great Wall
+TechIcons/Flight
   rotate: false
   xy: 436, 544
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
-Hagia Sophia
+TechIcons/Future Tech
   rotate: false
   xy: 544, 652
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
-Hanging Gardens
+TechIcons/Globalization
   rotate: false
   xy: 652, 760
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
-Hanse
+TechIcons/Guilds
   rotate: false
   xy: 760, 868
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
-Harbor
+TechIcons/Gunpowder
   rotate: false
   xy: 4, 4
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
-Hermitage
+TechIcons/Horseback Riding
   rotate: false
   xy: 112, 112
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
-Heroic Epic
+TechIcons/Industrialization
   rotate: false
   xy: 220, 220
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
-Himeji Castle
+TechIcons/Iron Working
   rotate: false
   xy: 328, 328
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
-Hospital
+TechIcons/Lasers
   rotate: false
   xy: 436, 436
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
-Hubble Space Telescope
+TechIcons/Machinery
   rotate: false
   xy: 544, 544
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
-Hydro Plant
+TechIcons/Masonry
   rotate: false
   xy: 652, 652
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
-Ironworks
+TechIcons/Mass Media
   rotate: false
   xy: 760, 760
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
-Kremlin
+TechIcons/Mathematics
   rotate: false
   xy: 868, 868
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
-Krepost
+TechIcons/Metal Casting
   rotate: false
   xy: 112, 4
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
-Leaning Tower of Pisa
+TechIcons/Metallurgy
   rotate: false
   xy: 220, 112
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
-Library
+TechIcons/Military Science
   rotate: false
   xy: 328, 220
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
-Lighthouse
+TechIcons/Mining
   rotate: false
   xy: 436, 328
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
-Longhouse
+TechIcons/Mobile Tactics
   rotate: false
   xy: 544, 436
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
-Machu Picchu
+TechIcons/Nanotechnology
   rotate: false
   xy: 652, 544
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
-Manhattan Project
+TechIcons/Navigation
   rotate: false
   xy: 760, 652
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
-Market
+TechIcons/Nuclear Fission
   rotate: false
   xy: 868, 760
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
-Mausoleum of Halicarnassus
-  rotate: false
-  xy: 976, 868
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Medical Lab
+TechIcons/Nuclear Fusion
   rotate: false
   xy: 220, 4
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
-Military Academy
+TechIcons/Optics
   rotate: false
   xy: 328, 112
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
-Military Base
+TechIcons/Particle Physics
   rotate: false
   xy: 436, 220
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
-Mint
+TechIcons/Pharmaceuticals
   rotate: false
   xy: 544, 328
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
-Monastery
+TechIcons/Philosophy
   rotate: false
   xy: 652, 436
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
-Monument
+TechIcons/Physics
   rotate: false
   xy: 760, 544
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
-Mosque
+TechIcons/Plastics
   rotate: false
   xy: 868, 652
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
-Mud Pyramid Mosque
-  rotate: false
-  xy: 976, 760
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Mughal Fort
-  rotate: false
-  xy: 1084, 868
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Museum
+TechIcons/Pottery
   rotate: false
   xy: 328, 4
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
-National College
+TechIcons/Printing Press
   rotate: false
   xy: 436, 112
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
-National Epic
+TechIcons/Radar
   rotate: false
   xy: 544, 220
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
-National Treasury
+TechIcons/Radio
   rotate: false
   xy: 652, 328
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
-Neuschwanstein
+TechIcons/Railroads
   rotate: false
   xy: 760, 436
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
-Notre Dame
+TechIcons/Refrigeration
   rotate: false
   xy: 868, 544
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
-Nuclear Plant
-  rotate: false
-  xy: 976, 652
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Observatory
-  rotate: false
-  xy: 1084, 760
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Opera House
-  rotate: false
-  xy: 1192, 868
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Oxford University
+TechIcons/Replaceable Parts
   rotate: false
   xy: 436, 4
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
-Pagoda
+TechIcons/Rifling
   rotate: false
   xy: 544, 112
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
-Palace
+TechIcons/Robotics
   rotate: false
   xy: 652, 220
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
-Paper Maker
+TechIcons/Rocketry
   rotate: false
   xy: 760, 328
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
-Pentagon
+TechIcons/Sailing
   rotate: false
   xy: 868, 436
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
-Petra
-  rotate: false
-  xy: 976, 544
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Porcelain Tower
-  rotate: false
-  xy: 1084, 652
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Public School
-  rotate: false
-  xy: 1192, 760
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Research Lab
-  rotate: false
-  xy: 1300, 868
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-SS Booster
+TechIcons/Satellites
   rotate: false
   xy: 544, 4
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
-SS Cockpit
+TechIcons/Scientific Theory
   rotate: false
   xy: 652, 112
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
-SS Engine
+TechIcons/Stealth
   rotate: false
   xy: 760, 220
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
-SS Stasis Chamber
+TechIcons/Steam Power
   rotate: false
   xy: 868, 328
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
-Satrap's Court
-  rotate: false
-  xy: 976, 436
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Seaport
-  rotate: false
-  xy: 1084, 544
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Shrine
-  rotate: false
-  xy: 1192, 652
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Sistine Chapel
-  rotate: false
-  xy: 1300, 760
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Solar Plant
-  rotate: false
-  xy: 1408, 868
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Spaceship Factory
+TechIcons/Steel
   rotate: false
   xy: 652, 4
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
-Stable
+TechIcons/Telecommunications
   rotate: false
   xy: 760, 112
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
-Stadium
+TechIcons/The Wheel
   rotate: false
   xy: 868, 220
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
-Statue of Liberty
-  rotate: false
-  xy: 976, 328
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Statue of Zeus
-  rotate: false
-  xy: 1084, 436
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Stock Exchange
-  rotate: false
-  xy: 1192, 544
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Stone Works
-  rotate: false
-  xy: 1300, 652
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Stonehenge
-  rotate: false
-  xy: 1408, 760
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Sydney Opera House
-  rotate: false
-  xy: 1516, 868
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Taj Mahal
+TechIcons/Theology
   rotate: false
   xy: 760, 4
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
-Temple
+TechIcons/Trapping
   rotate: false
   xy: 868, 112
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
-Temple of Artemis
-  rotate: false
-  xy: 976, 220
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Terracotta Army
-  rotate: false
-  xy: 1084, 328
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-The Great Library
-  rotate: false
-  xy: 1192, 436
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-The Great Lighthouse
-  rotate: false
-  xy: 1300, 544
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-The Louvre
-  rotate: false
-  xy: 1408, 652
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-The Oracle
-  rotate: false
-  xy: 1516, 760
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-The Pyramids
-  rotate: false
-  xy: 1624, 868
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Theatre
+TechIcons/Writing
   rotate: false
   xy: 868, 4
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
-United Nations
-  rotate: false
-  xy: 976, 112
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-University
-  rotate: false
-  xy: 1084, 220
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Utopia Project
-  rotate: false
-  xy: 1192, 328
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Walls
-  rotate: false
-  xy: 1300, 436
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Walls of Babylon
-  rotate: false
-  xy: 1408, 544
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Wat
-  rotate: false
-  xy: 1516, 652
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Water Mill
-  rotate: false
-  xy: 1624, 760
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Windmill
-  rotate: false
-  xy: 1732, 868
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Workshop
-  rotate: false
-  xy: 976, 4
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
diff --git a/android/assets/Tech.png b/android/assets/Tech.png
new file mode 100644
index 0000000000..fcad99f41c
Binary files /dev/null and b/android/assets/Tech.png differ
diff --git a/android/assets/UnitIcons.atlas b/android/assets/UnitIcons.atlas
deleted file mode 100644
index ed2c940b79..0000000000
--- a/android/assets/UnitIcons.atlas
+++ /dev/null
@@ -1,783 +0,0 @@
-
-UnitIcons.png
-size: 2048, 1024
-format: RGBA8888
-filter: MipMapLinearLinear, MipMapLinearLinear
-repeat: none
-Anti-Aircraft Gun
-  rotate: false
-  xy: 4, 862
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Anti-Tank Gun
-  rotate: false
-  xy: 4, 754
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Archer
-  rotate: false
-  xy: 112, 862
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Artillery
-  rotate: false
-  xy: 4, 646
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Atomic Bomb
-  rotate: false
-  xy: 112, 754
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-B17
-  rotate: false
-  xy: 220, 862
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Ballista
-  rotate: false
-  xy: 4, 538
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Battering Ram
-  rotate: false
-  xy: 112, 646
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Battleship
-  rotate: false
-  xy: 220, 754
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Berserker
-  rotate: false
-  xy: 328, 862
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Bomber
-  rotate: false
-  xy: 4, 430
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Bowman
-  rotate: false
-  xy: 112, 538
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Brute
-  rotate: false
-  xy: 220, 646
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Camel Archer
-  rotate: false
-  xy: 328, 754
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Cannon
-  rotate: false
-  xy: 436, 862
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Caravel
-  rotate: false
-  xy: 4, 322
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Carolean
-  rotate: false
-  xy: 112, 430
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Carrier
-  rotate: false
-  xy: 220, 538
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Catapult
-  rotate: false
-  xy: 328, 646
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Cavalry
-  rotate: false
-  xy: 436, 754
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Chariot Archer
-  rotate: false
-  xy: 544, 862
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Chu-Ko-Nu
-  rotate: false
-  xy: 4, 214
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Companion Cavalry
-  rotate: false
-  xy: 112, 322
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Composite Bowman
-  rotate: false
-  xy: 220, 430
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Conquistador
-  rotate: false
-  xy: 328, 538
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Cossack
-  rotate: false
-  xy: 436, 646
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Crossbowman
-  rotate: false
-  xy: 544, 754
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Destroyer
-  rotate: false
-  xy: 652, 862
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Fighter
-  rotate: false
-  xy: 4, 106
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Foreign Legion
-  rotate: false
-  xy: 112, 214
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Frigate
-  rotate: false
-  xy: 220, 322
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Galleass
-  rotate: false
-  xy: 328, 430
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Gatling Gun
-  rotate: false
-  xy: 436, 538
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Giant Death Robot
-  rotate: false
-  xy: 544, 646
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Great Artist
-  rotate: false
-  xy: 652, 754
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Great Engineer
-  rotate: false
-  xy: 760, 862
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Great General
-  rotate: false
-  xy: 4, 4
-  size: 100, 94
-  orig: 100, 94
-  offset: 0, 0
-  index: -1
-Great Merchant
-  rotate: false
-  xy: 112, 106
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Great Prophet
-  rotate: false
-  xy: 220, 214
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Great Scientist
-  rotate: false
-  xy: 328, 322
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Great War Bomber
-  rotate: false
-  xy: 436, 430
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Great War Infantry
-  rotate: false
-  xy: 544, 538
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Guided Missile
-  rotate: false
-  xy: 652, 646
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Hakkapeliitta
-  rotate: false
-  xy: 760, 754
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Helicopter Gunship
-  rotate: false
-  xy: 868, 862
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Hoplite
-  rotate: false
-  xy: 220, 106
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Horse Archer
-  rotate: false
-  xy: 328, 214
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Horseman
-  rotate: false
-  xy: 436, 322
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Hwach'a
-  rotate: false
-  xy: 544, 430
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Infantry
-  rotate: false
-  xy: 652, 538
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Inquisitor
-  rotate: false
-  xy: 760, 646
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Ironclad
-  rotate: false
-  xy: 868, 754
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Jaguar
-  rotate: false
-  xy: 976, 862
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Janissary
-  rotate: false
-  xy: 328, 106
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Jet Fighter
-  rotate: false
-  xy: 436, 214
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Keshik
-  rotate: false
-  xy: 544, 322
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Khan
-  rotate: false
-  xy: 652, 430
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Knight
-  rotate: false
-  xy: 760, 538
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Lancer
-  rotate: false
-  xy: 868, 646
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Landship
-  rotate: false
-  xy: 976, 754
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Landsknecht
-  rotate: false
-  xy: 1084, 862
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Legion
-  rotate: false
-  xy: 436, 106
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Longbowman
-  rotate: false
-  xy: 544, 214
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Longswordsman
-  rotate: false
-  xy: 652, 322
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Machine Gun
-  rotate: false
-  xy: 760, 430
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Mandekalu Cavalry
-  rotate: false
-  xy: 868, 538
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Maori Warrior
-  rotate: false
-  xy: 976, 646
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Marine
-  rotate: false
-  xy: 1084, 754
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Mechanized Infantry
-  rotate: false
-  xy: 1192, 862
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Minuteman
-  rotate: false
-  xy: 544, 106
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Missile Cruiser
-  rotate: false
-  xy: 652, 214
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Missionary
-  rotate: false
-  xy: 760, 322
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Mobile SAM
-  rotate: false
-  xy: 868, 430
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Modern Armor
-  rotate: false
-  xy: 976, 538
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Mohawk Warrior
-  rotate: false
-  xy: 1084, 646
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Musketeer
-  rotate: false
-  xy: 1192, 754
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Musketman
-  rotate: false
-  xy: 1300, 863
-  size: 100, 99
-  orig: 100, 99
-  offset: 0, 0
-  index: -1
-Naresuan's Elephant
-  rotate: false
-  xy: 652, 106
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Norwegian Ski Infantry
-  rotate: false
-  xy: 760, 214
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Nuclear Missile
-  rotate: false
-  xy: 868, 322
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Nuclear Submarine
-  rotate: false
-  xy: 976, 430
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Panzer
-  rotate: false
-  xy: 1084, 538
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Paratrooper
-  rotate: false
-  xy: 1192, 646
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Persian Immortal
-  rotate: false
-  xy: 1300, 755
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Pikeman
-  rotate: false
-  xy: 1408, 862
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Privateer
-  rotate: false
-  xy: 760, 106
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Rifleman
-  rotate: false
-  xy: 868, 214
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Rocket Artillery
-  rotate: false
-  xy: 976, 322
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Samurai
-  rotate: false
-  xy: 1084, 430
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Scout
-  rotate: false
-  xy: 1192, 538
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Sea Beggar
-  rotate: false
-  xy: 1300, 647
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Settler
-  rotate: false
-  xy: 1408, 754
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Ship of the Line
-  rotate: false
-  xy: 1516, 862
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Sipahi
-  rotate: false
-  xy: 868, 106
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Slinger
-  rotate: false
-  xy: 976, 214
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Spearman
-  rotate: false
-  xy: 1084, 322
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Stealth Bomber
-  rotate: false
-  xy: 1192, 430
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Submarine
-  rotate: false
-  xy: 1300, 539
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Swordsman
-  rotate: false
-  xy: 1408, 646
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Tank
-  rotate: false
-  xy: 1516, 754
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Tercio
-  rotate: false
-  xy: 1624, 862
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Trebuchet
-  rotate: false
-  xy: 976, 106
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Triplane
-  rotate: false
-  xy: 1084, 214
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Trireme
-  rotate: false
-  xy: 1192, 321
-  size: 100, 101
-  orig: 100, 101
-  offset: 0, 0
-  index: -1
-Turtle Ship
-  rotate: false
-  xy: 1300, 431
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-War Chariot
-  rotate: false
-  xy: 1408, 538
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-War Elephant
-  rotate: false
-  xy: 1516, 646
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Warrior
-  rotate: false
-  xy: 1624, 754
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Work Boats
-  rotate: false
-  xy: 1732, 862
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Worker
-  rotate: false
-  xy: 1084, 106
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-Zero
-  rotate: false
-  xy: 1192, 213
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
diff --git a/android/assets/UnitIcons.png b/android/assets/UnitIcons.png
deleted file mode 100644
index f1cd0c8a44..0000000000
Binary files a/android/assets/UnitIcons.png and /dev/null differ
diff --git a/android/assets/game.atlas b/android/assets/game.atlas
index 615b99a1e5..2e75d449c4 100644
--- a/android/assets/game.atlas
+++ b/android/assets/game.atlas
@@ -6,56 +6,56 @@ filter: MipMapLinearLinear, MipMapLinearLinear
 repeat: none
 EmojiIcons/Culture
   rotate: false
-  xy: 1466, 806
+  xy: 652, 658
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 EmojiIcons/Faith
   rotate: false
-  xy: 1034, 266
+  xy: 652, 252
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 EmojiIcons/Food
   rotate: false
-  xy: 1250, 482
+  xy: 652, 78
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 EmojiIcons/Gold
   rotate: false
-  xy: 876, 100
+  xy: 710, 1122
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 EmojiIcons/Happiness
   rotate: false
-  xy: 130, 20
+  xy: 710, 948
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 EmojiIcons/Production
   rotate: false
-  xy: 478, 14
+  xy: 362, 44
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 EmojiIcons/Science
   rotate: false
-  xy: 1258, 366
+  xy: 768, 1172
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 EmojiIcons/Turn
   rotate: false
-  xy: 1698, 848
+  xy: 942, 1172
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
@@ -69,413 +69,413 @@ ImprovementIcons/Academy
   index: -1
 ImprovementIcons/Ancient ruins
   rotate: false
-  xy: 4, 618
+  xy: 4, 942
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ImprovementIcons/Barbarian encampment
   rotate: false
-  xy: 112, 402
+  xy: 4, 186
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ImprovementIcons/Camp
   rotate: false
-  xy: 691, 1944
+  xy: 190, 1452
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ImprovementIcons/Citadel
   rotate: false
-  xy: 1339, 1944
+  xy: 112, 942
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ImprovementIcons/City center
   rotate: false
-  xy: 1663, 1944
+  xy: 112, 618
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ImprovementIcons/City ruins
   rotate: false
-  xy: 1771, 1944
+  xy: 112, 510
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ImprovementIcons/Customs house
   rotate: false
-  xy: 1015, 1728
+  xy: 1339, 1944
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ImprovementIcons/Farm
   rotate: false
-  xy: 514, 1368
+  xy: 1015, 1836
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ImprovementIcons/Fishing Boats
   rotate: false
-  xy: 220, 1074
+  xy: 1339, 1836
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ImprovementIcons/Fort
   rotate: false
-  xy: 220, 750
+  xy: 1879, 1836
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ImprovementIcons/Holy site
   rotate: false
-  xy: 436, 1260
+  xy: 1771, 1728
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ImprovementIcons/Landmark
   rotate: false
-  xy: 544, 288
+  xy: 328, 1182
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ImprovementIcons/Lumber mill
   rotate: false
-  xy: 622, 1620
+  xy: 220, 858
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ImprovementIcons/Manufactory
   rotate: false
-  xy: 622, 1404
+  xy: 220, 750
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ImprovementIcons/Mine
   rotate: false
-  xy: 1162, 1620
+  xy: 328, 642
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ImprovementIcons/Moai
   rotate: false
-  xy: 1162, 1512
+  xy: 220, 426
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ImprovementIcons/Oil well
   rotate: false
-  xy: 1594, 1404
+  xy: 436, 1260
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ImprovementIcons/Pasture
   rotate: false
-  xy: 1810, 1404
+  xy: 436, 936
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ImprovementIcons/Plantation
   rotate: false
-  xy: 760, 1080
+  xy: 436, 396
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ImprovementIcons/Polder
   rotate: false
-  xy: 976, 1296
+  xy: 436, 288
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ImprovementIcons/Quarry
   rotate: false
-  xy: 976, 1080
+  xy: 544, 720
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ImprovementIcons/Road
   rotate: false
-  xy: 1192, 1080
+  xy: 622, 1512
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ImprovementIcons/Terrace farm
   rotate: false
-  xy: 760, 216
+  xy: 1702, 1620
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ImprovementIcons/Trading post
   rotate: false
-  xy: 1408, 864
+  xy: 1270, 1404
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 NationIcons/America
   rotate: false
-  xy: 4, 726
+  xy: 4, 1050
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 NationIcons/Arabia
   rotate: false
-  xy: 4, 402
+  xy: 4, 834
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 NationIcons/Aztecs
   rotate: false
-  xy: 112, 1050
+  xy: 4, 618
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 NationIcons/Babylon
   rotate: false
-  xy: 112, 942
+  xy: 4, 510
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 NationIcons/China
   rotate: false
-  xy: 1015, 1944
+  xy: 112, 1158
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 NationIcons/CityState
   rotate: false
-  xy: 583, 1800
+  xy: 112, 186
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 NationIcons/Denmark
   rotate: false
-  xy: 1231, 1728
+  xy: 1555, 1944
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 NationIcons/Egypt
   rotate: false
-  xy: 298, 1398
+  xy: 583, 1800
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 NationIcons/England
   rotate: false
-  xy: 501, 1692
+  xy: 691, 1836
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 NationIcons/France
   rotate: false
-  xy: 328, 858
+  xy: 691, 1728
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 NationIcons/Germany
   rotate: false
-  xy: 328, 642
+  xy: 1015, 1728
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 NationIcons/Greece
   rotate: false
-  xy: 328, 426
+  xy: 1339, 1728
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 NationIcons/Inca
   rotate: false
-  xy: 436, 720
+  xy: 298, 1506
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 NationIcons/India
   rotate: false
-  xy: 436, 504
+  xy: 393, 1614
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 NationIcons/Iroquois
   rotate: false
-  xy: 544, 1260
+  xy: 406, 1398
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 NationIcons/Japan
   rotate: false
-  xy: 544, 936
+  xy: 514, 1476
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 NationIcons/Korea
   rotate: false
-  xy: 544, 504
+  xy: 328, 1290
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 NationIcons/Mongolia
   rotate: false
-  xy: 1270, 1512
+  xy: 220, 318
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 NationIcons/Persia
   rotate: false
-  xy: 760, 1296
+  xy: 436, 612
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 NationIcons/Polynesia
   rotate: false
-  xy: 652, 864
+  xy: 436, 180
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 NationIcons/Rome
   rotate: false
-  xy: 652, 432
+  xy: 730, 1620
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 NationIcons/Russia
   rotate: false
-  xy: 760, 540
+  xy: 622, 1404
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 NationIcons/Siam
   rotate: false
-  xy: 760, 432
+  xy: 838, 1404
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 NationIcons/Songhai
   rotate: false
-  xy: 1300, 972
+  xy: 1162, 1620
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 NationIcons/Spain
   rotate: false
-  xy: 1408, 1080
+  xy: 1054, 1404
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 NationIcons/Sweden
   rotate: false
-  xy: 1516, 1080
+  xy: 1486, 1512
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 NationIcons/The Huns
   rotate: false
-  xy: 868, 324
+  xy: 1702, 1512
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 NationIcons/The Netherlands
   rotate: false
-  xy: 976, 432
+  xy: 1810, 1620
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 NationIcons/The Ottomans
   rotate: false
-  xy: 1084, 540
+  xy: 1810, 1512
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 OtherIcons/Aircraft
   rotate: false
-  xy: 1408, 806
+  xy: 1987, 1936
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 OtherIcons/ArrowLeft
   rotate: false
-  xy: 1084, 374
+  xy: 1918, 1554
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 OtherIcons/ArrowRight
   rotate: false
-  xy: 1192, 482
+  xy: 652, 1122
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 StatIcons/Movement
   rotate: false
-  xy: 1192, 482
+  xy: 652, 1122
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 OtherIcons/BackArrow
   rotate: false
-  xy: 1300, 590
+  xy: 876, 1346
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 OtherIcons/Banner
   rotate: false
-  xy: 112, 510
+  xy: 4, 294
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
@@ -510,56 +510,56 @@ OtherIcons/Circle
   index: -1
 OtherIcons/Cities
   rotate: false
-  xy: 1447, 1944
+  xy: 112, 834
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 OtherIcons/Close
   rotate: false
-  xy: 799, 1836
+  xy: 112, 78
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 OtherIcons/Crosshair
   rotate: false
-  xy: 691, 1728
+  xy: 1123, 1944
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 OtherIcons/Diplomacy
   rotate: false
-  xy: 1339, 1728
+  xy: 1663, 1944
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 OtherIcons/DiplomacyW
   rotate: false
-  xy: 1447, 1728
+  xy: 1771, 1944
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 OtherIcons/DisbandUnit
   rotate: false
-  xy: 1555, 1728
+  xy: 1879, 1944
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 OtherIcons/Down
   rotate: false
-  xy: 1466, 690
+  xy: 652, 542
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 OtherIcons/Fire
   rotate: false
-  xy: 220, 1182
+  xy: 1123, 1836
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
@@ -587,154 +587,154 @@ TileSets/FantasyHex/Hexagon
   index: -1
 OtherIcons/Link
   rotate: false
-  xy: 1898, 1322
+  xy: 710, 484
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 OtherIcons/Load
   rotate: false
-  xy: 436, 72
+  xy: 220, 966
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 OtherIcons/Lock
   rotate: false
-  xy: 544, 72
+  xy: 328, 1074
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 OtherIcons/MapEditor
   rotate: false
-  xy: 730, 1512
+  xy: 328, 858
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 OtherIcons/MenuIcon
   rotate: false
-  xy: 946, 1512
+  xy: 220, 534
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 OtherIcons/Mods
   rotate: false
-  xy: 1162, 1404
+  xy: 328, 534
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 OtherIcons/Multiplayer
   rotate: false
-  xy: 1270, 1404
+  xy: 220, 210
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 OtherIcons/New
   rotate: false
-  xy: 1486, 1512
+  xy: 220, 102
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 OtherIcons/Options
   rotate: false
-  xy: 1810, 1620
+  xy: 436, 1152
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 OtherIcons/Pentagon
   rotate: false
-  xy: 652, 1188
+  xy: 436, 720
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 OtherIcons/Pillage
   rotate: false
-  xy: 652, 972
+  xy: 436, 504
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 OtherIcons/Present
   rotate: false
-  xy: 1084, 1296
+  xy: 544, 1044
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 OtherIcons/Puppet
   rotate: false
-  xy: 868, 972
+  xy: 544, 828
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 OtherIcons/Quest
   rotate: false
-  xy: 1084, 1188
+  xy: 544, 612
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 OtherIcons/Quickstart
   rotate: false
-  xy: 1192, 1296
+  xy: 544, 504
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 OtherIcons/Remove Heresy
   rotate: false
-  xy: 652, 540
+  xy: 436, 72
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 OtherIcons/Resume
   rotate: false
-  xy: 976, 864
+  xy: 622, 1620
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 OtherIcons/Shield
   rotate: false
-  xy: 1516, 1296
+  xy: 838, 1512
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 OtherIcons/Sleep
   rotate: false
-  xy: 1192, 864
+  xy: 1054, 1512
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 OtherIcons/Star
   rotate: false
-  xy: 652, 222
+  xy: 1162, 1410
   size: 100, 94
   orig: 100, 94
   offset: 0, 0
   index: -1
 OtherIcons/Stop
   rotate: false
-  xy: 1192, 756
+  xy: 1378, 1620
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 OtherIcons/Swap
   rotate: false
-  xy: 1408, 972
+  xy: 1486, 1620
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
@@ -748,14 +748,14 @@ OtherIcons/Triangle
   index: -1
 OtherIcons/Up
   rotate: false
-  xy: 1150, 308
+  xy: 768, 940
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 OtherIcons/whiteDot
   rotate: false
-  xy: 1404, 385
+  xy: 285, 1605
   size: 1, 1
   orig: 1, 1
   offset: 0, 0
@@ -769,1477 +769,910 @@ PolicyIcons/Aesthetics
   index: -1
 PolicyIcons/Aristocracy
   rotate: false
-  xy: 1732, 1130
+  xy: 818, 1346
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Citizenship
   rotate: false
-  xy: 1918, 1554
+  xy: 652, 1006
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Civil Society
   rotate: false
-  xy: 1840, 1230
+  xy: 992, 1346
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Collective Rule
   rotate: false
-  xy: 1408, 690
+  xy: 1050, 1346
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Communism
   rotate: false
-  xy: 1987, 1820
+  xy: 652, 890
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Constitution
   rotate: false
-  xy: 1918, 1496
+  xy: 652, 832
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Cultural Diplomacy
   rotate: false
-  xy: 1918, 1438
+  xy: 652, 716
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Democracy
   rotate: false
-  xy: 1466, 748
+  xy: 652, 600
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Educated Elite
   rotate: false
-  xy: 1682, 1022
+  xy: 652, 426
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Fascism
   rotate: false
-  xy: 1034, 208
+  xy: 652, 194
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Free Religion
   rotate: false
-  xy: 397, 1772
+  xy: 1166, 1352
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Free Speech
   rotate: false
-  xy: 760, 100
+  xy: 710, 1238
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Free Thought
   rotate: false
-  xy: 818, 100
+  xy: 710, 1180
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Humanism
   rotate: false
-  xy: 1976, 1646
+  xy: 710, 832
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Landed Elite
   rotate: false
-  xy: 1918, 1380
+  xy: 710, 600
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Legalism
   rotate: false
-  xy: 1976, 1414
+  xy: 710, 542
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Mandate Of Heaven
   rotate: false
-  xy: 1976, 1356
+  xy: 710, 368
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Mercantilism
   rotate: false
-  xy: 1956, 1240
+  xy: 710, 194
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Merchant Navy
   rotate: false
-  xy: 1956, 1182
+  xy: 710, 136
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Meritocracy
   rotate: false
-  xy: 188, 20
+  xy: 710, 78
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Militarism
   rotate: false
-  xy: 246, 44
+  xy: 397, 1772
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Military Caste
   rotate: false
-  xy: 304, 44
+  xy: 72, 20
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Military Tradition
   rotate: false
-  xy: 362, 44
+  xy: 130, 20
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Monarchy
   rotate: false
-  xy: 992, 150
+  xy: 1976, 1646
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Nationalism
   rotate: false
-  xy: 992, 92
+  xy: 1976, 1530
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Naval Tradition
   rotate: false
-  xy: 1050, 150
+  xy: 1976, 1472
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Oligarchy
   rotate: false
-  xy: 1050, 92
+  xy: 1918, 1380
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Organized Religion
   rotate: false
-  xy: 1416, 632
+  xy: 1976, 1414
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Philantropy
   rotate: false
-  xy: 1474, 632
+  xy: 1976, 1356
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Planned Economy
   rotate: false
-  xy: 1416, 574
+  xy: 188, 20
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Police State
   rotate: false
-  xy: 1474, 574
+  xy: 246, 44
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Populism
   rotate: false
-  xy: 420, 14
+  xy: 304, 44
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Professional Army
   rotate: false
-  xy: 536, 14
+  xy: 420, 14
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Protectionism
   rotate: false
-  xy: 594, 14
+  xy: 478, 14
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Reformation
   rotate: false
-  xy: 1690, 964
+  xy: 652, 20
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Representation
   rotate: false
-  xy: 1200, 424
+  xy: 768, 1288
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Republic
   rotate: false
-  xy: 1200, 366
+  xy: 768, 1230
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Scholasticism
   rotate: false
-  xy: 1258, 424
+  xy: 826, 1288
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Scientific Revolution
   rotate: false
-  xy: 1524, 856
+  xy: 826, 1230
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Secularism
   rotate: false
-  xy: 1524, 740
+  xy: 768, 1114
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Socialism
   rotate: false
-  xy: 1092, 316
+  xy: 942, 1288
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Sovereignty
   rotate: false
-  xy: 1308, 532
+  xy: 826, 1114
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Theocracy
   rotate: false
-  xy: 1640, 790
+  xy: 768, 998
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Total War
   rotate: false
-  xy: 1582, 732
+  xy: 826, 1056
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Trade Unions
   rotate: false
-  xy: 1640, 732
+  xy: 884, 1114
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/United Front
   rotate: false
-  xy: 1698, 790
+  xy: 1000, 1230
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Universal Suffrage
   rotate: false
-  xy: 1698, 732
+  xy: 1058, 1288
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Warrior Code
   rotate: false
-  xy: 1150, 250
+  xy: 884, 1056
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 ReligionIcons/Buddhism
   rotate: false
-  xy: 112, 78
+  xy: 4, 78
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ReligionIcons/Christianity
   rotate: false
-  xy: 1231, 1944
+  xy: 112, 1050
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ReligionIcons/Confucianism
   rotate: false
-  xy: 1447, 1836
+  xy: 691, 1944
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ReligionIcons/Follower
   rotate: false
-  xy: 328, 1074
+  xy: 1555, 1836
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ReligionIcons/Hinduism
   rotate: false
-  xy: 328, 102
+  xy: 1663, 1728
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ReligionIcons/Islam
   rotate: false
-  xy: 544, 1152
+  xy: 501, 1692
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ReligionIcons/Judaism
   rotate: false
-  xy: 544, 720
+  xy: 220, 1290
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ReligionIcons/Pantheon
   rotate: false
-  xy: 1702, 1404
+  xy: 436, 1044
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ReligionIcons/Religion
   rotate: false
-  xy: 1192, 1188
+  xy: 544, 288
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ReligionIcons/Shinto
   rotate: false
-  xy: 652, 324
+  xy: 946, 1620
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ReligionIcons/Sikhism
   rotate: false
-  xy: 868, 540
+  xy: 946, 1512
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ReligionIcons/Taoism
   rotate: false
-  xy: 1624, 1188
+  xy: 1594, 1620
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ReligionIcons/Tengriism
   rotate: false
-  xy: 652, 114
+  xy: 1594, 1512
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ReligionIcons/Zoroastrianism
   rotate: false
-  xy: 1300, 648
+  xy: 652, 1296
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Aluminum
   rotate: false
-  xy: 4, 834
+  xy: 4, 1158
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Bananas
   rotate: false
-  xy: 112, 726
+  xy: 4, 402
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Cattle
   rotate: false
-  xy: 799, 1944
+  xy: 112, 1266
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Citrus
   rotate: false
-  xy: 1555, 1944
+  xy: 112, 726
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Coal
   rotate: false
-  xy: 907, 1836
+  xy: 583, 1908
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Copper
   rotate: false
-  xy: 1663, 1836
+  xy: 799, 1944
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Cotton
   rotate: false
-  xy: 1771, 1836
+  xy: 907, 1944
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Crab
   rotate: false
-  xy: 1879, 1836
+  xy: 1015, 1944
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Deer
   rotate: false
-  xy: 1123, 1728
+  xy: 1447, 1944
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Dyes
   rotate: false
-  xy: 1771, 1728
+  xy: 475, 1800
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Fish
   rotate: false
-  xy: 328, 1290
+  xy: 1231, 1836
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Furs
   rotate: false
-  xy: 220, 642
+  xy: 799, 1728
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Gems
   rotate: false
-  xy: 220, 534
+  xy: 907, 1728
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Gold Ore
   rotate: false
-  xy: 220, 318
+  xy: 1231, 1728
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Horses
   rotate: false
-  xy: 436, 1044
+  xy: 1879, 1728
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Incense
   rotate: false
-  xy: 436, 612
+  xy: 298, 1398
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Iron
   rotate: false
-  xy: 436, 288
+  xy: 406, 1506
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Ivory
   rotate: false
-  xy: 544, 1044
+  xy: 514, 1584
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Jewelry
   rotate: false
-  xy: 544, 828
+  xy: 514, 1368
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Marble
   rotate: false
-  xy: 838, 1620
+  xy: 220, 642
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Oil
   rotate: false
-  xy: 1702, 1620
+  xy: 328, 102
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Pearls
   rotate: false
-  xy: 652, 1296
+  xy: 436, 828
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Porcelain
   rotate: false
-  xy: 868, 1080
+  xy: 544, 1152
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Salt
   rotate: false
-  xy: 976, 756
+  xy: 730, 1512
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Sheep
   rotate: false
-  xy: 1408, 1188
+  xy: 730, 1404
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Silk
   rotate: false
-  xy: 976, 648
+  xy: 1054, 1620
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Silver
   rotate: false
-  xy: 1084, 756
+  xy: 946, 1404
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Spices
   rotate: false
-  xy: 1624, 1296
+  xy: 1270, 1620
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Stone
   rotate: false
-  xy: 1084, 648
+  xy: 1270, 1512
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Sugar
   rotate: false
-  xy: 1300, 864
+  xy: 1378, 1512
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Truffles
   rotate: false
-  xy: 1624, 1080
+  xy: 1378, 1404
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Uranium
   rotate: false
-  xy: 1732, 1188
+  xy: 1486, 1404
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Whales
   rotate: false
-  xy: 868, 216
+  xy: 1594, 1404
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Wheat
   rotate: false
-  xy: 976, 324
+  xy: 1702, 1404
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Wine
   rotate: false
-  xy: 1084, 432
+  xy: 1810, 1404
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 StatIcons/Acquire
   rotate: false
-  xy: 4, 1158
+  xy: 475, 1908
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 StatIcons/CityConnection
   rotate: false
-  xy: 1879, 1944
+  xy: 112, 402
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 StatIcons/Culture
   rotate: false
-  xy: 799, 1728
+  xy: 1231, 1944
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 StatIcons/Faith
   rotate: false
-  xy: 514, 1584
+  xy: 799, 1836
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 StatIcons/Food
   rotate: false
-  xy: 220, 858
+  xy: 1663, 1836
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 StatIcons/Gold
   rotate: false
-  xy: 328, 534
+  xy: 1123, 1728
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 StatIcons/Happiness
   rotate: false
-  xy: 220, 102
+  xy: 1447, 1728
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 StatIcons/InterceptRange
   rotate: false
-  xy: 1976, 1530
+  xy: 710, 716
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 StatIcons/Malcontent
   rotate: false
-  xy: 730, 1620
+  xy: 328, 966
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 StatIcons/Population
   rotate: false
-  xy: 760, 972
+  xy: 544, 1260
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 StatIcons/Production
   rotate: false
-  xy: 760, 864
+  xy: 544, 936
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 StatIcons/Range
   rotate: false
-  xy: 1632, 964
+  xy: 536, 14
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 StatIcons/RangedStrength
   rotate: false
-  xy: 1632, 906
+  xy: 594, 14
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 StatIcons/ReligiousStrength
   rotate: false
-  xy: 1300, 1296
+  xy: 544, 180
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 StatIcons/Resistance
   rotate: false
-  xy: 868, 756
+  xy: 544, 72
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 StatIcons/Science
   rotate: false
-  xy: 1192, 972
+  xy: 838, 1620
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 StatIcons/Specialist
   rotate: false
-  xy: 1516, 1188
+  xy: 1162, 1512
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 StatIcons/Strength
   rotate: false
-  xy: 1582, 848
+  xy: 884, 1172
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
-TechIcons/Acoustics
-  rotate: false
-  xy: 475, 1908
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TechIcons/Advanced Ballistics
-  rotate: false
-  xy: 4, 1050
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TechIcons/Agriculture
-  rotate: false
-  xy: 4, 942
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TechIcons/Animal Husbandry
-  rotate: false
-  xy: 4, 510
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TechIcons/Archaeology
-  rotate: false
-  xy: 4, 294
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TechIcons/Archery
-  rotate: false
-  xy: 4, 186
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TechIcons/Architecture
-  rotate: false
-  xy: 4, 78
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TechIcons/Astronomy
-  rotate: false
-  xy: 190, 1452
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TechIcons/Atomic Theory
-  rotate: false
-  xy: 112, 1158
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TechIcons/Ballistics
-  rotate: false
-  xy: 112, 834
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TechIcons/Banking
-  rotate: false
-  xy: 112, 618
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TechIcons/Biology
-  rotate: false
-  xy: 112, 294
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TechIcons/Bronze Working
-  rotate: false
-  xy: 112, 186
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TechIcons/Calendar
-  rotate: false
-  xy: 583, 1908
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TechIcons/Chemistry
-  rotate: false
-  xy: 907, 1944
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TechIcons/Chivalry
-  rotate: false
-  xy: 1123, 1944
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TechIcons/Civil Service
-  rotate: false
-  xy: 691, 1836
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TechIcons/Combined Arms
-  rotate: false
-  xy: 1015, 1836
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TechIcons/Combustion
-  rotate: false
-  xy: 1123, 1836
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TechIcons/Compass
-  rotate: false
-  xy: 1231, 1836
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TechIcons/Computers
-  rotate: false
-  xy: 1339, 1836
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TechIcons/Construction
-  rotate: false
-  xy: 1555, 1836
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TechIcons/Currency
-  rotate: false
-  xy: 907, 1728
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TechIcons/Drama and Poetry
-  rotate: false
-  xy: 1663, 1728
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TechIcons/Dynamite
-  rotate: false
-  xy: 1879, 1728
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TechIcons/Ecology
-  rotate: false
-  xy: 289, 1722
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TechIcons/Economics
-  rotate: false
-  xy: 285, 1614
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TechIcons/Education
-  rotate: false
-  xy: 298, 1506
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TechIcons/Electricity
-  rotate: false
-  xy: 393, 1614
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TechIcons/Electronics
-  rotate: false
-  xy: 406, 1506
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TechIcons/Engineering
-  rotate: false
-  xy: 406, 1398
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TechIcons/Fertilizer
-  rotate: false
-  xy: 220, 1290
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TechIcons/Flight
-  rotate: false
-  xy: 328, 1182
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TechIcons/Future Tech
-  rotate: false
-  xy: 328, 750
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TechIcons/Globalization
-  rotate: false
-  xy: 220, 426
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TechIcons/Guilds
-  rotate: false
-  xy: 220, 210
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TechIcons/Gunpowder
-  rotate: false
-  xy: 328, 318
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TechIcons/Horseback Riding
-  rotate: false
-  xy: 436, 1152
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TechIcons/Industrialization
-  rotate: false
-  xy: 436, 396
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TechIcons/Iron Working
-  rotate: false
-  xy: 436, 180
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TechIcons/Lasers
-  rotate: false
-  xy: 544, 180
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TechIcons/Machinery
-  rotate: false
-  xy: 622, 1512
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TechIcons/Masonry
-  rotate: false
-  xy: 838, 1512
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TechIcons/Mass Media
-  rotate: false
-  xy: 946, 1620
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TechIcons/Mathematics
-  rotate: false
-  xy: 838, 1404
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TechIcons/Metal Casting
-  rotate: false
-  xy: 1054, 1620
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TechIcons/Metallurgy
-  rotate: false
-  xy: 946, 1404
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TechIcons/Military Science
-  rotate: false
-  xy: 1054, 1512
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TechIcons/Mining
-  rotate: false
-  xy: 1054, 1404
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TechIcons/Mobile Tactics
-  rotate: false
-  xy: 1270, 1620
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TechIcons/Nanotechnology
-  rotate: false
-  xy: 1378, 1512
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TechIcons/Navigation
-  rotate: false
-  xy: 1378, 1404
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TechIcons/Nuclear Fission
-  rotate: false
-  xy: 1594, 1620
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TechIcons/Nuclear Fusion
-  rotate: false
-  xy: 1486, 1404
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TechIcons/Optics
-  rotate: false
-  xy: 1702, 1512
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TechIcons/Particle Physics
-  rotate: false
-  xy: 1810, 1512
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TechIcons/Pharmaceuticals
-  rotate: false
-  xy: 652, 1080
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TechIcons/Philosophy
-  rotate: false
-  xy: 760, 1188
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TechIcons/Physics
-  rotate: false
-  xy: 868, 1296
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TechIcons/Plastics
-  rotate: false
-  xy: 868, 1188
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TechIcons/Pottery
-  rotate: false
-  xy: 976, 1188
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TechIcons/Printing Press
-  rotate: false
-  xy: 652, 756
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TechIcons/Radar
-  rotate: false
-  xy: 652, 648
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TechIcons/Radio
-  rotate: false
-  xy: 760, 756
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TechIcons/Railroads
-  rotate: false
-  xy: 976, 972
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TechIcons/Refrigeration
-  rotate: false
-  xy: 1084, 1080
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TechIcons/Replaceable Parts
-  rotate: false
-  xy: 760, 648
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TechIcons/Rifling
-  rotate: false
-  xy: 1084, 972
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TechIcons/Robotics
-  rotate: false
-  xy: 1300, 1188
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TechIcons/Rocketry
-  rotate: false
-  xy: 1408, 1296
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TechIcons/Sailing
-  rotate: false
-  xy: 868, 648
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TechIcons/Satellites
-  rotate: false
-  xy: 1084, 864
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TechIcons/Scientific Theory
-  rotate: false
-  xy: 1300, 1080
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TechIcons/Stealth
-  rotate: false
-  xy: 760, 324
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TechIcons/Steam Power
-  rotate: false
-  xy: 868, 432
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TechIcons/Steel
-  rotate: false
-  xy: 976, 540
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TechIcons/Telecommunications
-  rotate: false
-  xy: 1732, 1296
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TechIcons/The Wheel
-  rotate: false
-  xy: 1192, 648
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TechIcons/Theology
-  rotate: false
-  xy: 1300, 756
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TechIcons/Trapping
-  rotate: false
-  xy: 1516, 972
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TechIcons/Writing
-  rotate: false
-  xy: 1192, 540
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
 TileSets/Default/AtollOverlay
   rotate: false
-  xy: 112, 1266
+  xy: 4, 726
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 TileSets/Default/CityOverlay
   rotate: false
-  xy: 475, 1800
+  xy: 112, 294
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 TileSets/Default/FalloutOverlay
   rotate: false
-  xy: 514, 1476
+  xy: 907, 1836
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 TileSets/Default/Flood plainsOverlay
   rotate: false
-  xy: 220, 966
+  xy: 1447, 1836
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 TileSets/Default/ForestOverlay
   rotate: false
-  xy: 328, 966
+  xy: 1771, 1836
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 TileSets/Default/HillOverlay
   rotate: false
-  xy: 328, 210
+  xy: 1555, 1728
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 TileSets/Default/IceOverlay
   rotate: false
-  xy: 436, 936
+  xy: 289, 1722
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 TileSets/Default/JungleOverlay
   rotate: false
-  xy: 544, 612
+  xy: 220, 1182
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 TileSets/Default/LakesOverlay
   rotate: false
-  xy: 544, 396
+  xy: 220, 1074
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 TileSets/Default/MarshOverlay
   rotate: false
-  xy: 730, 1404
+  xy: 328, 750
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 TileSets/Default/MountainOverlay
   rotate: false
-  xy: 1378, 1620
+  xy: 328, 426
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 TileSets/Default/NaturalWonderOverlay
   rotate: false
-  xy: 1486, 1620
+  xy: 328, 318
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 TileSets/Default/OasisOverlay
   rotate: false
-  xy: 1594, 1512
+  xy: 328, 210
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 TileSets/Default/Railroad
   rotate: false
-  xy: 868, 864
+  xy: 544, 396
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ImprovementIcons/Railroad
   rotate: false
-  xy: 868, 864
+  xy: 544, 396
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
@@ -2253,21 +1686,21 @@ TileSets/Default/Road
   index: -1
 TileSets/Default/Tiles/River-Bottom
   rotate: false
-  xy: 1812, 650
+  xy: 1008, 692
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/Default/Tiles/River-BottomLeft
   rotate: false
-  xy: 1812, 578
+  xy: 1008, 620
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/Default/Tiles/River-BottomRight
   rotate: false
-  xy: 1812, 506
+  xy: 1008, 548
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
@@ -2302,14 +1735,14 @@ TileSets/FantasyHex/Road
   index: -1
 TileSets/FantasyHex/Tiles/Academy
   rotate: false
-  xy: 397, 1728
+  xy: 1224, 1366
   size: 32, 36
   orig: 32, 36
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Academy-Snow
   rotate: false
-  xy: 710, 71
+  xy: 397, 1729
   size: 32, 35
   orig: 32, 35
   offset: 0, 0
@@ -2323,7 +1756,7 @@ TileSets/FantasyHex/Tiles/Aluminum
   index: -1
 TileSets/FantasyHex/Tiles/Ancient ruins
   rotate: false
-  xy: 652, 20
+  xy: 1116, 1310
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
@@ -2337,1134 +1770,1134 @@ TileSets/FantasyHex/Tiles/Ancient ruins-Jungle
   index: -1
 TileSets/FantasyHex/Tiles/Ancient ruins-Sand
   rotate: false
-  xy: 1308, 496
+  xy: 826, 962
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Ancient ruins-Snow
   rotate: false
-  xy: 1366, 554
+  xy: 884, 1020
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Ancient ruins2
   rotate: false
-  xy: 1740, 1036
+  xy: 768, 904
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Atoll
   rotate: false
-  xy: 366, 8
+  xy: 768, 832
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Bananas
   rotate: false
-  xy: 1748, 1000
+  xy: 366, 8
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Barbarian encampment
   rotate: false
-  xy: 1748, 964
+  xy: 768, 760
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Barbarian encampment-Snow
   rotate: false
-  xy: 1788, 999
+  xy: 768, 723
   size: 32, 29
   orig: 32, 29
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Barringer Crater
   rotate: false
-  xy: 1748, 928
+  xy: 768, 687
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Bison
   rotate: false
-  xy: 1366, 518
+  xy: 768, 471
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Bison+Camp
   rotate: false
-  xy: 1406, 538
+  xy: 768, 435
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Cattle
   rotate: false
-  xy: 750, 28
+  xy: 1264, 1368
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Cattle+Pasture
   rotate: false
-  xy: 790, 24
+  xy: 1304, 1364
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Cerro de Potosi
   rotate: false
-  xy: 870, 28
+  xy: 1384, 1368
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Citadel
   rotate: false
-  xy: 1316, 417
+  xy: 1504, 1361
   size: 32, 35
   orig: 32, 35
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Citadel-Snow
   rotate: false
-  xy: 1316, 379
+  xy: 1544, 1366
   size: 32, 30
   orig: 32, 30
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Citrus
   rotate: false
-  xy: 1324, 343
+  xy: 1584, 1368
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Citrus+Plantation
   rotate: false
-  xy: 1324, 307
+  xy: 1624, 1368
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/City center
   rotate: false
-  xy: 1306, 264
+  xy: 1664, 1361
   size: 32, 35
   orig: 32, 35
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/City center-Ancient era
   rotate: false
-  xy: 1306, 224
+  xy: 1704, 1364
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/City center-Atomic era
   rotate: false
-  xy: 1532, 662
+  xy: 1744, 1362
   size: 32, 34
   orig: 32, 34
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/City center-Classical era
   rotate: false
-  xy: 1532, 622
+  xy: 1784, 1364
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/City center-Future era
   rotate: false
-  xy: 1532, 580
+  xy: 1824, 1362
   size: 32, 34
   orig: 32, 34
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/City center-Industrial era
   rotate: false
-  xy: 1346, 266
+  xy: 1864, 1363
   size: 32, 33
   orig: 32, 33
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/City center-Information era
   rotate: false
-  xy: 1346, 222
+  xy: 1098, 1244
   size: 32, 36
   orig: 32, 36
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/City center-Medieval era
   rotate: false
-  xy: 1888, 1166
+  xy: 1098, 1204
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/City center-Modern era
   rotate: false
-  xy: 910, 50
+  xy: 1098, 1162
   size: 32, 34
   orig: 32, 34
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/City center-Renaissance era
   rotate: false
-  xy: 950, 52
+  xy: 1058, 1139
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/City ruins
   rotate: false
-  xy: 990, 56
+  xy: 1098, 1126
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Coal
   rotate: false
-  xy: 1070, 56
+  xy: 884, 984
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Coast
   rotate: false
-  xy: 910, 14
+  xy: 942, 1042
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Cocoa
   rotate: false
-  xy: 950, 16
+  xy: 1000, 1100
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Cocoa+Plantation
   rotate: false
-  xy: 990, 20
+  xy: 1040, 1103
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Copper
   rotate: false
-  xy: 1212, 214
+  xy: 808, 744
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Cotton
   rotate: false
-  xy: 1928, 1146
+  xy: 808, 672
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Crab
   rotate: false
-  xy: 1968, 1146
+  xy: 808, 636
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Customs house
   rotate: false
-  xy: 1968, 1103
+  xy: 808, 557
   size: 32, 35
   orig: 32, 35
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Deer
   rotate: false
-  xy: 1252, 199
+  xy: 808, 521
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Deer+Camp
   rotate: false
-  xy: 1292, 188
+  xy: 808, 485
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Desert
   rotate: false
-  xy: 1332, 186
+  xy: 808, 449
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Desert+Farm
   rotate: false
-  xy: 1372, 186
+  xy: 808, 413
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Desert+Flood plains+Farm
   rotate: false
-  xy: 1486, 466
+  xy: 808, 377
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Dyes
   rotate: false
-  xy: 1526, 472
+  xy: 808, 269
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Dyes+Plantation
   rotate: false
-  xy: 1108, 178
+  xy: 808, 233
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/El Dorado
   rotate: false
-  xy: 1108, 141
+  xy: 808, 196
   size: 32, 29
   orig: 32, 29
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Fallout
   rotate: false
-  xy: 1148, 171
+  xy: 808, 153
   size: 32, 35
   orig: 32, 35
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Fish
   rotate: false
-  xy: 1108, 105
+  xy: 808, 117
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Fishing Boats
   rotate: false
-  xy: 1188, 178
+  xy: 808, 81
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Flood plains
   rotate: false
-  xy: 1148, 135
+  xy: 808, 45
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Forest
   rotate: false
-  xy: 1148, 95
+  xy: 924, 1002
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Fort
   rotate: false
-  xy: 1188, 101
+  xy: 808, 4
   size: 32, 33
   orig: 32, 33
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Fountain of Youth
   rotate: false
-  xy: 1228, 159
+  xy: 982, 1060
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Furs
   rotate: false
-  xy: 1228, 87
+  xy: 924, 966
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Furs+Camp
   rotate: false
-  xy: 1188, 65
+  xy: 982, 1024
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Gems
   rotate: false
-  xy: 1268, 80
+  xy: 848, 768
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Gold Ore
   rotate: false
-  xy: 1308, 150
+  xy: 848, 693
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Grand Mesa
   rotate: false
-  xy: 1308, 110
+  xy: 848, 653
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Grassland
   rotate: false
-  xy: 1348, 150
+  xy: 848, 617
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Grassland+Farm
   rotate: false
-  xy: 1308, 74
+  xy: 848, 581
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Grassland+Forest+Camp
   rotate: false
-  xy: 1348, 111
+  xy: 848, 542
   size: 32, 31
   orig: 32, 31
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Grassland+Forest+Deer+Camp
   rotate: false
-  xy: 1348, 72
+  xy: 848, 503
   size: 32, 31
   orig: 32, 31
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Grassland+Forest+Furs+Camp
   rotate: false
-  xy: 1308, 35
+  xy: 848, 464
   size: 32, 31
   orig: 32, 31
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Grassland+Forest+Lumber mill
   rotate: false
-  xy: 1348, 33
+  xy: 848, 425
   size: 32, 31
   orig: 32, 31
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Grassland+Forest+Truffles+Camp
   rotate: false
-  xy: 1388, 147
+  xy: 848, 386
   size: 32, 31
   orig: 32, 31
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Grassland+Hill+Farm
   rotate: false
-  xy: 1388, 111
+  xy: 848, 350
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Grassland+Hill+Forest+Camp
   rotate: false
-  xy: 1388, 75
+  xy: 848, 314
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Grassland+Hill+Forest+Lumber mill
   rotate: false
-  xy: 1388, 39
+  xy: 848, 278
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Grassland+Hill+Forest+Trading post
   rotate: false
-  xy: 1526, 436
+  xy: 848, 242
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Grassland+Jungle+Trading post
   rotate: false
-  xy: 1356, 478
+  xy: 848, 202
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/GrasslandForest
   rotate: false
-  xy: 1356, 439
+  xy: 848, 163
   size: 32, 31
   orig: 32, 31
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Great Barrier Reef
   rotate: false
-  xy: 1396, 430
+  xy: 848, 52
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Hill
   rotate: false
-  xy: 1856, 1090
+  xy: 888, 710
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/HillForest+Lumber mill
   rotate: false
-  xy: 1860, 1054
+  xy: 888, 674
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/HillMarbleQuarry
   rotate: false
-  xy: 1868, 1018
+  xy: 888, 638
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/HillMine
   rotate: false
-  xy: 1868, 982
+  xy: 888, 602
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/HillStoneQuarry
   rotate: false
-  xy: 1868, 946
+  xy: 888, 566
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Holy Site
   rotate: false
-  xy: 1868, 902
+  xy: 888, 522
   size: 32, 36
   orig: 32, 36
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Horses
   rotate: false
-  xy: 1556, 328
+  xy: 888, 378
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Horses+Pasture
   rotate: false
-  xy: 2008, 1142
+  xy: 888, 338
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Ice
   rotate: false
-  xy: 1566, 472
+  xy: 888, 229
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Incense
   rotate: false
-  xy: 1596, 364
+  xy: 888, 121
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Incense+Plantation
   rotate: false
-  xy: 1596, 328
+  xy: 888, 85
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Iron
   rotate: false
-  xy: 1646, 696
+  xy: 928, 841
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Ivory
   rotate: false
-  xy: 1726, 696
+  xy: 928, 769
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Ivory+Camp
   rotate: false
-  xy: 1572, 660
+  xy: 928, 733
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Jungle
   rotate: false
-  xy: 1572, 584
+  xy: 928, 621
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Krakatoa
   rotate: false
-  xy: 1652, 622
+  xy: 928, 472
   size: 32, 30
   orig: 32, 30
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Lakes
   rotate: false
-  xy: 1612, 585
+  xy: 928, 400
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Landmark
   rotate: false
-  xy: 1732, 652
+  xy: 928, 284
   size: 32, 36
   orig: 32, 36
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Manufactory
   rotate: false
-  xy: 1110, 4
+  xy: 1022, 1053
   size: 32, 39
   orig: 32, 39
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Marble
   rotate: false
-  xy: 1652, 514
+  xy: 1004, 981
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Marsh
   rotate: false
-  xy: 1150, 4
+  xy: 986, 908
   size: 32, 29
   orig: 32, 29
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Mine
   rotate: false
-  xy: 1692, 480
+  xy: 968, 764
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Moai
   rotate: false
-  xy: 1190, 4
+  xy: 968, 619
   size: 32, 29
   orig: 32, 29
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Mount Fuji
   rotate: false
-  xy: 1636, 367
+  xy: 968, 473
   size: 32, 30
   orig: 32, 30
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Mount Kailash
   rotate: false
-  xy: 1636, 327
+  xy: 968, 433
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Mount Sinai
   rotate: false
-  xy: 1676, 402
+  xy: 968, 393
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Mountain
   rotate: false
-  xy: 1676, 358
+  xy: 968, 349
   size: 32, 36
   orig: 32, 36
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Oasis
   rotate: false
-  xy: 1756, 328
+  xy: 968, 97
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Ocean
   rotate: false
-  xy: 1716, 292
+  xy: 968, 61
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Offshore Platform
   rotate: false
-  xy: 1756, 292
+  xy: 968, 25
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Oil
   rotate: false
-  xy: 1230, 5
+  xy: 437, 1736
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Oil well
   rotate: false
-  xy: 1364, 322
+  xy: 1224, 1330
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Old Faithful
   rotate: false
-  xy: 1386, 282
+  xy: 1264, 1328
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Pasture
   rotate: false
-  xy: 1404, 345
+  xy: 1384, 1328
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Pearls
   rotate: false
-  xy: 1756, 794
+  xy: 1464, 1332
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Plains
   rotate: false
-  xy: 1772, 650
+  xy: 1624, 1332
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Plains+Farm
   rotate: false
-  xy: 1772, 614
+  xy: 1664, 1325
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Plains+Forest+Camp
   rotate: false
-  xy: 1772, 574
+  xy: 1704, 1324
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Plains+Forest+Lumber mill
   rotate: false
-  xy: 1772, 534
+  xy: 1744, 1322
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Plains+Jungle+Trading post
   rotate: false
-  xy: 1772, 494
+  xy: 1784, 1324
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/PlainsForest
   rotate: false
-  xy: 1772, 454
+  xy: 1824, 1322
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/PlainsJungle
   rotate: false
-  xy: 1426, 252
+  xy: 1864, 1323
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Plantation
   rotate: false
-  xy: 1426, 292
+  xy: 1904, 1344
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Plantation+Bananas
   rotate: false
-  xy: 1426, 216
+  xy: 1904, 1308
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Plantation+Cotton
   rotate: false
-  xy: 1428, 180
+  xy: 1864, 1287
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Polder
   rotate: false
-  xy: 1428, 143
+  xy: 1904, 1271
   size: 32, 29
   orig: 32, 29
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Quarry
   rotate: false
-  xy: 1428, 35
+  xy: 1026, 909
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Quarry+Marble
   rotate: false
-  xy: 1796, 830
+  xy: 1026, 873
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Quarry+Stone
   rotate: false
-  xy: 1796, 794
+  xy: 1008, 836
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/River-Bottom
   rotate: false
-  xy: 1812, 686
+  xy: 1008, 728
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/River-BottomLeft
   rotate: false
-  xy: 1812, 614
+  xy: 1008, 656
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/River-BottomRight
   rotate: false
-  xy: 1812, 542
+  xy: 1008, 584
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Rock of Gibraltar
   rotate: false
-  xy: 1812, 466
+  xy: 1008, 508
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Salt
   rotate: false
-  xy: 1796, 394
+  xy: 1008, 436
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Sheep
   rotate: false
-  xy: 1836, 357
+  xy: 1008, 255
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Sheep+Pasture
   rotate: false
-  xy: 1836, 317
+  xy: 1008, 215
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Silk
   rotate: false
-  xy: 1876, 830
+  xy: 1008, 70
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Silk+Plantation
   rotate: false
-  xy: 1876, 794
+  xy: 1008, 34
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Silver
   rotate: false
-  xy: 1876, 758
+  xy: 1066, 909
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Snow
   rotate: false
-  xy: 1852, 648
+  xy: 1048, 799
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Snow+Farm
   rotate: false
-  xy: 1852, 612
+  xy: 1048, 763
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Spices
   rotate: false
-  xy: 1852, 540
+  xy: 1048, 691
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Spices+Plantation
   rotate: false
-  xy: 1852, 504
+  xy: 1048, 655
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Sri Pada
   rotate: false
-  xy: 1852, 464
+  xy: 1048, 615
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Stone
   rotate: false
-  xy: 1892, 684
+  xy: 1048, 579
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Sugar
   rotate: false
-  xy: 1892, 648
+  xy: 1048, 543
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Sugar+Plantation
   rotate: false
-  xy: 1892, 612
+  xy: 1048, 507
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Terrace farm
   rotate: false
-  xy: 1892, 468
+  xy: 1048, 363
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Trading post
   rotate: false
-  xy: 1876, 396
+  xy: 1048, 291
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Truffles
   rotate: false
-  xy: 1876, 288
+  xy: 1048, 183
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Truffles+Camp
   rotate: false
-  xy: 1916, 396
+  xy: 1048, 147
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Tundra
   rotate: false
-  xy: 1916, 360
+  xy: 1048, 111
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Tundra+Farm
   rotate: false
-  xy: 1916, 324
+  xy: 1048, 75
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Tundra+Forest+Camp
   rotate: false
-  xy: 1916, 284
+  xy: 1048, 35
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Tundra+Forest+Camp+Furs
   rotate: false
-  xy: 1876, 248
+  xy: 1088, 831
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Tundra+Forest+Deer+Camp
   rotate: false
-  xy: 1916, 244
+  xy: 1088, 791
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Tundra+Forest+Lumber mill
   rotate: false
-  xy: 1466, 288
+  xy: 1088, 751
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Tundra+Forest+Truffles+Camp
   rotate: false
-  xy: 1466, 248
+  xy: 1088, 711
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/TundraForest
   rotate: false
-  xy: 1506, 288
+  xy: 1088, 671
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Uluru
   rotate: false
-  xy: 1506, 248
+  xy: 1088, 595
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Uranium
   rotate: false
-  xy: 1546, 256
+  xy: 1088, 559
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Whales
   rotate: false
-  xy: 1626, 255
+  xy: 1088, 381
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Whales+Fishing Boats
   rotate: false
-  xy: 1666, 286
+  xy: 1088, 345
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Wheat
   rotate: false
-  xy: 1666, 250
+  xy: 1088, 309
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Wine
   rotate: false
-  xy: 1706, 256
+  xy: 1088, 273
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Wine+Plantation
   rotate: false
-  xy: 1746, 256
+  xy: 1088, 237
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/TopBorder
   rotate: false
-  xy: 1892, 432
+  xy: 1048, 327
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/African Forest Elephant
   rotate: false
-  xy: 1840, 1193
+  xy: 1058, 1251
   size: 32, 29
   orig: 32, 29
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Anti-Aircraft Gun
   rotate: false
-  xy: 1524, 704
+  xy: 942, 1078
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Anti-Tank Gun
   rotate: false
-  xy: 1092, 222
+  xy: 1000, 1136
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Archaeologist
   rotate: false
-  xy: 1266, 272
+  xy: 1058, 1215
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Archer
   rotate: false
-  xy: 1780, 1036
+  xy: 768, 868
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
@@ -3478,203 +2911,203 @@ TileSets/FantasyHex/Units/Artillery
   index: -1
 TileSets/FantasyHex/Units/Atlatlist
   rotate: false
-  xy: 326, 8
+  xy: 1058, 1179
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Axe Thrower
   rotate: false
-  xy: 1820, 1036
+  xy: 326, 8
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Ballista
   rotate: false
-  xy: 1848, 1157
+  xy: 768, 796
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Battering Ram
   rotate: false
-  xy: 1788, 963
+  xy: 768, 651
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Battleship
   rotate: false
-  xy: 1788, 927
+  xy: 768, 615
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Bazooka
   rotate: false
-  xy: 1828, 1000
+  xy: 768, 579
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Berber Cavalry
   rotate: false
-  xy: 1828, 964
+  xy: 768, 543
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Berserker
   rotate: false
-  xy: 1828, 928
+  xy: 768, 507
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Bowman
   rotate: false
-  xy: 1446, 538
+  xy: 768, 399
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Brute
   rotate: false
-  xy: 1486, 538
+  xy: 768, 363
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Camel Archer
   rotate: false
-  xy: 1266, 235
+  xy: 768, 326
   size: 32, 29
   orig: 32, 29
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Cannon
   rotate: false
-  xy: 1406, 502
+  xy: 768, 290
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Caravan
   rotate: false
-  xy: 1446, 496
+  xy: 768, 248
   size: 32, 34
   orig: 32, 34
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Caravel
   rotate: false
-  xy: 1486, 502
+  xy: 768, 212
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Cargo Ship
   rotate: false
-  xy: 750, 64
+  xy: 768, 176
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Carolean
   rotate: false
-  xy: 790, 64
+  xy: 768, 140
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Carrier
   rotate: false
-  xy: 830, 64
+  xy: 768, 104
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Cataphract
   rotate: false
-  xy: 870, 64
+  xy: 768, 68
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Catapult
   rotate: false
-  xy: 710, 35
+  xy: 768, 32
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Cavalry
   rotate: false
-  xy: 830, 28
+  xy: 1344, 1368
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Chariot Archer
   rotate: false
-  xy: 437, 1736
+  xy: 1424, 1368
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Chu-Ko-Nu
   rotate: false
-  xy: 1316, 460
+  xy: 1464, 1368
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/CivilianLandUnit
   rotate: false
-  xy: 1030, 56
+  xy: 826, 926
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Comanche Rider
   rotate: false
-  xy: 1030, 19
+  xy: 808, 889
   size: 32, 29
   orig: 32, 29
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Companion Cavalry
   rotate: false
-  xy: 1070, 19
+  xy: 808, 852
   size: 32, 29
   orig: 32, 29
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Composite Bowman
   rotate: false
-  xy: 1132, 214
+  xy: 808, 816
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Conquistador
   rotate: false
-  xy: 1172, 214
+  xy: 808, 780
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Cossack
   rotate: false
-  xy: 1888, 1130
+  xy: 808, 708
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Crossbowman
   rotate: false
-  xy: 1928, 1110
+  xy: 808, 600
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
@@ -3688,686 +3121,686 @@ TileSets/FantasyHex/Units/Cruiser
   index: -1
 TileSets/FantasyHex/Units/Destroyer
   rotate: false
-  xy: 1532, 544
+  xy: 808, 341
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Dromon
   rotate: false
-  xy: 1526, 508
+  xy: 808, 305
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Foreign Legion
   rotate: false
-  xy: 1188, 142
+  xy: 866, 948
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Frigate
   rotate: false
-  xy: 1228, 123
+  xy: 866, 912
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Galleass
   rotate: false
-  xy: 1228, 51
+  xy: 848, 876
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Galley
   rotate: false
-  xy: 1268, 152
+  xy: 848, 840
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Gatling Gun
   rotate: false
-  xy: 1268, 116
+  xy: 848, 804
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Giant Death Robot
   rotate: false
-  xy: 1268, 41
+  xy: 848, 729
   size: 32, 31
   orig: 32, 31
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Great Admiral
   rotate: false
-  xy: 1356, 400
+  xy: 848, 124
   size: 32, 31
   orig: 32, 31
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Great Artist
   rotate: false
-  xy: 1396, 466
+  xy: 848, 88
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Great Engineer
   rotate: false
-  xy: 1396, 394
+  xy: 848, 16
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Great Galleass
   rotate: false
-  xy: 1436, 460
+  xy: 906, 930
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Great General
   rotate: false
-  xy: 1436, 421
+  xy: 964, 985
   size: 32, 31
   orig: 32, 31
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Great Merchant
   rotate: false
-  xy: 1436, 385
+  xy: 964, 949
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Great Musician
   rotate: false
-  xy: 1476, 430
+  xy: 906, 894
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Great Prophet
   rotate: false
-  xy: 1476, 394
+  xy: 946, 913
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Great Scientist
   rotate: false
-  xy: 1516, 400
+  xy: 946, 877
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Great War Infantry
   rotate: false
-  xy: 1476, 358
+  xy: 888, 858
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Great Writer
   rotate: false
-  xy: 1516, 364
+  xy: 888, 822
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Hakkapeliitta
   rotate: false
-  xy: 1556, 400
+  xy: 888, 786
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Helicopter Gunship
   rotate: false
-  xy: 1556, 364
+  xy: 888, 750
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Hoplite
   rotate: false
-  xy: 1828, 892
+  xy: 888, 486
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Horse Archer
   rotate: false
-  xy: 1868, 866
+  xy: 888, 450
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Horseman
   rotate: false
-  xy: 1516, 328
+  xy: 888, 414
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Hussar
   rotate: false
-  xy: 2008, 1105
+  xy: 888, 301
   size: 32, 29
   orig: 32, 29
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Hwach'a
   rotate: false
-  xy: 1566, 508
+  xy: 888, 265
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Immortal
   rotate: false
-  xy: 1566, 436
+  xy: 888, 193
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Impi
   rotate: false
-  xy: 1596, 400
+  xy: 888, 157
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Infantry
   rotate: false
-  xy: 2008, 1069
+  xy: 888, 49
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Inquisitor
   rotate: false
-  xy: 1606, 696
+  xy: 888, 13
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Ironclad
   rotate: false
-  xy: 1686, 696
+  xy: 928, 805
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Jaguar
   rotate: false
-  xy: 1572, 624
+  xy: 928, 697
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Janissary
   rotate: false
-  xy: 1612, 660
+  xy: 928, 661
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Keshik
   rotate: false
-  xy: 1652, 660
+  xy: 928, 585
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Khan
   rotate: false
-  xy: 1612, 621
+  xy: 928, 546
   size: 32, 31
   orig: 32, 31
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Knight
   rotate: false
-  xy: 1572, 548
+  xy: 928, 510
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Kris Swordsman
   rotate: false
-  xy: 1692, 660
+  xy: 928, 436
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Lancer
   rotate: false
-  xy: 1652, 586
+  xy: 928, 364
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/LandUnit
   rotate: false
-  xy: 1692, 624
+  xy: 928, 328
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Landship
   rotate: false
-  xy: 1612, 549
+  xy: 928, 248
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Landsknecht
   rotate: false
-  xy: 1652, 550
+  xy: 928, 212
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Legion
   rotate: false
-  xy: 1692, 588
+  xy: 928, 176
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Longbowman
   rotate: false
-  xy: 1732, 616
+  xy: 928, 140
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Longswordsman
   rotate: false
-  xy: 1692, 552
+  xy: 928, 104
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Machine Gun
   rotate: false
-  xy: 1732, 580
+  xy: 928, 68
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Mandekalu Cavalry
   rotate: false
-  xy: 1732, 544
+  xy: 928, 32
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Maori Warrior
   rotate: false
-  xy: 1692, 516
+  xy: 1022, 1017
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Marine
   rotate: false
-  xy: 1612, 513
+  xy: 1004, 945
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Mechanized Infantry
   rotate: false
-  xy: 1606, 477
+  xy: 986, 872
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Mehal Sefari
   rotate: false
-  xy: 1606, 441
+  xy: 968, 836
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Merchant Of Venice
   rotate: false
-  xy: 1732, 508
+  xy: 968, 800
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Minuteman
   rotate: false
-  xy: 1652, 478
+  xy: 968, 728
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Missile Cruiser
   rotate: false
-  xy: 1646, 442
+  xy: 968, 692
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Missionary
   rotate: false
-  xy: 1732, 472
+  xy: 968, 656
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Mobile SAM
   rotate: false
-  xy: 1692, 444
+  xy: 968, 583
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Modern Armor
   rotate: false
-  xy: 1732, 436
+  xy: 968, 547
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Mohawk Warrior
   rotate: false
-  xy: 1636, 405
+  xy: 968, 511
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Musketeer
   rotate: false
-  xy: 1676, 322
+  xy: 968, 313
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Musketman
   rotate: false
-  xy: 1716, 400
+  xy: 968, 277
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Naresuan's Elephant
   rotate: false
-  xy: 1716, 364
+  xy: 968, 241
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Nau
   rotate: false
-  xy: 1716, 328
+  xy: 968, 205
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Norwegian Ski Infantry
   rotate: false
-  xy: 1756, 400
+  xy: 968, 169
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Nuclear Submarine
   rotate: false
-  xy: 1756, 364
+  xy: 968, 133
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Panzer
   rotate: false
-  xy: 1386, 246
+  xy: 1304, 1328
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Paratrooper
   rotate: false
-  xy: 1364, 358
+  xy: 1344, 1332
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Pathfinder
   rotate: false
-  xy: 1756, 830
+  xy: 1424, 1332
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Persian Immortal
   rotate: false
-  xy: 1756, 758
+  xy: 1504, 1325
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Pictish Warrior
   rotate: false
-  xy: 1766, 722
+  xy: 1544, 1330
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Pikeman
   rotate: false
-  xy: 1772, 686
+  xy: 1584, 1332
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Pracinha
   rotate: false
-  xy: 1428, 107
+  xy: 1044, 981
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Privateer
   rotate: false
-  xy: 1428, 71
+  xy: 1044, 945
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Quinquereme
   rotate: false
-  xy: 1796, 758
+  xy: 1008, 800
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Rifleman
   rotate: false
-  xy: 1806, 722
+  xy: 1008, 764
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Rocket Artillery
   rotate: false
-  xy: 1812, 430
+  xy: 1008, 472
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Samurai
   rotate: false
-  xy: 1796, 358
+  xy: 1008, 400
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Scout
   rotate: false
-  xy: 1796, 322
+  xy: 1008, 364
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Sea Beggar
   rotate: false
-  xy: 1796, 286
+  xy: 1008, 328
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Settler
   rotate: false
-  xy: 1836, 393
+  xy: 1008, 291
   size: 32, 29
   orig: 32, 29
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Ship Of The Line
   rotate: false
-  xy: 1836, 281
+  xy: 1008, 179
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Ship of the Line
   rotate: false
-  xy: 1836, 829
+  xy: 1008, 142
   size: 32, 29
   orig: 32, 29
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Siege Tower
   rotate: false
-  xy: 1836, 793
+  xy: 1008, 106
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Sipahi
   rotate: false
-  xy: 1876, 720
+  xy: 1066, 871
   size: 32, 30
   orig: 32, 30
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Slinger
   rotate: false
-  xy: 1852, 684
+  xy: 1048, 835
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Spearman
   rotate: false
-  xy: 1852, 576
+  xy: 1048, 727
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Submarine
   rotate: false
-  xy: 1836, 759
+  xy: 190, 1399
   size: 32, 26
   orig: 32, 26
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Swordsman
   rotate: false
-  xy: 1892, 576
+  xy: 1048, 471
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Tank
   rotate: false
-  xy: 1892, 540
+  xy: 1048, 435
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Tercio
   rotate: false
-  xy: 1892, 504
+  xy: 1048, 399
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Trebuchet
   rotate: false
-  xy: 1876, 360
+  xy: 1048, 255
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Trireme
   rotate: false
-  xy: 1876, 324
+  xy: 1048, 219
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Turtle Ship
   rotate: false
-  xy: 1546, 292
+  xy: 1088, 635
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/War Chariot
   rotate: false
-  xy: 1586, 292
+  xy: 1088, 523
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/War Elephant
   rotate: false
-  xy: 1586, 256
+  xy: 1088, 487
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Warrior
   rotate: false
-  xy: 1626, 291
+  xy: 1088, 451
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/WaterUnit
   rotate: false
-  xy: 190, 1399
+  xy: 1088, 417
   size: 32, 26
   orig: 32, 26
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Winged Hussar
   rotate: false
-  xy: 1786, 250
+  xy: 1088, 201
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Work Boats
   rotate: false
-  xy: 1826, 245
+  xy: 1088, 165
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Worker
   rotate: false
-  xy: 1546, 220
+  xy: 1088, 129
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
@@ -4395,315 +3828,315 @@ UnitPromotionIcons/Accuracy
   index: -1
 UnitPromotionIcons/Air Repair
   rotate: false
-  xy: 1840, 1346
+  xy: 652, 1238
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Air Targeting
   rotate: false
-  xy: 760, 158
+  xy: 760, 1346
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Targeting
   rotate: false
-  xy: 760, 158
+  xy: 760, 1346
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Ambush
   rotate: false
-  xy: 1516, 914
+  xy: 1918, 1612
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Amphibious
   rotate: false
-  xy: 1624, 1022
+  xy: 652, 1180
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Armor Plating
   rotate: false
-  xy: 976, 266
+  xy: 1987, 1878
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Barrage
   rotate: false
-  xy: 1987, 1936
+  xy: 1987, 1820
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Besiege
   rotate: false
-  xy: 1918, 1612
+  xy: 1918, 1496
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Siege
   rotate: false
-  xy: 1918, 1612
+  xy: 1918, 1496
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Blitz
   rotate: false
-  xy: 1840, 1288
+  xy: 652, 1064
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Boarding Party
   rotate: false
-  xy: 818, 158
+  xy: 934, 1346
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Bombardment
   rotate: false
-  xy: 1408, 748
+  xy: 1987, 1762
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Charge
   rotate: false
-  xy: 1987, 1878
+  xy: 1918, 1438
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Coastal Raider
   rotate: false
-  xy: 876, 158
+  xy: 652, 948
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Cover
   rotate: false
-  xy: 1987, 1762
+  xy: 652, 774
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Discipline
   rotate: false
-  xy: 1987, 1762
+  xy: 652, 774
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Drill
   rotate: false
-  xy: 1574, 914
+  xy: 652, 484
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Evasion
   rotate: false
-  xy: 1790, 1130
+  xy: 652, 368
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Extended Range
   rotate: false
-  xy: 976, 208
+  xy: 652, 310
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Operational Range
   rotate: false
-  xy: 976, 208
+  xy: 652, 310
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Flight Deck
   rotate: false
-  xy: 1142, 374
+  xy: 652, 136
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Formation
   rotate: false
-  xy: 1358, 590
+  xy: 1108, 1346
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Great Generals
   rotate: false
-  xy: 652, 56
+  xy: 710, 1064
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Quick Study
   rotate: false
-  xy: 652, 56
+  xy: 710, 1064
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Haka War Dance
   rotate: false
-  xy: 72, 20
+  xy: 710, 1006
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Heal Instantly
   rotate: false
-  xy: 1987, 1704
+  xy: 710, 890
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Ignore terrain cost
   rotate: false
-  xy: 436, 828
+  xy: 285, 1614
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Indirect Fire
   rotate: false
-  xy: 1976, 1588
+  xy: 710, 774
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Interception
   rotate: false
-  xy: 1976, 1472
+  xy: 710, 658
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Logistics
   rotate: false
-  xy: 1898, 1264
+  xy: 710, 426
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 UnitPromotionIcons/March
   rotate: false
-  xy: 1956, 1298
+  xy: 710, 310
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Medic
   rotate: false
-  xy: 1898, 1206
+  xy: 710, 252
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Mobility
   rotate: false
-  xy: 934, 150
+  xy: 1987, 1704
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Morale
   rotate: false
-  xy: 934, 92
+  xy: 1976, 1588
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Rejuvenation
   rotate: false
-  xy: 1690, 906
+  xy: 710, 20
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Scouting
   rotate: false
-  xy: 1524, 798
+  xy: 884, 1288
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Sentry
   rotate: false
-  xy: 1524, 798
+  xy: 884, 1288
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Shock
   rotate: false
-  xy: 1740, 1072
+  xy: 826, 1172
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Slinger Withdraw
   rotate: false
-  xy: 1798, 1072
+  xy: 884, 1230
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Sortie
   rotate: false
-  xy: 1092, 258
+  xy: 768, 1056
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Supply
   rotate: false
-  xy: 1582, 790
+  xy: 942, 1230
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Survivalism
   rotate: false
-  xy: 1640, 848
+  xy: 1000, 1288
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Volley
   rotate: false
-  xy: 1208, 308
+  xy: 826, 998
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Wolfpack
   rotate: false
-  xy: 1208, 250
+  xy: 942, 1114
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Woodsman
   rotate: false
-  xy: 1266, 308
+  xy: 1000, 1172
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
diff --git a/android/assets/game.png b/android/assets/game.png
index d78c533068..6b8819e39f 100644
Binary files a/android/assets/game.png and b/android/assets/game.png differ
diff --git a/android/assets/game2.png b/android/assets/game2.png
deleted file mode 100644
index 9b5c1217a0..0000000000
Binary files a/android/assets/game2.png and /dev/null differ
diff --git a/core/src/com/unciv/ui/utils/ImageGetter.kt b/core/src/com/unciv/ui/utils/ImageGetter.kt
index 1b80e7aa72..7474d35d9f 100644
--- a/core/src/com/unciv/ui/utils/ImageGetter.kt
+++ b/core/src/com/unciv/ui/utils/ImageGetter.kt
@@ -61,21 +61,20 @@ object ImageGetter {
             textureRegionDrawables[region.name] = drawable
         }
 
-        for (singleImagesFolder in sequenceOf("BuildingIcons", "FlagIcons", "UnitIcons")) {
-            if (!atlases.containsKey(singleImagesFolder)) atlases[singleImagesFolder] = TextureAtlas("$singleImagesFolder.atlas")
-            val tempAtlas = atlases[singleImagesFolder]!!
+        // Load all other atlas files
+        for (file in Gdx.files.internal(".").list(".atlas")) {
+            val extraAtlas = file.nameWithoutExtension()
+            val tempAtlas = atlases[extraAtlas]  // fetch if cached
+                ?: TextureAtlas(file.name()).apply {  // load if not
+                    atlases[extraAtlas] = this  // cache the freshly loaded
+                }
+            val prefix = if (extraAtlas == "Skin") "Skin/" else ""  // Only Skin is packed without folder prefix
             for (region in tempAtlas.regions) {
                 val drawable = TextureRegionDrawable(region)
-                textureRegionDrawables["$singleImagesFolder/" + region.name] = drawable
+                textureRegionDrawables[prefix + region.name] = drawable
             }
         }
 
-        if (!atlases.containsKey("Skin")) atlases["Skin"] = TextureAtlas("Skin.atlas")
-        for (region in atlases["Skin"]!!.regions) {
-            val drawable = TextureRegionDrawable(region)
-            textureRegionDrawables["Skin/" + region.name] = drawable
-        }
-
         // These are from the mods
         for (mod in UncivGame.Current.settings.visualMods + ruleset.mods) {
             val modAtlasFile = Gdx.files.local("mods/$mod/game.atlas")
@@ -132,10 +131,10 @@ object ImageGetter {
         val layerNames = mutableListOf(baseFileName)
         val layerList = arrayListOf<Image>()
 
-        var i = 1
-        while (imageExists("$baseFileName-$i")) {
-            layerNames.add("$baseFileName-$i")
-            ++i
+        var number = 1
+        while (imageExists("$baseFileName-$number")) {
+            layerNames.add("$baseFileName-$number")
+            ++number
         }
 
         for (i in layerNames.indices) {
diff --git a/desktop/src/com/unciv/app/desktop/DesktopLauncher.kt b/desktop/src/com/unciv/app/desktop/DesktopLauncher.kt
index 7522c4b38d..1603d0a275 100644
--- a/desktop/src/com/unciv/app/desktop/DesktopLauncher.kt
+++ b/desktop/src/com/unciv/app/desktop/DesktopLauncher.kt
@@ -7,8 +7,6 @@ import com.badlogic.gdx.Files
 import com.badlogic.gdx.backends.lwjgl.LwjglApplication
 import com.badlogic.gdx.backends.lwjgl.LwjglApplicationConfiguration
 import com.badlogic.gdx.files.FileHandle
-import com.badlogic.gdx.graphics.Texture
-import com.badlogic.gdx.tools.texturepacker.TexturePacker
 import com.sun.jna.Native
 import com.unciv.JsonParser
 import com.unciv.UncivGame
@@ -24,7 +22,6 @@ import io.ktor.response.*
 import io.ktor.routing.*
 import io.ktor.server.engine.*
 import io.ktor.server.netty.*
-import java.io.File
 import java.util.*
 import kotlin.concurrent.timer
 
@@ -37,7 +34,7 @@ internal object DesktopLauncher {
         // For more info see https://github.com/yairm210/Unciv/pull/3202 and https://github.com/LWJGL/lwjgl/issues/119
         System.setProperty("org.lwjgl.opengl.Display.allowSoftwareOpenGL", "true")
 
-        packImages()
+        ImagePacker.packImages()
 
         val config = LwjglApplicationConfiguration()
         // Don't activate GL 3.0 because it causes problems for MacOS computers
@@ -117,89 +114,10 @@ internal object DesktopLauncher {
         }.start()
     }
 
-
-    private fun packImages() {
-        val startTime = System.currentTimeMillis()
-
-        val settings = TexturePacker.Settings()
-        // Apparently some chipsets, like NVIDIA Tegra 3 graphics chipset (used in Asus TF700T tablet),
-        // don't support non-power-of-two texture sizes - kudos @yuroller!
-        // https://github.com/yairm210/UnCiv/issues/1340
-
-        /**
-         * These should be as big as possible in order to accommodate ALL the images together in one big file.
-         * Why? Because the rendering function of the main screen renders all the images consecutively, and every time it needs to switch between textures,
-         * this causes a delay, leading to horrible lag if there are enough switches.
-         * The cost of this specific solution is that the entire game.png needs be be kept in-memory constantly.
-         * Now here we come to what Fred Colon would call an Imp Arse.
-         * On the one hand, certain tilesets (ahem 5hex ahem) are really big.
-         * You wouldn't believe how hugely mindbogglingly big they are. So theoretically we should want all of their images to be together.
-         * HOWEVER certain chipsets (see https://github.com/yairm210/Unciv/issues/3330) only seem to support to up to 2048 width*height so this is maximum we can have.
-         * Practically this means that big custom tilesets will have to reload the texture a lot when covering the map and so the
-         *    panning on the map will tend to lag a lot :(
-         *
-         *    TL;DR this should be 2048.
-         */
-        settings.maxWidth = 2048
-        settings.maxHeight = 2048
-
-        // Trying to disable the subdirectory combine lead to even worse results. Don't.
-        settings.combineSubdirectories = true
-        settings.pot = true
-        settings.fast = true
-        // Set some additional padding and enable duplicatePadding to prevent image edges from bleeding into each other due to mipmapping
-        settings.paddingX = 8
-        settings.paddingY = 8
-        settings.duplicatePadding = true
-        settings.filterMin = Texture.TextureFilter.MipMapLinearLinear
-        settings.filterMag = Texture.TextureFilter.MipMapLinearLinear // I'm pretty sure this doesn't make sense for magnification, but setting it to Linear gives strange results
-
-        if (File("../Images").exists()) { // So we don't run this from within a fat JAR
-            packImagesIfOutdated(settings, "../Images", ".", "game")
-            packImagesIfOutdated(settings, "../ImagesToPackSeparately/BuildingIcons", ".", "BuildingIcons")
-            packImagesIfOutdated(settings, "../ImagesToPackSeparately/FlagIcons", ".", "FlagIcons")
-            packImagesIfOutdated(settings, "../ImagesToPackSeparately/UnitIcons", ".", "UnitIcons")
-        }
-
-        if (File("../Skin").exists()) {
-            settings.filterMag = Texture.TextureFilter.Linear
-            settings.filterMin = Texture.TextureFilter.Linear
-            packImagesIfOutdated(settings, "../Skin", ".", "Skin")
-        }
-
-        // pack for mods as well
-        val modDirectory = File("mods")
-        if (modDirectory.exists()) {
-            for (mod in modDirectory.listFiles()!!) {
-                if (!mod.isHidden && File(mod.path + "/Images").exists())
-                    packImagesIfOutdated(settings, mod.path + "/Images", mod.path, "game")
-            }
-        }
-
-        val texturePackingTime = System.currentTimeMillis() - startTime
-        println("Packing textures - " + texturePackingTime + "ms")
-    }
-
-    private fun packImagesIfOutdated(settings: TexturePacker.Settings, input: String, output: String, packFileName: String) {
-        fun File.listTree(): Sequence<File> = when {
-            this.isFile -> sequenceOf(this)
-            this.isDirectory -> this.listFiles()!!.asSequence().flatMap { it.listTree() }
-            else -> sequenceOf()
-        }
-
-        val atlasFile = File("$output${File.separator}$packFileName.atlas")
-        if (atlasFile.exists() && File("$output${File.separator}$packFileName.png").exists()) {
-            val atlasModTime = atlasFile.lastModified()
-            if (File(input).listTree().none { it.extension in listOf("png", "jpg", "jpeg") && it.lastModified() > atlasModTime }) return
-        }
-
-        TexturePacker.process(settings, input, output, packFileName)
-    }
-
     private fun tryActivateDiscord(game: UncivGame) {
         try {
             /*
-             We try to load the Discord library manuall before the instance initializes.
+             We try to load the Discord library manually before the instance initializes.
              This is because if there's a crash when the instance initializes on a similar line,
               it's not within the bounds of the try/catch and thus the app will crash.
              */
diff --git a/desktop/src/com/unciv/app/desktop/ImagePacker.kt b/desktop/src/com/unciv/app/desktop/ImagePacker.kt
new file mode 100644
index 0000000000..27fedde78b
--- /dev/null
+++ b/desktop/src/com/unciv/app/desktop/ImagePacker.kt
@@ -0,0 +1,106 @@
+package com.unciv.app.desktop
+
+import com.badlogic.gdx.graphics.Texture
+import com.badlogic.gdx.tools.texturepacker.TexturePacker
+import java.io.File
+
+/**
+ * Re-packs our texture assets into atlas + png File pairs, which will be loaded by the game.
+ * With the exception of the ExtraImages folder and the Font system these are the only
+ * graphics used (The source Image folders are unused at run time except here).
+ * 
+ * [TexturePacker] documentation is [here](https://github.com/libgdx/libgdx/wiki/Texture-packer)
+ */
+internal object ImagePacker {
+
+    fun packImages() {
+        val startTime = System.currentTimeMillis()
+
+        val settings = TexturePacker.Settings()
+        // Apparently some chipsets, like NVIDIA Tegra 3 graphics chipset (used in Asus TF700T tablet),
+        // don't support non-power-of-two texture sizes - kudos @yuroller!
+        // https://github.com/yairm210/UnCiv/issues/1340
+
+        /**
+         * These should be as big as possible in order to accommodate ALL the images together in one big file.
+         * Why? Because the rendering function of the main screen renders all the images consecutively, and every time it needs to switch between textures,
+         * this causes a delay, leading to horrible lag if there are enough switches.
+         * The cost of this specific solution is that the entire game.png needs be be kept in-memory constantly.
+         * Now here we come to what Fred Colon would call an Imp Arse.
+         * On the one hand, certain tilesets (ahem 5hex ahem) are really big.
+         * You wouldn't believe how hugely mindbogglingly big they are. So theoretically we should want all of their images to be together.
+         * HOWEVER certain chipsets (see https://github.com/yairm210/Unciv/issues/3330) only seem to support to up to 2048 width*height so this is maximum we can have.
+         * Practically this means that big custom tilesets will have to reload the texture a lot when covering the map and so the
+         *    panning on the map will tend to lag a lot :(
+         *
+         *    TL;DR this should be 2048.
+         */
+        settings.maxWidth = 2048
+        settings.maxHeight = 2048
+
+        // Trying to disable the subdirectory combine lead to even worse results. Don't.
+        settings.combineSubdirectories = true
+        settings.pot = true  // powers of two only for width/height
+        settings.fast = true  // with pot on this just resorts by width
+        // settings.rotation - do not set. Allows rotation, potentially packing tighter.
+        //      Proper rendering is mostly automatic - except borders which overwrite rotation.
+
+        // Set some additional padding and enable duplicatePadding to prevent image edges from bleeding into each other due to mipmapping
+        settings.paddingX = 8
+        settings.paddingY = 8
+        settings.duplicatePadding = true
+        settings.filterMin = Texture.TextureFilter.MipMapLinearLinear
+        settings.filterMag = Texture.TextureFilter.MipMapLinearLinear // I'm pretty sure this doesn't make sense for magnification, but setting it to Linear gives strange results
+
+        if (File("../Images").exists()) { // So we don't run this from within a fat JAR
+            for ((file, packFileName) in imageFolders()) {
+                packImagesIfOutdated(settings, file, ".", packFileName)
+            }
+        }
+
+        if (File("../Skin").exists()) {
+            settings.filterMag = Texture.TextureFilter.Linear
+            settings.filterMin = Texture.TextureFilter.Linear
+            packImagesIfOutdated(settings, "../Skin", ".", "Skin")
+        }
+
+        // pack for mods as well
+        val modDirectory = File("mods")
+        if (modDirectory.exists()) {
+            for (mod in modDirectory.listFiles()!!) {
+                if (!mod.isHidden && File(mod.path + "/Images").exists())
+                    packImagesIfOutdated(settings, mod.path + "/Images", mod.path, "game")
+            }
+        }
+
+        val texturePackingTime = System.currentTimeMillis() - startTime
+        println("Packing textures - " + texturePackingTime + "ms")
+    }
+
+    private fun packImagesIfOutdated(settings: TexturePacker.Settings, input: String, output: String, packFileName: String) {
+        fun File.listTree(): Sequence<File> = when {
+            this.isFile -> sequenceOf(this)
+            this.isDirectory -> this.listFiles()!!.asSequence().flatMap { it.listTree() }
+            else -> sequenceOf()
+        }
+
+        val atlasFile = File("$output${File.separator}$packFileName.atlas")
+        if (atlasFile.exists() && File("$output${File.separator}$packFileName.png").exists()) {
+            val atlasModTime = atlasFile.lastModified()
+            if (File(input).listTree().none { it.extension in listOf("png", "jpg", "jpeg") && it.lastModified() > atlasModTime }) return
+        }
+
+        TexturePacker.process(settings, input, output, packFileName)
+    }
+
+    private data class ImageFolderResult(val folder: String, val atlasName: String)
+    private fun imageFolders() = sequence {
+        val parent = File("..")
+        for (folder in parent.listFiles()!!) {
+            if (!folder.isDirectory) continue
+            if (folder.nameWithoutExtension != "Images") continue
+            val atlasName = if (folder.name == "Images") "game" else folder.extension
+            yield(ImageFolderResult("..${File.separator}${folder.name}", atlasName))
+        }
+    }
+}