Add icons. Some code changed.