Adds support for non-prerendered icons
Merge remote-tracking branch 'upstream/master'