diff --git a/tests/testdata/control_images/composer_legend/expected_composer_legend_expressions/expected_composer_legend_expressions_mask.png b/tests/testdata/control_images/composer_legend/expected_composer_legend_expressions/expected_composer_legend_expressions_mask.png
index 9a9b3dc1365..3cca7726b3a 100644
Binary files a/tests/testdata/control_images/composer_legend/expected_composer_legend_expressions/expected_composer_legend_expressions_mask.png and b/tests/testdata/control_images/composer_legend/expected_composer_legend_expressions/expected_composer_legend_expressions_mask.png differ
diff --git a/tests/testdata/control_images/compositionconverter/expected_importComposerTemplateLegend_0/expected_importComposerTemplateLegend_0.png b/tests/testdata/control_images/compositionconverter/expected_importComposerTemplateLegend_0/expected_importComposerTemplateLegend_0.png
index 681ca37b457..544c0c2b97b 100644
Binary files a/tests/testdata/control_images/compositionconverter/expected_importComposerTemplateLegend_0/expected_importComposerTemplateLegend_0.png and b/tests/testdata/control_images/compositionconverter/expected_importComposerTemplateLegend_0/expected_importComposerTemplateLegend_0.png differ
diff --git a/tests/testdata/control_images/compositionconverter/expected_importComposerTemplateLegend_0/expected_importComposerTemplateLegend_0_mask.png b/tests/testdata/control_images/compositionconverter/expected_importComposerTemplateLegend_0/expected_importComposerTemplateLegend_0_mask.png
deleted file mode 100644
index 09e50129b67..00000000000
Binary files a/tests/testdata/control_images/compositionconverter/expected_importComposerTemplateLegend_0/expected_importComposerTemplateLegend_0_mask.png and /dev/null differ
diff --git a/tests/testdata/control_images/compositionconverter/expected_importComposerTemplate_0/default/expected_importComposerTemplate_0.png b/tests/testdata/control_images/compositionconverter/expected_importComposerTemplate_0/default/expected_importComposerTemplate_0.png
deleted file mode 100644
index bf72e794950..00000000000
Binary files a/tests/testdata/control_images/compositionconverter/expected_importComposerTemplate_0/default/expected_importComposerTemplate_0.png and /dev/null differ
diff --git a/tests/testdata/control_images/compositionconverter/expected_importComposerTemplate_0/default/expected_importComposerTemplate_0_mask.png b/tests/testdata/control_images/compositionconverter/expected_importComposerTemplate_0/default/expected_importComposerTemplate_0_mask.png
deleted file mode 100644
index 1475ae33a83..00000000000
Binary files a/tests/testdata/control_images/compositionconverter/expected_importComposerTemplate_0/default/expected_importComposerTemplate_0_mask.png and /dev/null differ
diff --git a/tests/testdata/control_images/compositionconverter/expected_importComposerTemplate_0/expected_importComposerTemplate_0.png b/tests/testdata/control_images/compositionconverter/expected_importComposerTemplate_0/expected_importComposerTemplate_0.png
new file mode 100644
index 00000000000..1ff3b8bd279
Binary files /dev/null and b/tests/testdata/control_images/compositionconverter/expected_importComposerTemplate_0/expected_importComposerTemplate_0.png differ
diff --git a/tests/testdata/control_images/compositionconverter/expected_importComposerTemplate_0/fedora/expected_importComposerTemplate_0.png b/tests/testdata/control_images/compositionconverter/expected_importComposerTemplate_0/fedora/expected_importComposerTemplate_0.png
deleted file mode 100644
index e8b6fb2960c..00000000000
Binary files a/tests/testdata/control_images/compositionconverter/expected_importComposerTemplate_0/fedora/expected_importComposerTemplate_0.png and /dev/null differ
diff --git a/tests/testdata/control_images/compositionconverter/expected_importComposerTemplate_0/ubuntu2204/expected_importComposerTemplate_0.png b/tests/testdata/control_images/compositionconverter/expected_importComposerTemplate_0/ubuntu2204/expected_importComposerTemplate_0.png
deleted file mode 100644
index 96ba1dfa079..00000000000
Binary files a/tests/testdata/control_images/compositionconverter/expected_importComposerTemplate_0/ubuntu2204/expected_importComposerTemplate_0.png and /dev/null differ
diff --git a/tests/testdata/control_images/legend/expected_columns_with_mixed_symbol_sizes/expected_columns_with_mixed_symbol_sizes_mask.png b/tests/testdata/control_images/legend/expected_columns_with_mixed_symbol_sizes/expected_columns_with_mixed_symbol_sizes_mask.png
new file mode 100644
index 00000000000..07c42892357
Binary files /dev/null and b/tests/testdata/control_images/legend/expected_columns_with_mixed_symbol_sizes/expected_columns_with_mixed_symbol_sizes_mask.png differ
diff --git a/tests/testdata/control_images/legend/expected_legend_27_by_3/expected_legend_27_by_3_mask.png b/tests/testdata/control_images/legend/expected_legend_27_by_3/expected_legend_27_by_3_mask.png
new file mode 100644
index 00000000000..84668bce191
Binary files /dev/null and b/tests/testdata/control_images/legend/expected_legend_27_by_3/expected_legend_27_by_3_mask.png differ
diff --git a/tests/testdata/control_images/legend/expected_legend_27_by_9/expected_legend_27_by_9_mask.png b/tests/testdata/control_images/legend/expected_legend_27_by_9/expected_legend_27_by_9_mask.png
new file mode 100644
index 00000000000..ac684fac5b3
Binary files /dev/null and b/tests/testdata/control_images/legend/expected_legend_27_by_9/expected_legend_27_by_9_mask.png differ
diff --git a/tests/testdata/control_images/legend/expected_legend_2_by_2/expected_legend_2_by_2_mask.png b/tests/testdata/control_images/legend/expected_legend_2_by_2/expected_legend_2_by_2_mask.png
new file mode 100644
index 00000000000..bf93fc85ae1
Binary files /dev/null and b/tests/testdata/control_images/legend/expected_legend_2_by_2/expected_legend_2_by_2_mask.png differ
diff --git a/tests/testdata/control_images/legend/expected_legend_3_by_2/expected_legend_3_by_2_mask.png b/tests/testdata/control_images/legend/expected_legend_3_by_2/expected_legend_3_by_2_mask.png
new file mode 100644
index 00000000000..47ba35b9ac7
Binary files /dev/null and b/tests/testdata/control_images/legend/expected_legend_3_by_2/expected_legend_3_by_2_mask.png differ
diff --git a/tests/testdata/control_images/legend/expected_legend_3_by_3/expected_legend_3_by_3_mask.png b/tests/testdata/control_images/legend/expected_legend_3_by_3/expected_legend_3_by_3_mask.png
new file mode 100644
index 00000000000..66d38f40b0c
Binary files /dev/null and b/tests/testdata/control_images/legend/expected_legend_3_by_3/expected_legend_3_by_3_mask.png differ
diff --git a/tests/testdata/control_images/legend/expected_legend_4_by_2/expected_legend_4_by_2_mask.png b/tests/testdata/control_images/legend/expected_legend_4_by_2/expected_legend_4_by_2_mask.png
new file mode 100644
index 00000000000..7311b3f62aa
Binary files /dev/null and b/tests/testdata/control_images/legend/expected_legend_4_by_2/expected_legend_4_by_2_mask.png differ
diff --git a/tests/testdata/control_images/legend/expected_legend_4_by_3/expected_legend_4_by_3_mask.png b/tests/testdata/control_images/legend/expected_legend_4_by_3/expected_legend_4_by_3_mask.png
new file mode 100644
index 00000000000..3c6c3801998
Binary files /dev/null and b/tests/testdata/control_images/legend/expected_legend_4_by_3/expected_legend_4_by_3_mask.png differ
diff --git a/tests/testdata/control_images/legend/expected_legend_5_by_2/expected_legend_5_by_2_mask.png b/tests/testdata/control_images/legend/expected_legend_5_by_2/expected_legend_5_by_2_mask.png
new file mode 100644
index 00000000000..408a61e4532
Binary files /dev/null and b/tests/testdata/control_images/legend/expected_legend_5_by_2/expected_legend_5_by_2_mask.png differ
diff --git a/tests/testdata/control_images/legend/expected_legend_5_by_3/expected_legend_5_by_3_mask.png b/tests/testdata/control_images/legend/expected_legend_5_by_3/expected_legend_5_by_3_mask.png
new file mode 100644
index 00000000000..551291a867e
Binary files /dev/null and b/tests/testdata/control_images/legend/expected_legend_5_by_3/expected_legend_5_by_3_mask.png differ
diff --git a/tests/testdata/control_images/legend/expected_legend_6_by_3/expected_legend_6_by_3_mask.png b/tests/testdata/control_images/legend/expected_legend_6_by_3/expected_legend_6_by_3_mask.png
new file mode 100644
index 00000000000..f92756021c6
Binary files /dev/null and b/tests/testdata/control_images/legend/expected_legend_6_by_3/expected_legend_6_by_3_mask.png differ
diff --git a/tests/testdata/control_images/legend/expected_legend_7_by_3/expected_legend_7_by_3_mask.png b/tests/testdata/control_images/legend/expected_legend_7_by_3/expected_legend_7_by_3_mask.png
new file mode 100644
index 00000000000..9e91778a99b
Binary files /dev/null and b/tests/testdata/control_images/legend/expected_legend_7_by_3/expected_legend_7_by_3_mask.png differ
diff --git a/tests/testdata/control_images/legend/expected_legend_basic/expected_legend_basic_mask.png b/tests/testdata/control_images/legend/expected_legend_basic/expected_legend_basic_mask.png
new file mode 100644
index 00000000000..b69e482246b
Binary files /dev/null and b/tests/testdata/control_images/legend/expected_legend_basic/expected_legend_basic_mask.png differ
diff --git a/tests/testdata/control_images/legend/expected_legend_big_marker/expected_legend_big_marker_mask.png b/tests/testdata/control_images/legend/expected_legend_big_marker/expected_legend_big_marker_mask.png
new file mode 100644
index 00000000000..701613434bf
Binary files /dev/null and b/tests/testdata/control_images/legend/expected_legend_big_marker/expected_legend_big_marker_mask.png differ
diff --git a/tests/testdata/control_images/legend/expected_legend_big_marker_max_size/expected_legend_big_marker_max_size_mask.png b/tests/testdata/control_images/legend/expected_legend_big_marker_max_size/expected_legend_big_marker_max_size_mask.png
new file mode 100644
index 00000000000..6ef77571359
Binary files /dev/null and b/tests/testdata/control_images/legend/expected_legend_big_marker_max_size/expected_legend_big_marker_max_size_mask.png differ
diff --git a/tests/testdata/control_images/legend/expected_legend_center_align_text/expected_legend_center_align_text_mask.png b/tests/testdata/control_images/legend/expected_legend_center_align_text/expected_legend_center_align_text_mask.png
new file mode 100644
index 00000000000..108a43e6df3
Binary files /dev/null and b/tests/testdata/control_images/legend/expected_legend_center_align_text/expected_legend_center_align_text_mask.png differ
diff --git a/tests/testdata/control_images/legend/expected_legend_column_breaks/expected_legend_column_breaks_mask.png b/tests/testdata/control_images/legend/expected_legend_column_breaks/expected_legend_column_breaks_mask.png
new file mode 100644
index 00000000000..536d085feca
Binary files /dev/null and b/tests/testdata/control_images/legend/expected_legend_column_breaks/expected_legend_column_breaks_mask.png differ
diff --git a/tests/testdata/control_images/legend/expected_legend_column_breaks2/expected_legend_column_breaks2_mask.png b/tests/testdata/control_images/legend/expected_legend_column_breaks2/expected_legend_column_breaks2_mask.png
new file mode 100644
index 00000000000..91bb173a60e
Binary files /dev/null and b/tests/testdata/control_images/legend/expected_legend_column_breaks2/expected_legend_column_breaks2_mask.png differ
diff --git a/tests/testdata/control_images/legend/expected_legend_column_breaks3/expected_legend_column_breaks3_mask.png b/tests/testdata/control_images/legend/expected_legend_column_breaks3/expected_legend_column_breaks3_mask.png
new file mode 100644
index 00000000000..a9d95bcd95a
Binary files /dev/null and b/tests/testdata/control_images/legend/expected_legend_column_breaks3/expected_legend_column_breaks3_mask.png differ
diff --git a/tests/testdata/control_images/legend/expected_legend_column_breaks4/expected_legend_column_breaks4_mask.png b/tests/testdata/control_images/legend/expected_legend_column_breaks4/expected_legend_column_breaks4_mask.png
new file mode 100644
index 00000000000..28a86111c7a
Binary files /dev/null and b/tests/testdata/control_images/legend/expected_legend_column_breaks4/expected_legend_column_breaks4_mask.png differ
diff --git a/tests/testdata/control_images/legend/expected_legend_column_breaks5/expected_legend_column_breaks5_mask.png b/tests/testdata/control_images/legend/expected_legend_column_breaks5/expected_legend_column_breaks5_mask.png
new file mode 100644
index 00000000000..0e1d70f67d4
Binary files /dev/null and b/tests/testdata/control_images/legend/expected_legend_column_breaks5/expected_legend_column_breaks5_mask.png differ
diff --git a/tests/testdata/control_images/legend/expected_legend_data_defined_size_collapsed/expected_legend_data_defined_size_collapsed_mask.png b/tests/testdata/control_images/legend/expected_legend_data_defined_size_collapsed/expected_legend_data_defined_size_collapsed_mask.png
new file mode 100644
index 00000000000..a74f3f3579d
Binary files /dev/null and b/tests/testdata/control_images/legend/expected_legend_data_defined_size_collapsed/expected_legend_data_defined_size_collapsed_mask.png differ
diff --git a/tests/testdata/control_images/legend/expected_legend_diagram_attributes/expected_legend_diagram_attributes_mask.png b/tests/testdata/control_images/legend/expected_legend_diagram_attributes/expected_legend_diagram_attributes_mask.png
new file mode 100644
index 00000000000..5e0a5d2e8a8
Binary files /dev/null and b/tests/testdata/control_images/legend/expected_legend_diagram_attributes/expected_legend_diagram_attributes_mask.png differ
diff --git a/tests/testdata/control_images/legend/expected_legend_diagram_size/expected_legend_diagram_size_mask.png b/tests/testdata/control_images/legend/expected_legend_diagram_size/expected_legend_diagram_size_mask.png
new file mode 100644
index 00000000000..f9e32e092ee
Binary files /dev/null and b/tests/testdata/control_images/legend/expected_legend_diagram_size/expected_legend_diagram_size_mask.png differ
diff --git a/tests/testdata/control_images/legend/expected_legend_effects/expected_legend_effects_mask.png b/tests/testdata/control_images/legend/expected_legend_effects/expected_legend_effects_mask.png
new file mode 100644
index 00000000000..ffe84da5ce5
Binary files /dev/null and b/tests/testdata/control_images/legend/expected_legend_effects/expected_legend_effects_mask.png differ
diff --git a/tests/testdata/control_images/legend/expected_legend_filter_by_expression/expected_legend_filter_by_expression_mask.png b/tests/testdata/control_images/legend/expected_legend_filter_by_expression/expected_legend_filter_by_expression_mask.png
new file mode 100644
index 00000000000..70f56472a74
Binary files /dev/null and b/tests/testdata/control_images/legend/expected_legend_filter_by_expression/expected_legend_filter_by_expression_mask.png differ
diff --git a/tests/testdata/control_images/legend/expected_legend_filter_by_map/expected_legend_filter_by_map_mask.png b/tests/testdata/control_images/legend/expected_legend_filter_by_map/expected_legend_filter_by_map_mask.png
new file mode 100644
index 00000000000..41c2c70394b
Binary files /dev/null and b/tests/testdata/control_images/legend/expected_legend_filter_by_map/expected_legend_filter_by_map_mask.png differ
diff --git a/tests/testdata/control_images/legend/expected_legend_filter_by_map_dupe/expected_legend_filter_by_map_dupe_mask.png b/tests/testdata/control_images/legend/expected_legend_filter_by_map_dupe/expected_legend_filter_by_map_dupe_mask.png
new file mode 100644
index 00000000000..599c8d6dd2c
Binary files /dev/null and b/tests/testdata/control_images/legend/expected_legend_filter_by_map_dupe/expected_legend_filter_by_map_dupe_mask.png differ
diff --git a/tests/testdata/control_images/legend/expected_legend_filter_by_polygon/expected_legend_filter_by_polygon_mask.png b/tests/testdata/control_images/legend/expected_legend_filter_by_polygon/expected_legend_filter_by_polygon_mask.png
new file mode 100644
index 00000000000..0bb565d1936
Binary files /dev/null and b/tests/testdata/control_images/legend/expected_legend_filter_by_polygon/expected_legend_filter_by_polygon_mask.png differ
diff --git a/tests/testdata/control_images/legend/expected_legend_group_heading_spacing/expected_legend_group_heading_spacing_mask.png b/tests/testdata/control_images/legend/expected_legend_group_heading_spacing/expected_legend_group_heading_spacing_mask.png
new file mode 100644
index 00000000000..b85ac013ddc
Binary files /dev/null and b/tests/testdata/control_images/legend/expected_legend_group_heading_spacing/expected_legend_group_heading_spacing_mask.png differ
diff --git a/tests/testdata/control_images/legend/expected_legend_group_indent/expected_legend_group_indent_mask.png b/tests/testdata/control_images/legend/expected_legend_group_indent/expected_legend_group_indent_mask.png
new file mode 100644
index 00000000000..ca05115ff1a
Binary files /dev/null and b/tests/testdata/control_images/legend/expected_legend_group_indent/expected_legend_group_indent_mask.png differ
diff --git a/tests/testdata/control_images/legend/expected_legend_layer_column_splitting_allow/expected_legend_layer_column_splitting_allow_mask.png b/tests/testdata/control_images/legend/expected_legend_layer_column_splitting_allow/expected_legend_layer_column_splitting_allow_mask.png
new file mode 100644
index 00000000000..ea1dbd9e342
Binary files /dev/null and b/tests/testdata/control_images/legend/expected_legend_layer_column_splitting_allow/expected_legend_layer_column_splitting_allow_mask.png differ
diff --git a/tests/testdata/control_images/legend/expected_legend_layer_column_splitting_prevent/expected_legend_layer_column_splitting_prevent_mask.png b/tests/testdata/control_images/legend/expected_legend_layer_column_splitting_prevent/expected_legend_layer_column_splitting_prevent_mask.png
new file mode 100644
index 00000000000..2205450a4b4
Binary files /dev/null and b/tests/testdata/control_images/legend/expected_legend_layer_column_splitting_prevent/expected_legend_layer_column_splitting_prevent_mask.png differ