diff --git a/android/assets/Icons.atlas b/android/assets/Icons.atlas
index 90e972aad0..05a169d69d 100644
--- a/android/assets/Icons.atlas
+++ b/android/assets/Icons.atlas
@@ -6,154 +6,154 @@ filter: MipMapLinearLinear, Linear
 repeat: none
 CityStateIcons/Cultured
   rotate: false
-  xy: 127, 1001
+  xy: 235, 1001
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 OtherIcons/HiddenTutorialTask
   rotate: false
-  xy: 127, 1001
+  xy: 235, 1001
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 OtherIcons/Score
   rotate: false
-  xy: 127, 1001
+  xy: 235, 1001
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 CityStateIcons/Maritime
   rotate: false
-  xy: 1819, 1821
+  xy: 1015, 1698
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 CityStateIcons/Mercantile
   rotate: false
-  xy: 1015, 1698
+  xy: 1015, 1482
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 CityStateIcons/Militaristic
   rotate: false
-  xy: 1015, 1590
+  xy: 1123, 1712
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 CityStateIcons/Religious
   rotate: false
-  xy: 574, 1311
+  xy: 682, 1359
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 EmojiIcons/Automate
   rotate: false
-  xy: 436, 173
+  xy: 589, 65
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 EmojiIcons/Culture
   rotate: false
-  xy: 544, 273
+  xy: 1987, 1705
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 EmojiIcons/Death
   rotate: false
-  xy: 436, 57
+  xy: 1987, 1647
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 EmojiIcons/Faith
   rotate: false
-  xy: 602, 389
+  xy: 1987, 1589
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 EmojiIcons/Food
   rotate: false
-  xy: 602, 331
+  xy: 1987, 1531
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 EmojiIcons/Gold
   rotate: false
-  xy: 494, 173
+  xy: 652, 759
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 EmojiIcons/Great Artist
   rotate: false
-  xy: 494, 115
+  xy: 652, 701
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 EmojiIcons/Great Engineer
   rotate: false
-  xy: 494, 57
+  xy: 652, 643
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 EmojiIcons/Great General
   rotate: false
-  xy: 1987, 1763
+  xy: 652, 585
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 EmojiIcons/Great Merchant
   rotate: false
-  xy: 1987, 1705
+  xy: 652, 527
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 EmojiIcons/Great Scientist
   rotate: false
-  xy: 1987, 1647
+  xy: 652, 469
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 EmojiIcons/Happiness
   rotate: false
-  xy: 1987, 1589
+  xy: 652, 411
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 EmojiIcons/Production
   rotate: false
-  xy: 710, 695
+  xy: 1987, 1473
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 EmojiIcons/Science
   rotate: false
-  xy: 652, 521
+  xy: 883, 919
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 EmojiIcons/Turn
   rotate: false
-  xy: 652, 463
+  xy: 710, 817
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
@@ -181,280 +181,294 @@ ImprovementIcons/Barbarian encampment
   index: -1
 ImprovementIcons/Camp
   rotate: false
-  xy: 4, 401
+  xy: 1655, 1929
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ImprovementIcons/Cancel improvement order
   rotate: false
-  xy: 1655, 1929
+  xy: 4, 293
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 OtherIcons/Stop
   rotate: false
-  xy: 1655, 1929
+  xy: 4, 293
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ImprovementIcons/Citadel
   rotate: false
-  xy: 4, 185
+  xy: 1871, 1929
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ImprovementIcons/City center
   rotate: false
-  xy: 208, 1433
+  xy: 142, 1325
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ImprovementIcons/City ruins
   rotate: false
-  xy: 142, 1325
+  xy: 475, 1665
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ImprovementIcons/Customs house
   rotate: false
-  xy: 235, 1001
+  xy: 112, 893
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ImprovementIcons/Farm
   rotate: false
-  xy: 220, 353
+  xy: 220, 245
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ImprovementIcons/Fishing Boats
   rotate: false
-  xy: 220, 245
+  xy: 112, 29
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ImprovementIcons/Fort
   rotate: false
-  xy: 112, 29
+  xy: 847, 1791
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ImprovementIcons/Holy site
   rotate: false
