Fixed issue with custom icons not being correctly mapped