Improved exiting fields and add new ones

Added icon picker