Added custom Icon support