Added support for custom icons + macro {icon}