Shop scaffolding and index icon fix