Hygiene: More icon abstraction

Make more things dependent on Icon.js

Change-Id: Ie247030bd7d936b6d3a146fff15a0e6d28435216
Merge "Hygiene: More icon abstraction"