diff --git a/OpenRA.Mods.Common/Widgets/ViewportControllerWidget.cs b/OpenRA.Mods.Common/Widgets/ViewportControllerWidget.cs
index 8e18dc8a3c..598c52105a 100644
--- a/OpenRA.Mods.Common/Widgets/ViewportControllerWidget.cs
+++ b/OpenRA.Mods.Common/Widgets/ViewportControllerWidget.cs
@@ -35,8 +35,7 @@ namespace OpenRA.Mods.Common.Widgets
 		public FrozenActor FrozenActorTooltip { get; private set; }
 		public ResourceType ResourceTooltip { get; private set; }
 
-		public int EdgeScrollThreshold = 15;
-		public int EdgeCornerScrollThreshold = 35;
+		public int EdgeScrollThreshold = 5;
 
 		int2? joystickScrollStart, joystickScrollEnd;
 		int2? standardScrollStart;
diff --git a/mods/cnc/cursors.yaml b/mods/cnc/cursors.yaml
index fb877adfd4..b376477faf 100644
--- a/mods/cnc/cursors.yaml
+++ b/mods/cnc/cursors.yaml
@@ -5,36 +5,60 @@ Cursors:
 	mouse2.shp: cursor
 		scroll-t:
 			Start: 1
+			Y: -12
 		scroll-tr:
 			Start: 2
+			X: 14
+			Y: -12
 		scroll-r:
 			Start: 3
+			X: 14
 		scroll-br:
 			Start: 4
+			X: 14
+			Y: 11
 		scroll-b:
 			Start: 5
+			Y: 11
 		scroll-bl:
 			Start: 6
+			X: -15
+			Y: 11
 		scroll-l:
 			Start: 7
+			X: -15
 		scroll-tl:
 			Start: 8
+			X: -15
+			Y: -12
 		scroll-t-blocked:
 			Start: 130
+			Y: -12
 		scroll-tr-blocked:
 			Start: 131
+			X: 14
+			Y: -12
 		scroll-r-blocked:
 			Start: 132
+			X: 14
 		scroll-br-blocked:
 			Start: 133
+			X: 14
+			Y: 11
 		scroll-b-blocked:
 			Start: 134
+			Y: 11
 		scroll-bl-blocked:
 			Start: 135
+			X: -15
+			Y: 11
 		scroll-l-blocked:
 			Start: 136
+			X: -15
 		scroll-tl-blocked:
 			Start: 137
+			X: -15
+			Y: -12
 		select:
 			Start: 12
 			Length: 6
diff --git a/mods/ra/cursors.yaml b/mods/ra/cursors.yaml
index 421f6be203..ee566cfa4f 100644
--- a/mods/ra/cursors.yaml
+++ b/mods/ra/cursors.yaml
@@ -5,36 +5,60 @@ Cursors:
 	mouse.shp: cursor
 		scroll-t:
 			Start: 1
+			Y: -7
 		scroll-tr:
 			Start: 2
+			X: 6
+			Y: -5
 		scroll-r:
 			Start: 3
+			X: 7
 		scroll-br:
 			Start: 4
+			X: 6
+			Y: 5
 		scroll-b:
 			Start: 5
+			Y: 7
 		scroll-bl:
 			Start: 6
+			X: -6
+			Y: 5
 		scroll-l:
 			Start: 7
+			X: -8
 		scroll-tl:
 			Start: 8
+			X: -6
+			y: 5
 		scroll-t-blocked:
 			Start: 124
+			Y: -7
 		scroll-tr-blocked:
 			Start: 125
+			X: 6
+			Y: -5
 		scroll-r-blocked:
 			Start: 126
+			X: 7
 		scroll-br-blocked:
 			Start: 127
+			X: 6
+			Y: 5
 		scroll-b-blocked:
 			Start: 128
+			Y: 7
 		scroll-bl-blocked:
 			Start: 129
+			X: -6
+			Y: 5
 		scroll-l-blocked:
 			Start: 130
+			X: -8
 		scroll-tl-blocked:
 			Start: 131
+			X: -6
+			Y: 5
 		select:
 			Start: 15
 			Length: 6
diff --git a/mods/ts/cursors.yaml b/mods/ts/cursors.yaml
index 01ad0ad6c3..ebaafd448a 100644
--- a/mods/ts/cursors.yaml
+++ b/mods/ts/cursors.yaml
@@ -5,36 +5,60 @@ Cursors:
 	mouse.shp: cursor
 		scroll-t:
 			Start: 2
+			Y: -19
 		scroll-tr:
 			Start: 3
+			X: 26
+			Y: -16
 		scroll-r:
 			Start: 4
+			X: 28
 		scroll-br:
 			Start: 5
+			X: 25
+			Y: 19
 		scroll-b:
 			Start: 6
+			Y: 18
 		scroll-bl:
 			Start: 7
+			X: -26
+			Y: 16
 		scroll-l:
 			Start: 8
+			X: -28
 		scroll-tl:
 			Start: 9
+			X: -26
+			Y: -16
 		scroll-t-blocked:
 			Start: 10
+			Y: -19
 		scroll-tr-blocked:
 			Start: 11
+			X: 26
+			Y: -16
 		scroll-r-blocked:
 			Start: 12
+			X: 28
 		scroll-br-blocked:
 			Start: 13
+			X: 25
+			Y: 19
 		scroll-b-blocked:
 			Start: 14
+			Y: 18
 		scroll-bl-blocked:
 			Start: 15
+			X: -26
+			Y: 16
 		scroll-l-blocked:
 			Start: 16
+			X: -28
 		scroll-tl-blocked:
 			Start: 17
+			X: -26
+			Y: -16
 		select:
 			Start: 18
 			Length: 12