add hover effect to icon
fixed merge conflicts