diff --git a/web/app.js b/web/app.js
index 14fe84e70..3cc4126a5 100644
--- a/web/app.js
+++ b/web/app.js
@@ -2051,6 +2051,8 @@ const PDFViewerApplication = {
     eventBus._on("lastpage", () => (this.page = this.pagesCount), opts);
     eventBus._on("nextpage", () => pdfViewer.nextPage(), opts);
     eventBus._on("previouspage", () => pdfViewer.previousPage(), opts);
+    eventBus._on("redo", evt => pdfViewer.redo(), opts);
+    eventBus._on("undo", evt => pdfViewer.undo(), opts);
     eventBus._on("zoomin", this.zoomIn.bind(this), opts);
     eventBus._on("zoomout", this.zoomOut.bind(this), opts);
     eventBus._on("zoomreset", this.zoomReset.bind(this), opts);
diff --git a/web/images/toolbarButton-redo.svg b/web/images/toolbarButton-redo.svg
new file mode 100644
index 000000000..855425506
--- /dev/null
+++ b/web/images/toolbarButton-redo.svg
@@ -0,0 +1 @@
+<svg fill="#000000" width="16px" height="16px" viewBox="-0.02 -0.04 0.48 0.48" xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMinYMin" class="jam jam-redo"><path d="m0.387 0.145 0.017 -0.025a0.02 0.02 0 0 1 0.028 -0.005c0.009 0.006 0.012 0.019 0.006 0.028L0.393 0.208a0.02 0.02 0 0 1 -0.028 0.005L0.299 0.168a0.02 0.02 0 0 1 -0.006 -0.028 0.02 0.02 0 0 1 0.028 -0.005l0.027 0.018C0.329 0.088 0.268 0.04 0.197 0.04c-0.087 0 -0.158 0.072 -0.158 0.16s0.071 0.16 0.158 0.16c0.011 0 0.02 0.009 0.02 0.02s-0.009 0.02 -0.02 0.02C0.088 0.4 0 0.31 0 0.2S0.088 0 0.197 0c0.09 0 0.166 0.061 0.19 0.145"/></svg>
\ No newline at end of file
diff --git a/web/images/toolbarButton-undo.svg b/web/images/toolbarButton-undo.svg
new file mode 100644
index 000000000..82d8655ff
--- /dev/null
+++ b/web/images/toolbarButton-undo.svg
@@ -0,0 +1 @@
+<svg fill="#000000" width="16px" height="16px" viewBox="-0.01 -0.04 0.48 0.48" xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMinYMin" class="jam jam-undo"><path d="m0.106 0.152 0.027 -0.018a0.02 0.02 0 0 1 0.027 0.005 0.02 0.02 0 0 1 -0.005 0.028l-0.066 0.045a0.02 0.02 0 0 1 -0.027 -0.005L0.018 0.14a0.02 0.02 0 0 1 0.005 -0.028 0.02 0.02 0 0 1 0.027 0.005l0.017 0.025C0.092 0.06 0.168 0 0.257 0c0.109 0 0.198 0.09 0.198 0.2s-0.088 0.2 -0.198 0.2a0.02 0.02 0 0 1 -0.02 -0.02c0 -0.011 0.009 -0.02 0.02 -0.02 0.087 0 0.158 -0.072 0.158 -0.16s-0.071 -0.16 -0.158 -0.16C0.186 0.04 0.126 0.087 0.106 0.152"/></svg>
\ No newline at end of file
diff --git a/web/pdf_viewer.js b/web/pdf_viewer.js
index 37644840f..7e596deb1 100644
--- a/web/pdf_viewer.js
+++ b/web/pdf_viewer.js
@@ -2532,6 +2532,24 @@ class PDFViewer {
     updater();
   }
 
+  undo() {
+    if (!this.#annotationEditorUIManager) {
+      throw new Error(`The AnnotationEditor is not enabled.`);
+    }
+    if (this.pdfDocument) {
+      this.#annotationEditorUIManager.undo();
+    }
+  }
+
+  redo() {
+    if (!this.#annotationEditorUIManager) {
+      throw new Error(`The AnnotationEditor is not enabled.`);
+    }
+    if (this.pdfDocument) {
+      this.#annotationEditorUIManager.redo();
+    }
+  }
+
   refresh(noUpdate = false, updateArgs = Object.create(null)) {
     if (!this.pdfDocument) {
       return;
diff --git a/web/toolbar.js b/web/toolbar.js
index 5945cd409..ea3bccc07 100644
--- a/web/toolbar.js
+++ b/web/toolbar.js
@@ -67,6 +67,8 @@ class Toolbar {
       { element: options.zoomOut, eventName: "zoomout" },
       { element: options.print, eventName: "print" },
       { element: options.download, eventName: "download" },
+      { element: options.undo, eventName: "undo" },
+      { element: options.redo, eventName: "redo" },
       {
         element: options.editorFreeTextButton,
         eventName: "switchannotationeditormode",
diff --git a/web/viewer.css b/web/viewer.css
index daf980b78..ab0a7dfd0 100644
--- a/web/viewer.css
+++ b/web/viewer.css
@@ -111,6 +111,8 @@
   --toolbarButton-pageDown-icon: url(images/toolbarButton-pageDown.svg);
   --toolbarButton-zoomOut-icon: url(images/toolbarButton-zoomOut.svg);
   --toolbarButton-zoomIn-icon: url(images/toolbarButton-zoomIn.svg);
+  --toolbarButton-redo-icon: url(images/toolbarButton-redo.svg);
+  --toolbarButton-undo-icon: url(images/toolbarButton-undo.svg);
   --toolbarButton-presentationMode-icon: url(images/toolbarButton-presentationMode.svg);
   --toolbarButton-print-icon: url(images/toolbarButton-print.svg);
   /*#if GENERIC*/
@@ -540,6 +542,14 @@ body {
   mask-image: var(--toolbarButton-zoomIn-icon);
 }
 
+#redoButton::before {
+  mask-image: var(--toolbarButton-redo-icon);
+}
+
+#undoButton::before {
+  mask-image: var(--toolbarButton-undo-icon);
+}
+
 #editorFreeTextButton::before {
   mask-image: var(--toolbarButton-editorFreeText-icon);
 }
diff --git a/web/viewer.html b/web/viewer.html
index a57bc06a9..92db547fd 100644
--- a/web/viewer.html
+++ b/web/viewer.html
@@ -332,6 +332,12 @@ See https://github.com/adobe-type-tools/cmap-resources
                       </div>
                     </div>
                   </div>
+                  <button id="undoButton" class="toolbarButton" type="button" tabindex="0" data-l10n-id="pdfjs-undo-button">
+                    <span data-l10n-id="pdfjs-undo-button-label"></span>
+                  </button>
+                  <button id="redoButton" class="toolbarButton" type="button" tabindex="0" data-l10n-id="pdfjs-redo-button">
+                    <span data-l10n-id="pdfjs-redo-button-label"></span>
+                  </button>
                 </div>
 
                 <div id="editorModeSeparator" class="verticalToolbarSeparator"></div>
diff --git a/web/viewer.js b/web/viewer.js
index 3973a6b2f..e9c64ea84 100644
--- a/web/viewer.js
+++ b/web/viewer.js
@@ -45,6 +45,12 @@ function getViewerConfiguration() {
       zoomIn: document.getElementById("zoomInButton"),
       zoomOut: document.getElementById("zoomOutButton"),
       print: document.getElementById("printButton"),
+      undo: document.getElementById("undoButton"),
+      redo: document.getElementById("redoButton"),
+      editorEraserButton: document.getElementById("editorEraserButton"),
+      editorEraserParamsToolbar: document.getElementById(
+        "editorEraserParamsToolbar"
+      ),
       editorFreeTextButton: document.getElementById("editorFreeTextButton"),
       editorFreeTextParamsToolbar: document.getElementById(
         "editorFreeTextParamsToolbar"
@@ -241,6 +247,7 @@ function getViewerConfiguration() {
       updateButton: document.getElementById("editSignatureUpdateButton"),
     },
     annotationEditorParams: {
+      editorEraserThickness: document.getElementById("editorEraserThickness"),
       editorFreeTextFontSize: document.getElementById("editorFreeTextFontSize"),
       editorFreeTextColor: document.getElementById("editorFreeTextColor"),
       editorInkColor: document.getElementById("editorInkColor"),