[pvr] fixes related to chanel icons

This do the magic git rebase/split stuff for PR #4227.

@alexmaloteaux i also find some cosmetics and do some improvements.