remove some bad code related to icon color changes