Bug 1051792 Follow-ups:

* Fixed various nits
* Added new icons
* send the notification as soon as the attention screen is opened