diff --git a/extensions/theme-defaults/themes/dark_modern.json b/extensions/theme-defaults/themes/dark_modern.json
index 51e0f371c27..574d89f9c4a 100644
--- a/extensions/theme-defaults/themes/dark_modern.json
+++ b/extensions/theme-defaults/themes/dark_modern.json
@@ -13,12 +13,12 @@
 		"badge.background": "#616161",
 		"badge.foreground": "#F8F8F8",
 		"button.background": "#0078D4",
-		"button.border": "#FFFFFF12",
+		"button.border": "#ffffff1a",
 		"button.foreground": "#FFFFFF",
 		"button.hoverBackground": "#026EC1",
-		"button.secondaryBackground": "#313131",
+		"button.secondaryBackground": "#00000000",
 		"button.secondaryForeground": "#CCCCCC",
-		"button.secondaryHoverBackground": "#3C3C3C",
+		"button.secondaryHoverBackground": "#2B2B2B",
 		"chat.slashCommandBackground": "#26477866",
 		"chat.slashCommandForeground": "#85B6FF",
 		"chat.editedFileForeground": "#E2C08D",
diff --git a/src/vs/base/browser/ui/button/button.css b/src/vs/base/browser/ui/button/button.css
index 2517cd3571c..da2318ec8b6 100644
--- a/src/vs/base/browser/ui/button/button.css
+++ b/src/vs/base/browser/ui/button/button.css
@@ -7,14 +7,21 @@
 	box-sizing: border-box;
 	display: flex;
 	width: 100%;
-	padding: 4px;
-	border-radius: 2px;
+	padding: 4px 8px;
+	border-radius: 4px;
 	text-align: center;
 	cursor: pointer;
 	justify-content: center;
 	align-items: center;
 	border: 1px solid var(--vscode-button-border, transparent);
