added more icons, changes to make it work better with new icons