Icon refinements. Still needs another refinement round before release.