Add missing drawables, fix derps

Change-Id: I4be7aebc458b4a31ff6a57f3165dbfa828ff98bf