diff --git a/resources/machines/RigidBot.json b/resources/machines/RigidBot.json
index 9fd6448a50..d3e8c845a3 100644
--- a/resources/machines/RigidBot.json
+++ b/resources/machines/RigidBot.json
@@ -50,7 +50,7 @@
         "speed_topbottom": { "default": 15.0, "visible": true },
         "speed_travel": { "default": 150.0, "visible": true },
         "speed_layer_0": { "min_value": 0.1, "default": 15.0, "visible": true },
-        "infill_overlap": { "default": 10.0 },
+        "infill_overlap": { "default": 0.04, "inherit_function": "0.1 * line_width if infill_sparse_density < 95 else 0" },
         "cool_fan_enabled": { "default": false, "visible": true }, 
         "cool_fan_speed": { "default": 0.0, "visible": true },
         "skirt_line_count": { "default": 3, "active_if": { "setting": "adhesion_type", "value": "None" } },
diff --git a/resources/machines/RigidBotBig.json b/resources/machines/RigidBotBig.json
index 8b9419f3dd..f9e552fc59 100644
--- a/resources/machines/RigidBotBig.json
+++ b/resources/machines/RigidBotBig.json
@@ -48,7 +48,7 @@
         "speed_topbottom": { "default": 15.0, "visible": true },
         "speed_travel": { "default": 150.0, "visible": true },
         "speed_layer_0": { "min_value": 0.1, "default": 15.0, "visible": true },
-        "infill_overlap": { "default": 10.0 },
+        "infill_overlap": { "default": 0.04, "inherit_function": "0.1 * line_width if infill_sparse_density < 95 else 0" },
         "cool_fan_enabled": { "default": false, "visible": true},
         "cool_fan_speed": { "default": 0.0, "visible": true },
         "skirt_line_count": { "default": 3, "active_if": { "setting": "adhesion_type", "value": "None" } },
diff --git a/resources/machines/bq_hephestos_2.json b/resources/machines/bq_hephestos_2.json
index 52478e752c..8e0338c9ba 100644
--- a/resources/machines/bq_hephestos_2.json
+++ b/resources/machines/bq_hephestos_2.json
@@ -46,7 +46,7 @@
         "wall_thickness": { "default": 1.2, "visible": false },
         "top_bottom_thickness": { "default": 1.2, "visible": false },
         "infill_sparse_density": { "default": 20.0 },
-        "infill_overlap": { "default": 15.0, "visible": false },
+        "infill_overlap": { "default": 0.06, "inherit_function": "0.15 * line_width if infill_sparse_density < 95 else 0", "visible": false },
         "speed_print": { "default": 60.0 },
         "speed_travel": { "default": 160.0 },
         "speed_layer_0": { "default": 30.0, "visible": true },
diff --git a/resources/machines/bq_witbox_2.json b/resources/machines/bq_witbox_2.json
index 8e54242060..adb1826066 100644
--- a/resources/machines/bq_witbox_2.json
+++ b/resources/machines/bq_witbox_2.json
@@ -46,7 +46,7 @@
         "wall_thickness": { "default": 1.2, "visible": false },
         "top_bottom_thickness": { "default": 1.2, "visible": false },
         "infill_sparse_density": { "default": 20.0 },
-        "infill_overlap": { "default": 15.0, "visible": false },
+        "infill_overlap": { "default": 0.06, "inherit_function": "0.15 * line_width if infill_sparse_density < 95 else 0", "visible": false },
         "speed_print": { "default": 60.0 },
         "speed_travel": { "default": 160.0 },
         "speed_layer_0": { "default": 30.0, "visible": true },
diff --git a/resources/machines/ultimaker2plus.json b/resources/machines/ultimaker2plus.json
index b75e66122d..5be86d1a76 100644
--- a/resources/machines/ultimaker2plus.json
+++ b/resources/machines/ultimaker2plus.json
@@ -22,7 +22,7 @@
         "skin_alternate_rotation": { "default": true },
         "skin_outline_count": { "default": 2 },
         "infill_sparse_density": { "default": 10 },
-        "infill_overlap": { "default": 14, "inherit_function": "14 if infill_sparse_density < 95 else 0" },
+        "infill_overlap": { "default": 0.056, "inherit_function": "0.14 * line_width if infill_sparse_density < 95 else 0" },
         "infill_wipe_dist": { "default": 0.35, "inherit_function": "wall_line_width_0" },
         "retraction_amount": { "default": 6 },
         "retraction_min_travel": { "default": 4.5 },
