Remove the icon differentiation which was not a supported feature.

Fixes: 205502372
Test: ran through the verifier test
Change-Id: I46827dba2df8b157dc0051d5e65489a7e92aeeb1
2 files changed