Improved System Tray code