Reorder systray. Closes #2919.