make drawables more consistent

Change-Id: I342d0a132a7398d6d49b350324b42d857ad4cafb