Merge "Folder icon polish." into sc-dev