-  xy: 691, 1683
+  xy: 799, 1683
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ImprovementIcons/Landmark
   rotate: false
-  xy: 907, 1575
+  xy: 955, 1806
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ImprovementIcons/Lumber mill
   rotate: false
-  xy: 1279, 1821
+  xy: 1495, 1821
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ImprovementIcons/Manufactory
   rotate: false
-  xy: 1495, 1821
+  xy: 1711, 1821
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ImprovementIcons/Mine
   rotate: false
-  xy: 1015, 1482
+  xy: 1123, 1604
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ImprovementIcons/Moai
   rotate: false
-  xy: 1123, 1712
+  xy: 1123, 1496
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ImprovementIcons/Offshore Platform
   rotate: false
-  xy: 1339, 1605
+  xy: 1339, 1497
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ImprovementIcons/Oil well
   rotate: false
-  xy: 1339, 1497
+  xy: 1555, 1713
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ImprovementIcons/Pasture
   rotate: false
-  xy: 1555, 1713
+  xy: 1555, 1605
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ImprovementIcons/Plantation
   rotate: false
-  xy: 1663, 1497
+  xy: 1879, 1713
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ImprovementIcons/Polder
   rotate: false
-  xy: 1771, 1605
+  xy: 1771, 1497
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ImprovementIcons/Quarry
   rotate: false
-  xy: 532, 1419
+  xy: 358, 1233
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ImprovementIcons/Railroad
   rotate: false
-  xy: 466, 1203
+  xy: 574, 1203
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ImprovementIcons/Remove Fallout
   rotate: false
-  xy: 682, 1359
+  xy: 790, 1359
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ImprovementIcons/Remove Forest
   rotate: false
-  xy: 682, 1251
+  xy: 790, 1251
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ImprovementIcons/Remove Jungle
   rotate: false
-  xy: 682, 1251
+  xy: 790, 1251
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ImprovementIcons/Remove Marsh
   rotate: false
-  xy: 790, 1252
+  xy: 898, 1252
   size: 100, 99
   orig: 100, 99
   offset: 0, 0
   index: -1
 ImprovementIcons/Remove Railroad
   rotate: false
-  xy: 898, 1359
+  xy: 682, 1143
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ImprovementIcons/Remove Road
   rotate: false
-  xy: 898, 1251
+  xy: 790, 1143
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ImprovementIcons/Repair
   rotate: false
-  xy: 682, 1143
+  xy: 898, 1144
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ImprovementIcons/Road
   rotate: false
-  xy: 358, 1125
+  xy: 466, 1095
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ImprovementIcons/Terrace farm
   rotate: false
-  xy: 559, 879
+  xy: 544, 771
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ImprovementIcons/Trading post
   rotate: false
-  xy: 436, 771
+  xy: 544, 663
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+NotificationIcons/Bobot
+  rotate: false
+  xy: 1547, 1929
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+NotificationIcons/DollarSign
+  rotate: false
+  xy: 112, 569
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 NotificationIcons/EnhanceReligion
   rotate: false
-  xy: 220, 569
+  xy: 220, 461
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 NotificationIcons/FoundPantheon
   rotate: false
-  xy: 220, 569
+  xy: 220, 461
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 NotificationIcons/FoundReligion
   rotate: false
-  xy: 220, 569
+  xy: 220, 461
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 NotificationIcons/ReformReligion
   rotate: false
-  xy: 220, 569
+  xy: 220, 461
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 StatIcons/Faith
   rotate: false
-  xy: 220, 569
+  xy: 220, 461
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 NotificationIcons/PickConstruction
   rotate: false
-  xy: 1555, 1497
+  xy: 1771, 1713
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 StatIcons/Production
   rotate: false
-  xy: 1555, 1497
+  xy: 1771, 1713
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
@@ -468,14 +482,42 @@ NotificationIcons/PickPolicy
   index: -1
 NotificationIcons/PickTech
   rotate: false
-  xy: 1663, 1605
+  xy: 1663, 1497
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 StatIcons/Science
   rotate: false
