Embed arrows using ResourceLoader

Change-Id: I785c06f57f801ff8fb708c8bd24f5f3271a869f5
Merge "Embed arrows using ResourceLoader"