Highlight icon bug fixing