Added new icons and fixed some bugs