Minor clean up to icon and indicator