diff --git a/android/Images/FlagIcons/Thai.png b/android/Images/FlagIcons/Thai.png
new file mode 100644
index 00000000..df694027
Binary files /dev/null and b/android/Images/FlagIcons/Thai.png differ
diff --git a/android/assets/jsons/Translations/Other.json b/android/assets/jsons/Translations/Other.json
index aadd0751..177396d7 100644
--- a/android/assets/jsons/Translations/Other.json
+++ b/android/assets/jsons/Translations/Other.json
@@ -53,29 +53,30 @@
 /////// Turn
 
 	"Next turn":{
-        	Dutch:"Volgende beurt"
-        	French:"Prochain tour"
+		Dutch:"Volgende beurt"
+		French:"Prochain tour"
 		German:"Nächste Runde"
 		Italian:"Fine turno"
-        	Japanese:"次のターン"
-        	Portuguese:"Proximo turno"
+		Japanese:"次のターン"
+		Portuguese:"Proximo turno"
 		Romanian:"Runda următoare"
 		Russian:"Следующий ход"
 		Simplified_Chinese:"下一回合"
 		Spanish:"Siguiente turno"
+		Thai:"เริ่มเกมใหม่"
 		
 	}
 	
 	"Turn":{ // For main screen at top left, e.g. Turn 234
-        	Dutch:"Beurt"
+		Dutch:"Beurt"
 		French:"Tour"
 		German:"Runde"
-        	Italian:"Turno"
+		Italian:"Turno"
 		Japanese:"順番"
-        	Portuguese:"Turno"
+		Portuguese:"Turno"
 		Romanian:"Runda"
-        	Russian:"Ход"
-        	Simplified_Chinese:"回合"
+		Russian:"Ход"
+		Simplified_Chinese:"回合"
 		Spanish:"Turno"
 	}
 
@@ -209,7 +210,7 @@
 		Dutch:"Verbetering bouwen"
 		Spanish:"Construir mejora"
 		Simplified_Chinese:"建造设施"
-        	Portuguese:"Construir melhoria"
+		Portuguese:"Construir melhoria"
 		Japanese:"構造改善"
 	}
 
@@ -2038,5 +2039,24 @@
 		Portuguese:"Língua"
 		Russian:"Язык"
 	}
+	
+	// Map editor
+	
+	
+	"Terrains & Resources":{
+		Italian:"Terreni e risorse"
+	}
+
+	"Improvements":{
+		Italian:"Miglioramenti"
+	}
+
+	"Barbarian encampment":{
+		Italian:"Accampamento barbaro"
+	}
+
+	"[nation] starting location":{
+		Italian:"Punto iniziale di [nation]"
+	}
 
 }
diff --git a/core/src/com/unciv/ui/utils/Fonts.kt b/core/src/com/unciv/ui/utils/Fonts.kt
index f2dd77d4..b12b69ba 100644
--- a/core/src/com/unciv/ui/utils/Fonts.kt
+++ b/core/src/com/unciv/ui/utils/Fonts.kt
@@ -55,9 +55,11 @@ class Fonts {
 
     fun getCharsForFont(withChinese:Boolean): String {
         val defaultText = "ABCČĆDĐEFGHIJKLMNOPQRSŠTUVWXYZŽaäàâăbcčćçdđeéfghiîjklmnoöpqrsșštțuüvwxyzž" +
-                "АБВГҐДЂЕЁЄЖЗЅИІЇЙЈКЛЉМНЊОПРСТЋУЎФХЦЧЏШЩЪЫЬЭЮЯабвгґдђеёєжзѕиіїйјклљмнњопрстћуўфхцчџшщъыьэюя" +
-                "ΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡΣΤΥΦΧΨΩαβγδεζηθικλμνξοπρστυφχψωάßΆέΈέΉίϊΐΊόΌύΰϋΎΫΏ" + 
-                "ÀÄĂÂĎÊĚÉÈÍÎŁĹĽÔÓÖƠŘŔŚŤƯŮÚÜŻŹäâąďêęěłĺľńňôöơřŕśťưůýżźáèìíóú1234567890" +
+                "АБВГҐДЂЕЁЄЖЗЅИІЇЙЈКЛЉМНЊОПРСТЋУЎФХЦЧЏШЩЪЫЬЭЮЯабвгґдђеёєжзѕиіїйјклљмнњопрстћуўфхцчџшщъыьэюя" + // Russian
+                "ΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡΣΤΥΦΧΨΩαβγδεζηθικλμνξοπρστυφχψωάßΆέΈέΉίϊΐΊόΌύΰϋΎΫΏ" +  // Greek
+                "ÀÄĂÂĎÊĚÉÈÍÎŁĹĽÔÓÖƠŘŔŚŤƯŮÚÜŻŹäâąďêęěłĺľńňôöơřŕśťưůýżźáèìíóú" +
+                "กขฃคฅฆงจฉชซฌญฎฏฐฑฒณดตถทธนบปผฝพฟภมยรฤลฦวศษสหฬอฮฯะัาำิีึืฺุู฿เแโใไๅๆ็่้๊๋์ํ๎๏๐๑๒๓๔๕๖๗๘๙๚๛" +  // Thai
+                "1234567890" +
                 "‘?’'“!”(%)[#]{@}/&\\<-+÷×=>®©\$€£¥¢:;,.¡*|"
             val charSet = HashSet<Char>()
             charSet.addAll(defaultText.asIterable())
diff --git a/docs/Credits.md b/docs/Credits.md
index 7a543166..b743404f 100644
--- a/docs/Credits.md
+++ b/docs/Credits.md
@@ -26,7 +26,7 @@ Unless otherwise specified, all the following are from [the Noun Project](https:
 * [Fishing Vessel](https://thenounproject.com/term/fishing-vessel/23815/) By Luis Prado for Work Boats
 * [Greek Trireme](https://thenounproject.com/search/?q=ancient%20boat&i=1626303) By Zachary McCune for Trireme
 * [Chariot](https://thenounproject.com/search/?q=Chariot&i=1189930) By Andrew Doane for Chariot Archer
-* [Elephant](https://thenounproject.com/Luis/uploads/?i=14048) By Luis Prado, US for War Elephant
+* [Elephant](https://thenounproject.com/Luis/uploads/?i=14048) By Luis Prado for War Elephant
 * [Spear](https://thenounproject.com/search/?q=Spear&i=11432) By Stephen Copinger for Spearman
 * [Greek shield](https://thenounproject.com/search/?q=hoplite&i=440135) for Hoplite
 * [Spiked club](https://thenounproject.com/search/?q=club%20weapon&creator=1933477&i=831794) for Brute