From 3c91b0cb17d3e4fde51acc811c80bdd2228756bb Mon Sep 17 00:00:00 2001
From: Aman Harwara <amanharwara@protonmail.com>
Date: Sun, 27 Nov 2022 22:53:30 +0530
Subject: [PATCH] refactor: menu items (#2057)

---
 .../AccountMenu/GeneralAccountMenu.tsx        |  11 +-
 .../WorkspaceSwitcher/WorkspaceMenuItem.tsx   |   8 +-
 .../WorkspaceSwitcherMenu.tsx                 |   5 +-
 .../WorkspaceSwitcherOption.tsx               |   9 +-
 .../ChangeEditor/ChangeEditorMenu.tsx         |  10 +-
 .../Header/DisplayOptionsMenu.tsx             |  68 +++----
 .../FileContextMenu/FileMenuOptions.tsx       |   7 +-
 .../LinkedItems/LinkedItemsSectionItem.tsx    |   2 -
 .../javascripts/Components/Menu/MenuItem.tsx  |  72 +------
 .../Components/Menu/MenuListItem.tsx          |  11 ++
 .../Components/Menu/MenuRadioButtonItem.tsx   |  46 +++++
 .../Components/Menu/MenuSwitchButtonItem.tsx  |  53 ++++++
 .../NotesContextMenu/NotesContextMenu.tsx     |   9 +-
 .../Components/NotesOptions/AddTagOption.tsx  |  20 +-
 .../NotesOptions/ChangeEditorOption.tsx       |  15 +-
 .../Components/NotesOptions/ClassNames.ts     |  10 -
 .../NotesOptions/DeletePermanentlyButton.tsx  |  12 +-
 .../Listed/ListedActionsOption.tsx            |  10 +-
 .../Components/NotesOptions/NotesOptions.tsx  | 177 ++++++------------
 .../NotesOptions/NotesOptionsPanel.tsx        |  23 ++-
 .../NotesOptions/SpellcheckOptions.tsx        |  20 +-
 .../NotesOptions/SuperNoteOptions.tsx         |  23 +--
 .../PanelSettingsSection.tsx                  |  13 +-
 .../Components/Tags/TagContextMenu.tsx        |   9 +-
 24 files changed, 291 insertions(+), 352 deletions(-)
 create mode 100644 packages/web/src/javascripts/Components/Menu/MenuListItem.tsx
 create mode 100644 packages/web/src/javascripts/Components/Menu/MenuRadioButtonItem.tsx
 create mode 100644 packages/web/src/javascripts/Components/Menu/MenuSwitchButtonItem.tsx

diff --git a/packages/web/src/javascripts/Components/AccountMenu/GeneralAccountMenu.tsx b/packages/web/src/javascripts/Components/AccountMenu/GeneralAccountMenu.tsx
index 810128a85..9d20c935e 100644
--- a/packages/web/src/javascripts/Components/AccountMenu/GeneralAccountMenu.tsx
+++ b/packages/web/src/javascripts/Components/AccountMenu/GeneralAccountMenu.tsx
@@ -9,7 +9,6 @@ import { AccountMenuPane } from './AccountMenuPane'
 import Menu from '@/Components/Menu/Menu'
 import MenuItem from '@/Components/Menu/MenuItem'
 import MenuItemSeparator from '@/Components/Menu/MenuItemSeparator'
-import { MenuItemType } from '@/Components/Menu/MenuItemType'
 import WorkspaceSwitcherOption from './WorkspaceSwitcher/WorkspaceSwitcherOption'
 import { ApplicationGroup } from '@/Application/ApplicationGroup'
 import { formatLastSyncDate } from '@/Utils/DateUtils'
@@ -150,23 +149,23 @@ const GeneralAccountMenu: FunctionComponent<Props> = ({
         />
         <MenuItemSeparator />
         {user ? (
-          <MenuItem type={MenuItemType.IconButton} onClick={openPreferences}>
+          <MenuItem onClick={openPreferences}>
             <Icon type="user" className={iconClassName} />
             Account settings
           </MenuItem>
         ) : (
           <>
-            <MenuItem type={MenuItemType.IconButton} onClick={activateRegisterPane}>
+            <MenuItem onClick={activateRegisterPane}>
               <Icon type="user" className={iconClassName} />
               Create free account
             </MenuItem>
-            <MenuItem type={MenuItemType.IconButton} onClick={activateSignInPane}>
+            <MenuItem onClick={activateSignInPane}>
               <Icon type="signIn" className={iconClassName} />
               Sign in
             </MenuItem>
           </>
         )}
-        <MenuItem className="justify-between" type={MenuItemType.IconButton} onClick={openHelp}>
+        <MenuItem className="justify-between" onClick={openHelp}>
           <div className="flex items-center">
             <Icon type="help" className={iconClassName} />
             Help &amp; feedback
@@ -176,7 +175,7 @@ const GeneralAccountMenu: FunctionComponent<Props> = ({
         {user ? (
           <>
             <MenuItemSeparator />
-            <MenuItem type={MenuItemType.IconButton} onClick={signOut}>
+            <MenuItem onClick={signOut}>
               <Icon type="signOut" className={iconClassName} />
               Sign out workspace
             </MenuItem>
diff --git a/packages/web/src/javascripts/Components/AccountMenu/WorkspaceSwitcher/WorkspaceMenuItem.tsx b/packages/web/src/javascripts/Components/AccountMenu/WorkspaceSwitcher/WorkspaceMenuItem.tsx
index 99c950674..e1fbc2333 100644
--- a/packages/web/src/javascripts/Components/AccountMenu/WorkspaceSwitcher/WorkspaceMenuItem.tsx
+++ b/packages/web/src/javascripts/Components/AccountMenu/WorkspaceSwitcher/WorkspaceMenuItem.tsx
@@ -1,6 +1,4 @@
 import Icon from '@/Components/Icon/Icon'
-import MenuItem from '@/Components/Menu/MenuItem'
-import { MenuItemType } from '@/Components/Menu/MenuItemType'
 import { KeyboardKey } from '@standardnotes/ui-services'
 import { ApplicationDescriptor } from '@standardnotes/snjs'
 import {
@@ -13,6 +11,7 @@ import {
   useRef,
   useState,
 } from 'react'
+import MenuRadioButtonItem from '@/Components/Menu/MenuRadioButtonItem'
 
 type Props = {
   descriptor: ApplicationDescriptor
@@ -56,8 +55,7 @@ const WorkspaceMenuItem: FunctionComponent<Props> = ({
   }, [inputValue, renameDescriptor])
 
   return (
-    <MenuItem
-      type={MenuItemType.RadioButton}
+    <MenuRadioButtonItem
       className="flex w-full cursor-pointer items-center border-0 bg-transparent px-3 py-2 text-left text-sm text-text hover:bg-contrast hover:text-foreground focus:bg-info-backdrop focus:shadow-none"
       onClick={onClick}
       checked={descriptor.primary}
@@ -100,7 +98,7 @@ const WorkspaceMenuItem: FunctionComponent<Props> = ({
           </div>
         )}
       </div>
-    </MenuItem>
+    </MenuRadioButtonItem>
   )
 }
 
diff --git a/packages/web/src/javascripts/Components/AccountMenu/WorkspaceSwitcher/WorkspaceSwitcherMenu.tsx b/packages/web/src/javascripts/Components/AccountMenu/WorkspaceSwitcher/WorkspaceSwitcherMenu.tsx
index c58b40962..e6f3e791d 100644
--- a/packages/web/src/javascripts/Components/AccountMenu/WorkspaceSwitcher/WorkspaceSwitcherMenu.tsx
+++ b/packages/web/src/javascripts/Components/AccountMenu/WorkspaceSwitcher/WorkspaceSwitcherMenu.tsx
@@ -7,7 +7,6 @@ import Icon from '@/Components/Icon/Icon'
 import Menu from '@/Components/Menu/Menu'
 import MenuItem from '@/Components/Menu/MenuItem'
 import MenuItemSeparator from '@/Components/Menu/MenuItemSeparator'
-import { MenuItemType } from '@/Components/Menu/MenuItemType'
 import WorkspaceMenuItem from './WorkspaceMenuItem'
 
 type Props = {
@@ -85,13 +84,13 @@ const WorkspaceSwitcherMenu: FunctionComponent<Props> = ({
       ))}
       <MenuItemSeparator />
 
-      <MenuItem type={MenuItemType.IconButton} onClick={addAnotherWorkspace}>
+      <MenuItem onClick={addAnotherWorkspace}>
         <Icon type="user-add" className="mr-2 text-neutral" />
         Add another workspace
       </MenuItem>
 
       {!hideWorkspaceOptions && (
-        <MenuItem type={MenuItemType.IconButton} onClick={signoutAll}>
+        <MenuItem onClick={signoutAll}>
           <Icon type="signOut" className="mr-2 text-neutral" />
           Sign out all workspaces
         </MenuItem>
diff --git a/packages/web/src/javascripts/Components/AccountMenu/WorkspaceSwitcher/WorkspaceSwitcherOption.tsx b/packages/web/src/javascripts/Components/AccountMenu/WorkspaceSwitcher/WorkspaceSwitcherOption.tsx
index b6ed59ad1..f2cccb304 100644
--- a/packages/web/src/javascripts/Components/AccountMenu/WorkspaceSwitcher/WorkspaceSwitcherOption.tsx
+++ b/packages/web/src/javascripts/Components/AccountMenu/WorkspaceSwitcher/WorkspaceSwitcherOption.tsx
@@ -6,7 +6,6 @@ import { FunctionComponent, useCallback, useRef, useState } from 'react'
 import Icon from '@/Components/Icon/Icon'
 import WorkspaceSwitcherMenu from './WorkspaceSwitcherMenu'
 import MenuItem from '@/Components/Menu/MenuItem'
-import { MenuItemType } from '@/Components/Menu/MenuItemType'
 import Popover from '@/Components/Popover/Popover'
 import { MenuItemIconSize } from '@/Constants/TailwindClassNames'
 
@@ -25,13 +24,7 @@ const WorkspaceSwitcherOption: FunctionComponent<Props> = ({ mainApplicationGrou
 
   return (
     <>
-      <MenuItem
-        tabIndex={FOCUSABLE_BUT_NOT_TABBABLE}
-        ref={buttonRef}
-        type={MenuItemType.IconButton}
-        onClick={toggleMenu}
-        className="justify-between"
-      >
+      <MenuItem tabIndex={FOCUSABLE_BUT_NOT_TABBABLE} ref={buttonRef} onClick={toggleMenu} className="justify-between">
         <div className="flex items-center">
           <Icon type="user-switch" className={`mr-2 text-neutral ${MenuItemIconSize}`} />
           Switch workspace
diff --git a/packages/web/src/javascripts/Components/ChangeEditor/ChangeEditorMenu.tsx b/packages/web/src/javascripts/Components/ChangeEditor/ChangeEditorMenu.tsx
index 9b1480194..7689fa08e 100644
--- a/packages/web/src/javascripts/Components/ChangeEditor/ChangeEditorMenu.tsx
+++ b/packages/web/src/javascripts/Components/ChangeEditor/ChangeEditorMenu.tsx
@@ -1,7 +1,5 @@
 import Icon from '@/Components/Icon/Icon'
 import Menu from '@/Components/Menu/Menu'
-import MenuItem from '@/Components/Menu/MenuItem'
-import { MenuItemType } from '@/Components/Menu/MenuItemType'
 import { usePremiumModal } from '@/Hooks/usePremiumModal'
 import { STRING_EDIT_LOCKED_ATTEMPT } from '@/Constants/Strings'
 import { WebApplication } from '@/Application/Application'
@@ -13,6 +11,7 @@ import { createEditorMenuGroups } from '../../Utils/createEditorMenuGroups'
 import { reloadFont } from '../NoteView/FontFunctions'
 import { PremiumFeatureIconClass, PremiumFeatureIconName } from '../Icon/PremiumFeatureIcon'
 import { SuperNoteImporter } from '../NoteView/SuperEditor/SuperNoteImporter'
+import MenuRadioButtonItem from '../Menu/MenuRadioButtonItem'
 
 type ChangeEditorMenuProps = {
   application: WebApplication
@@ -190,12 +189,11 @@ const ChangeEditorMenu: FunctionComponent<ChangeEditorMenuProps> = ({
                       selectItem(item).catch(console.error)
                     }
                     return (
-                      <MenuItem
+                      <MenuRadioButtonItem
                         key={item.name}
-                        type={MenuItemType.RadioButton}
                         onClick={onClickEditorItem}
                         className={'flex-row-reverse py-2'}
-                        checked={item.isEntitled ? isSelected(item) : undefined}
+                        checked={item.isEntitled ? isSelected(item) : false}
                       >
                         <div className="flex flex-grow items-center justify-between">
                           <div className={`flex items-center ${group.featured ? 'font-bold' : ''}`}>
@@ -206,7 +204,7 @@ const ChangeEditorMenu: FunctionComponent<ChangeEditorMenuProps> = ({
                             <Icon type={PremiumFeatureIconName} className={PremiumFeatureIconClass} />
                           )}
                         </div>
-                      </MenuItem>
+                      </MenuRadioButtonItem>
                     )
                   })}
                 </div>
diff --git a/packages/web/src/javascripts/Components/ContentListView/Header/DisplayOptionsMenu.tsx b/packages/web/src/javascripts/Components/ContentListView/Header/DisplayOptionsMenu.tsx
index 66e3d8f99..b64429b9e 100644
--- a/packages/web/src/javascripts/Components/ContentListView/Header/DisplayOptionsMenu.tsx
+++ b/packages/web/src/javascripts/Components/ContentListView/Header/DisplayOptionsMenu.tsx
@@ -13,15 +13,15 @@ import { observer } from 'mobx-react-lite'
 import { FunctionComponent, useCallback, useEffect, useState } from 'react'
 import Icon from '@/Components/Icon/Icon'
 import Menu from '@/Components/Menu/Menu'
-import MenuItem from '@/Components/Menu/MenuItem'
 import MenuItemSeparator from '@/Components/Menu/MenuItemSeparator'
-import { MenuItemType } from '@/Components/Menu/MenuItemType'
 import { DisplayOptionsMenuProps } from './DisplayOptionsMenuProps'
 import { PrefDefaults } from '@/Constants/PrefDefaults'
 import NewNotePreferences from './NewNotePreferences'
 import { PreferenceMode } from './PreferenceMode'
 import { classNames } from '@standardnotes/utils'
 import NoSubscriptionBanner from '@/Components/NoSubscriptionBanner/NoSubscriptionBanner'
+import MenuRadioButtonItem from '@/Components/Menu/MenuRadioButtonItem'
+import MenuSwitchButtonItem from '@/Components/Menu/MenuSwitchButtonItem'
 
 const DailyEntryModeEnabled = true
 
@@ -230,10 +230,9 @@ const DisplayOptionsMenu: FunctionComponent<DisplayOptionsMenuProps> = ({
       <MenuItemSeparator />
 
       <div className="my-1 px-3 text-base font-semibold uppercase text-text lg:text-xs">Sort by</div>
-      <MenuItem
+      <MenuRadioButtonItem
         disabled={controlsDisabled || isDailyEntry}
         className="py-2"
-        type={MenuItemType.RadioButton}
         onClick={toggleSortByDateModified}
         checked={preferences.sortBy === CollectionSort.UpdatedAt}
       >
@@ -247,11 +246,10 @@ const DisplayOptionsMenu: FunctionComponent<DisplayOptionsMenuProps> = ({
             )
           ) : null}
         </div>
-      </MenuItem>
-      <MenuItem
+      </MenuRadioButtonItem>
+      <MenuRadioButtonItem
         disabled={controlsDisabled || isDailyEntry}
         className="py-2"
-        type={MenuItemType.RadioButton}
         onClick={toggleSortByCreationDate}
         checked={preferences.sortBy === CollectionSort.CreatedAt}
       >
@@ -265,11 +263,10 @@ const DisplayOptionsMenu: FunctionComponent<DisplayOptionsMenuProps> = ({
             )
           ) : null}
         </div>
-      </MenuItem>
-      <MenuItem
+      </MenuRadioButtonItem>
+      <MenuRadioButtonItem
         disabled={controlsDisabled || isDailyEntry}
         className="py-2"
-        type={MenuItemType.RadioButton}
         onClick={toggleSortByTitle}
         checked={preferences.sortBy === CollectionSort.Title}
       >
@@ -283,92 +280,83 @@ const DisplayOptionsMenu: FunctionComponent<DisplayOptionsMenuProps> = ({
             )
           ) : null}
         </div>
-      </MenuItem>
+      </MenuRadioButtonItem>
       <MenuItemSeparator />
       <div className="px-3 py-1 text-base font-semibold uppercase text-text lg:text-xs">View</div>
       {!isFilesSmartView && (
-        <MenuItem
+        <MenuSwitchButtonItem
           disabled={controlsDisabled}
-          type={MenuItemType.SwitchButton}
           className="py-1 hover:bg-contrast focus:bg-info-backdrop"
           checked={!preferences.hideNotePreview}
           onChange={toggleHidePreview}
         >
           <div className="max-w-3/4 flex flex-col">Show note preview</div>
-        </MenuItem>
+        </MenuSwitchButtonItem>
       )}
-      <MenuItem
+      <MenuSwitchButtonItem
         disabled={controlsDisabled}
-        type={MenuItemType.SwitchButton}
         className="py-1 hover:bg-contrast focus:bg-info-backdrop"
         checked={!preferences.hideDate}
         onChange={toggleHideDate}
       >
         Show date
-      </MenuItem>
-      <MenuItem
+      </MenuSwitchButtonItem>
+      <MenuSwitchButtonItem
         disabled={controlsDisabled}
-        type={MenuItemType.SwitchButton}
         className="py-1 hover:bg-contrast focus:bg-info-backdrop"
         checked={!preferences.hideTags}
         onChange={toggleHideTags}
       >
         Show tags
-      </MenuItem>
-      <MenuItem
+      </MenuSwitchButtonItem>
+      <MenuSwitchButtonItem
         disabled={controlsDisabled}
-        type={MenuItemType.SwitchButton}
         className="py-1 hover:bg-contrast focus:bg-info-backdrop"
         checked={!preferences.hideEditorIcon}
         onChange={toggleEditorIcon}
       >
         Show icon
-      </MenuItem>
+      </MenuSwitchButtonItem>
       <MenuItemSeparator />
       <div className="px-3 py-1 text-base font-semibold uppercase text-text lg:text-xs">Other</div>
-      <MenuItem
+      <MenuSwitchButtonItem
         disabled={controlsDisabled}
-        type={MenuItemType.SwitchButton}
         className="py-1 hover:bg-contrast focus:bg-info-backdrop"
         checked={!preferences.hidePinned}
         onChange={toggleHidePinned}
       >
         Show pinned
-      </MenuItem>
-      <MenuItem
+      </MenuSwitchButtonItem>
+      <MenuSwitchButtonItem
         disabled={controlsDisabled}
-        type={MenuItemType.SwitchButton}
         className="py-1 hover:bg-contrast focus:bg-info-backdrop"
         checked={!preferences.hideProtected}
         onChange={toggleHideProtected}
       >
         Show protected
-      </MenuItem>
-      <MenuItem
+      </MenuSwitchButtonItem>
+      <MenuSwitchButtonItem
         disabled={controlsDisabled}
-        type={MenuItemType.SwitchButton}
         className="py-1 hover:bg-contrast focus:bg-info-backdrop"
-        checked={preferences.showArchived}
+        checked={Boolean(preferences.showArchived)}
         onChange={toggleShowArchived}
       >
         Show archived
-      </MenuItem>
-      <MenuItem
+      </MenuSwitchButtonItem>
+      <MenuSwitchButtonItem
         disabled={controlsDisabled}
-        type={MenuItemType.SwitchButton}
         className="py-1 hover:bg-contrast focus:bg-info-backdrop"
-        checked={preferences.showTrashed}
+        checked={Boolean(preferences.showTrashed)}
         onChange={toggleShowTrashed}
       >
         Show trashed
-      </MenuItem>
+      </MenuSwitchButtonItem>
 
       {currentMode === 'tag' && DailyEntryModeEnabled && (
         <>
           <MenuItemSeparator />
-          <MenuItem
+          <MenuSwitchButtonItem
             disabled={controlsDisabled}
-            type={MenuItemType.SwitchButton}
             className="py-1 hover:bg-contrast focus:bg-info-backdrop"
             checked={isDailyEntry}
             onChange={toggleEntryMode}
@@ -382,7 +370,7 @@ const DisplayOptionsMenu: FunctionComponent<DisplayOptionsMenuProps> = ({
               </div>
               <div className="mt-1">Capture new notes daily with a calendar-based layout</div>
             </div>
-          </MenuItem>
+          </MenuSwitchButtonItem>
         </>
       )}
 
diff --git a/packages/web/src/javascripts/Components/FileContextMenu/FileMenuOptions.tsx b/packages/web/src/javascripts/Components/FileContextMenu/FileMenuOptions.tsx
index 0d3ee1526..c91c2e40a 100644
--- a/packages/web/src/javascripts/Components/FileContextMenu/FileMenuOptions.tsx
+++ b/packages/web/src/javascripts/Components/FileContextMenu/FileMenuOptions.tsx
@@ -9,8 +9,8 @@ import { formatSizeToReadableString } from '@standardnotes/filepicker'
 import { useResponsiveAppPane } from '../ResponsivePane/ResponsivePaneProvider'
 import { AppPaneId } from '../ResponsivePane/AppPaneMetadata'
 import MenuItem from '../Menu/MenuItem'
-import { MenuItemType } from '../Menu/MenuItemType'
 import { FileContextMenuBackupOption } from './FileContextMenuBackupOption'
+import MenuSwitchButtonItem from '../Menu/MenuSwitchButtonItem'
 
 type Props = {
   closeMenu: () => void
@@ -83,8 +83,7 @@ const FileMenuOptions: FunctionComponent<Props> = ({
           ) : null}
         </>
       )}
-      <MenuItem
-        type={MenuItemType.SwitchButton}
+      <MenuSwitchButtonItem
         checked={hasProtectedFiles}
         onChange={(hasProtectedFiles) => {
           void filesController.setProtectionForFiles(hasProtectedFiles, selectionController.selectedFiles)
@@ -92,7 +91,7 @@ const FileMenuOptions: FunctionComponent<Props> = ({
       >
         <Icon type="lock" className="mr-2 text-neutral" />
         Password protect
-      </MenuItem>
+      </MenuSwitchButtonItem>
       <HorizontalSeparator classes="my-1" />
       <MenuItem
         onClick={() => {
diff --git a/packages/web/src/javascripts/Components/LinkedItems/LinkedItemsSectionItem.tsx b/packages/web/src/javascripts/Components/LinkedItems/LinkedItemsSectionItem.tsx
index b294451ee..e44521dbe 100644
--- a/packages/web/src/javascripts/Components/LinkedItems/LinkedItemsSectionItem.tsx
+++ b/packages/web/src/javascripts/Components/LinkedItems/LinkedItemsSectionItem.tsx
@@ -12,7 +12,6 @@ import { useApplication } from '../ApplicationView/ApplicationProvider'
 import { PopoverFileItemActionType } from '../AttachedFilesPopover/PopoverFileItemAction'
 import Icon from '../Icon/Icon'
 import MenuItem from '../Menu/MenuItem'
-import { MenuItemType } from '../Menu/MenuItemType'
 import Popover from '../Popover/Popover'
 import HorizontalSeparator from '../Shared/HorizontalSeparator'
 import LinkedFileMenuOptions from './LinkedFileMenuOptions'
@@ -107,7 +106,6 @@ export const LinkedItemsSectionItem = ({
         className="py-2"
       >
         <MenuItem
-          type={MenuItemType.IconButton}
           onClick={() => {
             unlinkItem()
             toggleMenu()
diff --git a/packages/web/src/javascripts/Components/Menu/MenuItem.tsx b/packages/web/src/javascripts/Components/Menu/MenuItem.tsx
index 78f4880ac..ce2b31bbf 100644
--- a/packages/web/src/javascripts/Components/Menu/MenuItem.tsx
+++ b/packages/web/src/javascripts/Components/Menu/MenuItem.tsx
@@ -1,79 +1,34 @@
-import { forwardRef, MouseEventHandler, ReactNode, Ref } from 'react'
+import { ComponentPropsWithoutRef, forwardRef, MouseEventHandler, ReactNode, Ref } from 'react'
 import Icon from '@/Components/Icon/Icon'
-import Switch from '@/Components/Switch/Switch'
-import { SwitchProps } from '@/Components/Switch/SwitchProps'
 import { IconType } from '@standardnotes/snjs'
 import { FOCUSABLE_BUT_NOT_TABBABLE } from '@/Constants/Constants'
-import { MenuItemType } from './MenuItemType'
-import RadioIndicator from '../Radio/RadioIndicator'
 import { classNames } from '@standardnotes/utils'
 import { PlatformedKeyboardShortcut } from '@standardnotes/ui-services'
 import { KeyboardShortcutIndicator } from '../KeyboardShortcutIndicator/KeyboardShortcutIndicator'
+import MenuListItem from './MenuListItem'
 
 type MenuItemProps = {
   children: ReactNode
-  type?: MenuItemType
   onClick?: MouseEventHandler<HTMLButtonElement>
-  onChange?: SwitchProps['onChange']
   onBlur?: (event: { relatedTarget: EventTarget | null }) => void
   className?: string
-  checked?: boolean
   icon?: IconType
   iconClassName?: string
   tabIndex?: number
   disabled?: boolean
   shortcut?: PlatformedKeyboardShortcut
-}
+} & ComponentPropsWithoutRef<'button'>
 
 const MenuItem = forwardRef(
   (
-    {
-      children,
-      onClick,
-      onChange,
-      onBlur,
-      className = '',
-      type = MenuItemType.IconButton,
-      checked,
-      icon,
-      iconClassName,
-      tabIndex,
-      disabled,
-      shortcut,
-    }: MenuItemProps,
+    { children, className = '', icon, iconClassName, tabIndex, shortcut, ...props }: MenuItemProps,
     ref: Ref<HTMLButtonElement>,
   ) => {
-    return type === MenuItemType.SwitchButton && typeof onChange === 'function' ? (
-      <li className="list-none" role="none">
+    return (
+      <MenuListItem>
         <button
-          disabled={disabled}
           ref={ref}
-          className={classNames(
-            'flex w-full cursor-pointer items-center justify-between border-0 bg-transparent px-3 py-2 md:py-1.5',
-            'text-left text-text hover:bg-contrast hover:text-foreground focus:bg-info-backdrop focus:shadow-none',
-            'text-mobile-menu-item md:text-tablet-menu-item lg:text-menu-item',
-          )}
-          onClick={() => {
-            onChange(!checked)
-          }}
-          onBlur={onBlur}
-          tabIndex={typeof tabIndex === 'number' ? tabIndex : FOCUSABLE_BUT_NOT_TABBABLE}
-          role="menuitemcheckbox"
-          aria-checked={checked}
-        >
-          <span className="flex flex-grow items-center">{children}</span>
-          <div className="flex">
-            {shortcut && <KeyboardShortcutIndicator className="mr-2" shortcut={shortcut} />}
-            <Switch disabled={disabled} className="px-0" checked={checked} />
-          </div>
-        </button>
-      </li>
-    ) : (
-      <li className="list-none" role="none">
-        <button
-          disabled={disabled}
-          ref={ref}
-          role={type === MenuItemType.RadioButton ? 'menuitemradio' : 'menuitem'}
+          role="menuitem"
           tabIndex={typeof tabIndex === 'number' ? tabIndex : FOCUSABLE_BUT_NOT_TABBABLE}
           className={classNames(
             'flex w-full cursor-pointer border-0 bg-transparent px-3 py-2 text-left md:py-1.5',
@@ -82,20 +37,13 @@ const MenuItem = forwardRef(
             className,
             className.includes('items-') ? '' : 'items-center',
           )}
-          onClick={onClick}
-          onBlur={onBlur}
-          {...(type === MenuItemType.RadioButton ? { 'aria-checked': checked } : {})}
+          {...props}
         >
           {shortcut && <KeyboardShortcutIndicator className="mr-2" shortcut={shortcut} />}
-          {type === MenuItemType.IconButton && icon ? (
-            <Icon type={icon} className={`${iconClassName} flex-shrink-0`} />
-          ) : null}
-          {type === MenuItemType.RadioButton && typeof checked === 'boolean' ? (
-            <RadioIndicator disabled={disabled} checked={checked} className="flex-shrink-0" />
-          ) : null}
+          {icon ? <Icon type={icon} className={classNames('flex-shrink-0', iconClassName)} /> : null}
           {children}
         </button>
-      </li>
+      </MenuListItem>
     )
   },
 )
diff --git a/packages/web/src/javascripts/Components/Menu/MenuListItem.tsx b/packages/web/src/javascripts/Components/Menu/MenuListItem.tsx
new file mode 100644
index 000000000..834dbbd59
--- /dev/null
+++ b/packages/web/src/javascripts/Components/Menu/MenuListItem.tsx
@@ -0,0 +1,11 @@
+import { ReactNode } from 'react'
+
+const MenuListItem = ({ children }: { children: ReactNode }) => {
+  return (
+    <li className="list-none" role="none">
+      {children}
+    </li>
+  )
+}
+
+export default MenuListItem
diff --git a/packages/web/src/javascripts/Components/Menu/MenuRadioButtonItem.tsx b/packages/web/src/javascripts/Components/Menu/MenuRadioButtonItem.tsx
new file mode 100644
index 000000000..c1a4e2a21
--- /dev/null
+++ b/packages/web/src/javascripts/Components/Menu/MenuRadioButtonItem.tsx
@@ -0,0 +1,46 @@
+import { FOCUSABLE_BUT_NOT_TABBABLE } from '@/Constants/Constants'
+import { classNames } from '@standardnotes/snjs'
+import { PlatformedKeyboardShortcut } from '@standardnotes/ui-services'
+import { ComponentPropsWithoutRef, ForwardedRef, forwardRef, ReactNode } from 'react'
+import { KeyboardShortcutIndicator } from '../KeyboardShortcutIndicator/KeyboardShortcutIndicator'
+import RadioIndicator from '../Radio/RadioIndicator'
+import MenuListItem from './MenuListItem'
+
+type Props = {
+  checked: boolean
+  children: ReactNode
+  shortcut?: PlatformedKeyboardShortcut
+} & ComponentPropsWithoutRef<'button'>
+
+const MenuRadioButtonItem = forwardRef(
+  (
+    { checked, disabled, tabIndex, children, shortcut, className, ...props }: Props,
+    ref: ForwardedRef<HTMLButtonElement>,
+  ) => {
+    return (
+      <MenuListItem>
+        <button
+          ref={ref}
+          role="menuitemradio"
+          tabIndex={typeof tabIndex === 'number' ? tabIndex : FOCUSABLE_BUT_NOT_TABBABLE}
+          className={classNames(
+            'flex w-full cursor-pointer border-0 bg-transparent px-3 py-2 text-left md:py-1.5',
+            'text-mobile-menu-item text-text hover:bg-contrast hover:text-foreground',
+            'focus:bg-info-backdrop focus:shadow-none md:text-tablet-menu-item lg:text-menu-item',
+            className,
+            className?.includes('items-') ? '' : 'items-center',
+          )}
+          aria-checked={checked}
+          disabled={disabled}
+          {...props}
+        >
+          {shortcut && <KeyboardShortcutIndicator className="mr-2" shortcut={shortcut} />}
+          <RadioIndicator disabled={disabled} checked={checked} className="flex-shrink-0" />
+          {children}
+        </button>
+      </MenuListItem>
+    )
+  },
+)
+
+export default MenuRadioButtonItem
diff --git a/packages/web/src/javascripts/Components/Menu/MenuSwitchButtonItem.tsx b/packages/web/src/javascripts/Components/Menu/MenuSwitchButtonItem.tsx
new file mode 100644
index 000000000..aac578f40
--- /dev/null
+++ b/packages/web/src/javascripts/Components/Menu/MenuSwitchButtonItem.tsx
@@ -0,0 +1,53 @@
+import { FOCUSABLE_BUT_NOT_TABBABLE } from '@/Constants/Constants'
+import { classNames } from '@standardnotes/snjs'
+import { PlatformedKeyboardShortcut } from '@standardnotes/ui-services'
+import { ComponentPropsWithoutRef, ForwardedRef, forwardRef, ReactNode } from 'react'
+import { KeyboardShortcutIndicator } from '../KeyboardShortcutIndicator/KeyboardShortcutIndicator'
+import Switch from '../Switch/Switch'
+import { SwitchProps } from '../Switch/SwitchProps'
+import MenuListItem from './MenuListItem'
+
+type Props = {
+  checked: boolean
+  children: ReactNode
+  onChange: NonNullable<SwitchProps['onChange']>
+  shortcut?: PlatformedKeyboardShortcut
+} & Omit<ComponentPropsWithoutRef<'button'>, 'onChange'>
+
+const MenuSwitchButtonItem = forwardRef(
+  (
+    { checked, onChange, disabled, onBlur, tabIndex, children, shortcut, className, ...props }: Props,
+    ref: ForwardedRef<HTMLButtonElement>,
+  ) => {
+    return (
+      <MenuListItem>
+        <button
+          disabled={disabled}
+          ref={ref}
+          className={classNames(
+            'flex w-full cursor-pointer border-0 bg-transparent px-3 py-2 md:py-1.5',
+            'text-left text-text hover:bg-contrast hover:text-foreground focus:bg-info-backdrop focus:shadow-none',
+            'text-mobile-menu-item md:text-tablet-menu-item lg:text-menu-item',
+            className,
+          )}
+          onClick={() => {
+            onChange(!checked)
+          }}
+          onBlur={onBlur}
+          tabIndex={typeof tabIndex === 'number' ? tabIndex : FOCUSABLE_BUT_NOT_TABBABLE}
+          role="menuitemcheckbox"
+          aria-checked={checked}
+          {...props}
+        >
+          <span className="flex flex-grow items-center">{children}</span>
+          <div className="flex">
+            {shortcut && <KeyboardShortcutIndicator className="mr-2" shortcut={shortcut} />}
+            <Switch disabled={disabled} className="px-0" checked={checked} />
+          </div>
+        </button>
+      </MenuListItem>
+    )
+  },
+)
+
+export default MenuSwitchButtonItem
diff --git a/packages/web/src/javascripts/Components/NotesContextMenu/NotesContextMenu.tsx b/packages/web/src/javascripts/Components/NotesContextMenu/NotesContextMenu.tsx
index d95a307e4..fa759a3b6 100644
--- a/packages/web/src/javascripts/Components/NotesContextMenu/NotesContextMenu.tsx
+++ b/packages/web/src/javascripts/Components/NotesContextMenu/NotesContextMenu.tsx
@@ -1,12 +1,13 @@
 import { observer } from 'mobx-react-lite'
 import NotesOptions from '@/Components/NotesOptions/NotesOptions'
-import { useCallback, useRef, useState } from 'react'
+import { useCallback, useState } from 'react'
 import { WebApplication } from '@/Application/Application'
 import { NotesController } from '@/Controllers/NotesController/NotesController'
 import { NavigationController } from '@/Controllers/Navigation/NavigationController'
 import { HistoryModalController } from '@/Controllers/NoteHistory/HistoryModalController'
 import Popover from '../Popover/Popover'
 import { LinkingController } from '@/Controllers/LinkingController'
+import Menu from '../Menu/Menu'
 
 type Props = {
   application: WebApplication
@@ -25,8 +26,6 @@ const NotesContextMenu = ({
 }: Props) => {
   const { contextMenuOpen, contextMenuClickLocation, setContextMenuOpen } = notesController
 
-  const contextMenuRef = useRef<HTMLDivElement>(null)
-
   const closeMenu = () => setContextMenuOpen(!contextMenuOpen)
 
   const [disableClickOutside, setDisableClickOutside] = useState(false)
@@ -46,7 +45,7 @@ const NotesContextMenu = ({
       open={contextMenuOpen}
       togglePopover={closeMenu}
     >
-      <div className="select-none" ref={contextMenuRef}>
+      <Menu className="select-none" a11yLabel="Note context menu" isOpen={contextMenuOpen}>
         <NotesOptions
           application={application}
           navigationController={navigationController}
@@ -56,7 +55,7 @@ const NotesContextMenu = ({
           requestDisableClickOutside={handleDisableClickOutsideRequest}
           closeMenu={closeMenu}
         />
-      </div>
+      </Menu>
     </Popover>
   )
 }
diff --git a/packages/web/src/javascripts/Components/NotesOptions/AddTagOption.tsx b/packages/web/src/javascripts/Components/NotesOptions/AddTagOption.tsx
index c47038a0e..7840c55ed 100644
--- a/packages/web/src/javascripts/Components/NotesOptions/AddTagOption.tsx
+++ b/packages/web/src/javascripts/Components/NotesOptions/AddTagOption.tsx
@@ -8,20 +8,15 @@ import Popover from '../Popover/Popover'
 import { IconType } from '@standardnotes/snjs'
 import { getTitleForLinkedTag } from '@/Utils/Items/Display/getTitleForLinkedTag'
 import { useApplication } from '../ApplicationView/ApplicationProvider'
+import MenuItem from '../Menu/MenuItem'
 
 type Props = {
   navigationController: NavigationController
   notesController: NotesController
-  className: string
   iconClassName: string
 }
 
-const AddTagOption: FunctionComponent<Props> = ({
-  navigationController,
-  notesController,
-  className,
-  iconClassName,
-}) => {
+const AddTagOption: FunctionComponent<Props> = ({ navigationController, notesController, iconClassName }) => {
   const application = useApplication()
   const menuContainerRef = useRef<HTMLDivElement>(null)
   const buttonRef = useRef<HTMLButtonElement>(null)
@@ -34,7 +29,8 @@ const AddTagOption: FunctionComponent<Props> = ({
 
   return (
     <div ref={menuContainerRef}>
-      <button
+      <MenuItem
+        className="justify-between"
         onClick={toggleMenu}
         onKeyDown={(event) => {
           if (event.key === KeyboardKey.Escape) {
@@ -42,14 +38,13 @@ const AddTagOption: FunctionComponent<Props> = ({
           }
         }}
         ref={buttonRef}
-        className={className}
       >
         <div className="flex items-center">
           <Icon type="hashtag" className={`${iconClassName} mr-2 text-neutral`} />
           Add tag
         </div>
         <Icon type="chevron-right" className="text-neutral" />
-      </button>
+      </MenuItem>
       <Popover
         togglePopover={toggleMenu}
         anchorElement={buttonRef.current}
@@ -59,9 +54,8 @@ const AddTagOption: FunctionComponent<Props> = ({
         className="py-2"
       >
         {navigationController.tags.map((tag) => (
-          <button
+          <MenuItem
             key={tag.uuid}
-            className={`max-w-80 ${className.replace('justify-between', 'justify-start')}`}
             onClick={() => {
               notesController.isTagInSelectedNotes(tag)
                 ? notesController.removeTagFromSelectedNotes(tag).catch(console.error)
@@ -81,7 +75,7 @@ const AddTagOption: FunctionComponent<Props> = ({
             >
               {getTitleForLinkedTag(tag, application)?.longTitle}
             </span>
-          </button>
+          </MenuItem>
         ))}
       </Popover>
     </div>
diff --git a/packages/web/src/javascripts/Components/NotesOptions/ChangeEditorOption.tsx b/packages/web/src/javascripts/Components/NotesOptions/ChangeEditorOption.tsx
index 7f8134385..b8c78203b 100644
--- a/packages/web/src/javascripts/Components/NotesOptions/ChangeEditorOption.tsx
+++ b/packages/web/src/javascripts/Components/NotesOptions/ChangeEditorOption.tsx
@@ -6,20 +6,15 @@ import Icon from '@/Components/Icon/Icon'
 import ChangeEditorMenu from '@/Components/ChangeEditor/ChangeEditorMenu'
 import Popover from '../Popover/Popover'
 import { KeyboardShortcutIndicator } from '../KeyboardShortcutIndicator/KeyboardShortcutIndicator'
+import MenuItem from '../Menu/MenuItem'
 
 type ChangeEditorOptionProps = {
   application: WebApplication
   note: SNNote
-  className: string
   iconClassName: string
 }
 
-const ChangeEditorOption: FunctionComponent<ChangeEditorOptionProps> = ({
-  application,
-  note,
-  className,
-  iconClassName,
-}) => {
+const ChangeEditorOption: FunctionComponent<ChangeEditorOptionProps> = ({ application, note, iconClassName }) => {
   const [isOpen, setIsOpen] = useState(false)
   const menuContainerRef = useRef<HTMLDivElement>(null)
   const buttonRef = useRef<HTMLButtonElement>(null)
@@ -35,7 +30,8 @@ const ChangeEditorOption: FunctionComponent<ChangeEditorOptionProps> = ({
 
   return (
     <div ref={menuContainerRef}>
-      <button
+      <MenuItem
+        className="justify-between"
         onClick={toggleMenu}
         onKeyDown={(event) => {
           if (event.key === KeyboardKey.Escape) {
@@ -43,7 +39,6 @@ const ChangeEditorOption: FunctionComponent<ChangeEditorOptionProps> = ({
           }
         }}
         ref={buttonRef}
-        className={className}
       >
         <div className="flex items-center">
           <Icon type="dashboard" className={`${iconClassName} mr-2 text-neutral`} />
@@ -53,7 +48,7 @@ const ChangeEditorOption: FunctionComponent<ChangeEditorOptionProps> = ({
           {shortcut && <KeyboardShortcutIndicator className={'mr-2'} shortcut={shortcut} />}
           <Icon type="chevron-right" className="text-neutral" />
         </div>
-      </button>
+      </MenuItem>
       <Popover
         align="start"
         anchorElement={buttonRef.current}
diff --git a/packages/web/src/javascripts/Components/NotesOptions/ClassNames.ts b/packages/web/src/javascripts/Components/NotesOptions/ClassNames.ts
index 849cb713d..6e145ff75 100644
--- a/packages/web/src/javascripts/Components/NotesOptions/ClassNames.ts
+++ b/packages/web/src/javascripts/Components/NotesOptions/ClassNames.ts
@@ -1,13 +1,3 @@
 import { MenuItemIconSize } from '@/Constants/TailwindClassNames'
-import { classNames } from '@standardnotes/utils'
-
-export const menuItemTextClassNames = 'text-mobile-menu-item md:text-tablet-menu-item lg:text-menu-item'
-
-export const menuItemClassNames = classNames(
-  menuItemTextClassNames,
-  'flex w-full cursor-pointer items-center border-0 bg-transparent px-3 py-1.5 text-left text-text hover:bg-contrast hover:text-foreground focus:bg-info-backdrop focus:shadow-none',
-)
-
-export const menuItemSwitchClassNames = classNames(menuItemTextClassNames, menuItemClassNames, 'justify-between')
 
 export const iconClass = `text-neutral mr-2 ${MenuItemIconSize}`
diff --git a/packages/web/src/javascripts/Components/NotesOptions/DeletePermanentlyButton.tsx b/packages/web/src/javascripts/Components/NotesOptions/DeletePermanentlyButton.tsx
index f24730500..143dcff0a 100644
--- a/packages/web/src/javascripts/Components/NotesOptions/DeletePermanentlyButton.tsx
+++ b/packages/web/src/javascripts/Components/NotesOptions/DeletePermanentlyButton.tsx
@@ -1,19 +1,13 @@
 import Icon from '@/Components/Icon/Icon'
-import { classNames } from '@standardnotes/utils'
+import MenuItem from '../Menu/MenuItem'
 
 type DeletePermanentlyButtonProps = {
   onClick: () => void
 }
 
 export const DeletePermanentlyButton = ({ onClick }: DeletePermanentlyButtonProps) => (
-  <button
-    className={classNames(
-      'flex w-full cursor-pointer items-center border-0 bg-transparent px-3 py-1.5 text-left text-mobile-menu-item',
-      'text-text hover:bg-contrast hover:text-foreground focus:bg-info-backdrop focus:shadow-none md:text-menu-item',
-    )}
-    onClick={onClick}
-  >
+  <MenuItem onClick={onClick}>
     <Icon type="close" className="mr-2 text-danger" />
     <span className="text-danger">Delete permanently</span>
-  </button>
+  </MenuItem>
 )
diff --git a/packages/web/src/javascripts/Components/NotesOptions/Listed/ListedActionsOption.tsx b/packages/web/src/javascripts/Components/NotesOptions/Listed/ListedActionsOption.tsx
index be630d4a5..0a641d7bc 100644
--- a/packages/web/src/javascripts/Components/NotesOptions/Listed/ListedActionsOption.tsx
+++ b/packages/web/src/javascripts/Components/NotesOptions/Listed/ListedActionsOption.tsx
@@ -5,15 +5,15 @@ import Icon from '@/Components/Icon/Icon'
 import ListedActionsMenu from './ListedActionsMenu'
 import { KeyboardKey } from '@standardnotes/ui-services'
 import Popover from '../../Popover/Popover'
+import MenuItem from '@/Components/Menu/MenuItem'
 
 type Props = {
   application: WebApplication
   note: SNNote
-  className: string
   iconClassName: string
 }
 
-const ListedActionsOption: FunctionComponent<Props> = ({ application, note, className, iconClassName }) => {
+const ListedActionsOption: FunctionComponent<Props> = ({ application, note, iconClassName }) => {
   const menuContainerRef = useRef<HTMLDivElement>(null)
   const buttonRef = useRef<HTMLButtonElement>(null)
 
@@ -31,7 +31,8 @@ const ListedActionsOption: FunctionComponent<Props> = ({ application, note, clas
 
   return (
     <div ref={menuContainerRef}>
-      <button
+      <MenuItem
+        className="justify-between"
         onClick={toggleMenu}
         onKeyDown={(event) => {
           if (event.key === KeyboardKey.Escape) {
@@ -39,14 +40,13 @@ const ListedActionsOption: FunctionComponent<Props> = ({ application, note, clas
           }
         }}
         ref={buttonRef}
-        className={className}
       >
         <div className="flex items-center">
           <Icon type="listed" className={`mr-2 text-neutral ${iconClassName}`} />
           Listed actions
         </div>
         <Icon type="chevron-right" className="text-neutral" />
-      </button>
+      </MenuItem>
       <Popover
         togglePopover={toggleMenu}
         anchorElement={buttonRef.current}
diff --git a/packages/web/src/javascripts/Components/NotesOptions/NotesOptions.tsx b/packages/web/src/javascripts/Components/NotesOptions/NotesOptions.tsx
index fc8e8a948..03c734c9c 100644
--- a/packages/web/src/javascripts/Components/NotesOptions/NotesOptions.tsx
+++ b/packages/web/src/javascripts/Components/NotesOptions/NotesOptions.tsx
@@ -1,5 +1,4 @@
 import Icon from '@/Components/Icon/Icon'
-import Switch from '@/Components/Switch/Switch'
 import { observer } from 'mobx-react-lite'
 import { useState, useEffect, useMemo, useCallback } from 'react'
 import { NoteType, Platform, SNNote } from '@standardnotes/snjs'
@@ -22,7 +21,6 @@ import { getNoteBlob, getNoteFileName } from '@/Utils/NoteExportUtils'
 import { shareSelectedNotes } from '@/NativeMobileWeb/ShareSelectedNotes'
 import { downloadSelectedNotesOnAndroid } from '@/NativeMobileWeb/DownloadSelectedNotesOnAndroid'
 import ProtectedUnauthorizedLabel from '../ProtectedItemOverlay/ProtectedUnauthorizedLabel'
-import { classNames } from '@standardnotes/utils'
 import { MenuItemIconSize } from '@/Constants/TailwindClassNames'
 import { KeyboardShortcutIndicator } from '../KeyboardShortcutIndicator/KeyboardShortcutIndicator'
 import { NoteAttributes } from './NoteAttributes'
@@ -30,8 +28,10 @@ import { SpellcheckOptions } from './SpellcheckOptions'
 import { NoteSizeWarning } from './NoteSizeWarning'
 import { DeletePermanentlyButton } from './DeletePermanentlyButton'
 import { useCommandService } from '../ApplicationView/CommandProvider'
-import { menuItemClassNames, menuItemSwitchClassNames, iconClass } from './ClassNames'
+import { iconClass } from './ClassNames'
 import SuperNoteOptions from './SuperNoteOptions'
+import MenuSwitchButtonItem from '../Menu/MenuSwitchButtonItem'
+import MenuItem from '../Menu/MenuItem'
 
 const iconSize = MenuItemIconSize
 const iconClassDanger = `text-danger mr-2 ${iconSize}`
@@ -160,132 +160,94 @@ const NotesOptions = ({
     return <ProtectedUnauthorizedLabel />
   }
 
-  const firstItemClass = 'pt-4'
-
   return (
     <>
       {notes.length === 1 && (
         <>
-          <button className={classNames(menuItemClassNames, firstItemClass)} onClick={openRevisionHistoryModal}>
-            <div className="flex w-full items-center justify-between">
-              <span className="flex">
-                <Icon type="history" className={iconClass} />
-                Note history
-              </span>
-              {historyShortcut && <KeyboardShortcutIndicator className={''} shortcut={historyShortcut} />}
-            </div>
-          </button>
+          <MenuItem onClick={openRevisionHistoryModal}>
+            <Icon type="history" className={iconClass} />
+            Note history
+            {historyShortcut && <KeyboardShortcutIndicator className="ml-auto" shortcut={historyShortcut} />}
+          </MenuItem>
           <HorizontalSeparator classes="my-2" />
         </>
       )}
-      <button
-        className={menuItemSwitchClassNames}
-        onClick={() => {
-          notesController.setLockSelectedNotes(!locked)
+      <MenuSwitchButtonItem
+        checked={locked}
+        onChange={(locked) => {
+          notesController.setLockSelectedNotes(locked)
         }}
       >
-        <span className="flex items-center">
-          <Icon type="pencil-off" className={iconClass} />
-          Prevent editing
-        </span>
-        <Switch className="px-0" checked={locked} />
-      </button>
-      <button
-        className={menuItemSwitchClassNames}
-        onClick={() => {
+        <Icon type="pencil-off" className={iconClass} />
+        Prevent editing
+      </MenuSwitchButtonItem>
+      <MenuSwitchButtonItem
+        checked={!hidePreviews}
+        onChange={(hidePreviews) => {
           notesController.setHideSelectedNotePreviews(!hidePreviews)
         }}
       >
-        <span className="flex items-center">
-          <Icon type="rich-text" className={iconClass} />
-          Show preview
-        </span>
-        <Switch className="px-0" checked={!hidePreviews} />
-      </button>
-      <button
-        className={menuItemSwitchClassNames}
-        onClick={() => {
-          notesController.setProtectSelectedNotes(!protect).catch(console.error)
+        <Icon type="rich-text" className={iconClass} />
+        Show preview
+      </MenuSwitchButtonItem>
+      <MenuSwitchButtonItem
+        checked={protect}
+        onChange={(protect) => {
+          notesController.setProtectSelectedNotes(protect).catch(console.error)
         }}
       >
-        <span className="flex items-center">
-          <Icon type="lock" className={iconClass} />
-          Password protect
-        </span>
-        <Switch className="px-0" checked={protect} />
-      </button>
+        <Icon type="lock" className={iconClass} />
+        Password protect
+      </MenuSwitchButtonItem>
       {notes.length === 1 && (
         <>
           <HorizontalSeparator classes="my-2" />
-          <ChangeEditorOption
-            iconClassName={iconClass}
-            className={menuItemSwitchClassNames}
-            application={application}
-            note={notes[0]}
-          />
+          <ChangeEditorOption iconClassName={iconClass} application={application} note={notes[0]} />
         </>
       )}
       <HorizontalSeparator classes="my-2" />
       {navigationController.tagsCount > 0 && (
         <AddTagOption
           iconClassName={iconClass}
-          className={menuItemSwitchClassNames}
           navigationController={navigationController}
           notesController={notesController}
         />
       )}
-
-      <button
-        className={menuItemClassNames}
+      <MenuItem
         onClick={() => {
           notesController.setStarSelectedNotes(!starred)
         }}
       >
-        <div className="flex w-full items-center justify-between">
-          <span className="flex">
-            <Icon type="star" className={iconClass} />
-            {starred ? 'Unstar' : 'Star'}
-          </span>
-          {starShortcut && <KeyboardShortcutIndicator className={''} shortcut={starShortcut} />}
-        </div>
-      </button>
+        <Icon type="star" className={iconClass} />
+        {starred ? 'Unstar' : 'Star'}
+        {starShortcut && <KeyboardShortcutIndicator className="ml-auto" shortcut={starShortcut} />}
+      </MenuItem>
 
       {unpinned && (
-        <button
-          className={menuItemClassNames}
+        <MenuItem
           onClick={() => {
             notesController.setPinSelectedNotes(true)
           }}
         >
-          <div className="flex w-full items-center justify-between">
-            <span className="flex">
-              <Icon type="pin" className={iconClass} />
-              Pin to top
-            </span>
-            {pinShortcut && <KeyboardShortcutIndicator className={''} shortcut={pinShortcut} />}
-          </div>
-        </button>
+          <Icon type="pin" className={iconClass} />
+          Pin to top
+          {pinShortcut && <KeyboardShortcutIndicator className="ml-auto" shortcut={pinShortcut} />}
+        </MenuItem>
       )}
       {pinned && (
-        <button
-          className={menuItemClassNames}
+        <MenuItem
           onClick={() => {
             notesController.setPinSelectedNotes(false)
           }}
         >
-          <div className="flex w-full items-center justify-between">
-            <span className="flex">
-              <Icon type="unpin" className={iconClass} />
-              Unpin
-            </span>
-            {pinShortcut && <KeyboardShortcutIndicator className={''} shortcut={pinShortcut} />}
-          </div>
-        </button>
+          <Icon type="unpin" className={iconClass} />
+          Unpin
+          {pinShortcut && <KeyboardShortcutIndicator className="ml-auto" shortcut={pinShortcut} />}
+        </MenuItem>
       )}
       {notes[0].noteType !== NoteType.Super && (
         <>
-          <button
-            className={menuItemClassNames}
+          <MenuItem
             onClick={() => {
               application.isNativeMobileWeb()
                 ? void shareSelectedNotes(application, notes)
@@ -294,22 +256,21 @@ const NotesOptions = ({
           >
             <Icon type={application.platform === Platform.Android ? 'share' : 'download'} className={iconClass} />
             {application.platform === Platform.Android ? 'Share' : 'Export'}
-          </button>
+          </MenuItem>
           {application.platform === Platform.Android && (
-            <button className={menuItemClassNames} onClick={() => downloadSelectedNotesOnAndroid(application, notes)}>
+            <MenuItem onClick={() => downloadSelectedNotesOnAndroid(application, notes)}>
               <Icon type="download" className={iconClass} />
               Export
-            </button>
+            </MenuItem>
           )}
         </>
       )}
-      <button className={menuItemClassNames} onClick={duplicateSelectedItems}>
+      <MenuItem onClick={duplicateSelectedItems}>
         <Icon type="copy" className={iconClass} />
         Duplicate
-      </button>
+      </MenuItem>
       {unarchived && (
-        <button
-          className={menuItemClassNames}
+        <MenuItem
           onClick={async () => {
             await notesController.setArchiveSelectedNotes(true).catch(console.error)
             closeMenuAndToggleNotesList()
@@ -317,11 +278,10 @@ const NotesOptions = ({
         >
           <Icon type="archive" className={iconClassWarning} />
           <span className="text-warning">Archive</span>
-        </button>
+        </MenuItem>
       )}
       {archived && (
-        <button
-          className={menuItemClassNames}
+        <MenuItem
           onClick={async () => {
             await notesController.setArchiveSelectedNotes(false).catch(console.error)
             closeMenuAndToggleNotesList()
@@ -329,7 +289,7 @@ const NotesOptions = ({
         >
           <Icon type="unarchive" className={iconClassWarning} />
           <span className="text-warning">Unarchive</span>
-        </button>
+        </MenuItem>
       )}
       {notTrashed &&
         (altKeyDown ? (
@@ -340,8 +300,7 @@ const NotesOptions = ({
             }}
           />
         ) : (
-          <button
-            className={menuItemClassNames}
+          <MenuItem
             onClick={async () => {
               await notesController.setTrashSelectedNotes(true)
               closeMenuAndToggleNotesList()
@@ -349,12 +308,11 @@ const NotesOptions = ({
           >
             <Icon type="trash" className={iconClassDanger} />
             <span className="text-danger">Move to trash</span>
-          </button>
+          </MenuItem>
         ))}
       {trashed && (
         <>
-          <button
-            className={menuItemClassNames}
+          <MenuItem
             onClick={async () => {
               await notesController.setTrashSelectedNotes(false)
               closeMenuAndToggleNotesList()
@@ -362,15 +320,14 @@ const NotesOptions = ({
           >
             <Icon type="restore" className={iconClassSuccess} />
             <span className="text-success">Restore</span>
-          </button>
+          </MenuItem>
           <DeletePermanentlyButton
             onClick={async () => {
               await notesController.deleteNotesPermanently()
               closeMenuAndToggleNotesList()
             }}
           />
-          <button
-            className={menuItemClassNames}
+          <MenuItem
             onClick={async () => {
               await notesController.emptyTrash()
               closeMenuAndToggleNotesList()
@@ -383,7 +340,7 @@ const NotesOptions = ({
                 <div className="text-xs">{notesController.trashedNotesCount} notes in Trash</div>
               </div>
             </div>
-          </button>
+          </MenuItem>
         </>
       )}
 
@@ -398,21 +355,11 @@ const NotesOptions = ({
           )}
           <HorizontalSeparator classes="my-2" />
 
-          <ListedActionsOption
-            iconClassName={iconClass}
-            className={menuItemSwitchClassNames}
-            application={application}
-            note={notes[0]}
-          />
+          <ListedActionsOption iconClassName={iconClass} application={application} note={notes[0]} />
 
           <HorizontalSeparator classes="my-2" />
 
-          <SpellcheckOptions
-            className={menuItemSwitchClassNames}
-            editorForNote={editorForNote}
-            notesController={notesController}
-            note={notes[0]}
-          />
+          <SpellcheckOptions editorForNote={editorForNote} notesController={notesController} note={notes[0]} />
 
           <HorizontalSeparator classes="my-2" />
 
diff --git a/packages/web/src/javascripts/Components/NotesOptions/NotesOptionsPanel.tsx b/packages/web/src/javascripts/Components/NotesOptions/NotesOptionsPanel.tsx
index 86e067952..89305bb67 100644
--- a/packages/web/src/javascripts/Components/NotesOptions/NotesOptionsPanel.tsx
+++ b/packages/web/src/javascripts/Components/NotesOptions/NotesOptionsPanel.tsx
@@ -8,6 +8,7 @@ import { HistoryModalController } from '@/Controllers/NoteHistory/HistoryModalCo
 import Popover from '../Popover/Popover'
 import { LinkingController } from '@/Controllers/LinkingController'
 import RoundIconButton from '../Button/RoundIconButton'
+import Menu from '../Menu/Menu'
 
 type Props = {
   application: WebApplication
@@ -50,17 +51,19 @@ const NotesOptionsPanel = ({
         togglePopover={toggleMenu}
         anchorElement={buttonRef.current}
         open={isOpen}
-        className="select-none"
+        className="select-none md:pt-2"
       >
-        <NotesOptions
-          application={application}
-          navigationController={navigationController}
-          notesController={notesController}
-          linkingController={linkingController}
-          historyModalController={historyModalController}
-          requestDisableClickOutside={handleDisableClickOutsideRequest}
-          closeMenu={toggleMenu}
-        />
+        <Menu a11yLabel="Note options menu" isOpen={isOpen}>
+          <NotesOptions
+            application={application}
+            navigationController={navigationController}
+            notesController={notesController}
+            linkingController={linkingController}
+            historyModalController={historyModalController}
+            requestDisableClickOutside={handleDisableClickOutsideRequest}
+            closeMenu={toggleMenu}
+          />
+        </Menu>
       </Popover>
     </>
   )
diff --git a/packages/web/src/javascripts/Components/NotesOptions/SpellcheckOptions.tsx b/packages/web/src/javascripts/Components/NotesOptions/SpellcheckOptions.tsx
index d3f915477..cbd918871 100644
--- a/packages/web/src/javascripts/Components/NotesOptions/SpellcheckOptions.tsx
+++ b/packages/web/src/javascripts/Components/NotesOptions/SpellcheckOptions.tsx
@@ -1,16 +1,15 @@
 import Icon from '@/Components/Icon/Icon'
-import Switch from '@/Components/Switch/Switch'
 import { FunctionComponent } from 'react'
 import { SNComponent, SNNote } from '@standardnotes/snjs'
 import { NotesController } from '@/Controllers/NotesController/NotesController'
 import { iconClass } from './ClassNames'
+import MenuSwitchButtonItem from '../Menu/MenuSwitchButtonItem'
 
 export const SpellcheckOptions: FunctionComponent<{
   editorForNote: SNComponent | undefined
   notesController: NotesController
   note: SNNote
-  className: string
-}> = ({ editorForNote, notesController, note, className }) => {
+}> = ({ editorForNote, notesController, note }) => {
   const spellcheckControllable = Boolean(!editorForNote || editorForNote.package_info.spellcheckControl)
   const noteSpellcheck = !spellcheckControllable
     ? true
@@ -20,19 +19,16 @@ export const SpellcheckOptions: FunctionComponent<{
 
   return (
     <div className="flex flex-col">
-      <button
-        className={className}
-        onClick={() => {
+      <MenuSwitchButtonItem
+        checked={Boolean(noteSpellcheck)}
+        onChange={() => {
           notesController.toggleGlobalSpellcheckForNote(note).catch(console.error)
         }}
         disabled={!spellcheckControllable}
       >
-        <span className="flex items-center">
-          <Icon type="notes" className={iconClass} />
-          Spellcheck
-        </span>
-        <Switch className="px-0" checked={noteSpellcheck} disabled={!spellcheckControllable} />
-      </button>
+        <Icon type="notes" className={iconClass} />
+        Spellcheck
+      </MenuSwitchButtonItem>
       {!spellcheckControllable && (
         <p className="px-3 py-1.5 text-xs">Spellcheck cannot be controlled for this editor.</p>
       )}
diff --git a/packages/web/src/javascripts/Components/NotesOptions/SuperNoteOptions.tsx b/packages/web/src/javascripts/Components/NotesOptions/SuperNoteOptions.tsx
index 3d10d1b10..e9b24421d 100644
--- a/packages/web/src/javascripts/Components/NotesOptions/SuperNoteOptions.tsx
+++ b/packages/web/src/javascripts/Components/NotesOptions/SuperNoteOptions.tsx
@@ -13,7 +13,7 @@ import Menu from '../Menu/Menu'
 import MenuItem from '../Menu/MenuItem'
 import Popover from '../Popover/Popover'
 import HorizontalSeparator from '../Shared/HorizontalSeparator'
-import { iconClass, menuItemClassNames, menuItemSwitchClassNames } from './ClassNames'
+import { iconClass } from './ClassNames'
 
 type Props = {
   note: SNNote
@@ -33,19 +33,14 @@ const SuperNoteOptions = ({ note, markdownShortcut, enableSuperMarkdownPreview }
 
       <div className="my-1 px-3 text-base font-semibold uppercase text-text lg:text-xs">Super</div>
 
-      <button className={menuItemClassNames} onClick={enableSuperMarkdownPreview}>
-        <div className="flex w-full items-center justify-between">
-          <span className="flex">
-            <Icon type="markdown" className={iconClass} />
-            Show Markdown
-          </span>
-          {markdownShortcut && <KeyboardShortcutIndicator shortcut={markdownShortcut} />}
-        </div>
-      </button>
+      <MenuItem onClick={enableSuperMarkdownPreview}>
+        <Icon type="markdown" className={iconClass} />
+        Show Markdown
+        {markdownShortcut && <KeyboardShortcutIndicator className="ml-auto" shortcut={markdownShortcut} />}
+      </MenuItem>
 
-      <button
+      <MenuItem
         ref={exportButtonRef}
-        className={menuItemSwitchClassNames}
         onClick={() => {
           setIsExportMenuOpen((open) => !open)
         }}
@@ -54,8 +49,8 @@ const SuperNoteOptions = ({ note, markdownShortcut, enableSuperMarkdownPreview }
           <Icon type="download" className={iconClass} />
           Export
         </div>
-        <Icon type="chevron-right" className="text-neutral" />
-      </button>
+        <Icon type="chevron-right" className="ml-auto text-neutral" />
+      </MenuItem>
       <Popover
         side="left"
         align="start"
diff --git a/packages/web/src/javascripts/Components/QuickSettingsMenu/PanelSettingsSection.tsx b/packages/web/src/javascripts/Components/QuickSettingsMenu/PanelSettingsSection.tsx
index 60a13fc7e..4e3dcf0ba 100644
--- a/packages/web/src/javascripts/Components/QuickSettingsMenu/PanelSettingsSection.tsx
+++ b/packages/web/src/javascripts/Components/QuickSettingsMenu/PanelSettingsSection.tsx
@@ -1,10 +1,9 @@
 import { TOGGLE_LIST_PANE_KEYBOARD_COMMAND, TOGGLE_NAVIGATION_PANE_KEYBOARD_COMMAND } from '@standardnotes/ui-services'
 import { useMemo } from 'react'
-import MenuItem from '../Menu/MenuItem'
-import { MenuItemType } from '../Menu/MenuItemType'
 import { observer } from 'mobx-react-lite'
 import { useResponsiveAppPane } from '../ResponsivePane/ResponsivePaneProvider'
 import { useCommandService } from '../ApplicationView/CommandProvider'
+import MenuSwitchButtonItem from '../Menu/MenuSwitchButtonItem'
 
 const PanelSettingsSection = () => {
   const { isListPaneCollapsed, isNavigationPaneCollapsed, toggleListPane, toggleNavigationPane } =
@@ -24,24 +23,22 @@ const PanelSettingsSection = () => {
 
   return (
     <div className="hidden md:block pointer-coarse:md-only:hidden pointer-coarse:lg-only:hidden">
-      <MenuItem
-        type={MenuItemType.SwitchButton}
+      <MenuSwitchButtonItem
         className="py-1 hover:bg-contrast focus:bg-info-backdrop"
         checked={isNavigationPaneCollapsed}
         onChange={toggleNavigationPane}
         shortcut={navigationShortcut}
       >
         Show Tags Panel
-      </MenuItem>
-      <MenuItem
-        type={MenuItemType.SwitchButton}
+      </MenuSwitchButtonItem>
+      <MenuSwitchButtonItem
         className="py-1 hover:bg-contrast focus:bg-info-backdrop"
         checked={isListPaneCollapsed}
         onChange={toggleListPane}
         shortcut={listShortcut}
       >
         Show Notes Panel
-      </MenuItem>
+      </MenuSwitchButtonItem>
     </div>
   )
 }
diff --git a/packages/web/src/javascripts/Components/Tags/TagContextMenu.tsx b/packages/web/src/javascripts/Components/Tags/TagContextMenu.tsx
index ef7f884f1..5f36e24f0 100644
--- a/packages/web/src/javascripts/Components/Tags/TagContextMenu.tsx
+++ b/packages/web/src/javascripts/Components/Tags/TagContextMenu.tsx
@@ -3,7 +3,6 @@ import { useCallback, useRef, useMemo } from 'react'
 import Icon from '@/Components/Icon/Icon'
 import Menu from '@/Components/Menu/Menu'
 import MenuItem from '@/Components/Menu/MenuItem'
-import { MenuItemType } from '@/Components/Menu/MenuItemType'
 import { usePremiumModal } from '@/Hooks/usePremiumModal'
 import { SNTag, VectorIconNameOrEmoji, DefaultTagIconName } from '@standardnotes/snjs'
 import { useCloseOnClickOutside } from '@/Hooks/useCloseOnClickOutside'
@@ -82,24 +81,24 @@ const TagContextMenu = ({ navigationController, isEntitledToFolders, selectedTag
             iconGridClassName="max-h-30"
           />
           <HorizontalSeparator classes="my-2" />
-          <MenuItem type={MenuItemType.IconButton} className={'justify-between py-1.5'} onClick={onClickStar}>
+          <MenuItem className={'justify-between py-1.5'} onClick={onClickStar}>
             <div className="flex items-center">
               <Icon type="star" className="mr-2 text-neutral" />
               {selectedTag.starred ? 'Unfavorite' : 'Favorite'}
             </div>
           </MenuItem>
-          <MenuItem type={MenuItemType.IconButton} className={'justify-between py-1.5'} onClick={onClickAddSubtag}>
+          <MenuItem className={'justify-between py-1.5'} onClick={onClickAddSubtag}>
             <div className="flex items-center">
               <Icon type="add" className="mr-2 text-neutral" />
               Add subtag
             </div>
             {!isEntitledToFolders && <Icon type={PremiumFeatureIconName} className={PremiumFeatureIconClass} />}
           </MenuItem>
-          <MenuItem type={MenuItemType.IconButton} className={'py-1.5'} onClick={onClickRename}>
+          <MenuItem className={'py-1.5'} onClick={onClickRename}>
             <Icon type="pencil-filled" className="mr-2 text-neutral" />
             Rename
           </MenuItem>
-          <MenuItem type={MenuItemType.IconButton} className={'py-1.5'} onClick={onClickDelete}>
+          <MenuItem className={'py-1.5'} onClick={onClickDelete}>
             <Icon type="trash" className="mr-2 text-danger" />
             <span className="text-danger">Delete</span>
           </MenuItem>