Introduced PropertyIconMapper