Window icon, new todo

Few other code changes that shouldn't matter too