Use icon helper more.

Change-Id: If4613b7f29849de630b6276f68af56012023d457