*8673* Remove FIXME in prep for new icon sheet