First pass of new icon work.