Refactoring systray