Merge "Update preset color option icon mapping" into main