diff --git a/packages/ui/src/components/Form/CustomAutoFields.tsx b/packages/ui/src/components/Form/CustomAutoFields.tsx
index 9a1559192..c4a9cfae1 100644
--- a/packages/ui/src/components/Form/CustomAutoFields.tsx
+++ b/packages/ui/src/components/Form/CustomAutoFields.tsx
@@ -69,7 +69,7 @@ export function CustomAutoFields({
           groupName={CatalogKind.Processor + ' ' + groupName}
           isGroupExpanded={isGroupExpanded}
         >
-          <Card className="nest-field-card">
+          <Card isFlat className="nest-field-card">
             <CardBody className="nest-field-card-body">
               {groupFields.map((field) => (
                 <AutoField key={field} name={field} />
diff --git a/packages/ui/src/components/Form/customField/CustomNestField.scss b/packages/ui/src/components/Form/customField/CustomNestField.scss
index 212f494c3..7ba1eaf52 100644
--- a/packages/ui/src/components/Form/customField/CustomNestField.scss
+++ b/packages/ui/src/components/Form/customField/CustomNestField.scss
@@ -1,4 +1,6 @@
 .custom-nest-field {
+  border-radius: 15px;
+
   /* stylelint-disable-next-line selector-class-pattern */
   .pf-v5-c-card__body {
     display: grid;
diff --git a/packages/ui/src/components/Form/customField/CustomNestField.tsx b/packages/ui/src/components/Form/customField/CustomNestField.tsx
index 2204dd92f..54e1faaa0 100644
--- a/packages/ui/src/components/Form/customField/CustomNestField.tsx
+++ b/packages/ui/src/components/Form/customField/CustomNestField.tsx
@@ -56,7 +56,7 @@ export const CustomNestField = connectField(
     if (propertiesArray.common.length === 0 && Object.keys(propertiesArray.groups).length === 0) return null;
 
     return (
-      <Card className="custom-nest-field" data-testid={'nest-field'} {...filterDOMProps(props)}>
+      <Card isFlat className="custom-nest-field" data-testid={'nest-field'} {...filterDOMProps(props)}>
         <CardHeader>
           <CardTitle>{label}</CardTitle>
         </CardHeader>
diff --git a/packages/ui/src/components/Visualization/Canvas/Canvas.scss b/packages/ui/src/components/Visualization/Canvas/Canvas.scss
new file mode 100644
index 000000000..0a14e61c2
--- /dev/null
+++ b/packages/ui/src/components/Visualization/Canvas/Canvas.scss
@@ -0,0 +1,6 @@
+#topology-resize-panel {
+  /* stylelint-disable-next-line selector-class-pattern */
+  .pf-v5-c-drawer__splitter::after {
+    border: none;
+  }
+}
diff --git a/packages/ui/src/components/Visualization/Canvas/Canvas.tsx b/packages/ui/src/components/Visualization/Canvas/Canvas.tsx
index 6d965c2ba..a8b79dc10 100644
--- a/packages/ui/src/components/Visualization/Canvas/Canvas.tsx
+++ b/packages/ui/src/components/Visualization/Canvas/Canvas.tsx
@@ -36,6 +36,7 @@ import { CanvasDefaults } from './canvas.defaults';
 import { CanvasEdge, CanvasNode, LayoutType } from './canvas.models';
 import { ControllerService } from './controller.service';
 import { FlowService } from './flow.service';
+import './Canvas.scss';
 
 interface CanvasProps {
   contextToolbar?: ReactNode;
diff --git a/packages/ui/src/components/Visualization/Canvas/CanvasSideBar.scss b/packages/ui/src/components/Visualization/Canvas/CanvasSideBar.scss
index 6608d876e..b423cbc9b 100644
--- a/packages/ui/src/components/Visualization/Canvas/CanvasSideBar.scss
+++ b/packages/ui/src/components/Visualization/Canvas/CanvasSideBar.scss
@@ -3,3 +3,7 @@
   position: absolute;
   height: 100%;
 }
+/* stylelint-disable-next-line selector-class-pattern */
+.pf-v5-c-drawer__splitter pf-m-vertical {
+  border: none;
+}
diff --git a/packages/ui/src/components/Visualization/Canvas/Form/CanvasForm.scss b/packages/ui/src/components/Visualization/Canvas/Form/CanvasForm.scss
index f67eca2ff..be17d9a1d 100644
--- a/packages/ui/src/components/Visualization/Canvas/Form/CanvasForm.scss
+++ b/packages/ui/src/components/Visualization/Canvas/Form/CanvasForm.scss
@@ -1,5 +1,6 @@
 .canvas-form {
   height: 100%;
+  border-radius: 15px;
 
   &__body {
     overflow: auto;
diff --git a/packages/ui/src/components/Visualization/Canvas/Form/CanvasForm.tsx b/packages/ui/src/components/Visualization/Canvas/Form/CanvasForm.tsx
index bc0c8c7c7..8a2273a5b 100644
--- a/packages/ui/src/components/Visualization/Canvas/Form/CanvasForm.tsx
+++ b/packages/ui/src/components/Visualization/Canvas/Form/CanvasForm.tsx
@@ -43,7 +43,7 @@ export const CanvasForm: FunctionComponent<CanvasFormProps> = ({ selectedNode, o
 
   return (
     <ErrorBoundary key={selectedNode.id} fallback={<p>This node cannot be configured yet</p>}>
-      <Card className="canvas-form">
+      <Card isFlat className="canvas-form">
         <CardHeader>
           <CanvasFormHeader nodeId={selectedNode.id} title={title} onClose={onCloseFn} nodeIcon={vizNode?.data?.icon} />
         </CardHeader>
diff --git a/packages/ui/src/components/Visualization/Canvas/Form/__snapshots__/CanvasForm.test.tsx.snap b/packages/ui/src/components/Visualization/Canvas/Form/__snapshots__/CanvasForm.test.tsx.snap
index 6534639ec..a14c36fa9 100644
--- a/packages/ui/src/components/Visualization/Canvas/Form/__snapshots__/CanvasForm.test.tsx.snap
+++ b/packages/ui/src/components/Visualization/Canvas/Form/__snapshots__/CanvasForm.test.tsx.snap
@@ -3,7 +3,7 @@
 exports[`CanvasForm should render 1`] = `
 <div>
   <div
-    class="pf-v5-c-card canvas-form"
+    class="pf-v5-c-card pf-m-flat canvas-form"
     data-ouia-component-id="OUIA-Generated-Card-1"
     data-ouia-component-type="PF5/Card"
     data-ouia-safe="true"
@@ -286,7 +286,7 @@ exports[`CanvasForm should render 1`] = `
 exports[`CanvasForm should render nothing if no schema and no definition is available 1`] = `
 <div>
   <div
-    class="pf-v5-c-card canvas-form"
+    class="pf-v5-c-card pf-m-flat canvas-form"
     data-ouia-component-id="OUIA-Generated-Card-4"
     data-ouia-component-type="PF5/Card"
     data-ouia-safe="true"
@@ -551,7 +551,7 @@ exports[`CanvasForm should render nothing if no schema and no definition is avai
 exports[`CanvasForm should render nothing if no schema is available 1`] = `
 <div>
   <div
-    class="pf-v5-c-card canvas-form"
+    class="pf-v5-c-card pf-m-flat canvas-form"
     data-ouia-component-id="OUIA-Generated-Card-2"
     data-ouia-component-type="PF5/Card"
     data-ouia-safe="true"
diff --git a/packages/ui/src/components/Visualization/Canvas/__snapshots__/Canvas.test.tsx.snap b/packages/ui/src/components/Visualization/Canvas/__snapshots__/Canvas.test.tsx.snap
index b192ea62a..460afc052 100644
--- a/packages/ui/src/components/Visualization/Canvas/__snapshots__/Canvas.test.tsx.snap
+++ b/packages/ui/src/components/Visualization/Canvas/__snapshots__/Canvas.test.tsx.snap
@@ -730,13 +730,9 @@ exports[`Canvas should render correctly 1`] = `
                                       style="display: contents;"
                                     >
                                       <button
-                                        aria-disabled="false"
-                                        class="pf-v5-c-button pf-m-control container-controls"
-                                        data-ouia-component-id="OUIA-Generated-Button-control-7"
-                                        data-ouia-component-type="PF5/Button"
-                                        data-ouia-safe="true"
+                                        class="container-controls"
                                         data-testid="collapseButton-route-8888"
-                                        type="button"
+                                        id="collapse-button-control"
                                       >
                                         <svg
                                           aria-hidden="true"
@@ -758,13 +754,9 @@ exports[`Canvas should render correctly 1`] = `
                                       style="display: contents;"
                                     >
                                       <button
-                                        aria-disabled="false"
-                                        class="pf-v5-c-button pf-m-control container-controls"
-                                        data-ouia-component-id="OUIA-Generated-Button-control-8"
-                                        data-ouia-component-type="PF5/Button"
-                                        data-ouia-safe="true"
+                                        class="container-controls"
                                         data-testid="contextualMenu-route-8888"
-                                        type="button"
+                                        id="container-controls-contextual-menu"
                                       >
                                         <svg
                                           aria-hidden="true"
@@ -830,13 +822,9 @@ exports[`Canvas should render correctly 1`] = `
                                       style="display: contents;"
                                     >
                                       <button
-                                        aria-disabled="false"
-                                        class="pf-v5-c-button pf-m-control container-controls"
-                                        data-ouia-component-id="OUIA-Generated-Button-control-9"
-                                        data-ouia-component-type="PF5/Button"
-                                        data-ouia-safe="true"
+                                        class="container-controls"
                                         data-testid="collapseButton-choice"
-                                        type="button"
+                                        id="collapse-button-control"
                                       >
                                         <svg
                                           aria-hidden="true"
@@ -858,13 +846,9 @@ exports[`Canvas should render correctly 1`] = `
                                       style="display: contents;"
                                     >
                                       <button
-                                        aria-disabled="false"
-                                        class="pf-v5-c-button pf-m-control container-controls"
-                                        data-ouia-component-id="OUIA-Generated-Button-control-10"
-                                        data-ouia-component-type="PF5/Button"
-                                        data-ouia-safe="true"
+                                        class="container-controls"
                                         data-testid="contextualMenu-choice"
-                                        type="button"
+                                        id="container-controls-contextual-menu"
                                       >
                                         <svg
                                           aria-hidden="true"
@@ -930,13 +914,9 @@ exports[`Canvas should render correctly 1`] = `
                                       style="display: contents;"
                                     >
                                       <button
-                                        aria-disabled="false"
-                                        class="pf-v5-c-button pf-m-control container-controls"
-                                        data-ouia-component-id="OUIA-Generated-Button-control-11"
-                                        data-ouia-component-type="PF5/Button"
-                                        data-ouia-safe="true"
+                                        class="container-controls"
                                         data-testid="collapseButton-otherwise"
-                                        type="button"
+                                        id="collapse-button-control"
                                       >
                                         <svg
                                           aria-hidden="true"
@@ -958,13 +938,9 @@ exports[`Canvas should render correctly 1`] = `
                                       style="display: contents;"
                                     >
                                       <button
-                                        aria-disabled="false"
-                                        class="pf-v5-c-button pf-m-control container-controls"
-                                        data-ouia-component-id="OUIA-Generated-Button-control-12"
-                                        data-ouia-component-type="PF5/Button"
-                                        data-ouia-safe="true"
+                                        class="container-controls"
                                         data-testid="contextualMenu-otherwise"
-                                        type="button"
+                                        id="container-controls-contextual-menu"
                                       >
                                         <svg
                                           aria-hidden="true"
@@ -1481,13 +1457,9 @@ exports[`Canvas should render correctly with more routes  1`] = `
                                       style="display: contents;"
                                     >
                                       <button
-                                        aria-disabled="false"
-                                        class="pf-v5-c-button pf-m-control container-controls"
-                                        data-ouia-component-id="OUIA-Generated-Button-control-19"
-                                        data-ouia-component-type="PF5/Button"
-                                        data-ouia-safe="true"
+                                        class="container-controls"
                                         data-testid="collapseButton-route-8888"
-                                        type="button"
+                                        id="collapse-button-control"
                                       >
                                         <svg
                                           aria-hidden="true"
@@ -1509,13 +1481,9 @@ exports[`Canvas should render correctly with more routes  1`] = `
                                       style="display: contents;"
                                     >
                                       <button
-                                        aria-disabled="false"
-                                        class="pf-v5-c-button pf-m-control container-controls"
-                                        data-ouia-component-id="OUIA-Generated-Button-control-20"
-                                        data-ouia-component-type="PF5/Button"
-                                        data-ouia-safe="true"
+                                        class="container-controls"
                                         data-testid="contextualMenu-route-8888"
-                                        type="button"
+                                        id="container-controls-contextual-menu"
                                       >
                                         <svg
                                           aria-hidden="true"
@@ -1581,13 +1549,9 @@ exports[`Canvas should render correctly with more routes  1`] = `
                                       style="display: contents;"
                                     >
                                       <button
-                                        aria-disabled="false"
-                                        class="pf-v5-c-button pf-m-control container-controls"
-                                        data-ouia-component-id="OUIA-Generated-Button-control-21"
-                                        data-ouia-component-type="PF5/Button"
-                                        data-ouia-safe="true"
+                                        class="container-controls"
                                         data-testid="collapseButton-choice"
-                                        type="button"
+                                        id="collapse-button-control"
                                       >
                                         <svg
                                           aria-hidden="true"
@@ -1609,13 +1573,9 @@ exports[`Canvas should render correctly with more routes  1`] = `
                                       style="display: contents;"
                                     >
                                       <button
-                                        aria-disabled="false"
-                                        class="pf-v5-c-button pf-m-control container-controls"
-                                        data-ouia-component-id="OUIA-Generated-Button-control-22"
-                                        data-ouia-component-type="PF5/Button"
-                                        data-ouia-safe="true"
+                                        class="container-controls"
                                         data-testid="contextualMenu-choice"
-                                        type="button"
+                                        id="container-controls-contextual-menu"
                                       >
                                         <svg
                                           aria-hidden="true"
@@ -1681,13 +1641,9 @@ exports[`Canvas should render correctly with more routes  1`] = `
                                       style="display: contents;"
                                     >
                                       <button
-                                        aria-disabled="false"
-                                        class="pf-v5-c-button pf-m-control container-controls"
-                                        data-ouia-component-id="OUIA-Generated-Button-control-23"
-                                        data-ouia-component-type="PF5/Button"
-                                        data-ouia-safe="true"
+                                        class="container-controls"
                                         data-testid="collapseButton-otherwise"
-                                        type="button"
+                                        id="collapse-button-control"
                                       >
                                         <svg
                                           aria-hidden="true"
@@ -1709,13 +1665,9 @@ exports[`Canvas should render correctly with more routes  1`] = `
                                       style="display: contents;"
                                     >
                                       <button
-                                        aria-disabled="false"
-                                        class="pf-v5-c-button pf-m-control container-controls"
-                                        data-ouia-component-id="OUIA-Generated-Button-control-24"
-                                        data-ouia-component-type="PF5/Button"
-                                        data-ouia-safe="true"
+                                        class="container-controls"
                                         data-testid="contextualMenu-otherwise"
-                                        type="button"
+                                        id="container-controls-contextual-menu"
                                       >
                                         <svg
                                           aria-hidden="true"
@@ -2232,13 +2184,9 @@ exports[`Canvas should render the Catalog button if \`CatalogModalContext\` is p
                                       style="display: contents;"
                                     >
                                       <button
-                                        aria-disabled="false"
-                                        class="pf-v5-c-button pf-m-control container-controls"
-                                        data-ouia-component-id="OUIA-Generated-Button-control-45"
-                                        data-ouia-component-type="PF5/Button"
-                                        data-ouia-safe="true"
+                                        class="container-controls"
                                         data-testid="collapseButton-route-8888"
-                                        type="button"
+                                        id="collapse-button-control"
                                       >
                                         <svg
                                           aria-hidden="true"
@@ -2260,13 +2208,9 @@ exports[`Canvas should render the Catalog button if \`CatalogModalContext\` is p
                                       style="display: contents;"
                                     >
                                       <button
-                                        aria-disabled="false"
-                                        class="pf-v5-c-button pf-m-control container-controls"
-                                        data-ouia-component-id="OUIA-Generated-Button-control-46"
-                                        data-ouia-component-type="PF5/Button"
-                                        data-ouia-safe="true"
+                                        class="container-controls"
                                         data-testid="contextualMenu-route-8888"
-                                        type="button"
+                                        id="container-controls-contextual-menu"
                                       >
                                         <svg
                                           aria-hidden="true"
@@ -2332,13 +2276,9 @@ exports[`Canvas should render the Catalog button if \`CatalogModalContext\` is p
                                       style="display: contents;"
                                     >
                                       <button
-                                        aria-disabled="false"
-                                        class="pf-v5-c-button pf-m-control container-controls"
-                                        data-ouia-component-id="OUIA-Generated-Button-control-47"
-                                        data-ouia-component-type="PF5/Button"
-                                        data-ouia-safe="true"
+                                        class="container-controls"
                                         data-testid="collapseButton-choice"
-                                        type="button"
+                                        id="collapse-button-control"
                                       >
                                         <svg
                                           aria-hidden="true"
@@ -2360,13 +2300,9 @@ exports[`Canvas should render the Catalog button if \`CatalogModalContext\` is p
                                       style="display: contents;"
                                     >
                                       <button
-                                        aria-disabled="false"
-                                        class="pf-v5-c-button pf-m-control container-controls"
-                                        data-ouia-component-id="OUIA-Generated-Button-control-48"
-                                        data-ouia-component-type="PF5/Button"
-                                        data-ouia-safe="true"
+                                        class="container-controls"
                                         data-testid="contextualMenu-choice"
-                                        type="button"
+                                        id="container-controls-contextual-menu"
                                       >
                                         <svg
                                           aria-hidden="true"
@@ -2432,13 +2368,9 @@ exports[`Canvas should render the Catalog button if \`CatalogModalContext\` is p
                                       style="display: contents;"
                                     >
                                       <button
-                                        aria-disabled="false"
-                                        class="pf-v5-c-button pf-m-control container-controls"
-                                        data-ouia-component-id="OUIA-Generated-Button-control-49"
-                                        data-ouia-component-type="PF5/Button"
-                                        data-ouia-safe="true"
+                                        class="container-controls"
                                         data-testid="collapseButton-otherwise"
-                                        type="button"
+                                        id="collapse-button-control"
                                       >
                                         <svg
                                           aria-hidden="true"
@@ -2460,13 +2392,9 @@ exports[`Canvas should render the Catalog button if \`CatalogModalContext\` is p
                                       style="display: contents;"
                                     >
                                       <button
-                                        aria-disabled="false"
-                                        class="pf-v5-c-button pf-m-control container-controls"
-                                        data-ouia-component-id="OUIA-Generated-Button-control-50"
-                                        data-ouia-component-type="PF5/Button"
-                                        data-ouia-safe="true"
+                                        class="container-controls"
                                         data-testid="contextualMenu-otherwise"
-                                        type="button"
+                                        id="container-controls-contextual-menu"
                                       >
                                         <svg
                                           aria-hidden="true"
diff --git a/packages/ui/src/components/Visualization/Canvas/__snapshots__/CanvasSideBar.test.tsx.snap b/packages/ui/src/components/Visualization/Canvas/__snapshots__/CanvasSideBar.test.tsx.snap
index 54e596878..e422245b1 100644
--- a/packages/ui/src/components/Visualization/Canvas/__snapshots__/CanvasSideBar.test.tsx.snap
+++ b/packages/ui/src/components/Visualization/Canvas/__snapshots__/CanvasSideBar.test.tsx.snap
@@ -7,7 +7,7 @@ exports[`CanvasSideBar displays selected node information 1`] = `
     role="dialog"
   >
     <div
-      class="pf-v5-c-card canvas-form"
+      class="pf-v5-c-card pf-m-flat canvas-form"
       data-ouia-component-id="OUIA-Generated-Card-1"
       data-ouia-component-type="PF5/Card"
       data-ouia-safe="true"
diff --git a/packages/ui/src/components/Visualization/Custom/Group/CollapseButton.tsx b/packages/ui/src/components/Visualization/Custom/Group/CollapseButton.tsx
index 03e10523c..fbdb2c499 100644
--- a/packages/ui/src/components/Visualization/Custom/Group/CollapseButton.tsx
+++ b/packages/ui/src/components/Visualization/Custom/Group/CollapseButton.tsx
@@ -1,4 +1,4 @@
-import { Button, Tooltip } from '@patternfly/react-core';
+import { Tooltip } from '@patternfly/react-core';
 import { CompressArrowsAltIcon, ExpandArrowsAltIcon } from '@patternfly/react-icons';
 import { CollapsibleGroupProps } from '@patternfly/react-topology';
 import { FunctionComponent, MouseEventHandler } from 'react';
@@ -15,20 +15,20 @@ export const CollapseButton: FunctionComponent<CollapseButtonProps> = ({
   ['data-testid']: dataTestId,
   onCollapseChange,
 }) => {
-  const onClick: MouseEventHandler<HTMLButtonElement> = (event) => {
+  const onClick: MouseEventHandler<HTMLButtonElement> & MouseEventHandler<HTMLDivElement> = (event) => {
     event.stopPropagation();
     onCollapseChange?.(element, !element.isCollapsed());
   };
 
   return (
     <Tooltip content={element.isCollapsed() ? 'Expand' : 'Collapse'}>
-      <Button className="container-controls" variant="control" onClick={onClick} data-testid={dataTestId}>
+      <button className="container-controls" id="collapse-button-control" onClick={onClick} data-testid={dataTestId}>
         {element.isCollapsed() ? (
           <ExpandArrowsAltIcon data-testid="expand-icon" />
         ) : (
           <CompressArrowsAltIcon data-testid="collapse-icon" />
         )}
-      </Button>
+      </button>
     </Tooltip>
   );
 };
diff --git a/packages/ui/src/components/Visualization/Custom/Group/ContextMenuButton.tsx b/packages/ui/src/components/Visualization/Custom/Group/ContextMenuButton.tsx
index d071e5a0d..657433b80 100644
--- a/packages/ui/src/components/Visualization/Custom/Group/ContextMenuButton.tsx
+++ b/packages/ui/src/components/Visualization/Custom/Group/ContextMenuButton.tsx
@@ -1,4 +1,4 @@
-import { Button, Tooltip } from '@patternfly/react-core';
+import { Tooltip } from '@patternfly/react-core';
 import { EllipsisVIcon } from '@patternfly/react-icons';
 import { ContextMenu, PointIface } from '@patternfly/react-topology';
 import { FunctionComponent, MouseEventHandler, useRef, useState } from 'react';
@@ -26,9 +26,14 @@ export const ContextMenuButton: FunctionComponent<ContextMenuButtonProps> = ({
   return (
     <>
       <Tooltip content="Contextual menu">
-        <Button className="container-controls" variant="control" onClick={onClick} data-testid={dataTestId}>
+        <button
+          className="container-controls"
+          id="container-controls-contextual-menu"
+          onClick={onClick}
+          data-testid={dataTestId}
+        >
           <EllipsisVIcon />
-        </Button>
+        </button>
       </Tooltip>
       <ContextMenu
         reference={reference.current}
diff --git a/packages/ui/src/components/Visualization/Custom/Group/CustomGroup.scss b/packages/ui/src/components/Visualization/Custom/Group/CustomGroup.scss
index 9869b05a0..a1703d78b 100644
--- a/packages/ui/src/components/Visualization/Custom/Group/CustomGroup.scss
+++ b/packages/ui/src/components/Visualization/Custom/Group/CustomGroup.scss
@@ -8,21 +8,40 @@
 }
 
 .container-controls {
-  padding: var(--pf-v5-global--BorderWidth--xl);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  color: var(--pf-v5-global--Color--200);
+  width: calc(var(--custom-group-TitleHeight) * 0.8);
+  height: calc(var(--custom-group-TitleHeight) * 0.8);
+  border: var(--pf-v5-global--BorderWidth--sm) solid var(--pf-v5-global--palette--black-400);
+  background-color: var(--pf-v5-global--palette--white);
+  border-radius: 50px;
+  cursor: pointer;
+  margin-right: 5px;
+
+  &:hover {
+    border-color: var(--pf-v5-global--primary-color--light-100);
+    background-color: var(--pf-v5-global--BackgroundColor--200);
+  }
 }
 
 .custom-group {
   --custom-group--BorderColor: var(--pf-v5-global--palette--black-400);
   --custom-group--BorderSize: var(--pf-v5-global--BorderWidth--md);
+  --custom-group--BorderRadius: 15px;
   --custom-group--Background: var(--pf-v5-global--palette--white);
   --custom-group-TitleHeight: 32px;
+  --custom-group-TitleBackground: var(--pf-v5-global--palette--blue-200);
+  --custom-group-TitleColor: var(--pf-v5-global--palette--black-900);
 
   display: flex;
   flex-flow: column;
   height: 100%;
   width: 100%;
   background-color: var(--custom-group--Background);
-  border-radius: var(--pf-v5-global--BorderWidth--xl);
+  color: var(--pf-v5-global--Color--100);
+  border-radius: var(--custom-group--BorderRadius);
   border: var(--custom-group--BorderSize) solid var(--custom-group--BorderColor);
 
   &__title {
@@ -30,8 +49,10 @@
     align-items: center;
     font-size: var(--pf-v5-global--FontSize--md);
     font-weight: bold;
-    color: var(--pf-v5-global--palette--black-900);
-    background-color: var(--pf-v5-global--palette--light-blue-400);
+    color: var(--custom-group-TitleColor);
+    border-top-left-radius: calc(var(--custom-group--BorderRadius) - 2px);
+    border-top-right-radius: calc(var(--custom-group--BorderRadius) - 2px);
+    background-color: var(--custom-group-TitleBackground);
     height: var(--custom-group-TitleHeight);
 
     &__img-circle {
@@ -41,7 +62,7 @@
       justify-content: center;
       width: calc(var(--custom-group-TitleHeight) * 0.9);
       height: calc(var(--custom-group-TitleHeight) * 0.9);
-      border: var(--custom-group--BorderSize) solid var(--custom-group--BorderColor);
+      border: var(--pf-v5-global--BorderWidth--sm) solid var(--pf-v5-global--palette--black-400);
       background-color: var(--pf-v5-global--palette--white);
       border-radius: 50px;
 
@@ -65,12 +86,14 @@
   }
 
   &--selected {
-    --custom-group--BorderColor: var(--pf-v5-global--palette--light-blue-400);
+    --custom-group--BorderColor: var(--pf-v5-global--palette--blue-200);
     --custom-group--Background: var(--pf-v5-global--palette--blue-50);
-    --custom-group--BorderSize: var(--pf-v5-global--BorderWidth--lg);
+    --custom-group--BorderSize: var(--pf-v5-global--BorderWidth--md);
+    --custom-group-TitleBackground: var(--pf-v5-global--palette--blue-300);
+    --custom-group-TitleColor: var(--pf-v5-global--palette--white);
 
     &:hover {
-      --custom-group--BorderColor: var(--pf-v5-global--palette--light-blue-400);
+      --custom-group--BorderColor: var(--pf-v5-global--palette--blue-200);
       --custom-group--Background: var(--pf-v5-global--palette--blue-50);
     }
   }
diff --git a/packages/ui/src/components/Visualization/Custom/Group/__snapshots__/CollapseButton.test.tsx.snap b/packages/ui/src/components/Visualization/Custom/Group/__snapshots__/CollapseButton.test.tsx.snap
index 3dd654b77..f5a2c374e 100644
--- a/packages/ui/src/components/Visualization/Custom/Group/__snapshots__/CollapseButton.test.tsx.snap
+++ b/packages/ui/src/components/Visualization/Custom/Group/__snapshots__/CollapseButton.test.tsx.snap
@@ -2,13 +2,9 @@
 
 exports[`CollapseButton should render the collapse button 1`] = `
 <button
-  aria-disabled="false"
-  class="pf-v5-c-button pf-m-control container-controls"
-  data-ouia-component-id="OUIA-Generated-Button-control-1"
-  data-ouia-component-type="PF5/Button"
-  data-ouia-safe="true"
+  class="container-controls"
   data-testid="collapseButton-test"
-  type="button"
+  id="collapse-button-control"
 >
   <svg
     aria-hidden="true"
diff --git a/packages/ui/src/components/Visualization/Custom/Group/__snapshots__/ContextMenuButton.test.tsx.snap b/packages/ui/src/components/Visualization/Custom/Group/__snapshots__/ContextMenuButton.test.tsx.snap
index 59cd7baa3..610f98d0a 100644
--- a/packages/ui/src/components/Visualization/Custom/Group/__snapshots__/ContextMenuButton.test.tsx.snap
+++ b/packages/ui/src/components/Visualization/Custom/Group/__snapshots__/ContextMenuButton.test.tsx.snap
@@ -2,13 +2,9 @@
 
 exports[`ContextMenuButton should render the button 1`] = `
 <button
-  aria-disabled="false"
-  class="pf-v5-c-button pf-m-control container-controls"
-  data-ouia-component-id="OUIA-Generated-Button-control-1"
-  data-ouia-component-type="PF5/Button"
-  data-ouia-safe="true"
+  class="container-controls"
   data-testid="contextualMenu-test"
-  type="button"
+  id="container-controls-contextual-menu"
 >
   <svg
     aria-hidden="true"
diff --git a/packages/ui/src/components/Visualization/Visualization.scss b/packages/ui/src/components/Visualization/Visualization.scss
index 6f53df78c..15ec6eca7 100644
--- a/packages/ui/src/components/Visualization/Visualization.scss
+++ b/packages/ui/src/components/Visualization/Visualization.scss
@@ -1,6 +1,10 @@
 .canvas-surface {
   display: flex;
   flex-flow: column;
+
+  .pf-topology-content {
+    border-radius: 15px;
+  }
 }
 
 // Override for the default patternfly class