diff --git a/src/core/SignalMultiplexer.cpp b/src/core/SignalMultiplexer.cpp
index 7b5fab93..0f99b8e6 100644
--- a/src/core/SignalMultiplexer.cpp
+++ b/src/core/SignalMultiplexer.cpp
@@ -36,7 +36,7 @@ QObject* SignalMultiplexer::currentObject() const
 
 void SignalMultiplexer::setCurrentObject(QObject* object)
 {
-    // remove all Connections from the list whoes senders/receivers have been deleted
+    // remove all Connections from the list whose senders/receivers have been deleted
     QMutableListIterator<Connection> i = m_connections;
     while (i.hasNext()) {
         const Connection& con = i.next();
diff --git a/src/format/KeePass2Reader.cpp b/src/format/KeePass2Reader.cpp
index b45cefa6..1371aaa6 100644
--- a/src/format/KeePass2Reader.cpp
+++ b/src/format/KeePass2Reader.cpp
@@ -295,7 +295,7 @@ bool KeePass2Reader::readHeaderField()
         break;
 
     case KeePass2::TransformRounds:
-        setTansformRounds(fieldData);
+        setTransformRounds(fieldData);
         break;
 
     case KeePass2::EncryptionIV:
@@ -376,7 +376,7 @@ void KeePass2Reader::setTransformSeed(const QByteArray& data)
     }
 }
 
-void KeePass2Reader::setTansformRounds(const QByteArray& data)
+void KeePass2Reader::setTransformRounds(const QByteArray& data)
 {
     if (data.size() != 8) {
         raiseError("Invalid transform rounds size");
diff --git a/src/format/KeePass2Reader.h b/src/format/KeePass2Reader.h
index 827e671c..f8b96253 100644
--- a/src/format/KeePass2Reader.h
+++ b/src/format/KeePass2Reader.h
@@ -48,7 +48,7 @@ private:
     void setCompressionFlags(const QByteArray& data);
     void setMasterSeed(const QByteArray& data);
     void setTransformSeed(const QByteArray& data);
-    void setTansformRounds(const QByteArray& data);
+    void setTransformRounds(const QByteArray& data);
     void setEncryptionIV(const QByteArray& data);
     void setProtectedStreamKey(const QByteArray& data);
     void setStreamStartBytes(const QByteArray& data);
diff --git a/src/format/KeePass2XmlReader.cpp b/src/format/KeePass2XmlReader.cpp
index f7067259..dfb03bd0 100644
--- a/src/format/KeePass2XmlReader.cpp
+++ b/src/format/KeePass2XmlReader.cpp
@@ -178,7 +178,7 @@ bool KeePass2XmlReader::parseKeePassFile()
     Q_ASSERT(m_xml.isStartElement() && m_xml.name() == "KeePassFile");
 
     bool rootElementFound = false;
-    bool rootParsedSuccesfully = false;
+    bool rootParsedSuccessfully = false;
 
     while (!m_xml.error() && m_xml.readNextStartElement()) {
         if (m_xml.name() == "Meta") {
@@ -186,11 +186,11 @@ bool KeePass2XmlReader::parseKeePassFile()
         }
         else if (m_xml.name() == "Root") {
             if (rootElementFound) {
-                rootParsedSuccesfully = false;
+                rootParsedSuccessfully = false;
                 raiseError("Multiple root elements");
             }
             else {
-                rootParsedSuccesfully = parseRoot();
+                rootParsedSuccessfully = parseRoot();
                 rootElementFound = true;
             }
         }
@@ -199,7 +199,7 @@ bool KeePass2XmlReader::parseKeePassFile()
         }
     }
 
-    return rootParsedSuccesfully;
+    return rootParsedSuccessfully;
 }
 
 void KeePass2XmlReader::parseMeta()
@@ -458,12 +458,12 @@ bool KeePass2XmlReader::parseRoot()
     Q_ASSERT(m_xml.isStartElement() && m_xml.name() == "Root");
 
     bool groupElementFound = false;
-    bool groupParsedSuccesfully = false;
+    bool groupParsedSuccessfully = false;
 
     while (!m_xml.error() && m_xml.readNextStartElement()) {
         if (m_xml.name() == "Group") {
             if (groupElementFound) {
-                groupParsedSuccesfully = false;
+                groupParsedSuccessfully = false;
                 raiseError("Multiple group elements");
                 continue;
             }
@@ -473,7 +473,7 @@ bool KeePass2XmlReader::parseRoot()
                 Group* oldRoot = m_db->rootGroup();
                 m_db->setRootGroup(rootGroup);
                 delete oldRoot;
-                groupParsedSuccesfully = true;
+                groupParsedSuccessfully = true;
             }
 
             groupElementFound = true;
@@ -486,7 +486,7 @@ bool KeePass2XmlReader::parseRoot()
         }
     }
 
