Merge "Adding folder icon visualization"