Fixed some visual bugs and some interaction problems on the icons