diff --git a/Credits.md b/Credits.md
index 92dc32773c..a592a6096c 100644
--- a/Credits.md
+++ b/Credits.md
@@ -1,10 +1,14 @@
 # Icon Credits
 
+
 Flag Icons made by [Freepik](https://www.flaticon.com/authors/freepik) from [www.flaticon.com](https://www.flaticon.com) 
  and licensed by Creative Commons 3.0
 
+
 All the following are from [the Noun Project](https://thenounproject.com) licenced under Creative Commons
 
+## Units
+
 * [Sword](https://thenounproject.com/search/?q=Sword&i=1215443) By Guilherme Furtado
 * [Sword](https://thenounproject.com/search/?q=Sword&i=1432662) By uzeir syarief
 * [Flag](https://thenounproject.com/search/?q=Flag&i=50114) By Melvin Poppelaars
@@ -26,18 +30,15 @@ All the following are from [the Noun Project](https://thenounproject.com) licenc
 * [Lance](https://thenounproject.com/search/?q=Lance&i=440122) By parkjisun
 * [Musket](https://thenounproject.com/search/?q=Musket&i=298302) By Cezary Lopacinski
 * [Cannon](https://thenounproject.com/search/?q=Cannon&i=1618747) By Orin Zuu
-* [Fire](https://thenounproject.com/search/?q=Fire&i=96564) By Lloyd Humphreys
 * [Bow](https://thenounproject.com/search/?q=bow&i=101736) By Arthur Shlain
 * [Longbow](https://thenounproject.com/search/?q=longbow&i=815991) By Hamish
 * [Horse Head](https://thenounproject.com/search/?q=Cavalry&i=374037) By Juan Pablo Bravo
 * [Rifle](https://thenounproject.com/search/?q=Rifle&i=604291) By Chameleon Design
 * [Horse](https://thenounproject.com/search/?q=Horse&i=1023745) By Bakunetso Kaito
 * [Artillery](https://thenounproject.com/search/?q=Artillery&i=1165261) By Creative Mania
-* [Skull](https://thenounproject.com/search/?q=Skull&i=1030702) By Vladimir Belochkin
-* [Crosshair](https://thenounproject.com/search/?q=crosshairs&i=916030) By Bakunetsu Kaito 
-* [City](https://thenounproject.com/search/?q=city&i=571332) By Felix Westphal 
 * [Rapier](https://thenounproject.com/search/?q=musketeer&i=819822) By Hamish
 
+## Resources
 
 * [Saffron](https://thenounproject.com/term/saffron/1576606/) By parkjisun
 * [Can](https://thenounproject.com/term/can/708971/) By Nick Bluth
@@ -61,10 +62,9 @@ All the following are from [the Noun Project](https://thenounproject.com) licenc
 * [Leather](https://thenounproject.com/term/leather/16499/) By Alen Krummenacher
 * [Gem](https://thenounproject.com/term/gem/948920/) By Lluisa Iborra
 * [Joss Stick](https://thenounproject.com/search/?q=incense&i=583033) By Hea Poh Lin
-* [Connection](https://thenounproject.com/search/?q=connection&i=1521886) By Travis Avery
 
+## Improvements 
 
-* [Arrow](https://thenounproject.com/term/arrow/18123/) By Joe Mortell
 * [Woodcutting axe](https://thenounproject.com/term/woodcutting-axe/1060560/) By Chanut is Industries
 * [Monument](https://thenounproject.com/term/monument/1175928/) By Setyo Ari Wibowo
 * [Farm](https://thenounproject.com/term/farm/25362/) By Bonnie Beach
@@ -78,4 +78,79 @@ All the following are from [the Noun Project](https://thenounproject.com) licenc
 * [Pickaxe](https://thenounproject.com/term/pickaxe/175792/) By Creative Stall
 * [Food stall](https://thenounproject.com/term/food-stall/1618358/) By I Putu Kharismayadi
 * [Road](https://thenounproject.com/term/road/1600491/) By REVA
-* [Circle](https://thenounproject.com/term/circle/1841891/) By Aybige
\ No newline at end of file
+
+## Buildings
+* [Chinese traditional tower](https://thenounproject.com/term/chinese-traditional-tower/1808410/) By 1516
+* [Factory](https://thenounproject.com/term/factory/545906/) By icon 54
+* [Factory](https://thenounproject.com/term/factory/1624235/) By Maxim Kulikov
+* [Bullets](https://thenounproject.com/term/bullets/810156/) By Aldric Rodriguez
+* [Observatory](https://thenounproject.com/term/observatory/1259/) By Nathan Driskell
+* [Opera House](https://thenounproject.com/term/opera-house/446672/) By Xinh Studio
+* [Aqueduct](https://thenounproject.com/term/aqueduct/24639/) By Arthur Shlain
+* [Hand saw](https://thenounproject.com/term/hand-saw/990902/) By b farias
+* [Forge](https://thenounproject.com/term/forge/1044767/) By Monjin Friends
+* [Books](https://thenounproject.com/term/books/1140218/) By Abir Alward
+* [Cambodia](https://thenounproject.com/term/cambodia/1809152/) By Wichai Wi
+* [Stadium](https://thenounproject.com/term/stadium/1152530/) By Creaticca Creative Agency
+* [Stadium](https://thenounproject.com/term/stadium/1500595/) By sandra
+* [Stadium](https://thenounproject.com/term/stadium/13872/) By Karuna Lalvani
+* [Market](https://thenounproject.com/term/market/1723050/) By sofi
+* [Christian Church](https://thenounproject.com/term/christian-church/1174183/) By Andrejs Kirma
+* [Notre Dame](https://thenounproject.com/term/notre-dame/1361725/) By Marco Livolsi
+* [Hagia Sophia](https://thenounproject.com/term/hagia-sophia/1907752/) By Felipe Alvarado
+* [Shekel Coin](https://thenounproject.com/term/shekel-coin/204154/) By Till Teenck
+* [Machu Pichu](https://thenounproject.com/term/machu-picchu/1569706/) By Carpe Diem
+* [Parthenon](https://thenounproject.com/term/parthenon/493272/) By Christopher T. Howlett
+* [College](https://thenounproject.com/term/college/129978/) By Alexander Skowalsky
+* [College](https://thenounproject.com/term/college/1203703/) By Vectors Market
+* [Chichen Itza](https://thenounproject.com/term/chichen-itza/668065/) By Hea Poh Lin
+* [Great Wall Of China](https://thenounproject.com/term/great-wall-of-china/146039/) By Arthur Shlain
+* [Cross swords](https://thenounproject.com/term/cross-swords/965398/) By  Creaticca Creative Agency
+* [Temple](https://thenounproject.com/term/temple/1808407/) By 1516
+* [Anubis](https://thenounproject.com/term/anubis/1080090/) By Carpe Diem
+* [Stonehenge](https://thenounproject.com/term/stonehenge/543289/) By icon 54
+* [Paper](https://thenounproject.com/term/paper/1443472/) By anam
+* [Circus](https://thenounproject.com/term/circus/743734/) By Ralph Schmitzer
+* [korean palace](https://thenounproject.com/term/korean-palace/1797542/) By 1516
+* [Obelisk](https://thenounproject.com/term/obelisk/749104/) By Eliricon
+* [Storehouse](https://thenounproject.com/term/storehouse/966786/) By Pedro Santos
+* [Library](https://thenounproject.com/term/library/1122689/) By Rob Crosswell
+* [Block](https://thenounproject.com/term/block/1711553/) By Monjin Friends
+* [Water dam](https://thenounproject.com/term/water-dam/1002726/) By Symbolon
+* [Spaceship](https://thenounproject.com/term/spaceship/1444621/) By Dinosoft Labs
+* [Nuclear Plant](https://thenounproject.com/term/nuclear-plant/1132340/) By Andrejs Kirma
+* [Build](https://thenounproject.com/term/build/1156478/) By Michael G Brown
+* [Missile](https://thenounproject.com/term/missile/799922/) By ProSymbols
+* [Rocket](https://thenounproject.com/term/rocket/937173/) By BomSymbols
+* [Engine](https://thenounproject.com/term/engine/1877958/) By Andre
+* [Chamber](https://thenounproject.com/term/chamber/1242689/) By IYIKON
+* [Bank](https://thenounproject.com/term/bank/1882194/) By projecthayat
+* [Forbidden City](https://thenounproject.com/term/forbidden-city/1797540/) By 1516
+* [Theatre](https://thenounproject.com/term/theatre/1780401/) By b farias
+* [Taj Mahal](https://thenounproject.com/term/taj-mahal/1907755/) By Felipe Alvarado
+* [Windmill](https://thenounproject.com/term/windmill/1705107/) By corpus delicti
+* [Museum](https://thenounproject.com/term/museum/803560/) by zidney
+* [Hermitage](https://thenounproject.com/term/hermitage/133969/) By Yuri Mamaev
+* [The Louvre](https://thenounproject.com/term/the-louvre/1577539/) By roundicons.com
+* [Books](https://thenounproject.com/term/books/1767500/) By Minh Do
+* [Hospital](https://thenounproject.com/term/hospital/1658509/) By Adrien Coquet
+* [Stock exchange](https://thenounproject.com/term/stock-exchange/1210199/) By Pundimon
+* [Christ the redeemer](https://thenounproject.com/term/christ-the-redeemer/56112/) By Stefan Spieler
+* [Military](https://thenounproject.com/term/military/1857519/) By myiconfinder
+* [Signal Tower](https://thenounproject.com/term/signal-tower/1547758/) By Nociconist
+* [Eiffel Tower](https://thenounproject.com/term/eiffel-tower/1907757/) By Felipe Alvarado
+* [Microscope](https://thenounproject.com/term/microscope/1452362/) By Arafat Uddin
+* [Chemistry](https://thenounproject.com/term/chemistry/175847/) By Creative Stall
+* [Solar panel](https://thenounproject.com/term/solar-panel/154447/) By Andrew J. Young
+* [Cathedral](https://thenounproject.com/term/cathedral/1325415/) By Dairy Free Design
+
+
+## Others 
+
+* [Circle](https://thenounproject.com/term/circle/1841891/) By Aybige 
+* [Arrow](https://thenounproject.com/term/arrow/18123/) By Joe Mortell
+* [Connection](https://thenounproject.com/search/?q=connection&i=1521886) By Travis Avery
+* [Skull](https://thenounproject.com/search/?q=Skull&i=1030702) By Vladimir Belochkin
+* [Crosshair](https://thenounproject.com/search/?q=crosshairs&i=916030) By Bakunetsu Kaito 
+* [City](https://thenounproject.com/search/?q=city&i=571332) By Felix Westphal
+* [Fire](https://thenounproject.com/search/?q=Fire&i=96564) By Lloyd Humphreys
\ No newline at end of file
diff --git a/android/Images/BuildingIcons/Angkor Wat.png b/android/Images/BuildingIcons/Angkor Wat.png
new file mode 100644
index 0000000000..b7e77507a5
Binary files /dev/null and b/android/Images/BuildingIcons/Angkor Wat.png differ
diff --git a/android/Images/BuildingIcons/Apollo Program.png b/android/Images/BuildingIcons/Apollo Program.png
new file mode 100644
index 0000000000..1354fcee69
Binary files /dev/null and b/android/Images/BuildingIcons/Apollo Program.png differ
diff --git a/android/Images/BuildingIcons/Aqueduct.png b/android/Images/BuildingIcons/Aqueduct.png
new file mode 100644
index 0000000000..5fd28c8f9a
Binary files /dev/null and b/android/Images/BuildingIcons/Aqueduct.png differ
diff --git a/android/Images/BuildingIcons/Armory.png b/android/Images/BuildingIcons/Armory.png
new file mode 100644
index 0000000000..50c43e006f
Binary files /dev/null and b/android/Images/BuildingIcons/Armory.png differ
diff --git a/android/Images/BuildingIcons/Bank.png b/android/Images/BuildingIcons/Bank.png
new file mode 100644
index 0000000000..ed5900a2d3
Binary files /dev/null and b/android/Images/BuildingIcons/Bank.png differ
diff --git a/android/Images/BuildingIcons/Barracks.png b/android/Images/BuildingIcons/Barracks.png
new file mode 100644
index 0000000000..be5a01b01e
Binary files /dev/null and b/android/Images/BuildingIcons/Barracks.png differ
diff --git a/android/Images/BuildingIcons/Broadcast Tower.png b/android/Images/BuildingIcons/Broadcast Tower.png
new file mode 100644
index 0000000000..8bc7f217f3
Binary files /dev/null and b/android/Images/BuildingIcons/Broadcast Tower.png differ
diff --git a/android/Images/BuildingIcons/Burial  Tomb.png b/android/Images/BuildingIcons/Burial  Tomb.png
new file mode 100644
index 0000000000..59b9201e15
Binary files /dev/null and b/android/Images/BuildingIcons/Burial  Tomb.png differ
diff --git a/android/Images/BuildingIcons/Castle.png b/android/Images/BuildingIcons/Castle.png
new file mode 100644
index 0000000000..cea0b8b8a2
Binary files /dev/null and b/android/Images/BuildingIcons/Castle.png differ
diff --git a/android/Images/BuildingIcons/Chichen Itza.png b/android/Images/BuildingIcons/Chichen Itza.png
new file mode 100644
index 0000000000..764621c810
Binary files /dev/null and b/android/Images/BuildingIcons/Chichen Itza.png differ
diff --git a/android/Images/BuildingIcons/Circus Maximus.png b/android/Images/BuildingIcons/Circus Maximus.png
new file mode 100644
index 0000000000..90e4c51fd5
Binary files /dev/null and b/android/Images/BuildingIcons/Circus Maximus.png differ
diff --git a/android/Images/BuildingIcons/Circus.png b/android/Images/BuildingIcons/Circus.png
new file mode 100644
index 0000000000..00481c3fec
Binary files /dev/null and b/android/Images/BuildingIcons/Circus.png differ
diff --git a/android/Images/BuildingIcons/Colloseum.png b/android/Images/BuildingIcons/Colloseum.png
new file mode 100644
index 0000000000..8c2de2a0d2
Binary files /dev/null and b/android/Images/BuildingIcons/Colloseum.png differ
diff --git a/android/Images/BuildingIcons/Cristo Redentor.png b/android/Images/BuildingIcons/Cristo Redentor.png
new file mode 100644
index 0000000000..fe3fefb6b6
Binary files /dev/null and b/android/Images/BuildingIcons/Cristo Redentor.png differ
diff --git a/android/Images/BuildingIcons/Eiffel Tower.png b/android/Images/BuildingIcons/Eiffel Tower.png
new file mode 100644
index 0000000000..d9395bd983
Binary files /dev/null and b/android/Images/BuildingIcons/Eiffel Tower.png differ
diff --git a/android/Images/BuildingIcons/Factory.png b/android/Images/BuildingIcons/Factory.png
new file mode 100644
index 0000000000..f23b3a4070
Binary files /dev/null and b/android/Images/BuildingIcons/Factory.png differ
diff --git a/android/Images/BuildingIcons/Forbidden Palace.png b/android/Images/BuildingIcons/Forbidden Palace.png
new file mode 100644
index 0000000000..b178b6796c
Binary files /dev/null and b/android/Images/BuildingIcons/Forbidden Palace.png differ
diff --git a/android/Images/BuildingIcons/Forge.png b/android/Images/BuildingIcons/Forge.png
new file mode 100644
index 0000000000..0fd00faf06
Binary files /dev/null and b/android/Images/BuildingIcons/Forge.png differ
diff --git a/android/Images/BuildingIcons/Granary.png b/android/Images/BuildingIcons/Granary.png
new file mode 100644
index 0000000000..eb1466970b
Binary files /dev/null and b/android/Images/BuildingIcons/Granary.png differ
diff --git a/android/Images/BuildingIcons/Hagia Sophia.png b/android/Images/BuildingIcons/Hagia Sophia.png
new file mode 100644
index 0000000000..cdbc683592
Binary files /dev/null and b/android/Images/BuildingIcons/Hagia Sophia.png differ
diff --git a/android/Images/BuildingIcons/Hanging Gardens.png b/android/Images/BuildingIcons/Hanging Gardens.png
new file mode 100644
index 0000000000..8cb19fe125
Binary files /dev/null and b/android/Images/BuildingIcons/Hanging Gardens.png differ
diff --git a/android/Images/BuildingIcons/Hermitage.png b/android/Images/BuildingIcons/Hermitage.png
new file mode 100644
index 0000000000..e74b47a578
Binary files /dev/null and b/android/Images/BuildingIcons/Hermitage.png differ
diff --git a/android/Images/BuildingIcons/Hospital.png b/android/Images/BuildingIcons/Hospital.png
new file mode 100644
index 0000000000..b3879330c6
Binary files /dev/null and b/android/Images/BuildingIcons/Hospital.png differ
diff --git a/android/Images/BuildingIcons/Hydro Plant.png b/android/Images/BuildingIcons/Hydro Plant.png
new file mode 100644
index 0000000000..01e9e5fcf8
Binary files /dev/null and b/android/Images/BuildingIcons/Hydro Plant.png differ
diff --git a/android/Images/BuildingIcons/Ironworks.png b/android/Images/BuildingIcons/Ironworks.png
new file mode 100644
index 0000000000..227d8612cb
Binary files /dev/null and b/android/Images/BuildingIcons/Ironworks.png differ
diff --git a/android/Images/BuildingIcons/Library.png b/android/Images/BuildingIcons/Library.png
new file mode 100644
index 0000000000..0772486944
Binary files /dev/null and b/android/Images/BuildingIcons/Library.png differ
diff --git a/android/Images/BuildingIcons/Machu Pichu.png b/android/Images/BuildingIcons/Machu Pichu.png
new file mode 100644
index 0000000000..ce82bc5c8a
Binary files /dev/null and b/android/Images/BuildingIcons/Machu Pichu.png differ
diff --git a/android/Images/BuildingIcons/Market.png b/android/Images/BuildingIcons/Market.png
new file mode 100644
index 0000000000..0ad34ce265
Binary files /dev/null and b/android/Images/BuildingIcons/Market.png differ
diff --git a/android/Images/BuildingIcons/Medical Lab.png b/android/Images/BuildingIcons/Medical Lab.png
new file mode 100644
index 0000000000..2cc067153b
Binary files /dev/null and b/android/Images/BuildingIcons/Medical Lab.png differ
diff --git a/android/Images/BuildingIcons/Military Academy.png b/android/Images/BuildingIcons/Military Academy.png
new file mode 100644
index 0000000000..59704f1963
Binary files /dev/null and b/android/Images/BuildingIcons/Military Academy.png differ
diff --git a/android/Images/BuildingIcons/Mint.png b/android/Images/BuildingIcons/Mint.png
new file mode 100644
index 0000000000..da22a70500
Binary files /dev/null and b/android/Images/BuildingIcons/Mint.png differ
diff --git a/android/Images/BuildingIcons/Monastary.png b/android/Images/BuildingIcons/Monastary.png
new file mode 100644
index 0000000000..5e1a77b7ff
Binary files /dev/null and b/android/Images/BuildingIcons/Monastary.png differ
diff --git a/android/Images/BuildingIcons/Monument.png b/android/Images/BuildingIcons/Monument.png
new file mode 100644
index 0000000000..1f10a28fc1
Binary files /dev/null and b/android/Images/BuildingIcons/Monument.png differ
diff --git a/android/Images/BuildingIcons/Museum.png b/android/Images/BuildingIcons/Museum.png
new file mode 100644
index 0000000000..527997a68c
Binary files /dev/null and b/android/Images/BuildingIcons/Museum.png differ
diff --git a/android/Images/BuildingIcons/National College.png b/android/Images/BuildingIcons/National College.png
new file mode 100644
index 0000000000..9f926673a0
Binary files /dev/null and b/android/Images/BuildingIcons/National College.png differ
diff --git a/android/Images/BuildingIcons/Notre Dame.png b/android/Images/BuildingIcons/Notre Dame.png
new file mode 100644
index 0000000000..d34aeb5eb4
Binary files /dev/null and b/android/Images/BuildingIcons/Notre Dame.png differ
diff --git a/android/Images/BuildingIcons/Nuclear Plant.png b/android/Images/BuildingIcons/Nuclear Plant.png
new file mode 100644
index 0000000000..d6be69debb
Binary files /dev/null and b/android/Images/BuildingIcons/Nuclear Plant.png differ
diff --git a/android/Images/BuildingIcons/Observatory.png b/android/Images/BuildingIcons/Observatory.png
new file mode 100644
index 0000000000..14b9f49329
Binary files /dev/null and b/android/Images/BuildingIcons/Observatory.png differ
diff --git a/android/Images/BuildingIcons/Opera House.png b/android/Images/BuildingIcons/Opera House.png
new file mode 100644
index 0000000000..b107b9ff6e
Binary files /dev/null and b/android/Images/BuildingIcons/Opera House.png differ
diff --git a/android/Images/BuildingIcons/Oxford University.png b/android/Images/BuildingIcons/Oxford University.png
new file mode 100644
index 0000000000..85892a0e91
Binary files /dev/null and b/android/Images/BuildingIcons/Oxford University.png differ
diff --git a/android/Images/BuildingIcons/Palace.png b/android/Images/BuildingIcons/Palace.png
new file mode 100644
index 0000000000..d520cc4ffa
Binary files /dev/null and b/android/Images/BuildingIcons/Palace.png differ
diff --git a/android/Images/BuildingIcons/Paper maker.png b/android/Images/BuildingIcons/Paper maker.png
new file mode 100644
index 0000000000..e46811c63a
Binary files /dev/null and b/android/Images/BuildingIcons/Paper maker.png differ
diff --git a/android/Images/BuildingIcons/Porcelain Tower.png b/android/Images/BuildingIcons/Porcelain Tower.png
new file mode 100644
index 0000000000..b7cc5c7067
Binary files /dev/null and b/android/Images/BuildingIcons/Porcelain Tower.png differ
diff --git a/android/Images/BuildingIcons/Public School.png b/android/Images/BuildingIcons/Public School.png
new file mode 100644
index 0000000000..5a3414b955
Binary files /dev/null and b/android/Images/BuildingIcons/Public School.png differ
diff --git a/android/Images/BuildingIcons/Research Lab.png b/android/Images/BuildingIcons/Research Lab.png
new file mode 100644
index 0000000000..ec1b9c1fba
Binary files /dev/null and b/android/Images/BuildingIcons/Research Lab.png differ
diff --git a/android/Images/BuildingIcons/SS Booster.png b/android/Images/BuildingIcons/SS Booster.png
new file mode 100644
index 0000000000..07f2b46f0f
Binary files /dev/null and b/android/Images/BuildingIcons/SS Booster.png differ
diff --git a/android/Images/BuildingIcons/SS Cockpit.png b/android/Images/BuildingIcons/SS Cockpit.png
new file mode 100644
index 0000000000..b509b6c239
Binary files /dev/null and b/android/Images/BuildingIcons/SS Cockpit.png differ
diff --git a/android/Images/BuildingIcons/SS Engine.png b/android/Images/BuildingIcons/SS Engine.png
new file mode 100644
index 0000000000..fa2f642d50
Binary files /dev/null and b/android/Images/BuildingIcons/SS Engine.png differ
diff --git a/android/Images/BuildingIcons/SS Statis Chamber.png b/android/Images/BuildingIcons/SS Statis Chamber.png
new file mode 100644
index 0000000000..408a71ba62
Binary files /dev/null and b/android/Images/BuildingIcons/SS Statis Chamber.png differ
diff --git a/android/Images/BuildingIcons/Sistine Chapel.png b/android/Images/BuildingIcons/Sistine Chapel.png
new file mode 100644
index 0000000000..270690804d
Binary files /dev/null and b/android/Images/BuildingIcons/Sistine Chapel.png differ
diff --git a/android/Images/BuildingIcons/Spaceship Factory.png b/android/Images/BuildingIcons/Spaceship Factory.png
new file mode 100644
index 0000000000..aabb6d06d8
Binary files /dev/null and b/android/Images/BuildingIcons/Spaceship Factory.png differ
diff --git a/android/Images/BuildingIcons/Stable.png b/android/Images/BuildingIcons/Stable.png
new file mode 100644
index 0000000000..65b27f6113
Binary files /dev/null and b/android/Images/BuildingIcons/Stable.png differ
diff --git a/android/Images/BuildingIcons/Stadium.png b/android/Images/BuildingIcons/Stadium.png
new file mode 100644
index 0000000000..2aa09a5774
Binary files /dev/null and b/android/Images/BuildingIcons/Stadium.png differ
diff --git a/android/Images/BuildingIcons/Stock Exchange.png b/android/Images/BuildingIcons/Stock Exchange.png
new file mode 100644
index 0000000000..10ecc21766
Binary files /dev/null and b/android/Images/BuildingIcons/Stock Exchange.png differ
diff --git a/android/Images/BuildingIcons/Stone Works.png b/android/Images/BuildingIcons/Stone Works.png
new file mode 100644
index 0000000000..3590348af1
Binary files /dev/null and b/android/Images/BuildingIcons/Stone Works.png differ
diff --git a/android/Images/BuildingIcons/Stonehenge.png b/android/Images/BuildingIcons/Stonehenge.png
new file mode 100644
index 0000000000..f6075e21b7
Binary files /dev/null and b/android/Images/BuildingIcons/Stonehenge.png differ
diff --git a/android/Images/BuildingIcons/Taj Mahal.png b/android/Images/BuildingIcons/Taj Mahal.png
new file mode 100644
index 0000000000..0bc23f5763
Binary files /dev/null and b/android/Images/BuildingIcons/Taj Mahal.png differ
diff --git a/android/Images/BuildingIcons/Temple.png b/android/Images/BuildingIcons/Temple.png
new file mode 100644
index 0000000000..6adad2a63f
Binary files /dev/null and b/android/Images/BuildingIcons/Temple.png differ
diff --git a/android/Images/BuildingIcons/The Great Library.png b/android/Images/BuildingIcons/The Great Library.png
new file mode 100644
index 0000000000..3235c6e52b
Binary files /dev/null and b/android/Images/BuildingIcons/The Great Library.png differ
diff --git a/android/Images/BuildingIcons/The Louvre.png b/android/Images/BuildingIcons/The Louvre.png
new file mode 100644
index 0000000000..36ecf120c0
Binary files /dev/null and b/android/Images/BuildingIcons/The Louvre.png differ
diff --git a/android/Images/BuildingIcons/The Oracle.png b/android/Images/BuildingIcons/The Oracle.png
new file mode 100644
index 0000000000..cb33f28654
Binary files /dev/null and b/android/Images/BuildingIcons/The Oracle.png differ
diff --git a/android/Images/BuildingIcons/The Pyramids.png b/android/Images/BuildingIcons/The Pyramids.png
new file mode 100644
index 0000000000..6370e21601
Binary files /dev/null and b/android/Images/BuildingIcons/The Pyramids.png differ
diff --git a/android/Images/BuildingIcons/Theatre.png b/android/Images/BuildingIcons/Theatre.png
new file mode 100644
index 0000000000..727c63527e
Binary files /dev/null and b/android/Images/BuildingIcons/Theatre.png differ
diff --git a/android/Images/BuildingIcons/University.png b/android/Images/BuildingIcons/University.png
new file mode 100644
index 0000000000..e25272669d
Binary files /dev/null and b/android/Images/BuildingIcons/University.png differ
diff --git a/android/Images/BuildingIcons/Walls.png b/android/Images/BuildingIcons/Walls.png
new file mode 100644
index 0000000000..18c794ded5
Binary files /dev/null and b/android/Images/BuildingIcons/Walls.png differ
diff --git a/android/Images/BuildingIcons/Windmill.png b/android/Images/BuildingIcons/Windmill.png
new file mode 100644
index 0000000000..90cd6a40b8
Binary files /dev/null and b/android/Images/BuildingIcons/Windmill.png differ
diff --git a/android/Images/BuildingIcons/Workshop.png b/android/Images/BuildingIcons/Workshop.png
new file mode 100644
index 0000000000..3ba1eb658b
Binary files /dev/null and b/android/Images/BuildingIcons/Workshop.png differ
diff --git a/android/assets/game.atlas b/android/assets/game.atlas
index 2ec8adde65..9a58e8688d 100644
--- a/android/assets/game.atlas
+++ b/android/assets/game.atlas
@@ -1,1202 +1,1671 @@
 
 game.png
-size: 2048,1024
+size: 2048,2048
 format: RGBA8888
 filter: MipMapLinearLinear,MipMapLinearLinear
 repeat: none
+BuildingIcons/Angkor Wat
+  rotate: false
+  xy: 281, 1846
+  size: 200, 200
+  orig: 200, 200
+  offset: 0, 0
+  index: -1
+BuildingIcons/Apollo Program
+  rotate: false
+  xy: 2, 1346
+  size: 200, 200
+  orig: 200, 200
+  offset: 0, 0
+  index: -1
+BuildingIcons/Aqueduct
+  rotate: false
+  xy: 483, 1846
+  size: 200, 200
+  orig: 200, 200
+  offset: 0, 0
+  index: -1
+BuildingIcons/Armory
+  rotate: false
+  xy: 2, 1144
+  size: 200, 200
+  orig: 200, 200
+  offset: 0, 0
+  index: -1
+BuildingIcons/Bank
+  rotate: false
+  xy: 685, 1846
+  size: 200, 200
+  orig: 200, 200
+  offset: 0, 0
+  index: -1
+BuildingIcons/Barracks
+  rotate: false
+  xy: 2, 942
+  size: 200, 200
+  orig: 200, 200
+  offset: 0, 0
+  index: -1
+BuildingIcons/Broadcast Tower
+  rotate: false
+  xy: 887, 1846
+  size: 200, 200
+  orig: 200, 200
+  offset: 0, 0
+  index: -1
+BuildingIcons/Burial  Tomb
+  rotate: false
+  xy: 2, 740
+  size: 200, 200
+  orig: 200, 200
+  offset: 0, 0
+  index: -1
+BuildingIcons/Castle
+  rotate: false
+  xy: 384, 1490
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Chichen Itza
+  rotate: false
+  xy: 588, 1388
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Circus
+  rotate: false
+  xy: 334, 1164
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Circus Maximus
+  rotate: false
+  xy: 334, 1062
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Colloseum
+  rotate: false
+  xy: 436, 1286
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Cristo Redentor
+  rotate: false
+  xy: 436, 1082
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Eiffel Tower
+  rotate: false
+  xy: 538, 878
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Factory
+  rotate: false
+  xy: 436, 674
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Forbidden Palace
+  rotate: false
+  xy: 334, 552
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Forge
+  rotate: false
+  xy: 436, 572
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Granary
+  rotate: false
+  xy: 306, 246
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Hagia Sophia
+  rotate: false
+  xy: 792, 1440
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Hanging Gardens
+  rotate: false
+  xy: 894, 1542
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Hermitage
+  rotate: false
+  xy: 894, 1440
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Hospital
+  rotate: false
+  xy: 996, 1440
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Hydro Plant
+  rotate: false
+  xy: 1098, 1542
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Ironworks
+  rotate: false
+  xy: 1200, 1440
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Library
+  rotate: false
+  xy: 1506, 1542
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Machu Pichu
+  rotate: false
+  xy: 1710, 1542
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Market
+  rotate: false
+  xy: 1812, 1408
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Medical Lab
+  rotate: false
+  xy: 690, 1338
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Military Academy
+  rotate: false
+  xy: 894, 1338
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Mint
+  rotate: false
+  xy: 1098, 1338
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Monastary
+  rotate: false
+  xy: 1200, 1338
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Monument
+  rotate: false
+  xy: 1302, 1338
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Museum
+  rotate: false
+  xy: 1506, 1338
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/National College
+  rotate: false
+  xy: 1710, 1338
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Notre Dame
+  rotate: false
+  xy: 640, 1236
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Nuclear Plant
+  rotate: false
+  xy: 640, 1134
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Observatory
+  rotate: false
+  xy: 742, 1236
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Opera House
+  rotate: false
+  xy: 844, 1236
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Oxford University
+  rotate: false
+  xy: 640, 930
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Palace
+  rotate: false
+  xy: 742, 1032
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Paper maker
+  rotate: false
+  xy: 844, 1134
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Porcelain Tower
+  rotate: false
+  xy: 844, 1032
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Public School
+  rotate: false
+  xy: 946, 1134
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Research Lab
+  rotate: false
+  xy: 742, 828
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/SS Booster
+  rotate: false
+  xy: 1048, 1134
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/SS Cockpit
+  rotate: false
+  xy: 1150, 1236
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/SS Engine
+  rotate: false
+  xy: 640, 624
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/SS Statis Chamber
+  rotate: false
+  xy: 742, 726
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Sistine Chapel
+  rotate: false
+  xy: 844, 726
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Spaceship Factory
+  rotate: false
+  xy: 946, 828
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Stable
+  rotate: false
+  xy: 1252, 1134
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Stadium
+  rotate: false
+  xy: 1354, 1236
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Stock Exchange
+  rotate: false
+  xy: 844, 624
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Stone Works
+  rotate: false
+  xy: 1048, 828
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Stonehenge
+  rotate: false
+  xy: 1150, 930
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Taj Mahal
+  rotate: false
+  xy: 1456, 1236
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Temple
+  rotate: false
+  xy: 946, 624
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/The Great Library
+  rotate: false
+  xy: 1048, 726
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/The Louvre
+  rotate: false
+  xy: 1150, 828
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/The Oracle
+  rotate: false
+  xy: 1252, 930
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/The Pyramids
+  rotate: false
+  xy: 1354, 1032
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Theatre
+  rotate: false
+  xy: 1456, 1134
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/University
+  rotate: false
+  xy: 1150, 726
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Walls
+  rotate: false
+  xy: 1354, 930
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Windmill
+  rotate: false
+  xy: 1660, 1236
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Workshop
+  rotate: false
+  xy: 1354, 828
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
 FlagIcons/Dutch
   rotate: false
-  xy: 1897, 894
+  xy: 2, 4
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 FlagIcons/English
   rotate: false
-  xy: 1430, 692
+  xy: 1897, 1918
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 FlagIcons/French
   rotate: false
-  xy: 1560, 692
+  xy: 204, 1238
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 FlagIcons/German
   rotate: false
-  xy: 1690, 692
+  xy: 204, 1108
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 FlagIcons/Italian
   rotate: false
-  xy: 1820, 692
+  xy: 204, 978
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 FlagIcons/Romanian
   rotate: false
-  xy: 204, 394
+  xy: 204, 848
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 FlagIcons/Russian
   rotate: false
-  xy: 204, 264
+  xy: 204, 718
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 FlagIcons/Spanish
   rotate: false
-  xy: 204, 134
+  xy: 204, 588
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 ImprovementIcons/Academy
   rotate: false
-  xy: 2, 18
+  xy: 204, 486
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ImprovementIcons/Camp
   rotate: false
-  xy: 334, 262
+  xy: 1856, 1714
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ImprovementIcons/Customs_house
   rotate: false
-  xy: 640, 314
+  xy: 538, 1082
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ImprovementIcons/Farm
   rotate: false
-  xy: 844, 416
+  xy: 538, 776
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ImprovementIcons/Landmark
   rotate: false
-  xy: 640, 110
+  xy: 1404, 1440
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ImprovementIcons/Lumber mill
   rotate: false
-  xy: 946, 110
+  xy: 1608, 1440
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ImprovementIcons/Manufactory
   rotate: false
-  xy: 1048, 110
+  xy: 1710, 1440
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ImprovementIcons/Mine
   rotate: false
-  xy: 1480, 590
+  xy: 996, 1338
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ImprovementIcons/Oil well
   rotate: false
-  xy: 1888, 590
+  xy: 742, 1134
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ImprovementIcons/Pasture
   rotate: false
-  xy: 1582, 488
+  xy: 946, 1236
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ImprovementIcons/Plantation
   rotate: false
-  xy: 1786, 488
+  xy: 742, 930
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ImprovementIcons/Quarry
   rotate: false
-  xy: 1888, 488
+  xy: 1048, 1236
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ImprovementIcons/Railroad
   rotate: false
-  xy: 308, 32
+  xy: 640, 726
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 OtherIcons/Railroad
   rotate: false
-  xy: 308, 32
+  xy: 640, 726
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ImprovementIcons/Road
   rotate: false
-  xy: 512, 58
+  xy: 946, 1032
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ImprovementIcons/Trading post
   rotate: false
-  xy: 1354, 438
+  xy: 1558, 1236
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 OtherIcons/Circle
   rotate: false
-  xy: 1250, 642
+  xy: 204, 1368
   size: 178, 178
   orig: 178, 178
   offset: 0, 0
   index: -1
 OtherIcons/CircleOld
   rotate: false
-  xy: 436, 160
+  xy: 334, 1266
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 OtherIcons/City
   rotate: false
-  xy: 538, 262
+  xy: 334, 960
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 OtherIcons/Crosshair
   rotate: false
-  xy: 640, 416
+  xy: 436, 980
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 OtherIcons/DisbandUnit
   rotate: false
-  xy: 640, 212
+  xy: 538, 980
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 OtherIcons/Fire
   rotate: false
-  xy: 742, 212
+  xy: 538, 674
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 OtherIcons/MenuIcon
   rotate: false
-  xy: 1378, 540
+  xy: 792, 1338
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 OtherIcons/Shield
   rotate: false
-  xy: 920, 8
+  xy: 1150, 1134
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 OtherIcons/Star
   rotate: false
-  xy: 1558, 392
+  xy: 1456, 936
   size: 100, 94
   orig: 100, 94
   offset: 0, 0
   index: -1
 OtherIcons/Stop
   rotate: false
-  xy: 1252, 212
+  xy: 1252, 1032
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 OtherIcons/civTableBackground
   rotate: false
-  xy: 281, 770
+  xy: 281, 1794
   size: 300, 50
   orig: 300, 50
   offset: 0, 0
   index: -1
 OtherIcons/tileTableBackground
   rotate: false
-  xy: 1068, 620
+  xy: 1674, 1644
   size: 180, 200
   orig: 180, 200
   offset: 0, 0
   index: -1
 OtherIcons/whiteDot
   rotate: false
-  xy: 260, 779
+  xy: 260, 1803
   size: 1, 1
   orig: 1, 1
   offset: 0, 0
   index: -1
 PolicyIcons/Aristocracy_(Civ5)
   rotate: false
-  xy: 326, 3
+  xy: 1958, 1748
   size: 28, 27
   orig: 28, 27
   offset: 0, 0
   index: -1
 PolicyIcons/Citizenship_(Civ5)
   rotate: false
-  xy: 1558, 318
+  xy: 1660, 1201
   size: 28, 33
   orig: 28, 33
   offset: 0, 0
   index: -1
 PolicyIcons/Civil_Society_(Civ5)
   rotate: false
-  xy: 1660, 417
+  xy: 1252, 693
   size: 28, 31
   orig: 28, 31
   offset: 0, 0
   index: -1
 PolicyIcons/Collective_Rule_(Civ5)
   rotate: false
-  xy: 1690, 455
+  xy: 1354, 795
   size: 28, 31
   orig: 28, 31
   offset: 0, 0
   index: -1
 PolicyIcons/Constitution_(Civ5)
   rotate: false
-  xy: 1588, 329
+  xy: 264, 151
   size: 28, 27
   orig: 28, 27
   offset: 0, 0
   index: -1
 PolicyIcons/Democracy_(Civ5)
   rotate: false
-  xy: 1558, 286
+  xy: 1812, 1612
   size: 28, 30
   orig: 28, 30
   offset: 0, 0
   index: -1
 PolicyIcons/Entrepreneurship_(Civ5)
   rotate: false
-  xy: 1897, 845
+  xy: 640, 575
   size: 45, 47
   orig: 45, 47
   offset: 0, 0
   index: -1
 PolicyIcons/Free_Religion_(Civ5)
   rotate: false
-  xy: 260, 524
+  xy: 260, 1548
   size: 28, 29
   orig: 28, 29
   offset: 0, 0
   index: -1
 PolicyIcons/Free_Speech_(Civ5)
   rotate: false
-  xy: 1660, 450
+  xy: 234, 142
   size: 28, 36
   orig: 28, 36
   offset: 0, 0
   index: -1
 PolicyIcons/Free_Thought_(Civ5)
   rotate: false
-  xy: 206, 2
+  xy: 1856, 1816
   size: 28, 28
   orig: 28, 28
   offset: 0, 0
   index: -1
 PolicyIcons/Humanism_(Civ5)
   rotate: false
-  xy: 1618, 363
+  xy: 1914, 1545
   size: 28, 27
   orig: 28, 27
   offset: 0, 0
   index: -1
 PolicyIcons/Landed_Elite_(Civ5)
   rotate: false
-  xy: 1974, 861
+  xy: 1456, 903
   size: 28, 31
   orig: 28, 31
   offset: 0, 0
   index: -1
 PolicyIcons/Legalism_(Civ5)
   rotate: false
-  xy: 236, 2
+  xy: 132, 2
   size: 28, 28
   orig: 28, 28
   offset: 0, 0
   index: -1
 PolicyIcons/Mandate_Of_Heaven_(Civ5)
   rotate: false
-  xy: 1486, 146
+  xy: 1558, 1097
   size: 28, 35
   orig: 28, 35
   offset: 0, 0
   index: -1
 PolicyIcons/Mercantilism_(Civ5)
   rotate: false
-  xy: 1456, 144
+  xy: 1958, 1777
   size: 28, 37
   orig: 28, 37
   offset: 0, 0
   index: -1
 PolicyIcons/Meritocracy_(Civ5)
   rotate: false
-  xy: 1690, 426
+  xy: 1558, 1068
   size: 28, 27
   orig: 28, 27
   offset: 0, 0
   index: -1
 PolicyIcons/Monarchy_(Civ5)
   rotate: false
-  xy: 1944, 856
+  xy: 1914, 1574
   size: 28, 36
   orig: 28, 36
   offset: 0, 0
   index: -1
 PolicyIcons/Oligarchy_(Civ5)
   rotate: false
-  xy: 1588, 358
+  xy: 1762, 1304
   size: 28, 32
   orig: 28, 32
   offset: 0, 0
   index: -1
 PolicyIcons/Organized_Religion_(Civ5)
   rotate: false
-  xy: 334, 134
+  xy: 1252, 667
   size: 28, 24
   orig: 28, 24
   offset: 0, 0
   index: -1
 PolicyIcons/Patronage_(Civ5)
   rotate: false
-  xy: 583, 774
+  xy: 583, 1798
   size: 50, 46
   orig: 50, 46
   offset: 0, 0
   index: -1
 PolicyIcons/Protectionism_(Civ5)
   rotate: false
-  xy: 1720, 460
+  xy: 1588, 1106
   size: 28, 26
   orig: 28, 26
   offset: 0, 0
   index: -1
 PolicyIcons/Reformation_(Civ5)
   rotate: false
-  xy: 266, 2
+  xy: 162, 2
   size: 28, 28
   orig: 28, 28
   offset: 0, 0
   index: -1
 PolicyIcons/Representation_(Civ5)
   rotate: false
-  xy: 1516, 150
+  xy: 687, 591
   size: 28, 31
   orig: 28, 31
   offset: 0, 0
   index: -1
 PolicyIcons/Republic_(Civ5)
   rotate: false
-  xy: 1558, 258
+  xy: 1660, 1173
   size: 28, 26
   orig: 28, 26
   offset: 0, 0
   index: -1
 PolicyIcons/Scientific_Revolution_(Civ5)
   rotate: false
-  xy: 356, 4
+  xy: 1690, 1208
   size: 28, 26
   orig: 28, 26
   offset: 0, 0
   index: -1
 PolicyIcons/Secularism_(Civ5)
   rotate: false
-  xy: 290, 524
+  xy: 290, 1548
   size: 28, 29
   orig: 28, 29
   offset: 0, 0
   index: -1
 PolicyIcons/Sovereignty_(Civ5)
   rotate: false
-  xy: 1588, 302
+  xy: 1762, 1277
   size: 28, 25
   orig: 28, 25
   offset: 0, 0
   index: -1
 PolicyIcons/Theocracy_(Civ5)
   rotate: false
-  xy: 1558, 353
+  xy: 204, 141
   size: 28, 37
   orig: 28, 37
   offset: 0, 0
   index: -1
 PolicyIcons/Trade_Unions_(Civ5)
   rotate: false
-  xy: 296, 2
+  xy: 192, 2
   size: 28, 28
   orig: 28, 28
   offset: 0, 0
   index: -1
 PolicyIcons/Universal_Suffrage_(Civ5)
   rotate: false
-  xy: 1430, 642
+  xy: 640, 1338
   size: 28, 48
   orig: 28, 48
   offset: 0, 0
   index: -1
 ResourceIcons/Aluminum
   rotate: false
-  xy: 104, 18
+  xy: 204, 384
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Bananas
   rotate: false
-  xy: 334, 364
+  xy: 132, 32
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Cattle
   rotate: false
-  xy: 334, 160
+  xy: 486, 1490
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Coal
   rotate: false
-  xy: 766, 518
+  xy: 334, 654
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Cotton
   rotate: false
-  xy: 970, 518
+  xy: 538, 1286
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Deer
   rotate: false
-  xy: 742, 416
+  xy: 436, 878
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Dyes
   rotate: false
-  xy: 742, 314
+  xy: 436, 776
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Furs
   rotate: false
-  xy: 844, 314
+  xy: 538, 572
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Gems
   rotate: false
-  xy: 946, 416
+  xy: 306, 450
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Gold
   rotate: false
-  xy: 844, 212
+  xy: 306, 348
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Incense
   rotate: false
-  xy: 1174, 518
+  xy: 1098, 1440
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Iron
   rotate: false
-  xy: 1150, 416
+  xy: 1200, 1542
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Ivory
   rotate: false
-  xy: 1150, 314
+  xy: 1302, 1542
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Marble
   rotate: false
-  xy: 1150, 110
+  xy: 1812, 1510
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Oil
   rotate: false
-  xy: 1786, 590
+  xy: 640, 1032
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Sheep
   rotate: false
-  xy: 818, 8
+  xy: 1048, 1032
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Silk
   rotate: false
-  xy: 1022, 8
+  xy: 1252, 1236
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Silver
   rotate: false
-  xy: 1124, 8
+  xy: 742, 624
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Spices
   rotate: false
-  xy: 1252, 416
+  xy: 1150, 1032
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Stone
   rotate: false
-  xy: 1252, 314
+  xy: 946, 726
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Sugar
   rotate: false
-  xy: 866, 620
+  xy: 1472, 1644
   size: 200, 200
   orig: 200, 200
   offset: 0, 0
   index: -1
 ResourceIcons/Uranium
   rotate: false
-  xy: 1354, 234
+  xy: 1252, 828
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Wheat
   rotate: false
-  xy: 1456, 387
+  xy: 1558, 1134
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Wine
   rotate: false
-  xy: 1456, 285
+  xy: 1150, 624
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 StatIcons/CityConnection
   rotate: false
-  xy: 538, 160
+  xy: 334, 858
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 StatIcons/City_Center_(Civ6)
   rotate: false
-  xy: 664, 518
+  xy: 334, 756
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 StatIcons/Culture
   rotate: false
-  xy: 281, 822
+  xy: 1089, 1846
   size: 200, 200
   orig: 200, 200
   offset: 0, 0
   index: -1
 StatIcons/Food
   rotate: false
-  xy: 483, 822
+  xy: 1291, 1846
   size: 200, 200
   orig: 200, 200
   offset: 0, 0
   index: -1
 StatIcons/Gold
   rotate: false
-  xy: 685, 822
+  xy: 1493, 1846
   size: 200, 200
   orig: 200, 200
   offset: 0, 0
   index: -1
 StatIcons/Happiness
   rotate: false
-  xy: 887, 822
+  xy: 2, 134
   size: 200, 200
   orig: 200, 200
   offset: 0, 0
   index: -1
 StatIcons/Malcontent
   rotate: false
-  xy: 1291, 822
+  xy: 260, 1592
   size: 200, 200
   orig: 200, 200
   offset: 0, 0
   index: -1
 StatIcons/Movement
   rotate: false
-  xy: 1582, 590
+  xy: 1404, 1338
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 StatIcons/Population
   rotate: false
-  xy: 260, 568
+  xy: 866, 1644
   size: 200, 200
   orig: 200, 200
   offset: 0, 0
   index: -1
 StatIcons/Production
   rotate: false
-  xy: 462, 568
+  xy: 1068, 1644
   size: 200, 200
   orig: 200, 200
   offset: 0, 0
   index: -1
 StatIcons/Science
   rotate: false
-  xy: 664, 620
+  xy: 1270, 1644
   size: 200, 200
   orig: 200, 200
   offset: 0, 0
   index: -1
 StatIcons/Strength
   rotate: false
-  xy: 1252, 110
+  xy: 1354, 1134
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 UnitIcons/Swordsman
   rotate: false
-  xy: 1252, 110
+  xy: 1354, 1134
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 TerrainIcons/Flood plains
   rotate: false
-  xy: 2, 322
+  xy: 2, 538
   size: 200, 200
   orig: 200, 200
   offset: 0, 0
   index: -1
 TerrainIcons/Fog
   rotate: false
-  xy: 2, 524
+  xy: 2, 1548
   size: 256, 256
   orig: 256, 256
   offset: 0, 0
   index: -1
 TerrainIcons/Forest
   rotate: false
-  xy: 2, 120
+  xy: 2, 336
   size: 200, 200
   orig: 200, 200
   offset: 0, 0
   index: -1
 TerrainIcons/Hexagon
   rotate: false
-  xy: 2, 782
+  xy: 2, 1806
   size: 277, 240
   orig: 277, 240
   offset: 0, 0
   index: -1
 TerrainIcons/Jungle
   rotate: false
-  xy: 1089, 822
+  xy: 1695, 1846
   size: 200, 200
   orig: 200, 200
   offset: 0, 0
   index: -1
 TerrainIcons/Marsh
   rotate: false
-  xy: 1493, 822
+  xy: 462, 1592
   size: 200, 200
   orig: 200, 200
   offset: 0, 0
   index: -1
 TerrainIcons/Oasis
   rotate: false
-  xy: 1695, 822
+  xy: 664, 1644
   size: 200, 200
   orig: 200, 200
   offset: 0, 0
   index: -1
 TerrainIcons/road
   rotate: false
-  xy: 260, 555
+  xy: 260, 1579
   size: 61, 11
   orig: 61, 11
   offset: 0, 0
   index: -1
 UnitIcons/Archer
   rotate: false
-  xy: 206, 32
+  xy: 204, 282
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 UnitIcons/Artillery
   rotate: false
-  xy: 334, 466
+  xy: 204, 180
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 UnitIcons/Bowman
   rotate: false
-  xy: 436, 466
+  xy: 1897, 1816
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 StatIcons/RangedStrength
   rotate: false
-  xy: 436, 466
+  xy: 1897, 1816
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 UnitIcons/Cannon
   rotate: false
-  xy: 436, 364
+  xy: 1856, 1612
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 UnitIcons/Catapult
   rotate: false
-  xy: 538, 466
+  xy: 384, 1388
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 UnitIcons/Cavalry
   rotate: false
-  xy: 436, 262
+  xy: 486, 1388
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 UnitIcons/Chariot Archer
   rotate: false
-  xy: 538, 364
+  xy: 588, 1490
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 UnitIcons/Companion Cavalry
   rotate: false
-  xy: 868, 518
+  xy: 436, 1184
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 UnitIcons/Crossbowman
   rotate: false
-  xy: 1072, 518
+  xy: 538, 1184
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 UnitIcons/Great Artist
   rotate: false
-  xy: 946, 314
+  xy: 306, 144
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 UnitIcons/Great Engineer
   rotate: false
-  xy: 1048, 416
+  xy: 690, 1542
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 UnitIcons/Great Merchant
   rotate: false
-  xy: 946, 212
+  xy: 690, 1440
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 UnitIcons/Great Scientist
   rotate: false
-  xy: 1048, 314
+  xy: 792, 1542
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 UnitIcons/Horseman
   rotate: false
-  xy: 1048, 212
+  xy: 996, 1542
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Horses
   rotate: false
-  xy: 1048, 212
+  xy: 996, 1542
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 UnitIcons/Knight
   rotate: false
-  xy: 1150, 212
+  xy: 1302, 1440
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 UnitIcons/Lancer
   rotate: false
-  xy: 1276, 540
+  xy: 1404, 1542
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 UnitIcons/Longbowman
   rotate: false
-  xy: 742, 110
+  xy: 1506, 1440
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 UnitIcons/Longswordsman
   rotate: false
-  xy: 844, 110
+  xy: 1608, 1542
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 UnitIcons/Musketeer
   rotate: false
-  xy: 1684, 590
+  xy: 1608, 1338
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 UnitIcons/Musketman
   rotate: false
-  xy: 1480, 489
+  xy: 1812, 1307
   size: 100, 99
   orig: 100, 99
   offset: 0, 0
   index: -1
 UnitIcons/Pikeman
   rotate: false
-  xy: 1684, 488
+  xy: 640, 828
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 UnitIcons/Rifleman
   rotate: false
-  xy: 410, 58
+  xy: 844, 930
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 UnitIcons/Scout
   rotate: false
-  xy: 614, 8
+  xy: 844, 828
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 UnitIcons/Settler
   rotate: false
-  xy: 716, 8
+  xy: 946, 930
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 UnitIcons/Spearman
   rotate: false
-  xy: 1226, 8
+  xy: 1048, 930
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 UnitIcons/Trebuchet
   rotate: false
-  xy: 1354, 336
+  xy: 1048, 624
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 UnitIcons/Warrior
   rotate: false
-  xy: 1354, 132
+  xy: 1456, 1032
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 UnitIcons/Worker
   rotate: false
-  xy: 1456, 183
+  xy: 1252, 726
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Accuracy_III_(Civ5)
   rotate: false
-  xy: 1250, 620
+  xy: 1999, 1896
   size: 20, 20
   orig: 20, 20
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Accuracy_II_(Civ5)
   rotate: false
-  xy: 1276, 518
+  xy: 408, 530
   size: 20, 20
   orig: 20, 20
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Accuracy_I_(Civ5)
   rotate: false
-  xy: 1298, 518
+  xy: 306, 566
   size: 20, 20
   orig: 20, 20
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Barrage_III_(Civ5)
   rotate: false
-  xy: 1320, 518
+  xy: 664, 1622
   size: 20, 20
   orig: 20, 20
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Barrage_II_(Civ5)
   rotate: false
-  xy: 640, 546
+  xy: 635, 1824
   size: 20, 20
   orig: 20, 20
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Barrage_I_(Civ5)
   rotate: false
-  xy: 410, 36
+  xy: 1282, 704
   size: 20, 20
   orig: 20, 20
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Blitz_(Civ5)
   rotate: false
-  xy: 614, 138
+  xy: 1354, 773
   size: 20, 20
   orig: 20, 20
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Charge_(Civ5)
   rotate: false
-  xy: 1328, 88
+  xy: 1384, 806
   size: 20, 20
   orig: 20, 20
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Cover_II_(Civ5)
   rotate: false
-  xy: 1354, 110
+  xy: 1456, 881
   size: 20, 20
   orig: 20, 20
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Cover_I_(Civ5)
   rotate: false
-  xy: 1456, 518
+  xy: 1486, 914
   size: 20, 20
   orig: 20, 20
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Drill_III_(Civ5)
   rotate: false
-  xy: 635, 800
+  xy: 717, 602
   size: 20, 20
   orig: 20, 20
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Drill_II_(Civ5)
   rotate: false
-  xy: 1897, 823
+  xy: 1958, 1726
   size: 20, 20
   orig: 20, 20
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Drill_I_(Civ5)
   rotate: false
-  xy: 364, 138
+  xy: 1914, 1523
   size: 20, 20
   orig: 20, 20
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Formation_II_(Civ5)
   rotate: false
-  xy: 1660, 395
+  xy: 1558, 1046
   size: 20, 20
   orig: 20, 20
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Formation_I_(Civ5)
   rotate: false
-  xy: 2004, 872
+  xy: 1588, 1084
   size: 20, 20
   orig: 20, 20
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Indirect_Fire_(Civ5)
   rotate: false
-  xy: 2026, 872
+  xy: 1618, 1112
   size: 20, 20
   orig: 20, 20
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Logistics_(Civ5)
   rotate: false
-  xy: 1618, 341
+  xy: 1660, 1151
   size: 20, 20
   orig: 20, 20
   offset: 0, 0
   index: -1
 UnitPromotionIcons/March_(Civ5)
   rotate: false
-  xy: 1720, 438
+  xy: 1690, 1186
   size: 20, 20
   orig: 20, 20
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Mobility_(Civ5)
   rotate: false
-  xy: 1750, 466
+  xy: 1720, 1214
   size: 20, 20
   orig: 20, 20
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Range_(Civ5)
   rotate: false
-  xy: 1558, 236
+  xy: 1762, 1255
   size: 20, 20
   orig: 20, 20
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Scouting_III_(Civ5)
   rotate: false
-  xy: 386, 10
+  xy: 1252, 645
   size: 20, 20
   orig: 20, 20
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Scouting_II_(Civ5)
   rotate: false
-  xy: 1588, 280
+  xy: 1999, 1874
   size: 20, 20
   orig: 20, 20
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Scouting_I_(Civ5)
   rotate: false
-  xy: 640, 524
+  xy: 408, 508
   size: 20, 20
   orig: 20, 20
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Sentry_(Civ5)
   rotate: false
-  xy: 432, 36
+  xy: 664, 1600
   size: 20, 20
   orig: 20, 20
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Shock_III_(Civ5)
   rotate: false
-  xy: 614, 116
+  xy: 635, 1802
   size: 20, 20
   orig: 20, 20
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Shock_II_(Civ5)
   rotate: false
-  xy: 1328, 66
+  xy: 1282, 682
   size: 20, 20
   orig: 20, 20
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Shock_I_(Civ5)
   rotate: false
-  xy: 1350, 88
+  xy: 1304, 704
   size: 20, 20
   orig: 20, 20
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Siege_(Civ5)
   rotate: false
-  xy: 1376, 110
+  xy: 1354, 751
   size: 20, 20
   orig: 20, 20
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Volley_(Civ5)
   rotate: false
-  xy: 1456, 496
+  xy: 1406, 806
   size: 20, 20
   orig: 20, 20
   offset: 0, 0
diff --git a/android/assets/game.png b/android/assets/game.png
index fab470011d..3226a197a5 100644
Binary files a/android/assets/game.png and b/android/assets/game.png differ
diff --git a/core/src/com/unciv/logic/civilization/PolicyManager.kt b/core/src/com/unciv/logic/civilization/PolicyManager.kt
index 1ac6124bd6..0de678dd9a 100644
--- a/core/src/com/unciv/logic/civilization/PolicyManager.kt
+++ b/core/src/com/unciv/logic/civilization/PolicyManager.kt
@@ -59,9 +59,10 @@ class PolicyManager {
             }
         }
 
+        val hasCapital = civInfo.cities.any{it.isCapital()}
         when (policy.name) {
-            "Collective Rule" -> civInfo.placeUnitNearTile(civInfo.getCapital().location, "Settler")
-            "Citizenship" -> civInfo.placeUnitNearTile(civInfo.getCapital().location, "Worker")
+            "Collective Rule" -> if(hasCapital) civInfo.placeUnitNearTile(civInfo.getCapital().location, "Settler")
+            "Citizenship" -> if(hasCapital) civInfo.placeUnitNearTile(civInfo.getCapital().location, "Worker")
             "Representation", "Reformation" -> civInfo.goldenAges.enterGoldenAge()
             "Scientific Revolution" -> civInfo.tech.freeTechs += 2
             "Legalism" ->