diff --git a/android/Images/TileSets/FantasyHex/Tiles/Hill+Forest.png b/android/Images/TileSets/FantasyHex/Tiles/Hill+Forest.png
index 03e53eda77..3d53e7c4b7 100644
Binary files a/android/Images/TileSets/FantasyHex/Tiles/Hill+Forest.png and b/android/Images/TileSets/FantasyHex/Tiles/Hill+Forest.png differ
diff --git a/android/Images/TileSets/FantasyHex/Tiles/Hill.png b/android/Images/TileSets/FantasyHex/Tiles/Hill.png
index 162e53bdd8..1d36522e2e 100644
Binary files a/android/Images/TileSets/FantasyHex/Tiles/Hill.png and b/android/Images/TileSets/FantasyHex/Tiles/Hill.png differ
diff --git a/android/Images/TileSets/FantasyHex/Tiles/River-Bottom.png b/android/Images/TileSets/FantasyHex/Tiles/River-Bottom.png
index a462deb2b5..bf6f6c7833 100644
Binary files a/android/Images/TileSets/FantasyHex/Tiles/River-Bottom.png and b/android/Images/TileSets/FantasyHex/Tiles/River-Bottom.png differ
diff --git a/android/Images/TileSets/FantasyHex/Tiles/River-BottomLeft.png b/android/Images/TileSets/FantasyHex/Tiles/River-BottomLeft.png
index 44169ebfa6..bf87409263 100644
Binary files a/android/Images/TileSets/FantasyHex/Tiles/River-BottomLeft.png and b/android/Images/TileSets/FantasyHex/Tiles/River-BottomLeft.png differ
diff --git a/android/Images/TileSets/FantasyHex/Tiles/River-BottomRight.png b/android/Images/TileSets/FantasyHex/Tiles/River-BottomRight.png
index 86ad82723a..0cc3d17645 100644
Binary files a/android/Images/TileSets/FantasyHex/Tiles/River-BottomRight.png and b/android/Images/TileSets/FantasyHex/Tiles/River-BottomRight.png differ
diff --git a/android/Images/TileSets/FantasyHex/Tiles/River-Top.png b/android/Images/TileSets/FantasyHex/Tiles/River-Top.png
deleted file mode 100644
index dcb825fd1b..0000000000
Binary files a/android/Images/TileSets/FantasyHex/Tiles/River-Top.png and /dev/null differ
diff --git a/android/Images/TileSets/FantasyHex/Tiles/River-TopLeft.png b/android/Images/TileSets/FantasyHex/Tiles/River-TopLeft.png
deleted file mode 100644
index d532870258..0000000000
Binary files a/android/Images/TileSets/FantasyHex/Tiles/River-TopLeft.png and /dev/null differ
diff --git a/android/Images/TileSets/FantasyHex/Tiles/River-TopRight.png b/android/Images/TileSets/FantasyHex/Tiles/River-TopRight.png
deleted file mode 100644
index eb3b18e0be..0000000000
Binary files a/android/Images/TileSets/FantasyHex/Tiles/River-TopRight.png and /dev/null differ
diff --git a/android/assets/game.atlas b/android/assets/game.atlas
index b83204e842..54dd0787c4 100644
--- a/android/assets/game.atlas
+++ b/android/assets/game.atlas
@@ -3575,14 +3575,14 @@ TileSets/FantasyHex/Tiles/Hill+Fallout
   index: -1
 TileSets/FantasyHex/Tiles/Hill+Forest
   rotate: false
-  xy: 1212, 273
-  size: 32, 45
-  orig: 32, 45
+  xy: 1212, 290
+  size: 32, 28
+  orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Hill+Forest+Camp
   rotate: false
-  xy: 1212, 226
+  xy: 1212, 243
   size: 32, 45
   orig: 32, 45
   offset: 0, 0
@@ -3680,42 +3680,42 @@ TileSets/FantasyHex/Tiles/Landmark
   index: -1
 TileSets/FantasyHex/Tiles/Manufactory
   rotate: false
-  xy: 1502, 755
+  xy: 992, 101
   size: 32, 39
   orig: 32, 39
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Marble
   rotate: false
-  xy: 1570, 772
+  xy: 992, 41
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Mine
   rotate: false
-  xy: 1672, 732
+  xy: 1502, 766
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Moai
   rotate: false
-  xy: 1570, 741
+  xy: 1570, 771
   size: 32, 29
   orig: 32, 29
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Mount Fuji
   rotate: false
