Added custom icon text support