Patched for systray.