Rearrange order of template pages, use more standard ampersand and 'picture' instead of 'image' in page labels, add embedded metadata for icons