Work on the icons.
Clean Up