Adding <icon> support