diff --git a/src/app/mainwindow.cpp b/src/app/mainwindow.cpp
index 781810d4c..66ba94573 100644
--- a/src/app/mainwindow.cpp
+++ b/src/app/mainwindow.cpp
@@ -36,6 +36,7 @@
 #include "exception/vexceptionwrongid.h"
 #include "version.h"
 #include "xml/vstandardmeasurements.h"
+#include "widgets/vapplication.h"
 
 #include <QInputDialog>
 #include <QtCore>
@@ -1708,6 +1709,21 @@ void MainWindow::CreateMenus()
     separatorAct->setSeparator(true);
     ui->menuFile->insertAction(ui->actionPreferences, separatorAct);
     UpdateRecentFileActions();
+
+    //Add Undo/Redo actions.
+    QAction *undoAction = qApp->getUndoStack()->createUndoAction(this, tr("&Undo"));
+    undoAction->setShortcuts(QKeySequence::Undo);
+    undoAction->setIcon(QIcon::fromTheme("edit-undo"));
+    ui->menuDrawing->insertAction(ui->actionPattern_properties, undoAction);
+
+    QAction *redoAction = qApp->getUndoStack()->createRedoAction(this, tr("&Redo"));
+    redoAction->setShortcuts(QKeySequence::Redo);
+    redoAction->setIcon(QIcon::fromTheme("edit-redo"));
+    ui->menuDrawing->insertAction(ui->actionPattern_properties, redoAction);
+
+    separatorAct = new QAction(this);
+    separatorAct->setSeparator(true);
+    ui->menuDrawing->insertAction(ui->actionPattern_properties, separatorAct);
 }
 
 //---------------------------------------------------------------------------------------------------------------------
diff --git a/src/app/share/resources/icons/win.icon.theme/16x16/actions/edit-redo.png b/src/app/share/resources/icons/win.icon.theme/16x16/actions/edit-redo.png
new file mode 100644
index 000000000..0bf5159f6
Binary files /dev/null and b/src/app/share/resources/icons/win.icon.theme/16x16/actions/edit-redo.png differ
diff --git a/src/app/share/resources/icons/win.icon.theme/16x16/actions/edit-undo.png b/src/app/share/resources/icons/win.icon.theme/16x16/actions/edit-undo.png
new file mode 100644
index 000000000..c6ddff49d
Binary files /dev/null and b/src/app/share/resources/icons/win.icon.theme/16x16/actions/edit-undo.png differ
diff --git a/src/app/share/resources/icons/win.icon.theme/24x24/actions/edit-redo.png b/src/app/share/resources/icons/win.icon.theme/24x24/actions/edit-redo.png
new file mode 100755
index 000000000..6bac7ca71
Binary files /dev/null and b/src/app/share/resources/icons/win.icon.theme/24x24/actions/edit-redo.png differ
diff --git a/src/app/share/resources/icons/win.icon.theme/24x24/actions/edit-undo.png b/src/app/share/resources/icons/win.icon.theme/24x24/actions/edit-undo.png
new file mode 100755
index 000000000..c30db971d
Binary files /dev/null and b/src/app/share/resources/icons/win.icon.theme/24x24/actions/edit-undo.png differ
diff --git a/src/app/share/resources/icons/win.icon.theme/32x32/actions/edit-redo.png b/src/app/share/resources/icons/win.icon.theme/32x32/actions/edit-redo.png
new file mode 100644
index 000000000..353989137
Binary files /dev/null and b/src/app/share/resources/icons/win.icon.theme/32x32/actions/edit-redo.png differ
diff --git a/src/app/share/resources/icons/win.icon.theme/32x32/actions/edit-undo.png b/src/app/share/resources/icons/win.icon.theme/32x32/actions/edit-undo.png
new file mode 100644
index 000000000..938acb0d4
Binary files /dev/null and b/src/app/share/resources/icons/win.icon.theme/32x32/actions/edit-undo.png differ
diff --git a/src/app/share/resources/theme.qrc b/src/app/share/resources/theme.qrc
index 4950eb163..c659ccf05 100644
--- a/src/app/share/resources/theme.qrc
+++ b/src/app/share/resources/theme.qrc
@@ -34,5 +34,11 @@
         <file alias="24x24/actions/list-add.png">icons/win.icon.theme/24x24/actions/list-add.png</file>
         <file alias="32x32/actions/list-remove.png">icons/win.icon.theme/32x32/actions/list-remove.png</file>
         <file alias="32x32/actions/list-add.png">icons/win.icon.theme/32x32/actions/list-add.png</file>
+        <file>icons/win.icon.theme/16x16/actions/edit-redo.png</file>
+        <file>icons/win.icon.theme/16x16/actions/edit-undo.png</file>
+        <file>icons/win.icon.theme/24x24/actions/edit-undo.png</file>
+        <file>icons/win.icon.theme/24x24/actions/edit-redo.png</file>
+        <file>icons/win.icon.theme/32x32/actions/edit-redo.png</file>
+        <file>icons/win.icon.theme/32x32/actions/edit-undo.png</file>
     </qresource>
 </RCC>