added icons and reshuffle folders