diff --git a/utils/themeeditor/gui/editorwindow.cpp b/utils/themeeditor/gui/editorwindow.cpp
index 6bc40fbff6..48ee76d11c 100644
--- a/utils/themeeditor/gui/editorwindow.cpp
+++ b/utils/themeeditor/gui/editorwindow.cpp
@@ -207,6 +207,24 @@ void EditorWindow::setupUI()
 
 void EditorWindow::setupMenus()
 {
+    /* Adding actions to the toolbar */
+    ui->toolBar->addAction(ui->actionNew_Document);
+    ui->toolBar->addAction(ui->actionOpen_Document);
+    ui->toolBar->addAction(ui->actionSave_Document);
+    ui->toolBar->addAction(ui->actionSave_Document_As);
+
+    ui->toolBar->addSeparator();
+    ui->toolBar->addAction(ui->actionUndo);
+    ui->toolBar->addAction(ui->actionRedo);
+
+    ui->toolBar->addSeparator();
+    ui->toolBar->addAction(ui->actionCut);
+    ui->toolBar->addAction(ui->actionCopy);
+    ui->toolBar->addAction(ui->actionPaste);
+
+    ui->toolBar->addSeparator();
+    ui->toolBar->addAction(ui->actionFind_Replace);
+
     /* Connecting panel show actions */
     QObject::connect(ui->actionFile_Panel, SIGNAL(triggered()),
                      this, SLOT(showPanel()));
@@ -224,8 +242,6 @@ void EditorWindow::setupMenus()
                      this, SLOT(newTab()));
     QObject::connect(ui->actionNew_Project, SIGNAL(triggered()),
                      this, SLOT(newProject()));
-    QObject::connect(ui->actionToolbarNew, SIGNAL(triggered()),
-                     this, SLOT(newTab()));
 
     QObject::connect(ui->actionClose_Document, SIGNAL(triggered()),
                      this, SLOT(closeCurrent()));
@@ -236,15 +252,11 @@ void EditorWindow::setupMenus()
                      this, SLOT(saveCurrent()));
     QObject::connect(ui->actionSave_Document_As, SIGNAL(triggered()),
                      this, SLOT(saveCurrentAs()));
-    QObject::connect(ui->actionToolbarSave, SIGNAL(triggered()),
-                     this, SLOT(saveCurrent()));
     QObject::connect(ui->actionExport_Project, SIGNAL(triggered()),
                      this, SLOT(exportProject()));
 
     QObject::connect(ui->actionOpen_Document, SIGNAL(triggered()),
                      this, SLOT(openFile()));
-    QObject::connect(ui->actionToolbarOpen, SIGNAL(triggered()),
-                     this, SLOT(openFile()));
 
     QObject::connect(ui->actionOpen_Project, SIGNAL(triggered()),
                      this, SLOT(openProject()));
@@ -409,7 +421,6 @@ void EditorWindow::shiftTab(int index)
         ui->actionSave_Document->setEnabled(false);
         ui->actionSave_Document_As->setEnabled(false);
         ui->actionClose_Document->setEnabled(false);
-        ui->actionToolbarSave->setEnabled(false);
         ui->fromTree->setEnabled(false);
         ui->actionUndo->setEnabled(false);
         ui->actionRedo->setEnabled(false);
@@ -424,7 +435,6 @@ void EditorWindow::shiftTab(int index)
         ui->actionSave_Document->setEnabled(true);
         ui->actionSave_Document_As->setEnabled(true);
         ui->actionClose_Document->setEnabled(true);
-        ui->actionToolbarSave->setEnabled(true);
         ui->actionUndo->setEnabled(false);
         ui->actionRedo->setEnabled(false);
         ui->actionCut->setEnabled(false);
@@ -443,7 +453,6 @@ void EditorWindow::shiftTab(int index)
         ui->actionSave_Document->setEnabled(true);
         ui->actionSave_Document_As->setEnabled(true);
         ui->actionClose_Document->setEnabled(true);
-        ui->actionToolbarSave->setEnabled(true);
         ui->fromTree->setEnabled(true);
 
         ui->actionUndo->setEnabled(true);
diff --git a/utils/themeeditor/gui/editorwindow.ui b/utils/themeeditor/gui/editorwindow.ui
index bd74e1369e..65f6f7e528 100644
--- a/utils/themeeditor/gui/editorwindow.ui
+++ b/utils/themeeditor/gui/editorwindow.ui
@@ -129,9 +129,6 @@
    <attribute name="toolBarBreak">
     <bool>false</bool>
    </attribute>
