diff --git a/android/Images/UnitActionIcons/Promote.png b/android/Images/UnitActionIcons/Promote.png
index f480a5652f..824735777f 100644
Binary files a/android/Images/UnitActionIcons/Promote.png and b/android/Images/UnitActionIcons/Promote.png differ
diff --git a/android/Images/UnitActionIcons/StopMove.png b/android/Images/UnitActionIcons/StopMove.png
index 47804b26a5..0fe42953fb 100644
Binary files a/android/Images/UnitActionIcons/StopMove.png and b/android/Images/UnitActionIcons/StopMove.png differ
diff --git a/android/assets/game.atlas b/android/assets/game.atlas
index 5ffc8c15cc..320ffa8ad4 100644
--- a/android/assets/game.atlas
+++ b/android/assets/game.atlas
@@ -90,7 +90,7 @@ EmojiIcons/Science
   index: -1
 EmojiIcons/Turn
   rotate: false
-  xy: 1486, 1286
+  xy: 762, 720
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
@@ -412,7 +412,7 @@ StatIcons/Movement
   index: -1
 OtherIcons/BackArrow
   rotate: false
-  xy: 1162, 1014
+  xy: 946, 906
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
@@ -426,7 +426,7 @@ OtherIcons/Banner
   index: -1
 OtherIcons/Camera
   rotate: false
-  xy: 1162, 981
+  xy: 896, 829
   size: 25, 25
   orig: 25, 25
   offset: 0, 0
@@ -468,7 +468,7 @@ OtherIcons/Cities
   index: -1
 OtherIcons/CityState
   rotate: false
-  xy: 1054, 906
+  xy: 1162, 1014
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
@@ -545,7 +545,7 @@ OtherIcons/Improvements
   index: -1
 OtherIcons/Link
   rotate: false
-  xy: 896, 804
+  xy: 1004, 906
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
@@ -830,6 +830,13 @@ UnitActionIcons/Stop
   orig: 100, 100
   offset: 0, 0
   index: -1
+UnitActionIcons/StopMove
+  rotate: false
+  xy: 1054, 1072
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
 OtherIcons/Swap
   rotate: false
   xy: 1270, 1288
@@ -846,7 +853,7 @@ UnitActionIcons/Swap
   index: -1
 OtherIcons/Terrains
   rotate: false
-  xy: 762, 720
+  xy: 704, 720
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
@@ -1217,7 +1224,7 @@ StatIcons/Population
   index: -1
 StatIcons/Range
   rotate: false
-  xy: 954, 804
+  xy: 1062, 906
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
@@ -1252,7 +1259,7 @@ StatIcons/Specialist
   index: -1
 StatIcons/Strength
   rotate: false
-  xy: 704, 720
+  xy: 646, 720
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
@@ -1369,6 +1376,13 @@ UnitActionIcons/Promote
   orig: 100, 94
   offset: 0, 0
   index: -1
+UnitActionIcons/Upgrade
+  rotate: false
+  xy: 838, 1510
+  size: 100, 94
+  orig: 100, 94
+  offset: 0, 0
+  index: -1
 UnitActionIcons/RemoveHeresy
   rotate: false
   xy: 1162, 1612
@@ -1404,20 +1418,6 @@ UnitActionIcons/StartGoldenAge
   orig: 100, 100
   offset: 0, 0
   index: -1
-UnitActionIcons/StopMove
-  rotate: false
-  xy: 646, 720
-  size: 50, 50
-  orig: 50, 50
-  offset: 0, 0
-  index: -1
-UnitActionIcons/Upgrade
-  rotate: false
-  xy: 946, 862
-  size: 100, 94
-  orig: 100, 94
-  offset: 0, 0
-  index: -1
 UnitFlagIcons/UnitFlagCivilian
   rotate: false
   xy: 4, 1385
diff --git a/android/assets/game.png b/android/assets/game.png
index e1e6010e93..ff6396dcbb 100644
Binary files a/android/assets/game.png and b/android/assets/game.png differ
diff --git a/core/src/com/unciv/models/UnitAction.kt b/core/src/com/unciv/models/UnitAction.kt
index 0dfbce0476..3baf7a8880 100644
--- a/core/src/com/unciv/models/UnitAction.kt
+++ b/core/src/com/unciv/models/UnitAction.kt
@@ -7,6 +7,8 @@ import com.unciv.Constants
 import com.unciv.models.translations.getPlaceholderParameters
 import com.unciv.ui.images.ImageGetter
 import com.unciv.ui.utils.KeyCharAndCode
+import com.unciv.ui.utils.extensions.surroundWithCircle
+import com.unciv.ui.utils.extensions.surroundWithThinCircle
 
 
 /** Unit Actions - class - carries dynamic data and actual execution.
@@ -22,6 +24,8 @@ data class UnitAction(
 ) {
     fun getIcon(): Actor {
         if (type.imageGetter != null) return type.imageGetter.invoke()
+            .surroundWithCircle(20f)
+            .surroundWithThinCircle(Color.BLACK)
         return when (type) {
             UnitActionType.Create -> {
                 ImageGetter.getImprovementIcon(title.getPlaceholderParameters()[0])
@@ -32,6 +36,7 @@ data class UnitAction(
                     if (ImageGetter.religionIconExists(religionName)) religionName
                     else "Pantheon"
                 ).apply { color = Color.BLACK }
+                    .surroundWithCircle(20f).surroundWithThinCircle(Color.BLACK)
             }
             else -> ImageGetter.getImage("UnitActionIcons/Star").apply { color = Color.BLACK }
         }
diff --git a/extraImages/Icons/Unciv icon v6.png b/extraImages/Icons/Unciv icon v6.png
new file mode 100644
index 0000000000..41dd3f94a0
Binary files /dev/null and b/extraImages/Icons/Unciv icon v6.png differ