Updates for new image files & tag generation

Image file name convention changed slightly & the tags for each icon
type had various requested changes