Refactor system tray icon