Add basic support for showing an icon within choices