Improved icon mapping & added more icons

Mapped icons to PUA instead of Latin chars.