diff --git a/public/models/FANUC_ARC_Mate_120iD.glb b/public/models/FANUC_ARC_Mate_120iD.glb
index 8e78163..6df14c4 100644
Binary files a/public/models/FANUC_ARC_Mate_120iD.glb and b/public/models/FANUC_ARC_Mate_120iD.glb differ
diff --git a/public/models/FANUC_ARC_Mate_120iD35.glb b/public/models/FANUC_ARC_Mate_120iD35.glb
index 8e78163..acd2c00 100644
Binary files a/public/models/FANUC_ARC_Mate_120iD35.glb and b/public/models/FANUC_ARC_Mate_120iD35.glb differ
diff --git a/public/models/FANUC_M20iD25.glb b/public/models/FANUC_M20iD25.glb
index 8e78163..6df14c4 100644
Binary files a/public/models/FANUC_M20iD25.glb and b/public/models/FANUC_M20iD25.glb differ
diff --git a/public/models/FANUC_M20iD35.glb b/public/models/FANUC_M20iD35.glb
index 30ee891..acd2c00 100644
Binary files a/public/models/FANUC_M20iD35.glb and b/public/models/FANUC_M20iD35.glb differ
diff --git a/public/models/Yaskawa_AR2010.glb b/public/models/Yaskawa_AR2010.glb
index fe2bc13..7952088 100644
Binary files a/public/models/Yaskawa_AR2010.glb and b/public/models/Yaskawa_AR2010.glb differ
diff --git a/public/models/Yaskawa_GP25_12.glb b/public/models/Yaskawa_GP25_12.glb
index fe2bc13..7952088 100644
Binary files a/public/models/Yaskawa_GP25_12.glb and b/public/models/Yaskawa_GP25_12.glb differ
diff --git a/src/components/jogging/JoggingCartesianTab.tsx b/src/components/jogging/JoggingCartesianTab.tsx
index 57cd89f..c9b7591 100644
--- a/src/components/jogging/JoggingCartesianTab.tsx
+++ b/src/components/jogging/JoggingCartesianTab.tsx
@@ -83,7 +83,10 @@ export const JoggingCartesianTab = observer(
             currentTcpPose: tcpPose,
             currentJoints: jointPosition,
             coordSystemId: store.activeCoordSystemId,
-            velocityInRelevantUnits: store.velocityInCurrentUnits,
+            velocityInRelevantUnits:
+              store.selectedCartesianMotionType === "translate"
+                ? store.translationVelocityMmPerSec
+                : store.rotationVelocityRadsPerSec,
             axis: opts.axis,
             direction: opts.direction,
             motion:
diff --git a/src/components/jogging/JoggingStore.ts b/src/components/jogging/JoggingStore.ts
index 7acda07..261aeb4 100644
--- a/src/components/jogging/JoggingStore.ts
+++ b/src/components/jogging/JoggingStore.ts
@@ -340,19 +340,22 @@ export class JoggingStore {
     return (this.rotationVelocityDegPerSec * Math.PI) / 180
   }
 
-  get velocityInCurrentUnits() {
+  /** Selected velocity in mm/sec or deg/sec */
+  get velocityInDisplayUnits() {
     return this.currentMotionType === "translate"
       ? this.translationVelocityMmPerSec
       : this.rotationVelocityDegPerSec
   }
 
-  get minVelocityInCurrentUnits() {
+  /** Minimum selectable velocity in mm/sec or deg/sec */
+  get minVelocityInDisplayUnits() {
     return this.currentMotionType === "translate"
       ? this.minTranslationVelocityMmPerSec
       : this.minRotationVelocityDegPerSec
   }
 
-  get maxVelocityInCurrentUnits() {
+  /** Maximum selectable velocity in mm/sec or deg/sec */
+  get maxVelocityInDisplayUnits() {
     return this.currentMotionType === "translate"
       ? this.maxTranslationVelocityMmPerSec
       : this.maxRotationVelocityDegPerSec
diff --git a/src/components/jogging/JoggingVelocitySlider.tsx b/src/components/jogging/JoggingVelocitySlider.tsx
index 2dd3432..916b5ec 100644
--- a/src/components/jogging/JoggingVelocitySlider.tsx
+++ b/src/components/jogging/JoggingVelocitySlider.tsx
@@ -21,9 +21,9 @@ export const JoggingVelocitySlider = observer(
 
     return (
       <VelocitySlider
-        velocity={store.velocityInCurrentUnits}
-        min={store.minVelocityInCurrentUnits}
-        max={store.maxVelocityInCurrentUnits}
+        velocity={store.velocityInDisplayUnits}
+        min={store.minVelocityInDisplayUnits}
+        max={store.maxVelocityInDisplayUnits}
         onVelocityChange={store.setVelocityFromSlider}
         disabled={store.isLocked}
         renderValue={(value) => (