Now icons may be grouped in folders