Update AR skins. Add icons. Fix some ambiguous names.