diff --git a/app/assets/images/symbols.svg b/app/assets/images/symbols.svg
index 5c1eee4673..328c5cc012 100644
--- a/app/assets/images/symbols.svg
+++ b/app/assets/images/symbols.svg
@@ -137,6 +137,14 @@
     <polygon fill="currentColor" points="14,7 5.41,7 9.71,2.71 8.29,1.29 1.59,8 8.29,14.71 9.71,13.29 5.41,9 14,9"/>
   </symbol>
 
+  <symbol id="icon-arrow-undo" viewBox="0 0 24 24" fill="none">
+    <g stroke-width="0"></g><g stroke-linecap="round" stroke-linejoin="round"></g><g > <path d="M4 7H15C16.8692 7 17.8039 7 18.5 7.40193C18.9561 7.66523 19.3348 8.04394 19.5981 8.49999C20 9.19615 20 10.1308 20 12C20 13.8692 20 14.8038 19.5981 15.5C19.3348 15.9561 18.9561 16.3348 18.5 16.5981C17.8039 17 16.8692 17 15 17H8.00001M4 7L7 4M4 7L7 10" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"></path> </g>
+  </symbol>
+
+  <symbol id="icon-arrow-redo" viewBox="0 0 24 24" fill="none">
+    <g stroke-width="0"></g><g stroke-linecap="round" stroke-linejoin="round"></g><g > <path d="M20 7H9.00001C7.13077 7 6.19615 7 5.5 7.40193C5.04395 7.66523 4.66524 8.04394 4.40193 8.49999C4 9.19615 4 10.1308 4 12C4 13.8692 4 14.8038 4.40192 15.5C4.66523 15.9561 5.04394 16.3348 5.5 16.5981C6.19615 17 7.13077 17 9 17H16M20 7L17 4M20 7L17 10" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"></path> </g>
+  </symbol>
+
   <symbol id="icon-arrow-right" viewBox="0 0 16 16">
     <polygon fill="currentColor" points="2,7 10.59,7 6.29,2.71 7.71,1.29 14.41,8 7.71,14.71 6.29,13.29 10.59,9 2,9"/>
   </symbol>
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 33d122b41a..bcb2e3ffd1 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -377,6 +377,18 @@ function refreshEditors() {
   }
 }
 
+function undoCodeMirror() {
+  if(typeof myCodeMirror !== 'undefined') {
+    myCodeMirror.undo();
+  }
+}
+
+function redoCodeMirror() {
+  if(typeof myCodeMirror !== 'undefined') {
+    myCodeMirror.redo();
+  }
+}
+
 const ResizableSplitter = {
   initVertical: function makeResiableSplitter(splitterSelector, panel1Selector, panel2Selector, mode='', options = {}) {
     const { onDrag, onChanged, initialPosition = '50%', onPositionChange } = options;
diff --git a/app/assets/stylesheets/codemirror/lib/codemirror.css b/app/assets/stylesheets/codemirror/lib/codemirror.css
index 4cd92363fc..ce85920b51 100644
--- a/app/assets/stylesheets/codemirror/lib/codemirror.css
+++ b/app/assets/stylesheets/codemirror/lib/codemirror.css
@@ -585,4 +585,20 @@ span.CodeMirror-selectedtext {
 li.CodeMirror-hint-active {
   background: #08f;
   color: #fff;
+}
+
+
+button.undoBtn,
+button.redoBtn  {
+  position: relative;
+  display: flex;
+  align-items: center;
+  column-gap: 3px;
+  justify-content: center;
+  width: 40px;
+
+  svg {
+    width: 18px;
+    height: 18px;
+  }
 }
\ No newline at end of file
diff --git a/app/assets/stylesheets/sections/page.scss b/app/assets/stylesheets/sections/page.scss
index 38f9a9d50a..d54b21d5e8 100644
--- a/app/assets/stylesheets/sections/page.scss
+++ b/app/assets/stylesheets/sections/page.scss
@@ -102,7 +102,6 @@
   }
 }
 
-
 #blankPageButton {
   margin: 0px 10px;
 }
