Remove hardcoded icon codes and use map