Got the icon to disappear properly when you exit.  Plus a minor re-factor and a few lines of redundant code removed.