Add folder icons
Merge branch 'bug-18392-add-missing-icon'