each type now shows appropriate icon

I also fixed issue where convenience stores were using wrong propery to
identify them