diff --git a/packages/hawtio/src/plugins/connect/discover/Discover.tsx b/packages/hawtio/src/plugins/connect/discover/Discover.tsx
index 7eb2b755d..8c64c98c8 100644
--- a/packages/hawtio/src/plugins/connect/discover/Discover.tsx
+++ b/packages/hawtio/src/plugins/connect/discover/Discover.tsx
@@ -32,9 +32,6 @@ import React, { useContext, useEffect, useState } from 'react'
 import { ADD, UPDATE } from '../connections'
 import { ConnectContext } from '../context'
 import { log } from '../globals'
-import javaLogo from '../img/java-logo.svg'
-import jettyLogo from '../img/jetty-logo.svg'
-import tomcatLogo from '../img/tomcat-logo.svg'
 import { Agent, Jvm, discoverService } from './discover-service'
 
 export const Discover: React.FunctionComponent = () => {
@@ -223,20 +220,10 @@ export const Discover: React.FunctionComponent = () => {
   )
 }
 
-const PRODUCT_LOGO: Record<string, string> = {
-  jetty: jettyLogo,
-  tomcat: tomcatLogo,
-  generic: javaLogo,
-}
-
 export const AgentCard: React.FunctionComponent<{
   agent: Agent
   connect: (conn: Connection) => void
 }> = ({ agent, connect }) => {
-  const productLogo = (agent: Agent) => {
-    return PRODUCT_LOGO[agent.server_product?.toLowerCase() ?? 'generic'] ?? PRODUCT_LOGO.generic
-  }
-
   const title = discoverService.hasName(agent) ? (
     `${agent.server_vendor} ${agent.server_product} ${agent.server_version}`
   ) : (
@@ -247,16 +234,15 @@ export const AgentCard: React.FunctionComponent<{
     <Card isCompact id={`connect-discover-agent-card-${agent.agent_id}`}>
       <CardHeader
         actions={{
-          actions: (
-            <>
-              <Label color='blue'>Agent</Label>
-            </>
-          ),
+          actions: <Label color='blue'>Agent</Label>,
           hasNoOffset: false,
-          className: undefined,
         }}
       >
-        <img src={productLogo(agent)} alt={agent.server_product} style={{ maxWidth: '30px', paddingRight: '0.5rem' }} />
+        <img
+          src={discoverService.productLogo(agent)}
+          alt={agent.server_product}
+          style={{ maxWidth: '30px', paddingRight: '0.5rem' }}
+        />
         <CardTitle style={{ whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis' }}>{title}</CardTitle>
       </CardHeader>
       <CardBody>
@@ -334,16 +320,15 @@ export const JvmCard: React.FunctionComponent<{
     <Card isCompact id={`connect-discover-jvm-card-${jvm.id}`}>
       <CardHeader
         actions={{
-          actions: (
-            <>
-              <Label color='green'>JVM</Label>
-            </>
-          ),
+          actions: <Label color='green'>JVM</Label>,
           hasNoOffset: false,
-          className: undefined,
         }}
       >
-        <img src={PRODUCT_LOGO.generic} alt={jvm.alias} style={{ maxWidth: '30px', paddingRight: '0.5rem' }} />
+        <img
+          src={discoverService.productLogoJvm(jvm)}
+          alt={jvm.alias}
+          style={{ maxWidth: '30px', paddingRight: '0.5rem' }}
+        />
         <CardTitle style={{ whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis' }}>
           {jvm.alias}
         </CardTitle>
diff --git a/packages/hawtio/src/plugins/connect/discover/discover-service.ts b/packages/hawtio/src/plugins/connect/discover/discover-service.ts
index 493e7de38..368cf35b1 100644
--- a/packages/hawtio/src/plugins/connect/discover/discover-service.ts
+++ b/packages/hawtio/src/plugins/connect/discover/discover-service.ts
@@ -1,6 +1,10 @@
 import { Connection, INITIAL_CONNECTION, connectService, jolokiaService, workspace } from '@hawtiosrc/plugins/shared'
 import { isBlank } from '@hawtiosrc/util/strings'
 import { log } from '../globals'
+import camelLogo from '../img/camel-logo.svg'
+import javaLogo from '../img/java-logo.svg'
+import jettyLogo from '../img/jetty-logo.svg'
+import tomcatLogo from '../img/tomcat-logo.svg'
 
 /**
  * @see https://jolokia.org/reference/html/manual/jolokia_mbeans.html#mbean-discovery
@@ -22,7 +26,7 @@ export type Agent = {
 }
 
 /**
- * @see https://github.com/hawtio/hawtio/blob/3.x/plugins/hawtio-local-jvm-mbean/src/main/java/io/hawt/jvm/local/VMDescriptorDTO.java
+ * @see https://github.com/hawtio/hawtio/blob/4.x/plugins/hawtio-local-jvm-mbean/src/main/java/io/hawt/jvm/local/VMDescriptorDTO.java
  */
 export type Jvm = {
   id: string
@@ -35,6 +39,13 @@ export type Jvm = {
   path: string | null
 }
 
+export const PRODUCT_LOGO: Record<string, string> = {
+  camel: camelLogo,
+  jetty: jettyLogo,
+  tomcat: tomcatLogo,
+  generic: javaLogo,
+}
+
 class DiscoverService {
   hasDiscoveryMBean(): Promise<boolean> {
     return workspace.treeContainsDomainAndProperties('jolokia', { type: 'Discovery' })
@@ -92,6 +103,22 @@ class DiscoverService {
     return [agent.server_vendor, agent.server_product, agent.server_version].every(s => !isBlank(s))
   }
 
+  productLogo(agent: Agent): string {
+    // Special handling for Camel
+    if (agent.command?.startsWith('main.CamelJBang')) {
+      return PRODUCT_LOGO.camel!
+    }
+    return PRODUCT_LOGO[agent.server_product?.toLowerCase() ?? 'generic'] ?? PRODUCT_LOGO.generic!
+  }
+
+  productLogoJvm(jvm: Jvm): string {
+    // Special handling for Camel
+    if (jvm.displayName.startsWith('main.CamelJBang')) {
+      return PRODUCT_LOGO.camel!
+    }
+    return PRODUCT_LOGO.generic!
+  }
+
   agentToConnection(agent: Agent): Connection {
     const conn = {
       ...INITIAL_CONNECTION,
diff --git a/packages/hawtio/src/plugins/connect/img/camel-logo.svg b/packages/hawtio/src/plugins/connect/img/camel-logo.svg
new file mode 100644
index 000000000..3dc5f97ff
--- /dev/null
+++ b/packages/hawtio/src/plugins/connect/img/camel-logo.svg
@@ -0,0 +1,7 @@
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<!-- Uploaded to: SVG Repo, www.svgrepo.com, Transformed by: SVG Repo Mixer Tools -->
+<svg width="64px" height="64px" viewBox="0 0 256 256" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" preserveAspectRatio="xMidYMid" fill="#000000">
+
<g id="SVGRepo_bgCarrier" stroke-width="0"/>
+
<g id="SVGRepo_tracerCarrier" stroke-linecap="round" stroke-linejoin="round"/>
+
<g id="SVGRepo_iconCarrier"> <defs> <circle id="path-1" cx="128" cy="128.00015" r="128"> </circle> <linearGradient x1="-12.5638445%" y1="108.214456%" x2="101.304079%" y2="-1.96418442%" id="linearGradient-3"> <stop stop-color="#F69923" offset="0%"> </stop> <stop stop-color="#F79A23" offset="10.996%"> </stop> <stop stop-color="#E97826" offset="94.502%"> </stop> </linearGradient> <linearGradient x1="-12.5638445%" y1="108.214456%" x2="101.304079%" y2="-1.96418442%" id="linearGradient-4"> <stop stop-color="#F69923" offset="0%"> </stop> <stop stop-color="#F79A23" offset="8.0478%"> </stop> <stop stop-color="#E97826" offset="41.874%"> </stop> </linearGradient> <linearGradient x1="74.7241541%" y1="-3.0591512%" x2="6.6528419%" y2="100.065517%" id="linearGradient-5"> <stop stop-color="#F6E423" offset="0%"> </stop> <stop stop-color="#F79A23" offset="41.191%"> </stop> <stop stop-color="#E97826" offset="73.271%"> </stop> </linearGradient> </defs> <g> <mask id="mask-2" fill="white"> <use xlink:href="#path-1"> </use> </mask> <g> </g> <circle fill="url(#linearGradient-3)" fill-rule="nonzero" mask="url(#mask-2)" cx="127.99429" cy="127.994289" r="123.110531"> </circle> <path d="M128,256 C57.307552,256 0,198.692448 0,128 C0,57.307552 57.307552,0 128,0 C198.692448,0 256,57.307552 256,128 C256,198.692448 198.692448,256 128,256 Z M128,246.232047 C193.297756,246.232047 246.232047,193.297757 246.232047,128 C246.232047,62.7022434 193.297756,9.76795285 128,9.76795285 C62.7022433,9.76795285 9.76795287,62.7022434 9.76795287,128 C9.76795287,193.297757 62.7022433,246.232047 128,246.232047 Z" fill="url(#linearGradient-4)" fill-rule="nonzero" mask="url(#mask-2)"> </path> <path d="M98.0436948,75.5167519 C96.2930127,75.5147828 94.5195279,75.5265976 92.7516355,75.578189 C90.6964457,75.6388385 87.9353199,76.2913715 84.7520108,77.3627207 C138.52721,118.196743 157.860212,191.86024 124.627063,255.876929 C125.755714,255.906269 126.875819,256 128.011618,256 C188.747721,256 239.504232,213.677309 252.620663,156.92871 C214.078718,111.750768 161.80794,75.6151104 98.043301,75.5166535 L98.0436948,75.5167519 Z" fill="url(#linearGradient-5)" fill-rule="nonzero" opacity="0.75" mask="url(#mask-2)"> </path> <path d="M84.7520108,77.3677419 C66.8954703,83.3771585 32.8297703,104.545789 0.0790609054,132.810802 C2.56627958,200.145488 57.1072772,254.12351 124.627063,255.88195 C157.860212,191.865262 138.527998,118.201764 84.7520108,77.3677419 L84.7520108,77.3677419 Z" fill="#28170B" fill-rule="nonzero" opacity="0.75" mask="url(#mask-2)"> </path> <path d="M128.747194,54.0045284 C117.762336,59.4999 128.747194,81.4705963 128.747194,81.4705963 C95.774179,108.954321 102.779988,155.899717 64.3117981,155.899717 C43.3414552,155.899717 22.069572,131.822923 0.0790609054,117.071683 C-0.204035781,120.550653 -0.706298828,124.044146 -0.706298828,127.596097 C-0.706298828,175.691144 25.5565753,217.52046 64.7133789,239.493314 C75.666062,238.113713 87.5520153,235.378866 95.7643696,229.900759 C138.909639,201.135938 149.621405,146.409798 167.250697,119.975669 C178.229669,103.483669 229.684993,104.914651 233.157489,97.9655396 C238.658746,86.9747963 222.166942,70.4994717 216.665685,70.4994717 L172.708205,70.4994717 C169.63691,70.4994717 164.811122,65.0431411 161.733941,65.0431411 L145.242137,65.0431411 C145.242137,65.0431411 137.935182,53.9580322 131.447893,53.5172018 C130.51799,53.4510871 129.61726,53.5697797 128.747194,54.0045284 Z" fill="#FFFFFF" fill-rule="nonzero" mask="url(#mask-2)"> </path> </g> </g>
+
</svg>
\ No newline at end of file