diff --git a/qt/aqt/browser/browser.py b/qt/aqt/browser/browser.py
index b122e5240..9e42e70ec 100644
--- a/qt/aqt/browser/browser.py
+++ b/qt/aqt/browser/browser.py
@@ -386,13 +386,12 @@ class Browser(QMainWindow):
             editor._links["preview"] = lambda _editor: self.onTogglePreview()
             editor.web.eval(
                 f"""
-$editorToolbar.addButton({{
-    component: editorToolbar.LabelButton,
+$editorToolbar.addButton(editorToolbar.labelButton({{
     label: `{tr.actions_preview()}`,
     tooltip: `{tr.browsing_preview_selected_card(val=shortcut(preview_shortcut))}`,
     onClick: () => bridgeCommand("preview"),
     disables: false,
-}}, "notetype");
+}}), "notetype", -1);
 """
             )
 
diff --git a/qt/aqt/editor.py b/qt/aqt/editor.py
index 808cdf86c..1db017bb1 100644
--- a/qt/aqt/editor.py
+++ b/qt/aqt/editor.py
@@ -155,7 +155,7 @@ class Editor:
         gui_hooks.editor_did_init_left_buttons(lefttopbtns, self)
 
         lefttopbtns_defs = [
-            f"$editorToolbar.addButton({{ component: editorToolbar.RawButton, html: `{button}` }}, 'notetype');"
+            f"$editorToolbar.addButton(editorToolbar.rawButton({{ html: `{button}` }}), 'notetype', -1);"
             for button in lefttopbtns
         ]
         lefttopbtns_js = "\n".join(lefttopbtns_defs)
@@ -167,16 +167,16 @@ class Editor:
 
         righttopbtns_defs = "\n".join(
             [
-                f"{{ component: editorToolbar.RawButton, html: `{button}` }},"
+                f"editorToolbar.rawButton({{ html: `{button}` }}),"
                 for button in righttopbtns
             ]
         )
         righttopbtns_js = (
             f"""
-$editorToolbar.addButtonGroup({{
+$editorToolbar.addButton(editorToolbar.buttonGroup({{
   id: "addons",
-  buttons: [ {righttopbtns_defs} ]
-}});
+  items: [ {righttopbtns_defs} ]
+}}), -1);
 """
             if righttopbtns_defs
             else ""
@@ -1277,13 +1277,9 @@ gui_hooks.editor_will_munge_html.append(reverse_url_quoting)
 
 def set_cloze_button(editor: Editor) -> None:
     if editor.note.model()["type"] == MODEL_CLOZE:
-        editor.web.eval(
-            'document.getElementById("editorToolbar").showButton("template", "cloze"); '
-        )
+        editor.web.eval('$editorToolbar.showButton("template", "cloze"); ')
     else:
-        editor.web.eval(
-            'document.getElementById("editorToolbar").hideButton("template", "cloze"); '
-        )
+        editor.web.eval('$editorToolbar.hideButton("template", "cloze"); ')
 
 
 gui_hooks.editor_did_load_note.append(set_cloze_button)
diff --git a/ts/editor-toolbar/ButtonDropdown.d.ts b/ts/editor-toolbar/ButtonDropdown.d.ts
index ad869013e..2b3cdb70f 100644
--- a/ts/editor-toolbar/ButtonDropdown.d.ts
+++ b/ts/editor-toolbar/ButtonDropdown.d.ts
@@ -5,5 +5,5 @@ import type { ToolbarItem } from "./types";
 export interface ButtonDropdownProps {
     id: string;
     className?: string;
-    buttons: ToolbarItem[];
+    items: ToolbarItem[];
 }
diff --git a/ts/editor-toolbar/ButtonDropdown.svelte b/ts/editor-toolbar/ButtonDropdown.svelte
index 0db3df397..a1585c12f 100644
--- a/ts/editor-toolbar/ButtonDropdown.svelte
+++ b/ts/editor-toolbar/ButtonDropdown.svelte
@@ -10,10 +10,10 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     export let className = "";
 
     function extendClassName(className: string): string {
-        return `dropdown-menu btn-dropdown-menu py-1 mb-0 ${className}`;
+        return `dropdown-menu btn-dropdown-menu ${className}`;
     }
 
-    export let buttons: ToolbarItem[];
+    export let items: ToolbarItem[];
 </script>
 
 <style>
@@ -22,6 +22,10 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         background-color: var(--window-bg);
         border-color: var(--medium-border);
     }
+
+    :global(ul.btn-dropdown-menu.show) {
+        display: flex;
+    }
 </style>
 
-<ButtonGroup {id} className={extendClassName(className)} {buttons} />
+<ButtonGroup {id} className={extendClassName(className)} {items} />
diff --git a/ts/editor-toolbar/ButtonGroup.d.ts b/ts/editor-toolbar/ButtonGroup.d.ts
index e4a2d7ce5..f5f273e45 100644
--- a/ts/editor-toolbar/ButtonGroup.d.ts
+++ b/ts/editor-toolbar/ButtonGroup.d.ts
@@ -5,5 +5,6 @@ import type { ToolbarItem } from "./types";
 export interface ButtonGroupProps {
     id: string;
     className?: string;
-    buttons: ToolbarItem[];
+    items: ToolbarItem[];
+    fullWidth?: boolean;
 }
diff --git a/ts/editor-toolbar/ButtonGroup.svelte b/ts/editor-toolbar/ButtonGroup.svelte
index fc8130b7e..ad2101a19 100644
--- a/ts/editor-toolbar/ButtonGroup.svelte
+++ b/ts/editor-toolbar/ButtonGroup.svelte
@@ -9,7 +9,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
     export let id: string | undefined = undefined;
     export let className = "";
-    export let buttons: ToolbarItem[];
+    export let items: ToolbarItem[];
 
     function filterHidden({ hidden = false, ...props }) {
         return props;
@@ -26,19 +26,26 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         flex-wrap: var(--toolbar-wrap);
         overflow-y: auto;
 
-        padding-inline-start: 0;
-        margin: 0 0 calc(var(--toolbar-size) / 10);
-    }
+        padding: calc(var(--toolbar-size) / 10);
+        margin: 0;
 
