[PVR] Some improvments for fixes related to icons