Refactor marker drawables