-  xy: 1663, 1605
+  xy: 1663, 1497
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+NotificationIcons/RobotArm
+  rotate: false
+  xy: 436, 28
+  size: 87, 87
+  orig: 87, 87
+  offset: 0, 0
+  index: -1
+NotificationIcons/RobotHeadRect
+  rotate: false
+  xy: 574, 1095
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+NotificationIcons/RobotHeadSquare
+  rotate: false
+  xy: 451, 987
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+NotificationIcons/ServerRack
+  rotate: false
+  xy: 343, 909
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
@@ -496,35 +538,35 @@ OtherIcons/Aircraft
   index: -1
 OtherIcons/ArrowRight
   rotate: false
-  xy: 544, 389
+  xy: 531, 65
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 NotificationIcons/MoveAutomatedUnits
   rotate: false
-  xy: 544, 389
+  xy: 531, 65
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 NotificationIcons/NextUnit
   rotate: false
-  xy: 544, 389
+  xy: 531, 65
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 StatIcons/Movement
   rotate: false
-  xy: 544, 389
+  xy: 531, 65
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 OtherIcons/BackArrow
   rotate: false
-  xy: 544, 331
+  xy: 667, 875
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
@@ -566,14 +608,14 @@ OtherIcons/Capital
   index: -1
 OtherIcons/Checkmark
   rotate: false
-  xy: 1763, 1929
+  xy: 4, 185
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 NotificationIcons/NextTurn
   rotate: false
-  xy: 1763, 1929
+  xy: 4, 185
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
@@ -587,77 +629,77 @@ OtherIcons/Circle
   index: -1
 OtherIcons/Cities
   rotate: false
-  xy: 1871, 1929
+  xy: 4, 77
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 OtherIcons/CityState
   rotate: false
-  xy: 436, 115
+  xy: 1987, 1763
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 OtherIcons/CityStatus
   rotate: false
-  xy: 475, 1557
+  xy: 250, 1325
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 OtherIcons/Close
   rotate: false
-  xy: 250, 1325
+  xy: 316, 1479
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 OtherIcons/CrosshairB
   rotate: false
-  xy: 127, 1109
+  xy: 235, 1109
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 OtherIcons/Diplomacy
   rotate: false
-  xy: 112, 785
+  xy: 220, 893
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 OtherIcons/DiplomacyW
   rotate: false
-  xy: 220, 893
+  xy: 112, 677
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 OtherIcons/DisbandUnit
   rotate: false
-  xy: 112, 677
+  xy: 220, 785
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 OtherIcons/Espionage
   rotate: false
-  xy: 112, 353
+  xy: 112, 245
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 NotificationIcons/MoveSpies
   rotate: false
-  xy: 112, 353
+  xy: 112, 245
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 OtherIcons/Spy_White
   rotate: false
-  xy: 112, 353
+  xy: 112, 245
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
@@ -671,7 +713,7 @@ OtherIcons/EspionageTutorial
   index: -1
 OtherIcons/ExclamationMark
   rotate: false
-  xy: 220, 461
+  xy: 220, 353
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
@@ -685,7 +727,7 @@ OtherIcons/Fire
   index: -1
 OtherIcons/ForwardArrow
   rotate: false
-  xy: 602, 273
+  xy: 652, 817
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
@@ -706,168 +748,168 @@ OtherIcons/HexagonOutline
   index: -1
 OtherIcons/Improvements
   rotate: false
-  xy: 1987, 1531
+  xy: 652, 353
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 OtherIcons/Keyboard
   rotate: false
-  xy: 907, 1683
+  xy: 907, 1467
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 OtherIcons/Link
   rotate: false
-  xy: 907, 1467
+  xy: 1063, 1820
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 OtherIcons/Load
   rotate: false
-  xy: 955, 1806
+  xy: 1171, 1821
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 OtherIcons/Loading
   rotate: false
-  xy: 1063, 1820
+  xy: 1279, 1821
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 NotificationIcons/Loading
   rotate: false
-  xy: 1063, 1820
+  xy: 1279, 1821
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 NotificationIcons/Working
   rotate: false
-  xy: 1063, 1820
+  xy: 1279, 1821
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 OtherIcons/LockSmall
   rotate: false
