diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json
index f4c07db2a8..d440f0f70a 100644
--- a/resources/definitions/fdmprinter.def.json
+++ b/resources/definitions/fdmprinter.def.json
@@ -1147,7 +1147,7 @@
                     "type": "float",
                     "default_value": 25,
                     "minimum_value": "0",
-                    "maximum_value": "299792458000",
+                    "maximum_value": "machine_max_feedrate_e",
                     "maximum_value_warning": "100",
                     "enabled": "retraction_enable",
                     "settable_per_mesh": false,
@@ -1160,7 +1160,7 @@
                             "type": "float",
                             "default_value": 25,
                             "minimum_value": "0",
-                            "maximum_value": "299792458000",
+                            "maximum_value": "machine_max_feedrate_e",
                             "maximum_value_warning": "100",
                             "enabled": "retraction_enable",
                             "value": "retraction_speed",
@@ -1174,7 +1174,7 @@
                             "type": "float",
                             "default_value": 25,
                             "minimum_value": "0",
-                            "maximum_value": "299792458000",
+                            "maximum_value": "machine_max_feedrate_e",
                             "maximum_value_warning": "100",
                             "enabled": "retraction_enable",
                             "value": "retraction_speed",
@@ -1359,7 +1359,7 @@
                     "type": "float",
                     "minimum_value": "0.1",
                     "maximum_value_warning": "150",
-                    "maximum_value": "299792458000",
+                    "maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2)",
                     "default_value": 60,
                     "settable_per_mesh": true,
                     "children":
@@ -1371,7 +1371,7 @@
                             "unit": "mm/s",
                             "type": "float",
                             "minimum_value": "0.1",
-                            "maximum_value": "299792458000",
+                            "maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2)",
                             "maximum_value_warning": "150",
                             "default_value": 60,
                             "value": "speed_print",
@@ -1384,7 +1384,7 @@
                             "unit": "mm/s",
                             "type": "float",
                             "minimum_value": "0.1",
-                            "maximum_value": "299792458000",
+                            "maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2)",
                             "maximum_value_warning": "150",
                             "default_value": 30,
                             "value": "speed_print / 2",
@@ -1398,7 +1398,7 @@
                                     "unit": "mm/s",
                                     "type": "float",
                                     "minimum_value": "0.1",
-                                    "maximum_value": "299792458000",
+                                    "maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2)",
                                     "maximum_value_warning": "150",
                                     "default_value": 30,
                                     "value": "speed_wall",
@@ -1411,7 +1411,7 @@
                                     "unit": "mm/s",
                                     "type": "float",
                                     "minimum_value": "0.1",
-                                    "maximum_value": "299792458000",
+                                    "maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2)",
                                     "maximum_value_warning": "150",
                                     "default_value": 60,
                                     "value": "speed_wall * 2",
@@ -1426,7 +1426,7 @@
                             "unit": "mm/s",
                             "type": "float",
                             "minimum_value": "0.1",
-                            "maximum_value": "299792458000",
+                            "maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2)",
                             "maximum_value_warning": "150",
                             "default_value": 30,
                             "value": "speed_print / 2",
@@ -1439,7 +1439,7 @@
                             "unit": "mm/s",
                             "type": "float",
                             "minimum_value": "0.1",
-                            "maximum_value": "299792458000",
+                            "maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2)",
                             "maximum_value_warning": "150",
                             "default_value": 60,
                             "value": "speed_print",
@@ -1456,7 +1456,7 @@
                                     "type": "float",
                                     "default_value": 60,
                                     "minimum_value": "0.1",
-                                    "maximum_value": "299792458000",
+                                    "maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2)",
                                     "maximum_value_warning": "150",
                                     "value": "speed_support",
                                     "enabled": "support_enable",
@@ -1471,7 +1471,7 @@
                                     "type": "float",
                                     "default_value": 40,
                                     "minimum_value": "0.1",
-                                    "maximum_value": "299792458000",
+                                    "maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2)",
                                     "maximum_value_warning": "150",
                                     "enabled": "extruderValue(support_extruder_nr, 'support_interface_enable') and support_enable",
                                     "value": "speed_support / 1.5",
@@ -1490,6 +1490,7 @@
                             "default_value": 60,
                             "value": "speed_print",
                             "minimum_value": "0.1",
+                            "maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2)",
                             "maximum_value_warning": "150",
                             "settable_per_mesh": false,
                             "settable_per_extruder": true
@@ -1504,7 +1505,7 @@
                     "type": "float",
                     "default_value": 120,
                     "minimum_value": "0.1",
-                    "maximum_value": "299792458000",
+                    "maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2)",
                     "maximum_value_warning": "300",
                     "value": "speed_print if magic_spiralize else 120",
                     "settable_per_mesh": false,
@@ -1517,7 +1518,7 @@
                     "type": "float",
                     "default_value": 30,
                     "minimum_value": "0.1",
