#38: Missing icons added, string organized.