diff --git a/resources/profiles/ultimaker2+/abs_0.25_high.curaprofile b/resources/profiles/ultimaker2+/abs_0.25_high.curaprofile
index fd6b51c059..474212a553 100644
--- a/resources/profiles/ultimaker2+/abs_0.25_high.curaprofile
+++ b/resources/profiles/ultimaker2+/abs_0.25_high.curaprofile
@@ -33,7 +33,7 @@ shell_thickness = 0.88
 cool_fan_speed_max = 100
 raft_airgap = 0.0
 material_bed_temperature = 70
-infill_overlap = 15
+infill_overlap = 0.022
 speed_wall_x = 25
 skirt_minimal_length = 150.0
 speed_layer_0 = 20
diff --git a/resources/profiles/ultimaker2+/abs_0.4_fast.curaprofile b/resources/profiles/ultimaker2+/abs_0.4_fast.curaprofile
index 8ff2f1be6f..d0afe8742e 100644
--- a/resources/profiles/ultimaker2+/abs_0.4_fast.curaprofile
+++ b/resources/profiles/ultimaker2+/abs_0.4_fast.curaprofile
@@ -34,7 +34,7 @@ shell_thickness = 0.7
 cool_fan_speed_max = 100
 raft_airgap = 0.0
 material_bed_temperature = 70
-infill_overlap = 15
+infill_overlap = 0.0525
 speed_wall_x = 40
 skirt_minimal_length = 150.0
 bottom_thickness = 0.75
diff --git a/resources/profiles/ultimaker2+/abs_0.4_high.curaprofile b/resources/profiles/ultimaker2+/abs_0.4_high.curaprofile
index 55eae0a8f4..c67f924158 100644
--- a/resources/profiles/ultimaker2+/abs_0.4_high.curaprofile
+++ b/resources/profiles/ultimaker2+/abs_0.4_high.curaprofile
@@ -33,7 +33,7 @@ shell_thickness = 1.05
 cool_fan_speed_max = 100
 raft_airgap = 0.0
 material_bed_temperature = 70
-infill_overlap = 15
+infill_overlap = 0.0525
 speed_wall_x = 30
 skirt_minimal_length = 150.0
 speed_layer_0 = 20
diff --git a/resources/profiles/ultimaker2+/abs_0.4_normal.curaprofile b/resources/profiles/ultimaker2+/abs_0.4_normal.curaprofile
index 627f22aa61..d34b91b446 100644
--- a/resources/profiles/ultimaker2+/abs_0.4_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/abs_0.4_normal.curaprofile
@@ -29,7 +29,7 @@ shell_thickness = 1.05
 cool_fan_speed_max = 100
 raft_airgap = 0.0
 material_bed_temperature = 70
-infill_overlap = 15
+infill_overlap = 0.0525
 speed_wall_x = 30
 skirt_minimal_length = 150.0
 speed_layer_0 = 20
diff --git a/resources/profiles/ultimaker2+/abs_0.6_normal.curaprofile b/resources/profiles/ultimaker2+/abs_0.6_normal.curaprofile
index 54904f0e2d..801fe7f29b 100644
--- a/resources/profiles/ultimaker2+/abs_0.6_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/abs_0.6_normal.curaprofile
@@ -32,7 +32,7 @@ shell_thickness = 1.59
 cool_fan_speed_max = 100
 raft_airgap = 0.0
 material_bed_temperature = 70
-infill_overlap = 15
+infill_overlap = 0.0795
 speed_wall_x = 30
 skirt_minimal_length = 150.0
 speed_layer_0 = 20
diff --git a/resources/profiles/ultimaker2+/abs_0.8_fast.curaprofile b/resources/profiles/ultimaker2+/abs_0.8_fast.curaprofile
index 45ac82364b..2824a8c077 100644
--- a/resources/profiles/ultimaker2+/abs_0.8_fast.curaprofile
+++ b/resources/profiles/ultimaker2+/abs_0.8_fast.curaprofile
@@ -32,7 +32,7 @@ shell_thickness = 2.1
 cool_fan_speed_max = 100
 raft_airgap = 0.0
 material_bed_temperature = 70
-infill_overlap = 15
+infill_overlap = 0.105
 speed_wall_x = 30
 skirt_minimal_length = 150.0
 speed_layer_0 = 20
