diff --git a/surfsense_web/components/editor/plugins/basic-marks-kit.tsx b/surfsense_web/components/editor/plugins/basic-marks-kit.tsx
index d2fe62817..4190efc29 100644
--- a/surfsense_web/components/editor/plugins/basic-marks-kit.tsx
+++ b/surfsense_web/components/editor/plugins/basic-marks-kit.tsx
@@ -5,7 +5,6 @@ import {
   CodePlugin,
   HighlightPlugin,
   ItalicPlugin,
-  KbdPlugin,
   StrikethroughPlugin,
   SubscriptPlugin,
   SuperscriptPlugin,
@@ -14,7 +13,6 @@ import {
 
 import { CodeLeaf } from '@/components/ui/code-node';
 import { HighlightLeaf } from '@/components/ui/highlight-node';
-import { KbdLeaf } from '@/components/ui/kbd-node';
 
 export const BasicMarksKit = [
   BoldPlugin,
@@ -37,5 +35,4 @@ export const BasicMarksKit = [
     node: { component: HighlightLeaf },
     shortcuts: { toggle: { keys: 'mod+shift+h' } },
   }),
-  KbdPlugin.withComponent(KbdLeaf),
 ];
diff --git a/surfsense_web/components/ui/fixed-toolbar-buttons.tsx b/surfsense_web/components/ui/fixed-toolbar-buttons.tsx
index 7fef1c443..c3b421a63 100644
--- a/surfsense_web/components/ui/fixed-toolbar-buttons.tsx
+++ b/surfsense_web/components/ui/fixed-toolbar-buttons.tsx
@@ -23,7 +23,6 @@ import { InsertToolbarButton } from './insert-toolbar-button';
 import { LinkToolbarButton } from './link-toolbar-button';
 import { MarkToolbarButton } from './mark-toolbar-button';
 import { ModeToolbarButton } from './mode-toolbar-button';
-import { MoreToolbarButton } from './more-toolbar-button';
 import { ToolbarButton, ToolbarGroup } from './toolbar';
 import { TurnIntoToolbarButton } from './turn-into-toolbar-button';
 
@@ -102,10 +101,6 @@ export function FixedToolbarButtons() {
             <LinkToolbarButton />
           </ToolbarGroup>
 
-          <ToolbarGroup>
-            <MoreToolbarButton />
-          </ToolbarGroup>
-
           {/* Save button — appears when in editing mode with unsaved changes */}
           {onSave && hasUnsavedChanges && (
             <ToolbarGroup>
diff --git a/surfsense_web/components/ui/floating-toolbar-buttons.tsx b/surfsense_web/components/ui/floating-toolbar-buttons.tsx
index 525ff5e2f..e819ee91c 100644
--- a/surfsense_web/components/ui/floating-toolbar-buttons.tsx
+++ b/surfsense_web/components/ui/floating-toolbar-buttons.tsx
@@ -14,7 +14,6 @@ import { useEditorReadOnly } from 'platejs/react';
 
 import { LinkToolbarButton } from './link-toolbar-button';
 import { MarkToolbarButton } from './mark-toolbar-button';
-import { MoreToolbarButton } from './more-toolbar-button';
 import { ToolbarGroup } from './toolbar';
 import { TurnIntoToolbarButton } from './turn-into-toolbar-button';
 
@@ -57,9 +56,6 @@ export function FloatingToolbarButtons() {
         <LinkToolbarButton />
       </ToolbarGroup>
 
-      <ToolbarGroup>
-        <MoreToolbarButton />
-      </ToolbarGroup>
     </>
   );
 }
diff --git a/surfsense_web/components/ui/insert-toolbar-button.tsx b/surfsense_web/components/ui/insert-toolbar-button.tsx
index 420d05b69..452110df5 100644
--- a/surfsense_web/components/ui/insert-toolbar-button.tsx
+++ b/surfsense_web/components/ui/insert-toolbar-button.tsx
@@ -19,6 +19,8 @@ import {
   QuoteIcon,
   RadicalIcon,
   SquareIcon,
+  SubscriptIcon,
+  SuperscriptIcon,
   TableIcon,
 } from 'lucide-react';
 import { KEYS } from 'platejs';
@@ -156,6 +158,28 @@ const groups: Group[] = [
       },
     })),
   },
