Merge pull request #4568 from lp-hub/feature/folder-icon