diff --git a/resources/definitions/grr_neo.def.json b/resources/definitions/grr_neo.def.json
index 9fc5d2121e..76ae73540f 100644
--- a/resources/definitions/grr_neo.def.json
+++ b/resources/definitions/grr_neo.def.json
@@ -35,17 +35,13 @@
         "machine_nozzle_cool_down_speed": {
             "default_value": 2
         },
-        "machine_head_shape_min_x": {
-            "default_value": 75
-        },
-        "machine_head_shape_min_y": {
-            "default_value": 18
-        },
-        "machine_head_shape_max_x": {
-            "default_value": 18
-        },
-        "machine_head_shape_max_y": {
-            "default_value": 35
+        "machine_head_polygon": {
+            "default_value": [
+                [-75, -18],
+                [-75, 35],
+                [18, 35],
+                [18, -18]
+            ]
         },
         "machine_nozzle_gantry_distance": {
             "default_value": 55
diff --git a/resources/definitions/innovo_inventor.def.json b/resources/definitions/innovo_inventor.def.json
index cd63423094..a0e8bd8b8f 100644
--- a/resources/definitions/innovo_inventor.def.json
+++ b/resources/definitions/innovo_inventor.def.json
@@ -32,17 +32,13 @@
         "machine_nozzle_size": {
             "default_value": 0.4
         },
-        "machine_head_shape_min_x": {
-            "default_value": 43.7
-        },
-        "machine_head_shape_min_y": {
-            "default_value": 19.2
-        },
-        "machine_head_shape_max_x": {
-            "default_value": 43.7
-        },
-        "machine_head_shape_max_y": {
-            "default_value": 55
+        "machine_head_polygon": {
+            "default_value": [
+                [-43.7, -19.2],
+                [-43.7, 55],
+                [43.7, 55],
+                [43.7, -19.2]
+            ]
         },
         "machine_nozzle_gantry_distance": {
             "default_value": 82.3
diff --git a/resources/definitions/maker_starter.def.json b/resources/definitions/maker_starter.def.json
index 24033d8968..94caa5d789 100644
--- a/resources/definitions/maker_starter.def.json
+++ b/resources/definitions/maker_starter.def.json
@@ -37,18 +37,6 @@
         "machine_nozzle_cool_down_speed": {
             "default_value": 2
         },
-        "machine_head_shape_min_x": {
-            "default_value": 0
-        },
-        "machine_head_shape_min_y": {
-            "default_value": 0
-        },
-        "machine_head_shape_max_x": {
-            "default_value": 0
-        },
-        "machine_head_shape_max_y": {
-            "default_value": 0
-        },
         "machine_nozzle_gantry_distance": {
             "default_value": 55
         },
diff --git a/resources/definitions/prusa_i3.def.json b/resources/definitions/prusa_i3.def.json
index 21db84838a..dbd5877248 100644
--- a/resources/definitions/prusa_i3.def.json
+++ b/resources/definitions/prusa_i3.def.json
@@ -41,17 +41,13 @@
         "machine_nozzle_cool_down_speed": {
             "default_value": 2
         },
-        "machine_head_shape_min_x": {
-            "default_value": 75
-        },
-        "machine_head_shape_min_y": {
-            "default_value": 18
-        },
-        "machine_head_shape_max_x": {
-            "default_value": 18
-        },
-        "machine_head_shape_max_y": {
-            "default_value": 35
+        "machine_head_polygon": {
+            "default_value": [
+                [-75, -18],
+                [-75, 35],
+                [18, 35],
+                [18, -18]
+            ]
         },
         "machine_nozzle_gantry_distance": {
             "default_value": 55
diff --git a/resources/definitions/prusa_i3_xl.def.json b/resources/definitions/prusa_i3_xl.def.json
index ddd1796eb7..049705abd4 100644
--- a/resources/definitions/prusa_i3_xl.def.json
+++ b/resources/definitions/prusa_i3_xl.def.json
@@ -41,17 +41,13 @@
         "machine_nozzle_cool_down_speed": {
             "default_value": 2.0
         },
-        "machine_head_shape_min_x": {
-            "default_value": 75
-        },
-        "machine_head_shape_min_y": {
-            "default_value": 18
-        },
-        "machine_head_shape_max_x": {
-            "default_value": 18
-        },
-        "machine_head_shape_max_y": {
-            "default_value": 35
+        "machine_head_polygon": {
+            "default_value": [
+                [-75, -18],
+                [-75, 35],
+                [18, 35],
+                [18, -18]
+            ]
         },
         "machine_nozzle_gantry_distance": {
             "default_value": 55
diff --git a/resources/definitions/rigidbot.def.json b/resources/definitions/rigidbot.def.json
index e70c407463..f8b8801395 100644
--- a/resources/definitions/rigidbot.def.json
+++ b/resources/definitions/rigidbot.def.json
@@ -31,18 +31,6 @@
         "machine_nozzle_cool_down_speed": {
             "default_value": 2
         },
-        "machine_head_shape_min_x": {
-            "default_value": 0
-        },
-        "machine_head_shape_min_y": {
-            "default_value": 0
-        },
-        "machine_head_shape_max_x": {
-            "default_value": 0
-        },
-        "machine_head_shape_max_y": {
-            "default_value": 0
-        },
         "machine_nozzle_gantry_distance": {
             "default_value": 0
         },
diff --git a/resources/definitions/rigidbot_big.def.json b/resources/definitions/rigidbot_big.def.json
index f4b282d9db..1037e3ea12 100644
--- a/resources/definitions/rigidbot_big.def.json
+++ b/resources/definitions/rigidbot_big.def.json
@@ -34,18 +34,6 @@
         "machine_nozzle_cool_down_speed": {
             "default_value": 2
         },
-        "machine_head_shape_min_x": {
-            "default_value": 0
-        },
-        "machine_head_shape_min_y": {
-            "default_value": 0
-        },
-        "machine_head_shape_max_x": {
-            "default_value": 0
-        },
-        "machine_head_shape_max_y": {
-            "default_value": 0
-        },
         "machine_nozzle_gantry_distance": {
             "default_value": 0
         },