Implement icon picker, bring back raster icons.