Revert systray rework for now.  Still do a couple of hidpi fixes