Merge "Polish folder icon bugs." into sc-dev