icon and TODO updated