Made a few more changes to support generic shop icons