diff --git a/src/vs/workbench/browser/media/part.css b/src/vs/workbench/browser/media/part.css
index f2787c2bf3b..f17465a5e4a 100644
--- a/src/vs/workbench/browser/media/part.css
+++ b/src/vs/workbench/browser/media/part.css
@@ -35,8 +35,7 @@
 	overflow: hidden;
 }
 
-.monaco-workbench .part > .title,
-.monaco-workbench .part > .header-or-footer {
+.monaco-workbench .part > .title {
 	padding-left: 8px;
 	padding-right: 8px;
 }
diff --git a/src/vs/workbench/browser/parts/media/paneCompositePart.css b/src/vs/workbench/browser/parts/media/paneCompositePart.css
index 153ba9ef298..bc9ad38c3b8 100644
--- a/src/vs/workbench/browser/parts/media/paneCompositePart.css
+++ b/src/vs/workbench/browser/parts/media/paneCompositePart.css
@@ -21,6 +21,8 @@
 }
 
 .monaco-workbench .pane-composite-part > .header-or-footer {
+	padding-left: 4px;
+	padding-right: 4px;
 	background-color: var(--vscode-activityBarTop-background);
 }
 
diff --git a/src/vs/workbench/browser/parts/paneCompositePart.ts b/src/vs/workbench/browser/parts/paneCompositePart.ts
index d914587e771..634760a8213 100644
--- a/src/vs/workbench/browser/parts/paneCompositePart.ts
+++ b/src/vs/workbench/browser/parts/paneCompositePart.ts
@@ -545,7 +545,8 @@ export abstract class AbstractPaneCompositePart extends CompositePart<PaneCompos
 
 	private layoutCompositeBar(): void {
 		if (this.contentDimension && this.dimension && this.paneCompositeBar.value) {
-			let availableWidth = this.contentDimension.width - 16; // take padding into account
+			const padding = this.compositeBarPosition === CompositeBarPosition.TITLE ? 16 : 8;
+			let availableWidth = this.contentDimension.width - padding;
 			availableWidth = Math.max(AbstractPaneCompositePart.MIN_COMPOSITE_BAR_WIDTH, availableWidth - this.getToolbarWidth());
 			this.paneCompositeBar.value.layout(availableWidth, this.dimension.height);
 		}
@@ -578,7 +579,7 @@ export abstract class AbstractPaneCompositePart extends CompositePart<PaneCompos
 		// Each toolbar item has 4px margin in the panel toolbar
 		const toolBarWidth = this.toolBar.getItemsWidth() + this.toolBar.getItemsLength() * 4;
 		const globalToolBarWidth = this.globalToolBar ? this.globalToolBar.getItemsWidth() + this.globalToolBar.getItemsLength() * 4 : 0;
-		return 5 + toolBarWidth + globalToolBarWidth; // 5px toolBar padding-left
+		return toolBarWidth + globalToolBarWidth;
 	}
 
 	private onTitleAreaContextMenu(event: StandardMouseEvent): void {
diff --git a/src/vs/workbench/browser/parts/panel/panelPart.ts b/src/vs/workbench/browser/parts/panel/panelPart.ts
index c85e46aedce..0fc902c7657 100644
--- a/src/vs/workbench/browser/parts/panel/panelPart.ts
+++ b/src/vs/workbench/browser/parts/panel/panelPart.ts
@@ -163,6 +163,10 @@ export class PanelPart extends AbstractPaneCompositePart {
 		]);
 	}
 
+	protected override getToolbarWidth(): number {
+		return super.getToolbarWidth() + 5; // 5px toolBar padding-left
+	}
+
 	override layout(width: number, height: number, top: number, left: number): void {
 		let dimensions: Dimension;
 		if (this.layoutService.getPanelPosition() === Position.RIGHT) {