-	line-height: 18px;
+	line-height: 16px;
+	font-size: 12px;
+}
+
+.monaco-text-button.small {
+	line-height: 14px;
+	font-size: 11px;
+	padding: 3px 6px;
 }
 
 .monaco-text-button:focus {
@@ -39,9 +46,7 @@
 .monaco-text-button.monaco-text-button-with-short-label {
 	flex-direction: row;
 	flex-wrap: wrap;
-	padding: 0 4px;
 	overflow: hidden;
-	height: 28px;
 }
 
 .monaco-text-button.monaco-text-button-with-short-label > .monaco-button-label {
@@ -61,7 +66,6 @@
 	align-items: center;
 	font-weight: normal;
 	font-style: inherit;
-	padding: 4px 0;
 }
 
 .monaco-button-dropdown {
@@ -100,13 +104,13 @@
 .monaco-button-dropdown > .monaco-button.monaco-dropdown-button {
 	border: 1px solid var(--vscode-button-border, transparent);
 	border-left-width: 0 !important;
-	border-radius: 0 2px 2px 0;
+	border-radius: 0 4px 4px 0;
 	display: flex;
 	align-items: center;
 }
 
 .monaco-button-dropdown > .monaco-button.monaco-text-button {
-	border-radius: 2px 0 0 2px;
+	border-radius: 4px 0 0 4px;
 }
 
 .monaco-description-button {
diff --git a/src/vs/base/browser/ui/button/button.ts b/src/vs/base/browser/ui/button/button.ts
index 9b66a126cb9..fa1fa93d545 100644
--- a/src/vs/base/browser/ui/button/button.ts
+++ b/src/vs/base/browser/ui/button/button.ts
@@ -35,6 +35,7 @@ export interface IButtonOptions extends Partial<IButtonStyles> {
 	readonly supportIcons?: boolean;
 	readonly supportShortLabel?: boolean;
 	readonly secondary?: boolean;
+	readonly small?: boolean;
 	readonly hoverDelegate?: IHoverDelegate;
 	readonly disabled?: boolean;
 }
@@ -116,6 +117,7 @@ export class Button extends Disposable implements IButton {
 		this._element.setAttribute('role', 'button');
 
 		this._element.classList.toggle('secondary', !!options.secondary);
+		this._element.classList.toggle('small', !!options.small);
 		const background = options.secondary ? options.buttonSecondaryBackground : options.buttonBackground;
 		const foreground = options.secondary ? options.buttonSecondaryForeground : options.buttonForeground;
 
diff --git a/src/vs/base/browser/ui/dialog/dialog.css b/src/vs/base/browser/ui/dialog/dialog.css
index fe18c9a447b..c484fa86dbd 100644
--- a/src/vs/base/browser/ui/dialog/dialog.css
+++ b/src/vs/base/browser/ui/dialog/dialog.css
@@ -194,7 +194,6 @@
 }
 
 .monaco-dialog-box > .dialog-buttons-row > .dialog-buttons > .monaco-button {
-	padding: 4px 10px;
 	overflow: hidden;
 	text-overflow: ellipsis;
 	margin: 4px 5px; /* allows button focus outline to be visible */
@@ -228,19 +227,14 @@
 	outline-width: 1px;
 	outline-style: solid;
 	outline-color: var(--vscode-focusBorder);
-	border-radius: 2px;
+	border-radius: 4px;
 }
 
-.monaco-dialog-box > .dialog-buttons-row > .dialog-buttons > .monaco-button-dropdown > .monaco-text-button {
-	padding-left: 10px;
-	padding-right: 10px;
-}
 
 .monaco-dialog-box.align-vertical > .dialog-buttons-row > .dialog-buttons > .monaco-button-dropdown > .monaco-text-button {
 	width: 100%;
 }
 
 .monaco-dialog-box > .dialog-buttons-row > .dialog-buttons > .monaco-button-dropdown > .monaco-dropdown-button {
-	padding-left: 5px;
-	padding-right: 5px;
+	padding: 0 4px;
 }
diff --git a/src/vs/base/browser/ui/inputbox/inputBox.css b/src/vs/base/browser/ui/inputbox/inputBox.css
index f6005a48f78..827a19f29b4 100644
--- a/src/vs/base/browser/ui/inputbox/inputBox.css
+++ b/src/vs/base/browser/ui/inputbox/inputBox.css
@@ -8,7 +8,7 @@
 	display: block;
 	padding: 0;
 	box-sizing:	border-box;
-	border-radius: 2px;
+	border-radius: 4px;
 
 	/* Customizable */
 	font-size: inherit;
diff --git a/src/vs/base/browser/ui/selectBox/selectBox.css b/src/vs/base/browser/ui/selectBox/selectBox.css
index 7242251e9b4..2b0011a842b 100644
--- a/src/vs/base/browser/ui/selectBox/selectBox.css
+++ b/src/vs/base/browser/ui/selectBox/selectBox.css
@@ -6,7 +6,7 @@
 .monaco-select-box {
 	width: 100%;
 	cursor: pointer;
-	border-radius: 2px;
+	border-radius: 4px;
 }
 
 .monaco-select-box-dropdown-container {
@@ -30,6 +30,6 @@
 
 .mac .monaco-action-bar .action-item .monaco-select-box {
 	font-size: 11px;
-	border-radius: 3px;
+	border-radius: 4px;
 	min-height: 24px;
 }
diff --git a/src/vs/base/browser/ui/selectBox/selectBoxCustom.css b/src/vs/base/browser/ui/selectBox/selectBoxCustom.css
index 4d2fb516f20..2ca9a99a7bc 100644
--- a/src/vs/base/browser/ui/selectBox/selectBoxCustom.css
+++ b/src/vs/base/browser/ui/selectBox/selectBoxCustom.css
@@ -6,7 +6,7 @@
 .monaco-select-box-dropdown-container {
 	display: none;
 	box-sizing: border-box;
-	border-radius: 5px;
+	border-radius: 4px;
 	box-shadow: 0 2px 8px var(--vscode-widget-shadow);
 }
 
diff --git a/src/vs/editor/contrib/rename/browser/renameWidget.css b/src/vs/editor/contrib/rename/browser/renameWidget.css
index 66f241efd1c..acd375f2afb 100644
--- a/src/vs/editor/contrib/rename/browser/renameWidget.css
+++ b/src/vs/editor/contrib/rename/browser/renameWidget.css
@@ -15,7 +15,7 @@
 
 .monaco-editor .rename-box .rename-input-with-button {
 	padding: 3px;
-	border-radius: 2px;
+	border-radius: 4px;
 	width: calc(100% - 8px); /* 4px padding on each side */
 }
 
diff --git a/src/vs/platform/actions/browser/buttonbar.ts b/src/vs/platform/actions/browser/buttonbar.ts
index 45778e15a54..f6488250bba 100644
--- a/src/vs/platform/actions/browser/buttonbar.ts
+++ b/src/vs/platform/actions/browser/buttonbar.ts
@@ -29,6 +29,7 @@ export type IButtonConfigProvider = (action: IAction, index: number) => {
 export interface IWorkbenchButtonBarOptions {
 	telemetrySource?: string;
 	buttonConfigProvider?: IButtonConfigProvider;
+	small?: boolean;
 }
 
 export class WorkbenchButtonBar extends ButtonBar {
@@ -99,6 +100,7 @@ export class WorkbenchButtonBar extends ButtonBar {
 					contextMenuProvider: this._contextMenuService,
 					ariaLabel: tooltip,
 					supportIcons: true,
+					small: this._options?.small,
 				});
 			} else {
 				action = actionOrSubmenu;
@@ -106,6 +108,7 @@ export class WorkbenchButtonBar extends ButtonBar {
 					secondary: conifgProvider(action, i)?.isSecondary ?? secondary,
 					ariaLabel: tooltip,
 					supportIcons: true,
+					small: this._options?.small,
 				});
 			}
 
@@ -142,7 +145,8 @@ export class WorkbenchButtonBar extends ButtonBar {
 
 			const btn = this.addButton({
 				secondary: true,
-				ariaLabel: localize('moreActions', "More Actions")
+				ariaLabel: localize('moreActions', "More Actions"),
+				small: this._options?.small,
 			});
 
 			btn.icon = Codicon.dropDownButton;
diff --git a/src/vs/platform/quickinput/browser/media/quickInput.css b/src/vs/platform/quickinput/browser/media/quickInput.css
index 0b0856c6411..0636687742d 100644
--- a/src/vs/platform/quickinput/browser/media/quickInput.css
+++ b/src/vs/platform/quickinput/browser/media/quickInput.css
@@ -9,7 +9,7 @@
 	z-index: 2550;
 	left: 50%;
 	-webkit-app-region: no-drag;
-	border-radius: 6px;
+	border-radius: 8px;
 }
 
 .quick-input-titlebar {
@@ -89,7 +89,7 @@
 .quick-input-header {
 	cursor: grab;
 	display: flex;
-	padding: 6px 6px 2px 6px;
+	padding: 6px 6px 4px 6px;
 }
 
 .quick-input-widget.hidden-input .quick-input-header {
@@ -155,14 +155,6 @@
 	margin-left: 6px;
 }
 
-.quick-input-action .monaco-text-button {
-	font-size: 11px;
-	padding: 0 6px;
-	display: flex;
-	height: 25px;
-	align-items: center;
-}
-
 .quick-input-message {
 	margin-top: -1px;
 	padding: 5px;
@@ -196,7 +188,7 @@
 .quick-input-list .monaco-list {
 	overflow: hidden;
 	max-height: calc(20 * 22px);
-	padding-bottom: 5px;
+	padding-bottom: 7px;
 }
 
 .quick-input-list .monaco-scrollable-element {
diff --git a/src/vs/workbench/browser/parts/editor/media/editorplaceholder.css b/src/vs/workbench/browser/parts/editor/media/editorplaceholder.css
index 4861d184353..b7c1b96fc9a 100644
--- a/src/vs/workbench/browser/parts/editor/media/editorplaceholder.css
+++ b/src/vs/workbench/browser/parts/editor/media/editorplaceholder.css
@@ -57,8 +57,6 @@
 }
 
 .monaco-editor-pane-placeholder .editor-placeholder-buttons-container > .monaco-button {
-	font-size: 14px;
 	width: fit-content;
-	padding: 6px 11px;
 	outline-offset: 2px !important;
 }
diff --git a/src/vs/workbench/browser/parts/notifications/media/notificationsList.css b/src/vs/workbench/browser/parts/notifications/media/notificationsList.css
index e41d6f4824a..92da46b4dca 100644
--- a/src/vs/workbench/browser/parts/notifications/media/notificationsList.css
+++ b/src/vs/workbench/browser/parts/notifications/media/notificationsList.css
@@ -127,9 +127,7 @@
 
 .monaco-workbench .notifications-list-container .notification-list-item .notification-list-item-buttons-container .monaco-text-button {
 	width: fit-content;
-	padding: 4px 10px;
 	display: inline-block;	/* to enable ellipsis in text overflow */
-	font-size: 12px;
 	overflow: hidden;
 	text-overflow: ellipsis;
 }
diff --git a/src/vs/workbench/browser/parts/titlebar/media/titlebarpart.css b/src/vs/workbench/browser/parts/titlebar/media/titlebarpart.css
index 0246cd2ad10..982f5a620df 100644
--- a/src/vs/workbench/browser/parts/titlebar/media/titlebarpart.css
+++ b/src/vs/workbench/browser/parts/titlebar/media/titlebarpart.css
@@ -168,10 +168,7 @@
 	border: 1px solid var(--vscode-commandCenter-border);
 	overflow: hidden;
 	margin: 0 6px;
-	border-top-left-radius: 6px;
-	border-bottom-left-radius: 6px;
-	border-top-right-radius: 6px;
-	border-bottom-right-radius: 6px;
+	border-radius: 4px;
 	height: 22px;
 	width: 38vw;
 	max-width: 600px;
diff --git a/src/vs/workbench/contrib/bulkEdit/browser/preview/bulkEdit.css b/src/vs/workbench/contrib/bulkEdit/browser/preview/bulkEdit.css
index e113ad073ff..641c0d5e311 100644
--- a/src/vs/workbench/contrib/bulkEdit/browser/preview/bulkEdit.css
+++ b/src/vs/workbench/contrib/bulkEdit/browser/preview/bulkEdit.css
@@ -43,7 +43,6 @@
 	display: inline-flex;
 	width: inherit;
 	margin: 0 4px;
-	padding: 4px 8px;
 }
 
 .monaco-workbench .bulk-edit-panel .monaco-tl-contents {
diff --git a/src/vs/workbench/contrib/chat/browser/attachments/media/simpleBrowserOverlay.css b/src/vs/workbench/contrib/chat/browser/attachments/media/simpleBrowserOverlay.css
index 3a5e84b1fc9..9975b3a93b8 100644
--- a/src/vs/workbench/contrib/chat/browser/attachments/media/simpleBrowserOverlay.css
+++ b/src/vs/workbench/contrib/chat/browser/attachments/media/simpleBrowserOverlay.css
@@ -40,7 +40,6 @@
 }
 
 .element-selection-main-content .monaco-button-dropdown > .monaco-button.monaco-text-button {
-	height: 24px;
 	align-content: center;
 	padding: 0px 5px;
 }
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingCodeEditorIntegration.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingCodeEditorIntegration.ts
index bda048be301..72074bcfcc6 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingCodeEditorIntegration.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingCodeEditorIntegration.ts
@@ -749,11 +749,18 @@ class DiffHunkWidget implements IOverlayWidget, IModifiedFileEntryChangeHunk {
 				arg: this,
 			},
 			actionViewItemProvider: (action, options) => {
+				const isPrimary = action.id === 'chatEditor.action.acceptHunk';
 				if (!action.class) {
 					return new class extends ActionViewItem {
 						constructor() {
 							super(undefined, action, { ...options, keybindingNotRenderedWithLabel: true /* hide keybinding for actions without icon */, icon: false, label: true });
 						}
+						override render(container: HTMLElement): void {
+							super.render(container);
+							if (isPrimary) {
+								this.element?.classList.add('primary');
+							}
+						}
 					};
 				}
 				return undefined;
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorOverlay.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorOverlay.ts
index f7d6bef2bf1..ff4e50795c6 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorOverlay.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorOverlay.ts
@@ -239,6 +239,7 @@ class ChatEditorOverlayWidget extends Disposable {
 							super.render(container);
 
 							if (action.id === AcceptAction.ID) {
+								this.element?.classList.add('primary');
 
 								const listener = this._store.add(new MutableDisposable());
 
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/media/chatEditingEditorOverlay.css b/src/vs/workbench/contrib/chat/browser/chatEditing/media/chatEditingEditorOverlay.css
index 0177040611d..1033ada08b1 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/media/chatEditingEditorOverlay.css
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/media/chatEditingEditorOverlay.css
@@ -4,13 +4,15 @@
  *--------------------------------------------------------------------------------------------*/
 
 .chat-editor-overlay-widget {
-	padding: 2px;
-	color: var(--vscode-button-foreground);
-	background-color: var(--vscode-button-background);
-	border-radius: 2px;
+	padding: 2px 4px;
+	color: var(--vscode-foreground);
+	background-color: var(--vscode-editor-background);
+	border-radius: 6px;
 	border: 1px solid var(--vscode-contrastBorder);
 	display: flex;
 	align-items: center;
+	justify-content: center;
+	gap: 4px;
 	z-index: 10;
 	box-shadow: 0 2px 8px var(--vscode-widget-shadow);
 	overflow: hidden;
@@ -54,25 +56,41 @@
 }
 
 .chat-editor-overlay-widget .action-item > .action-label {
-	padding: 5px;
-	font-size: 12px;
-	border-radius: 2px; /* same as overlay widget */
+	padding: 4px 6px;
+	font-size: 11px;
+	line-height: 14px;
+	border-radius: 4px; /* same as overlay widget */
 }
 
-
-.chat-editor-overlay-widget .action-item:first-child > .action-label {
-	padding-left: 7px;
+.chat-editor-overlay-widget .monaco-action-bar .actions-container {
+	gap: 4px;
 }
 
-.chat-editor-overlay-widget .action-item:last-child > .action-label {
-	padding-right: 7px;
-}
-
-.chat-editor-overlay-widget.busy .chat-editor-overlay-progress .codicon,
-.chat-editor-overlay-widget .action-item > .action-label.codicon {
+.chat-editor-overlay-widget .action-item.primary > .action-label {
+	background-color: var(--vscode-button-background);
 	color: var(--vscode-button-foreground);
 }
 
+.monaco-workbench .chat-editor-overlay-widget .monaco-action-bar .action-item.primary > .action-label:hover {
+	background-color: var(--vscode-button-hoverBackground);
+}
+
+.chat-editor-overlay-widget.busy .chat-editor-overlay-progress .codicon {
+	color: var(--vscode-foreground);
+}
+
+.chat-editor-overlay-widget .action-item > .action-label.codicon:not(.separator) {
+	color: var(--vscode-foreground);
+	width: 22px; /* align with default icon button dimensions */
+	height: 22px;
+	padding: 0;
+	font-size: 16px;
+	line-height: 22px;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+
 .chat-diff-change-content-widget .monaco-action-bar .action-item.disabled,
 .chat-editor-overlay-widget .monaco-action-bar .action-item.disabled {
 
@@ -85,18 +103,13 @@
 	}
 }
 
-.chat-diff-change-content-widget .action-item > .action-label {
-	border-radius: 2px; /* same as overlay widget */
-}
-
-
 .chat-editor-overlay-widget .action-item.label-item {
 	font-variant-numeric: tabular-nums;
 }
 
 .chat-editor-overlay-widget .monaco-action-bar .action-item.label-item > .action-label,
 .chat-editor-overlay-widget .monaco-action-bar .action-item.label-item > .action-label:hover {
-	color: var(--vscode-button-foreground);
+	color: var(--vscode-foreground);
 	opacity: 1;
 }
 
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/media/chatEditorController.css b/src/vs/workbench/contrib/chat/browser/chatEditing/media/chatEditorController.css
index 8be9fd6ba29..5e4b3de1ebc 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/media/chatEditorController.css
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/media/chatEditorController.css
@@ -8,6 +8,8 @@
 	transition: opacity 0.2s ease-in-out;
 	display: flex;
 	box-shadow: 0 2px 8px var(--vscode-widget-shadow);
+	border-radius: 6px;
+	overflow: hidden;
 }
 
 .chat-diff-change-content-widget.hover {
@@ -15,27 +17,45 @@
 }
 
 .chat-diff-change-content-widget .monaco-action-bar {
-	padding: 2px;
-	border-radius: 2px;
-	background-color: var(--vscode-button-background);
-	color: var(--vscode-button-foreground);
+	padding: 4px 4px;
+	border-radius: 6px;
+	background-color: var(--vscode-editor-background);
+	color: var(--vscode-foreground);
 	border: 1px solid var(--vscode-contrastBorder);
+	overflow: hidden;
+}
+
+.chat-diff-change-content-widget .monaco-action-bar .actions-container {
+	gap: 4px;
 }
 
 .chat-diff-change-content-widget .monaco-action-bar .action-item .action-label {
-	border-radius: 2px;
-	color: var(--vscode-button-foreground);
-	padding: 2px 5px;
+	border-radius: 4px;
+	font-size: 11px;
+	line-height: 14px;
+	padding: 4px 6px;
 }
 
-.chat-diff-change-content-widget .monaco-action-bar .action-item .action-label.codicon {
-	width: unset;
-	padding: 2px;
-	font-size: 16px;
-	line-height: 16px;
+.chat-diff-change-content-widget .monaco-action-bar .action-item.primary .action-label {
+	background-color: var(--vscode-button-background);
 	color: var(--vscode-button-foreground);
 }
 
+.monaco-workbench .chat-diff-change-content-widget .monaco-action-bar .action-item.primary .action-label:hover {
+	background-color: var(--vscode-button-hoverBackground);
+}
+
+.chat-diff-change-content-widget .monaco-action-bar .action-item .action-label.codicon:not(.separator) {
+	width: 22px; /* align with default icon button dimensions */
+	height: 22px;
+	padding: 0;
+	font-size: 16px;
+	line-height: 22px;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+
 .chat-diff-change-content-widget .monaco-action-bar .action-item .action-label.codicon[class*='codicon-'] {
 	font-size: 16px;
 }
diff --git a/src/vs/workbench/contrib/chat/browser/chatManagement/media/chatModelsWidget.css b/src/vs/workbench/contrib/chat/browser/chatManagement/media/chatModelsWidget.css
index 2feaf2c2416..c70f5b6ba08 100644
--- a/src/vs/workbench/contrib/chat/browser/chatManagement/media/chatModelsWidget.css
+++ b/src/vs/workbench/contrib/chat/browser/chatManagement/media/chatModelsWidget.css
@@ -43,6 +43,7 @@
 
 .models-widget .models-search-and-button-container .section-title-actions .models-add-model-button {
 	white-space: nowrap;
+	padding: 4px 8px 4px 4px;
 }
 
 /** Table styling **/
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatConfirmationWidget.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatConfirmationWidget.ts
index 32997095374..d0fea511292 100644
--- a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatConfirmationWidget.ts
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatConfirmationWidget.ts
@@ -162,7 +162,7 @@ abstract class BaseSimpleChatConfirmationWidget<T> extends Disposable {
 
 		// Create buttons
 		buttons.forEach(buttonData => {
-			const buttonOptions: IButtonOptions = { ...defaultButtonStyles, secondary: buttonData.isSecondary, title: buttonData.tooltip, disabled: buttonData.disabled };
+			const buttonOptions: IButtonOptions = { ...defaultButtonStyles, small: true, secondary: buttonData.isSecondary, title: buttonData.tooltip, disabled: buttonData.disabled };
 
 			let button: IButton;
 			if (buttonData.moreActions) {
@@ -363,7 +363,7 @@ abstract class BaseChatConfirmationWidget<T> extends Disposable {
 			this._buttonsDomNode.children[0].remove();
 		}
 		for (const buttonData of buttons) {
-			const buttonOptions: IButtonOptions = { ...defaultButtonStyles, secondary: buttonData.isSecondary, title: buttonData.tooltip, disabled: buttonData.disabled };
+			const buttonOptions: IButtonOptions = { ...defaultButtonStyles, small: true, secondary: buttonData.isSecondary, title: buttonData.tooltip, disabled: buttonData.disabled };
 
 			let button: IButton;
 			if (buttonData.moreActions) {
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/media/chatConfirmationWidget.css b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/media/chatConfirmationWidget.css
index 33ddd1bbb32..be0ea2424f3 100644
--- a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/media/chatConfirmationWidget.css
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/media/chatConfirmationWidget.css
@@ -12,13 +12,6 @@
 	position: relative;
 }
 
-.chat-confirmation-widget .monaco-text-button {
-	padding: 0 12px;
-	min-height: 2em;
-	box-sizing: border-box;
-	font-size: var(--vscode-chat-font-size-body-m);
-}
-
 .chat-confirmation-widget:not(:last-child) {
 	margin-bottom: 16px;
 }
@@ -279,22 +272,16 @@
 .chat-confirmation-widget2 .chat-confirmation-widget-buttons {
 	display: flex;
 	padding: 5px 9px;
-	font-size: var(--vscode-chat-font-size-body-m);
 
 	.chat-buttons {
 		display: flex;
-		column-gap: 10px;
+		column-gap: 4px;
 		align-items: center;
 
 		.monaco-button {
 			overflow-wrap: break-word;
-			padding: 2px 5px;
 			width: inherit;
 		}
-
-		.monaco-text-button {
-			padding: 2px 10px;
-		}
 	}
 }
 
diff --git a/src/vs/workbench/contrib/chat/browser/widget/input/chatInputPart.ts b/src/vs/workbench/contrib/chat/browser/widget/input/chatInputPart.ts
index ab2fd90106a..a98c158ad8c 100644
--- a/src/vs/workbench/contrib/chat/browser/widget/input/chatInputPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/widget/input/chatInputPart.ts
@@ -2375,6 +2375,7 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 			const isSessionMenu = topLevelIsSessionMenu.read(reader);
 			reader.store.add(scopedInstantiationService.createInstance(MenuWorkbenchButtonBar, actionsContainer, isSessionMenu ? MenuId.ChatEditingSessionChangesToolbar : MenuId.ChatEditingWidgetToolbar, {
 				telemetrySource: this.options.menus.telemetrySource,
+				small: true,
 				menuOptions: {
 					arg: sessionResource && (isSessionMenu ? sessionResource : {
 						$mid: MarshalledId.ChatViewContext,
diff --git a/src/vs/workbench/contrib/chat/browser/widget/media/chat.css b/src/vs/workbench/contrib/chat/browser/widget/media/chat.css
index eb83d36d846..70b964b531b 100644
--- a/src/vs/workbench/contrib/chat/browser/widget/media/chat.css
+++ b/src/vs/workbench/contrib/chat/browser/widget/media/chat.css
@@ -903,10 +903,7 @@ have to be updated for changes to the rules above, or to support more deeply nes
 }
 
 .interactive-session .chat-editing-session .monaco-button {
-	height: 22px;
 	width: fit-content;
-	padding: 2px 6px;
-	font-size: 12px;
 }
 
 .interactive-session .chat-editing-session .chat-editing-session-toolbar-actions .monaco-button:hover {
@@ -2435,7 +2432,6 @@ have to be updated for changes to the rules above, or to support more deeply nes
 
 	.monaco-button {
 		width: fit-content;
-		padding: 2px 11px;
 	}
 
 	.chat-quota-error-button,
@@ -2757,7 +2753,6 @@ have to be updated for changes to the rules above, or to support more deeply nes
 .chat-buttons-container .monaco-button:not(.monaco-dropdown-button) {
 	text-align: left;
 	width: initial;
-	padding: 4px 8px;
 }
 
 .interactive-item-container .chat-edit-input-container {
diff --git a/src/vs/workbench/contrib/chat/browser/widget/media/chatViewWelcome.css b/src/vs/workbench/contrib/chat/browser/widget/media/chatViewWelcome.css
index 27bf0df2e09..678b4037a90 100644
--- a/src/vs/workbench/contrib/chat/browser/widget/media/chatViewWelcome.css
+++ b/src/vs/workbench/contrib/chat/browser/widget/media/chatViewWelcome.css
@@ -106,7 +106,6 @@ div.chat-welcome-view {
 	.monaco-button {
 		display: inline-block;
 		width: initial;
-		padding: 4px 7px;
 	}
 
 	& > .chat-welcome-view-tips {
diff --git a/src/vs/workbench/contrib/codeEditor/browser/suggestEnabledInput/suggestEnabledInput.css b/src/vs/workbench/contrib/codeEditor/browser/suggestEnabledInput/suggestEnabledInput.css
index 0c378f88922..7b5530e7fa7 100644
--- a/src/vs/workbench/contrib/codeEditor/browser/suggestEnabledInput/suggestEnabledInput.css
+++ b/src/vs/workbench/contrib/codeEditor/browser/suggestEnabledInput/suggestEnabledInput.css
@@ -5,7 +5,7 @@
 
 .suggest-input-container {
 	padding: 2px 6px;
-	border-radius: 2px;
+	border-radius: 4px;
 }
 
 .suggest-input-container .monaco-editor-background,
diff --git a/src/vs/workbench/contrib/comments/browser/commentFormActions.ts b/src/vs/workbench/contrib/comments/browser/commentFormActions.ts
index f83a1b60a53..7acbf42409f 100644
--- a/src/vs/workbench/contrib/comments/browser/commentFormActions.ts
+++ b/src/vs/workbench/contrib/comments/browser/commentFormActions.ts
@@ -60,8 +60,9 @@ export class CommentFormActions implements IDisposable {
 					secondary: !isPrimary,
 					title,
 					addPrimaryActionToDropdown: false,
+					small: true,
 					...defaultButtonStyles
-				}) : new Button(this.container, { secondary: !isPrimary, title, ...defaultButtonStyles });
+				}) : new Button(this.container, { secondary: !isPrimary, title, small: true, ...defaultButtonStyles });
 
 				isPrimary = false;
 				this._buttonElements.push(button.element);
diff --git a/src/vs/workbench/contrib/comments/browser/media/review.css b/src/vs/workbench/contrib/comments/browser/media/review.css
index 42a3076cffd..1d42ac39101 100644
--- a/src/vs/workbench/contrib/comments/browser/media/review.css
+++ b/src/vs/workbench/contrib/comments/browser/media/review.css
@@ -319,10 +319,6 @@
 	margin: 0 10px 0 0;
 }
 
-.review-widget .body .comment-additional-actions .button-bar .monaco-text-button {
-	padding: 4px 10px;
-}
-
 .review-widget .body .comment-additional-actions .codicon-drop-down-button {
 	align-items: center;
 }
@@ -425,7 +421,6 @@
 .review-widget .body .comment-form-container .form-actions .monaco-text-button,
 .review-widget .body .edit-container .monaco-text-button {
 	width: auto;
-	padding: 4px 10px;
 	margin-left: 5px;
 }
 
diff --git a/src/vs/workbench/contrib/extensions/browser/media/extensionEditor.css b/src/vs/workbench/contrib/extensions/browser/media/extensionEditor.css
index 98e13ca7a83..eb7649d45cb 100644
--- a/src/vs/workbench/contrib/extensions/browser/media/extensionEditor.css
+++ b/src/vs/workbench/contrib/extensions/browser/media/extensionEditor.css
@@ -246,7 +246,6 @@
 
 .extension-editor > .header > .details > .actions-status-container > .monaco-action-bar > .actions-container > .action-item > .extension-action.label,
 .extension-editor > .header > .details > .actions-status-container > .monaco-action-bar > .actions-container > .action-item.action-dropdown-item .extension-action.label {
-	font-weight: 600;
 	max-width: 300px;
 }
 
@@ -269,17 +268,17 @@
 /* single install */
 .extension-editor > .header > .details > .actions-status-container > .monaco-action-bar > .actions-container > .action-item > .extension-action.label,
 .extension-editor > .header > .details > .actions-status-container > .monaco-action-bar > .actions-container > .action-item.action-dropdown-item.empty > .extension-action.label {
-	border-radius: 2px;
+	border-radius: 4px;
 }
 
 /* split install */
 .extension-editor > .header > .details > .actions-status-container > .monaco-action-bar > .actions-container > .action-item.action-dropdown-item:not(.empty) > .extension-action.label {
-	border-radius: 2px 0 0 2px;
+	border-radius: 4px 0 0 4px;
 }
 
 .extension-editor > .header > .details > .actions-status-container > .monaco-action-bar > .actions-container > .action-item.action-dropdown-item:not(.empty) > .monaco-dropdown .extension-action.label {
 	border-left-width: 0;
-	border-radius: 0 2px 2px 0;
+	border-radius: 0 4px 4px 0;
 	padding: 0 2px;
 }
 
diff --git a/src/vs/workbench/contrib/issue/browser/media/issueReporter.css b/src/vs/workbench/contrib/issue/browser/media/issueReporter.css
index bc997b189eb..d24fe259aa8 100644
--- a/src/vs/workbench/contrib/issue/browser/media/issueReporter.css
+++ b/src/vs/workbench/contrib/issue/browser/media/issueReporter.css
@@ -80,9 +80,7 @@
 .issue-reporter-body .monaco-text-button {
 	display: block;
 	width: auto;
-	padding: 4px 10px;
 	align-self: flex-end;
-	font-size: 13px;
 }
 
 .issue-reporter-body .monaco-button-dropdown {
@@ -603,10 +601,6 @@ body.issue-reporter-body  {
 	line-height: 15px; /* approximate button height for vertical centering */
 }
 
-.issue-reporter-body .internal-elements .monaco-text-button {
-	font-size: 10px;
-	padding: 2px 8px;
-}
 
 .issue-reporter-body .internal-elements #show-private-repo-name {
 	align-self: flex-end;
diff --git a/src/vs/workbench/contrib/preferences/browser/media/settingsWidgets.css b/src/vs/workbench/contrib/preferences/browser/media/settingsWidgets.css
index 04d78eea54a..ad55ce23048 100644
--- a/src/vs/workbench/contrib/preferences/browser/media/settingsWidgets.css
+++ b/src/vs/workbench/contrib/preferences/browser/media/settingsWidgets.css
@@ -181,7 +181,6 @@
 .settings-editor > .settings-body .settings-tree-container .setting-item.setting-item-list .monaco-text-button {
 	width: initial;
 	white-space: nowrap;
-	padding: 4px 14px;
 }
 
 .settings-editor > .settings-body .settings-tree-container .setting-item.setting-item-list .setting-item-control.setting-list-hide-add-button .setting-list-new-row {
diff --git a/src/vs/workbench/contrib/scm/browser/media/scm.css b/src/vs/workbench/contrib/scm/browser/media/scm.css
index fc5382a2164..20c78c396f1 100644
--- a/src/vs/workbench/contrib/scm/browser/media/scm.css
+++ b/src/vs/workbench/contrib/scm/browser/media/scm.css
@@ -378,7 +378,11 @@
 }
 
 .scm-view .scm-editor-container .monaco-editor {
-	border-radius: 2px;
+	border-radius: 4px;
+}
+
+.scm-view .scm-editor-container .monaco-editor .overflow-guard {
+	border-radius: 4px;
 }
 
 .scm-view .scm-editor {
@@ -389,7 +393,7 @@
 	box-sizing: border-box;
 	border: 1px solid var(--vscode-input-border, transparent);
 	background-color: var(--vscode-input-background);
-	border-radius: 2px;
+	border-radius: 4px;
 }
 
 .scm-view .button-container {
diff --git a/src/vs/workbench/contrib/userDataProfile/browser/media/userDataProfilesEditor.css b/src/vs/workbench/contrib/userDataProfile/browser/media/userDataProfilesEditor.css
index 42debd6aca7..181db2d28a9 100644
--- a/src/vs/workbench/contrib/userDataProfile/browser/media/userDataProfilesEditor.css
+++ b/src/vs/workbench/contrib/userDataProfile/browser/media/userDataProfilesEditor.css
@@ -365,7 +365,6 @@
 
 .profiles-editor .contents-container .profile-body .profile-row-container .profile-workspaces-button-container .monaco-button {
 	width: inherit;
-	padding: 2px 14px;
 }
 
 /* Profile Editor Tree Theming */
diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/browser/media/gettingStarted.css b/src/vs/workbench/contrib/welcomeGettingStarted/browser/media/gettingStarted.css
index 9b4448a62be..fefdf4c9dfe 100644
--- a/src/vs/workbench/contrib/welcomeGettingStarted/browser/media/gettingStarted.css
+++ b/src/vs/workbench/contrib/welcomeGettingStarted/browser/media/gettingStarted.css
@@ -946,11 +946,7 @@
 }
 
 .monaco-workbench .part.editor > .content .gettingStartedContainer .gettingStartedSlideDetails .getting-started-step .step-description-container .monaco-button {
-	height: 24px;
 	width: fit-content;
-	display: flex;
-	padding: 0 11px;
-	align-items: center;
 	min-width: max-content;
 }
 
diff --git a/src/vs/workbench/contrib/workspace/browser/media/workspaceTrustEditor.css b/src/vs/workbench/contrib/workspace/browser/media/workspaceTrustEditor.css
index ce487f6cf7b..3bd850fb25b 100644
--- a/src/vs/workbench/contrib/workspace/browser/media/workspaceTrustEditor.css
+++ b/src/vs/workbench/contrib/workspace/browser/media/workspaceTrustEditor.css
@@ -175,7 +175,6 @@
 
 .workspace-trust-editor .workspace-trust-settings .trusted-uris-button-bar .monaco-button {
 	width: fit-content;
-	padding: 5px 10px;
 	overflow: hidden;
 	text-overflow: ellipsis;
 	outline-offset: 2px !important;
@@ -188,7 +187,7 @@
 }
 
 .workspace-trust-editor .workspace-trust-features .workspace-trust-buttons-row .workspace-trust-buttons .monaco-button-dropdown .monaco-dropdown-button {
-	padding: 5px;
+	padding: 0 4px;
 }
 
 .workspace-trust-limitations {