Replace icons + some style improvements

Change-Id: Ifb9cc2ebb7883ed957cd35abb61da6be674ad2de
11 files changed