Merge "Fix mime types of .ico files"