-  xy: 725, 869
+  xy: 652, 237
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 OtherIcons/MapEditor
   rotate: false
-  xy: 1603, 1821
+  xy: 1819, 1821
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 OtherIcons/MenuIcon
   rotate: false
-  xy: 1927, 1821
+  xy: 1015, 1590
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 OtherIcons/Mods
   rotate: false
-  xy: 1123, 1604
+  xy: 1231, 1713
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 OtherIcons/Multiplayer
   rotate: false
-  xy: 1123, 1496
+  xy: 1231, 1605
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 OtherIcons/NationSwap
   rotate: false
-  xy: 1231, 1713
+  xy: 1339, 1713
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 OtherIcons/Nations
   rotate: false
-  xy: 710, 753
+  xy: 589, 7
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 OtherIcons/New
   rotate: false
-  xy: 1231, 1605
+  xy: 1231, 1497
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 OtherIcons/Notifications
   rotate: false
-  xy: 1231, 1497
+  xy: 1447, 1713
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 OtherIcons/Options
   rotate: false
-  xy: 1447, 1605
+  xy: 1447, 1497
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 OtherIcons/Pause
   rotate: false
-  xy: 652, 637
+  xy: 647, 5
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 OtherIcons/Pencil
   rotate: false
-  xy: 1555, 1605
+  xy: 1555, 1497
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 OtherIcons/Pentagon
   rotate: false
-  xy: 1663, 1713
+  xy: 1663, 1605
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 OtherIcons/Pillage
   rotate: false
-  xy: 1771, 1713
+  xy: 1771, 1605
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 OtherIcons/Policies
   rotate: false
-  xy: 1879, 1713
+  xy: 1879, 1605
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 OtherIcons/Politics
   rotate: false
-  xy: 1771, 1497
+  xy: 1879, 1497
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 NotificationIcons/WorldCongressVote
   rotate: false
-  xy: 1771, 1497
+  xy: 1879, 1497
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
@@ -881,7 +923,7 @@ OtherIcons/Politics-diagram-bg
   index: -1
 OtherIcons/Present
   rotate: false
-  xy: 424, 1449
+  xy: 358, 1341
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
@@ -895,126 +937,126 @@ OtherIcons/Puppet
   index: -1
 OtherIcons/Quest
   rotate: false
-  xy: 358, 1341
+  xy: 466, 1311
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 OtherIcons/Question
   rotate: false
-  xy: 358, 1233
+  xy: 466, 1203
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 OtherIcons/Quickstart
   rotate: false
-  xy: 466, 1311
+  xy: 574, 1311
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 OtherIcons/Remove Heresy
   rotate: false
-  xy: 790, 1359
+  xy: 898, 1359
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 OtherIcons/Resources
   rotate: false
-  xy: 790, 1144
+  xy: 358, 1125
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 OtherIcons/Resume
   rotate: false
-  xy: 898, 1143
+  xy: 343, 1017
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 OtherIcons/Undo
   rotate: false
-  xy: 898, 1143
+  xy: 343, 1017
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 OtherIcons/Scenarios
   rotate: false
-  xy: 466, 1095
+  xy: 682, 1035
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 OtherIcons/Search
   rotate: false
-  xy: 574, 1095
+  xy: 790, 1035
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 OtherIcons/SecretOptions
   rotate: false
-  xy: 451, 987
+  xy: 898, 1036
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 OtherIcons/Settings
   rotate: false
-  xy: 559, 987
+  xy: 328, 801
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 OtherIcons/Shield
   rotate: false
-  xy: 790, 1036
+  xy: 328, 585
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 OtherIcons/Sleep
   rotate: false
-  xy: 328, 801
+  xy: 328, 261
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 OtherIcons/Speaker
   rotate: false
-  xy: 328, 693
+  xy: 328, 153
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 OtherIcons/Spy
   rotate: false
-  xy: 328, 369
+  xy: 559, 879
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 OtherIcons/Star
   rotate: false
-  xy: 328, 267
+  xy: 667, 933
   size: 100, 94
   orig: 100, 94
   offset: 0, 0
   index: -1
 OtherIcons/Swap
   rotate: false
