Settings: PGM improve icon handling

Change-Id: Ic7e7dcc6bbc3837985f18a44588dba2cea47a9b7
Merge "Settings: PGM improve icon handling" into jb4.2