diff --git a/app/views/shared/_codemirror.html.erb b/app/views/shared/_codemirror.html.erb
index 332fefc3ed..6da5f40fea 100644
--- a/app/views/shared/_codemirror.html.erb
+++ b/app/views/shared/_codemirror.html.erb
@@ -28,12 +28,28 @@
 
 <script>
   var button_config = [
+    {
+      class: 'undoBtn',
+      label: '<%= svg_symbol("#icon-arrow-undo") %>',
+      title: '<%= t(".undo_description") %>',
+      callback: function (cm) {
+        return false
+      }
+    },
+    {
+      class: 'redoBtn',
+      label: '<%= svg_symbol("#icon-arrow-redo") %>',
+      title: '<%= t(".redo_description") %>',
+      callback: function (cm) {
+        return false
+      }
+    },
     <% @collection.editor_buttons.each do |button| %>
       {
         hotkey: '<%= button.hotkey %>',
         class: '<%= "editor-buttons-#{button.key}" %>',
         label: '<%= "#{button.key}" %>',
-        tooltip: '<%= t(".#{button.key}_description", default: button.key) %>',
+        title: '<%= t(".#{button.key}_description", default: button.key) %>',
         callback: function (cm) {
           var selection = cm.getSelection();
           cm.replaceSelection('<%= button.open_tag %>' + selection + '<%= button.close_tag %>');
@@ -206,4 +222,7 @@
     
     // give codeMirror with class of respective text direction
     myCodeMirror.getWrapperElement().classList.add("<%= text_direction %>");
+
+    document.querySelector('.undoBtn').addEventListener('click', function(){undoCodeMirror()});
+    document.querySelector('.redoBtn').addEventListener('click', function(){redoCodeMirror()});
 </script>
\ No newline at end of file
diff --git a/app/views/transcribe/display_page.html.slim b/app/views/transcribe/display_page.html.slim
index 8abda91e3a..7a19aebd83 100644
--- a/app/views/transcribe/display_page.html.slim
+++ b/app/views/transcribe/display_page.html.slim
@@ -48,6 +48,8 @@
           span =t('.always_show_fullscreen')
 
       .flex-toolbar_group.push-right
+
+      .flex-toolbar_group
         =f.label 'mark_blank', t('.mark_as_blank')
         =f.check_box('mark_blank', {checked: @page.status_blank?})
 
diff --git a/app/views/transcribe/translate.html.slim b/app/views/transcribe/translate.html.slim
index d3a6159787..3935ea2a11 100644
--- a/app/views/transcribe/translate.html.slim
+++ b/app/views/transcribe/translate.html.slim
@@ -16,6 +16,8 @@
             span.voice-info
 
       .flex-toolbar_group.push-right
+
+      .flex-toolbar_group
         =f.label 'mark_blank', t('.mark_as_blank')
         =f.check_box('mark_blank', {checked: @page.status_blank?})
 
diff --git a/config/locales/shared/shared-de.yml b/config/locales/shared/shared-de.yml
index 0361642948..e7728b4a6b 100644
--- a/config/locales/shared/shared-de.yml
+++ b/config/locales/shared/shared-de.yml
@@ -21,12 +21,14 @@ de:
       gap_description: Markiert eine Lücke im Text, oft aufgrund von Beschädigungen
       head_description: Markiert Überschriften im Text
       marginalia_description: Markiert Text am Seitenrand (außerhalb des Haupttextes).
+      redo_description: Die letzte rückgängig gemachte Aktion wiederherstellen.
       reg_description: Markiert eine normalisierte Schreibung mit Originalform im orig-Attribut.
       s_description: Markiert Text, der aus irgendeinem Grund durchgestrichen wurde.
       sub_description: Tiefgestellter Text.
       sup_description: Hochgestellter Text.
       u_description: Markiert unterstrichenen Text.
       unclear_description: Markiert unklaren Text.
+      undo_description: Die letzte Aktion rückgängig machen.
     collection_tabs:
       add_work: Werk hinzufügen
       collaborators: Mitarbeitende
diff --git a/config/locales/shared/shared-en.yml b/config/locales/shared/shared-en.yml
index e49e1f9611..f51901085c 100644
--- a/config/locales/shared/shared-en.yml
+++ b/config/locales/shared/shared-en.yml
@@ -21,12 +21,14 @@ en:
       gap_description: Marks a gap in the text, often due to damage
       head_description: Marks headings within the text
       marginalia_description: Marks text in the margins of the main text.
+      redo_description: Redo the last undone action
       reg_description: Marks a regularized form of the text, with original forms in the orig attribute.
       s_description: Marks text that has been struck through for any reason.
       sub_description: Subscript text.
       sup_description: Superscript text.
       u_description: Marks underlined text.
       unclear_description: Marks unclear text.
+      undo_description: Undo the last action
     collection_tabs:
       add_work: Add Work
       collaborators: Collaborators
diff --git a/config/locales/shared/shared-es.yml b/config/locales/shared/shared-es.yml
index aa40dcb73a..4fb5e1539d 100644
--- a/config/locales/shared/shared-es.yml
+++ b/config/locales/shared/shared-es.yml
@@ -21,12 +21,14 @@ es:
       gap_description: Marca un hueco en el texto, a menudo debido a daños
       head_description: Marca los encabezados dentro del texto
       marginalia_description: Marca el texto en los márgenes del texto principal.
+      redo_description: Rehacer la última acción deshecha
       reg_description: Marca una forma regularizada del texto, con formularios originales en el atributo orig.
       s_description: Marca el texto que se ha tachado por cualquier motivo.
       sub_description: Texto de subíndice.
       sup_description: Texto de superíndice.
       u_description: Marca el texto subrayado.
       unclear_description: Marca texto poco claro.
+      undo_description: Deshacer la última acción.
     collection_tabs:
       add_work: Añadir Obra
       collaborators: Colaboradores
diff --git a/config/locales/shared/shared-fr.yml b/config/locales/shared/shared-fr.yml
index 0f40103f18..176ecb6c9d 100644
--- a/config/locales/shared/shared-fr.yml
+++ b/config/locales/shared/shared-fr.yml
@@ -21,12 +21,14 @@ fr:
       gap_description: Marque un vide dans le texte, souvent dû à des dommages
       head_description: Marque les titres dans le texte
       marginalia_description: Marque le texte dans les marges du texte principal.
+      redo_description: Refaire la dernière action annulée
       reg_description: Marque une forme régularisée du texte, avec des formes originales dans l'attribut orig.
       s_description: Marque le texte qui a été barré pour une raison quelconque.
       sub_description: Texte en indice.
       sup_description: Texte en exposant.
       u_description: Marque le texte souligné.
       unclear_description: Marque le texte peu clair.
+      undo_description: Annuler la dernière action
     collection_tabs:
       add_work: Ajouter un œuvre
       collaborators: Collaborateurs
diff --git a/config/locales/shared/shared-pt.yml b/config/locales/shared/shared-pt.yml
index 1923c78daa..4bb37e9553 100644
--- a/config/locales/shared/shared-pt.yml
+++ b/config/locales/shared/shared-pt.yml
@@ -21,12 +21,14 @@ pt:
       gap_description: Marca uma lacuna no texto, geralmente devido a danos
       head_description: Marca os títulos dentro do texto
       marginalia_description: Marca o texto nas margens do texto principal.
+      redo_description: Refazer a última ação anulada
       reg_description: Marca uma forma regularizada do texto, com formas originais no atributo original.
       s_description: Marca o texto que foi riscado por qualquer motivo.
       sub_description: Texto subscrito.
       sup_description: Superscript text.
       u_description: Marca o texto sublinhado
       unclear_description: Marca um texto pouco claro
+      undo_description: Anular a última ação
     collection_tabs:
       add_work: Adicionar Obra
       collaborators: Colaboradores