diff --git a/resources/profiles/ultimaker2+/cpe_0.25_high.curaprofile b/resources/profiles/ultimaker2+/cpe_0.25_high.curaprofile
index 6442cbd5e9..ac95f856bf 100644
--- a/resources/profiles/ultimaker2+/cpe_0.25_high.curaprofile
+++ b/resources/profiles/ultimaker2+/cpe_0.25_high.curaprofile
@@ -39,7 +39,7 @@ material_bed_temperature = 70
 top_thickness = 0.72
 top_bottom_thickness = 0.72
 speed_wall_x = 25
-infill_overlap = 17
+infill_overlap = 0.0374
 infill_before_walls = False
 raft_surface_line_width = 0.4
 skirt_minimal_length = 150.0
diff --git a/resources/profiles/ultimaker2+/cpe_0.4_fast.curaprofile b/resources/profiles/ultimaker2+/cpe_0.4_fast.curaprofile
index 9b2a4dd901..82df8ce412 100644
--- a/resources/profiles/ultimaker2+/cpe_0.4_fast.curaprofile
+++ b/resources/profiles/ultimaker2+/cpe_0.4_fast.curaprofile
@@ -40,7 +40,7 @@ material_bed_temperature = 70
 top_thickness = 0.75
 top_bottom_thickness = 0.75
 speed_wall_x = 40
-infill_overlap = 17
+infill_overlap = 0.0595
 infill_before_walls = False
 skirt_minimal_length = 150.0
 speed_topbottom = 20
diff --git a/resources/profiles/ultimaker2+/cpe_0.4_high.curaprofile b/resources/profiles/ultimaker2+/cpe_0.4_high.curaprofile
index 0ca6bdca19..31a47bf22c 100644
--- a/resources/profiles/ultimaker2+/cpe_0.4_high.curaprofile
+++ b/resources/profiles/ultimaker2+/cpe_0.4_high.curaprofile
@@ -39,7 +39,7 @@ material_bed_temperature = 70
 top_thickness = 0.72
 top_bottom_thickness = 0.72
 speed_wall_x = 30
-infill_overlap = 15
+infill_overlap = 0.0525
 infill_before_walls = False
 raft_surface_line_width = 0.4
 skirt_minimal_length = 150.0
diff --git a/resources/profiles/ultimaker2+/cpe_0.4_normal.curaprofile b/resources/profiles/ultimaker2+/cpe_0.4_normal.curaprofile
index 340ded170e..171c2c2f62 100644
--- a/resources/profiles/ultimaker2+/cpe_0.4_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/cpe_0.4_normal.curaprofile
@@ -35,7 +35,7 @@ retraction_speed = 40.0
 layer_height_0 = 0.26
 material_bed_temperature = 70
 speed_wall_x = 30
-infill_overlap = 15
+infill_overlap = 0.0525
 speed_infill = 45
 skirt_minimal_length = 150.0
 speed_topbottom = 20
diff --git a/resources/profiles/ultimaker2+/cpe_0.6_normal.curaprofile b/resources/profiles/ultimaker2+/cpe_0.6_normal.curaprofile
index d1b26b64e8..58e5bbced0 100644
--- a/resources/profiles/ultimaker2+/cpe_0.6_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/cpe_0.6_normal.curaprofile
@@ -38,7 +38,7 @@ material_bed_temperature = 70
 top_thickness = 1.2
 top_bottom_thickness = 1.2
 speed_wall_x = 30
-infill_overlap = 17
+infill_overlap = 0.0901
 infill_before_walls = False
 raft_surface_line_width = 0.4
 skirt_minimal_length = 150.0
diff --git a/resources/profiles/ultimaker2+/cpe_0.8_fast.curaprofile b/resources/profiles/ultimaker2+/cpe_0.8_fast.curaprofile
index 94cb538b63..f5025c049f 100644
--- a/resources/profiles/ultimaker2+/cpe_0.8_fast.curaprofile
+++ b/resources/profiles/ultimaker2+/cpe_0.8_fast.curaprofile
@@ -38,7 +38,7 @@ material_bed_temperature = 70
 top_thickness = 1.2
 top_bottom_thickness = 1.2
 speed_wall_x = 30
-infill_overlap = 17
+infill_overlap = 0.119
 infill_before_walls = False
 raft_surface_line_width = 0.4
 skirt_minimal_length = 150.0
