Clean Up: Notification Icon

Slight refactor to place code where (I think) it belongs.
A little more clean up.

Issue #3