Added icon sets and fixed some bugs.