Apply systray patch, slightly modified