More SVG detection fixes

Merged Bastien Nocera requested to merge wip/hadess/more-svg-detection-fixes into master

Merge request reports