diff --git a/src/browser/BrowserAction.cpp b/src/browser/BrowserAction.cpp
index 70b301fda3..20b2fc975f 100644
--- a/src/browser/BrowserAction.cpp
+++ b/src/browser/BrowserAction.cpp
@@ -541,10 +541,7 @@ QString BrowserAction::getDatabaseHash()
 {
     QMutexLocker locker(&m_mutex);
     QByteArray hash =
-        QCryptographicHash::hash(
-            m_browserService.getDatabaseRootUuid().toUtf8(),
-            QCryptographicHash::Sha256)
-            .toHex();
+        QCryptographicHash::hash(m_browserService.getDatabaseRootUuid().toUtf8(), QCryptographicHash::Sha256).toHex();
     return QString(hash);
 }
 
diff --git a/src/cli/Add.cpp b/src/cli/Add.cpp
index bd29a169a6..c8a0189e42 100644
--- a/src/cli/Add.cpp
+++ b/src/cli/Add.cpp
@@ -45,7 +45,6 @@ const QCommandLineOption Add::GenerateOption = QCommandLineOption(QStringList()
                                                                                 << "generate",
                                                                   QObject::tr("Generate a password for the entry."));
 
-
 Add::Add()
 {
     name = QString("add");
diff --git a/src/cli/Export.cpp b/src/cli/Export.cpp
index 77acaf8067..f68826a23e 100644
--- a/src/cli/Export.cpp
+++ b/src/cli/Export.cpp
@@ -38,7 +38,6 @@ Export::Export()
     description = QObject::tr("Exports the content of a database to standard output in the specified format.");
 }
 
-
 int Export::executeWithDatabase(QSharedPointer<Database> database, QSharedPointer<QCommandLineParser> parser)
 {
     TextStream outputTextStream(Utils::STDOUT, QIODevice::WriteOnly);
diff --git a/src/core/Bootstrap.cpp b/src/core/Bootstrap.cpp
index 204942f4de..2d1a3e0878 100644
--- a/src/core/Bootstrap.cpp
+++ b/src/core/Bootstrap.cpp
@@ -257,7 +257,7 @@ namespace Bootstrap
                                       nullptr, // do not change owner or group
                                       pACL, // DACL specified
                                       nullptr // do not change SACL
-                   );
+                      );
 
     Cleanup:
 
diff --git a/src/gui/dbsettings/DatabaseSettingsWidgetBrowser.cpp b/src/gui/dbsettings/DatabaseSettingsWidgetBrowser.cpp
index 4ea30c1f6f..fac85c21e6 100644
--- a/src/gui/dbsettings/DatabaseSettingsWidgetBrowser.cpp
+++ b/src/gui/dbsettings/DatabaseSettingsWidgetBrowser.cpp
@@ -242,12 +242,12 @@ void DatabaseSettingsWidgetBrowser::convertAttributesToCustomData()
 {
     if (MessageBox::Yes
         != MessageBox::question(
-            this,
-            tr("Move KeePassHTTP attributes to custom data"),
-            tr("Do you really want to move all legacy browser integration data to the latest standard?\n"
-               "This is necessary to maintain compatibility with the browser plugin."),
-            MessageBox::Yes | MessageBox::Cancel,
-            MessageBox::Cancel)) {
+               this,
+               tr("Move KeePassHTTP attributes to custom data"),
+               tr("Do you really want to move all legacy browser integration data to the latest standard?\n"
+                  "This is necessary to maintain compatibility with the browser plugin."),
+               MessageBox::Yes | MessageBox::Cancel,
+               MessageBox::Cancel)) {
         return;
     }
 
diff --git a/src/keys/YkChallengeResponseKeyCLI.h b/src/keys/YkChallengeResponseKeyCLI.h
index 93e73a56f8..ed2d62b2ab 100644
--- a/src/keys/YkChallengeResponseKeyCLI.h
+++ b/src/keys/YkChallengeResponseKeyCLI.h
@@ -32,10 +32,7 @@ class YkChallengeResponseKeyCLI : public QObject, public ChallengeResponseKey
 public:
     static QUuid UUID;
 
-    explicit YkChallengeResponseKeyCLI(int slot,
-                                       bool blocking,
-                                       QString messageInteraction,
-                                       FILE* outputDescriptor);
+    explicit YkChallengeResponseKeyCLI(int slot, bool blocking, QString messageInteraction, FILE* outputDescriptor);
 
     QByteArray rawKey() const override;
     bool challenge(const QByteArray& challenge) override;
diff --git a/tests/TestMerge.cpp b/tests/TestMerge.cpp
index a682e8681c..4f96d3e6d5 100644
--- a/tests/TestMerge.cpp
+++ b/tests/TestMerge.cpp
@@ -1214,7 +1214,6 @@ void TestMerge::testCustomData()
     QCOMPARE(dbDestination->metadata()->customData()->value("key3"),
              QString("newValue")); // Old value should be replaced
 
-
     // Merging again should not do anything if the values are the same.
     m_clock->advanceSecond(1);
     dbSource->metadata()->customData()->set("key3", "oldValue");
@@ -1223,7 +1222,6 @@ void TestMerge::testCustomData()
     QStringList changes2 = merger2.merge();
     QVERIFY(changes2.isEmpty());
 
-
     Merger merger3(dbSource2.data(), dbDestination2.data());
     merger3.merge();
 
diff --git a/tests/gui/TestGuiBrowser.cpp b/tests/gui/TestGuiBrowser.cpp
index 7f2c548050..1b578df02b 100644
--- a/tests/gui/TestGuiBrowser.cpp
+++ b/tests/gui/TestGuiBrowser.cpp
@@ -26,8 +26,8 @@
 #include <QDialogButtonBox>
 #include <QLineEdit>
 #include <QPushButton>
-#include <QToolBar>
 #include <QTableView>
+#include <QToolBar>
 
 #include "config-keepassx-tests.h"
 #include "core/Bootstrap.h"
@@ -144,7 +144,7 @@ void TestGuiBrowser::testEntrySettings()
     QTest::mouseClick(entryEditWidget, Qt::LeftButton);
     QCOMPARE(m_dbWidget->currentMode(), DatabaseWidget::Mode::EditMode);
     auto* editEntryWidget = m_dbWidget->findChild<EditEntryWidget*>("editEntryWidget");
-    
+
     // Switch to Properties page and select all rows from the custom data table
     editEntryWidget->setCurrentPage(4);
     auto customDataTableView = editEntryWidget->findChild<QTableView*>("customDataTable");
@@ -181,9 +181,9 @@ void TestGuiBrowser::triggerAction(const QString& name)
 }
 
 void TestGuiBrowser::clickIndex(const QModelIndex& index,
-                         QAbstractItemView* view,
-                         Qt::MouseButton button,
-                         Qt::KeyboardModifiers stateKey)
+                                QAbstractItemView* view,
+                                Qt::MouseButton button,
+                                Qt::KeyboardModifiers stateKey)
 {
     QTest::mouseClick(view->viewport(), button, stateKey, view->visualRect(index).center());
 }