HALO cleanup & better drawables
Change-Id: I7afb5f1e473e9611059e1ea2acfaa9d307696449