First cut of work on supporting icons.