Recolor icons and add proper button icon

Change-Id: I70e48698502225d150df20a51c759f8d95bbaeac