Merge pull request #942 from nextcloud-libraries/backport/icons-and-path

Merge pull request #942 from nextcloud-libraries/backport/icons-and-path #87