Merge "Implementing new visualization for folder icon"