rewrote how shopItem icons are Located in the ShopScreen
resolved git merge conflicts on Pixmap and ShopScreen