Merge remote-tracking branch 'gravitystorm/icons' into staging