Fix color chip where it was still a bar

Change-Id: Idd6ca8b5c88a0d895d96127b45f2b1315c279599
5 files changed