diff --git a/core/modules/menu_ui/menu_ui.module b/core/modules/menu_ui/menu_ui.module
index 0349a38b3c05a77ef25601f4484314f7bc8dd47e..568f22fc4f67476e440860144033f0939d2882a2 100644
--- a/core/modules/menu_ui/menu_ui.module
+++ b/core/modules/menu_ui/menu_ui.module
@@ -455,3 +455,14 @@ function menu_ui_system_breadcrumb_alter(Breadcrumb $breadcrumb, RouteMatchInter
     }
   }
 }
+
+/**
+ * Implements hook_theme().
+ */
+function menu_ui_theme(): array {
+  return [
+    'menu_link_form' => [
+      'render element' => 'form',
+    ],
+  ];
+}
diff --git a/core/modules/menu_ui/templates/menu-link-form.html.twig b/core/modules/menu_ui/templates/menu-link-form.html.twig
new file mode 100644
index 0000000000000000000000000000000000000000..50a82923e7dd3c529372d4b3a5fa11e7cf5fd234
--- /dev/null
+++ b/core/modules/menu_ui/templates/menu-link-form.html.twig
@@ -0,0 +1,18 @@
+{#
+/**
+ * @file
+ * Default theme implementation for menu_link_form.
+ *
+ * Two-column template for the menu link add/edit form.
+ *
+ * This template will be used when a menu link form specifies
+ * 'menu_link_form' as its #theme callback. Otherwise, by default,
+ * menu_link add/edit forms will be themed by form.html.twig.
+ *
+ * Available variables:
+ * - form: The menu link add/edit form.
+ *
+ * @ingroup themeable
+ */
+#}
+{{ form }}
diff --git a/core/themes/claro/claro.libraries.yml b/core/themes/claro/claro.libraries.yml
index 7a55c1749f06018fd761465c94eacba948375388..718bbf6ec44802f90c94b02ed126003f578d399f 100644
--- a/core/themes/claro/claro.libraries.yml
+++ b/core/themes/claro/claro.libraries.yml
@@ -77,13 +77,11 @@ global-styling:
     # attached, therefore it is always attached.
     - core/drupal.touchevents-test
 
-node-form:
+form-two-columns:
   version: VERSION
   css:
     layout:
-      css/layout/node-add.css: {}
-  dependencies:
-    - node/form
+      css/layout/form-two-columns.css: {}
 
 maintenance-page:
   version: VERSION
diff --git a/core/themes/claro/claro.theme b/core/themes/claro/claro.theme
index f33e425c16591d616cb5b4e4b2a8c3c0b581fecb..b760ed3de079a14b44dee4a8b1f7c415e1e5a404 100644
--- a/core/themes/claro/claro.theme
+++ b/core/themes/claro/claro.theme
@@ -664,7 +664,7 @@ function _claro_convert_link_to_action_link(array $link, $icon_name = NULL, $siz
  */
 function claro_form_node_form_alter(&$form, FormStateInterface $form_state) {
   $form['#theme'] = ['node_edit_form'];
-  $form['#attached']['library'][] = 'claro/node-form';
+  $form['#attached']['library'][] = 'claro/form-two-columns';
 
   $form['advanced']['#type'] = 'container';
   $form['advanced']['#accordion'] = TRUE;
@@ -676,6 +676,66 @@ function claro_form_node_form_alter(&$form, FormStateInterface $form_state) {
   $form['revision_information']['#attributes']['class'][] = 'entity-meta__revision';
 }
 
+/**
+ * Implements hook_form_BASE_FORM_ID_alter() for MenuLinkContentForm.
+ *
+ * Alters the menu_link_content_form by organizing form elements into different
+ * 'details' sections.
+ */
+function claro_form_menu_link_content_form_alter(&$form, FormStateInterface $form_state) {
+  $form['#theme'] = ['menu_link_form'];
+  $form['#attached']['library'][] = 'claro/form-two-columns';
+  $form['advanced'] = [
+    '#type' => 'container',
+    '#weight' => 10,
+    '#accordion' => TRUE,
+  ];
+  $form['menu_parent']['#wrapper_attributes'] = ['class' => ['accordion__item', 'entity-meta__header']];
+  $form['menu_parent']['#prefix'] = '<div class="accordion">';
+  $form['menu_parent']['#suffix'] = '</div>';
+  $form['menu_parent']['#group'] = 'advanced';
+
+  $form['menu_link_display_settings'] = [
+    '#type' => 'details',
+    '#group' => 'advanced',
+    '#title' => t('Display settings'),
+    '#attributes' => ['class' => ['entity-meta__options']],
+    '#tree' => TRUE,
+    '#accordion' => TRUE,
+  ];
+  if (!empty($form['weight'])) {
+    $form['menu_link_display_settings']['weight'] = $form['weight'];
+    unset($form['weight'], $form['menu_link_display_settings']['weight']['#weight']);
+  }
+  if (!empty($form['expanded'])) {
+    $form['menu_link_display_settings']['expanded'] = $form['expanded'];
+    unset($form['expanded']);
+  }
+
+  if (isset($form['description'])) {
+    $form['menu_link_description'] = [
+      '#type' => 'details',
+      '#group' => 'advanced',
+      '#title' => t('Description'),
+      '#attributes' => ['class' => ['entity-meta__description']],
+      '#tree' => TRUE,
+      '#accordion' => TRUE,
+      'description' => $form['description'],
+    ];
+    unset($form['description']);
+  }
+}
+
+/**
+ * Implements hook_form_FORM_ID_alter() for MenuLinkEditForm.
+ *
+ * Alters the menu_link_edit form by organizing form elements into different
+ * 'details' sections.
+ */
+function claro_form_menu_link_edit_alter(&$form, FormStateInterface $form_state) {
+  claro_form_menu_link_content_form_alter($form, $form_state);
+}
+
 /**
  * Implements hook_form_BASE_FORM_ID_alter() for \Drupal\media\MediaForm.
  */
diff --git a/core/themes/claro/css/layout/node-add.css b/core/themes/claro/css/layout/form-two-columns.css
similarity index 68%
rename from core/themes/claro/css/layout/node-add.css
rename to core/themes/claro/css/layout/form-two-columns.css
index a2c8cce02107bf4e6b707e7ad468a7780afa4b7e..0c737bce8072c741e87c00317d0f5fe3818917ca 100644
--- a/core/themes/claro/css/layout/node-add.css
+++ b/core/themes/claro/css/layout/form-two-columns.css
@@ -5,34 +5,34 @@
  * @preserve
  */
 /**
- * Layout overrides for node add/edit form.
+ * Layout overrides for the menu link add/edit form.
  */
 .layout-region {
   box-sizing: border-box;
 }
-.layout-region--node-footer .layout-region__content {
+.layout-region--footer .layout-region__content {
   margin-top: var(--space-l);
 }
 /**
  * Move to two column layout at wider widths.
  */
 @media (min-width: 61rem) {
-  .layout-node-form {
+  .layout-form {
     display: grid;
     grid-template-rows: auto 1fr;
-    grid-template-columns: minmax(0, 3fr) minmax(22.5rem, 1fr);
+    grid-template-columns: 3fr minmax(22.5rem, 1fr);
     gap: var(--space-l);
   }
 
-  .layout-region--node-main,
-  .layout-region--node-footer {
+  .layout-region--main,
+  .layout-region--footer {
     grid-column: 1;
     margin-inline: auto;
     width: min(52rem, 100%);
   }
 
   /* Push sidebar down to horizontal align with form section. */
-  .layout-region--node-secondary {
+  .layout-region--secondary {
     grid-row: span 2;
     margin-block-start: var(--space-l);
   }
diff --git a/core/themes/claro/css/layout/node-add.pcss.css b/core/themes/claro/css/layout/form-two-columns.pcss.css
similarity index 62%
rename from core/themes/claro/css/layout/node-add.pcss.css
rename to core/themes/claro/css/layout/form-two-columns.pcss.css
index 8286afab6269a2c4f360c9b2033071c4a333f6bb..ff458b1f3e49cf6a64695d0e74942978f0e483ed 100644
--- a/core/themes/claro/css/layout/node-add.pcss.css
+++ b/core/themes/claro/css/layout/form-two-columns.pcss.css
@@ -1,11 +1,11 @@
 /**
- * Layout overrides for node add/edit form.
+ * Layout overrides for the menu link add/edit form.
  */
 .layout-region {
   box-sizing: border-box;
 }
 
-.layout-region--node-footer .layout-region__content {
+.layout-region--footer .layout-region__content {
   margin-top: var(--space-l);
 }
 
@@ -13,22 +13,22 @@
  * Move to two column layout at wider widths.
  */
 @media (min-width: 61rem) {
-  .layout-node-form {
+  .layout-form {
     display: grid;
     grid-template-rows: auto 1fr;
-    grid-template-columns: minmax(0, 3fr) minmax(360px, 1fr);
+    grid-template-columns: 3fr minmax(360px, 1fr);
     gap: var(--space-l);
   }
 
-  .layout-region--node-main,
-  .layout-region--node-footer {
+  .layout-region--main,
+  .layout-region--footer {
     grid-column: 1;
     margin-inline: auto;
     width: min(832px, 100%);
   }
 
   /* Push sidebar down to horizontal align with form section. */
-  .layout-region--node-secondary {
+  .layout-region--secondary {
     grid-row: span 2;
     margin-block-start: var(--space-l);
   }
diff --git a/core/themes/claro/templates/form/form-two-columns.html.twig b/core/themes/claro/templates/form/form-two-columns.html.twig
new file mode 100644
index 0000000000000000000000000000000000000000..a9571788f030fdcbdea76b521c22acb065ed92bb
--- /dev/null
+++ b/core/themes/claro/templates/form/form-two-columns.html.twig
@@ -0,0 +1,20 @@
+<div class="layout-form clearfix">
+  <div class="layout-region layout-region--main">
+    <div class="layout-region__content">
+      {% block main %}
+      {% endblock %}
+    </div>
+  </div>
+  <div class="layout-region layout-region--secondary">
+    <div class="layout-region__content">
+      {% block secondary %}
+      {% endblock %}
+    </div>
+  </div>
+  <div class="layout-region layout-region--footer">
+    <div class="layout-region__content">
+      {% block footer %}
+      {% endblock %}
+    </div>
+  </div>
+</div>
diff --git a/core/themes/claro/templates/menu-link-form.html.twig b/core/themes/claro/templates/menu-link-form.html.twig
new file mode 100644
index 0000000000000000000000000000000000000000..4183188536fde800b22cb3bb3ac8196461468276
--- /dev/null
+++ b/core/themes/claro/templates/menu-link-form.html.twig
@@ -0,0 +1,32 @@
+{#
+/**
+ * @file
+ * Theme override for a menu link form.
+ *
+ * Two-column template for the menu link add/edit form.
+ *
+ * This template will be used when a menu link form specifies
+ * 'menu_link_form' as its #theme callback. Otherwise, by default,
+ * menu_link add/edit forms will be themed by form.html.twig.
+ *
+ * Available variables:
+ * - form: The menu link add/edit form.
+ *
+ * @see claro_form_menu_link_content_form_alter()
+ */
+#}
+{% extends '@claro/form/form-two-columns.html.twig' %}
+{% block main %}
+  {{ form|without('advanced', 'menu_parent', 'actions') }}
+{% endblock %}
+
+{% block secondary %}
+<div class="entity-meta">
+  {{ form.menu_parent }}
+  {{ form.advanced }}
+</div>
+{% endblock %}
+
+{% block footer %}
+  {{ form.actions }}
+{% endblock %}
diff --git a/core/themes/claro/templates/node-edit-form.html.twig b/core/themes/claro/templates/node-edit-form.html.twig
index 78f1b4fce102ca05d14a06243cffd28acd3a999f..9503b9b7719c4b35b12b659183d6dbb9fc19f01d 100644
--- a/core/themes/claro/templates/node-edit-form.html.twig
+++ b/core/themes/claro/templates/node-edit-form.html.twig
@@ -6,7 +6,7 @@
  * Two column template for the node add/edit form.
  *
  * This template will be used when a node edit form specifies 'node_edit_form'
- * as its #theme callback.  Otherwise, by default, node add/edit forms will be
+ * as its #theme callback. Otherwise, by default, node add/edit forms will be
  * themed by form.html.twig.
  *
  * Available variables:
@@ -15,22 +15,16 @@
  * @see claro_form_node_form_alter()
  */
 #}
-<div class="layout-node-form clearfix">
-  <div class="layout-region layout-region--node-main">
-    <div class="layout-region__content">
-      {{ form|without('advanced', 'footer', 'actions') }}
-    </div>
-  </div>
-  <div class="layout-region layout-region--node-secondary">
-    <div class="layout-region__content">
-      {{ form.advanced }}
-    </div>
-  </div>
-  <div class="layout-region layout-region--node-footer">
-    <div class="layout-region__content">
-      <div class="divider"></div>
-      {{ form.footer }}
-      {{ form.actions }}
-    </div>
-  </div>
-</div>
+{% extends '@claro/form/form-two-columns.html.twig' %}
+{% block main %}
+  {{ form|without('advanced', 'footer', 'actions') }}
+{% endblock %}
+
+{% block secondary %}
+  {{ form.advanced }}
+{% endblock %}
+
+{% block footer %}
+  {{ form.footer }}
+  {{ form.actions }}
+{% endblock %}
diff --git a/core/themes/stable9/templates/admin/menu-link-form.html.twig b/core/themes/stable9/templates/admin/menu-link-form.html.twig
new file mode 100644
index 0000000000000000000000000000000000000000..1a12dc1f8da372359982d64f5fd89e47cb72801e
--- /dev/null
+++ b/core/themes/stable9/templates/admin/menu-link-form.html.twig
@@ -0,0 +1,16 @@
+{#
+/**
+ * @file
+ * Theme override for menu_link_form.
+ *
+ * Two-column template for the menu link add/edit form.
+ *
+ * This template will be used when a menu link form specifies
+ * 'menu_link_form' as its #theme callback. Otherwise, by default,
+ * menu_link add/edit forms will be themed by form.html.twig.
+ *
+ * Available variables:
+ * - form: The menu link add/edit form.
+ */
+#}
+{{ form }}