fix click issue on icon
merged conflit