diff --git a/tests/testdata/control_images/expected_pal_canvas/sp_background_rect/sp_background_rect_mask.png b/tests/testdata/control_images/expected_pal_canvas/sp_background_rect/sp_background_rect_mask.png
index 6ef47f15e1c..375a758a2a9 100644
Binary files a/tests/testdata/control_images/expected_pal_canvas/sp_background_rect/sp_background_rect_mask.png and b/tests/testdata/control_images/expected_pal_canvas/sp_background_rect/sp_background_rect_mask.png differ
diff --git a/tests/testdata/control_images/expected_pal_canvas/sp_background_rect_w_offset/sp_background_rect_w_offset_mask.png b/tests/testdata/control_images/expected_pal_canvas/sp_background_rect_w_offset/sp_background_rect_w_offset_mask.png
index 702f42b62fe..b24e28b9e28 100644
Binary files a/tests/testdata/control_images/expected_pal_canvas/sp_background_rect_w_offset/sp_background_rect_w_offset_mask.png and b/tests/testdata/control_images/expected_pal_canvas/sp_background_rect_w_offset/sp_background_rect_w_offset_mask.png differ
diff --git a/tests/testdata/control_images/expected_pal_canvas/sp_background_svg/sp_background_svg_mask.png b/tests/testdata/control_images/expected_pal_canvas/sp_background_svg/sp_background_svg_mask.png
index 7db4c7b256e..f090466c817 100644
Binary files a/tests/testdata/control_images/expected_pal_canvas/sp_background_svg/sp_background_svg_mask.png and b/tests/testdata/control_images/expected_pal_canvas/sp_background_svg/sp_background_svg_mask.png differ
diff --git a/tests/testdata/control_images/expected_pal_canvas/sp_background_svg_w_offset/sp_background_svg_w_offset_mask.png b/tests/testdata/control_images/expected_pal_canvas/sp_background_svg_w_offset/sp_background_svg_w_offset_mask.png
index ff2fe14b829..a595de6c234 100644
Binary files a/tests/testdata/control_images/expected_pal_canvas/sp_background_svg_w_offset/sp_background_svg_w_offset_mask.png and b/tests/testdata/control_images/expected_pal_canvas/sp_background_svg_w_offset/sp_background_svg_w_offset_mask.png differ
diff --git a/tests/testdata/control_images/expected_pal_canvas/sp_default_label/sp_default_label_mask.png b/tests/testdata/control_images/expected_pal_canvas/sp_default_label/sp_default_label_mask.png
index 4dbecc13231..87c4fe74933 100644
Binary files a/tests/testdata/control_images/expected_pal_canvas/sp_default_label/sp_default_label_mask.png and b/tests/testdata/control_images/expected_pal_canvas/sp_default_label/sp_default_label_mask.png differ
diff --git a/tests/testdata/control_images/expected_pal_canvas/sp_partials_labels_disabled/sp_partials_labels_disabled_mask.png b/tests/testdata/control_images/expected_pal_canvas/sp_partials_labels_disabled/sp_partials_labels_disabled_mask.png
new file mode 100644
index 00000000000..d3ccf67effc
Binary files /dev/null and b/tests/testdata/control_images/expected_pal_canvas/sp_partials_labels_disabled/sp_partials_labels_disabled_mask.png differ
diff --git a/tests/testdata/control_images/expected_pal_canvas/sp_partials_labels_enabled/sp_partials_labels_enabled_mask.png b/tests/testdata/control_images/expected_pal_canvas/sp_partials_labels_enabled/sp_partials_labels_enabled_mask.png
index faf56aaf306..85c69a380ad 100644
Binary files a/tests/testdata/control_images/expected_pal_canvas/sp_partials_labels_enabled/sp_partials_labels_enabled_mask.png and b/tests/testdata/control_images/expected_pal_canvas/sp_partials_labels_enabled/sp_partials_labels_enabled_mask.png differ
diff --git a/tests/testdata/control_images/expected_pal_canvas/sp_text_color/sp_text_color_mask.png b/tests/testdata/control_images/expected_pal_canvas/sp_text_color/sp_text_color_mask.png
index 38823af2334..d18b00cbbda 100644
Binary files a/tests/testdata/control_images/expected_pal_canvas/sp_text_color/sp_text_color_mask.png and b/tests/testdata/control_images/expected_pal_canvas/sp_text_color/sp_text_color_mask.png differ
diff --git a/tests/testdata/control_images/expected_pal_canvas/sp_text_size_map_unit/sp_text_size_map_unit_mask.png b/tests/testdata/control_images/expected_pal_canvas/sp_text_size_map_unit/sp_text_size_map_unit_mask.png
index 4dbecc13231..87c4fe74933 100644
Binary files a/tests/testdata/control_images/expected_pal_canvas/sp_text_size_map_unit/sp_text_size_map_unit_mask.png and b/tests/testdata/control_images/expected_pal_canvas/sp_text_size_map_unit/sp_text_size_map_unit_mask.png differ
diff --git a/tests/testdata/control_images/expected_pal_composer/sp_img_background_rect/sp_img_background_rect_mask.png b/tests/testdata/control_images/expected_pal_composer/sp_img_background_rect/sp_img_background_rect_mask.png
index 043bfc3bd1a..fc6ddf326e8 100644
Binary files a/tests/testdata/control_images/expected_pal_composer/sp_img_background_rect/sp_img_background_rect_mask.png and b/tests/testdata/control_images/expected_pal_composer/sp_img_background_rect/sp_img_background_rect_mask.png differ
diff --git a/tests/testdata/control_images/expected_pal_composer/sp_img_background_rect_w_offset/sp_img_background_rect_w_offset_mask.png b/tests/testdata/control_images/expected_pal_composer/sp_img_background_rect_w_offset/sp_img_background_rect_w_offset_mask.png
index 887a694a6c5..aa8abea50a0 100644
Binary files a/tests/testdata/control_images/expected_pal_composer/sp_img_background_rect_w_offset/sp_img_background_rect_w_offset_mask.png and b/tests/testdata/control_images/expected_pal_composer/sp_img_background_rect_w_offset/sp_img_background_rect_w_offset_mask.png differ
diff --git a/tests/testdata/control_images/expected_pal_composer/sp_img_background_svg/sp_img_background_svg_mask.png b/tests/testdata/control_images/expected_pal_composer/sp_img_background_svg/sp_img_background_svg_mask.png
index 9c81d2b8d88..e44863014cc 100644
Binary files a/tests/testdata/control_images/expected_pal_composer/sp_img_background_svg/sp_img_background_svg_mask.png and b/tests/testdata/control_images/expected_pal_composer/sp_img_background_svg/sp_img_background_svg_mask.png differ
diff --git a/tests/testdata/control_images/expected_pal_composer/sp_img_background_svg_w_offset/sp_img_background_svg_w_offset_mask.png b/tests/testdata/control_images/expected_pal_composer/sp_img_background_svg_w_offset/sp_img_background_svg_w_offset_mask.png
index 0f791e539e7..7d913f82b43 100644
Binary files a/tests/testdata/control_images/expected_pal_composer/sp_img_background_svg_w_offset/sp_img_background_svg_w_offset_mask.png and b/tests/testdata/control_images/expected_pal_composer/sp_img_background_svg_w_offset/sp_img_background_svg_w_offset_mask.png differ
diff --git a/tests/testdata/control_images/expected_pal_composer/sp_img_default_label/sp_img_default_label_mask.png b/tests/testdata/control_images/expected_pal_composer/sp_img_default_label/sp_img_default_label_mask.png
index fcde5e7f751..ddbfc0d3248 100644
Binary files a/tests/testdata/control_images/expected_pal_composer/sp_img_default_label/sp_img_default_label_mask.png and b/tests/testdata/control_images/expected_pal_composer/sp_img_default_label/sp_img_default_label_mask.png differ
diff --git a/tests/testdata/control_images/expected_pal_composer/sp_img_partials_labels_enabled/sp_img_partials_labels_enabled_mask.png b/tests/testdata/control_images/expected_pal_composer/sp_img_partials_labels_enabled/sp_img_partials_labels_enabled_mask.png
index 80389cb2765..395368cc6df 100644
Binary files a/tests/testdata/control_images/expected_pal_composer/sp_img_partials_labels_enabled/sp_img_partials_labels_enabled_mask.png and b/tests/testdata/control_images/expected_pal_composer/sp_img_partials_labels_enabled/sp_img_partials_labels_enabled_mask.png differ
diff --git a/tests/testdata/control_images/expected_pal_composer/sp_img_text_color/sp_img_text_color_mask.png b/tests/testdata/control_images/expected_pal_composer/sp_img_text_color/sp_img_text_color_mask.png
index b3123ce1a0f..4b79f44deb4 100644
Binary files a/tests/testdata/control_images/expected_pal_composer/sp_img_text_color/sp_img_text_color_mask.png and b/tests/testdata/control_images/expected_pal_composer/sp_img_text_color/sp_img_text_color_mask.png differ
diff --git a/tests/testdata/control_images/expected_pal_server/sp_background_rect/sp_background_rect_mask.png b/tests/testdata/control_images/expected_pal_server/sp_background_rect/sp_background_rect_mask.png
index ba85dd2dcbf..86dc5294dd1 100644
Binary files a/tests/testdata/control_images/expected_pal_server/sp_background_rect/sp_background_rect_mask.png and b/tests/testdata/control_images/expected_pal_server/sp_background_rect/sp_background_rect_mask.png differ
diff --git a/tests/testdata/control_images/expected_pal_server/sp_background_rect_w_offset/sp_background_rect_w_offset_mask.png b/tests/testdata/control_images/expected_pal_server/sp_background_rect_w_offset/sp_background_rect_w_offset_mask.png
index ad031e08ac1..89d3e8481c4 100644
Binary files a/tests/testdata/control_images/expected_pal_server/sp_background_rect_w_offset/sp_background_rect_w_offset_mask.png and b/tests/testdata/control_images/expected_pal_server/sp_background_rect_w_offset/sp_background_rect_w_offset_mask.png differ
diff --git a/tests/testdata/control_images/expected_pal_server/sp_background_svg/sp_background_svg_mask.png b/tests/testdata/control_images/expected_pal_server/sp_background_svg/sp_background_svg_mask.png
index 5d95adad051..31b2aae078f 100644
Binary files a/tests/testdata/control_images/expected_pal_server/sp_background_svg/sp_background_svg_mask.png and b/tests/testdata/control_images/expected_pal_server/sp_background_svg/sp_background_svg_mask.png differ
diff --git a/tests/testdata/control_images/expected_pal_server/sp_background_svg_w_offset/sp_background_svg_w_offset_mask.png b/tests/testdata/control_images/expected_pal_server/sp_background_svg_w_offset/sp_background_svg_w_offset_mask.png
index 132f3370108..080f09a1952 100644
Binary files a/tests/testdata/control_images/expected_pal_server/sp_background_svg_w_offset/sp_background_svg_w_offset_mask.png and b/tests/testdata/control_images/expected_pal_server/sp_background_svg_w_offset/sp_background_svg_w_offset_mask.png differ
diff --git a/tests/testdata/control_images/expected_pal_server/sp_default_label/sp_default_label_mask.png b/tests/testdata/control_images/expected_pal_server/sp_default_label/sp_default_label_mask.png
new file mode 100644
index 00000000000..00fc4a26ada
Binary files /dev/null and b/tests/testdata/control_images/expected_pal_server/sp_default_label/sp_default_label_mask.png differ
diff --git a/tests/testdata/control_images/expected_pal_server/sp_partials_labels_enabled/sp_partials_labels_enabled_mask.png b/tests/testdata/control_images/expected_pal_server/sp_partials_labels_enabled/sp_partials_labels_enabled_mask.png
index 5739d7e14f4..291fe8a4241 100644
Binary files a/tests/testdata/control_images/expected_pal_server/sp_partials_labels_enabled/sp_partials_labels_enabled_mask.png and b/tests/testdata/control_images/expected_pal_server/sp_partials_labels_enabled/sp_partials_labels_enabled_mask.png differ
diff --git a/tests/testdata/control_images/expected_pal_server/sp_text_color/sp_text_color_mask.png b/tests/testdata/control_images/expected_pal_server/sp_text_color/sp_text_color_mask.png
new file mode 100644
index 00000000000..30954e9db38
Binary files /dev/null and b/tests/testdata/control_images/expected_pal_server/sp_text_color/sp_text_color_mask.png differ
diff --git a/tests/testdata/control_images/expected_pal_server/sp_text_size_map_unit/sp_text_size_map_unit_mask.png b/tests/testdata/control_images/expected_pal_server/sp_text_size_map_unit/sp_text_size_map_unit_mask.png
new file mode 100644
index 00000000000..00fc4a26ada
Binary files /dev/null and b/tests/testdata/control_images/expected_pal_server/sp_text_size_map_unit/sp_text_size_map_unit_mask.png differ
diff --git a/tests/testdata/control_images/expected_qgis_local_server/expected_qgis_local_server_mask.png b/tests/testdata/control_images/expected_qgis_local_server/expected_qgis_local_server_mask.png
new file mode 100644
index 00000000000..4b159569085
Binary files /dev/null and b/tests/testdata/control_images/expected_qgis_local_server/expected_qgis_local_server_mask.png differ