Icon written to use data out of plugins/icons folder instead of in images.
Merge branch '1.8.1'