Cleaning up alerts, a few icons, etc.

@ajself