4 files changed, 8 insertions, 6 deletions

diff --git a/TODO b/TODO
index 906bc02..41d3f5e 100644
--- a/TODO
+++ b/TODO
@@ -14,10 +14,10 @@ Release 0.3.1
 - enum for verify status [DONE]
 - put sign/verify to toolbar and add shortcuts
 - umlaute are not handled correctly in signing
+- beautify icons for verify and sign
 
 BUGS: 
 - Sometimes two or more stars are shown at modified documents
-- enter "satan" keyserverimport and it crashes [DONE]
 - what should be shown in verify message?
 - show, if message is partially verified(how)?
 
@@ -81,6 +81,6 @@ usability:
 
 BUGS
 ----
-- key generation on windows 7 64-bit may fail
 - on windows an empty directory gnupg in application-data is created, find out how to disable
 - cancel decryption on windows hangs programm -> possibly bug in gpgme
+- entering wrong password for decrypt on windows hangs program -> possible bug in gpgme
diff --git a/gpgwin.cpp b/gpgwin.cpp
index 7052639..ab8efd1 100644
--- a/gpgwin.cpp
+++ b/gpgwin.cpp
@@ -247,14 +247,14 @@ void GpgWin::createActions()
     connect(fileEncryptionAct, SIGNAL(triggered()), this, SLOT(fileEncryption()));
 
     signAct = new QAction(tr("&Sign"), this);
-    //signAct->setIcon(QIcon(iconPath + "encrypted.png"));
-    //signAct->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_E));
+    signAct->setIcon(QIcon(iconPath + "signature.png"));
+    signAct->setShortcut(QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_S));
     signAct->setToolTip(tr("Sign Message"));
     connect(signAct, SIGNAL(triggered()), this, SLOT(sign()));
 
     verifyAct = new QAction(tr("&Verify"), this);
-    //signAct->setIcon(QIcon(iconPath + "encrypted.png"));
-    //signAct->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_E));
+    verifyAct->setIcon(QIcon(iconPath + "verify.png"));
+    verifyAct->setShortcut(QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_V));
     verifyAct->setToolTip(tr("Verify Message"));
     connect(verifyAct, SIGNAL(triggered()), this, SLOT(verify()));
 
@@ -392,6 +392,8 @@ void GpgWin::createToolBars()
     cryptToolBar->setObjectName("cryptToolBar");
     cryptToolBar->addAction(encryptAct);
     cryptToolBar->addAction(decryptAct);
+    cryptToolBar->addAction(signAct);
+    cryptToolBar->addAction(verifyAct);
     cryptToolBar->addAction(fileEncryptionAct);
     viewMenu->addAction(cryptToolBar->toggleViewAction());
 
diff --git a/release/icons/signature.png b/release/icons/signature.png
new file mode 100755
index 0000000..5f1f3fa
--- /dev/null
+++ b/release/icons/signature.png
diff --git a/release/icons/verify.png b/release/icons/verify.png
new file mode 100644
index 0000000..242f68b
--- /dev/null
+++ b/release/icons/verify.png