Story 832: Show icons when not available / add new assets

Change-Id: I9ceea67010590ff71e95a168d49dbad59aae85a0
Merge "Story 832: Show icons when not available / add new assets"