Changes to tray icon handling.