Merge "Add a file icon for xcf file type"