diff --git a/src/view/welcomewidget.cpp b/src/view/welcomewidget.cpp
index c1e0fe406..0b0faf2b7 100644
--- a/src/view/welcomewidget.cpp
+++ b/src/view/welcomewidget.cpp
@@ -1,147 +1,149 @@
 /*  view/smartcardwidget.h
 
     This file is part of Kleopatra, the KDE keymanager
     SPDX-FileCopyrightText: 2017 Bundesamt für Sicherheit in der Informationstechnik
     SPDX-FileContributor: Intevation GmbH
 
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
 #include "welcomewidget.h"
 
 #include <version-kleopatra.h>
 #include <Libkleo/GnuPG>
 
 #include <QVBoxLayout>
 #include <QHBoxLayout>
 #include <QToolButton>
 #include <QLabel>
 #include <QAction>
 
 #include "commands/importcertificatefromfilecommand.h"
 #include "commands/newcertificatecommand.h"
 
 #include <KLocalizedString>
 #include <KSharedConfig>
 #include <KConfigGroup>
 
 static const QString templ = QStringLiteral(
 "<h3>%1</h3>" // Welcome
 "<p>%2<p/><p>%3</p>" // Intro + Explanation
 "<ul><li>%4</li><li>%5</li></ul>" //
 "<p>%6</p>" // More info
 "");
 
 using namespace Kleo;
 
 class WelcomeWidget::Private
 {
 public:
     Private(WelcomeWidget *qq): q(qq)
     {
         auto vLay = new QVBoxLayout(q);
         auto hLay = new QHBoxLayout;
 
         const QString welcome = i18nc("%1 is version", "Welcome to Kleopatra %1",
 #ifdef Q_OS_WIN
                                       Kleo::gpg4winVersion());
 #else
                                       QStringLiteral(KLEOPATRA_VERSION_STRING));
 #endif
         const QString introduction = i18n("Kleopatra is a front-end for the crypto software <a href=\"https://gnupg.org\">GnuPG</a>.");
 
         const QString keyExplanation = i18n("For most actions you need either a public key (certificate) or your own private key.");
 
         const QString privateKeyExplanation = i18n("The private key is needed to decrypt or sign.");
         const QString publicKeyExplanation = i18n("The public key can be used by others to verify your identity or encrypt to you.");
 
         const QString wikiUrl = i18nc("More info about public key cryptography, please link to your local version of Wikipedia",
                                       "https://en.wikipedia.org/wiki/Public-key_cryptography");
         const QString learnMore = i18nc("%1 is link a wiki article", "You can learn more about this on <a href=\"%1\">Wikipedia</a>.", wikiUrl);
 
-        auto label = new QLabel(templ.arg(welcome).arg(introduction).arg(keyExplanation).arg(privateKeyExplanation).arg(publicKeyExplanation).arg(learnMore));
-        label->setTextInteractionFlags(Qt::TextBrowserInteraction);
-        label->setOpenExternalLinks(true);
+        const auto labelText = templ.arg(welcome).arg(introduction).arg(keyExplanation).arg(privateKeyExplanation).arg(publicKeyExplanation).arg(learnMore);
+        mLabel = new QLabel{labelText, q};
+        mLabel->setTextInteractionFlags(Qt::TextBrowserInteraction);
+        mLabel->setOpenExternalLinks(true);
 
         auto genKeyAction = new QAction(q);
         genKeyAction->setText(i18n("New Key Pair..."));
         genKeyAction->setIcon(QIcon::fromTheme(QStringLiteral("view-certificate-add")));
 
         auto importAction = new QAction(q);
         importAction->setText(i18n("Import..."));
         importAction->setIcon(QIcon::fromTheme(QStringLiteral("view-certificate-import")));
 
         connect(importAction, &QAction::triggered, q, [this] () { import(); });
         connect(genKeyAction, &QAction::triggered, q, [this] () { generate(); });
 
-        mGenerateBtn = new QToolButton();
+        mGenerateBtn = new QToolButton{q};
         mGenerateBtn->setDefaultAction(genKeyAction);
         mGenerateBtn->setIconSize(QSize(64, 64));
         mGenerateBtn->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
         mGenerateBtn->setToolTip(i18n("Create a new OpenPGP key pair") + QStringLiteral("<br>") +
                                  i18n("To create an S/MIME certificate request use \"New Key Pair\" from the 'File' Menu instead"));
 
         KConfigGroup restrictions(KSharedConfig::openConfig(), "KDE Action Restrictions");
         mGenerateBtn->setEnabled(restrictions.readEntry("action/file_new_certificate", true));
 
-        mImportBtn = new QToolButton();
+        mImportBtn = new QToolButton{q};
         mImportBtn->setDefaultAction(importAction);
         mImportBtn->setIconSize(QSize(64, 64));
         mImportBtn->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
         mImportBtn->setToolTip(i18n("Import from a file.") + QStringLiteral("<br>") +
                                i18n("To import from a public keyserver use \"Lookup on Server\" instead."));
         mImportBtn->setEnabled(restrictions.readEntry("action/file_import_certificate", true));
 
         auto btnLayout = new QHBoxLayout;
         btnLayout->addStretch(-1);
         btnLayout->addWidget(mGenerateBtn);
         btnLayout->addWidget(mImportBtn);
         btnLayout->addStretch(-1);
 
         vLay->addStretch(-1);
         vLay->addLayout(hLay);
         vLay->addLayout(btnLayout);
         vLay->addStretch(-1);
 
         hLay->addStretch(-1);
-        hLay->addWidget(label);
+        hLay->addWidget(mLabel);
         hLay->addStretch(-1);
     }
 
     void import()
     {
         mImportBtn->setEnabled(false);
         auto cmd = new Kleo::ImportCertificateFromFileCommand();
         cmd->setParentWidget(q);
 
         QObject::connect(cmd, &Kleo::ImportCertificateFromFileCommand::finished,
                 q, [this]() {
             mImportBtn->setEnabled(true);
         });
         cmd->start();
     }
 
     void generate()
     {
         mGenerateBtn->setEnabled(false);
         auto cmd = new Commands::NewCertificateCommand();
         cmd->setProtocol(GpgME::OpenPGP);
         cmd->setParentWidget(q);
 
         QObject::connect(cmd, &Commands::NewCertificateCommand::finished,
                 q, [this]() {
             mGenerateBtn->setEnabled(true);
         });
         cmd->start();
     }
 
     WelcomeWidget *const q;
-    QToolButton *mGenerateBtn;
-    QToolButton *mImportBtn;
+    QLabel *mLabel = nullptr;
+    QToolButton *mGenerateBtn = nullptr;
+    QToolButton *mImportBtn = nullptr;
 };
 
 
 WelcomeWidget::WelcomeWidget (QWidget *parent): QWidget(parent),
     d(new Private(this))
 {
 }