Cart icon, cart page, product page
merge conflicts fixed