-    return groupParsedSuccesfully;
+    return groupParsedSuccessfully;
 }
 
 Group* KeePass2XmlReader::parseGroup()
diff --git a/src/gui/entry/EditEntryWidget.cpp b/src/gui/entry/EditEntryWidget.cpp
index 344a329f..d9ba5bd8 100644
--- a/src/gui/entry/EditEntryWidget.cpp
+++ b/src/gui/entry/EditEntryWidget.cpp
@@ -90,7 +90,7 @@ void EditEntryWidget::setupMain()
 
     m_mainUi->togglePasswordButton->setIcon(filePath()->onOffIcon("actions", "password-show"));
     connect(m_mainUi->togglePasswordButton, SIGNAL(toggled(bool)), m_mainUi->passwordEdit, SLOT(setShowPassword(bool)));
-    connect(m_mainUi->tooglePasswordGeneratorButton, SIGNAL(toggled(bool)), SLOT(togglePasswordGeneratorButton(bool)));
+    connect(m_mainUi->togglePasswordGeneratorButton, SIGNAL(toggled(bool)), SLOT(togglePasswordGeneratorButton(bool)));
     connect(m_mainUi->expireCheck, SIGNAL(toggled(bool)), m_mainUi->expireDatePicker, SLOT(setEnabled(bool)));
     m_mainUi->passwordRepeatEdit->enableVerifyMode(m_mainUi->passwordEdit);
     connect(m_mainUi->passwordGenerator, SIGNAL(appliedPassword(QString)), SLOT(setGeneratedPassword(QString)));
@@ -299,8 +299,8 @@ void EditEntryWidget::setForms(const Entry* entry, bool restore)
     m_mainUi->expireCheck->setEnabled(!m_history);
     m_mainUi->expireDatePicker->setReadOnly(m_history);
     m_mainUi->notesEdit->setReadOnly(m_history);
-    m_mainUi->tooglePasswordGeneratorButton->setChecked(false);
-    m_mainUi->tooglePasswordGeneratorButton->setDisabled(m_history);
+    m_mainUi->togglePasswordGeneratorButton->setChecked(false);
+    m_mainUi->togglePasswordGeneratorButton->setDisabled(m_history);
     m_mainUi->passwordGenerator->reset();
     m_advancedUi->addAttachmentButton->setEnabled(!m_history);
     updateAttachmentButtonsEnabled(m_advancedUi->attachmentsView->currentIndex());
@@ -529,7 +529,7 @@ void EditEntryWidget::setGeneratedPassword(const QString& password)
     m_mainUi->passwordEdit->setText(password);
     m_mainUi->passwordRepeatEdit->setText(password);
 
-    m_mainUi->tooglePasswordGeneratorButton->setChecked(false);
+    m_mainUi->togglePasswordGeneratorButton->setChecked(false);
 }
 
 void EditEntryWidget::insertAttribute()
diff --git a/src/gui/entry/EditEntryWidgetMain.ui b/src/gui/entry/EditEntryWidgetMain.ui
index ebf32425..083f1c03 100644
--- a/src/gui/entry/EditEntryWidgetMain.ui
+++ b/src/gui/entry/EditEntryWidgetMain.ui
@@ -76,7 +76,7 @@
       </widget>
      </item>
      <item>
-      <widget class="QToolButton" name="tooglePasswordGeneratorButton">
+      <widget class="QToolButton" name="togglePasswordGeneratorButton">
        <property name="text">
         <string>Generate</string>
        </property>
@@ -166,7 +166,7 @@
   <tabstop>passwordEdit</tabstop>
   <tabstop>passwordRepeatEdit</tabstop>
   <tabstop>togglePasswordButton</tabstop>
-  <tabstop>tooglePasswordGeneratorButton</tabstop>
+  <tabstop>togglePasswordGeneratorButton</tabstop>
   <tabstop>urlEdit</tabstop>
   <tabstop>expireCheck</tabstop>
   <tabstop>expireDatePicker</tabstop>
diff --git a/tests/gui/TestGui.cpp b/tests/gui/TestGui.cpp
index 01f16524..babab8ab 100644
--- a/tests/gui/TestGui.cpp
+++ b/tests/gui/TestGui.cpp
@@ -328,7 +328,7 @@ void TestGui::testEntryEntropy()
     QTest::keyClicks(titleEdit, "test");
 
     // Open the password generator
-    QToolButton* generatorButton = editEntryWidget->findChild<QToolButton*>("tooglePasswordGeneratorButton");
+    QToolButton* generatorButton = editEntryWidget->findChild<QToolButton*>("togglePasswordGeneratorButton");
     QTest::mouseClick(generatorButton, Qt::LeftButton);
 
     // Type in some password