implemented icons, improved folder selection