Merge "Folder icon polish."