More Icon stuff, and fixes/alerts when no location