Icon handling cleaned up, folder structure supported, text overlays added