diff --git a/packages/mermaid/src/rendering-util/rendering-elements/shapes/crossedCircle.ts b/packages/mermaid/src/rendering-util/rendering-elements/shapes/crossedCircle.ts
index 0f0b911b2..83c4d0beb 100644
--- a/packages/mermaid/src/rendering-util/rendering-elements/shapes/crossedCircle.ts
+++ b/packages/mermaid/src/rendering-util/rendering-elements/shapes/crossedCircle.ts
@@ -42,7 +42,8 @@ export const crossedCircle = (parent: SVG, node: Node) => {
   const linePath = createLine(radius);
   const lineNode = rc.path(linePath, options);
 
-  const crossedCircle = shapeSvg.insert(() => circleNode, ':first-child');
+  const crossedCircle = shapeSvg.insert('g', ':first-child');
+  crossedCircle.insert(() => circleNode);
   crossedCircle.insert(() => lineNode);
 
   if (cssStyles && node.look !== 'handDrawn') {
diff --git a/packages/mermaid/src/rendering-util/rendering-elements/shapes/multiRect.ts b/packages/mermaid/src/rendering-util/rendering-elements/shapes/multiRect.ts
index fd71bdd13..a1afff555 100644
--- a/packages/mermaid/src/rendering-util/rendering-elements/shapes/multiRect.ts
+++ b/packages/mermaid/src/rendering-util/rendering-elements/shapes/multiRect.ts
@@ -13,7 +13,7 @@ export const multiRect = async (parent: SVGAElement, node: Node) => {
   const labelPaddingY = node.look === 'neo' ? nodePadding * 1 : nodePadding;
   const w = Math.max(bbox.width + (labelPaddingX ?? 0) * 2, node?.width ?? 0);
   const h = Math.max(bbox.height + (labelPaddingY ?? 0) * 2, node?.height ?? 0);
-  const rectOffset = 5;
+  const rectOffset = node.look === 'neo' ? 10 : 5;
   const x = -w / 2;
   const y = -h / 2;
   const { cssStyles } = node;
@@ -54,9 +54,10 @@ export const multiRect = async (parent: SVGAElement, node: Node) => {
   const outerPath = createPathFromPoints(outerPathPoints);
   const outerNode = rc.path(outerPath, options);
   const innerPath = createPathFromPoints(innerPathPoints);
-  const innerNode = rc.path(innerPath, { ...options, fill: 'none' });
+  const innerNode = rc.path(innerPath, options);
 
-  const multiRect = shapeSvg.insert(() => outerNode, ':first-child');
+  const multiRect = shapeSvg.insert('g', ':first-child');
+  multiRect.insert(() => outerNode);
   multiRect.insert(() => innerNode);
 
   multiRect.attr('class', 'basic label-container');
diff --git a/packages/mermaid/src/rendering-util/rendering-elements/shapes/multiWaveEdgedRectangle.ts b/packages/mermaid/src/rendering-util/rendering-elements/shapes/multiWaveEdgedRectangle.ts
index 39017c711..09219cdc0 100644
--- a/packages/mermaid/src/rendering-util/rendering-elements/shapes/multiWaveEdgedRectangle.ts
+++ b/packages/mermaid/src/rendering-util/rendering-elements/shapes/multiWaveEdgedRectangle.ts
@@ -77,7 +77,8 @@ export const multiWaveEdgedRectangle = async (parent: SVGAElement, node: Node) =
   const innerPath = createPathFromPoints(innerPathPoints);
   const innerNode = rc.path(innerPath, options);
 
-  const shape = shapeSvg.insert(() => outerNode, ':first-child');
+  const shape = shapeSvg.insert('g', ':first-child');
+  shape.insert(() => outerNode);
   shape.insert(() => innerNode);
 
   shape.attr('class', 'basic label-container');