diff --git a/src/code/addButtons.ts b/src/code/addButtons.ts
index 16635974..595cb131 100644
--- a/src/code/addButtons.ts
+++ b/src/code/addButtons.ts
@@ -3,6 +3,7 @@ import QuickdrawButton from "./buttons/quickdrawButton";
 import WasabeeButton from "./buttons/wasabeeButton";
 import SyncButton from "./buttons/syncButton";
 import OpButton from "./buttons/opButton";
+import UndoButton from "./buttons/undoButton";
 import LinkButton from "./buttons/linkButton";
 import MarkerButton from "./buttons/markerButton";
 import UploadButton from "./buttons/uploadButton";
@@ -24,6 +25,7 @@ export function addButtons() {
     WasabeeButton,
     OpButton,
     QuickdrawButton,
+    UndoButton,
     QuickDeleteButton,
     LinkButton,
     MarkerButton,
diff --git a/src/code/buttons/undoButton.d.ts b/src/code/buttons/undoButton.d.ts
new file mode 100644
index 00000000..ddeed722
--- /dev/null
+++ b/src/code/buttons/undoButton.d.ts
@@ -0,0 +1,4 @@
+import { WButton } from "../leafletClasses";
+
+declare class UndoButton extends WButton {}
+export default UndoButton;
diff --git a/src/code/buttons/undoButton.js b/src/code/buttons/undoButton.js
new file mode 100644
index 00000000..5765295e
--- /dev/null
+++ b/src/code/buttons/undoButton.js
@@ -0,0 +1,61 @@
+import { WButton } from "../leafletClasses";
+import wX from "../wX";
+import { undoable, undo } from "../undo";
+import { postToFirebase } from "../firebase/logger";
+
+const UndoButton = WButton.extend({
+  statics: {
+    TYPE: "UndoButton",
+  },
+
+  needWritePermission: true,
+
+  initialize: function (container) {
+    this.type = UndoButton.TYPE;
+    this.title = wX("toolbar.op.undo");
+
+    this.button = this._createButton({
+      container: container,
+      className: "wasabee-toolbar-undo",
+      callback: () => {
+        console.log(this);
+        this.control.disableAllExcept();
+        postToFirebase({ id: "analytics", action: "undo" });
+        undo();
+      },
+      context: this,
+      title: this.title,
+    });
+  },
+  update: function () {
+    WButton.prototype.update.call(this);
+    console.log("UndoButton.update >> ", this);
+    if (undoable()) {
+      console.log(">> is undoable");
+      this.enable();
+    } else {
+      console.log(">> no undoable");
+      this.disable();
+    }
+  },
+  disable: function () {
+    console.log("do disable:", this);
+    let btn = this.button;
+    console.log(btn);
+    btn.style.pointerEvents = "none";
+    btn.style.cursor = "not-allowed";
+
+    btn.className = "wasabee-toolbar-undo-disable";
+  },
+  enable: function () {
+    console.log("do enable:", this);
+    let btn = this.button;
+    console.log(btn);
+    btn.style.pointerEvents = "auto";
+    btn.style.cursor = "pointer";
+
+    btn.className = "wasabee-toolbar-undo";
+  },
+});
+
+export default UndoButton;
diff --git a/src/code/css/toolbar.css b/src/code/css/toolbar.css
index 095514c7..8000f1ed 100644
--- a/src/code/css/toolbar.css
+++ b/src/code/css/toolbar.css
@@ -136,6 +136,18 @@
   background-image: url(../images/toolbar_quickdelete.svg);
   background-size: 60%;
 }
+.wasabee-toolbar-undo {
+  background-image: url(../images/toolbar_undo.svg);
+  background-size: 60%;
+}
+.wasabee-toolbar-undo-disable {
+  background-image: url(../images/toolbar_undo_disable.svg);
+  background-size: 60%;
+}
+.wasabee-toolbar-redo {
+  background-image: url(../images/toolbar_redo.svg);
+  background-size: 60%;
+}
 .wasabee-toolbar-link {
   background-image: url(../images/toolbar_addlinks.svg)
 }
