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

This reverts commit 7e4678128cdd6d296b67679fbe827845d19e7ec7.