Icon working.  cleanup