Added appicon, better folder logic