diff --git a/core/src/com/unciv/ui/mapeditor/MapEditorScreen.kt b/core/src/com/unciv/ui/mapeditor/MapEditorScreen.kt
index ded78c4433..d2ea89ad18 100644
--- a/core/src/com/unciv/ui/mapeditor/MapEditorScreen.kt
+++ b/core/src/com/unciv/ui/mapeditor/MapEditorScreen.kt
@@ -9,6 +9,7 @@ import com.badlogic.gdx.scenes.scene2d.ui.TextButton
 import com.unciv.GameParameters
 import com.unciv.UnCivGame
 import com.unciv.logic.GameSaver
+import com.unciv.logic.map.TileInfo
 import com.unciv.logic.map.TileMap
 import com.unciv.models.gamebasics.GameBasics
 import com.unciv.models.gamebasics.tile.Terrain
@@ -31,7 +32,7 @@ class MapEditorScreen(): CameraStageBaseScreen(){
     var selectedResource:TileResource?=null
     var tileMap = TileMap(GameParameters())
     var mapName = "My first map"
-    var currentHex=Group()
+    private var currentHex:Actor=Group()
     lateinit var mapHolder: TileGroupMap<TileGroup>
 
     fun clearSelection(){
@@ -128,44 +129,49 @@ class MapEditorScreen(): CameraStageBaseScreen(){
     }
 
 
-    fun setCurrentHex(color: Color, image: Actor?=null){
+    fun setCurrentHex(tileInfo: TileInfo?){
         currentHex.remove()
-        currentHex=getHex(color,image)
+        if(tileInfo!=null)currentHex=TileGroup(tileInfo)
+                .apply {
+                    showEntireMap=true
+                    forMapEditorIcon=true
+                    update(true,true,true)
+                }
+        else currentHex = ImageGetter.getCircle()
         currentHex.setPosition(stage.width-currentHex.width-10, 10f)
         stage.addActor(currentHex)
     }
 
     private fun getTileEditorOptions(): Table {
 
-        val baseTerrainHolder = Table()
-        val terrainFeatureHolder = Table()
+        val baseTerrainHolder = Table().apply { defaults().padRight(10f) }
+        val terrainFeatureHolder = Table().apply { defaults().padRight(10f) }
         terrainFeatureHolder.add(getHex(Color.WHITE).apply {
             onClick {
                 clearSelection()
                 clearTerrainFeature = true
-                setCurrentHex(Color.WHITE)
+                setCurrentHex(null)
             }
         })
 
         for (terrain in GameBasics.Terrains.values) {
-            var iconPath: String? = null
-            var color = Color.WHITE
-
-            if (terrain.type == TerrainType.TerrainFeature)
-                iconPath = tileSetLocation + terrain.name+"Overlay"
-            else {
-                color = terrain.getColor()
-                val imagePath = tileSetLocation + terrain.name+"Overlay"
-                if (ImageGetter.imageExists(imagePath)) {
-                    iconPath = imagePath
-                }
+            val tileInfo = TileInfo()
+            if (terrain.type == TerrainType.TerrainFeature) {
+                tileInfo.baseTerrain = terrain.occursOn!!.first()
+                tileInfo.terrainFeature=terrain.name
             }
+            else tileInfo.baseTerrain=terrain.name
+
+            tileInfo.setTransients()
+            val group = TileGroup(tileInfo)
+            group.showEntireMap=true
+            group.forMapEditorIcon=true
+            group.update(true,true,true)
 
-            val group = getHex(color, if(iconPath==null) null else ImageGetter.getImage(iconPath))
             group.onClick {
                 clearSelection()
                 selectedTerrain = terrain
-                setCurrentHex(color, if(iconPath==null) null else ImageGetter.getImage(iconPath))
+                setCurrentHex(tileInfo)
             }
 
             if (terrain.type == TerrainType.TerrainFeature)
@@ -184,7 +190,19 @@ class MapEditorScreen(): CameraStageBaseScreen(){
             resourceHex.onClick {
                 clearSelection()
                 selectedResource = resource
-                setCurrentHex(Color.WHITE, ImageGetter.getResourceImage(resource.name, 40f))
+                val tileInfo = TileInfo()
+
+                val terrain = resource.terrainsCanBeFoundOn.first()
+                val terrainObject = GameBasics.Terrains[terrain]!!
+                if(terrainObject.type==TerrainType.TerrainFeature){
+                    tileInfo.baseTerrain=terrainObject.occursOn!!.first()
+                    tileInfo.terrainFeature=terrain
+                }
+                else tileInfo.baseTerrain=terrain
+
+                tileInfo.resource = resource.name
+                tileInfo.setTransients()
+                setCurrentHex(tileInfo)
             }
             resourcesHolder.add(resourceHex)
         }
diff --git a/core/src/com/unciv/ui/tilegroups/TileGroup.kt b/core/src/com/unciv/ui/tilegroups/TileGroup.kt
index 90fc0cde9c..80cb23e28f 100644
--- a/core/src/com/unciv/ui/tilegroups/TileGroup.kt
+++ b/core/src/com/unciv/ui/tilegroups/TileGroup.kt
@@ -63,6 +63,7 @@ open class TileGroup(var tileInfo: TileInfo) : Group() {
     var yieldGroup = YieldGroup()
 
     var showEntireMap = UnCivGame.Current.viewEntireMapForDebug
+    var forMapEditorIcon = false
 
     class RoadImage {
         var roadStatus: RoadStatus = RoadStatus.None
@@ -304,6 +305,7 @@ open class TileGroup(var tileInfo: TileInfo) : Group() {
     }
 
     private fun updateRoadImages() {
+        if(forMapEditorIcon) return
         for (neighbor in tileInfo.neighbors) {
             if (!roadImages.containsKey(neighbor)) roadImages[neighbor] = RoadImage()
             val roadImage = roadImages[neighbor]!!