-  xy: 451, 879
+  xy: 436, 663
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 OtherIcons/Timer
   rotate: false
-  xy: 667, 927
+  xy: 436, 555
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
@@ -1028,14 +1070,14 @@ OtherIcons/Triangle
   index: -1
 OtherIcons/Turn right
   rotate: false
-  xy: 544, 771
+  xy: 544, 555
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 OtherIcons/Tyrannosaurus
   rotate: false
-  xy: 436, 555
+  xy: 436, 339
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
@@ -1049,14 +1091,14 @@ OtherIcons/WLTKD
   index: -1
 OtherIcons/Wait
   rotate: false
-  xy: 436, 447
+  xy: 436, 231
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 OtherIcons/Wonders
   rotate: false
-  xy: 436, 231
+  xy: 544, 123
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
@@ -1084,231 +1126,231 @@ ResourceIcons/Bananas
   index: -1
 ResourceIcons/Cattle
   rotate: false
-  xy: 4, 293
+  xy: 1763, 1929
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Citrus
   rotate: false
-  xy: 4, 77
+  xy: 208, 1433
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Coal
   rotate: false
-  xy: 316, 1479
+  xy: 739, 1791
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Copper
   rotate: false
-  xy: 739, 1791
+  xy: 142, 1217
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Cotton
   rotate: false
-  xy: 142, 1217
+  xy: 250, 1217
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Crab
   rotate: false
-  xy: 250, 1217
+  xy: 127, 1109
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Deer
   rotate: false
-  xy: 112, 893
+  xy: 112, 785
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Dyes
   rotate: false
-  xy: 112, 461
+  xy: 112, 353
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Fish
   rotate: false
-  xy: 112, 137
+  xy: 220, 137
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Furs
   rotate: false
-  xy: 220, 29
+  xy: 583, 1743
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Gems
   rotate: false
-  xy: 847, 1791
+  xy: 583, 1635
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Gold Ore
   rotate: false
-  xy: 583, 1635
+  xy: 691, 1683
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Horses
   rotate: false
-  xy: 691, 1575
+  xy: 799, 1575
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Incense
   rotate: false
-  xy: 799, 1683
+  xy: 691, 1467
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Iron
   rotate: false
-  xy: 799, 1575
+  xy: 799, 1467
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Ivory
   rotate: false
-  xy: 691, 1467
+  xy: 907, 1683
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Jewelry
   rotate: false
-  xy: 799, 1467
+  xy: 907, 1575
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Marble
   rotate: false
-  xy: 1711, 1821
+  xy: 1927, 1821
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Oil
   rotate: false
-  xy: 1447, 1713
+  xy: 1447, 1605
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Pearls
   rotate: false
-  xy: 1447, 1497
+  xy: 1663, 1713
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Porcelain
   rotate: false
-  xy: 1879, 1497
+  xy: 532, 1419
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Salt
   rotate: false
-  xy: 343, 1017
+  xy: 559, 987
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Sheep
   rotate: false
-  xy: 682, 1035
+  xy: 328, 693
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Silk
   rotate: false
-  xy: 898, 1035
+  xy: 328, 477
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Silver
   rotate: false
-  xy: 343, 909
+  xy: 328, 369
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Spices
   rotate: false
-  xy: 328, 477
+  xy: 451, 879
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Stone
   rotate: false
-  xy: 328, 159
+  xy: 775, 927
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Sugar
   rotate: false
-  xy: 328, 51
+  xy: 436, 771
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Truffles
   rotate: false
-  xy: 436, 663
+  xy: 436, 447
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Uranium
   rotate: false
-  xy: 544, 663
+  xy: 544, 447
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Whales
   rotate: false
-  xy: 544, 555
+  xy: 544, 339
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Wheat
   rotate: false
-  xy: 436, 339
+  xy: 436, 123
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Wine
   rotate: false
-  xy: 544, 447
+  xy: 544, 231
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
@@ -1329,77 +1371,77 @@ StatIcons/CityConnection
   index: -1
 StatIcons/Culture
   rotate: false