diff --git a/src/code/images/toolbar_quickdelete.svg b/src/code/images/toolbar_quickdelete.svg
index 15035f46..439a91b7 100644
--- a/src/code/images/toolbar_quickdelete.svg
+++ b/src/code/images/toolbar_quickdelete.svg
@@ -1,7 +1,7 @@
 <svg xmlns="http://www.w3.org/2000/svg"
       width="26" height="26" viewBox="0 0 26 26">
   <!-- <rect x="5" y="5" width="16" height="16" fill="blue"/> -->
-  <g>
+  <g transform="matrix(1.4473592,0,0,1.4476318,-5.8156696,-8.2815931)">
 	  <path d="M 5 7 L 8 22 L 18 22 L 21 7 M 5.5 9.5 l 14.5 2.5 l -13.5 2.5 l 12.5 2.5 l -11.5 2.5 l 10.5 2.5 M 20.5 9.5 l -14.5 2.5 l 13.5 2.5 l -12.5 2.5 l 11.5 2.5 l -10.5 2.5" fill="none" stroke="black"/>
 	</g>
 </svg>
\ No newline at end of file
diff --git a/src/code/images/toolbar_redo.svg b/src/code/images/toolbar_redo.svg
new file mode 100644
index 00000000..086a3adf
--- /dev/null
+++ b/src/code/images/toolbar_redo.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-sign-turn-left" viewBox="0 0 16 16">
+  <path d="M12.5 4a.5.5 0 0 0-1 0v3.248L5.233 3.612C4.713 3.31 4 3.655 4 4.308v7.384c0 .653.713.998 1.233.696L11.5 8.752V12a.5.5 0 0 0 1 0V4zM5 4.633 10.804 8 5 11.367V4.633z"/>
+  <path d="M8 16A8 8 0 1 0 8 0a8 8 0 0 0 0 16zm7-8A7 7 0 1 1 1 8a7 7 0 0 1 14 0z"/>
+</svg>
\ No newline at end of file
diff --git a/src/code/images/toolbar_undo.svg b/src/code/images/toolbar_undo.svg
new file mode 100644
index 00000000..2aa8c2d8
--- /dev/null
+++ b/src/code/images/toolbar_undo.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-sign-turn-left" viewBox="0 0 16 16">
+  <path d="M4 4a.5.5 0 0 1 1 0v3.248l6.267-3.636c.52-.302 1.233.043 1.233.696v7.384c0 .653-.713.998-1.233.696L5 8.752V12a.5.5 0 0 1-1 0V4zm7.5.633L5.696 8l5.804 3.367V4.633z"/>
+  <path d="M8 16A8 8 0 1 0 8 0a8 8 0 0 0 0 16zm7-8A7 7 0 1 1 1 8a7 7 0 0 1 14 0z"/>
+</svg>
\ No newline at end of file
diff --git a/src/code/images/toolbar_undo_disable.svg b/src/code/images/toolbar_undo_disable.svg
new file mode 100644
index 00000000..13705ee3
--- /dev/null
+++ b/src/code/images/toolbar_undo_disable.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="#D3D3D3" class="bi bi-sign-turn-left" viewBox="0 0 16 16">
+  <path d="M4 4a.5.5 0 0 1 1 0v3.248l6.267-3.636c.52-.302 1.233.043 1.233.696v7.384c0 .653-.713.998-1.233.696L5 8.752V12a.5.5 0 0 1-1 0V4zm7.5.633L5.696 8l5.804 3.367V4.633z"/>
+  <path d="M8 16A8 8 0 1 0 8 0a8 8 0 0 0 0 16zm7-8A7 7 0 1 1 1 8a7 7 0 0 1 14 0z"/>
+</svg>
\ No newline at end of file