-  xy: 1638, 710
+  xy: 1638, 738
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Mountain
   rotate: false
-  xy: 1672, 694
+  xy: 1672, 726
   size: 32, 36
   orig: 32, 36
   offset: 0, 0
@@ -3750,420 +3750,399 @@ TileSets/FantasyHex/Tiles/Oil
   index: -1
 TileSets/FantasyHex/Tiles/Oil well
   rotate: false
-  xy: 1486, 725
+  xy: 1486, 736
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Old Faithful
   rotate: false
-  xy: 1486, 691
+  xy: 1486, 702
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Pasture
   rotate: false
-  xy: 1520, 712
+  xy: 1298, 596
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Pasture+Cattle
   rotate: false
-  xy: 1486, 657
+  xy: 1298, 532
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Pasture+Horses
   rotate: false
-  xy: 1520, 648
+  xy: 1298, 498
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Pasture+Sheep
   rotate: false
-  xy: 1554, 707
+  xy: 1332, 592
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Pasture2
   rotate: false
-  xy: 1520, 682
+  xy: 1298, 566
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Pearls
   rotate: false
-  xy: 1554, 677
+  xy: 1332, 562
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Plains
   rotate: false
-  xy: 1588, 673
+  xy: 1298, 468
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Plains+City
   rotate: false
-  xy: 1588, 636
+  xy: 1332, 465
   size: 32, 35
   orig: 32, 35
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Plains+Fallout
   rotate: false
-  xy: 1622, 680
+  xy: 1452, 678
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Plains+Farm
   rotate: false
-  xy: 1622, 650
+  xy: 1450, 648
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Plains+Forest
   rotate: false
-  xy: 1656, 659
+  xy: 1486, 667
   size: 32, 33
   orig: 32, 33
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Plains+Forest+Camp
   rotate: false
-  xy: 1690, 659
+  xy: 1520, 731
   size: 32, 33
   orig: 32, 33
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Plains+Forest+Camp+Deer
   rotate: false
-  xy: 992, 107
+  xy: 1520, 696
   size: 32, 33
   orig: 32, 33
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Plains+Forest+Camp+Furs
   rotate: false
-  xy: 992, 72
+  xy: 1520, 661
   size: 32, 33
   orig: 32, 33
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Plains+Forest+Lumber mill
   rotate: false
-  xy: 992, 37
+  xy: 1484, 632
   size: 32, 33
   orig: 32, 33
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Plains+Jungle
   rotate: false
-  xy: 992, 3
+  xy: 1518, 627
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Plains+Jungle+Trading post
   rotate: false
-  xy: 1622, 616
+  xy: 1450, 614
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Plantation
   rotate: false
-  xy: 1656, 629
+  xy: 1484, 602
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Plantation+Bananas
   rotate: false
-  xy: 1690, 629
+  xy: 1518, 597
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Plantation+Cotton
   rotate: false
-  xy: 1656, 599
+  xy: 1554, 741
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Plantation+Dyes
   rotate: false
-  xy: 1690, 599
+  xy: 1554, 711
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Plantation+Incense
   rotate: false
-  xy: 1450, 620
+  xy: 1554, 681
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Plantation+Silk
   rotate: false
-  xy: 1484, 627
+  xy: 1554, 651
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Plantation+Spices
   rotate: false
-  xy: 1518, 618
+  xy: 1552, 621
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Plantation+Sugar
   rotate: false
-  xy: 1552, 617
+  xy: 1552, 591
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Plantation+Wine
   rotate: false
-  xy: 1586, 606
+  xy: 1588, 733
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Polder
   rotate: false
-  xy: 1484, 597
+  xy: 1588, 703
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Quarry
   rotate: false
-  xy: 1518, 588
+  xy: 1588, 673
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Quarry+Marble
   rotate: false
-  xy: 1552, 587
+  xy: 1588, 643
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Quarry+Stone
   rotate: false
-  xy: 1586, 576
+  xy: 1586, 613
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/River-Bottom
   rotate: false
-  xy: 1654, 567
-  size: 32, 30
-  orig: 32, 30
+  xy: 1622, 708
+  size: 32, 28
+  orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/River-BottomLeft
   rotate: false
-  xy: 1688, 567
-  size: 32, 30
-  orig: 32, 30
+  xy: 1622, 678
+  size: 32, 28
+  orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/River-BottomRight
   rotate: false
