Fixed two possible NPE's
Updated Notification icon