Refactor status icon display. Fixes #961 (osx)