-  xy: 1620, 554
-  size: 32, 30
-  orig: 32, 30
-  offset: 0, 0
-  index: -1
-TileSets/FantasyHex/Tiles/River-Top
-  rotate: false
-  xy: 1654, 535
-  size: 32, 30
-  orig: 32, 30
-  offset: 0, 0
-  index: -1
-TileSets/FantasyHex/Tiles/River-TopLeft
-  rotate: false
-  xy: 1688, 535
-  size: 32, 30
-  orig: 32, 30
-  offset: 0, 0
-  index: -1
-TileSets/FantasyHex/Tiles/River-TopRight
-  rotate: false
-  xy: 2004, 962
-  size: 32, 30
-  orig: 32, 30
+  xy: 1622, 648
+  size: 32, 28
+  orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Rock of Gibraltar
   rotate: false
-  xy: 2004, 928
+  xy: 1656, 692
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Sheep
   rotate: false
-  xy: 1874, 860
+  xy: 1622, 618
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Silk
   rotate: false
-  xy: 1942, 853
+  xy: 1656, 602
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Silver
   rotate: false
-  xy: 1976, 853
+  xy: 1690, 696
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Snow
   rotate: false
-  xy: 1942, 823
+  xy: 1690, 608
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Spices
   rotate: false
-  xy: 2010, 810
+  xy: 1620, 560
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Stone
   rotate: false
-  xy: 1314, 626
+  xy: 1654, 542
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Sugar
   rotate: false
-  xy: 1382, 616
+  xy: 1688, 550
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Trading post
   rotate: false
-  xy: 1552, 557
+  xy: 2010, 874
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Tundra
   rotate: false
-  xy: 1298, 596
+  xy: 1942, 853
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Tundra+City
   rotate: false
-  xy: 1298, 559
+  xy: 1976, 846
   size: 32, 35
   orig: 32, 35
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Tundra+Fallout
   rotate: false
-  xy: 1298, 529
+  xy: 2010, 844
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Tundra+Forest
   rotate: false
-  xy: 1298, 495
+  xy: 1908, 828
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Tundra+Forest+Camp
   rotate: false
-  xy: 1298, 461
+  xy: 1942, 819
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Tundra+Forest+Camp+Deer
   rotate: false
-  xy: 1332, 592
+  xy: 1976, 812
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Tundra+Forest+Camp+Furs
   rotate: false
-  xy: 1332, 558
+  xy: 2010, 810
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Tundra+Forest+Lumber mill
   rotate: false
-  xy: 1332, 524
+  xy: 1010, 207
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Uranium
   rotate: false
-  xy: 1332, 466
+  xy: 1010, 149
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Whales
   rotate: false
-  xy: 1366, 500
+  xy: 1026, 33
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Wheat
   rotate: false
-  xy: 1366, 470
+  xy: 1026, 3
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Tiles/Wine
   rotate: false
-  xy: 1400, 579
+  xy: 1706, 860
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/TopBorder
   rotate: false
-  xy: 1518, 558
+  xy: 2010, 904
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
@@ -4548,56 +4527,56 @@ TileSets/FantasyHex/Units/Legion
   index: -1
 TileSets/FantasyHex/Units/Longbowman
   rotate: false
-  xy: 1638, 772
+  xy: 1212, 213
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Longswordsman
   rotate: false
-  xy: 1672, 762
+  xy: 1638, 772
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Mandekalu Cavalry
   rotate: false
-  xy: 1468, 768
+  xy: 1672, 764
   size: 32, 26
   orig: 32, 26
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Maori Warrior
   rotate: false
-  xy: 1536, 772
+  xy: 992, 71
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Marine
   rotate: false
-  xy: 1604, 763
+  xy: 992, 11
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Mechanized Infantry
   rotate: false
-  xy: 1638, 744
+  xy: 1468, 768
   size: 32, 26
   orig: 32, 26
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Minuteman
   rotate: false
-  xy: 1536, 742
+  xy: 1536, 772
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Mohawk Warrior
   rotate: false
-  xy: 1604, 733
+  xy: 1604, 763
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
@@ -4632,154 +4611,154 @@ TileSets/FantasyHex/Units/Norwegian Ski Infantry
   index: -1
 TileSets/FantasyHex/Units/Panzer
   rotate: false
-  xy: 1452, 680
+  xy: 1296, 626
   size: 32, 26
   orig: 32, 26
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Paratrooper
   rotate: false
-  xy: 1450, 650
+  xy: 1330, 626
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Persian Immortal
   rotate: false
