diff --git a/src/browser/BrowserService.cpp b/src/browser/BrowserService.cpp
index aa114cef0..a0b42f787 100644
--- a/src/browser/BrowserService.cpp
+++ b/src/browser/BrowserService.cpp
@@ -348,7 +348,7 @@ void BrowserService::addEntry(const QString& id,
                               const QString& realm,
                               const QString& group,
                               const QString& groupUuid,
-                              QSharedPointer<Database> selectedDb)
+                              const QSharedPointer<Database>& selectedDb)
 {
     if (thread() != QThread::currentThread()) {
         QMetaObject::invokeMethod(this,
@@ -482,7 +482,7 @@ void BrowserService::updateEntry(const QString& id,
     }
 }
 
-QList<Entry*> BrowserService::searchEntries(QSharedPointer<Database> db, const QString& hostname, const QString& url)
+QList<Entry*> BrowserService::searchEntries(const QSharedPointer<Database>& db, const QString& hostname, const QString& url)
 {
     QList<Entry*> entries;
     auto* rootGroup = db->rootGroup();
@@ -549,7 +549,7 @@ QList<Entry*> BrowserService::searchEntries(const QString& url, const StringPair
     return entries;
 }
 
-void BrowserService::convertAttributesToCustomData(QSharedPointer<Database> currentDb)
+void BrowserService::convertAttributesToCustomData(const QSharedPointer<Database>& currentDb)
 {
     auto db = currentDb ? currentDb : getDatabase();
     if (!db) {
@@ -770,7 +770,7 @@ BrowserService::checkAccess(const Entry* entry, const QString& host, const QStri
     return Unknown;
 }
 
-Group* BrowserService::findCreateAddEntryGroup(QSharedPointer<Database> selectedDb)
+Group* BrowserService::findCreateAddEntryGroup(const QSharedPointer<Database>& selectedDb)
 {
     auto db = selectedDb ? selectedDb : getDatabase();
     if (!db) {
@@ -955,7 +955,7 @@ bool BrowserService::moveSettingsToCustomData(Entry* entry, const QString& name)
     return false;
 }
 
-int BrowserService::moveKeysToCustomData(Entry* entry, QSharedPointer<Database> db) const
+int BrowserService::moveKeysToCustomData(Entry* entry, const QSharedPointer<Database>& db) const
 {
     int keyCounter = 0;
     for (const auto& key : entry->attributes()->keys()) {
diff --git a/src/browser/BrowserService.h b/src/browser/BrowserService.h
index 8db7be5d8..240fe232c 100644
--- a/src/browser/BrowserService.h
+++ b/src/browser/BrowserService.h
@@ -54,10 +54,10 @@ public:
                   const QString& realm,
                   const QString& group,
                   const QString& groupUuid,
-                  QSharedPointer<Database> selectedDb = {});
-    QList<Entry*> searchEntries(QSharedPointer<Database> db, const QString& hostname, const QString& url);
+                  const QSharedPointer<Database>& selectedDb = {});
+    QList<Entry*> searchEntries(const QSharedPointer<Database>& db, const QString& hostname, const QString& url);
     QList<Entry*> searchEntries(const QString& url, const StringPairList& keyList);
-    void convertAttributesToCustomData(QSharedPointer<Database> currentDb = {});
+    void convertAttributesToCustomData(const QSharedPointer<Database>& currentDb = {});
 
 public:
     static const char KEEPASSXCBROWSER_NAME[];
@@ -106,7 +106,7 @@ private:
                         const QString& realm);
     QJsonObject prepareEntry(const Entry* entry);
     Access checkAccess(const Entry* entry, const QString& host, const QString& submitHost, const QString& realm);
-    Group* findCreateAddEntryGroup(QSharedPointer<Database> selectedDb = {});
+    Group* findCreateAddEntryGroup(const QSharedPointer<Database>& selectedDb = {});
     int
     sortPriority(const Entry* entry, const QString& host, const QString& submitUrl, const QString& baseSubmitUrl) const;
     bool matchUrlScheme(const QString& url);
@@ -116,7 +116,7 @@ private:
     QSharedPointer<Database> selectedDatabase();
     QJsonArray addChildrenToGroup(Group* group);
     bool moveSettingsToCustomData(Entry* entry, const QString& name) const;
-    int moveKeysToCustomData(Entry* entry, QSharedPointer<Database> db) const;
+    int moveKeysToCustomData(Entry* entry, const QSharedPointer<Database>& db) const;
     bool checkLegacySettings();
     void hideWindow() const;
     void raiseWindow(const bool force = false);
diff --git a/src/cli/Clip.cpp b/src/cli/Clip.cpp
index 25aea06e1..6e346f25c 100644
--- a/src/cli/Clip.cpp
+++ b/src/cli/Clip.cpp
@@ -77,7 +77,7 @@ int Clip::execute(const QStringList& arguments)
     return clipEntry(db, args.at(1), args.value(2), parser.isSet(totp), parser.isSet(Command::QuietOption));
 }
 
-int Clip::clipEntry(QSharedPointer<Database> database,
+int Clip::clipEntry(const QSharedPointer<Database>& database,
                     const QString& entryPath,
                     const QString& timeout,
                     bool clipTotp,
diff --git a/src/cli/Clip.h b/src/cli/Clip.h
index bdc1de03d..65a616955 100644
--- a/src/cli/Clip.h
+++ b/src/cli/Clip.h
@@ -26,7 +26,7 @@ public:
     Clip();
     ~Clip();
     int execute(const QStringList& arguments) override;
-    int clipEntry(QSharedPointer<Database> database,
+    int clipEntry(const QSharedPointer<Database>& database,
                   const QString& entryPath,
                   const QString& timeout,
                   bool clipTotp,
diff --git a/src/cli/Create.cpp b/src/cli/Create.cpp
index 39aca63b6..b8c094f90 100644
--- a/src/cli/Create.cpp
+++ b/src/cli/Create.cpp
@@ -74,7 +74,7 @@ int Create::execute(const QStringList& arguments)
         return EXIT_FAILURE;
     }
 
-    QString databaseFilename = args.at(0);
+    const QString& databaseFilename = args.at(0);
     if (QFileInfo::exists(databaseFilename)) {
         err << QObject::tr("File %1 already exists.").arg(databaseFilename) << endl;
         return EXIT_FAILURE;
@@ -150,7 +150,7 @@ QSharedPointer<PasswordKey> Create::getPasswordFromStdin()
  * @param fileKey Resulting fileKey
  * @return true if the key file was loaded succesfully
  */
-bool Create::loadFileKey(QString path, QSharedPointer<FileKey>& fileKey)
+bool Create::loadFileKey(const QString& path, QSharedPointer<FileKey>& fileKey)
 {
     QTextStream err(Utils::STDERR, QIODevice::WriteOnly);
 
diff --git a/src/cli/Create.h b/src/cli/Create.h
index 9c14d37b2..85993eaeb 100644
--- a/src/cli/Create.h
+++ b/src/cli/Create.h
@@ -33,7 +33,7 @@ public:
 private:
     QSharedPointer<PasswordKey> getPasswordFromStdin();
     QSharedPointer<FileKey> getFileKeyFromStdin();
-    bool loadFileKey(QString path, QSharedPointer<FileKey>& fileKey);
+    bool loadFileKey(const QString& path, QSharedPointer<FileKey>& fileKey);
 };
 
 #endif // KEEPASSXC_CREATE_H
diff --git a/src/format/CsvExporter.cpp b/src/format/CsvExporter.cpp
index 0d9a4e0a7..03d5a576f 100644
--- a/src/format/CsvExporter.cpp
+++ b/src/format/CsvExporter.cpp
@@ -23,7 +23,7 @@
 #include "core/Database.h"
 #include "core/Group.h"
 
-bool CsvExporter::exportDatabase(const QString& filename, QSharedPointer<const Database> db)
+bool CsvExporter::exportDatabase(const QString& filename, const QSharedPointer<const Database>& db)
 {
     QFile file(filename);
     if (!file.open(QIODevice::WriteOnly | QIODevice::Truncate)) {
@@ -33,7 +33,7 @@ bool CsvExporter::exportDatabase(const QString& filename, QSharedPointer<const D
     return exportDatabase(&file, db);
 }
 
-bool CsvExporter::exportDatabase(QIODevice* device, QSharedPointer<const Database> db)
+bool CsvExporter::exportDatabase(QIODevice* device, const QSharedPointer<const Database>& db)
 {
     QString header;
     addColumn(header, "Group");
diff --git a/src/format/CsvExporter.h b/src/format/CsvExporter.h
index 3cb41c0af..e71cf7fa9 100644
--- a/src/format/CsvExporter.h
+++ b/src/format/CsvExporter.h
@@ -29,8 +29,8 @@ class QIODevice;
 class CsvExporter
 {
 public:
-    bool exportDatabase(const QString& filename, QSharedPointer<const Database> db);
-    bool exportDatabase(QIODevice* device, QSharedPointer<const Database> db);
+    bool exportDatabase(const QString& filename, const QSharedPointer<const Database>& db);
+    bool exportDatabase(QIODevice* device, const QSharedPointer<const Database>& db);
     QString errorString() const;
 
 private:
diff --git a/src/gui/EditWidgetIcons.cpp b/src/gui/EditWidgetIcons.cpp
index a7cfb80cb..990e480ee 100644
--- a/src/gui/EditWidgetIcons.cpp
+++ b/src/gui/EditWidgetIcons.cpp
@@ -113,7 +113,7 @@ void EditWidgetIcons::reset()
 }
 
 void EditWidgetIcons::load(const QUuid& currentUuid,
-                           QSharedPointer<Database> database,
+                           const QSharedPointer<Database>& database,
                            const IconStruct& iconStruct,
                            const QString& url)
 {
diff --git a/src/gui/EditWidgetIcons.h b/src/gui/EditWidgetIcons.h
index 5c02f31a1..a01b920f0 100644
--- a/src/gui/EditWidgetIcons.h
+++ b/src/gui/EditWidgetIcons.h
@@ -60,7 +60,7 @@ public:
     IconStruct state();
     void reset();
     void load(const QUuid& currentUuid,
-              QSharedPointer<Database> database,
+              const QSharedPointer<Database>& database,
               const IconStruct& iconStruct,
               const QString& url = "");
 
diff --git a/src/gui/dbsettings/DatabaseSettingsDialog.cpp b/src/gui/dbsettings/DatabaseSettingsDialog.cpp
index 550319777..6475793f9 100644
--- a/src/gui/dbsettings/DatabaseSettingsDialog.cpp
+++ b/src/gui/dbsettings/DatabaseSettingsDialog.cpp
@@ -105,7 +105,7 @@ DatabaseSettingsDialog::~DatabaseSettingsDialog()
 {
 }
 
-void DatabaseSettingsDialog::load(QSharedPointer<Database> db)
+void DatabaseSettingsDialog::load(const QSharedPointer<Database>& db)
 {
     m_ui->categoryList->setCurrentCategory(0);
     m_generalWidget->load(db);
diff --git a/src/gui/dbsettings/DatabaseSettingsDialog.h b/src/gui/dbsettings/DatabaseSettingsDialog.h
index 2a1a89fab..855978f29 100644
--- a/src/gui/dbsettings/DatabaseSettingsDialog.h
+++ b/src/gui/dbsettings/DatabaseSettingsDialog.h
@@ -61,7 +61,7 @@ public:
     ~DatabaseSettingsDialog() override;
     Q_DISABLE_COPY(DatabaseSettingsDialog);
 
-    void load(QSharedPointer<Database> db);
+    void load(const QSharedPointer<Database>& db);
     void addSettingsPage(IDatabaseSettingsPage* page);
     void showMasterKeySettings();
 
diff --git a/src/gui/dbsettings/DatabaseSettingsWidget.cpp b/src/gui/dbsettings/DatabaseSettingsWidget.cpp
index 7b438cc33..4699344a7 100644
--- a/src/gui/dbsettings/DatabaseSettingsWidget.cpp
+++ b/src/gui/dbsettings/DatabaseSettingsWidget.cpp
@@ -18,6 +18,8 @@
 #include "DatabaseSettingsWidget.h"
 #include "core/Database.h"
 
+#include <utility>
+
 #include <QTimer>
 #include <QWidget>
 
@@ -38,6 +40,6 @@ DatabaseSettingsWidget::~DatabaseSettingsWidget()
  */
 void DatabaseSettingsWidget::load(QSharedPointer<Database> db)
 {
-    m_db = db;
+    m_db = std::move(db);
     initialize();
 }
diff --git a/src/gui/group/EditGroupWidget.cpp b/src/gui/group/EditGroupWidget.cpp
index 4acad5339..41351d3d9 100644
--- a/src/gui/group/EditGroupWidget.cpp
+++ b/src/gui/group/EditGroupWidget.cpp
@@ -91,7 +91,7 @@ EditGroupWidget::~EditGroupWidget()
 {
 }
 
-void EditGroupWidget::loadGroup(Group* group, bool create, QSharedPointer<Database> database)
+void EditGroupWidget::loadGroup(Group* group, bool create, const QSharedPointer<Database>& database)
 {
     m_group = group;
     m_db = database;
diff --git a/src/gui/group/EditGroupWidget.h b/src/gui/group/EditGroupWidget.h
index f013be796..4de117724 100644
--- a/src/gui/group/EditGroupWidget.h
+++ b/src/gui/group/EditGroupWidget.h
@@ -55,7 +55,7 @@ public:
     explicit EditGroupWidget(QWidget* parent = nullptr);
     ~EditGroupWidget();
 
-    void loadGroup(Group* group, bool create, QSharedPointer<Database> database);
+    void loadGroup(Group* group, bool create, const QSharedPointer<Database>& database);
     void clear();
 
     void addEditPage(IEditGroupPage* page);
diff --git a/src/gui/group/GroupView.cpp b/src/gui/group/GroupView.cpp
index 567048631..7c3c91355 100644
--- a/src/gui/group/GroupView.cpp
+++ b/src/gui/group/GroupView.cpp
@@ -50,7 +50,7 @@ GroupView::GroupView(Database* db, QWidget* parent)
     setDefaultDropAction(Qt::MoveAction);
 }
 
-void GroupView::changeDatabase(QSharedPointer<Database> newDb)
+void GroupView::changeDatabase(const QSharedPointer<Database>& newDb)
 {
     m_model->changeDatabase(newDb.data());
 }
diff --git a/src/gui/group/GroupView.h b/src/gui/group/GroupView.h
index 141706b07..61f7b3bac 100644
--- a/src/gui/group/GroupView.h
+++ b/src/gui/group/GroupView.h
@@ -30,7 +30,7 @@ class GroupView : public QTreeView
 
 public:
     explicit GroupView(Database* db, QWidget* parent = nullptr);
-    void changeDatabase(QSharedPointer<Database> newDb);
+    void changeDatabase(const QSharedPointer<Database>& newDb);
     void setModel(QAbstractItemModel* model) override;
     Group* currentGroup();
     void setCurrentGroup(Group* group);
diff --git a/src/gui/wizard/NewDatabaseWizardPage.h b/src/gui/wizard/NewDatabaseWizardPage.h
index ea5158a00..02df31027 100644
--- a/src/gui/wizard/NewDatabaseWizardPage.h
+++ b/src/gui/wizard/NewDatabaseWizardPage.h
@@ -38,7 +38,7 @@ class NewDatabaseWizardPage : public QWizardPage
 
 public:
     explicit NewDatabaseWizardPage(QWidget* parent = nullptr);
-    Q_DISABLE_COPY(NewDatabaseWizardPage);
+    Q_DISABLE_COPY(NewDatabaseWizardPage)
     ~NewDatabaseWizardPage() override;
 
     void setPageWidget(DatabaseSettingsWidget* page);