Refactor field_icon_class and field_icon_image to field_oa_*