Android fix displaying badges, updated drawables