diff --git a/COPYING b/COPYING
index 7dbc29c1c..50d8c47bf 100644
--- a/COPYING
+++ b/COPYING
@@ -134,11 +134,13 @@ Files: share/icons/application/*/actions/application-exit.png
        share/icons/application/*/actions/document-save-as.png
        share/icons/application/*/actions/edit-clear-locationbar-ltr.png
        share/icons/application/*/actions/edit-clear-locationbar-rtl.png
+       share/icons/application/*/actions/password-copy.png
        share/icons/application/*/actions/password-show-*.png
        share/icons/application/*/actions/system-search.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/*/status/username-copy.png
        share/icons/svg/*.svgz
 Copyright: 2007, Nuno Pinheiro <nuno@oxygen-icons.org>
            2007, David Vignoni <david@icon-king.com>
diff --git a/share/icons/application/16x16/actions/password-copy.png b/share/icons/application/16x16/actions/password-copy.png
new file mode 100644
index 000000000..259218934
Binary files /dev/null and b/share/icons/application/16x16/actions/password-copy.png differ
diff --git a/share/icons/application/16x16/actions/username-copy.png b/share/icons/application/16x16/actions/username-copy.png
new file mode 100644
index 000000000..1df39d428
Binary files /dev/null and b/share/icons/application/16x16/actions/username-copy.png differ
diff --git a/share/icons/svg/password-copy.svgz b/share/icons/svg/password-copy.svgz
new file mode 100644
index 000000000..9136d8399
Binary files /dev/null and b/share/icons/svg/password-copy.svgz differ
diff --git a/share/icons/svg/username-copy.svgz b/share/icons/svg/username-copy.svgz
new file mode 100644
index 000000000..0009cf9ad
Binary files /dev/null and b/share/icons/svg/username-copy.svgz differ
diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp
index a51c19735..57f2d45c6 100644
--- a/src/gui/MainWindow.cpp
+++ b/src/gui/MainWindow.cpp
@@ -107,6 +107,8 @@ MainWindow::MainWindow()
     m_ui->actionEntryEdit->setIcon(filePath()->icon("actions", "entry-edit", false));
     m_ui->actionEntryDelete->setIcon(filePath()->icon("actions", "entry-delete", false));
     m_ui->actionEntryAutoType->setIcon(filePath()->icon("actions", "auto-type", false));
+    m_ui->actionEntryCopyUsername->setIcon(filePath()->icon("actions", "username-copy", false));
+    m_ui->actionEntryCopyPassword->setIcon(filePath()->icon("actions", "password-copy", false));
 
     m_ui->actionGroupNew->setIcon(filePath()->icon("actions", "group-new", false));
     m_ui->actionGroupEdit->setIcon(filePath()->icon("actions", "group-edit", false));
diff --git a/src/gui/MainWindow.ui b/src/gui/MainWindow.ui
index dfc868166..a16dca79c 100644
--- a/src/gui/MainWindow.ui
+++ b/src/gui/MainWindow.ui
@@ -172,6 +172,9 @@
    <addaction name="actionEntryEdit"/>
    <addaction name="actionEntryDelete"/>
    <addaction name="separator"/>
+   <addaction name="actionEntryCopyUsername"/>
+   <addaction name="actionEntryCopyPassword"/>
+   <addaction name="separator"/>
    <addaction name="actionLockDatabases"/>
    <addaction name="actionSearch"/>
   </widget>
@@ -317,6 +320,9 @@
    <property name="text">
     <string>Username</string>
    </property>
+   <property name="toolTip">
+    <string>Copy username to clipboard</string>
+   </property>
   </action>
   <action name="actionEntryCopyPassword">
    <property name="enabled">
@@ -325,6 +331,9 @@
    <property name="text">
     <string>Password</string>
    </property>
+   <property name="toolTip">
+    <string>Copy password to clipboard</string>
+   </property>
   </action>
   <action name="actionSettings">
    <property name="text">