Add a shaped drawable and do some more improvments of the base code