Refactor field_icon_class and field_icon_image with field_oa_*