diff --git a/Credits.md b/Credits.md
index c519c86cfe..582b4aab2e 100644
--- a/Credits.md
+++ b/Credits.md
@@ -45,6 +45,7 @@ All the following are from [the Noun Project](https://thenounproject.com) licenc
 * [Cannon](https://thenounproject.com/search/?q=Cannon&i=1618747) By Orin Zuu
 * [Musket](https://thenounproject.com/search/?q=Musket&i=298302) By Cezary Lopacinski for Musketman
 * [Rapier](https://thenounproject.com/search/?q=musketeer&i=819822) By Hamish for Musketeer
+* [Ship](https://thenounproject.com/term/ship/1293899/) By Orin Zuu for Frigate
 * [Lance](https://thenounproject.com/search/?q=Lance&i=440122) By parkjisun for Lancer
 
 ### Industrial
@@ -52,6 +53,7 @@ All the following are from [the Noun Project](https://thenounproject.com) licenc
 * [Rifle](https://thenounproject.com/search/?q=Rifle&i=604291) By Chameleon Design for Rifleman
 * [Horse](https://thenounproject.com/search/?q=Horse&i=1023745) By Bakunetso Kaito for Cavalry
 * [Artillery](https://thenounproject.com/search/?q=Artillery&i=1165261) By Creative Mania
+* [Ship](https://thenounproject.com/term/ship/1594793/) By Aisyah for Ironclad
 
 ### Great People
 
@@ -162,6 +164,7 @@ All the following are from [the Noun Project](https://thenounproject.com) licenc
 * [Opera House](https://thenounproject.com/term/opera-house/446672/) By Xinh Studio
 * [Chinese traditional tower](https://thenounproject.com/term/chinese-traditional-tower/1808410/) By 1516 for Porcelain Tower
 * [Bank](https://thenounproject.com/term/bank/1882194/) By projecthayat
+* [Harbor](https://thenounproject.com/term/harbor/225583/) By Rflor for Seaport
 
 ### Industrial Era
 
@@ -308,6 +311,7 @@ All the following are from [the Noun Project](https://thenounproject.com) licenc
 * [Printing Press](https://thenounproject.com/term/printing-press/11880/) By Mike Wirth
 * [Flintlock](https://thenounproject.com/term/flintlock/1122659/) By Madison Apple for Gunpowder 
 * [Fossil](https://thenounproject.com/term/fossil/168650/) By Raf Verbraeken for Archaeology
+* [Sextant](https://thenounproject.com/term/sextant/313438/) By lastspark for Navigation
 * [Architecture](https://thenounproject.com/term/architecture/795297/) By Andrew Doane
 * [Money Growth](https://thenounproject.com/search/?q=economic%20model&i=136159) By DesignNex for Economics 
 * [Metal Block](https://thenounproject.com/term/metal-bock/1518464/) By Creaticca Creative Agency for Metallurgy
diff --git a/android/Images/BuildingIcons/Seaport.png b/android/Images/BuildingIcons/Seaport.png
new file mode 100644
index 0000000000..59d3d382d0
Binary files /dev/null and b/android/Images/BuildingIcons/Seaport.png differ
diff --git a/android/Images/TechIcons/Navigation.png b/android/Images/TechIcons/Navigation.png
new file mode 100644
index 0000000000..a5fbbeb8a7
Binary files /dev/null and b/android/Images/TechIcons/Navigation.png differ
diff --git a/android/Images/UnitIcons/Frigate.png b/android/Images/UnitIcons/Frigate.png
new file mode 100644
index 0000000000..1e4860bcad
Binary files /dev/null and b/android/Images/UnitIcons/Frigate.png differ
diff --git a/android/assets/game.atlas b/android/assets/game.atlas
index 5f3bb1d412..f0d0e5ff65 100644
--- a/android/assets/game.atlas
+++ b/android/assets/game.atlas
@@ -139,371 +139,378 @@ BuildingIcons/Forge
   index: -1
 BuildingIcons/Granary
   rotate: false
-  xy: 408, 673
+  xy: 408, 571
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 BuildingIcons/Hagia Sophia
   rotate: false
-  xy: 510, 877
+  xy: 510, 775
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 BuildingIcons/Hanging Gardens
   rotate: false
-  xy: 510, 775
+  xy: 510, 673
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 BuildingIcons/Harbor
   rotate: false
-  xy: 510, 673
+  xy: 510, 571
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 BuildingIcons/Hermitage
   rotate: false
-  xy: 510, 571
+  xy: 510, 469
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 BuildingIcons/Hospital
   rotate: false
-  xy: 510, 265
+  xy: 306, 237
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 BuildingIcons/Hydro Plant
   rotate: false
-  xy: 306, 237
+  xy: 286, 135
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 BuildingIcons/Ironworks
   rotate: false
-  xy: 1892, 1493
+  xy: 1892, 1391
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 BuildingIcons/Library
   rotate: false
-  xy: 551, 61
+  xy: 653, 61
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 BuildingIcons/Lighthouse
   rotate: false
-  xy: 653, 61
+  xy: 566, 1319
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 BuildingIcons/Machu Pichu
   rotate: false
-  xy: 974, 1319
+  xy: 1076, 1319
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 BuildingIcons/Market
   rotate: false
-  xy: 1280, 1319
+  xy: 1382, 1319
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 BuildingIcons/Military Academy
   rotate: false
-  xy: 612, 1115
+  xy: 714, 1217
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 BuildingIcons/Mint
   rotate: false
-  xy: 714, 1115
+  xy: 612, 911
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 BuildingIcons/Monastery
   rotate: false
-  xy: 612, 911
+  xy: 918, 1217
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 BuildingIcons/Monument
   rotate: false
-  xy: 918, 1217
+  xy: 816, 1115
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 BuildingIcons/Museum
   rotate: false
-  xy: 714, 1013
+  xy: 612, 809
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 BuildingIcons/National College
   rotate: false
-  xy: 918, 1115
+  xy: 816, 1013
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 BuildingIcons/Notre Dame
   rotate: false
-  xy: 816, 1013
+  xy: 612, 707
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 BuildingIcons/Nuclear Plant
   rotate: false
-  xy: 612, 707
+  xy: 1020, 1115
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 BuildingIcons/Observatory
   rotate: false
-  xy: 1122, 1217
+  xy: 918, 1013
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 BuildingIcons/Opera House
   rotate: false
-  xy: 816, 911
+  xy: 612, 605
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 BuildingIcons/Oxford University
   rotate: false
-  xy: 612, 605
+  xy: 1122, 1115
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 BuildingIcons/Palace
   rotate: false
-  xy: 1224, 1217
+  xy: 1020, 1013
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 BuildingIcons/Paper Maker
   rotate: false
-  xy: 1122, 1115
+  xy: 918, 911
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 BuildingIcons/Porcelain Tower
   rotate: false
-  xy: 918, 809
+  xy: 714, 605
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 BuildingIcons/Public School
   rotate: false
-  xy: 612, 401
+  xy: 1326, 1115
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 BuildingIcons/Research Lab
   rotate: false
-  xy: 1020, 809
+  xy: 816, 605
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 BuildingIcons/SS Booster
   rotate: false
-  xy: 1428, 1115
+  xy: 1224, 911
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 BuildingIcons/SS Cockpit
   rotate: false
-  xy: 1326, 1013
+  xy: 1122, 809
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 BuildingIcons/SS Engine
   rotate: false
-  xy: 1224, 911
+  xy: 1020, 707
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 BuildingIcons/SS Stasis Chamber
   rotate: false
-  xy: 1122, 809
+  xy: 918, 605
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+BuildingIcons/Seaport
+  rotate: false
+  xy: 1428, 1013
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 BuildingIcons/Sistine Chapel
   rotate: false
-  xy: 1122, 707
+  xy: 816, 401
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 BuildingIcons/Solar Plant
   rotate: false
-  xy: 918, 503
+  xy: 1632, 1115
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 BuildingIcons/Spaceship Factory
   rotate: false
-  xy: 816, 401
+  xy: 1530, 1013
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 BuildingIcons/Stable
   rotate: false
-  xy: 1530, 1013
+  xy: 1224, 707
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 BuildingIcons/Stadium
   rotate: false
-  xy: 1428, 911
+  xy: 1122, 605
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 BuildingIcons/Stock Exchange
   rotate: false
-  xy: 1122, 605
+  xy: 816, 299
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 BuildingIcons/Stone Works
   rotate: false
-  xy: 918, 401
+  xy: 1530, 911
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 BuildingIcons/Stonehenge
   rotate: false
-  xy: 816, 299
+  xy: 1428, 809
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 BuildingIcons/Sydney Opera House
   rotate: false
-  xy: 1224, 605
+  xy: 918, 299
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 BuildingIcons/Taj Mahal
   rotate: false
-  xy: 1122, 503
+  xy: 1632, 911
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 BuildingIcons/Temple
   rotate: false
-  xy: 1020, 401
+  xy: 1530, 809
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 BuildingIcons/The Great Library
   rotate: false
-  xy: 918, 299
+  xy: 1428, 707
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 BuildingIcons/The Great Lighthouse
   rotate: false
-  xy: 1632, 911
+  xy: 1326, 605
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 BuildingIcons/The Louvre
   rotate: false
-  xy: 1530, 809
+  xy: 1224, 503
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 BuildingIcons/The Oracle
   rotate: false
-  xy: 1428, 707
+  xy: 1122, 401
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 BuildingIcons/The Pyramids
   rotate: false
-  xy: 1326, 605
+  xy: 1020, 299
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 BuildingIcons/Theatre
   rotate: false
-  xy: 1122, 401
+  xy: 1530, 707
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 BuildingIcons/University
   rotate: false
-  xy: 1326, 503
+  xy: 1632, 707
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 BuildingIcons/Walls
   rotate: false
-  xy: 1122, 299
+  xy: 1428, 503
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 BuildingIcons/Windmill
   rotate: false
-  xy: 1326, 401
+  xy: 1530, 503
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 BuildingIcons/Workshop
   rotate: false
-  xy: 1428, 401
+  xy: 1530, 401
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
@@ -615,77 +622,77 @@ ImprovementIcons/Fishing Boats
   index: -1
 ImprovementIcons/Landmark
   rotate: false
-  xy: 592, 163
+  xy: 551, 61
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ImprovementIcons/Lumber mill
   rotate: false
-  xy: 770, 1319
+  xy: 872, 1319
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ImprovementIcons/Manufactory
   rotate: false
-  xy: 1076, 1319
+  xy: 1178, 1319
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ImprovementIcons/Mine
   rotate: false
-  xy: 612, 1013
+  xy: 816, 1217
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ImprovementIcons/Oil well
   rotate: false
-  xy: 918, 1013
+  xy: 714, 809
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ImprovementIcons/Plantation
   rotate: false
-  xy: 1122, 1013
+  xy: 918, 809
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ImprovementIcons/Quarry
   rotate: false
-  xy: 1428, 1217
+  xy: 1224, 1013
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ImprovementIcons/Railroad
   rotate: false
-  xy: 1224, 1013
+  xy: 1020, 809
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 OtherIcons/Railroad
   rotate: false
-  xy: 1224, 1013
+  xy: 1020, 809
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ImprovementIcons/Road
   rotate: false
-  xy: 714, 503
+  xy: 1530, 1217
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ImprovementIcons/Trading post
   rotate: false
-  xy: 1632, 809
+  xy: 1326, 503
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
@@ -734,42 +741,42 @@ OtherIcons/Fire
   index: -1
 OtherIcons/MenuIcon
   rotate: false
-  xy: 1688, 1319
+  xy: 1790, 1239
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 OtherIcons/Pentagon
   rotate: false
-  xy: 816, 809
+  xy: 612, 503
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 OtherIcons/Shield
   rotate: false
-  xy: 1428, 1013
+  xy: 1122, 707
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 OtherIcons/Sleep
   rotate: false
-  xy: 1020, 605
+  xy: 714, 299
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 OtherIcons/Star
   rotate: false
-  xy: 1530, 407
+  xy: 1530, 305
   size: 100, 94
   orig: 100, 94
   offset: 0, 0
   index: -1
 OtherIcons/Stop
   rotate: false
-  xy: 1632, 1013
+  xy: 1326, 707
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
@@ -804,273 +811,273 @@ PolicyIcons/Aristocracy
   index: -1
 PolicyIcons/Citizenship
   rotate: false
-  xy: 1428, 349
+  xy: 1632, 350
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Civil Society
   rotate: false
-  xy: 1632, 452
+  xy: 1734, 1215
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Collective Rule
   rotate: false
-  xy: 1734, 1215
+  xy: 1734, 1163
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Constitution
   rotate: false
-  xy: 1734, 1163
+  xy: 1734, 1111
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Democracy
   rotate: false
-  xy: 1734, 1111
+  xy: 1734, 1059
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Discipline
   rotate: false
-  xy: 1734, 1059
+  xy: 1734, 1007
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Entrepreneurship
   rotate: false
-  xy: 1734, 1007
+  xy: 1734, 955
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Facism
   rotate: false
-  xy: 1734, 955
+  xy: 1734, 903
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Free Religion
   rotate: false
-  xy: 1734, 903
+  xy: 1734, 851
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Free Speech
   rotate: false
-  xy: 1734, 851
+  xy: 1734, 799
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Free Thought
   rotate: false
-  xy: 1734, 799
+  xy: 1734, 747
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Humanism
   rotate: false
-  xy: 1734, 747
+  xy: 1734, 695
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Landed Elite
   rotate: false
-  xy: 1734, 695
+  xy: 1734, 643
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Legalism
   rotate: false
-  xy: 1734, 643
+  xy: 1734, 591
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Mandate Of Heaven
   rotate: false
-  xy: 1734, 591
+  xy: 1734, 539
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Mercantilism
   rotate: false
-  xy: 1734, 539
+  xy: 1734, 487
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Meritocracy
   rotate: false
-  xy: 1892, 1237
+  xy: 1734, 435
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Militarism
   rotate: false
-  xy: 1428, 297
+  xy: 1892, 1237
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Military Caste
   rotate: false
-  xy: 1480, 349
+  xy: 1684, 350
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Military Tradition
   rotate: false
-  xy: 1480, 297
+  xy: 1944, 1237
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Monarchy
   rotate: false
-  xy: 1684, 452
+  xy: 1786, 1187
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Oligarchy
   rotate: false
-  xy: 1944, 1237
+  xy: 1786, 1135
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Organized Religion
   rotate: false
-  xy: 1786, 1187
+  xy: 1838, 1187
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Patronage
   rotate: false
-  xy: 1786, 1135
+  xy: 1786, 1083
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Police State
   rotate: false
-  xy: 1838, 1187
+  xy: 1838, 1135
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Populism
   rotate: false
-  xy: 1786, 1083
+  xy: 1786, 1031
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Professional Army
   rotate: false
-  xy: 1838, 1135
+  xy: 1838, 1083
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Protectionism
   rotate: false
-  xy: 1786, 1031
+  xy: 1786, 979
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Reformation
   rotate: false
-  xy: 1838, 1083
+  xy: 1838, 1031
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Representation
   rotate: false
-  xy: 1786, 979
+  xy: 1786, 927
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Republic
   rotate: false
-  xy: 1838, 1031
+  xy: 1838, 979
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Scientific Revolution
   rotate: false
-  xy: 1786, 927
+  xy: 1786, 875
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Secularism
   rotate: false
-  xy: 1838, 979
+  xy: 1838, 927
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Sovereignty
   rotate: false
-  xy: 1786, 875
+  xy: 1786, 823
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Theocracy
   rotate: false
-  xy: 1838, 927
+  xy: 1838, 875
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Total War
   rotate: false
-  xy: 1786, 823
+  xy: 1786, 771
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Trade Unions
   rotate: false
-  xy: 1838, 875
+  xy: 1838, 823
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Universal Suffrage
   rotate: false
-  xy: 1786, 771
+  xy: 1786, 719
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 PolicyIcons/Warrior Code
   rotate: false
-  xy: 1838, 823
+  xy: 1838, 771
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
@@ -1133,140 +1140,140 @@ ResourceIcons/Fish
   index: -1
 ResourceIcons/Furs
   rotate: false
-  xy: 408, 1183
+  xy: 408, 1081
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Gems
   rotate: false
-  xy: 408, 877
+  xy: 408, 775
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Gold
   rotate: false
-  xy: 408, 775
+  xy: 408, 673
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Horses
   rotate: false
-  xy: 408, 265
+  xy: 510, 265
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Incense
   rotate: false
-  xy: 286, 135
+  xy: 347, 33
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Iron
   rotate: false
-  xy: 388, 135
+  xy: 490, 163
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Ivory
   rotate: false
-  xy: 1892, 1391
+  xy: 1790, 1341
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Marble
   rotate: false
-  xy: 1178, 1319
+  xy: 1280, 1319
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Oil
   rotate: false
-  xy: 1020, 1115
+  xy: 816, 911
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Pearls
   rotate: false
-  xy: 918, 911
+  xy: 714, 707
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Sheep
   rotate: false
-  xy: 1530, 1115
+  xy: 1224, 809
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Silk
   rotate: false
-  xy: 1326, 911
+  xy: 1020, 605
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Silver
   rotate: false
-  xy: 1224, 809
+  xy: 918, 503
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Spices
   rotate: false
-  xy: 1632, 1115
+  xy: 1326, 809
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Stone
   rotate: false
-  xy: 1020, 503
+  xy: 1632, 1013
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Sugar
   rotate: false
-  xy: 1428, 809
+  xy: 1122, 503
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Uranium
   rotate: false
-  xy: 1224, 401
+  xy: 1530, 605
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Whales
   rotate: false
-  xy: 1530, 605
+  xy: 1224, 299
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Wheat
   rotate: false
-  xy: 1428, 503
+  xy: 1632, 605
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 ResourceIcons/Wine
   rotate: false
-  xy: 1224, 299
+  xy: 1428, 401
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
@@ -1322,7 +1329,7 @@ StatIcons/Malcontent
   index: -1
 StatIcons/Movement
   rotate: false
-  xy: 816, 1115
+  xy: 714, 1013
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
@@ -1343,7 +1350,7 @@ StatIcons/Production
   index: -1
 StatIcons/RangedStrength
   rotate: false
-  xy: 1122, 911
+  xy: 918, 707
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
@@ -1357,7 +1364,7 @@ StatIcons/Science
   index: -1
 StatIcons/Strength
   rotate: false
-  xy: 1530, 911
+  xy: 1224, 605
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
@@ -1567,259 +1574,266 @@ TechIcons/Flight
   index: -1
 TechIcons/Future Tech
   rotate: false
-  xy: 408, 1081
+  xy: 408, 979
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 TechIcons/Guilds
   rotate: false
-  xy: 510, 1081
+  xy: 510, 979
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 TechIcons/Gunpowder
   rotate: false
-  xy: 510, 979
+  xy: 510, 877
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 TechIcons/Horseback Riding
   rotate: false
-  xy: 510, 469
+  xy: 510, 367
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 TechIcons/Industrialization
   rotate: false
-  xy: 347, 33
+  xy: 388, 135
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 TechIcons/Iron Working
   rotate: false
-  xy: 490, 163
+  xy: 449, 33
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 TechIcons/Machinery
   rotate: false
-  xy: 872, 1319
+  xy: 974, 1319
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 TechIcons/Masonry
   rotate: false
-  xy: 1382, 1319
+  xy: 1484, 1319
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 TechIcons/Mass Media
   rotate: false
-  xy: 1484, 1319
+  xy: 1586, 1319
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 TechIcons/Mathematics
   rotate: false
-  xy: 1586, 1319
+  xy: 1688, 1319
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 TechIcons/Metal Casting
   rotate: false
-  xy: 1790, 1239
+  xy: 612, 1217
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 TechIcons/Metallurgy
   rotate: false
-  xy: 612, 1217
+  xy: 612, 1115
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 TechIcons/Military Science
   rotate: false
-  xy: 714, 1217
+  xy: 612, 1013
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 TechIcons/Mining
   rotate: false
-  xy: 816, 1217
+  xy: 714, 1115
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 TechIcons/Nanotechnology
   rotate: false
-  xy: 1020, 1217
+  xy: 918, 1115
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
-TechIcons/Nuclear Fission
+TechIcons/Navigation
   rotate: false
   xy: 714, 911
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
+TechIcons/Nuclear Fission
+  rotate: false
+  xy: 1122, 1217
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
 TechIcons/Optics
   rotate: false
-  xy: 714, 809
+  xy: 1224, 1217
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 TechIcons/Particle Physics
   rotate: false
-  xy: 1020, 1013
+  xy: 816, 809
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 TechIcons/Pharmaceuticals
   rotate: false
-  xy: 714, 707
+  xy: 1326, 1217
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 TechIcons/Philosophy
   rotate: false
-  xy: 612, 503
+  xy: 1224, 1115
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 TechIcons/Physics
   rotate: false
-  xy: 1326, 1217
+  xy: 1122, 1013
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 TechIcons/Plastics
   rotate: false
-  xy: 1020, 911
+  xy: 816, 707
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 TechIcons/Pottery
   rotate: false
-  xy: 816, 707
+  xy: 612, 401
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 TechIcons/Printing Press
   rotate: false
-  xy: 714, 605
+  xy: 1428, 1217
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 TechIcons/Radio
   rotate: false
-  xy: 1326, 1115
+  xy: 1122, 911
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 TechIcons/Rifling
   rotate: false
-  xy: 816, 605
+  xy: 612, 299
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 TechIcons/Robotics
   rotate: false
-  xy: 612, 299
+  xy: 1428, 1115
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 TechIcons/Rocketry
   rotate: false
-  xy: 1530, 1217
+  xy: 1326, 1013
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 TechIcons/Sailing
   rotate: false
-  xy: 1020, 707
+  xy: 816, 503
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 TechIcons/Satellites
   rotate: false
-  xy: 918, 605
+  xy: 714, 401
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 TechIcons/Scientific Theory
   rotate: false
-  xy: 816, 503
+  xy: 1632, 1217
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 TechIcons/Steam Power
   rotate: false
-  xy: 1326, 809
+  xy: 1020, 503
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 TechIcons/Steel
   rotate: false
-  xy: 1224, 707
+  xy: 918, 401
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 TechIcons/The Wheel
   rotate: false
-  xy: 1224, 503
+  xy: 1632, 809
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 TechIcons/Theology
   rotate: false
-  xy: 1020, 299
+  xy: 1428, 605
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 TechIcons/Trapping
   rotate: false
-  xy: 1530, 707
+  xy: 1224, 401
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 TechIcons/Writing
   rotate: false
-  xy: 1326, 299
+  xy: 1428, 299
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
@@ -1964,142 +1978,149 @@ UnitIcons/Crossbowman
   orig: 100, 100
   offset: 0, 0
   index: -1
+UnitIcons/Frigate
+  rotate: false
+  xy: 408, 1183
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
 UnitIcons/Galleass
   rotate: false
-  xy: 408, 979
+  xy: 408, 877
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 UnitIcons/Great Artist
   rotate: false
-  xy: 408, 571
+  xy: 408, 469
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 UnitIcons/Great Engineer
   rotate: false
-  xy: 408, 469
+  xy: 408, 367
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 UnitIcons/Great Merchant
   rotate: false
-  xy: 408, 367
+  xy: 510, 1183
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 UnitIcons/Great Scientist
   rotate: false
-  xy: 510, 1183
+  xy: 510, 1081
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 UnitIcons/Horseman
   rotate: false
-  xy: 510, 367
+  xy: 408, 265
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 UnitIcons/Ironclad
   rotate: false
-  xy: 449, 33
+  xy: 1892, 1493
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 UnitIcons/Knight
   rotate: false
-  xy: 1790, 1341
+  xy: 1892, 1289
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 UnitIcons/Lancer
   rotate: false
-  xy: 1892, 1289
+  xy: 592, 163
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 UnitIcons/Longbowman
   rotate: false
-  xy: 566, 1319
+  xy: 668, 1319
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 UnitIcons/Longswordsman
   rotate: false
-  xy: 668, 1319
+  xy: 770, 1319
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 UnitIcons/Musketeer
   rotate: false
-  xy: 612, 809
+  xy: 1020, 1217
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 UnitIcons/Musketman
   rotate: false
-  xy: 1632, 504
+  xy: 1632, 402
   size: 100, 99
   orig: 100, 99
   offset: 0, 0
   index: -1
 UnitIcons/Pikeman
   rotate: false
-  xy: 1224, 1115
+  xy: 1020, 911
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 UnitIcons/Rifleman
   rotate: false
-  xy: 918, 707
+  xy: 714, 503
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 UnitIcons/Scout
   rotate: false
-  xy: 714, 401
+  xy: 1530, 1115
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 UnitIcons/Settler
   rotate: false
-  xy: 1632, 1217
+  xy: 1326, 911
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 UnitIcons/Spearman
   rotate: false
-  xy: 714, 299
+  xy: 1428, 911
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 UnitIcons/Swordsman
   rotate: false
-  xy: 1326, 707
+  xy: 1020, 401
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 UnitIcons/Trebuchet
   rotate: false
-  xy: 1428, 605
+  xy: 1122, 299
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
@@ -2113,21 +2134,21 @@ UnitIcons/Trireme
   index: -1
 UnitIcons/Warrior
   rotate: false
-  xy: 1632, 707
+  xy: 1326, 401
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 UnitIcons/Work Boats
   rotate: false
-  xy: 1632, 605
+  xy: 1326, 299
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
   index: -1
 UnitIcons/Worker
   rotate: false
-  xy: 1530, 503
+  xy: 1632, 503
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
@@ -2239,35 +2260,35 @@ UnitPromotionIcons/Coastal_Raider_III_(Civ5)
   index: -1
 UnitPromotionIcons/Coastal_Raider_II_(Civ5)
   rotate: false
-  xy: 1632, 430
+  xy: 612, 277
   size: 20, 20
   orig: 20, 20
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Coastal_Raider_I_(Civ5)
   rotate: false
-  xy: 612, 277
+  xy: 1632, 328
   size: 20, 20
   orig: 20, 20
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Cover_II_(Civ5)
   rotate: false
-  xy: 1734, 517
+  xy: 1734, 413
   size: 20, 20
   orig: 20, 20
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Cover_I_(Civ5)
   rotate: false
-  xy: 1786, 749
+  xy: 1786, 697
   size: 20, 20
   orig: 20, 20
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Drill_III_(Civ5)
   rotate: false
-  xy: 1838, 801
+  xy: 1838, 749
   size: 20, 20
   orig: 20, 20
   offset: 0, 0
@@ -2379,42 +2400,42 @@ UnitPromotionIcons/Shock_II_(Civ5)
   index: -1
 UnitPromotionIcons/Shock_I_(Civ5)
   rotate: false
-  xy: 1632, 408
+  xy: 634, 277
   size: 20, 20
   orig: 20, 20
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Siege_(Civ5)
   rotate: false
-  xy: 1654, 430
+  xy: 1632, 306
   size: 20, 20
   orig: 20, 20
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Targeting_III_(Civ5)
   rotate: false
-  xy: 634, 277
+  xy: 1654, 328
   size: 20, 20
   orig: 20, 20
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Targeting_II_(Civ5)
   rotate: false
-  xy: 1756, 517
+  xy: 1756, 413
   size: 20, 20
   orig: 20, 20
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Targeting_I_(Civ5)
   rotate: false
-  xy: 1786, 727
+  xy: 1786, 675
   size: 20, 20
   orig: 20, 20
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Volley_(Civ5)
   rotate: false
-  xy: 1808, 749
+  xy: 1808, 697
   size: 20, 20
   orig: 20, 20
   offset: 0, 0
diff --git a/android/assets/game.png b/android/assets/game.png
index 574ac7fe20..f37b38d207 100644
Binary files a/android/assets/game.png and b/android/assets/game.png differ
diff --git a/android/assets/jsons/Buildings.json b/android/assets/jsons/Buildings.json
index 077834ae8e..ab27a2ae09 100644
--- a/android/assets/jsons/Buildings.json
+++ b/android/assets/jsons/Buildings.json
@@ -192,7 +192,8 @@
 		specialistSlots:{gold:1},
 		hurryCostModifier:25,
 		percentStatBonus:{gold:25},
-		uniques:["Provides 1 extra copy of each improved luxury resource near this City","+2 Gold for each source of Oil and oasis"],
+		uniques:["Provides 1 extra copy of each improved luxury resource near this City",
+			"+2 Gold for each source of Oil and oasis"],
 		requiredTech:"Currency"
 	},
 	{
@@ -417,6 +418,14 @@
 		uniques:["Free Great Artist Appears"],
 		requiredTech:"Archaeology"
 	},
+	{
+		name:"Seaport",
+		hurryCostModifier:25,
+		maintenance:2,
+		uniques:["+1 production and gold from all sea resources worked by the city",
+			"Can only be built in coastal cities", "+15% production of naval units"]
+		requiredTech:"Navigation"
+	},
 	{
 		name:"Taj Mahal",
 		culture:1,
diff --git a/android/assets/jsons/Techs.json b/android/assets/jsons/Techs.json
index c798971984..cf114d2acf 100644
--- a/android/assets/jsons/Techs.json
+++ b/android/assets/jsons/Techs.json
@@ -222,7 +222,7 @@
 				name:"Astronomy",
 				row:2,
 				baseDescription:"Increases embarked movement +1",
-				prerequisites:[/*"Compass",*/"Education"]
+				prerequisites:["Compass","Education"]
 			},
 			{
 				name:"Acoustics",
@@ -253,12 +253,11 @@
 		buildingCost:300,
 		wonderCost:750,
 		techs:[
-			/*{
+			{
 				name:"Navigation",
 				row:2,
-				prerequisites:["Astronomy"],
-				baseDescription:"Does nothing since we have no sea tiles - In theory, allows construction of Frigates and Seaports"
-			},*/
+				prerequisites:["Astronomy"]
+			},
 			{
 				name:"Architecture",
 				row:4,
@@ -291,7 +290,7 @@
 			{
 				name:"Archaeology",
 				row:2,
-				prerequisites:["Astronomy"]
+				prerequisites:["Navigation"]
 			},
 			{
 				name:"Scientific Theory",
diff --git a/android/assets/jsons/Units.json b/android/assets/jsons/Units.json
index 70c21cc6db..481b8bbbca 100644
--- a/android/assets/jsons/Units.json
+++ b/android/assets/jsons/Units.json
@@ -245,6 +245,8 @@
 		rangedStrength:17
 		cost: 100,
 		requiredTech:"Compass",
+		obsoleteTech:"Navigation",
+		upgradesTo:"Frigate",
 		uniques:["Cannot enter ocean tiles"]
 		hurryCostModifier:20
 	},
@@ -304,6 +306,17 @@
 		requiredTech:"Gunpowder",
 		hurryCostModifier:20
 	},
+	{
+		name:"Frigate",
+		unitType:"WaterRanged",
+		movement:5,
+		strength:25,
+		rangedStrength:28,
+		cost: 185,
+		requiredResource:"Iron",
+		requiredTech:"Navigation",
+		hurryCostModifier:20
+	},
 	{
 		name:"Lancer",
 		unitType:"Mounted",
diff --git a/core/src/com/unciv/logic/map/TileInfo.kt b/core/src/com/unciv/logic/map/TileInfo.kt
index 5242bf049a..7a9cf92247 100644
--- a/core/src/com/unciv/logic/map/TileInfo.kt
+++ b/core/src/com/unciv/logic/map/TileInfo.kt
@@ -139,9 +139,14 @@ open class TileInfo {
             if(resource.name=="Oil" && city!=null
                     && city.getBuildingUniques().contains("+2 Gold for each source of Oil and oasis"))
                 stats.gold += 2
-            if(city!=null && isWater()
-                    && city.getBuildingUniques().contains("+1 production from all sea resources worked by the city"))
-                stats.production+=1
+            if(city!=null && isWater()){
+                if(city.getBuildingUniques().contains("+1 production from all sea resources worked by the city"))
+                    stats.production+=1
+                if(city.getBuildingUniques().contains("+1 production and gold from all sea resources worked by the city")){
+                    stats.production+=1
+                    stats.gold+=1
+                }
+            }
         }
 
         val improvement = getTileImprovement()
diff --git a/core/src/com/unciv/ui/NewGameScreen.kt b/core/src/com/unciv/ui/NewGameScreen.kt
index 22e3433157..b47e150d58 100644
--- a/core/src/com/unciv/ui/NewGameScreen.kt
+++ b/core/src/com/unciv/ui/NewGameScreen.kt
@@ -26,7 +26,7 @@ class NewGameScreen: PickerScreen(){
         var nation="Babylon"
         var mapRadius=20
         var numberOfEnemies=3
-        var mapType=MapType.LandOnly
+        var mapType=MapType.WithWater
     }
 
     val newGameParameters=NewGameParameters()
@@ -145,13 +145,6 @@ class NewGameScreen: PickerScreen(){
         newGameOptionsTable.add(difficultySelectBox).pad(10f).row()
 
 
-        val checkBox = CheckBox("Add water tiles \n(EXPERIMENTAL/WIP)",skin)
-        checkBox.onClick {
-            if(checkBox.isChecked) newGameParameters.mapType = NewGameParameters.MapType.WithWater
-            else newGameParameters.mapType = NewGameParameters.MapType.LandOnly
-        }
-        newGameOptionsTable.add(checkBox).row()
-
         rightSideButton.enable()
         rightSideButton.setText("Start game!".tr())
         rightSideButton.onClick {