diff --git a/hivemq-edge/src/frontend/src/modules/Workspace/components/nodes/NodeAdapter.tsx b/hivemq-edge/src/frontend/src/modules/Workspace/components/nodes/NodeAdapter.tsx
index 863991320..057d4cdd7 100644
--- a/hivemq-edge/src/frontend/src/modules/Workspace/components/nodes/NodeAdapter.tsx
+++ b/hivemq-edge/src/frontend/src/modules/Workspace/components/nodes/NodeAdapter.tsx
@@ -47,7 +47,7 @@ const NodeAdapter: FC<NodeProps<Adapter>> = ({ id, data: adapter, selected, drag
 
   return (
     <>
-      <ContextualToolbar id={id} dragging={dragging} onOpenPanel={onContextMenu}>
+      <ContextualToolbar id={id} title={adapter.id} dragging={dragging} onOpenPanel={onContextMenu}>
         <ToolbarButtonGroup>
           <IconButton
             icon={<Icon as={deviceCapabilityIcon['READ']} />}
diff --git a/hivemq-edge/src/frontend/src/modules/Workspace/components/nodes/NodeBridge.tsx b/hivemq-edge/src/frontend/src/modules/Workspace/components/nodes/NodeBridge.tsx
index 10e9a6e8d..4a99a011b 100644
--- a/hivemq-edge/src/frontend/src/modules/Workspace/components/nodes/NodeBridge.tsx
+++ b/hivemq-edge/src/frontend/src/modules/Workspace/components/nodes/NodeBridge.tsx
@@ -25,7 +25,7 @@ const NodeBridge: FC<NodeProps<Bridge>> = ({ id, selected, data: bridge, draggin
 
   return (
     <>
-      <ContextualToolbar id={id} dragging={dragging} onOpenPanel={onContextMenu} />
+      <ContextualToolbar id={id} title={bridge.id} dragging={dragging} onOpenPanel={onContextMenu} />
       <NodeWrapper
         isSelected={selected}
         onDoubleClick={onContextMenu}
diff --git a/hivemq-edge/src/frontend/src/modules/Workspace/components/nodes/NodeDevice.tsx b/hivemq-edge/src/frontend/src/modules/Workspace/components/nodes/NodeDevice.tsx
index 2842c428b..8e5682c17 100644
--- a/hivemq-edge/src/frontend/src/modules/Workspace/components/nodes/NodeDevice.tsx
+++ b/hivemq-edge/src/frontend/src/modules/Workspace/components/nodes/NodeDevice.tsx
@@ -26,7 +26,7 @@ const NodeDevice: FC<NodeProps<DeviceMetadata>> = ({ id, selected, data, draggin
 
   return (
     <>
-      <ContextualToolbar id={id} onOpenPanel={onContextMenu} dragging={dragging} hasNoOverview>
+      <ContextualToolbar id={id} title={data.protocol} onOpenPanel={onContextMenu} dragging={dragging} hasNoOverview>
         <ToolbarButtonGroup>
           <IconButton
             icon={<PLCTagIcon />}
diff --git a/hivemq-edge/src/frontend/src/modules/Workspace/components/nodes/NodeEdge.tsx b/hivemq-edge/src/frontend/src/modules/Workspace/components/nodes/NodeEdge.tsx
index e25d0636e..c5deaf54b 100644
--- a/hivemq-edge/src/frontend/src/modules/Workspace/components/nodes/NodeEdge.tsx
+++ b/hivemq-edge/src/frontend/src/modules/Workspace/components/nodes/NodeEdge.tsx
@@ -1,7 +1,9 @@
 import { FC } from 'react'
+import { useNavigate } from 'react-router-dom'
 import { Handle, Position, NodeProps } from 'reactflow'
 import { useTranslation } from 'react-i18next'
 import { Icon, Image } from '@chakra-ui/react'
+import { LuInspect } from 'react-icons/lu'
 
 import logo from '@/assets/edge/05-icon-industrial-hivemq-edge.svg'
 import ToolbarButtonGroup from '@/components/react-flow/ToolbarButtonGroup.tsx'
@@ -10,7 +12,6 @@ import { TopicIcon } from '@/components/Icons/TopicIcon.tsx'
 import NodeWrapper from '@/modules/Workspace/components/parts/NodeWrapper.tsx'
 import { useContextMenu } from '@/modules/Workspace/hooks/useContextMenu.ts'
 import ContextualToolbar from '@/modules/Workspace/components/nodes/ContextualToolbar.tsx'
-import { useNavigate } from 'react-router-dom'
 
 const NodeEdge: FC<NodeProps> = (props) => {
   const { t } = useTranslation()
@@ -19,7 +20,12 @@ const NodeEdge: FC<NodeProps> = (props) => {
 
   return (
     <>
-      <ContextualToolbar id={props.id} dragging={props.dragging} onOpenPanel={onContextMenu}>
+      <ContextualToolbar
+        id={props.id}
+        title={t('branding.appName')}
+        dragging={props.dragging}
+        onOpenPanel={onContextMenu}
+      >
         <ToolbarButtonGroup>
           <IconButton
             icon={<Icon as={TopicIcon} />}
diff --git a/hivemq-edge/src/frontend/src/modules/Workspace/components/nodes/NodeGroup.tsx b/hivemq-edge/src/frontend/src/modules/Workspace/components/nodes/NodeGroup.tsx
index 705a10bf3..d8209c194 100644
--- a/hivemq-edge/src/frontend/src/modules/Workspace/components/nodes/NodeGroup.tsx
+++ b/hivemq-edge/src/frontend/src/modules/Workspace/components/nodes/NodeGroup.tsx
@@ -65,7 +65,7 @@ const NodeGroup: FC<NodeProps<Group>> = ({ id, data, selected, ...props }) => {
 
   return (
     <>
-      <ContextualToolbar id={id} dragging={props.dragging} onOpenPanel={onContextMenu}>
+      <ContextualToolbar id={id} title={data.title} dragging={props.dragging} onOpenPanel={onContextMenu}>
         <ToolbarButtonGroup isAttached={false}>
           <IconButton
             data-testid="node-group-toolbar-expand"