diff --git a/Credits.md b/Credits.md
index 7ee75147ca..2920c8e98a 100644
--- a/Credits.md
+++ b/Credits.md
@@ -60,4 +60,5 @@ All the following are from [the Noun Project](https://thenounproject.com) licenc
 * [Cattle](https://thenounproject.com/term/cattle/781342/) By Daniela Baptista
 * [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
\ No newline at end of file
+* [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
\ No newline at end of file
diff --git a/android/Images/ResourceIcons/Dye.png b/android/Images/ResourceIcons/Dyes.png
similarity index 100%
rename from android/Images/ResourceIcons/Dye.png
rename to android/Images/ResourceIcons/Dyes.png
diff --git a/android/Images/StatIcons/20xCityConnection5.png b/android/Images/StatIcons/20xCityConnection5.png
index 2ba55f9b69..1ac2a5f31f 100644
Binary files a/android/Images/StatIcons/20xCityConnection5.png and b/android/Images/StatIcons/20xCityConnection5.png differ
diff --git a/android/assets/game.atlas b/android/assets/game.atlas
index 37ba31e66d..744a328885 100644
--- a/android/assets/game.atlas
+++ b/android/assets/game.atlas
@@ -6,1162 +6,1337 @@ filter: MipMapLinearLinear,MipMapLinearLinear
 repeat: none
 FlagIcons/Dutch
   rotate: false
-  xy: 1401, 1501
+  xy: 1618, 722
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 FlagIcons/English
   rotate: false
-  xy: 810, 713
+  xy: 1618, 592
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 FlagIcons/French
   rotate: false
-  xy: 1531, 1501
+  xy: 406, 48
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 FlagIcons/German
   rotate: false
-  xy: 810, 583
+  xy: 536, 48
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 FlagIcons/Italian
   rotate: false
-  xy: 1661, 1501
+  xy: 666, 48
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 FlagIcons/Romanian
   rotate: false
-  xy: 1791, 1501
+  xy: 1398, 236
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 FlagIcons/Russian
   rotate: false
-  xy: 810, 323
+  xy: 1748, 722
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 FlagIcons/Spanish
   rotate: false
-  xy: 810, 193
+  xy: 1748, 592
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 ImprovementIcons/Academy_(Civ5)
   rotate: false
-  xy: 406, 119
+  xy: 810, 184
   size: 44, 44
   orig: 44, 44
   offset: 0, 0
   index: -1
 ImprovementIcons/Camp_(Civ5)
   rotate: false
-  xy: 1214, 1261
+  xy: 1962, 1954
   size: 44, 44
   orig: 44, 44
   offset: 0, 0
   index: -1
 ImprovementIcons/Customs_house_(Civ5)
   rotate: false
-  xy: 1921, 1585
+  xy: 48, 2
   size: 44, 44
   orig: 44, 44
   offset: 0, 0
   index: -1
 ImprovementIcons/Farm_(Civ5)
   rotate: false
-  xy: 1962, 1940
+  xy: 902, 184
   size: 44, 44
   orig: 44, 44
   offset: 0, 0
   index: -1
 ImprovementIcons/Landmark_(Civ5)
   rotate: false
-  xy: 100, 50
+  xy: 140, 2
   size: 44, 44
   orig: 44, 44
   offset: 0, 0
   index: -1
 ImprovementIcons/Lumber_mill_(Civ5)
   rotate: false
-  xy: 1962, 1894
+  xy: 94, 63
   size: 44, 44
   orig: 44, 44
   offset: 0, 0
   index: -1
 ImprovementIcons/Manufactory_(Civ5)
   rotate: false
-  xy: 498, 119
+  xy: 994, 184
   size: 44, 44
   orig: 44, 44
   offset: 0, 0
   index: -1
 ImprovementIcons/Mine_(Civ5)
   rotate: false
-  xy: 1352, 1307
+  xy: 140, 63
   size: 44, 44
   orig: 44, 44
   offset: 0, 0
   index: -1
 ImprovementIcons/Oil_well_(Civ5)
   rotate: false
-  xy: 940, 705
+  xy: 232, 2
   size: 44, 44
   orig: 44, 44
   offset: 0, 0
   index: -1
 ImprovementIcons/Pasture_(Civ5)
   rotate: false
-  xy: 1967, 1539
+  xy: 186, 63
   size: 44, 44
   orig: 44, 44
   offset: 0, 0
   index: -1
 ImprovementIcons/Plantation_(Civ5)
   rotate: false
-  xy: 146, 50
+  xy: 1086, 184
   size: 44, 44
   orig: 44, 44
   offset: 0, 0
   index: -1
 ImprovementIcons/Quarry_(Civ5)
   rotate: false
-  xy: 1962, 1848
+  xy: 278, 2
   size: 44, 44
   orig: 44, 44
   offset: 0, 0
   index: -1
 ImprovementIcons/Railroad_(Civ5)
   rotate: false
-  xy: 544, 119
+  xy: 232, 63
   size: 44, 44
   orig: 44, 44
   offset: 0, 0
   index: -1
 ImprovementIcons/Road_(Civ5)
   rotate: false
-  xy: 1352, 1261
+  xy: 1132, 184
   size: 44, 44
   orig: 44, 44
   offset: 0, 0
   index: -1
 ImprovementIcons/Trading_post_(Civ5)
   rotate: false
-  xy: 238, 50
+  xy: 600, 2
   size: 44, 44
   orig: 44, 44
   offset: 0, 0
   index: -1
 OtherIcons/Circle
   rotate: false
-  xy: 2, 96
+  xy: 204, 715
   size: 200, 200
   orig: 200, 200
   offset: 0, 0
   index: -1
 OtherIcons/City
   rotate: false
-  xy: 204, 1308
+  xy: 204, 513
   size: 200, 200
   orig: 200, 200
   offset: 0, 0
   index: -1
 OtherIcons/Crosshair
   rotate: false
-  xy: 204, 702
+  xy: 1254, 1644
   size: 200, 200
   orig: 200, 200
   offset: 0, 0
   index: -1
 OtherIcons/DisbandUnit
   rotate: false
-  xy: 204, 500
+  xy: 1658, 1644
   size: 200, 200
   orig: 200, 200
   offset: 0, 0
   index: -1
 OtherIcons/Fire
   rotate: false
-  xy: 204, 298
+  xy: 471, 1592
   size: 200, 200
   orig: 200, 200
   offset: 0, 0
   index: -1
 OtherIcons/MenuIcon
   rotate: false
-  xy: 810, 453
+  xy: 1416, 366
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 OtherIcons/Railroad
   rotate: false
-  xy: 608, 1175
+  xy: 810, 634
   size: 200, 200
   orig: 200, 200
   offset: 0, 0
   index: -1
 OtherIcons/Shield
   rotate: false
-  xy: 608, 367
+  xy: 810, 432
   size: 200, 200
   orig: 200, 200
   offset: 0, 0
   index: -1
 OtherIcons/Star
   rotate: false
-  xy: 673, 1638
+  xy: 673, 1651
   size: 150, 141
   orig: 150, 141
   offset: 0, 0
   index: -1
 OtherIcons/Stop
   rotate: false
-  xy: 810, 1429
+  xy: 810, 230
   size: 200, 200
   orig: 200, 200
   offset: 0, 0
   index: -1
 OtherIcons/civTableBackground
   rotate: false
-  xy: 548, 1781
+  xy: 548, 1794
   size: 300, 50
   orig: 300, 50
   offset: 0, 0
   index: -1
 OtherIcons/tileTableBackground
   rotate: false
-  xy: 1860, 1631
+  xy: 1860, 1644
   size: 180, 200
   orig: 180, 200
   offset: 0, 0
   index: -1
 OtherIcons/whiteDot
   rotate: false
-  xy: 847, 1778
+  xy: 847, 1791
   size: 1, 1
   orig: 1, 1
   offset: 0, 0
   index: -1
 PolicyIcons/Aristocracy_(Civ5)
   rotate: false
-  xy: 742, 136
+  xy: 1528, 232
   size: 28, 27
   orig: 28, 27
   offset: 0, 0
   index: -1
 PolicyIcons/Citizenship_(Civ5)
   rotate: false
-  xy: 1677, 1466
+  xy: 308, 74
   size: 28, 33
   orig: 28, 33
   offset: 0, 0
   index: -1
 PolicyIcons/Civil_Society_(Civ5)
   rotate: false
-  xy: 1196, 1194
+  xy: 338, 76
   size: 28, 31
   orig: 28, 31
   offset: 0, 0
   index: -1
 PolicyIcons/Collective_Rule_(Civ5)
   rotate: false
-  xy: 940, 484
+  xy: 1528, 261
   size: 28, 31
   orig: 28, 31
   offset: 0, 0
   index: -1
 PolicyIcons/Constitution_(Civ5)
   rotate: false
-  xy: 1737, 1472
+  xy: 320, 1575
   size: 28, 27
   orig: 28, 27
   offset: 0, 0
   index: -1
 PolicyIcons/Democracy_(Civ5)
   rotate: false
-  xy: 712, 133
+  xy: 2008, 1933
   size: 28, 30
   orig: 28, 30
   offset: 0, 0
   index: -1
 PolicyIcons/Entrepreneurship_(Civ5)
   rotate: false
-  xy: 1962, 1986
+  xy: 673, 1602
   size: 45, 47
   orig: 45, 47
   offset: 0, 0
   index: -1
 PolicyIcons/Free_Religion_(Civ5)
   rotate: false
-  xy: 1707, 1470
+  xy: 2008, 1902
   size: 28, 29
   orig: 28, 29
   offset: 0, 0
   index: -1
 PolicyIcons/Free_Speech_(Civ5)
   rotate: false
-  xy: 1921, 1501
+  xy: 1546, 366
   size: 28, 36
   orig: 28, 36
   offset: 0, 0
   index: -1
 PolicyIcons/Free_Thought_(Civ5)
   rotate: false
-  xy: 1196, 1164
+  xy: 260, 1574
   size: 28, 28
   orig: 28, 28
   offset: 0, 0
   index: -1
 PolicyIcons/Humanism_(Civ5)
   rotate: false
-  xy: 1274, 1232
+  xy: 320, 1546
   size: 28, 27
   orig: 28, 27
   offset: 0, 0
   index: -1
 PolicyIcons/Landed_Elite_(Civ5)
   rotate: false
-  xy: 1951, 1506
+  xy: 368, 76
   size: 28, 31
   orig: 28, 31
   offset: 0, 0
   index: -1
 PolicyIcons/Legalism_(Civ5)
   rotate: false
-  xy: 940, 454
+  xy: 260, 1544
   size: 28, 28
   orig: 28, 28
   offset: 0, 0
   index: -1
 PolicyIcons/Mandate_Of_Heaven_(Civ5)
   rotate: false
-  xy: 682, 128
+  xy: 1178, 193
   size: 28, 35
   orig: 28, 35
   offset: 0, 0
   index: -1
 PolicyIcons/Mercantilism_(Civ5)
   rotate: false
-  xy: 2009, 1996
+  xy: 766, 1612
   size: 28, 37
   orig: 28, 37
   offset: 0, 0
   index: -1
 PolicyIcons/Meritocracy_(Civ5)
   rotate: false
-  xy: 1196, 1135
+  xy: 350, 1575
   size: 28, 27
   orig: 28, 27
   offset: 0, 0
   index: -1
 PolicyIcons/Monarchy_(Civ5)
   rotate: false
-  xy: 284, 58
+  xy: 1528, 328
   size: 28, 36
   orig: 28, 36
   offset: 0, 0
   index: -1
 PolicyIcons/Oligarchy_(Civ5)
   rotate: false
-  xy: 1214, 1227
+  xy: 1528, 294
   size: 28, 32
   orig: 28, 32
   offset: 0, 0
   index: -1
 PolicyIcons/Organized_Religion_(Civ5)
   rotate: false
-  xy: 1767, 1475
+  xy: 308, 48
   size: 28, 24
   orig: 28, 24
   offset: 0, 0
   index: -1
 PolicyIcons/Patronage_(Civ5)
   rotate: false
-  xy: 2, 48
+  xy: 1962, 2000
   size: 50, 46
   orig: 50, 46
   offset: 0, 0
   index: -1
 PolicyIcons/Protectionism_(Civ5)
   rotate: false
-  xy: 810, 165
+  xy: 338, 48
   size: 28, 26
   orig: 28, 26
   offset: 0, 0
   index: -1
 PolicyIcons/Reformation_(Civ5)
   rotate: false
-  xy: 1981, 1509
+  xy: 290, 1574
   size: 28, 28
   orig: 28, 28
   offset: 0, 0
   index: -1
 PolicyIcons/Representation_(Civ5)
   rotate: false
-  xy: 314, 63
+  xy: 2008, 1965
   size: 28, 31
   orig: 28, 31
   offset: 0, 0
   index: -1
 PolicyIcons/Republic_(Civ5)
   rotate: false
-  xy: 940, 426
+  xy: 368, 48
   size: 28, 26
   orig: 28, 26
   offset: 0, 0
   index: -1
 PolicyIcons/Scientific_Revolution_(Civ5)
   rotate: false
-  xy: 374, 68
+  xy: 350, 1547
   size: 28, 26
   orig: 28, 26
   offset: 0, 0
   index: -1
 PolicyIcons/Secularism_(Civ5)
   rotate: false
-  xy: 1244, 1230
+  xy: 2008, 1871
   size: 28, 29
   orig: 28, 29
   offset: 0, 0
   index: -1
 PolicyIcons/Sovereignty_(Civ5)
   rotate: false
-  xy: 772, 138
+  xy: 1214, 223
   size: 28, 25
   orig: 28, 25
   offset: 0, 0
   index: -1
 PolicyIcons/Theocracy_(Civ5)
   rotate: false
-  xy: 765, 1599
+  xy: 278, 70
   size: 28, 37
   orig: 28, 37
   offset: 0, 0
   index: -1
 PolicyIcons/Trade_Unions_(Civ5)
   rotate: false
-  xy: 344, 66
+  xy: 290, 1544
   size: 28, 28
   orig: 28, 28
   offset: 0, 0
   index: -1
 PolicyIcons/Universal_Suffrage_(Civ5)
   rotate: false
-  xy: 940, 517
+  xy: 2014, 1998
   size: 28, 48
   orig: 28, 48
   offset: 0, 0
   index: -1
+ResourceIcons/Aluminum
+  rotate: false
+  xy: 1356, 1846
+  size: 200, 200
+  orig: 200, 200
+  offset: 0, 0
+  index: -1
 ResourceIcons/Aluminum_(Civ5)
   rotate: false
-  xy: 673, 1592
+  xy: 1554, 588
   size: 44, 44
   orig: 44, 44
   offset: 0, 0
   index: -1
+ResourceIcons/Bananas
+  rotate: false
+  xy: 2, 311
+  size: 200, 200
+  orig: 200, 200
+  offset: 0, 0
+  index: -1
 ResourceIcons/Bananas_(Civ5)
-  rotate: false
-  xy: 719, 1592
-  size: 44, 44
-  orig: 44, 44
-  offset: 0, 0
-  index: -1
-ResourceIcons/Cattle_(Civ5)
-  rotate: false
-  xy: 1352, 1399
-  size: 44, 44
-  orig: 44, 44
-  offset: 0, 0
-  index: -1
-ResourceIcons/Coal_(Civ5)
-  rotate: false
-  xy: 1401, 1455
-  size: 44, 44
-  orig: 44, 44
-  offset: 0, 0
-  index: -1
-ResourceIcons/Cotton_(Civ5)
-  rotate: false
-  xy: 940, 797
-  size: 44, 44
-  orig: 44, 44
-  offset: 0, 0
-  index: -1
-ResourceIcons/Deer_(Civ5)
   rotate: false
   xy: 2, 2
   size: 44, 44
   orig: 44, 44
   offset: 0, 0
   index: -1
-ResourceIcons/Dyes_(Civ5)
+ResourceIcons/Cattle
   rotate: false
-  xy: 54, 50
+  xy: 204, 1119
+  size: 200, 200
+  orig: 200, 200
+  offset: 0, 0
+  index: -1
+ResourceIcons/Cattle_(Civ5)
+  rotate: false
+  xy: 720, 1605
   size: 44, 44
   orig: 44, 44
   offset: 0, 0
   index: -1
+ResourceIcons/Coal
+  rotate: false
+  xy: 204, 311
+  size: 200, 200
+  orig: 200, 200
+  offset: 0, 0
+  index: -1
+ResourceIcons/Coal_(Civ5)
+  rotate: false
+  xy: 856, 184
+  size: 44, 44
+  orig: 44, 44
+  offset: 0, 0
+  index: -1
+ResourceIcons/Cotton
+  rotate: false
+  xy: 850, 1644
+  size: 200, 200
+  orig: 200, 200
+  offset: 0, 0
+  index: -1
+ResourceIcons/Cotton_(Civ5)
+  rotate: false
+  xy: 1554, 542
+  size: 44, 44
+  orig: 44, 44
+  offset: 0, 0
+  index: -1
+ResourceIcons/Deer
+  rotate: false
+  xy: 1456, 1644
+  size: 200, 200
+  orig: 200, 200
+  offset: 0, 0
+  index: -1
+ResourceIcons/Deer_(Civ5)
+  rotate: false
+  xy: 2, 63
+  size: 44, 44
+  orig: 44, 44
+  offset: 0, 0
+  index: -1
+ResourceIcons/Dyes
+  rotate: false
+  xy: 269, 1604
+  size: 200, 200
+  orig: 200, 200
+  offset: 0, 0
+  index: -1
+ResourceIcons/Dyes_(Civ5)
+  rotate: false
+  xy: 1962, 1908
+  size: 44, 44
+  orig: 44, 44
+  offset: 0, 0
+  index: -1
+ResourceIcons/Furs
+  rotate: false
+  xy: 406, 986
+  size: 200, 200
+  orig: 200, 200
+  offset: 0, 0
+  index: -1
 ResourceIcons/Furs_(Civ5)
   rotate: false
-  xy: 452, 119
+  xy: 1554, 496
   size: 44, 44
   orig: 44, 44
   offset: 0, 0
   index: -1
+ResourceIcons/Gems
+  rotate: false
+  xy: 406, 784
+  size: 200, 200
+  orig: 200, 200
+  offset: 0, 0
+  index: -1
 ResourceIcons/Gems_(Civ5)
   rotate: false
-  xy: 1260, 1261
+  xy: 1546, 450
   size: 44, 44
   orig: 44, 44
   offset: 0, 0
   index: -1
+ResourceIcons/Gold
+  rotate: false
+  xy: 406, 582
+  size: 200, 200
+  orig: 200, 200
+  offset: 0, 0
+  index: -1
 ResourceIcons/Gold_(Civ5)
   rotate: false
-  xy: 1352, 1353
+  xy: 94, 2
   size: 44, 44
   orig: 44, 44
   offset: 0, 0
   index: -1
 ResourceIcons/Horses_(Civ5)
   rotate: false
-  xy: 1447, 1455
+  xy: 48, 63
   size: 44, 44
   orig: 44, 44
   offset: 0, 0
   index: -1
+ResourceIcons/Incense
+  rotate: false
+  xy: 608, 784
+  size: 200, 200
+  orig: 200, 200
+  offset: 0, 0
+  index: -1
 ResourceIcons/Incense_(Civ5)
   rotate: false
-  xy: 940, 751
+  xy: 1962, 1862
   size: 44, 44
   orig: 44, 44
   offset: 0, 0
   index: -1
+ResourceIcons/Iron
+  rotate: false
+  xy: 608, 582
+  size: 200, 200
+  orig: 200, 200
+  offset: 0, 0
+  index: -1
 ResourceIcons/Iron_(Civ5)
   rotate: false
-  xy: 1921, 1539
+  xy: 948, 184
   size: 44, 44
   orig: 44, 44
   offset: 0, 0
   index: -1
+ResourceIcons/Ivory
+  rotate: false
+  xy: 608, 380
+  size: 200, 200
+  orig: 200, 200
+  offset: 0, 0
+  index: -1
 ResourceIcons/Ivory_(Civ5)
   rotate: false
-  xy: 1967, 1585
+  xy: 1546, 404
   size: 44, 44
   orig: 44, 44
   offset: 0, 0
   index: -1
+ResourceIcons/Marble
+  rotate: false
+  xy: 1012, 1240
+  size: 200, 200
+  orig: 200, 200
+  offset: 0, 0
+  index: -1
 ResourceIcons/Marble_(Civ5)
   rotate: false
-  xy: 1306, 1261
+  xy: 186, 2
   size: 44, 44
   orig: 44, 44
   offset: 0, 0
   index: -1
+ResourceIcons/Oil
+  rotate: false
+  xy: 1214, 1240
+  size: 200, 200
+  orig: 200, 200
+  offset: 0, 0
+  index: -1
 ResourceIcons/Oil_(Civ5)
   rotate: false
-  xy: 1493, 1455
+  xy: 1040, 184
   size: 44, 44
   orig: 44, 44
   offset: 0, 0
   index: -1
+ResourceIcons/Sheep
+  rotate: false
+  xy: 1618, 1442
+  size: 200, 200
+  orig: 200, 200
+  offset: 0, 0
+  index: -1
 ResourceIcons/Sheep_(Civ5)
   rotate: false
-  xy: 1539, 1455
+  xy: 324, 2
   size: 44, 44
   orig: 44, 44
   offset: 0, 0
   index: -1
+ResourceIcons/Silk
+  rotate: false
+  xy: 1012, 634
+  size: 200, 200
+  orig: 200, 200
+  offset: 0, 0
+  index: -1
 ResourceIcons/Silk_(Civ5)
   rotate: false
-  xy: 940, 659
+  xy: 370, 2
   size: 44, 44
   orig: 44, 44
   offset: 0, 0
   index: -1
+ResourceIcons/Silver
+  rotate: false
+  xy: 1214, 836
+  size: 200, 200
+  orig: 200, 200
+  offset: 0, 0
+  index: -1
 ResourceIcons/Silver_(Civ5)
   rotate: false
-  xy: 192, 50
+  xy: 416, 2
   size: 44, 44
   orig: 44, 44
   offset: 0, 0
   index: -1
+ResourceIcons/Spices
+  rotate: false
+  xy: 1618, 1240
+  size: 200, 200
+  orig: 200, 200
+  offset: 0, 0
+  index: -1
 ResourceIcons/Spices_(Civ5)
   rotate: false
-  xy: 590, 119
+  xy: 462, 2
   size: 44, 44
   orig: 44, 44
   offset: 0, 0
   index: -1
+ResourceIcons/Stone
+  rotate: false
+  xy: 1820, 1442
+  size: 200, 200
+  orig: 200, 200
+  offset: 0, 0
+  index: -1
 ResourceIcons/Stone_(Civ5)
   rotate: false
-  xy: 1585, 1455
+  xy: 508, 2
   size: 44, 44
   orig: 44, 44
   offset: 0, 0
   index: -1
+ResourceIcons/Sugar
+  rotate: false
+  xy: 1012, 432
+  size: 200, 200
+  orig: 200, 200
+  offset: 0, 0
+  index: -1
 ResourceIcons/Sugar_(Civ5)
   rotate: false
-  xy: 940, 613
+  xy: 554, 2
   size: 44, 44
   orig: 44, 44
   offset: 0, 0
   index: -1
+ResourceIcons/Uranium
+  rotate: false
+  xy: 1618, 1038
+  size: 200, 200
+  orig: 200, 200
+  offset: 0, 0
+  index: -1
 ResourceIcons/Uranium_(Civ5)
   rotate: false
-  xy: 636, 119
+  xy: 646, 2
   size: 44, 44
   orig: 44, 44
   offset: 0, 0
   index: -1
+ResourceIcons/Wheat
+  rotate: false
+  xy: 1012, 230
+  size: 200, 200
+  orig: 200, 200
+  offset: 0, 0
+  index: -1
 ResourceIcons/Wheat_(Civ5)
   rotate: false
-  xy: 1631, 1455
+  xy: 692, 2
   size: 44, 44
   orig: 44, 44
   offset: 0, 0
   index: -1
+ResourceIcons/Wine
+  rotate: false
+  xy: 1214, 432
+  size: 200, 200
+  orig: 200, 200
+  offset: 0, 0
+  index: -1
 ResourceIcons/Wine_(Civ5)
   rotate: false
-  xy: 940, 567
+  xy: 738, 2
   size: 44, 44
   orig: 44, 44
   offset: 0, 0
   index: -1
 StatIcons/20xCityConnection5
   rotate: false
-  xy: 825, 1759
-  size: 20, 20
-  orig: 20, 20
+  xy: 548, 1846
+  size: 200, 200
+  orig: 200, 200
   offset: 0, 0
   index: -1
 StatIcons/20xCulture5
   rotate: false
-  xy: 548, 1833
+  xy: 2, 1321
   size: 200, 200
   orig: 200, 200
   offset: 0, 0
   index: -1
 StatIcons/20xFood5
   rotate: false
-  xy: 2, 1308
+  xy: 750, 1846
   size: 200, 200
   orig: 200, 200
   offset: 0, 0
   index: -1
 StatIcons/20xGold5
   rotate: false
-  xy: 750, 1833
+  xy: 2, 1119
   size: 200, 200
   orig: 200, 200
   offset: 0, 0
   index: -1
 StatIcons/20xHappiness5
   rotate: false
-  xy: 2, 1106
+  xy: 952, 1846
   size: 200, 200
   orig: 200, 200
   offset: 0, 0
   index: -1
 StatIcons/20xMalcontent5
   rotate: false
-  xy: 406, 97
+  xy: 278, 48
   size: 20, 20
   orig: 20, 20
   offset: 0, 0
   index: -1
 StatIcons/20xMovement5
   rotate: false
-  xy: 2013, 1609
+  xy: 825, 1772
   size: 20, 20
   orig: 20, 20
   offset: 0, 0
   index: -1
 StatIcons/20xPopulation5
   rotate: false
-  xy: 952, 1833
+  xy: 2, 917
   size: 200, 200
   orig: 200, 200
   offset: 0, 0
   index: -1
 StatIcons/20xProduction5
   rotate: false
-  xy: 2, 904
+  xy: 1154, 1846
   size: 200, 200
   orig: 200, 200
   offset: 0, 0
   index: -1
 StatIcons/20xRangedStrength5
   rotate: false
-  xy: 1304, 1239
+  xy: 380, 1582
   size: 20, 20
   orig: 20, 20
   offset: 0, 0
   index: -1
 StatIcons/20xScience5
   rotate: false
-  xy: 1154, 1833
+  xy: 2, 715
   size: 200, 200
   orig: 200, 200
   offset: 0, 0
   index: -1
 StatIcons/20xStrength5
   rotate: false
-  xy: 1196, 1113
+  xy: 1244, 228
   size: 20, 20
   orig: 20, 20
   offset: 0, 0
   index: -1
 StatIcons/City_Center_(Civ6)
   rotate: false
-  xy: 2, 1768
+  xy: 2, 1781
   size: 265, 265
   orig: 265, 265
   offset: 0, 0
   index: -1
 StatIcons/populationGray
   rotate: false
-  xy: 810, 843
+  xy: 1820, 1058
   size: 182, 180
   orig: 182, 180
   offset: 0, 0
   index: -1
 StatIcons/populationGreen
   rotate: false
-  xy: 1012, 1045
+  xy: 1214, 250
   size: 182, 180
   orig: 182, 180
   offset: 0, 0
   index: -1
 TerrainIcons/Flood plains
   rotate: false
-  xy: 204, 96
+  xy: 406, 1390
   size: 200, 200
   orig: 200, 200
   offset: 0, 0
   index: -1
 TerrainIcons/Fog
   rotate: false
-  xy: 2, 1510
+  xy: 2, 1523
   size: 256, 256
   orig: 256, 256
   offset: 0, 0
   index: -1
 TerrainIcons/Forest
   rotate: false
-  xy: 850, 1631
+  xy: 406, 1188
   size: 200, 200
   orig: 200, 200
   offset: 0, 0
   index: -1
 TerrainIcons/Hexagon
   rotate: false
-  xy: 269, 1793
+  xy: 269, 1806
   size: 277, 240
   orig: 277, 240
   offset: 0, 0
   index: -1
 TerrainIcons/Jungle
   rotate: false
-  xy: 471, 1579
+  xy: 608, 178
   size: 200, 200
   orig: 200, 200
   offset: 0, 0
   index: -1
 TerrainIcons/Marsh
   rotate: false
-  xy: 406, 569
+  xy: 1214, 1442
   size: 200, 200
   orig: 200, 200
   offset: 0, 0
   index: -1
 TerrainIcons/Oasis
   rotate: false
-  xy: 406, 165
+  xy: 1012, 1038
   size: 200, 200
   orig: 200, 200
   offset: 0, 0
   index: -1
 TerrainIcons/road
   rotate: false
-  xy: 673, 1579
+  xy: 720, 1592
   size: 61, 11
   orig: 61, 11
   offset: 0, 0
   index: -1
 UnitIcons/Archer
   rotate: false
-  xy: 2, 702
+  xy: 2, 513
   size: 200, 200
   orig: 200, 200
   offset: 0, 0
   index: -1
 UnitIcons/Artillery
   rotate: false
-  xy: 1356, 1833
+  xy: 1558, 1846
   size: 200, 200
   orig: 200, 200
   offset: 0, 0
   index: -1
 UnitIcons/Bowman
   rotate: false
-  xy: 2, 500
+  xy: 1760, 1846
   size: 200, 200
   orig: 200, 200
   offset: 0, 0
   index: -1
 UnitIcons/Cannon
   rotate: false
-  xy: 1558, 1833
+  xy: 2, 109
   size: 200, 200
   orig: 200, 200
   offset: 0, 0
   index: -1
 UnitIcons/Catapult
   rotate: false
-  xy: 2, 298
+  xy: 204, 1321
   size: 200, 200
   orig: 200, 200
   offset: 0, 0
   index: -1
 UnitIcons/Cavalry
   rotate: false
-  xy: 1760, 1833
+  xy: 204, 917
   size: 200, 200
   orig: 200, 200
   offset: 0, 0
   index: -1
 UnitIcons/Chariot Archer
   rotate: false
-  xy: 1214, 1307
+  xy: 1416, 496
   size: 136, 136
   orig: 136, 136
   offset: 0, 0
   index: -1
 UnitIcons/Companion Cavalry
   rotate: false
-  xy: 204, 1106
+  xy: 204, 109
   size: 200, 200
   orig: 200, 200
   offset: 0, 0
   index: -1
 UnitIcons/Crossbowman
   rotate: false
-  xy: 204, 904
+  xy: 1052, 1644
   size: 200, 200
   orig: 200, 200
   offset: 0, 0
   index: -1
 UnitIcons/Great Artist
   rotate: false
-  xy: 1052, 1631
+  xy: 406, 380
   size: 200, 200
   orig: 200, 200
   offset: 0, 0
   index: -1
 UnitIcons/Great Engineer
   rotate: false
-  xy: 1254, 1631
+  xy: 406, 178
   size: 200, 200
   orig: 200, 200
   offset: 0, 0
   index: -1
 UnitIcons/Great Merchant
   rotate: false
-  xy: 1456, 1631
+  xy: 608, 1390
   size: 200, 200
   orig: 200, 200
   offset: 0, 0
   index: -1
 UnitIcons/Great Scientist
   rotate: false
-  xy: 1658, 1631
+  xy: 608, 1188
   size: 200, 200
   orig: 200, 200
   offset: 0, 0
   index: -1
 UnitIcons/Horseman
   rotate: false
-  xy: 269, 1591
+  xy: 608, 986
+  size: 200, 200
+  orig: 200, 200
+  offset: 0, 0
+  index: -1
+ResourceIcons/Horses
+  rotate: false
+  xy: 608, 986
   size: 200, 200
   orig: 200, 200
   offset: 0, 0
   index: -1
 UnitIcons/Knight
   rotate: false
-  xy: 406, 1377
+  xy: 810, 1442
   size: 200, 200
   orig: 200, 200
   offset: 0, 0
   index: -1
 UnitIcons/Lancer
   rotate: false
-  xy: 406, 1175
+  xy: 810, 1240
   size: 200, 200
   orig: 200, 200
   offset: 0, 0
   index: -1
 UnitIcons/Longbowman
   rotate: false
-  xy: 406, 973
+  xy: 1012, 1442
   size: 200, 200
   orig: 200, 200
   offset: 0, 0
   index: -1
 UnitIcons/Longswordsman
   rotate: false
-  xy: 406, 771
+  xy: 810, 1038
   size: 200, 200
   orig: 200, 200
   offset: 0, 0
   index: -1
 UnitIcons/Musketeer
   rotate: false
-  xy: 406, 367
+  xy: 810, 836
   size: 200, 200
   orig: 200, 200
   offset: 0, 0
   index: -1
 UnitIcons/Musketman
   rotate: false
-  xy: 1214, 1445
+  xy: 1618, 852
   size: 185, 184
   orig: 185, 184
   offset: 0, 0
   index: -1
 UnitIcons/Pikeman
   rotate: false
-  xy: 608, 1377
+  xy: 1416, 1442
   size: 200, 200
   orig: 200, 200
   offset: 0, 0
   index: -1
 UnitIcons/Rifleman
   rotate: false
-  xy: 608, 973
+  xy: 1012, 836
   size: 200, 200
   orig: 200, 200
   offset: 0, 0
   index: -1
 UnitIcons/Scout
   rotate: false
-  xy: 608, 771
+  xy: 1214, 1038
   size: 200, 200
   orig: 200, 200
   offset: 0, 0
   index: -1
 UnitIcons/Settler
   rotate: false
-  xy: 608, 569
+  xy: 1416, 1240
   size: 200, 200
   orig: 200, 200
   offset: 0, 0
   index: -1
 UnitIcons/Spearman
   rotate: false
-  xy: 608, 165
+  xy: 1416, 1038
   size: 200, 200
   orig: 200, 200
   offset: 0, 0
   index: -1
 UnitIcons/Swordsman
   rotate: false
-  xy: 810, 1227
+  xy: 1214, 634
   size: 200, 200
   orig: 200, 200
   offset: 0, 0
   index: -1
 UnitIcons/Trebuchet
   rotate: false
-  xy: 1012, 1429
+  xy: 1416, 836
   size: 200, 200
   orig: 200, 200
   offset: 0, 0
   index: -1
 UnitIcons/Warrior
   rotate: false
-  xy: 810, 1025
+  xy: 1820, 1240
   size: 200, 200
   orig: 200, 200
   offset: 0, 0
   index: -1
 UnitIcons/Worker
   rotate: false
-  xy: 1012, 1227
+  xy: 1416, 634
   size: 200, 200
   orig: 200, 200
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Accuracy_III_(Civ5)
   rotate: false
-  xy: 840, 171
+  xy: 825, 1750
   size: 20, 20
   orig: 20, 20
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Accuracy_II_(Civ5)
   rotate: false
-  xy: 940, 404
+  xy: 380, 1560
   size: 20, 20
   orig: 20, 20
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Accuracy_I_(Civ5)
   rotate: false
-  xy: 802, 143
+  xy: 1266, 228
   size: 20, 20
   orig: 20, 20
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Barrage_III_(Civ5)
   rotate: false
-  xy: 1797, 1479
+  xy: 825, 1728
   size: 20, 20
   orig: 20, 20
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Barrage_II_(Civ5)
   rotate: false
-  xy: 825, 1737
+  xy: 1288, 228
   size: 20, 20
   orig: 20, 20
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Barrage_I_(Civ5)
   rotate: false
-  xy: 428, 97
+  xy: 825, 1706
   size: 20, 20
   orig: 20, 20
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Charge_(Civ5)
   rotate: false
-  xy: 2013, 1587
+  xy: 1310, 228
   size: 20, 20
   orig: 20, 20
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Cover_II_(Civ5)
   rotate: false
-  xy: 1326, 1239
+  xy: 825, 1684
   size: 20, 20
   orig: 20, 20
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Cover_I_(Civ5)
   rotate: false
-  xy: 1196, 1091
+  xy: 1332, 228
   size: 20, 20
   orig: 20, 20
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Drill_III_(Civ5)
   rotate: false
-  xy: 862, 171
+  xy: 825, 1662
   size: 20, 20
   orig: 20, 20
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Drill_II_(Civ5)
   rotate: false
-  xy: 940, 382
+  xy: 1354, 228
   size: 20, 20
   orig: 20, 20
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Drill_I_(Civ5)
   rotate: false
-  xy: 1819, 1479
+  xy: 1376, 228
   size: 20, 20
   orig: 20, 20
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Indirect_Fire_(Civ5)
   rotate: false
-  xy: 825, 1715
+  xy: 2022, 1622
   size: 20, 20
   orig: 20, 20
   offset: 0, 0
   index: -1
 UnitPromotionIcons/March_(Civ5)
   rotate: false
-  xy: 450, 97
+  xy: 2022, 1600
   size: 20, 20
   orig: 20, 20
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Range_(Civ5)
   rotate: false
-  xy: 2013, 1565
+  xy: 2022, 1578
   size: 20, 20
   orig: 20, 20
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Scouting_III_(Civ5)
   rotate: false
-  xy: 1348, 1239
+  xy: 2022, 1556
   size: 20, 20
   orig: 20, 20
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Scouting_II_(Civ5)
   rotate: false
-  xy: 1196, 1069
+  xy: 2022, 1534
   size: 20, 20
   orig: 20, 20
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Scouting_I_(Civ5)
   rotate: false
-  xy: 884, 171
+  xy: 2022, 1512
   size: 20, 20
   orig: 20, 20
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Sentry_(Civ5)
   rotate: false
-  xy: 940, 360
+  xy: 2022, 1490
   size: 20, 20
   orig: 20, 20
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Shock_III_(Civ5)
   rotate: false
-  xy: 1841, 1479
+  xy: 2022, 1468
   size: 20, 20
   orig: 20, 20
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Shock_II_(Civ5)
   rotate: false
-  xy: 825, 1693
+  xy: 2022, 1446
   size: 20, 20
   orig: 20, 20
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Shock_I_(Civ5)
   rotate: false
-  xy: 472, 97
+  xy: 2022, 1424
   size: 20, 20
   orig: 20, 20
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Siege_(Civ5)
   rotate: false
-  xy: 2013, 1543
+  xy: 2022, 1402
   size: 20, 20
   orig: 20, 20
   offset: 0, 0
diff --git a/android/assets/game.png b/android/assets/game.png
index 974f28cc89..bb97184ae2 100644
Binary files a/android/assets/game.png and b/android/assets/game.png differ
diff --git a/core/src/com/unciv/ui/cityscreen/CityTileGroup.kt b/core/src/com/unciv/ui/cityscreen/CityTileGroup.kt
index 148282b6c6..90135ccec7 100644
--- a/core/src/com/unciv/ui/cityscreen/CityTileGroup.kt
+++ b/core/src/com/unciv/ui/cityscreen/CityTileGroup.kt
@@ -26,6 +26,8 @@ class CityTileGroup(private val city: CityInfo, tileInfo: TileInfo) : TileGroup(
         if (improvementImage != null) improvementImage!!.setColor(1f, 1f, 1f, 0.5f)
         if (resourceImage != null) resourceImage!!.setColor(1f, 1f, 1f, 0.5f)
         if (cityImage != null) cityImage!!.setColor(1f, 1f, 1f, 0.5f)
+        if (civilianUnitImage != null) civilianUnitImage!!.setColor(1f, 1f, 1f, 0.5f)
+        if (militaryUnitImage!= null) militaryUnitImage!!.setColor(1f, 1f, 1f, 0.5f)
         if (terrainFeatureImage!= null) terrainFeatureImage!!.setColor(1f, 1f, 1f, 0.5f)
         updateYieldGroup()
     }
diff --git a/core/src/com/unciv/ui/tilegroups/TileGroup.kt b/core/src/com/unciv/ui/tilegroups/TileGroup.kt
index fff08db79f..e3e5be56b5 100644
--- a/core/src/com/unciv/ui/tilegroups/TileGroup.kt
+++ b/core/src/com/unciv/ui/tilegroups/TileGroup.kt
@@ -1,6 +1,7 @@
 package com.unciv.ui.tilegroups
 
 import com.badlogic.gdx.graphics.Color
+import com.badlogic.gdx.scenes.scene2d.Actor
 import com.badlogic.gdx.scenes.scene2d.Group
 import com.badlogic.gdx.scenes.scene2d.ui.Image
 import com.badlogic.gdx.utils.Align
@@ -20,7 +21,7 @@ open class TileGroup(var tileInfo: TileInfo) : Group() {
     protected var terrainFeatureImage:Image?=null
     protected var cityImage:Image?=null
 
-    protected var resourceImage: Image? = null
+    protected var resourceImage: Actor? = null
     protected var improvementImage: Image? =null
     var populationImage: Image? = null
     private val roadImages = HashMap<TileInfo, RoadImage>()
@@ -301,17 +302,14 @@ open class TileGroup(var tileInfo: TileInfo) : Group() {
         }
 
         if(resourceImage==null && shouldDisplayResource) { // Need to add the resource image!
-            val fileName = "ResourceIcons/" + tileInfo.resource + "_(Civ5).png"
-                resourceImage = ImageGetter.getImage(fileName)
-                resourceImage!!.setSize(20f, 20f)
+            resourceImage = ImageGetter.getResourceImage(tileInfo.resource!!,20f)
             resourceImage!!.center(this)
-            resourceImage!!.x -= 22 // left
-            resourceImage!!.y += 10 // top
+            resourceImage!!.x = resourceImage!!.x - 22 // left
+            resourceImage!!.y = resourceImage!!.y + 10 // top
             addActor(resourceImage!!)
         }
         if(resourceImage!=null){
-            if(viewable) resourceImage!!.color= Color.WHITE
-            else resourceImage!!.color= Color.WHITE.cpy().apply { a=0.7f }
+            resourceImage!!.color= Color.WHITE.cpy().apply { a=0.7f }
         }
     }
 
diff --git a/core/src/com/unciv/ui/tilegroups/WorldTileGroup.kt b/core/src/com/unciv/ui/tilegroups/WorldTileGroup.kt
index 3a9e8e4ed6..5a0fbc06b9 100644
--- a/core/src/com/unciv/ui/tilegroups/WorldTileGroup.kt
+++ b/core/src/com/unciv/ui/tilegroups/WorldTileGroup.kt
@@ -73,10 +73,10 @@ class WorldTileGroup(tileInfo: TileInfo) : TileGroup(tileInfo) {
             if (cityButton == null) {
                 cityButton = Table()
                 cityButton!!.background = ImageGetter.getDrawable("OtherIcons/civTableBackground.png")
-                cityButton!!.isTransform = true
+                cityButton!!.isTransform = true // If this is not set then the city button won't scale!
 
                 addActor(cityButton)
-                zIndex = parent.children.size // so this tile is rendered over neighboring tiles
+                toFront() // so this tile is rendered over neighboring tiles
             }
 
             val cityButtonText = city.name + " (" + city.population.population + ")"
@@ -89,7 +89,7 @@ class WorldTileGroup(tileInfo: TileInfo) : TileGroup(tileInfo) {
 
             cityButton!!.run {
                 clear()
-                if(viewable) {
+                if(viewable && city.health<city.getMaxHealth().toFloat()) {
                     val healthBarSize = 100f
                     val healthPercent = city.health / city.getMaxHealth().toFloat()
                     val healthBar = Table()
@@ -107,15 +107,15 @@ class WorldTileGroup(tileInfo: TileInfo) : TileGroup(tileInfo) {
 
                 if(city.isBeingRazed){
                     val fireImage = ImageGetter.getImage("OtherIcons/Fire.png")
-                    add(fireImage).size(20f).padLeft(5f)
+                    add(fireImage).size(20f).pad(2f).padLeft(5f)
                 }
                 if(city.isCapital()){
                     val starImage = ImageGetter.getImage("OtherIcons/Star.png").apply { color = Color.LIGHT_GRAY}
-                    add(starImage).size(20f).padLeft(5f)
+                    add(starImage).size(20f).pad(2f).padLeft(5f)
                 }
                 else if (city.civInfo.isPlayerCivilization() && city.cityStats.isConnectedToCapital(RoadStatus.Road)){
                     val connectionImage = ImageGetter.getStatIcon("CityConnection")
-                    add(connectionImage).size(20f).padLeft(5f)
+                    add(connectionImage).size(20f).pad(2f).padLeft(5f)
                 }
 
                 else{add()} // this is so the health bar is always 2 columns wide
@@ -130,5 +130,4 @@ class WorldTileGroup(tileInfo: TileInfo) : TileGroup(tileInfo) {
         }
     }
 
-
 }
diff --git a/core/src/com/unciv/ui/utils/ImageGetter.kt b/core/src/com/unciv/ui/utils/ImageGetter.kt
index 8e81694186..e855317c98 100644
--- a/core/src/com/unciv/ui/utils/ImageGetter.kt
+++ b/core/src/com/unciv/ui/utils/ImageGetter.kt
@@ -3,9 +3,13 @@ package com.unciv.ui.utils
 import com.badlogic.gdx.graphics.Color
 import com.badlogic.gdx.graphics.g2d.TextureAtlas
 import com.badlogic.gdx.graphics.g2d.TextureRegion
+import com.badlogic.gdx.scenes.scene2d.Actor
+import com.badlogic.gdx.scenes.scene2d.Group
 import com.badlogic.gdx.scenes.scene2d.ui.Image
 import com.badlogic.gdx.scenes.scene2d.utils.Drawable
 import com.badlogic.gdx.scenes.scene2d.utils.TextureRegionDrawable
+import com.unciv.models.gamebasics.GameBasics
+import com.unciv.models.gamebasics.tile.ResourceType
 
 object ImageGetter {
     const val WhiteDot = "OtherIcons/whiteDot.png"
@@ -69,4 +73,34 @@ object ImageGetter {
     fun refreshAltas() {
         atlas = TextureAtlas("game.atlas")
     }
+
+    fun getResourceImage(resourceName: String, size:Float): Actor {
+        val group= Group()
+        val resource = GameBasics.TileResources[resourceName]!!
+        val circle = getImage("OtherIcons/Circle").apply { setSize(size,size) }
+        if(resource.food>0) circle.color= Color.GREEN.cpy().lerp(Color.WHITE,0.5f)
+        else if(resource.production>0) circle.color= Color.BROWN.cpy().lerp(Color.WHITE,0.5f)
+        else if(resource.gold>0) circle.color= Color.GOLD.cpy().lerp(Color.WHITE,0.5f)
+
+        group.setSize(size,size)
+        group.addActor(circle)
+        group.addActor(getImage("ResourceIcons/${resourceName}")
+                .apply { setSize(size*0.8f,size*0.8f); center(group) })
+        if(resource.resourceType==ResourceType.Luxury){
+            val happiness = getStatIcon("Happiness")
+            happiness.setSize(size/2,size/2)
+            happiness.x = group.width-happiness.width
+//            happiness.y = group.height-happiness.height
+            group.addActor(happiness)
+        }
+        if(resource.resourceType==ResourceType.Strategic){
+            val production = getStatIcon("Production")
+            production.setSize(size/2,size/2)
+            production.x = group.width-production.width
+//            production.y = group.height-production.height
+            group.addActor(production)
+        }
+        return group
+        return getImage("ResourceIcons/${resourceName}")
+    }
 }
diff --git a/core/src/com/unciv/ui/worldscreen/WorldScreenTopBar.kt b/core/src/com/unciv/ui/worldscreen/WorldScreenTopBar.kt
index d00c0dfe27..1640489791 100644
--- a/core/src/com/unciv/ui/worldscreen/WorldScreenTopBar.kt
+++ b/core/src/com/unciv/ui/worldscreen/WorldScreenTopBar.kt
@@ -1,6 +1,7 @@
 package com.unciv.ui.worldscreen
 
 import com.badlogic.gdx.graphics.Color
+import com.badlogic.gdx.scenes.scene2d.Actor
 import com.badlogic.gdx.scenes.scene2d.Group
 import com.badlogic.gdx.scenes.scene2d.ui.Image
 import com.badlogic.gdx.scenes.scene2d.ui.Label
@@ -27,9 +28,9 @@ class WorldScreenTopBar(val screen: WorldScreen) : Table() {
     private val happinessLabel = Label("Happiness:", labelSkin)
     private val cultureLabel = Label("Culture:", labelSkin).setFontColor(colorFromRGB(210, 94, 210) )
     private val resourceLabels = HashMap<String, Label>()
-    private val resourceImages = HashMap<String, Image>()
+    private val resourceImages = HashMap<String, Actor>()
     private val happinessImage = Group()
-    // These are all to improve performance IE recude update time (was 150 ms on my phone, which is a lot!)
+    // These are all to improve performance IE reduce update time (was 150 ms on my phone, which is a lot!)
     private val malcontentColor = Color.valueOf("ef5350")
     val happinessColor = colorFromRGB(92, 194, 77)
     val malcontentGroup = ImageGetter.getStatIcon("Malcontent")
@@ -58,10 +59,9 @@ class WorldScreenTopBar(val screen: WorldScreen) : Table() {
         val revealedStrategicResources = GameBasics.TileResources.values
                 .filter { it.resourceType == ResourceType.Strategic } // && civInfo.tech.isResearched(it.revealedBy!!) }
         for (resource in revealedStrategicResources) {
-            val fileName = "ResourceIcons/${resource.name}_(Civ5).png"
-            val resourceImage = ImageGetter.getImage(fileName)
+            val resourceImage = ImageGetter.getResourceImage(resource.name,20f)
             resourceImages.put(resource.name, resourceImage)
-            resourceTable.add(resourceImage).size(20f)
+            resourceTable.add(resourceImage)
             val resourceLabel = Label("0", labelSkin)
             resourceLabels.put(resource.name, resourceLabel)
             resourceTable.add(resourceLabel)
diff --git a/desktop/src/com/unciv/game/desktop/DesktopLauncher.java b/desktop/src/com/unciv/game/desktop/DesktopLauncher.java
index 5d4e0cf2a2..41be611e49 100644
--- a/desktop/src/com/unciv/game/desktop/DesktopLauncher.java
+++ b/desktop/src/com/unciv/game/desktop/DesktopLauncher.java
@@ -2,20 +2,22 @@ package com.unciv.game.desktop;
 
 import com.badlogic.gdx.backends.lwjgl.LwjglApplication;
 import com.badlogic.gdx.backends.lwjgl.LwjglApplicationConfiguration;
+import com.badlogic.gdx.graphics.Texture;
+import com.badlogic.gdx.tools.texturepacker.TexturePacker;
 import com.unciv.UnCivGame;
 
 class DesktopLauncher {
 	public static void main (String[] arg) {
-//
-//		TexturePacker.Settings settings = new TexturePacker.Settings();
-//		settings.maxWidth = 2048;
-//		settings.maxHeight = 2048;
-//		settings.combineSubdirectories=true;
-//
-//		// This is so they don't look all pixelated
-//		settings.filterMag = Texture.TextureFilter.MipMapLinearLinear;
-//		settings.filterMin =  Texture.TextureFilter.MipMapLinearLinear;
-//		TexturePacker.process(settings, "../images", ".", "game");
+
+		TexturePacker.Settings settings = new TexturePacker.Settings();
+		settings.maxWidth = 2048;
+		settings.maxHeight = 2048;
+		settings.combineSubdirectories=true;
+
+		// This is so they don't look all pixelated
+		settings.filterMag = Texture.TextureFilter.MipMapLinearLinear;
+		settings.filterMin =  Texture.TextureFilter.MipMapLinearLinear;
+		TexturePacker.process(settings, "../images", ".", "game");
 
 		LwjglApplicationConfiguration config = new LwjglApplicationConfiguration();
 		new LwjglApplication(new UnCivGame(), config);