Simplify icon generation using nested svg tags
Merge branch 'master' into debianize