Fix issue with icons in multiple folders