-  xy: 235, 1109
+  xy: 127, 1001
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 StatIcons/Food
   rotate: false
-  xy: 220, 137
+  xy: 220, 29
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 StatIcons/Gold
   rotate: false
-  xy: 583, 1743
+  xy: 583, 1527
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 StatIcons/Happiness
   rotate: false
-  xy: 583, 1527
+  xy: 691, 1575
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 StatIcons/InterceptRange
   rotate: false
-  xy: 667, 869
+  xy: 652, 295
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 StatIcons/Malcontent
   rotate: false
-  xy: 1387, 1821
+  xy: 1603, 1821
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 StatIcons/Population
   rotate: false
-  xy: 1879, 1605
+  xy: 424, 1449
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 TileIcons/Worked
   rotate: false
-  xy: 1879, 1605
+  xy: 424, 1449
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 StatIcons/Range
   rotate: false
-  xy: 652, 579
+  xy: 883, 977
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 StatIcons/RangedStrength
   rotate: false
-  xy: 710, 637
+  xy: 941, 978
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 StatIcons/ReligiousStrength
   rotate: false
-  xy: 574, 1203
+  xy: 682, 1251
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
@@ -1413,14 +1455,14 @@ StatIcons/Resistance
   index: -1
 StatIcons/Specialist
   rotate: false
-  xy: 328, 585
+  xy: 328, 45
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 StatIcons/Strength
   rotate: false
-  xy: 710, 579
+  xy: 941, 920
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
@@ -1434,91 +1476,91 @@ TileIcons/Blockaded
   index: -1
 TileIcons/Buy
   rotate: false
-  xy: 1547, 1929
+  xy: 4, 401
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 TileIcons/CityCenter
   rotate: false
-  xy: 475, 1665
+  xy: 475, 1557
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 TileIcons/Locked
   rotate: false
-  xy: 1171, 1821
+  xy: 1387, 1821
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 TileIcons/MapOverlayToggleMovement
   rotate: false
-  xy: 652, 811
+  xy: 652, 179
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 TileIcons/MapOverlayToggleResources
   rotate: false
-  xy: 652, 753
+  xy: 652, 121
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 TileIcons/MapOverlayToggleWorkedTiles
   rotate: false
-  xy: 710, 811
+  xy: 647, 63
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 TileIcons/MapOverlayToggleYields
   rotate: false
-  xy: 652, 695
+  xy: 531, 7
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 TileIcons/NotWorked
   rotate: false
-  xy: 1339, 1713
+  xy: 1339, 1605
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 UniqueIcons/Fallback
   rotate: false
-  xy: 112, 245
+  xy: 112, 137
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 UnitTypeIcons/DomainAir
   rotate: false
-  xy: 220, 785
+  xy: 220, 677
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 UnitTypeIcons/DomainLand
   rotate: false
-  xy: 112, 569
+  xy: 112, 461
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 OtherIcons/Terrains
   rotate: false
-  xy: 112, 569
+  xy: 112, 461
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 UnitTypeIcons/DomainWater
   rotate: false
