Themed icons and removed double licence bugs