diff --git a/frontend/src/components/network/nodes/DeviceNode.tsx b/frontend/src/components/network/nodes/DeviceNode.tsx
index b14a8416..30b9faf6 100644
--- a/frontend/src/components/network/nodes/DeviceNode.tsx
+++ b/frontend/src/components/network/nodes/DeviceNode.tsx
@@ -25,15 +25,27 @@ function TooltipRow({ label, value }: { label: string; value: string | null | un
   )
 }
 
-function DeviceNodeComponent({ data, selected, width }: NodeProps) {
+const NODE_DEFAULT = 120  // default square side in px
+const NODE_MIN = 80       // minimum square side in px
+const NODE_MAX = 280      // maximum square side in px
+
+function DeviceNodeComponent({ data, selected, width, height }: NodeProps) {
   const nodeData = data as unknown as DeviceNodeData
   const { icon: Icon, color } = getDeviceRenderConfig(nodeData.deviceType, nodeData.category)
   const status = (nodeData.properties?.status || 'unknown') as NodeStatus
   const ip = nodeData.properties?.ip
   const props = nodeData.properties || {}
 
-  // Scale icon proportionally: 28px at default 120px wide, clamped 16–60px
-  const iconPx = Math.round(Math.max(16, Math.min(60, ((width ?? 120) / 120) * 28)))
+  // Use the shorter dimension so content never overflows a non-square node
+  const size = Math.min(width ?? NODE_DEFAULT, height ?? NODE_DEFAULT)
+  const scale = size / NODE_DEFAULT
+
+  // Icon: 28px at default, clamped to [14, 72]
+  const iconPx = Math.round(Math.max(14, Math.min(72, scale * 28)))
+  // Label font: 11px at default, clamped to [9, 20]
+  const labelPx = Math.max(9, Math.min(20, Math.round(scale * 11)))
+  // IP font: 9px at default, clamped to [8, 16]
+  const ipPx = Math.max(8, Math.min(16, Math.round(scale * 9)))
 
   const hasTooltipContent = props.hostname || props.ip || props.vendor || props.model || props.role || props.notes
 
@@ -41,24 +53,27 @@ function DeviceNodeComponent({ data, selected, width }: NodeProps) {
     <>
       <NodeResizer
         isVisible={selected}
-        minWidth={80}
-        minHeight={70}
+        minWidth={NODE_MIN}
+        minHeight={NODE_MIN}
+        maxWidth={NODE_MAX}
+        maxHeight={NODE_MAX}
+        keepAspectRatio
         lineStyle={{ borderColor: 'var(--color-accent)', borderWidth: 1 }}
         handleStyle={{ width: 8, height: 8, borderColor: 'var(--color-accent)', background: 'var(--color-card)' }}
       />
       <NodeStatusIndicator status={status}>
         <NodeTooltip>
           <NodeTooltipTrigger>
-            <BaseNode className="w-full min-w-[80px] group">
-              <BaseNodeHeader className="flex-col gap-1 items-center py-3 px-4">
+            <BaseNode className="w-full h-full group flex flex-col items-center justify-center">
+              <BaseNodeHeader className="flex-col gap-1 items-center py-2 px-2">
                 <Icon size={iconPx} style={{ color }} />
-                <BaseNodeHeaderTitle className="text-center text-xs">
+                <BaseNodeHeaderTitle className="text-center leading-tight" style={{ fontSize: labelPx }}>
                   {nodeData.label}
                 </BaseNodeHeaderTitle>
               </BaseNodeHeader>
               {ip && (
-                <BaseNodeContent className="items-center pt-0">
-                  <span className="font-mono text-[10px] text-muted-foreground">{ip}</span>
+                <BaseNodeContent className="items-center pt-0 pb-1">
+                  <span className="font-mono text-muted-foreground" style={{ fontSize: ipPx }}>{ip}</span>
                 </BaseNodeContent>
               )}
               <BaseHandle type="target" position={Position.Top} />
diff --git a/frontend/src/pages/NetworkDiagrams/DiagramEditor.tsx b/frontend/src/pages/NetworkDiagrams/DiagramEditor.tsx
index 9ab258bc..c20b4507 100644
--- a/frontend/src/pages/NetworkDiagrams/DiagramEditor.tsx
+++ b/frontend/src/pages/NetworkDiagrams/DiagramEditor.tsx
@@ -136,6 +136,7 @@ function DiagramEditorInner() {
               id: n.id,
               type: 'device',
               position: n.position,
+              style: n.style || { width: 120, height: 120 },
               data: {
                 label: n.label,
                 deviceType: n.type,
@@ -187,12 +188,15 @@ function DiagramEditorInner() {
         }
       }
       const data = n.data as unknown as DeviceNodeData
+      const dw = typeof n.style?.width === 'number' ? n.style.width : (n.measured?.width ?? 120)
+      const dh = typeof n.style?.height === 'number' ? n.style.height : (n.measured?.height ?? 120)
       return {
         id: n.id,
         type: data.deviceType,
         label: data.label,
         position: n.position,
         properties: data.properties,
+        style: { width: dw, height: dh },
       }
     })
   }, [getNodes])
@@ -312,6 +316,7 @@ function DiagramEditorInner() {
         id: `device-${Date.now()}-${Math.random().toString(36).slice(2, 7)}`,
         type: 'device',
         position,
+        style: { width: 120, height: 120 },
         data: {
           label,
           deviceType: slug,