Add icons. Clean up contacts list.