Icons Stay Highlighted

Latest WIP on Mac, icons remain highlighted after using