Added support for folder and file type icons