-                    "maximum_value": "299792458000",
+                    "maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2)",
                     "maximum_value_warning": "300",
                     "settable_per_mesh": true,
                     "children":
@@ -1531,7 +1532,7 @@
                             "default_value": 30,
                             "value": "speed_layer_0",
                             "minimum_value": "0.1",
-                            "maximum_value": "299792458000",
+                            "maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2)",
                             "maximum_value_warning": "300",
                             "settable_per_mesh": true
                         },
@@ -1544,7 +1545,7 @@
                             "default_value": 60,
                             "value": "speed_layer_0 * speed_travel / speed_print",
                             "minimum_value": "0.1",
-                            "maximum_value": "299792458000",
+                            "maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2)",
                             "maximum_value_warning": "300",
                             "settable_per_extruder": true,
                             "settable_per_mesh": false
@@ -1558,7 +1559,7 @@
                     "type": "float",
                     "default_value": 30,
                     "minimum_value": "0.1",
-                    "maximum_value": "299792458000",
+                    "maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2)",
                     "maximum_value_warning": "300",
                     "value": "speed_layer_0",
                     "enabled": "adhesion_type == \"skirt\" or adhesion_type == \"brim\"",
@@ -1585,8 +1586,6 @@
                     "type": "int",
                     "default_value": 2,
                     "minimum_value": "0",
-                    "maximum_value": "299792458000",
-                    "maximum_value_warning": "300",
                     "settable_per_mesh": false,
                     "settable_per_extruder": false
                 },
@@ -1608,7 +1607,7 @@
                     "enabled": "speed_equalize_flow_enabled",
                     "default_value": 150,
                     "minimum_value": "0.1",
-                    "maximum_value": "299792458000",
+                    "maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2)",
                     "maximum_value_warning": "150",
                     "settable_per_mesh": false,
                     "settable_per_extruder": true
@@ -2931,7 +2930,7 @@
                     "type": "float",
                     "default_value": 20,
                     "minimum_value": "0.1",
-                    "maximum_value": "299792458000",
+                    "maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2)",
                     "maximum_value_warning": "200",
                     "enabled": "adhesion_type == \"raft\"",
                     "value": "speed_print / 60 * 30",
@@ -2947,7 +2946,7 @@
                             "type": "float",
                             "default_value": 20,
                             "minimum_value": "0.1",
-                            "maximum_value": "299792458000",
+                            "maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2)",
                             "maximum_value_warning": "100",
                             "enabled": "adhesion_type == \"raft\"",
                             "value": "raft_speed",
@@ -2963,7 +2962,7 @@
                             "default_value": 15,
                             "value": "raft_speed * 0.75",
                             "minimum_value": "0.1",
-                            "maximum_value": "299792458000",
+                            "maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2)",
                             "maximum_value_warning": "150",
                             "enabled": "adhesion_type == \"raft\"",
                             "settable_per_mesh": false,
@@ -2977,7 +2976,7 @@
                             "type": "float",
                             "default_value": 15,
                             "minimum_value": "0.1",
-                            "maximum_value": "299792458000",
+                            "maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2)",
                             "maximum_value_warning": "200",
                             "enabled": "adhesion_type == \"raft\"",
                             "value": "0.75 * raft_speed",
@@ -3737,7 +3736,7 @@
                     "type": "float",
                     "default_value": 5,
                     "minimum_value": "0.1",
-                    "maximum_value": "299792458000",
+                    "maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2)",
                     "maximum_value_warning": "50",
                     "enabled": "wireframe_enabled",
                     "settable_per_mesh": false,
@@ -3753,7 +3752,7 @@
                             "type": "float",
                             "default_value": 5,
                             "minimum_value": "0.1",
-                            "maximum_value": "299792458000",
+                            "maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2)",
                             "maximum_value_warning": "50",
                             "enabled": "wireframe_enabled",
                             "value": "wireframe_printspeed",
@@ -3769,7 +3768,7 @@
                             "type": "float",
                             "default_value": 5,
                             "minimum_value": "0.1",
-                            "maximum_value": "299792458000",
+                            "maximum_value": "math.max(max_feedrate_z_override, machine_max_feedrate_z)",
                             "maximum_value_warning": "50",
                             "enabled": "wireframe_enabled",
                             "value": "wireframe_printspeed",
@@ -3785,7 +3784,7 @@
                             "type": "float",
                             "default_value": 5,
                             "minimum_value": "0.1",
-                            "maximum_value": "299792458000",
+                            "maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2)",
                             "maximum_value_warning": "50",
                             "enabled": "wireframe_enabled",
                             "value": "wireframe_printspeed",
@@ -3801,7 +3800,7 @@
                             "type": "float",
                             "default_value": 5,
                             "minimum_value": "0.1",
-                            "maximum_value": "299792458000",
+                            "maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2)",
                             "maximum_value_warning": "100",
                             "value": "wireframe_printspeed",
                             "enabled": "wireframe_enabled",