-  xy: 220, 677
+  xy: 220, 569
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
diff --git a/android/assets/Icons.png b/android/assets/Icons.png
index 7d88ba5cd6..8a01cac1a8 100644
Binary files a/android/assets/Icons.png and b/android/assets/Icons.png differ
diff --git a/core/src/com/unciv/logic/multiplayer/Multiplayer.kt b/core/src/com/unciv/logic/multiplayer/Multiplayer.kt
index b40cf545f6..9c27290432 100644
--- a/core/src/com/unciv/logic/multiplayer/Multiplayer.kt
+++ b/core/src/com/unciv/logic/multiplayer/Multiplayer.kt
@@ -303,7 +303,7 @@ suspend fun <T> throttle(
     lastSuccessfulExecution: AtomicReference<Instant?>,
     throttleInterval: Duration,
     onNoExecution: () -> T,
-    onFailed: (Exception) -> T = { throw it },
+    onFailed: (Throwable) -> T = { throw it },
     action: suspend () -> T
 ): T {
     val lastExecution = lastSuccessfulExecution.get()
@@ -323,7 +323,7 @@ suspend fun <T> throttle(
 suspend fun <T> attemptAction(
     lastSuccessfulExecution: AtomicReference<Instant?>,
     onNoExecution: () -> T,
-    onFailed: (Exception) -> T = { throw it },
+    onFailed: (Throwable) -> T = { throw it },
     action: suspend () -> T
 ): T {
     val lastExecution = lastSuccessfulExecution.get()
@@ -331,7 +331,7 @@ suspend fun <T> attemptAction(
     return if (lastSuccessfulExecution.compareAndSet(lastExecution, now)) {
         try {
             action()
-        } catch (e: Exception) {
+        } catch (e: Throwable) {
             lastSuccessfulExecution.compareAndSet(now, lastExecution)
             onFailed(e)
         }
diff --git a/core/src/com/unciv/logic/multiplayer/MultiplayerGame.kt b/core/src/com/unciv/logic/multiplayer/MultiplayerGame.kt
index 83dff49620..dd775c9b34 100644
--- a/core/src/com/unciv/logic/multiplayer/MultiplayerGame.kt
+++ b/core/src/com/unciv/logic/multiplayer/MultiplayerGame.kt
@@ -41,13 +41,13 @@ class MultiplayerGame(
         }
     }
     val name = fileHandle.name()
-    var error: Exception? = null
+    var error: Throwable? = null
 
     init {
         if (preview == null) {
             try {
                 loadPreviewFromFile()
-            } catch (e: Exception) {
+            } catch (e: Throwable) {
                 error = e
             }
         }
@@ -69,9 +69,9 @@ class MultiplayerGame(
      */
     suspend fun requestUpdate(forceUpdate: Boolean = false) = coroutineScope {
         val onUnchanged = { GameUpdateResult(UNCHANGED, preview!!) }
-        val onError = { e: Exception ->
-            error = e
-            GameUpdateResult(e)
+        val onError = { t: Throwable ->
+            error = t
+            GameUpdateResult(t)
         }
         debug("Starting multiplayer game update for %s with id %s", name, preview?.gameId)
         launchOnGLThread {
@@ -145,10 +145,10 @@ class MultiplayerGame(
 private class GameUpdateResult private constructor(
     val type: Type,
     val status: GameInfoPreview?,
-    val error: Exception?
+    val error: Throwable?
 ) {
     constructor(type: Type, status: GameInfoPreview) : this(type, status, null)
-    constructor(error: Exception) : this(FAILURE, null, error)
+    constructor(error: Throwable) : this(FAILURE, null, error)
 
     enum class Type { CHANGED, UNCHANGED, FAILURE }
 }
diff --git a/core/src/com/unciv/logic/multiplayer/OnlineMultiplayerEvents.kt b/core/src/com/unciv/logic/multiplayer/OnlineMultiplayerEvents.kt
index 0ad0c62ba3..b54db00188 100644
--- a/core/src/com/unciv/logic/multiplayer/OnlineMultiplayerEvents.kt
+++ b/core/src/com/unciv/logic/multiplayer/OnlineMultiplayerEvents.kt
@@ -25,7 +25,7 @@ class MultiplayerGameUpdated(
  */
 class MultiplayerGameUpdateFailed(
     override val name: String,
-    val error: Exception
+    val error: Throwable
 ) : MultiplayerGameUpdateEnded
 /**
  * Gets sent when a game updated successfully, but nothing changed
diff --git a/core/src/com/unciv/ui/screens/multiplayerscreens/GameList.kt b/core/src/com/unciv/ui/screens/multiplayerscreens/GameList.kt
index 3b2a69013f..3335bd8d34 100644
--- a/core/src/com/unciv/ui/screens/multiplayerscreens/GameList.kt
+++ b/core/src/com/unciv/ui/screens/multiplayerscreens/GameList.kt
@@ -56,7 +56,7 @@ class GameList(
 private class GameDisplay(
     multiplayerGameName: String,
     var preview: GameInfoPreview?,
-    error: Exception?,
+    error: Throwable?,
     private val onSelected: (String) -> Unit
 ) : Table(), Comparable<GameDisplay> {
     var gameName: String = multiplayerGameName