Fixed some off calculations when dealing with highlighting icons