diff --git a/components/lib/panel/style/PanelStyle.js b/components/lib/panel/style/PanelStyle.js
index 300d3ce2e..5f26ea030 100644
--- a/components/lib/panel/style/PanelStyle.js
+++ b/components/lib/panel/style/PanelStyle.js
@@ -6,9 +6,6 @@ const theme = ({ dt }) => `
     border-radius: ${dt('panel.border.radius')};
     background: ${dt('panel.background')};
     color: ${dt('panel.color')};
-    display: flex;
-    flex-direction: column;
-    gap: ${dt('panel.gap')};
 }
 
 .p-panel-header {
@@ -21,6 +18,7 @@ const theme = ({ dt }) => `
     border-style: solid;
     border-width: ${dt('panel.header.border.width')};
     border-color: ${dt('panel.header.border.color')};
+    border-radius: ${dt('panel.header.border.radius')};
 }
 
 .p-panel-toggleable .p-panel-header {
@@ -39,10 +37,6 @@ const theme = ({ dt }) => `
 .p-panel-footer {
     padding: ${dt('panel.footer.padding')};
 }
-
-.p-panel-header + .p-panel-content-container >  .p-panel-content {
-    padding-top: 0;
-}
 `;
 
 const classes = {
diff --git a/components/lib/themes/aura/panel/index.js b/components/lib/themes/aura/panel/index.js
index 51e5e4568..1e7551b5a 100644
--- a/components/lib/themes/aura/panel/index.js
+++ b/components/lib/themes/aura/panel/index.js
@@ -3,14 +3,14 @@ export default {
         background: '{content.background}',
         borderColor: '{content.border.color}',
         color: '{content.color}',
-        borderRadius: '{content.border.radius}',
-        gap: '0'
+        borderRadius: '{content.border.radius}'
     },
     header: {
         background: 'transparent',
         color: '{text.color}',
         padding: '1.125rem',
-        borderWidth: '0'
+        borderWidth: '0',
+        borderRadius: '0'
     },
     toggleableHeader: {
         padding: '0.375rem 1.125rem'
diff --git a/components/lib/themes/lara/panel/index.js b/components/lib/themes/lara/panel/index.js
index 1acbf061a..4d247d389 100644
--- a/components/lib/themes/lara/panel/index.js
+++ b/components/lib/themes/lara/panel/index.js
@@ -3,13 +3,13 @@ export default {
         background: '{content.background}',
         borderColor: '{content.border.color}',
         color: '{content.color}',
-        borderRadius: '{content.border.radius}',
-        gap: '1.125rem'
+        borderRadius: '{content.border.radius}'
     },
     header: {
         borderWidth: '0 0 1px 0',
         borderColor: '{content.border.color}',
-        padding: '1.125rem'
+        padding: '1.125rem',
+        borderRadius: '3px 3px 0 0'
     },
     toggleableHeader: {
         padding: '0.25rem 1.125rem'
@@ -18,11 +18,10 @@ export default {
         fontWeight: '700'
     },
     content: {
-        padding: '1.125rem',
-        withHeaderPadding: '1.125rem'
+        padding: '1.125rem'
     },
     footer: {
-        padding: '0 1.125rem 1.125rem 1.125rem'
+        padding: '1.125rem'
     },
     colorScheme: {
         light: {