diff --git a/resources/profiles/ultimaker2+/pla_0.25_high.curaprofile b/resources/profiles/ultimaker2+/pla_0.25_high.curaprofile
index db552e3f82..3951f92ef4 100644
--- a/resources/profiles/ultimaker2+/pla_0.25_high.curaprofile
+++ b/resources/profiles/ultimaker2+/pla_0.25_high.curaprofile
@@ -13,7 +13,7 @@ speed_print = 20
 speed_wall_0 = 20
 raft_interface_line_spacing = 3.0
 shell_thickness = 0.88
-infill_overlap = 15
+infill_overlap = 0.033
 retraction_hop = 0.0
 material_bed_temperature = 70
 skin_no_small_gaps_heuristic = False
diff --git a/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile
index b13bfc075f..4edf925732 100644
--- a/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile
+++ b/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile
@@ -27,7 +27,7 @@ brim_line_count = 22
 infill_before_walls = False
 raft_surface_thickness = 0.27
 raft_airgap = 0.0
-infill_overlap = 15
+infill_overlap = 0.0525
 raft_interface_line_width = 0.4
 speed_topbottom = 30
 support_pattern = lines
diff --git a/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile
index baf1848efb..9de62fbc69 100644
--- a/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile
+++ b/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile
@@ -13,7 +13,7 @@ speed_print = 30
 speed_wall_0 = 30
 raft_interface_line_spacing = 3.0
 shell_thickness = 1.05
-infill_overlap = 15
+infill_overlap = 0.0525
 retraction_hop = 0.0
 material_bed_temperature = 70
 skin_no_small_gaps_heuristic = False
diff --git a/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile
index db5ea4fd44..c45cc2ec61 100644
--- a/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile
@@ -26,7 +26,7 @@ brim_line_count = 22
 infill_before_walls = False
 raft_surface_thickness = 0.27
 raft_airgap = 0.0
-infill_overlap = 15
+infill_overlap = 0.0525
 raft_interface_line_width = 0.4
 speed_topbottom = 20
 support_pattern = lines
diff --git a/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile
index 09d1061880..7ec4c4b513 100644
--- a/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile
@@ -13,7 +13,7 @@ speed_print = 25
 speed_wall_0 = 25
 raft_interface_line_spacing = 3.0
 shell_thickness = 1.59
-infill_overlap = 15
+infill_overlap = 0.0795
 retraction_hop = 0.0
 material_bed_temperature = 70
 skin_no_small_gaps_heuristic = False
diff --git a/resources/profiles/ultimaker2+/pla_0.8_fast.curaprofile b/resources/profiles/ultimaker2+/pla_0.8_fast.curaprofile
index a3d4242072..af64414465 100644
--- a/resources/profiles/ultimaker2+/pla_0.8_fast.curaprofile
+++ b/resources/profiles/ultimaker2+/pla_0.8_fast.curaprofile
@@ -13,7 +13,7 @@ speed_print = 20
 speed_wall_0 = 25
 raft_interface_line_spacing = 3.0
 shell_thickness = 2.1
-infill_overlap = 15
+infill_overlap = 0.105
 retraction_hop = 0.0
 material_bed_temperature = 70
 skin_no_small_gaps_heuristic = False
diff --git a/resources/settings/innovo-inventor.json b/resources/settings/innovo-inventor.json
index c7259bb1fc..23b5c0acaf 100644
--- a/resources/settings/innovo-inventor.json
+++ b/resources/settings/innovo-inventor.json
@@ -12,7 +12,7 @@
         "machine_width": {"default": 340},
         "machine_height": {"default": 290},
         "machine_depth": {"default": 300},
-        "machine_heated_bed": { "default": true }
+        "machine_heated_bed": { "default": true },
         "machine_center_is_zero": {"default": false},
         "machine_nozzle_size": {"default": 0.4},
         "machine_head_shape_min_x": {"default": 43.7},
@@ -44,6 +44,6 @@
         "speed_topbottom": { "default": 30.0, "visible": true },
         "speed_travel": { "default": 150.0, "visible": true },
         "speed_layer_0": { "min_value": 0.1, "default": 30.0, "visible": true },
-        "infill_overlap": { "default": 10.0 }
+        "infill_overlap": { "default": 0.04, "inherit_function": "0.1 * line_width if infill_sparse_density < 95 else 0" }
     }
 }