+  {
+    group: 'Marks',
+    items: [
+      {
+        icon: <SuperscriptIcon />,
+        label: 'Superscript',
+        value: KEYS.sup,
+      },
+      {
+        icon: <SubscriptIcon />,
+        label: 'Subscript',
+        value: KEYS.sub,
+      },
+    ].map((item) => ({
+      ...item,
+      onSelect: (editor: PlateEditor, value: string) => {
+        editor.tf.toggleMark(value, {
+          remove: value === KEYS.sup ? KEYS.sub : KEYS.sup,
+        });
+      },
+    })),
+  },
 ];
 
 export function InsertToolbarButton(props: DropdownMenuProps) {
diff --git a/surfsense_web/components/ui/kbd-node.tsx b/surfsense_web/components/ui/kbd-node.tsx
deleted file mode 100644
index 65ca86d34..000000000
--- a/surfsense_web/components/ui/kbd-node.tsx
+++ /dev/null
@@ -1,19 +0,0 @@
-'use client';
-
-import * as React from 'react';
-
-import type { PlateLeafProps } from 'platejs/react';
-
-import { PlateLeaf } from 'platejs/react';
-
-export function KbdLeaf(props: PlateLeafProps) {
-  return (
-    <PlateLeaf
-      {...props}
-      as="kbd"
-      className="rounded border border-border bg-muted px-1.5 py-0.5 font-mono text-sm shadow-[rgba(255,_255,_255,_0.1)_0px_0.5px_0px_0px_inset,_rgb(248,_249,_250)_0px_1px_5px_0px_inset,_rgb(193,_200,_205)_0px_0px_0px_0.5px,_rgb(193,_200,_205)_0px_2px_1px_-1px,_rgb(193,_200,_205)_0px_1px_0px_0px] dark:shadow-[rgba(255,_255,_255,_0.1)_0px_0.5px_0px_0px_inset,_rgb(26,_29,_30)_0px_1px_5px_0px_inset,_rgb(76,_81,_85)_0px_0px_0px_0.5px,_rgb(76,_81,_85)_0px_2px_1px_-1px,_rgb(76,_81,_85)_0px_1px_0px_0px]"
-    >
-      {props.children}
-    </PlateLeaf>
-  );
-}
diff --git a/surfsense_web/components/ui/more-toolbar-button.tsx b/surfsense_web/components/ui/more-toolbar-button.tsx
deleted file mode 100644
index c24a242d7..000000000
--- a/surfsense_web/components/ui/more-toolbar-button.tsx
+++ /dev/null
@@ -1,108 +0,0 @@
-'use client';
-
-import * as React from 'react';
-
-import type { DropdownMenuProps } from '@radix-ui/react-dropdown-menu';
-
-import { insertInlineEquation } from '@platejs/math';
-import {
-  InfoIcon,
-  KeyboardIcon,
-  MoreHorizontalIcon,
-  RadicalIcon,
-  SubscriptIcon,
-  SuperscriptIcon,
-} from 'lucide-react';
-import { KEYS } from 'platejs';
-import { useEditorRef } from 'platejs/react';
-
-import {
-  DropdownMenu,
-  DropdownMenuContent,
-  DropdownMenuGroup,
-  DropdownMenuItem,
-  DropdownMenuTrigger,
-} from '@/components/ui/dropdown-menu';
-
-import { ToolbarButton } from './toolbar';
-
-export function MoreToolbarButton(props: DropdownMenuProps) {
-  const editor = useEditorRef();
-  const [open, setOpen] = React.useState(false);
-
-  return (
-    <DropdownMenu open={open} onOpenChange={setOpen} modal={false} {...props}>
-      <DropdownMenuTrigger asChild>
-        <ToolbarButton pressed={open} tooltip="Insert">
-          <MoreHorizontalIcon />
-        </ToolbarButton>
-      </DropdownMenuTrigger>
-
-      <DropdownMenuContent
-        className="ignore-click-outside/toolbar flex max-h-[500px] min-w-[180px] flex-col overflow-y-auto"
-        align="start"
-      >
-        <DropdownMenuGroup>
-          <DropdownMenuItem
-            onSelect={() => {
-              editor.tf.toggleMark(KEYS.kbd);
-              editor.tf.collapse({ edge: 'end' });
-              editor.tf.focus();
-            }}
-          >
-            <KeyboardIcon />
-            Keyboard input
-          </DropdownMenuItem>
-
-          <DropdownMenuItem
-            onSelect={() => {
-              editor.tf.toggleMark(KEYS.sup, {
-                remove: KEYS.sub,
-              });
-              editor.tf.focus();
-            }}
-          >
-            <SuperscriptIcon />
-            Superscript
-            {/* (⌘+,) */}
-          </DropdownMenuItem>
-          <DropdownMenuItem
-            onSelect={() => {
-              editor.tf.toggleMark(KEYS.sub, {
-                remove: KEYS.sup,
-              });
-              editor.tf.focus();
-            }}
-          >
-            <SubscriptIcon />
-            Subscript
-            {/* (⌘+.) */}
-          </DropdownMenuItem>
-
-          <DropdownMenuItem
-            onSelect={() => {
-              insertInlineEquation(editor);
-              editor.tf.focus();
-            }}
-          >
-            <RadicalIcon />
-            Equation
-          </DropdownMenuItem>
-
-          <DropdownMenuItem
-            onSelect={() => {
-              editor.tf.insertNodes(
-                editor.api.create.block({ type: KEYS.callout }),
-                { select: true }
-              );
-              editor.tf.focus();
-            }}
-          >
-            <InfoIcon />
-            Callout
-          </DropdownMenuItem>
-        </DropdownMenuGroup>
-      </DropdownMenuContent>
-    </DropdownMenu>
-  );
-}