@@ -32,7 +32,6 @@ export function CommandMenu({ open, onClose, navigate, chats, workspaces }: Comm
             items: chats.map((item) => ({
               id: item.id,
               label: item.title,
-              icon: 'I073',
               value: `/chat/${item.id}`,
             })),
           },
 
@@ -101,6 +101,20 @@ test('a keyboard search navigates to the matching chat and shell edits survive t
   const search = page.getByRole('combobox', { name: 'Search the platform' })
   await expect(search).toBeFocused()
   const list = page.getByRole('listbox', { name: 'Search results' })
+  const settings = list.getByRole('option', { name: 'Settings', exact: true })
+  const resting = await settings.evaluate((option) => getComputedStyle(option).backgroundColor)
+  const icon = settings.locator('svg')
+  const restingInk = await icon.evaluate((glyph) => getComputedStyle(glyph).color)
+  await settings.hover()
+  await expect(settings).not.toHaveCSS('background-color', resting)
+  await expect(icon).not.toHaveCSS('color', restingInk)
+  await search.press('ArrowDown')
+  await expect(settings).toHaveCSS('background-color', resting)
+  await expect(icon).toHaveCSS('color', restingInk)
+  await expect(list.getByRole('option', { name: 'Integrations', exact: true })).not.toHaveCSS(
+    'background-color',
+    resting
+  )
   await expect(list).not.toHaveCSS('mask-image', 'none')
   const initialFade = await list.evaluate((element) => getComputedStyle(element).maskImage)
   await list.evaluate((element) => {
 
@@ -1,15 +1,14 @@
 .field,
-.result,
 .footer,
 .footer > span {
   display: flex;
   align-items: center;
 }
 .field {
   flex: none;
-  gap: var(--spacing-12);
+  gap: var(--ui-row-gap);
   min-block-size: var(--spacing-44);
-  padding-inline: var(--spacing-20);
+  padding-inline: var(--ui-dialog-inset);
 }
 .field input {
   flex: 1;
@@ -31,39 +30,22 @@
   gap: var(--ui-list-gap);
 }
 .group + .group {
-  padding-block-start: var(--ui-popup-padding);
-}
-.heading {
-  display: flex;
-  align-items: flex-end;
-  min-block-size: var(--spacing-32);
-  padding: var(--ui-popup-padding) var(--spacing-12);
-  color: var(--ui-secondary);
-}
-.result {
-  min-block-size: var(--spacing-36);
-  padding: var(--ui-row-block) var(--spacing-12);
-  gap: var(--spacing-12);
-  border-radius: var(--ui-control-radius);
-  cursor: pointer;
-  overflow-wrap: anywhere;
-}
-.result[data-highlighted] {
-  background: var(--ui-hover);
+  padding-block-start: var(--ui-section-gap);
 }
 .empty:not(:empty) {
-  padding: var(--spacing-12) var(--spacing-20);
+  padding: var(--ui-section-gap) var(--ui-dialog-inset);
   color: var(--ui-secondary);
 }
 .footer {
   flex: none;
+  flex-wrap: wrap;
   min-block-size: var(--spacing-40);
-  padding: var(--ui-row-block) var(--spacing-16);
+  padding: var(--ui-row-block) var(--ui-dialog-inset);
   color: var(--ui-secondary);
-  gap: var(--spacing-16);
+  gap: var(--ui-list-gap) var(--ui-section-gap);
 }
 .footer > span {
-  gap: var(--ui-popup-padding);
+  gap: var(--spacing-4);
 }
 .footer > span:last-child {
   margin-inline-start: auto;
 
@@ -4,6 +4,7 @@ import { Autocomplete } from '@base-ui/react/autocomplete'
 import type { IconName } from '@/platform/design-system/catalog/icon-geometry'
 import styles from '@/platform/design-system/components/command-palette/command-palette.module.css'
 import { Icon } from '@/platform/design-system/components/icon/icon'
+import popup from '@/platform/design-system/components/menu/popup.shared.module.css'
 import { useScrollEdges } from '@/platform/design-system/components/scroll-area/use-scroll-edges'
 
 interface Command {
@@ -46,7 +47,7 @@ export function CommandPalette({ groups, label, onSelect }: CommandPaletteProps)
         {(group: CommandGroup) => (
           <Autocomplete.Group key={group.label ?? ''} items={group.items} className={styles.group}>
             {group.label && (
-              <Autocomplete.GroupLabel className={styles.heading} data-type='T052'>
+              <Autocomplete.GroupLabel className={popup.heading} data-type='T052'>
                 {group.label}
               </Autocomplete.GroupLabel>
             )}
@@ -55,12 +56,12 @@ export function CommandPalette({ groups, label, onSelect }: CommandPaletteProps)
                 <Autocomplete.Item
                   key={item.id}
                   value={item}
-                  className={styles.result}
-                  data-type='T043'
+                  className={popup.item}
+                  data-type='T060'
                   onClick={() => onSelect(item.value)}
                 >
                   {item.icon && <Icon name={item.icon} />}
-                  <span>{item.label}</span>
+                  <span className={popup.label}>{item.label}</span>
                 </Autocomplete.Item>
               )}
             </Autocomplete.Collection>
 
@@ -152,7 +152,7 @@ function TriggeredMenu({
       )}
       <ActionMenuPopup label={label} container={container} align={align}>
         {heading && (
-          <div className={styles.menuTitle} data-type='T052'>
+          <div className={popup.heading} data-type='T052'>
             {heading}
           </div>
         )}
@@ -557,7 +557,7 @@ export function VisibilityMenu({ label, options, onChange }: VisibilityMenuProps
   const [choices, setChoices] = useState<Readonly<Record<string, boolean>>>({})
   return (
     <MenuSurface label={label} layout='visibility'>
-      <div className={styles.menuTitle} data-type='T052'>
+      <div className={popup.heading} data-type='T052'>
         {label}
       </div>
       {options.map((option) => {
 
@@ -40,14 +40,6 @@
 .separator {
   composes: separator from "./popup.shared.module.css";
 }
-.menuTitle {
-  display: flex;
-  align-items: center;
-  padding-inline: var(--spacing-8);
-  min-block-size: var(--spacing-28);
-  color: var(--ui-secondary);
-}
-
 .menu[data-menu="zoom"] {
   inline-size: var(--menu-zoom-width);
 }
 
@@ -27,6 +27,14 @@
   overscroll-behavior: contain;
 }
 
+.heading {
+  display: flex;
+  align-items: center;
+  min-block-size: var(--spacing-28);
+  padding-inline: var(--ui-row-inset);
+  color: var(--ui-secondary);
+}
+
 .item {
   display: flex;
   align-items: center;
@@ -40,7 +48,10 @@
   text-align: start;
 }
 
-.item:not(:disabled, [data-disabled], [aria-disabled="true"]):is(:hover, [data-highlighted]) {
+.item:not(:disabled, [data-disabled], [aria-disabled="true"]):is(
+    [data-highlighted],
+    :hover:not([role="option"])
+  ) {
   background: var(--ui-hover);
 }
 
 
@@ -44,7 +44,7 @@
     [role="menuitemcheckbox"],
     [role="option"]
   ):not(:disabled, [data-disabled], [aria-disabled="true"]):is(
-    :hover,
+    :hover:not([role="option"]),
     [data-highlighted],
     [data-popup-open]
   ),
 
@@ -14,7 +14,7 @@ Hide Email or Calendar from the widget menu or Customize Home. Email and calenda
 
 ## Current navigation
 
-The shared product layout keeps the main sidebar at the same scroll position when a chat opens or a reader returns from Settings. Closing and reopening the compact drawer also preserves the position. Command K lists Home, Settings and Integrations, followed by workspace and chat results in sidebar order. Integrations and workspace selections currently go to Home.
+The shared product layout keeps the main sidebar at the same scroll position when a chat opens or a reader returns from Settings. Closing and reopening the compact drawer also preserves the position. Command K lists Home, Settings and Integrations with their destination icons, followed by text-only workspace and chat results in sidebar order. It uses the same rows and section headings as Platform menus; the search, results and keyboard hints share the dialog’s content inset. Integrations and workspace selections currently go to Home.
 
 ## Settings coverage