Merge "XML metadata for storage backend; custom icons."