-   <addaction name="actionToolbarNew"/>
-   <addaction name="actionToolbarOpen"/>
-   <addaction name="actionToolbarSave"/>
   </widget>
   <widget class="QDockWidget" name="projectDock">
    <property name="windowTitle">
@@ -230,6 +227,10 @@
    </property>
   </action>
   <action name="actionNew_Document">
+   <property name="icon">
+    <iconset resource="../resources.qrc">
+     <normaloff>:/resources/resources/document-new.png</normaloff>:/resources/resources/document-new.png</iconset>
+   </property>
    <property name="text">
     <string>&amp;New Document</string>
    </property>
@@ -238,6 +239,10 @@
    </property>
   </action>
   <action name="actionOpen_Document">
+   <property name="icon">
+    <iconset resource="../resources.qrc">
+     <normaloff>:/resources/resources/document-open.png</normaloff>:/resources/resources/document-open.png</iconset>
+   </property>
    <property name="text">
     <string>&amp;Open Document</string>
    </property>
@@ -249,6 +254,10 @@
    <property name="enabled">
     <bool>false</bool>
    </property>
+   <property name="icon">
+    <iconset resource="../resources.qrc">
+     <normaloff>:/resources/resources/document-save.png</normaloff>:/resources/resources/document-save.png</iconset>
+   </property>
    <property name="text">
     <string>&amp;Save Document</string>
    </property>
@@ -271,6 +280,10 @@
    <property name="enabled">
     <bool>false</bool>
    </property>
+   <property name="icon">
+    <iconset resource="../resources.qrc">
+     <normaloff>:/resources/resources/document-save-as.png</normaloff>:/resources/resources/document-save-as.png</iconset>
+   </property>
    <property name="text">
     <string>Save Document &amp;As</string>
    </property>
@@ -334,6 +347,10 @@
    </property>
   </action>
   <action name="actionUndo">
+   <property name="icon">
+    <iconset resource="../resources.qrc">
+     <normaloff>:/resources/resources/edit-undo.png</normaloff>:/resources/resources/edit-undo.png</iconset>
+   </property>
    <property name="text">
     <string>&amp;Undo</string>
    </property>
@@ -342,6 +359,10 @@
    </property>
   </action>
   <action name="actionRedo">
+   <property name="icon">
+    <iconset resource="../resources.qrc">
+     <normaloff>:/resources/resources/edit-redo.png</normaloff>:/resources/resources/edit-redo.png</iconset>
+   </property>
    <property name="text">
     <string>&amp;Redo</string>
    </property>
@@ -350,6 +371,10 @@
    </property>
   </action>
   <action name="actionCut">
+   <property name="icon">
+    <iconset resource="../resources.qrc">
+     <normaloff>:/resources/resources/edit-cut.png</normaloff>:/resources/resources/edit-cut.png</iconset>
+   </property>
    <property name="text">
     <string>C&amp;ut</string>
    </property>
@@ -358,6 +383,10 @@
    </property>
   </action>
   <action name="actionCopy">
+   <property name="icon">
+    <iconset resource="../resources.qrc">
+     <normaloff>:/resources/resources/edit-copy.png</normaloff>:/resources/resources/edit-copy.png</iconset>
+   </property>
    <property name="text">
     <string>&amp;Copy</string>
    </property>
@@ -366,6 +395,10 @@
    </property>
   </action>
   <action name="actionPaste">
+   <property name="icon">
+    <iconset resource="../resources.qrc">
+     <normaloff>:/resources/resources/edit-paste.png</normaloff>:/resources/resources/edit-paste.png</iconset>
+   </property>
    <property name="text">
     <string>&amp;Paste</string>
    </property>
@@ -374,6 +407,10 @@
    </property>
   </action>
   <action name="actionFind_Replace">
+   <property name="icon">
+    <iconset resource="../resources.qrc">
+     <normaloff>:/resources/resources/edit-find-replace.png</normaloff>:/resources/resources/edit-find-replace.png</iconset>
+   </property>
    <property name="text">
     <string>&amp;Find/Replace</string>
    </property>
diff --git a/utils/themeeditor/resources.qrc b/utils/themeeditor/resources.qrc
index c00953a3c0..9290ca9b48 100644
--- a/utils/themeeditor/resources.qrc
+++ b/utils/themeeditor/resources.qrc
@@ -16,6 +16,13 @@
         <file>resources/cursor.png</file>
         <file>resources/lines.png</file>
         <file alias="tagdb">resources/tagdb</file>
