Migrate to image sets + new icon