Comment 8 for bug 1355803

Tagging for rtm or an early ota
See also bug #1336712 on dynamic icons
Idea is to add some checking on load and connecting to signals to change the icons based on state