Refactor IconDrawable class