diff --git a/.gitignore b/.gitignore
index 4152d107a..fcef39e3a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,4 @@
 /docs/.jekyll-cache/
 /docs/.jekyll-metadata
 /docs/Gemfile.lock
+.yarn/install-state.gz
diff --git a/src/editor/command_dispatcher.js b/src/editor/command_dispatcher.js
index 11d9ef9ff..548dfbc26 100644
--- a/src/editor/command_dispatcher.js
+++ b/src/editor/command_dispatcher.js
@@ -33,6 +33,7 @@ const COMMANDS = [
   "unlink",
   "toggleHighlight",
   "removeHighlight",
+  "setFormatHeadingXLarge",
   "setFormatHeadingLarge",
   "setFormatHeadingMedium",
   "setFormatHeadingSmall",
@@ -211,6 +212,10 @@ export class CommandDispatcher {
     this.editor.focus()
   }
 
+  dispatchSetFormatHeadingXLarge() {
+    this.contents.applyHeadingFormat("h1")
+  }
+
   dispatchSetFormatHeadingLarge() {
     this.contents.applyHeadingFormat("h2")
   }
diff --git a/src/elements/toolbar.js b/src/elements/toolbar.js
index 0319776b1..9fc661f7b 100644
--- a/src/elements/toolbar.js
+++ b/src/elements/toolbar.js
@@ -217,6 +217,7 @@ export class LexicalToolbarElement extends HTMLElement {
 
     this.#setButtonPressed("format", isInHeading || isStrikethrough || isUnderline)
     this.#setButtonPressed("paragraph", !isInHeading)
+    this.#setButtonPressed("heading-xlarge", headingTag === "h1")
     this.#setButtonPressed("heading-large", headingTag === "h2")
     this.#setButtonPressed("heading-medium", headingTag === "h3")
     this.#setButtonPressed("heading-small", headingTag === "h4")
@@ -363,14 +364,17 @@ export class LexicalToolbarElement extends HTMLElement {
           <button type="button" name="paragraph" data-command="setFormatParagraph" title="Paragraph">
             ${ToolbarIcons.paragraph} <span>Normal</span>
           </button>
-          <button type="button" name="heading-large" data-command="setFormatHeadingLarge" title="Large heading">
-            ${ToolbarIcons.h2} <span>Large Heading</span>
+          <button type="button" name="heading-xlarge" data-command="setFormatHeadingXLarge" title="Heading 1">
+            ${ToolbarIcons.h1} <span>Heading 1</span>
           </button>
-          <button type="button" name="heading-medium" data-command="setFormatHeadingMedium" title="Medium heading">
-            ${ToolbarIcons.h3} <span>Medium Heading</span>
+          <button type="button" name="heading-large" data-command="setFormatHeadingLarge" title="Heading 2">
+            ${ToolbarIcons.h2} <span>Heading 2</span>
           </button>
-          <button class="lexxy-editor__toolbar-group-end" type="button" name="heading-small" data-command="setFormatHeadingSmall" title="Small heading">
-            ${ToolbarIcons.h4} <span>Small Heading</span>
+          <button type="button" name="heading-medium" data-command="setFormatHeadingMedium" title="Heading 3">
+            ${ToolbarIcons.h3} <span>Heading 3</span>
+          </button>
+          <button type="button" name="heading-small" data-command="setFormatHeadingSmall" title="Heading 4">
+            ${ToolbarIcons.h4} <span>Heading 4</span>
           </button>
           <div class="lexxy-editor__toolbar-separator" role="separator"></div>
           <button type="button" name="strikethrough" data-command="strikethrough" title="Strikethrough">
diff --git a/src/elements/toolbar_icons.js b/src/elements/toolbar_icons.js
index a080e2824..20d4e126f 100644
--- a/src/elements/toolbar_icons.js
+++ b/src/elements/toolbar_icons.js
@@ -26,6 +26,11 @@ export default {
     <path d="M11.5 2C12.0523 2 12.5 2.44772 12.5 3V3.5C12.5 4.05228 12.0523 4.5 11.5 4.5H8V15C8 15.5523 7.55228 16 7 16H6.5C5.94772 16 5.5 15.5523 5.5 15V4.5H2C1.44772 4.5 1 4.05228 1 3.5V3C1 2.44772 1.44772 2 2 2H11.5ZM16 7C16.5523 7 17 7.44772 17 8V8.5C17 9.05228 16.5523 9.5 16 9.5H15V15C15 15.5523 14.5523 16 14 16H13.5C12.9477 16 12.5 15.5523 12.5 15V9.5H11.5C10.9477 9.5 10.5 9.05228 10.5 8.5V8C10.5 7.44772 10.9477 7 11.5 7H16Z"/>
   </svg>`,
 
+  "h1":
+  `<svg viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg">
+    <path d="M8.12207 4.30078C8.84668 4.30078 9.25684 4.74512 9.25684 5.51758V12.5518C9.25677 13.3241 8.84662 13.7686 8.12207 13.7686C7.39752 13.7686 6.9942 13.3309 6.99414 12.5518V9.87207H3.56934V12.5518C3.56927 13.3241 3.15912 13.7686 2.43457 13.7686C1.71002 13.7686 1.3067 13.3309 1.30664 12.5518V5.51758C1.30664 4.73828 1.70996 4.30078 2.43457 4.30078C3.15918 4.30078 3.56934 4.74512 3.56934 5.51758V8.07422H6.99414V5.51758C6.99414 4.73828 7.39746 4.30078 8.12207 4.30078ZM14.5 4.19824C15.2246 4.19824 15.6348 4.64258 15.6348 5.41504V12.6611C15.6347 13.4336 15.2246 13.8779 14.5 13.8779C13.7754 13.8779 13.3653 13.4404 13.3652 12.6611V6.55859H13.2832L12.1191 7.36914C11.8594 7.54785 11.627 7.63672 11.3672 7.63672C10.8477 7.63672 10.4785 7.27441 10.4785 6.7959C10.4785 6.43359 10.6641 6.16699 11.0469 5.90039L13.3379 4.44434C13.6455 4.24609 13.9941 4.19824 14.5 4.19824Z"/>
+  </svg>`,
+
   "h2":
   `<svg viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg">
     <path d="M8.12207 4.30078C8.84668 4.30078 9.25684 4.74512 9.25684 5.51758V12.5518C9.25677 13.3241 8.84662 13.7686 8.12207 13.7686C7.39752 13.7686 6.9942 13.3309 6.99414 12.5518V9.87207H3.56934V12.5518C3.56927 13.3241 3.15912 13.7686 2.43457 13.7686C1.71002 13.7686 1.3067 13.3309 1.30664 12.5518V5.51758C1.30664 4.73828 1.70996 4.30078 2.43457 4.30078C3.15918 4.30078 3.56934 4.74512 3.56934 5.51758V8.07422H6.99414V5.51758C6.99414 4.73828 7.39746 4.30078 8.12207 4.30078ZM13.6445 4.19824C15.5244 4.19824 16.8984 5.34668 16.8984 6.91211C16.8984 7.8759 16.4335 8.7237 15.292 9.84473L13.3438 11.8135V11.9092H16.1875C16.8232 11.9092 17.2197 12.251 17.2197 12.8115C17.2196 13.3651 16.83 13.7002 16.1875 13.7002H11.5117C10.8487 13.7002 10.4112 13.3241 10.4111 12.75C10.4111 12.3399 10.6368 11.9843 11.3203 11.3145L13.6855 8.88086C14.4169 8.13583 14.7245 7.64349 14.7246 7.12402C14.7246 6.4541 14.2393 6.00293 13.5215 6.00293C12.9404 6.00293 12.5166 6.29688 12.2158 6.90527C11.9151 7.37002 11.6552 7.54785 11.2588 7.54785C10.7188 7.54785 10.3429 7.17861 10.3428 6.65918C10.3428 5.3877 11.7783 4.19824 13.6445 4.19824Z"/>