Remove drawable and fix shapes