Bug 1042105 - [User Story] Icon prioritization in the status bar

Those changes seems unrelated to this PR. Please remove them.