HALO cleanup & better drawables

Change-Id: Ibeeb70c9bf65ea28d7df9c081e0859b201063d04