diff --git a/COPYING b/COPYING
index d4662eacf..df6064472 100644
--- a/COPYING
+++ b/COPYING
@@ -32,9 +32,19 @@ Copyright: 2006, Otto Salminen
            2011, Felix Geyer <debfx@fobos.de>
 License: GPL-2
 
-Files: share/icons/application/22x22/action/dialog-close.png, share/icons/application/22x22/action/dialog-ok.png,
-       share/icons/application/22x22/status/dialog-error.png, share/icons/application/22x22/status/dialog-information.png,
-       share/icons/application/22x22/status/dialog-warning.png
+Files: share/icons/application/*/actions/entry-clone.png, share/icons/application/*/actions/entry-edit.png,
+       share/icons/application/*/actions/entry-new.png, share/icons/application/*/actions/password-generate.png
+Copyright: 2003-2004, David Vignoni <david@icon-king.com>
+License: LGPL-2.1
+
+Files: share/icons/application/*/actions/entry-delete.png
+Copyright: 2003-2004, David Vignoni <david@icon-king.com>
+           2012, Felix Geyer <debfx@fobos.de>
+License: LGPL-2.1
+
+Files: share/icons/application/*/action/dialog-close.png, share/icons/application/*/action/dialog-ok.png,
+       share/icons/application/*/status/dialog-error.png, share/icons/application/*/status/dialog-information.png,
+       share/icons/application/*/status/dialog-warning.png, share/icons/application/*/actions/system-search.png
 Copyright: 2007, Nuno Pinheiro <nuno@oxygen-icons.org>
            2007, David Vignoni <david@icon-king.com>
            2007, David Miller <miller@oxygen-icons.org>
diff --git a/share/icons/application/16x16/actions/entry-clone.png b/share/icons/application/16x16/actions/entry-clone.png
new file mode 100644
index 000000000..43e5a521d
Binary files /dev/null and b/share/icons/application/16x16/actions/entry-clone.png differ
diff --git a/share/icons/application/16x16/actions/entry-delete.png b/share/icons/application/16x16/actions/entry-delete.png
new file mode 100644
index 000000000..0a21e090e
Binary files /dev/null and b/share/icons/application/16x16/actions/entry-delete.png differ
diff --git a/share/icons/application/16x16/actions/entry-edit.png b/share/icons/application/16x16/actions/entry-edit.png
new file mode 100644
index 000000000..83f4eed2c
Binary files /dev/null and b/share/icons/application/16x16/actions/entry-edit.png differ
diff --git a/share/icons/application/16x16/actions/entry-new.png b/share/icons/application/16x16/actions/entry-new.png
new file mode 100644
index 000000000..3f6a25e4f
Binary files /dev/null and b/share/icons/application/16x16/actions/entry-new.png differ
diff --git a/share/icons/application/16x16/actions/password-generate.png b/share/icons/application/16x16/actions/password-generate.png
new file mode 100644
index 000000000..74578fb8d
Binary files /dev/null and b/share/icons/application/16x16/actions/password-generate.png differ
diff --git a/share/icons/application/16x16/actions/system-search.png b/share/icons/application/16x16/actions/system-search.png
new file mode 100644
index 000000000..354c0f98f
Binary files /dev/null and b/share/icons/application/16x16/actions/system-search.png differ
diff --git a/share/icons/application/22x22/action/entry-delete.png b/share/icons/application/22x22/action/entry-delete.png
new file mode 100644
index 000000000..11b846e8c
Binary files /dev/null and b/share/icons/application/22x22/action/entry-delete.png differ
diff --git a/share/icons/application/22x22/action/entry-edit.png b/share/icons/application/22x22/action/entry-edit.png
new file mode 100644
index 000000000..f407cfab5
Binary files /dev/null and b/share/icons/application/22x22/action/entry-edit.png differ
diff --git a/share/icons/application/22x22/action/entry-new.png b/share/icons/application/22x22/action/entry-new.png
new file mode 100644
index 000000000..a1c0b34b3
Binary files /dev/null and b/share/icons/application/22x22/action/entry-new.png differ
diff --git a/share/icons/application/22x22/action/system-search.png b/share/icons/application/22x22/action/system-search.png
new file mode 100644
index 000000000..931d932ff
Binary files /dev/null and b/share/icons/application/22x22/action/system-search.png differ
diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp
index c2563ad77..2aaea2bb5 100644
--- a/src/gui/MainWindow.cpp
+++ b/src/gui/MainWindow.cpp
@@ -44,6 +44,13 @@ MainWindow::MainWindow()
     m_ui->actionEntryCopyUsername->setShortcut(Qt::CTRL + Qt::Key_B);
     m_ui->actionEntryCopyPassword->setShortcut(Qt::CTRL + Qt::Key_C);
 
+    m_ui->actionEntryNew->setIcon(dataPath()->icon("actions", "entry-new", false));
+    m_ui->actionEntryClone->setIcon(dataPath()->icon("actions", "entry-clone", false));
+    m_ui->actionEntryEdit->setIcon(dataPath()->icon("actions", "entry-edit", false));
+    m_ui->actionEntryDelete->setIcon(dataPath()->icon("actions", "entry-delete", false));
+
+    m_ui->actionSearch->setIcon(dataPath()->icon("actions", "system-search", true));
+
     connect(m_ui->tabWidget, SIGNAL(entrySelectionChanged(bool)),
             SLOT(setMenuActionState()));
     connect(m_ui->tabWidget, SIGNAL(currentWidgetModeChanged(DatabaseWidget::Mode)),