Update TODOs. Try to fix MainWindow icon by re-arranging IDs.