-  xy: 1554, 647
+  xy: 1332, 532
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Pikeman
   rotate: false
-  xy: 1588, 703
+  xy: 1332, 502
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Rifleman
   rotate: false
-  xy: 1620, 586
+  xy: 1586, 583
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Rocket Artillery
   rotate: false
-  xy: 2010, 898
+  xy: 1656, 662
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Scout
   rotate: false
-  xy: 2010, 868
+  xy: 1656, 632
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Ship of the Line
   rotate: false
-  xy: 1908, 862
+  xy: 1620, 590
   size: 32, 26
   orig: 32, 26
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Sipahi
   rotate: false
-  xy: 2010, 840
+  xy: 1690, 668
   size: 32, 26
   orig: 32, 26
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Slinger
   rotate: false
-  xy: 1908, 832
+  xy: 1690, 638
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Spearman
   rotate: false
-  xy: 1976, 823
+  xy: 1654, 572
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Submarine
   rotate: false
-  xy: 1348, 628
+  xy: 1690, 580
   size: 32, 26
   orig: 32, 26
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Swordsman
   rotate: false
-  xy: 1416, 609
+  xy: 1688, 520
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Tank
   rotate: false
-  xy: 1450, 590
+  xy: 2004, 964
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Tercio
   rotate: false
-  xy: 1484, 567
+  xy: 2004, 934
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Trebuchet
   rotate: false
-  xy: 1586, 546
+  xy: 1874, 860
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Trireme
   rotate: false
-  xy: 1620, 526
+  xy: 1908, 862
   size: 32, 26
   orig: 32, 26
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Turtle Ship
   rotate: false
-  xy: 1332, 496
+  xy: 1010, 179
   size: 32, 26
   orig: 32, 26
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/War Chariot
   rotate: false
-  xy: 1366, 586
+  xy: 1026, 119
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/War Elephant
   rotate: false
-  xy: 1366, 558
+  xy: 1026, 91
   size: 32, 26
   orig: 32, 26
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/WaterUnit
   rotate: false
-  xy: 1366, 530
+  xy: 1026, 63
   size: 32, 26
   orig: 32, 26
   offset: 0, 0
   index: -1
 TileSets/FantasyHex/Units/Work Boats
   rotate: false
-  xy: 1400, 551
+  xy: 1706, 832
   size: 32, 26
   orig: 32, 26
   offset: 0, 0
diff --git a/android/assets/game2.png b/android/assets/game2.png
index daa40a1462..ccc72d8fad 100644
Binary files a/android/assets/game2.png and b/android/assets/game2.png differ
diff --git a/core/src/com/unciv/ui/mapeditor/TileEditorOptionsTable.kt b/core/src/com/unciv/ui/mapeditor/TileEditorOptionsTable.kt
index 2e3ff8d2e8..776f56b3c5 100644
--- a/core/src/com/unciv/ui/mapeditor/TileEditorOptionsTable.kt
+++ b/core/src/com/unciv/ui/mapeditor/TileEditorOptionsTable.kt
@@ -191,7 +191,7 @@ class TileEditorOptionsTable(val mapEditorScreen: MapEditorScreen): Table(Camera
 
 
         addTerrainOptions(terrainFeaturesTable, baseTerrainTable)
-//        addRiverToggleOptions(baseTerrainTable)
+        addRiverToggleOptions(baseTerrainTable)
 
 
         val resources = getResourceActors()
@@ -261,7 +261,6 @@ class TileEditorOptionsTable(val mapEditorScreen: MapEditorScreen): Table(Camera
     private fun addTerrainOptions(terrainFeaturesTable: Table, baseTerrainTable: Table) {
         for (terrain in ruleset.terrains.values) {
             val tileInfo = TileInfo()
-            tileInfo.ruleset = mapEditorScreen.ruleset
             if (terrain.type == TerrainType.TerrainFeature) {
                 tileInfo.baseTerrain = when {
                     terrain.occursOn != null -> terrain.occursOn.first()
@@ -332,6 +331,7 @@ class TileEditorOptionsTable(val mapEditorScreen: MapEditorScreen): Table(Camera
     }
 
     private fun makeTileGroup(tileInfo: TileInfo): TileGroup {
+        tileInfo.ruleset = mapEditorScreen.ruleset
         tileInfo.setTerrainTransients()
         val group = TileGroup(tileInfo, TileSetStrings())
         group.showEntireMap = true