Improve handling of SVG icons

Closes #3446177

Merge request reports

Loading