+        <file>resources/document-save-as.png</file>
+        <file>resources/edit-redo.png</file>
+        <file>resources/edit-undo.png</file>
+        <file>resources/edit-copy.png</file>
+        <file>resources/edit-cut.png</file>
+        <file>resources/edit-paste.png</file>
+        <file>resources/edit-find-replace.png</file>
     </qresource>
     <qresource prefix="/render">
         <file alias="scenebg.png">resources/render/scenebg.png</file>
diff --git a/utils/themeeditor/resources/COPYING b/utils/themeeditor/resources/COPYING
index 3d9e7e72f0..14c27fa030 100644
--- a/utils/themeeditor/resources/COPYING
+++ b/utils/themeeditor/resources/COPYING
@@ -1,7 +1,8 @@
-The files ffwd.png, rwnd.png, play.png, pause.png, document-new.png, 
-document-open.png, and document-save.png came from
-the Tango Desktop Project (http://www.tango.freedesktop.org) and are in
-the public domain.
+The files edit-cut.png, edit-copy.png, edit-paste.png, edit-find-replace.png, 
+edit-undo.png, edit-redo.png, ffwd.png, rwnd.png, play.png, pause.png, 
+document-new.png, document-open.png, document-save-as.png, and document-save.png 
+came from the Tango Desktop Project (http://www.tango.freedesktop.org) and are 
+in the public domain.
 
 The files zoomin.png, zoomout.png, and zoomeven.png came from the Tango Project 
 with modifications by Robert Bieber, also in the public domain.
diff --git a/utils/themeeditor/resources/document-save-as.png b/utils/themeeditor/resources/document-save-as.png
new file mode 100644
index 0000000000..5c9f6b343b
Binary files /dev/null and b/utils/themeeditor/resources/document-save-as.png differ
diff --git a/utils/themeeditor/resources/edit-copy.png b/utils/themeeditor/resources/edit-copy.png
new file mode 100644
index 0000000000..3348ee08fd
Binary files /dev/null and b/utils/themeeditor/resources/edit-copy.png differ
diff --git a/utils/themeeditor/resources/edit-cut.png b/utils/themeeditor/resources/edit-cut.png
new file mode 100644
index 0000000000..217663b19c
Binary files /dev/null and b/utils/themeeditor/resources/edit-cut.png differ
diff --git a/utils/themeeditor/resources/edit-find-replace.png b/utils/themeeditor/resources/edit-find-replace.png
new file mode 100644
index 0000000000..0f1b117ff7
Binary files /dev/null and b/utils/themeeditor/resources/edit-find-replace.png differ
diff --git a/utils/themeeditor/resources/edit-paste.png b/utils/themeeditor/resources/edit-paste.png
new file mode 100644
index 0000000000..dd429ced62
Binary files /dev/null and b/utils/themeeditor/resources/edit-paste.png differ
diff --git a/utils/themeeditor/resources/edit-redo.png b/utils/themeeditor/resources/edit-redo.png
new file mode 100644
index 0000000000..3eb7b05c84
Binary files /dev/null and b/utils/themeeditor/resources/edit-redo.png differ
diff --git a/utils/themeeditor/resources/edit-undo.png b/utils/themeeditor/resources/edit-undo.png
new file mode 100644
index 0000000000..61b2ce9a53
Binary files /dev/null and b/utils/themeeditor/resources/edit-undo.png differ
diff --git a/utils/themeeditor/themeeditor.pro b/utils/themeeditor/themeeditor.pro
index da5fe4156b..d3d8b1d080 100644
--- a/utils/themeeditor/themeeditor.pro
+++ b/utils/themeeditor/themeeditor.pro
@@ -175,7 +175,14 @@ OTHER_FILES += README \
     quazip/README.ROCKBOX \
     quazip/LICENSE.GPL \
     qtfindreplacedialog/dialogs.pro \
-    resources/tagdb
+    resources/tagdb \
+    resources/document-save-as.png \
+    resources/edit-undo.png \
+    resources/edit-redo.png \
+    resources/edit-paste.png \
+    resources/edit-cut.png \
+    resources/edit-copy.png \
+    resources/edit-find-replace.png
 FORMS += gui/editorwindow.ui \
     gui/preferencesdialog.ui \
     gui/configdocument.ui \