Merge "Fix add icon"