diff --git a/OpenRA.Mods.Common/Traits/AttackMove.cs b/OpenRA.Mods.Common/Traits/AttackMove.cs
index 0f639c64aa..a31c6422ab 100644
--- a/OpenRA.Mods.Common/Traits/AttackMove.cs
+++ b/OpenRA.Mods.Common/Traits/AttackMove.cs
@@ -156,10 +156,8 @@ namespace OpenRA.Mods.Common.Traits
 
 		public override string GetCursor(World world, CPos cell, int2 worldPixel, MouseInput mi)
 		{
-			if (world.Map.Contains(cell))
-				return mi.Modifiers.HasModifier(Modifiers.Ctrl) ? "assaultmove" : "attackmove";
-
-			return "generic-blocked";
+			var prefix = mi.Modifiers.HasModifier(Modifiers.Ctrl) ? "assaultmove" : "attackmove";
+			return world.Map.Contains(cell) ? prefix : prefix + "-blocked";
 		}
 
 		public override bool InputOverridesSelection(World world, int2 xy, MouseInput mi)
diff --git a/mods/cnc/bits/mouse4.shp b/mods/cnc/bits/mouse4.shp
index b1d9bb3792..07824a75b5 100644
Binary files a/mods/cnc/bits/mouse4.shp and b/mods/cnc/bits/mouse4.shp differ
diff --git a/mods/cnc/bits/mouse8.shp b/mods/cnc/bits/mouse8.shp
deleted file mode 100644
index bff0a2b4ed..0000000000
Binary files a/mods/cnc/bits/mouse8.shp and /dev/null differ
diff --git a/mods/cnc/cursors.yaml b/mods/cnc/cursors.yaml
index 48782591c5..ada0b6beb5 100644
--- a/mods/cnc/cursors.yaml
+++ b/mods/cnc/cursors.yaml
@@ -155,23 +155,41 @@ Cursors:
 		move:
 			Start: 0
 			Length: 8
-		move-minimap:
-			Start: 8
-			Length: 4
 		move-rough:
 			Start: 0
 			Length: 8
+		move-minimap:
+			Start: 8
+			Length: 4
 		attackmove:
 			Start: 12
 			Length: 8
 		attackmove-minimap:
 			Start: 20
 			Length: 4
-		move-blocked:
+		assaultmove:
 			Start: 24
+			Length: 8
+		assaultmove-minimap:
+			Start: 32
+			Length: 4
+		move-blocked:
+			Start: 36
+			Length: 1
+		attackmove-blocked:
+			Start: 37
+			Length: 1
+		assaultmove-blocked:
+			Start: 38
 			Length: 1
 		move-blocked-minimap:
-			Start: 25
+			Start: 39
+			Length: 1
+		attackmove-blocked-minimap:
+			Start: 39
+			Length: 1
+		assaultmove-blocked-minimap:
+			Start: 40
 			Length: 1
 	mouse5.shp: cursor
 		guard:
@@ -217,10 +235,3 @@ Cursors:
 			Length: 8
 		attackoutsiderange-minimap:
 			Start: 8
-	mouse8.shp: cursor
-		assaultmove:
-			Start: 0
-			Length: 8
-		assaultmove-minimap:
-			Start: 8
-			Length: 4
\ No newline at end of file
diff --git a/mods/d2k/bits/assaultmove.shp b/mods/d2k/bits/assaultmove.shp
old mode 100644
new mode 100755
index 19c5da5991..46aee2e292
Binary files a/mods/d2k/bits/assaultmove.shp and b/mods/d2k/bits/assaultmove.shp differ
diff --git a/mods/d2k/bits/attackmove.shp b/mods/d2k/bits/attackmove.shp
old mode 100644
new mode 100755
index 2b60c8c604..284ebc0f8a
Binary files a/mods/d2k/bits/attackmove.shp and b/mods/d2k/bits/attackmove.shp differ
diff --git a/mods/d2k/cursors.yaml b/mods/d2k/cursors.yaml
index d3c031f5e6..d99b9122f5 100644
--- a/mods/d2k/cursors.yaml
+++ b/mods/d2k/cursors.yaml
@@ -306,6 +306,14 @@ Cursors:
 			Length: 8
 			X: -2
 			Y: -2
+		attackmove-blocked:
+			Start: 8
+			X: -2
+			Y: -2
+		attackmove-blocked-minimap:
+			Start: 8
+			X: -2
+			Y: -2
 	assaultmove.shp: mouse
 		assaultmove:
 			Start: 0
@@ -316,4 +324,12 @@ Cursors:
 			Start: 0
 			Length: 8
 			X: -2
-			Y: -2
\ No newline at end of file
+			Y: -2
+		assaultmove-blocked:
+			Start: 8
+			X: -2
+			Y: -2
+		assaultmove-blocked-minimap:
+			Start: 8
+			X: -2
+			Y: -2
diff --git a/mods/ra/bits/attackmove.shp b/mods/ra/bits/attackmove.shp
index e0dfbc1d3f..9c47a75e5f 100644
Binary files a/mods/ra/bits/attackmove.shp and b/mods/ra/bits/attackmove.shp differ
diff --git a/mods/ra/cursors.yaml b/mods/ra/cursors.yaml
index 2e8ef2b62c..ebc8e9fcce 100644
--- a/mods/ra/cursors.yaml
+++ b/mods/ra/cursors.yaml
@@ -217,9 +217,17 @@ Cursors:
 		attackmove-minimap:
 			Start: 4
 			Length: 4
+		attackmove-blocked:
+			Start: 16
+		attackmove-blocked-minimap:
+			Start: 18
 		assaultmove:
 			Start: 8
 			Length: 4
 		assaultmove-minimap:
 			Start: 12
 			Length: 4
+		assaultmove-blocked:
+			Start: 17
+		assaultmove-blocked-minimap:
+			Start: 19