Merge window.py and iconTray.py