fix lost icons in ui

Change-Id: Iff71a800b359fce87e9bbe6b1b0810e8bcb35c89
Merge "fix lost icons in ui"