removed giant icon, put in toggle in popup menu.  Added icon.
Refactored some names.