diff --git a/android/assets/game.atlas b/android/assets/game.atlas
index f38ef743e9..be66451d62 100644
--- a/android/assets/game.atlas
+++ b/android/assets/game.atlas
@@ -767,6 +767,20 @@ ImprovementIcons/Quarry
   orig: 100, 100
   offset: 0, 0
   index: -1
+ImprovementIcons/Railroad
+  rotate: false
+  xy: 1736, 106
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+TileSets/Default/Railroad
+  rotate: false
+  xy: 1736, 106
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
 ImprovementIcons/Road
   rotate: false
   xy: 1430, 84
@@ -1630,7 +1644,7 @@ TechIcons/Radio
   index: -1
 TechIcons/Railroad
   rotate: false
-  xy: 1736, 106
+  xy: 1940, 106
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
@@ -1698,6 +1712,20 @@ TileSets/Default/CityOverlay
   orig: 100, 100
   offset: 0, 0
   index: -1
+TileSets/Default/CrosshatchHexagon
+  rotate: false
+  xy: 862, 1808
+  size: 273, 236
+  orig: 273, 236
+  offset: 0, 0
+  index: -1
+TileSets/FantasyHex/CrosshatchHexagon
+  rotate: false
+  xy: 862, 1808
+  size: 273, 236
+  orig: 273, 236
+  offset: 0, 0
+  index: -1
 TileSets/Default/FalloutOverlay
   rotate: false
   xy: 512, 932
@@ -1719,6 +1747,20 @@ TileSets/Default/ForestOverlay
   orig: 100, 100
   offset: 0, 0
   index: -1
+TileSets/Default/Hexagon
+  rotate: false
+  xy: 583, 1804
+  size: 277, 240
+  orig: 277, 240
+  offset: 0, 0
+  index: -1
+TileSets/FantasyHex/Hexagon
+  rotate: false
+  xy: 583, 1804
+  size: 277, 240
+  orig: 277, 240
+  offset: 0, 0
+  index: -1
 TileSets/Default/HillOverlay
   rotate: false
   xy: 512, 728
@@ -1775,51 +1817,9 @@ TileSets/Default/OasisOverlay
   orig: 100, 100
   offset: 0, 0
   index: -1
-TileSets/Default/Railroad
-  rotate: false
-  xy: 2, 104
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-ImprovementIcons/Railroad
-  rotate: false
-  xy: 2, 104
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-TileSets/FantasyHex/CrosshatchHexagon
-  rotate: false
-  xy: 862, 1808
-  size: 273, 236
-  orig: 273, 236
-  offset: 0, 0
-  index: -1
-TileSets/Default/CrosshatchHexagon
-  rotate: false
-  xy: 862, 1808
-  size: 273, 236
-  orig: 273, 236
-  offset: 0, 0
-  index: -1
-TileSets/FantasyHex/Hexagon
-  rotate: false
-  xy: 583, 1804
-  size: 277, 240
-  orig: 277, 240
-  offset: 0, 0
-  index: -1
-TileSets/Default/Hexagon
-  rotate: false
-  xy: 583, 1804
-  size: 277, 240
-  orig: 277, 240
-  offset: 0, 0
-  index: -1
 TileSets/FantasyHex/Railroad
   rotate: false
-  xy: 1940, 106
+  xy: 2, 104
   size: 100, 100
   orig: 100, 100
   offset: 0, 0
@@ -3027,6 +3027,20 @@ TechIcons/Writing
   orig: 100, 100
   offset: 0, 0
   index: -1
+TileSets/Default/road
+  rotate: false
+  xy: 920, 807
+  size: 61, 11
+  orig: 61, 11
+  offset: 0, 0
+  index: -1
+TileSets/FantasyHex/road
+  rotate: false
+  xy: 920, 807
+  size: 61, 11
+  orig: 61, 11
+  offset: 0, 0
+  index: -1
 TileSets/FantasyHex/Tiles/Academy
   rotate: false
   xy: 2008, 986
@@ -4707,20 +4721,6 @@ TileSets/FantasyHex/Units/Work Boats
   orig: 32, 26
   offset: 0, 0
   index: -1
-TileSets/FantasyHex/road
-  rotate: false
-  xy: 920, 807
-  size: 61, 11
-  orig: 61, 11
-  offset: 0, 0
-  index: -1
-TileSets/Default/road
-  rotate: false
-  xy: 920, 807
-  size: 61, 11
-  orig: 61, 11
-  offset: 0, 0
-  index: -1
 UnitIcons/Scout
   rotate: false
   xy: 2, 820
diff --git a/android/assets/game.png b/android/assets/game.png
index e360a238b3..5be646cc37 100644
Binary files a/android/assets/game.png and b/android/assets/game.png differ
diff --git a/build.gradle b/build.gradle
index db4871cae9..83c5042c72 100644
--- a/build.gradle
+++ b/build.gradle
@@ -33,8 +33,8 @@ allprojects {
     version = '1.0.1'
     ext {
         appName = "Unciv"
-        appCodeNumber = 392
-        appVersion = "3.6.6-resubmit"
+        appCodeNumber = 393
+        appVersion = "3.6.7"
 
         gdxVersion = '1.9.10'
         roboVMVersion = '2.3.1'
diff --git a/changelog.md b/changelog.md
index 4f128d9223..55fe93a752 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1,19 @@
+## 3.6.7
+
+By Reversi:
+- Fixed city buy/sell exploits
+- Snow, Ice, Atoll & Map Generation
+- Borders made of oriented triangles rather than circles
+
+By Jack Rainy:
+- Major translation changes
+- Minor UI changes
+- Brought specific things more in line with Civ V
+
+Starting locations work again =)
+
+Translation updates
+
 ## 3.6.6
 
 Resolved #2071 - AI will wait 20 turns between proposing research agreements if declined