Fixing icons and hover state