Fix SVG+PNG rendering for 1.19+