HALO cleanup & better drawables

Change-Id: I4528d50b8ed82df16c3a5ee546ef225abae8bd67