City state icon in city button now visible and colored according to city-state color

core/src/com/unciv/models/gamebasics/Nation.kt

@@ -14,7 +14,7 @@ class Nation : INamed {
     }
 
     var leaderName=""
-    fun getLeaderDisplayName() = if(isCityState()) "City-state [${getNameTranslation()}]".tr()
+    fun getLeaderDisplayName() = if(isCityState()) getNameTranslation()
         else "[$leaderName] of [${getNameTranslation()}]"
 
     var cityStateType: CityStateType?=null

core/src/com/unciv/ui/tilegroups/CityButton.kt

@@ -81,7 +81,8 @@ class CityButton(val city: CityInfo, internal val tileGroup: WorldTileGroup, ski
         }
         if (city.isCapital()) {
             if (city.civInfo.isCityState()) {
-                val cityStateImage = ImageGetter.getImage("OtherIcons/CityState.png").apply { color = Color.LIGHT_GRAY }
+                val cityStateImage = ImageGetter.getImage("OtherIcons/CityState.png")
+                        .apply { color = city.civInfo.getNation().getSecondaryColor()}
                 iconTable.add(cityStateImage).size(20f).pad(2f).padLeft(10f)
             } else {
                 val starImage = ImageGetter.getImage("OtherIcons/Star.png").apply { color = Color.LIGHT_GRAY }

core/src/com/unciv/ui/trade/DiplomacyScreen.kt

@@ -56,6 +56,7 @@ class DiplomacyScreen:CameraStageBaseScreen() {
                 val cityStateIcon = ImageGetter.getImage("OtherIcons/CityState.png")
                 cityStateIcon.setSize(70f,70f)
                 cityStateIcon.center(civIndicator)
+                cityStateIcon.color= Color.BLACK
                 civIndicator.addActor(cityStateIcon)
             }