-    .border-overlap-group {
-        :global(button),
-        :global(select) {
-            margin-left: -1px;
+        &.border-overlap-group {
+            :global(button),
+            :global(select) {
+                margin-left: -1px;
+            }
+        }
+
+        &.gap-group {
+            :global(button),
+            :global(select) {
+                margin-left: 1px;
+            }
         }
     }
 
     li {
-        display: inline-block;
+        display: contents;
 
         > :global(button),
         > :global(select) {
@@ -46,36 +53,31 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         }
 
         &:nth-child(1) {
-            margin-left: calc(var(--toolbar-size) / 7.5);
-
             > :global(button),
             > :global(select) {
-                /* default 0.25rem */
                 border-top-left-radius: calc(var(--toolbar-size) / 7.5);
                 border-bottom-left-radius: calc(var(--toolbar-size) / 7.5);
             }
         }
 
         &:nth-last-child(1) {
-            margin-right: calc(var(--toolbar-size) / 7.5);
-
             > :global(button),
             > :global(select) {
                 border-top-right-radius: calc(var(--toolbar-size) / 7.5);
                 border-bottom-right-radius: calc(var(--toolbar-size) / 7.5);
             }
         }
-
-        &.gap-item:not(:nth-child(1)) {
-            margin-left: 1px;
-        }
     }
 </style>
 
-<ul {id} class={className} class:border-overlap-group={!nightMode}>
-    {#each buttons as button}
+<ul
+    {id}
+    class={className}
+    class:border-overlap-group={!nightMode}
+    class:gap-group={nightMode}>
+    {#each items as button}
         {#if !button.hidden}
-            <li class:gap-item={nightMode}>
+            <li>
                 <svelte:component this={button.component} {...filterHidden(button)} />
             </li>
         {/if}
diff --git a/ts/editor-toolbar/DropdownMenu.d.ts b/ts/editor-toolbar/DropdownMenu.d.ts
index 9e43bc953..7d6b6fac9 100644
--- a/ts/editor-toolbar/DropdownMenu.d.ts
+++ b/ts/editor-toolbar/DropdownMenu.d.ts
@@ -4,5 +4,5 @@ import type { ToolbarItem } from "./types";
 
 export interface DropdownMenuProps {
     id: string;
-    menuItems: ToolbarItem[];
+    items: ToolbarItem[];
 }
diff --git a/ts/editor-toolbar/DropdownMenu.svelte b/ts/editor-toolbar/DropdownMenu.svelte
index 546b2d78f..f616dd0a5 100644
--- a/ts/editor-toolbar/DropdownMenu.svelte
+++ b/ts/editor-toolbar/DropdownMenu.svelte
@@ -3,12 +3,12 @@ Copyright: Ankitects Pty Ltd and contributors
 License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="typescript">
-    import type { DynamicSvelteComponent } from "sveltelib/dynamicComponent";
+    import type { ToolbarItem } from "./types";
     import { getContext } from "svelte";
     import { nightModeKey } from "./contextKeys";
 
     export let id: string;
-    export let menuItems: DynamicSvelteComponent[];
+    export let items: ToolbarItem[];
 
     const nightMode = getContext<boolean>(nightModeKey);
 </script>
@@ -27,7 +27,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 </style>
 
 <ul {id} class="dropdown-menu" class:night-mode={nightMode}>
-    {#each menuItems as menuItem}
+    {#each items as menuItem}
         <li>
             <svelte:component this={menuItem.component} {...menuItem} />
         </li>
diff --git a/ts/editor-toolbar/EditorToolbar.svelte b/ts/editor-toolbar/EditorToolbar.svelte
index 676fb260d..c11f6ee7f 100644
--- a/ts/editor-toolbar/EditorToolbar.svelte
+++ b/ts/editor-toolbar/EditorToolbar.svelte
@@ -19,16 +19,13 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
 <script lang="typescript">
     import type { Readable } from "svelte/store";
-    import type { ToolbarItem } from "./types";
+    import type { ToolbarItem, IterableToolbarItem } from "./types";
     import { setContext } from "svelte";
     import { disabledKey, nightModeKey } from "./contextKeys";
 
     import ButtonGroup from "./ButtonGroup.svelte";
-    import type { ButtonGroupProps } from "./ButtonGroup";
 
-    export let buttons: Readable<
-        (ToolbarItem<typeof ButtonGroup> & ButtonGroupProps)[]
-    >;
+    export let buttons: Readable<IterableToolbarItem[]>;
     export let menus: Readable<ToolbarItem[]>;
 
     $: _buttons = $buttons;
@@ -56,17 +53,6 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
         background: var(--bg-color);
         border-bottom: 1px solid var(--border);
-
-        /* Remove outermost marigns */
-        & > :global(ul) {
-            & > :global(li:nth-child(1)) {
-                margin-left: 0;
-            }
-
-            & > :global(li:nth-last-child(1)) {
-                margin-right: 0;
-            }
-        }
     }
 </style>
 
@@ -77,5 +63,5 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 </div>
 
 <nav {style}>
-    <ButtonGroup buttons={_buttons} className="mt-0" />
+    <ButtonGroup items={_buttons} className="p-0 mb-1" />
 </nav>
diff --git a/ts/editor-toolbar/SelectButton.d.ts b/ts/editor-toolbar/SelectButton.d.ts
new file mode 100644
index 000000000..d82ad0ab1
--- /dev/null
+++ b/ts/editor-toolbar/SelectButton.d.ts
@@ -0,0 +1,15 @@
+// Copyright: Ankitects Pty Ltd and contributors
+// License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
+export interface Option {
+    label: string;
+    value: string;
+    selected: boolean;
+}
+
+export interface SelectButtonProps {
+    id: string;
+    className?: string;
+    tooltip?: string;
+    disables: boolean;
+    options: Option[];
+}
diff --git a/ts/editor-toolbar/SelectButton.svelte b/ts/editor-toolbar/SelectButton.svelte
index 559ab8cfc..81afa44d8 100644
--- a/ts/editor-toolbar/SelectButton.svelte
+++ b/ts/editor-toolbar/SelectButton.svelte
@@ -4,16 +4,11 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="typescript">
     import type { Readable } from "svelte/store";
+    import type { Option } from "./SelectButton";
     import { onMount, createEventDispatcher, getContext } from "svelte";
     import { disabledKey } from "./contextKeys";
     import SelectOption from "./SelectOption.svelte";
 
-    interface Option {
-        label: string;
-        value: string;
-        selected: boolean;
-    }
-
     export let id: string;
     export let className = "";
     export let tooltip: string;
diff --git a/ts/editor-toolbar/WithLabel.d.ts b/ts/editor-toolbar/WithLabel.d.ts
new file mode 100644
index 000000000..0d0c98a14
--- /dev/null
+++ b/ts/editor-toolbar/WithLabel.d.ts
@@ -0,0 +1,11 @@
+// Copyright: Ankitects Pty Ltd and contributors
+// License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
+import type { ToolbarItem } from "./types";
+
+export interface WithLabelProps {
+    id?: string;
+    className?: string;
+
+    button: ToolbarItem;
+    label: string;
+}
diff --git a/ts/editor-toolbar/WithLabel.svelte b/ts/editor-toolbar/WithLabel.svelte
new file mode 100644
index 000000000..29544290a
--- /dev/null
+++ b/ts/editor-toolbar/WithLabel.svelte
@@ -0,0 +1,27 @@
+<!--
+Copyright: Ankitects Pty Ltd and contributors
+License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
+-->
+<script lang="typescript">
+    import type { ToolbarItem } from "./types";
+
+    export let id: string;
+    export let className = "";
+
+    export let label: string;
+    export let button: ToolbarItem;
+</script>
+
+<style lang="scss">
+    label {
+        display: flex;
+        padding: 0 calc(var(--toolbar-size) / 10);
+    }
+</style>
+
+<!-- svelte-ignore a11y-label-has-associated-control -->
+
+<label {id} class={className}>
+    <span class="me-1">{label}</span>
+    <svelte:component this={button.component} {...button} />
+</label>
diff --git a/ts/editor-toolbar/dynamicComponents.ts b/ts/editor-toolbar/dynamicComponents.ts
index 5774421b6..7fc623e8c 100644
--- a/ts/editor-toolbar/dynamicComponents.ts
+++ b/ts/editor-toolbar/dynamicComponents.ts
@@ -1,5 +1,6 @@
 // Copyright: Ankitects Pty Ltd and contributors
 // License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
+import RawButton from "./RawButton.svelte";
 import LabelButton from "./LabelButton.svelte";
 import type { LabelButtonProps } from "./LabelButton";
 import IconButton from "./IconButton.svelte";
@@ -8,6 +9,8 @@ import CommandIconButton from "./CommandIconButton.svelte";
 import type { CommandIconButtonProps } from "./CommandIconButton";
 import ColorPicker from "./ColorPicker.svelte";
 import type { ColorPickerProps } from "./ColorPicker";
+import SelectButton from "./SelectButton.svelte";
+import type { SelectButtonProps } from "./SelectButton";
 import ButtonGroup from "./ButtonGroup.svelte";
 import type { ButtonGroupProps } from "./ButtonGroup";
 
@@ -23,8 +26,14 @@ import type { WithDropdownMenuProps } from "./WithDropdownMenu";
 import WithShortcut from "./WithShortcut.svelte";
 import type { WithShortcutProps } from "./WithShortcut";
 
+import WithLabel from "./WithLabel.svelte";
+import type { WithLabelProps } from "./WithLabel";
+
 import { dynamicComponent } from "sveltelib/dynamicComponent";
 
+export const rawButton = dynamicComponent<typeof RawButton, { html: string }>(
+    RawButton
+);
 export const labelButton = dynamicComponent<typeof LabelButton, LabelButtonProps>(
     LabelButton
 );
@@ -38,6 +47,9 @@ export const commandIconButton = dynamicComponent<
 export const colorPicker = dynamicComponent<typeof ColorPicker, ColorPickerProps>(
     ColorPicker
 );
+export const selectButton = dynamicComponent<typeof SelectButton, SelectButtonProps>(
+    SelectButton
+);
 
 export const buttonGroup = dynamicComponent<typeof ButtonGroup, ButtonGroupProps>(
     ButtonGroup
@@ -62,3 +74,5 @@ export const withDropdownMenu = dynamicComponent<
 export const withShortcut = dynamicComponent<typeof WithShortcut, WithShortcutProps>(
     WithShortcut
 );
+
+export const withLabel = dynamicComponent<typeof WithLabel, WithLabelProps>(WithLabel);
diff --git a/ts/editor-toolbar/hideable.ts b/ts/editor-toolbar/hideable.ts
new file mode 100644
index 000000000..4df9af725
--- /dev/null
+++ b/ts/editor-toolbar/hideable.ts
@@ -0,0 +1,20 @@
+// Copyright: Ankitects Pty Ltd and contributors
+// License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
+interface Hideable {
+    hidden?: boolean;
+}
+
+export function showComponent<T extends Hideable>(component: T): T {
+    component.hidden = false;
+    return component;
+}
+
+export function hideComponent<T extends Hideable>(component: T): T {
+    component.hidden = true;
+    return component;
+}
+
+export function toggleComponent<T extends Hideable>(component: T): T {
+    component.hidden = !component.hidden;
+    return component;
+}
diff --git a/ts/editor-toolbar/identifiable.ts b/ts/editor-toolbar/identifiable.ts
index 154895bfc..f44015d19 100644
--- a/ts/editor-toolbar/identifiable.ts
+++ b/ts/editor-toolbar/identifiable.ts
@@ -4,43 +4,89 @@ export interface Identifiable {
     id?: string;
 }
 
-function normalize<T extends Identifiable>(
-    values: T[],
-    idOrIndex: string | number
-): number {
-    if (typeof idOrIndex === "string") {
-        return values.findIndex((value) => value.id === idOrIndex);
-    } else {
-        return idOrIndex >= values.length ? -1 : idOrIndex;
-    }
+interface IterableIdentifiable<T extends Identifiable> extends Identifiable {
+    items: T[];
 }
 
-export function search<T extends Identifiable>(
-    values: T[],
-    idOrIndex: string | number
-): T | null {
-    const index = normalize(values, idOrIndex);
+export type Identifier = string | number;
+
+function normalize<T extends Identifiable>(
+    iterable: IterableIdentifiable<T>,
+    idOrIndex: Identifier
+): number {
+    let normalizedIndex: number;
+
+    if (typeof idOrIndex === "string") {
+        normalizedIndex = iterable.items.findIndex((value) => value.id === idOrIndex);
+    } else if (idOrIndex < 0) {
+        normalizedIndex = iterable.items.length + idOrIndex;
+    } else {
+        normalizedIndex = idOrIndex;
+    }
+
+    return normalizedIndex >= iterable.items.length ? -1 : normalizedIndex;
+}
+
+function search<T extends Identifiable>(values: T[], index: number): T | null {
     return index >= 0 ? values[index] : null;
 }
 
 export function insert<T extends Identifiable>(
-    values: T[],
+    iterable: IterableIdentifiable<T> & T,
     value: T,
-    idOrIndex: string | number
-): T[] {
-    const index = normalize(values, idOrIndex);
-    return index >= 0
-        ? [...values.slice(0, index), value, ...values.slice(index)]
-        : values;
+    idOrIndex: Identifier
+): IterableIdentifiable<T> & T {
+    const index = normalize(iterable, idOrIndex);
+
+    if (index >= 0) {
+        iterable.items = iterable.items.slice();
+        iterable.items.splice(index, 0, value);
+    }
+
+    return iterable;
 }
 
 export function add<T extends Identifiable>(
-    values: T[],
+    iterable: IterableIdentifiable<T> & T,
     value: T,
-    idOrIndex: string | number
-): T[] {
-    const index = normalize(values, idOrIndex);
-    return index >= 0
-        ? [...values.slice(0, index + 1), value, ...values.slice(index + 1)]
-        : values;
+    idOrIndex: Identifier
+): IterableIdentifiable<T> & T {
+    const index = normalize(iterable, idOrIndex);
+
+    if (index >= 0) {
+        iterable.items = iterable.items.slice();
+        iterable.items.splice(index + 1, 0, value);
+    }
+
+    return iterable;
+}
+
+function isRecursive<T>(component: Identifiable): component is IterableIdentifiable<T> {
+    return Boolean(Object.prototype.hasOwnProperty.call(component, "items"));
+}
+
+export function updateRecursive<T extends Identifiable>(
+    update: (component: T) => T,
+    component: T,
+    ...identifiers: Identifier[]
+): T {
+    if (identifiers.length === 0) {
+        return update(component);
+    } else if (isRecursive<T>(component)) {
+        const [identifier, ...restIdentifiers] = identifiers;
+        const normalizedIndex = normalize(component, identifier);
+        const foundComponent = search(component.items, normalizedIndex);
+
+        if (foundComponent) {
+            component.items[normalizedIndex] = updateRecursive(
+                update,
+                foundComponent as T,
+                ...restIdentifiers
+            );
+        }
+
+        return component;
+    }
+
+    return component;
 }
diff --git a/ts/editor-toolbar/index.ts b/ts/editor-toolbar/index.ts
index e08cbe6db..0ff494251 100644
--- a/ts/editor-toolbar/index.ts
+++ b/ts/editor-toolbar/index.ts
@@ -1,54 +1,31 @@
 // Copyright: Ankitects Pty Ltd and contributors
 // License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
-import type { SvelteComponentDev } from "svelte/internal";
-import type { ToolbarItem } from "./types";
+import type { ToolbarItem, IterableToolbarItem } from "./types";
+import type { Identifier } from "./identifiable";
 
-import ButtonGroup from "./ButtonGroup.svelte";
-import type { ButtonGroupProps } from "./ButtonGroup";
-
-import { dynamicComponent } from "sveltelib/dynamicComponent";
 import { Writable, writable } from "svelte/store";
 
 import EditorToolbarSvelte from "./EditorToolbar.svelte";
 
 import "./bootstrap.css";
 
-import { Identifiable, search, add, insert } from "./identifiable";
+import { add, insert, updateRecursive } from "./identifiable";
+import { showComponent, hideComponent, toggleComponent } from "./hideable";
 
-interface Hideable {
-    hidden?: boolean;
-}
-
-function showComponent(component: Hideable): void {
-    component.hidden = false;
-}
-
-function hideComponent(component: Hideable): void {
-    component.hidden = true;
-}
-
-function toggleComponent(component: Hideable): void {
-    component.hidden = !component.hidden;
-}
-
-const buttonGroup = dynamicComponent<typeof ButtonGroup, ButtonGroupProps>(ButtonGroup);
-
-let buttonsResolve: (
-    value: Writable<(ToolbarItem<typeof ButtonGroup> & ButtonGroupProps)[]>
-) => void;
+let buttonsResolve: (value: Writable<IterableToolbarItem[]>) => void;
 let menusResolve: (value: Writable<ToolbarItem[]>) => void;
 
 export class EditorToolbar extends HTMLElement {
-    component?: SvelteComponentDev;
-
-    buttonsPromise: Promise<
-        Writable<(ToolbarItem<typeof ButtonGroup> & ButtonGroupProps)[]>
-    > = new Promise((resolve) => {
-        buttonsResolve = resolve;
-    });
-    menusPromise: Promise<Writable<ToolbarItem[]>> = new Promise((resolve): void => {
-        menusResolve = resolve;
-    });
+    private buttonsPromise: Promise<Writable<IterableToolbarItem[]>> = new Promise(
+        (resolve) => {
+            buttonsResolve = resolve;
+        }
+    );
+    private menusPromise: Promise<Writable<ToolbarItem[]>> = new Promise(
+        (resolve): void => {
+            menusResolve = resolve;
+        }
+    );
 
     connectedCallback(): void {
         globalThis.$editorToolbar = this;
@@ -56,7 +33,7 @@ export class EditorToolbar extends HTMLElement {
         const buttons = writable([]);
         const menus = writable([]);
 
-        this.component = new EditorToolbarSvelte({
+        new EditorToolbarSvelte({
             target: this,
             props: {
                 buttons,
@@ -69,117 +46,89 @@ export class EditorToolbar extends HTMLElement {
         menusResolve(menus);
     }
 
-    updateButtonGroup<T>(
-        update: (
-            component: ToolbarItem<typeof ButtonGroup> & ButtonGroupProps & T
-        ) => void,
-        group: string | number
-    ): void {
-        this.buttonsPromise.then((buttons) => {
-            buttons.update((buttonGroups) => {
-                const foundGroup = search(buttonGroups, group);
-
-                if (foundGroup) {
-                    update(
-                        foundGroup as ToolbarItem<typeof ButtonGroup> &
-                            ButtonGroupProps &
-                            T
-                    );
-                }
-
-                return buttonGroups;
-            });
-
-            return buttons;
-        });
-    }
-
-    showButtonGroup(group: string | number): void {
-        this.updateButtonGroup<Hideable>(showComponent, group);
-    }
-
-    hideButtonGroup(group: string | number): void {
-        this.updateButtonGroup<Hideable>(hideComponent, group);
-    }
-
-    toggleButtonGroup(group: string | number): void {
-        this.updateButtonGroup<Hideable>(toggleComponent, group);
-    }
-
-    insertButtonGroup(newGroup: ButtonGroupProps, group: string | number = 0): void {
-        this.buttonsPromise.then((buttons) => {
-            buttons.update((buttonGroups) => {
-                const newButtonGroup = buttonGroup(newGroup);
-                return insert(buttonGroups, newButtonGroup, group);
-            });
-
-            return buttons;
-        });
-    }
-
-    addButtonGroup(newGroup: ButtonGroupProps, group: string | number = -1): void {
-        this.buttonsPromise.then((buttons) => {
-            buttons.update((buttonGroups) => {
-                const newButtonGroup = buttonGroup(newGroup);
-                return add(buttonGroups, newButtonGroup, group);
-            });
-
-            return buttons;
-        });
-    }
-
     updateButton(
-        update: (component: ToolbarItem) => void,
-        group: string | number,
-        button: string | number
+        update: (component: ToolbarItem) => ToolbarItem,
+        ...identifiers: Identifier[]
     ): void {
-        this.updateButtonGroup((foundGroup) => {
-            const foundButton = search(foundGroup.buttons, button);
+        this.buttonsPromise.then(
+            (
+                buttons: Writable<IterableToolbarItem[]>
+            ): Writable<IterableToolbarItem[]> => {
+                buttons.update(
+                    (items: IterableToolbarItem[]): IterableToolbarItem[] =>
+                        updateRecursive(
+                            update,
+                            ({ items } as unknown) as ToolbarItem,
+                            ...identifiers
+                        ).items as IterableToolbarItem[]
+                );
 
-            if (foundButton) {
-                update(foundButton);
+                return buttons;
             }
-        }, group);
+        );
     }
 
-    showButton(group: string | number, button: string | number): void {
-        this.updateButton(showComponent, group, button);
+    showButton(...identifiers: Identifier[]): void {
+        this.updateButton(showComponent, ...identifiers);
     }
 
-    hideButton(group: string | number, button: string | number): void {
-        this.updateButton(hideComponent, group, button);
+    hideButton(...identifiers: Identifier[]): void {
+        this.updateButton(hideComponent, ...identifiers);
     }
 
-    toggleButton(group: string | number, button: string | number): void {
-        this.updateButton(toggleComponent, group, button);
+    toggleButton(...identifiers: Identifier[]): void {
+        this.updateButton(toggleComponent, ...identifiers);
     }
 
-    insertButton(
-        newButton: ToolbarItem & Identifiable,
-        group: string | number,
-        button: string | number = 0
+    insertButton(newButton: ToolbarItem, ...identifiers: Identifier[]): void {
+        const initIdentifiers = identifiers.slice(0, -1);
+        const lastIdentifier = identifiers[identifiers.length - 1];
+        this.updateButton(
+            (component: ToolbarItem) =>
+                insert(component as IterableToolbarItem, newButton, lastIdentifier),
+
+            ...initIdentifiers
+        );
+    }
+
+    addButton(newButton: ToolbarItem, ...identifiers: Identifier[]): void {
+        const initIdentifiers = identifiers.slice(0, -1);
+        const lastIdentifier = identifiers[identifiers.length - 1];
+        this.updateButton(
+            (component: ToolbarItem) =>
+                add(component as IterableToolbarItem, newButton, lastIdentifier),
+            ...initIdentifiers
+        );
+    }
+
+    updateMenu(
+        update: (component: ToolbarItem) => ToolbarItem,
+        ...identifiers: Identifier[]
     ): void {
-        this.updateButtonGroup((component) => {
-            component.buttons = insert(
-                component.buttons as (ToolbarItem & Identifiable)[],
-                newButton,
-                button
-            );
-        }, group);
+        this.menusPromise.then(
+            (menus: Writable<ToolbarItem[]>): Writable<ToolbarItem[]> => {
+                menus.update(
+                    (items: ToolbarItem[]): ToolbarItem[] =>
+                        updateRecursive(
+                            update,
+                            ({ items } as unknown) as ToolbarItem,
+                            ...identifiers
+                        ).items as ToolbarItem[]
+                );
+
+                return menus;
+            }
+        );
     }
 
-    addButton(
-        newButton: ToolbarItem & Identifiable,
-        group: string | number,
-        button: string | number = -1
-    ): void {
-        this.updateButtonGroup((component) => {
-            component.buttons = add(
-                component.buttons as (ToolbarItem & Identifiable)[],
-                newButton,
-                button
-            );
-        }, group);
+    addMenu(newMenu: ToolbarItem, ...identifiers: Identifier[]): void {
+        const initIdentifiers = identifiers.slice(0, -1);
+        const lastIdentifier = identifiers[identifiers.length - 1];
+        this.updateMenu(
+            (component: ToolbarItem) =>
+                add(component as IterableToolbarItem, newMenu, lastIdentifier),
+            ...initIdentifiers
+        );
     }
 }
 
diff --git a/ts/editor-toolbar/types.d.ts b/ts/editor-toolbar/types.ts
similarity index 50%
rename from ts/editor-toolbar/types.d.ts
rename to ts/editor-toolbar/types.ts
index a272d405d..ef4b39a31 100644
--- a/ts/editor-toolbar/types.d.ts
+++ b/ts/editor-toolbar/types.ts
@@ -3,8 +3,15 @@
 import type { DynamicSvelteComponent } from "sveltelib/dynamicComponent";
 import type { SvelteComponentDev } from "svelte/internal";
 
-interface ToolbarItem<T extends typeof SvelteComponentDev = typeof SvelteComponentDev>
-    extends DynamicSvelteComponent<T> {
+export interface ToolbarItem<
+    T extends typeof SvelteComponentDev = typeof SvelteComponentDev
+> extends DynamicSvelteComponent<T> {
     id?: string;
     hidden?: boolean;
 }
+
+export interface IterableToolbarItem<
+    T extends typeof SvelteComponentDev = typeof SvelteComponentDev
+> extends ToolbarItem<T> {
+    items: ToolbarItem[];
+}
diff --git a/ts/editor/addons.ts b/ts/editor/addons.ts
index 4cd3af6be..6fef47af0 100644
--- a/ts/editor/addons.ts
+++ b/ts/editor/addons.ts
@@ -1,24 +1,35 @@
 // Copyright: Ankitects Pty Ltd and contributors
 // License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
-import { default as RawButton } from "editor-toolbar/RawButton.svelte";
-import { default as LabelButton } from "editor-toolbar/LabelButton.svelte";
-import { default as IconButton } from "editor-toolbar/IconButton.svelte";
-import { default as CommandIconButton } from "editor-toolbar/CommandIconButton.svelte";
-import { default as SelectButton } from "editor-toolbar/SelectButton.svelte";
+import type { DynamicSvelteComponent } from "sveltelib/dynamicComponent";
 
-import { default as DropdownMenu } from "editor-toolbar/DropdownMenu.svelte";
-import { default as DropdownItem } from "editor-toolbar/DropdownItem.svelte";
-import { default as ButtonDropdown } from "editor-toolbar/DropdownMenu.svelte";
-import { default as WithDropdownMenu } from "editor-toolbar/WithDropdownMenu.svelte";
+import {
+    buttonGroup,
+    rawButton,
+    labelButton,
+    iconButton,
+    commandIconButton,
+    selectButton,
+    dropdownMenu,
+    dropdownItem,
+    buttonDropdown,
+    withDropdownMenu,
+    withLabel,
+} from "editor-toolbar/dynamicComponents";
 
-export const editorToolbar = {
-    RawButton,
-    LabelButton,
-    IconButton,
-    CommandIconButton,
-    SelectButton,
-    DropdownMenu,
-    DropdownItem,
-    ButtonDropdown,
-    WithDropdownMenu,
+export const editorToolbar: Record<
+    string,
+    (props: Record<string, unknown>) => DynamicSvelteComponent
+> = {
+    buttonGroup,
+    rawButton,
+    labelButton,
+    iconButton,
+    commandIconButton,
+    selectButton,
+
+    dropdownMenu,
+    dropdownItem,
+    buttonDropdown,
+    withDropdownMenu,
+    withLabel,
 };
diff --git a/ts/editor/cloze.ts b/ts/editor/cloze.ts
index 055c3fb25..4de47c97c 100644
--- a/ts/editor/cloze.ts
+++ b/ts/editor/cloze.ts
@@ -1,8 +1,6 @@
 // Copyright: Ankitects Pty Ltd and contributors
 // License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
-import type WithShortcut from "editor-toolbar/WithShortcut.svelte";
-import type { WithShortcutProps } from "editor-toolbar/WithShortcut";
-import type { DynamicSvelteComponent } from "sveltelib/dynamicComponent";
+import type { ToolbarItem } from "editor-toolbar/types";
 
 import * as tr from "lib/i18n";
 import { iconButton, withShortcut } from "editor-toolbar/dynamicComponents";
@@ -40,8 +38,7 @@ function onCloze(event: KeyboardEvent | MouseEvent): void {
     wrap(`{{c${highestCloze}::`, "}}");
 }
 
-export function getClozeButton(): DynamicSvelteComponent<typeof WithShortcut> &
-    WithShortcutProps {
+export function getClozeButton(): ToolbarItem {
     return withShortcut({
         id: "cloze",
         shortcut: "Control+Shift+KeyC",
diff --git a/ts/editor/color.ts b/ts/editor/color.ts
index eb615258e..4923b8403 100644
--- a/ts/editor/color.ts
+++ b/ts/editor/color.ts
@@ -1,8 +1,6 @@
 // Copyright: Ankitects Pty Ltd and contributors
 // License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
-import type ButtonGroup from "editor-toolbar/ButtonGroup.svelte";
-import type { ButtonGroupProps } from "editor-toolbar/ButtonGroup";
-import type { DynamicSvelteComponent } from "sveltelib/dynamicComponent";
+import type { IterableToolbarItem } from "editor-toolbar/types";
 
 import {
     iconButton,
@@ -29,8 +27,7 @@ function wrapWithForecolor(color: string): void {
     document.execCommand("forecolor", false, color);
 }
 
-export function getColorGroup(): DynamicSvelteComponent<typeof ButtonGroup> &
-    ButtonGroupProps {
+export function getColorGroup(): IterableToolbarItem {
     const forecolorButton = withShortcut({
         shortcut: "F7",
         button: iconButton({
@@ -52,6 +49,6 @@ export function getColorGroup(): DynamicSvelteComponent<typeof ButtonGroup> &
 
     return buttonGroup({
         id: "color",
-        buttons: [forecolorButton, colorpickerButton],
+        items: [forecolorButton, colorpickerButton],
     });
 }
diff --git a/ts/editor/fields.scss b/ts/editor/fields.scss
index b8745c982..cdc64d079 100644
--- a/ts/editor/fields.scss
+++ b/ts/editor/fields.scss
@@ -59,3 +59,7 @@
         opacity: 0.5;
     }
 }
+
+.flex-basis-100 {
+    flex-basis: 100%;
+}
diff --git a/ts/editor/formatBlock.ts b/ts/editor/formatBlock.ts
index 192fd4759..e65c65572 100644
--- a/ts/editor/formatBlock.ts
+++ b/ts/editor/formatBlock.ts
@@ -1,11 +1,6 @@
 // Copyright: Ankitects Pty Ltd and contributors
 // License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
-import type ButtonGroup from "editor-toolbar/ButtonGroup.svelte";
-import type { ButtonGroupProps } from "editor-toolbar/ButtonGroup";
-import type ButtonDropdown from "editor-toolbar/ButtonDropdown.svelte";
-import type { ButtonDropdownProps } from "editor-toolbar/ButtonDropdown";
-import type { DynamicSvelteComponent } from "sveltelib/dynamicComponent";
-
+import type { IterableToolbarItem } from "editor-toolbar/types";
 import type { EditingArea } from "./editingArea";
 
 import * as tr from "lib/i18n";
@@ -45,8 +40,7 @@ const indentListItem = () => {
     }
 };
 
-export function getFormatBlockMenus(): (DynamicSvelteComponent<typeof ButtonDropdown> &
-    ButtonDropdownProps)[] {
+export function getFormatBlockMenus(): IterableToolbarItem[] {
     const justifyLeftButton = commandIconButton({
         icon: justifyLeftIcon,
         command: "justifyLeft",
@@ -73,7 +67,7 @@ export function getFormatBlockMenus(): (DynamicSvelteComponent<typeof ButtonDrop
 
     const justifyGroup = buttonGroup({
         id: "justify",
-        buttons: [
+        items: [
             justifyLeftButton,
             justifyCenterButton,
             justifyRightButton,
@@ -95,19 +89,18 @@ export function getFormatBlockMenus(): (DynamicSvelteComponent<typeof ButtonDrop
 
     const indentationGroup = buttonGroup({
         id: "indentation",
-        buttons: [outdentButton, indentButton],
+        items: [outdentButton, indentButton],
     });
 
     const formattingOptions = buttonDropdown({
         id: "listFormatting",
-        buttons: [justifyGroup, indentationGroup],
+        items: [justifyGroup, indentationGroup],
     });
 
     return [formattingOptions];
 }
 
-export function getFormatBlockGroup(): DynamicSvelteComponent<typeof ButtonGroup> &
-    ButtonGroupProps {
+export function getFormatBlockGroup(): IterableToolbarItem {
     const ulButton = commandIconButton({
         icon: ulIcon,
         command: "insertUnorderedList",
@@ -131,6 +124,6 @@ export function getFormatBlockGroup(): DynamicSvelteComponent<typeof ButtonGroup
 
     return buttonGroup({
         id: "blockFormatting",
-        buttons: [ulButton, olButton, listFormatting],
+        items: [ulButton, olButton, listFormatting],
     });
 }
diff --git a/ts/editor/formatInline.ts b/ts/editor/formatInline.ts
index f8ed9fb27..280053d60 100644
--- a/ts/editor/formatInline.ts
+++ b/ts/editor/formatInline.ts
@@ -1,8 +1,6 @@
 // Copyright: Ankitects Pty Ltd and contributors
 // License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
-import type ButtonGroup from "editor-toolbar/ButtonGroup.svelte";
-import type { ButtonGroupProps } from "editor-toolbar/ButtonGroup";
-import type { DynamicSvelteComponent } from "sveltelib/dynamicComponent";
+import type { IterableToolbarItem } from "editor-toolbar/types";
 
 import * as tr from "lib/i18n";
 import {
@@ -19,8 +17,7 @@ import superscriptIcon from "./format-superscript.svg";
 import subscriptIcon from "./format-subscript.svg";
 import eraserIcon from "./eraser.svg";
 
-export function getFormatInlineGroup(): DynamicSvelteComponent<typeof ButtonGroup> &
-    ButtonGroupProps {
+export function getFormatInlineGroup(): IterableToolbarItem {
     const boldButton = withShortcut({
         shortcut: "Control+KeyB",
         button: commandIconButton({
@@ -79,7 +76,7 @@ export function getFormatInlineGroup(): DynamicSvelteComponent<typeof ButtonGrou
 
     return buttonGroup({
         id: "inlineFormatting",
-        buttons: [
+        items: [
             boldButton,
             italicButton,
             underlineButton,
diff --git a/ts/editor/notetype.ts b/ts/editor/notetype.ts
index ac503da86..fe570a8a1 100644
--- a/ts/editor/notetype.ts
+++ b/ts/editor/notetype.ts
@@ -1,8 +1,6 @@
 // Copyright: Ankitects Pty Ltd and contributors
 // License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
-import type ButtonGroup from "editor-toolbar/ButtonGroup.svelte";
-import type { ButtonGroupProps } from "editor-toolbar/ButtonGroup";
-import type { DynamicSvelteComponent } from "sveltelib/dynamicComponent";
+import type { IterableToolbarItem } from "editor-toolbar/types";
 
 import { bridgeCommand } from "lib/bridgecommand";
 import * as tr from "lib/i18n";
@@ -12,8 +10,7 @@ import {
     withShortcut,
 } from "editor-toolbar/dynamicComponents";
 
-export function getNotetypeGroup(): DynamicSvelteComponent<typeof ButtonGroup> &
-    ButtonGroupProps {
+export function getNotetypeGroup(): IterableToolbarItem {
     const fieldsButton = labelButton({
         onClick: () => bridgeCommand("fields"),
         disables: false,
@@ -33,6 +30,6 @@ export function getNotetypeGroup(): DynamicSvelteComponent<typeof ButtonGroup> &
 
     return buttonGroup({
         id: "notetype",
-        buttons: [fieldsButton, cardsButton],
+        items: [fieldsButton, cardsButton],
     });
 }
diff --git a/ts/editor/template.ts b/ts/editor/template.ts
index ffee8f1db..f43e1f677 100644
--- a/ts/editor/template.ts
+++ b/ts/editor/template.ts
@@ -1,10 +1,6 @@
 // Copyright: Ankitects Pty Ltd and contributors
 // License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
-import type DropdownMenu from "editor-toolbar/DropdownMenu.svelte";
-import type { DropdownMenuProps } from "editor-toolbar/DropdownMenu";
-import type ButtonGroup from "editor-toolbar/ButtonGroup.svelte";
-import type { ButtonGroupProps } from "editor-toolbar/ButtonGroup";
-import type { DynamicSvelteComponent } from "sveltelib/dynamicComponent";
+import type { IterableToolbarItem } from "editor-toolbar/types";
 
 import { bridgeCommand } from "lib/bridgecommand";
 import {
@@ -40,8 +36,7 @@ function onHtmlEdit(): void {
 
 const mathjaxMenuId = "mathjaxMenu";
 
-export function getTemplateGroup(): DynamicSvelteComponent<typeof ButtonGroup> &
-    ButtonGroupProps {
+export function getTemplateGroup(): IterableToolbarItem {
     const attachmentButton = withShortcut({
         shortcut: "F3",
         button: iconButton({
@@ -80,7 +75,7 @@ export function getTemplateGroup(): DynamicSvelteComponent<typeof ButtonGroup> &
 
     return buttonGroup({
         id: "template",
-        buttons: [
+        items: [
             attachmentButton,
             recordButton,
             getClozeButton(),
@@ -90,8 +85,7 @@ export function getTemplateGroup(): DynamicSvelteComponent<typeof ButtonGroup> &
     });
 }
 
-export function getTemplateMenus(): (DynamicSvelteComponent<typeof DropdownMenu> &
-    DropdownMenuProps)[] {
+export function getTemplateMenus(): IterableToolbarItem[] {
     const mathjaxMenuItems = [
         withShortcut({
             shortcut: "Control+KeyM, KeyM",
@@ -142,7 +136,7 @@ export function getTemplateMenus(): (DynamicSvelteComponent<typeof DropdownMenu>
 
     const mathjaxMenu = dropdownMenu({
         id: mathjaxMenuId,
-        menuItems: [...mathjaxMenuItems, ...latexMenuItems],
+        items: [...mathjaxMenuItems, ...latexMenuItems],
     });
 
     return [mathjaxMenu];
diff --git a/ts/editor/toolbar.ts b/ts/editor/toolbar.ts
index d03e20490..f0af19df7 100644
--- a/ts/editor/toolbar.ts
+++ b/ts/editor/toolbar.ts
@@ -1,10 +1,5 @@
 // Copyright: Ankitects Pty Ltd and contributors
 // License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
-import type { ToolbarItem } from "editor-toolbar/types";
-import type ButtonGroup from "editor-toolbar/ButtonGroup.svelte";
-import type { ButtonGroupProps } from "editor-toolbar/ButtonGroup";
-import type { Writable } from "svelte/store";
-
 import { getNotetypeGroup } from "./notetype";
 import { getFormatInlineGroup } from "./formatInline";
 import { getFormatBlockGroup, getFormatBlockMenus } from "./formatBlock";
@@ -14,32 +9,18 @@ import { getTemplateGroup, getTemplateMenus } from "./template";
 export function initToolbar(i18n: Promise<void>): void {
     document.addEventListener("DOMContentLoaded", () => {
         i18n.then(() => {
-            globalThis.$editorToolbar.buttonsPromise.then(
-                (
-                    buttons: Writable<
-                        (ToolbarItem<typeof ButtonGroup> & ButtonGroupProps)[]
-                    >
-                ): Writable<(ToolbarItem<typeof ButtonGroup> & ButtonGroupProps)[]> => {
-                    buttons.update(() => [
-                        getNotetypeGroup(),
-                        getFormatInlineGroup(),
-                        getFormatBlockGroup(),
-                        getColorGroup(),
-                        getTemplateGroup(),
-                    ]);
-                    return buttons;
-                }
-            );
+            const buttons = [
+                getNotetypeGroup(),
+                getFormatInlineGroup(),
+                getFormatBlockGroup(),
+                getColorGroup(),
+                getTemplateGroup(),
+            ];
 
-            globalThis.$editorToolbar.menusPromise.then(
-                (menus: Writable<ToolbarItem[]>): Writable<ToolbarItem[]> => {
-                    menus.update(() => [
-                        ...getFormatBlockMenus(),
-                        ...getTemplateMenus(),
-                    ]);
-                    return menus;
-                }
-            );
+            const menus = [...getFormatBlockMenus(), ...getTemplateMenus()];
+
+            globalThis.$editorToolbar.updateButton(() => ({ items: buttons }));
+            globalThis.$editorToolbar.updateMenu(() => ({ items: menus }));
         });
     });
 }
diff --git a/ts/sass/base.scss b/ts/sass/base.scss
index 25b2809b9..40fe2973e 100644
--- a/ts/sass/base.scss
+++ b/ts/sass/base.scss
@@ -9,6 +9,7 @@ $link-hover-decoration: none;
 @import "ts/sass/bootstrap/bootstrap-reboot";
 @import "ts/sass/bootstrap/bootstrap-utilities";
 
-body, html {
+body,
+html {
     overscroll-behavior: none;
 }