Unifying various icon loading methods

Change-Id: I5a8969b6aad6513d769b5bb38bf95a701fe346d8
2 files changed