diff --git a/ui/admin/app/components/form/target/add-host-sets/index.hbs b/ui/admin/app/components/form/target/add-host-sets/index.hbs
index b96753741..241489b42 100644
--- a/ui/admin/app/components/form/target/add-host-sets/index.hbs
+++ b/ui/admin/app/components/form/target/add-host-sets/index.hbs
@@ -33,11 +33,33 @@
               />
             </row.cell>
             <row.cell>{{hostSet.name}}</row.cell>
-            <row.cell>
-              <Rose::Badge>{{t
-                  (concat 'resources.host-catalog.types.' hostSet.type '.label')
-                }}</Rose::Badge>
-            </row.cell>
+            {{#if hostSet.isPlugin}}
+              <Rose::Badge
+                @icon={{concat
+                  'flight-icons/svg/'
+                  hostSet.compositeType
+                  '-color-16'
+                }}
+              >
+                {{t
+                  (concat
+                    'resources.host-catalog.types.'
+                    hostSet.compositeType
+                    '.label'
+                  )
+                }}
+              </Rose::Badge>
+            {{else}}
+              <Rose::Badge>
+                {{t
+                  (concat
+                    'resources.host-catalog.types.'
+                    hostSet.compositeType
+                    '.label'
+                  )
+                }}
+              </Rose::Badge>
+            {{/if}}
             <row.cell>
               <code>{{hostSet.host_catalog_id}}</code>
             </row.cell>
diff --git a/ui/admin/app/templates/scopes/scope/targets/target/host-sources.hbs b/ui/admin/app/templates/scopes/scope/targets/target/host-sources.hbs
index be374ae3d..3dce601fb 100644
--- a/ui/admin/app/templates/scopes/scope/targets/target/host-sources.hbs
+++ b/ui/admin/app/templates/scopes/scope/targets/target/host-sources.hbs
@@ -38,9 +38,34 @@
                 <p>{{hostSet.model.description}}</p>
               </row.headerCell>
               <row.cell>
-                <Rose::Badge>{{t
-                    (concat 'resources.host-catalog.types.' hostSet.model.type '.label')
-                  }}</Rose::Badge>
+                {{#if hostSet.model.isPlugin}}
+                  <Rose::Badge
+                    @icon={{concat
+                      'flight-icons/svg/'
+                      hostSet.model.compositeType
+                      '-color-16'
+                    }}
+                  >
+                    {{t
+                      (concat
+                        'resources.host-catalog.types.'
+                        hostSet.model.compositeType
+                        '.label'
+                      )
+                    }}
+                  </Rose::Badge>
+                {{else}}
+                  <Rose::Badge>
+                    {{t
+                      (concat
+                        'resources.host-catalog.types.'
+                        hostSet.model.compositeType
+                        '.label'
+                      )
+                    }}
+                  </Rose::Badge>
+                {{/if}}
+
               </row.cell>
               <row.cell>
                 <Copyable