Switch to icons

Change-Id: Ice65ac2701025df1a54fd0719bc5e65059d5bc0f