diff --git a/tests/testdata/control_images/compositionconverter/expected_importComposerAtlas_0/expected_importComposerAtlas_0.png b/tests/testdata/control_images/compositionconverter/expected_importComposerAtlas_0/expected_importComposerAtlas_0.png
index 8a0225684c1..7df0fd1dc07 100644
Binary files a/tests/testdata/control_images/compositionconverter/expected_importComposerAtlas_0/expected_importComposerAtlas_0.png and b/tests/testdata/control_images/compositionconverter/expected_importComposerAtlas_0/expected_importComposerAtlas_0.png differ
diff --git a/tests/testdata/control_images/compositionconverter/expected_importComposerTemplateArrow_0/expected_importComposerTemplateArrow_0.png b/tests/testdata/control_images/compositionconverter/expected_importComposerTemplateArrow_0/expected_importComposerTemplateArrow_0.png
index c47ebe949cd..00105419679 100644
Binary files a/tests/testdata/control_images/compositionconverter/expected_importComposerTemplateArrow_0/expected_importComposerTemplateArrow_0.png and b/tests/testdata/control_images/compositionconverter/expected_importComposerTemplateArrow_0/expected_importComposerTemplateArrow_0.png differ
diff --git a/tests/testdata/control_images/compositionconverter/expected_importComposerTemplateAttributeTable_0/expected_importComposerTemplateAttributeTable_0.png b/tests/testdata/control_images/compositionconverter/expected_importComposerTemplateAttributeTable_0/expected_importComposerTemplateAttributeTable_0.png
index 6ac0b779faf..e2aaec4996c 100644
Binary files a/tests/testdata/control_images/compositionconverter/expected_importComposerTemplateAttributeTable_0/expected_importComposerTemplateAttributeTable_0.png and b/tests/testdata/control_images/compositionconverter/expected_importComposerTemplateAttributeTable_0/expected_importComposerTemplateAttributeTable_0.png differ
diff --git a/tests/testdata/control_images/compositionconverter/expected_importComposerTemplateHtml_0/expected_importComposerTemplateHtml_0.png b/tests/testdata/control_images/compositionconverter/expected_importComposerTemplateHtml_0/expected_importComposerTemplateHtml_0.png
index 99c4c6fbf55..ede440b42cd 100644
Binary files a/tests/testdata/control_images/compositionconverter/expected_importComposerTemplateHtml_0/expected_importComposerTemplateHtml_0.png and b/tests/testdata/control_images/compositionconverter/expected_importComposerTemplateHtml_0/expected_importComposerTemplateHtml_0.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 7f7977ff5f3..80613e3a698 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_importComposerTemplateMap_0/expected_importComposerTemplateMap_0.png b/tests/testdata/control_images/compositionconverter/expected_importComposerTemplateMap_0/expected_importComposerTemplateMap_0.png
index 7e2c1106b70..88a47e63e62 100644
Binary files a/tests/testdata/control_images/compositionconverter/expected_importComposerTemplateMap_0/expected_importComposerTemplateMap_0.png and b/tests/testdata/control_images/compositionconverter/expected_importComposerTemplateMap_0/expected_importComposerTemplateMap_0.png differ
diff --git a/tests/testdata/control_images/compositionconverter/expected_importComposerTemplatePicture_0/expected_importComposerTemplatePicture_0.png b/tests/testdata/control_images/compositionconverter/expected_importComposerTemplatePicture_0/expected_importComposerTemplatePicture_0.png
index 558be239cfc..b7c77375d05 100644
Binary files a/tests/testdata/control_images/compositionconverter/expected_importComposerTemplatePicture_0/expected_importComposerTemplatePicture_0.png and b/tests/testdata/control_images/compositionconverter/expected_importComposerTemplatePicture_0/expected_importComposerTemplatePicture_0.png differ
diff --git a/tests/testdata/control_images/compositionconverter/expected_importComposerTemplatePolygon_0/expected_importComposerTemplatePolygon_0.png b/tests/testdata/control_images/compositionconverter/expected_importComposerTemplatePolygon_0/expected_importComposerTemplatePolygon_0.png
index 9f04d97d93d..b5e298955e7 100644
Binary files a/tests/testdata/control_images/compositionconverter/expected_importComposerTemplatePolygon_0/expected_importComposerTemplatePolygon_0.png and b/tests/testdata/control_images/compositionconverter/expected_importComposerTemplatePolygon_0/expected_importComposerTemplatePolygon_0.png differ
diff --git a/tests/testdata/control_images/compositionconverter/expected_importComposerTemplatePolyline_0/expected_importComposerTemplatePolyline_0.png b/tests/testdata/control_images/compositionconverter/expected_importComposerTemplatePolyline_0/expected_importComposerTemplatePolyline_0.png
index d892401ccac..b07c06a6c64 100644
Binary files a/tests/testdata/control_images/compositionconverter/expected_importComposerTemplatePolyline_0/expected_importComposerTemplatePolyline_0.png and b/tests/testdata/control_images/compositionconverter/expected_importComposerTemplatePolyline_0/expected_importComposerTemplatePolyline_0.png differ
diff --git a/tests/testdata/control_images/compositionconverter/expected_importComposerTemplateScaleBar_0/expected_importComposerTemplateScaleBar_0.png b/tests/testdata/control_images/compositionconverter/expected_importComposerTemplateScaleBar_0/expected_importComposerTemplateScaleBar_0.png
index 8f3c7c0eaf3..2bbe10c3161 100644
Binary files a/tests/testdata/control_images/compositionconverter/expected_importComposerTemplateScaleBar_0/expected_importComposerTemplateScaleBar_0.png and b/tests/testdata/control_images/compositionconverter/expected_importComposerTemplateScaleBar_0/expected_importComposerTemplateScaleBar_0.png differ
diff --git a/tests/testdata/control_images/compositionconverter/expected_importComposerTemplateShape_0/expected_importComposerTemplateShape_0.png b/tests/testdata/control_images/compositionconverter/expected_importComposerTemplateShape_0/expected_importComposerTemplateShape_0.png
index dc7225e5205..fea3f9f82d2 100644
Binary files a/tests/testdata/control_images/compositionconverter/expected_importComposerTemplateShape_0/expected_importComposerTemplateShape_0.png and b/tests/testdata/control_images/compositionconverter/expected_importComposerTemplateShape_0/expected_importComposerTemplateShape_0.png 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
index d8306062d6f..5ee8d0bc9ae 100644
Binary files a/tests/testdata/control_images/compositionconverter/expected_importComposerTemplate_0/expected_importComposerTemplate_0.png 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_1/expected_importComposerTemplate_1.png b/tests/testdata/control_images/compositionconverter/expected_importComposerTemplate_1/expected_importComposerTemplate_1.png
index cdb9a41b53a..a1c2cdb5bc4 100644
Binary files a/tests/testdata/control_images/compositionconverter/expected_importComposerTemplate_1/expected_importComposerTemplate_1.png and b/tests/testdata/control_images/compositionconverter/expected_importComposerTemplate_1/expected_importComposerTemplate_1.png differ