Simplified #includes, updated .ico files, occasional small changes.