Added support for icons and desktop folder