most of the icons are now fixed + added to P-C