diff --git a/packages/block-library/src/comments/edit/comments-legacy.js b/packages/block-library/src/comments/edit/comments-legacy.js
index b5a12e34343dac..dbe89a4e3a83e1 100644
--- a/packages/block-library/src/comments/edit/comments-legacy.js
+++ b/packages/block-library/src/comments/edit/comments-legacy.js
@@ -29,8 +29,7 @@ export default function CommentsLegacy( {
 
 	const actions = [
 		<Button
-			// TODO: Switch to `true` (40px size) if possible
-			__next40pxDefaultSize={ false }
+			__next40pxDefaultSize
 			key="convert"
 			onClick={ () => void setAttributes( { legacy: false } ) }
 			variant="primary"
diff --git a/packages/block-library/src/embed/embed-placeholder.js b/packages/block-library/src/embed/embed-placeholder.js
index 9a26060a294120..1626aca5c9c9cb 100644
--- a/packages/block-library/src/embed/embed-placeholder.js
+++ b/packages/block-library/src/embed/embed-placeholder.js
@@ -66,16 +66,14 @@ const EmbedPlaceholder = ( {
 						justify="flex-start"
 					>
 						<Button
-							// TODO: Switch to `true` (40px size) if possible
-							__next40pxDefaultSize={ false }
+							__next40pxDefaultSize
 							variant="secondary"
 							onClick={ tryAgain }
 						>
 							{ _x( 'Try again', 'button label' ) }
 						</Button>{ ' ' }
 						<Button
-							// TODO: Switch to `true` (40px size) if possible
-							__next40pxDefaultSize={ false }
+							__next40pxDefaultSize
 							variant="secondary"
 							onClick={ fallback }
 						>
diff --git a/packages/block-library/src/freeform/modal.js b/packages/block-library/src/freeform/modal.js
index 1768022377a432..aad79473b172b2 100644
--- a/packages/block-library/src/freeform/modal.js
+++ b/packages/block-library/src/freeform/modal.js
@@ -123,8 +123,7 @@ export default function ModalEdit( props ) {
 					>
 						<FlexItem>
 							<Button
-								// TODO: Switch to `true` (40px size) if possible
-								__next40pxDefaultSize={ false }
+								__next40pxDefaultSize
 								variant="tertiary"
 								onClick={ onClose }
 							>
@@ -133,8 +132,7 @@ export default function ModalEdit( props ) {
 						</FlexItem>
 						<FlexItem>
 							<Button
-								// TODO: Switch to `true` (40px size) if possible
-								__next40pxDefaultSize={ false }
+								__next40pxDefaultSize
 								variant="primary"
 								onClick={ () => {
 									setAttributes( {
diff --git a/packages/block-library/src/missing/edit.js b/packages/block-library/src/missing/edit.js
index 70b032cb9a2fe8..e7744839b08889 100644
--- a/packages/block-library/src/missing/edit.js
+++ b/packages/block-library/src/missing/edit.js
@@ -50,8 +50,7 @@ export default function MissingEdit( { attributes, clientId } ) {
 
 	const convertToHtmlButton = (
 		<Button
-			// TODO: Switch to `true` (40px size) if possible
-			__next40pxDefaultSize={ false }
+			__next40pxDefaultSize
 			key="convert"
 			onClick={ convertToHTML }
 			variant="primary"