diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 787985585..7ec4c41d0 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,411 +1,410 @@
 # SPDX-FileCopyrightText: none
 # SPDX-License-Identifier: BSD-3-Clause
 add_subdirectory(icons)
 add_subdirectory(mimetypes)
 
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
 if (NOT DISABLE_KWATCHGNUPG)
     add_subdirectory(kwatchgnupg)
 endif()
 add_subdirectory(libkleopatraclient)
 add_subdirectory(conf)
 add_subdirectory(kconf_update)
 
 if(WIN32)
   set(_kleopatra_extra_uiserver_SRCS uiserver/uiserver_win.cpp)
   set(_kleopatra_extra_SRCS
       utils/gnupg-registry.c
       selftest/registrycheck.cpp
       utils/windowsprocessdevice.cpp
       utils/userinfo_win.cpp
   )
 else()
   set(_kleopatra_extra_uiserver_SRCS uiserver/uiserver_unix.cpp)
   set(_kleopatra_extra_SRCS)
 endif()
 
 set(_kleopatra_uiserver_SRCS
     uiserver/sessiondata.cpp
     uiserver/uiserver.cpp
     ${_kleopatra_extra_uiserver_SRCS}
     uiserver/assuanserverconnection.cpp
     uiserver/echocommand.cpp
     uiserver/decryptverifycommandemailbase.cpp
     uiserver/decryptverifycommandfilesbase.cpp
     uiserver/signcommand.cpp
     uiserver/signencryptfilescommand.cpp
     uiserver/prepencryptcommand.cpp
     uiserver/prepsigncommand.cpp
     uiserver/encryptcommand.cpp
     uiserver/selectcertificatecommand.cpp
     uiserver/importfilescommand.cpp
     uiserver/createchecksumscommand.cpp
     uiserver/verifychecksumscommand.cpp
 
     selftest/uiservercheck.cpp
   )
 
 if(ASSUAN2_FOUND)
   include_directories(${ASSUAN2_INCLUDES})
   set(_kleopatra_uiserver_extra_libs ${ASSUAN2_LIBRARIES})
 else()
   include_directories(${ASSUAN_INCLUDES})
   if(WIN32)
     set(_kleopatra_uiserver_extra_libs ${ASSUAN_VANILLA_LIBRARIES})
   else()
     set(_kleopatra_uiserver_extra_libs ${ASSUAN_PTHREAD_LIBRARIES})
   endif()
 endif()
 
 if(HAVE_GPG_ERR_SOURCE_KLEO)
   add_definitions(-DGPG_ERR_SOURCE_DEFAULT=GPG_ERR_SOURCE_KLEO)
   add_definitions(-DGPGMEPP_ERR_SOURCE_DEFAULT=GPG_ERR_SOURCE_KLEO)
 else()
   add_definitions(-DGPG_ERR_SOURCE_DEFAULT=GPG_ERR_SOURCE_USER_1)
   add_definitions(-DGPGMEPP_ERR_SOURCE_DEFAULT=GPG_ERR_SOURCE_USER_1)
 endif()
 
 if(KF5IdentityManagement_FOUND AND KF5MailTransport_FOUND AND KF5MailTransportAkonadi_FOUND)
   set(_kleopatra_mail_libs
       KF5::IdentityManagement # Export OpenPGP keys using WKS
       KF5::MailTransport
       KF5::MailTransportAkonadi
   )
   add_definitions(-DMAILAKONADI_ENABLED)
 endif()
 
 ki18n_wrap_ui(_kleopatra_uiserver_SRCS crypto/gui/signingcertificateselectionwidget.ui)
 
 set(_kleopatra_SRCS
   utils/accessibility.cpp
   utils/gui-helper.cpp
   utils/filedialog.cpp
   utils/kdpipeiodevice.cpp
   utils/headerview.cpp
   utils/scrollarea.cpp
   utils/dragqueen.cpp
   utils/multivalidator.cpp
   utils/systemtrayicon.cpp
 
   utils/path-helper.cpp
   utils/input.cpp
   utils/output.cpp
   utils/validation.cpp
   utils/wsastarter.cpp
   utils/iodevicelogger.cpp
   utils/log.cpp
   utils/action_data.cpp
   utils/types.cpp
   utils/archivedefinition.cpp
   utils/auditlog.cpp
   utils/clipboardmenu.cpp
   utils/kuniqueservice.cpp
   utils/tags.cpp
   utils/writecertassuantransaction.cpp
   utils/keyparameters.cpp
   utils/userinfo.cpp
   utils/keys.cpp
 
   selftest/selftest.cpp
   selftest/enginecheck.cpp
   selftest/gpgconfcheck.cpp
   selftest/gpgagentcheck.cpp
   selftest/libkleopatrarccheck.cpp
   selftest/compliancecheck.cpp
 
   ${_kleopatra_extra_SRCS}
 
   view/errorlabel.cpp
   view/formtextinput.cpp
   view/htmllabel.cpp
   view/keylistcontroller.cpp
   view/keytreeview.cpp
   view/searchbar.cpp
   view/smartcardwidget.cpp
   view/openpgpkeycardwidget.cpp
   view/padwidget.cpp
   view/pgpcardwidget.cpp
   view/pivcardwidget.cpp
   view/p15cardwidget.cpp
   view/netkeywidget.cpp
   view/nullpinwidget.cpp
   view/tabwidget.cpp
   view/keycacheoverlay.cpp
   view/urllabel.cpp
   view/waitwidget.cpp
   view/welcomewidget.cpp
 
   dialogs/certificateselectiondialog.cpp
   dialogs/certifywidget.cpp
   dialogs/expirydialog.cpp
   dialogs/lookupcertificatesdialog.cpp
   dialogs/ownertrustdialog.cpp
   dialogs/selftestdialog.cpp
   dialogs/certifycertificatedialog.cpp
   dialogs/revokecertificationwidget.cpp
   dialogs/revokecertificationdialog.cpp
   dialogs/adduseriddialog.cpp
   dialogs/deletecertificatesdialog.cpp
   dialogs/setinitialpindialog.cpp
   dialogs/certificatedetailsdialog.cpp
   dialogs/certificatedetailswidget.cpp
   dialogs/trustchainwidget.cpp
   dialogs/weboftrustwidget.cpp
   dialogs/weboftrustdialog.cpp
   dialogs/exportdialog.cpp
   dialogs/subkeyswidget.cpp
   dialogs/gencardkeydialog.cpp
   dialogs/updatenotification.cpp
   dialogs/pivcardapplicationadministrationkeyinputdialog.cpp
   dialogs/certificatedetailsinputwidget.cpp
   dialogs/createcsrforcardkeydialog.cpp
   dialogs/groupdetailsdialog.cpp
   dialogs/editgroupdialog.cpp
   dialogs/revokekeydialog.cpp
 
   crypto/controller.cpp
   crypto/certificateresolver.cpp
   crypto/sender.cpp
   crypto/recipient.cpp
   crypto/task.cpp
   crypto/taskcollection.cpp
   crypto/decryptverifytask.cpp
   crypto/decryptverifyemailcontroller.cpp
   crypto/decryptverifyfilescontroller.cpp
   crypto/autodecryptverifyfilescontroller.cpp
   crypto/encryptemailtask.cpp
   crypto/encryptemailcontroller.cpp
   crypto/newsignencryptemailcontroller.cpp
   crypto/signencrypttask.cpp
   crypto/signencryptfilescontroller.cpp
   crypto/signemailtask.cpp
   crypto/signemailcontroller.cpp
   crypto/createchecksumscontroller.cpp
   crypto/verifychecksumscontroller.cpp
 
   crypto/gui/wizard.cpp
   crypto/gui/wizardpage.cpp
 
   crypto/gui/certificateselectionline.cpp
   crypto/gui/certificatelineedit.cpp
   crypto/gui/signingcertificateselectionwidget.cpp
   crypto/gui/signingcertificateselectiondialog.cpp
 
   crypto/gui/resultitemwidget.cpp
   crypto/gui/resultlistwidget.cpp
   crypto/gui/resultpage.cpp
 
   crypto/gui/newresultpage.cpp
   crypto/gui/signencryptfileswizard.cpp
 
   crypto/gui/signencryptemailconflictdialog.cpp
 
   crypto/gui/decryptverifyoperationwidget.cpp
   crypto/gui/decryptverifyfileswizard.cpp
   crypto/gui/decryptverifyfilesdialog.cpp
 
   crypto/gui/objectspage.cpp
   crypto/gui/resolverecipientspage.cpp
   crypto/gui/signerresolvepage.cpp
   crypto/gui/encryptemailwizard.cpp
   crypto/gui/signemailwizard.cpp
   crypto/gui/signencryptwidget.cpp
   crypto/gui/signencryptwizard.cpp
   crypto/gui/unknownrecipientwidget.cpp
 
   crypto/gui/verifychecksumsdialog.cpp
 
   commands/command.cpp
   commands/gnupgprocesscommand.cpp
   commands/detailscommand.cpp
   commands/exportcertificatecommand.cpp
   commands/exportgroupscommand.cpp
   commands/importcertificatescommand.cpp
   commands/importcertificatefromfilecommand.cpp
   commands/importcertificatefromclipboardcommand.cpp
   commands/importcertificatefromdatacommand.cpp
   commands/importcertificatefromkeyservercommand.cpp
   commands/lookupcertificatescommand.cpp
   commands/reloadkeyscommand.cpp
   commands/refreshcertificatecommand.cpp
   commands/refreshx509certscommand.cpp
   commands/refreshopenpgpcertscommand.cpp
   commands/deletecertificatescommand.cpp
   commands/decryptverifyfilescommand.cpp
   commands/signencryptfilescommand.cpp
   commands/signencryptfoldercommand.cpp
   commands/encryptclipboardcommand.cpp
   commands/signclipboardcommand.cpp
   commands/decryptverifyclipboardcommand.cpp
   commands/clearcrlcachecommand.cpp
   commands/dumpcrlcachecommand.cpp
   commands/dumpcertificatecommand.cpp
   commands/importcrlcommand.cpp
   commands/changeexpirycommand.cpp
   commands/changeownertrustcommand.cpp
   commands/changeroottrustcommand.cpp
   commands/changepassphrasecommand.cpp
   commands/certifycertificatecommand.cpp
   commands/revokecertificationcommand.cpp
   commands/selftestcommand.cpp
   commands/exportsecretkeycommand.cpp
   commands/exportsecretkeycommand_old.cpp
   commands/exportsecretsubkeycommand.cpp
   commands/exportopenpgpcertstoservercommand.cpp
   commands/exportopenpgpcerttoprovidercommand.cpp
   commands/adduseridcommand.cpp
   commands/newcertificatecommand.cpp
   commands/setinitialpincommand.cpp
   commands/learncardkeyscommand.cpp
   commands/checksumcreatefilescommand.cpp
   commands/checksumverifyfilescommand.cpp
   commands/exportpaperkeycommand.cpp
   commands/importpaperkeycommand.cpp
   commands/genrevokecommand.cpp
   commands/keytocardcommand.cpp
   commands/cardcommand.cpp
   commands/pivgeneratecardkeycommand.cpp
   commands/changepincommand.cpp
   commands/authenticatepivcardapplicationcommand.cpp
   commands/setpivcardapplicationadministrationkeycommand.cpp
   commands/certificatetopivcardcommand.cpp
   commands/importcertificatefrompivcardcommand.cpp
   commands/createopenpgpkeyfromcardkeyscommand.cpp
   commands/createcsrforcardkeycommand.cpp
   commands/revokekeycommand.cpp
   commands/revokeuseridcommand.cpp
 
   ${_kleopatra_uiserver_files}
 
   conf/configuredialog.cpp
   conf/groupsconfigdialog.cpp
   conf/groupsconfigpage.cpp
   conf/groupsconfigwidget.cpp
 
   newcertificatewizard/advancedsettingsdialog.cpp
   newcertificatewizard/chooseprotocolpage.cpp
   newcertificatewizard/enterdetailspage.cpp
   newcertificatewizard/keyalgo.cpp
   newcertificatewizard/keycreationpage.cpp
   newcertificatewizard/listwidget.cpp
   newcertificatewizard/newcertificatewizard.cpp
   newcertificatewizard/resultpage.cpp
   newcertificatewizard/wizardpage.cpp
 
   smartcard/readerstatus.cpp
   smartcard/card.cpp
   smartcard/openpgpcard.cpp
   smartcard/netkeycard.cpp
   smartcard/pivcard.cpp
   smartcard/p15card.cpp
   smartcard/keypairinfo.cpp
   smartcard/utils.cpp
   smartcard/deviceinfowatcher.cpp
 
   accessibility/accessiblerichtextlabel.cpp
   accessibility/accessiblewidgetfactory.cpp
 
   aboutdata.cpp
   systrayicon.cpp
   kleopatraapplication.cpp
   mainwindow.cpp
   main.cpp
   kleopatra.qrc
 )
 
 if(WIN32)
   configure_file (versioninfo.rc.in versioninfo.rc)
   set(_kleopatra_SRCS ${CMAKE_CURRENT_BINARY_DIR}/versioninfo.rc ${_kleopatra_SRCS})
 endif()
 
 set (_kleopatra_SRCS conf/kleopageconfigdialog.cpp ${_kleopatra_SRCS})
 
 ecm_qt_declare_logging_category(_kleopatra_SRCS HEADER kleopatra_debug.h IDENTIFIER KLEOPATRA_LOG CATEGORY_NAME org.kde.pim.kleopatra
         DESCRIPTION "kleopatra (kleopatra)"
         OLD_CATEGORY_NAMES log_kleopatra
         EXPORT KLEOPATRA
     )
 
 
 if(KLEO_MODEL_TEST)
   add_definitions(-DKLEO_MODEL_TEST)
   set(_kleopatra_SRCS ${_kleopatra_SRCS} models/modeltest.cpp)
 endif()
 
 ki18n_wrap_ui(_kleopatra_SRCS
   dialogs/ownertrustdialog.ui
   dialogs/selectchecklevelwidget.ui
   dialogs/selftestdialog.ui
   dialogs/setinitialpindialog.ui
   dialogs/trustchainwidget.ui
   dialogs/subkeyswidget.ui
   newcertificatewizard/listwidget.ui
   newcertificatewizard/keycreationpage.ui
-  newcertificatewizard/resultpage.ui
   newcertificatewizard/advancedsettingsdialog.ui
 )
 
 kconfig_add_kcfg_files(_kleopatra_SRCS
   kcfg/tooltippreferences.kcfgc
   kcfg/emailoperationspreferences.kcfgc
   kcfg/fileoperationspreferences.kcfgc
   kcfg/smimevalidationpreferences.kcfgc
   kcfg/tagspreferences.kcfgc
   kcfg/settings.kcfgc
 )
 
 file(GLOB ICONS_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/icons/*-apps-kleopatra.png")
 ecm_add_app_icon(_kleopatra_SRCS ICONS ${ICONS_SRCS})
 
 add_executable(kleopatra_bin ${_kleopatra_SRCS} ${_kleopatra_uiserver_SRCS})
 
 # For the ConfigureDialog & KCMs
 target_link_libraries(kleopatra_bin kcm_kleopatra_static)
 
 #if (COMPILE_WITH_UNITY_CMAKE_SUPPORT)
 #    set_target_properties(kleopatra_bin PROPERTIES UNITY_BUILD ON)
 #endif()
 set_target_properties(kleopatra_bin PROPERTIES OUTPUT_NAME kleopatra)
 
 if (WIN32)
   set(_kleopatra_platform_libs "secur32")
 endif ()
 
 target_link_libraries(kleopatra_bin
   Gpgmepp
   QGpgme
   ${_kleopatra_extra_libs}
   KF5::Libkleo
   KF5::Mime
   KF5::I18n
   KF5::XmlGui
   KF5::IconThemes
   KF5::WindowSystem
   KF5::CoreAddons
   KF5::ItemModels
   KF5::Crash
   ${_kleopatra_mail_libs}
   Qt${QT_MAJOR_VERSION}::Network
   Qt${QT_MAJOR_VERSION}::PrintSupport # Printing secret keys
   ${_kleopatra_uiserver_extra_libs}
   ${_kleopatra_dbusaddons_libs}
   kleopatraclientcore
   ${_kleopatra_platform_libs}
 )
 
 install(TARGETS kleopatra_bin ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
 
 install(
   PROGRAMS data/org.kde.kleopatra.desktop data/kleopatra_import.desktop
   DESTINATION ${KDE_INSTALL_APPDIR}
 )
 install(FILES data/org.kde.kleopatra.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR})
 install(
   PROGRAMS data/kleopatra_signencryptfiles.desktop
         data/kleopatra_signencryptfolders.desktop
         data/kleopatra_decryptverifyfiles.desktop
         data/kleopatra_decryptverifyfolders.desktop
   DESTINATION ${KDE_INSTALL_DATADIR}/kio/servicemenus
 )
diff --git a/src/newcertificatewizard/resultpage.cpp b/src/newcertificatewizard/resultpage.cpp
index ff06bf204..7f378bab3 100644
--- a/src/newcertificatewizard/resultpage.cpp
+++ b/src/newcertificatewizard/resultpage.cpp
@@ -1,291 +1,377 @@
 /* -*- mode: c++; c-basic-offset:4 -*-
     newcertificatewizard/resultpage.cpp
 
     This file is part of Kleopatra, the KDE keymanager
     SPDX-FileCopyrightText: 2008 Klarälvdalens Datakonsult AB
     SPDX-FileCopyrightText: 2016, 2017 Bundesamt für Sicherheit in der Informationstechnik
     SPDX-FileContributor: Intevation GmbH
 
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
 #include <config-kleopatra.h>
 
 #include "resultpage_p.h"
 
-#include <ui_resultpage.h>
-
 #include "commands/exportcertificatecommand.h"
 #include "commands/exportopenpgpcertstoservercommand.h"
 #ifdef QGPGME_SUPPORTS_SECRET_KEY_EXPORT
 # include "commands/exportsecretkeycommand.h"
 #else
 # include "commands/exportsecretkeycommand_old.h"
 #endif
+#include "utils/dragqueen.h"
 #include "utils/filedialog.h"
 
 #include <Libkleo/KeyCache>
 
 #include <KConfigGroup>
+#include <KLocalizedString>
 #include <KMessageBox>
 #include <KSharedConfig>
 
 #include <QDesktopServices>
+#include <QGroupBox>
+#include <QHBoxLayout>
 #include <QLineEdit>
+#include <QPushButton>
+#include <QTextBrowser>
 #include <QUrlQuery>
+#include <QVBoxLayout>
 
 #include <gpgme++/key.h>
 
 #include "kleopatra_debug.h"
 
 using namespace Kleo;
 using namespace Kleo::Commands;
 using namespace Kleo::NewCertificateUi;
 using namespace GpgME;
 #ifndef QGPGME_SUPPORTS_SECRET_KEY_EXPORT
 using Kleo::Commands::Compat::ExportSecretKeyCommand;
 #endif
 
+struct ResultPage::UI
+{
+    QTextBrowser *resultTB = nullptr;
+    QTextBrowser *errorTB = nullptr;
+    DragQueen *dragQueen = nullptr;
+    QPushButton *restartWizardPB = nullptr;
+    QGroupBox *nextStepsGB = nullptr;
+    QPushButton *saveRequestToFilePB = nullptr;
+    QPushButton *sendRequestByEMailPB = nullptr;
+    QPushButton *makeBackupPB = nullptr;
+    QPushButton *sendCertificateByEMailPB = nullptr;
+    QPushButton *uploadToKeyserverPB = nullptr;
+    QPushButton *createRevocationRequestPB = nullptr;
+    QPushButton *createSigningCertificatePB = nullptr;
+    QPushButton *createEncryptionCertificatePB = nullptr;
+
+    UI(QWizardPage *parent)
+    {
+        auto mainLayout = new QVBoxLayout{parent};
+
+        auto resultGB = new QGroupBox{i18nc("@title:group", "Result"), parent};
+        auto resultGBLayout = new QHBoxLayout{resultGB};
+
+        resultTB = new QTextBrowser{resultGB};
+        resultGBLayout->addWidget(resultTB);
+
+        errorTB = new QTextBrowser{resultGB};
+        resultGBLayout->addWidget(errorTB);
+
+        dragQueen = new Kleo::DragQueen{resultGB};
+        dragQueen->setToolTip(i18n("Drag this icon to your mail application's composer to attach the request to a mail."));
+        dragQueen->setAlignment(Qt::AlignCenter);
+        resultGBLayout->addWidget(dragQueen);
+
+        mainLayout->addWidget(resultGB);
+
+        restartWizardPB = new QPushButton{i18n("Restart This Wizard (Keeps Your Parameters)"), parent};
+
+        mainLayout->addWidget(restartWizardPB);
+
+        nextStepsGB = new QGroupBox{i18nc("@title:group", "Next Steps"), parent};
+        auto nextStepsGBLayout = new QVBoxLayout{nextStepsGB};
+
+        saveRequestToFilePB = new QPushButton{i18n("Save Certificate Request To File..."), nextStepsGB};
+        nextStepsGBLayout->addWidget(saveRequestToFilePB);
+
+        sendRequestByEMailPB = new QPushButton{i18n("Send Certificate Request By EMail..."), nextStepsGB};
+        nextStepsGBLayout->addWidget(sendRequestByEMailPB);
+
+        makeBackupPB = new QPushButton{i18n("Make a Backup Of Your Key Pair..."), nextStepsGB};
+        nextStepsGBLayout->addWidget(makeBackupPB);
+
+        sendCertificateByEMailPB = new QPushButton{i18n("Send Public Key By EMail..."), nextStepsGB};
+        nextStepsGBLayout->addWidget(sendCertificateByEMailPB);
+
+        uploadToKeyserverPB = new QPushButton{i18n("Upload Public Key To Directory Service..."), nextStepsGB};
+        nextStepsGBLayout->addWidget(uploadToKeyserverPB);
+
+        createRevocationRequestPB = new QPushButton{i18n("Create Revocation Request..."), nextStepsGB};
+        nextStepsGBLayout->addWidget(createRevocationRequestPB);
+
+        createSigningCertificatePB = new QPushButton{i18n("Create Signing Certificate With Same Parameters"), nextStepsGB};
+        nextStepsGBLayout->addWidget(createSigningCertificatePB);
+
+        createEncryptionCertificatePB = new QPushButton{i18n("Create Encryption Certificate With Same Parameters"), nextStepsGB};
+        nextStepsGBLayout->addWidget(createEncryptionCertificatePB);
+
+        mainLayout->addWidget(nextStepsGB);
+    }
+};
+
 ResultPage::ResultPage(QWidget *p)
     : WizardPage{p}
-    , ui{new Ui_ResultPage}
+    , ui{new UI{this}}
     , initialized{false}
     , successfullyCreatedSigningCertificate{false}
     , successfullyCreatedEncryptionCertificate{false}
 {
-    ui->setupUi(this);
+    setObjectName(QString::fromUtf8("Kleo__NewCertificateUi__ResultPage"));
+
+    connect(ui->saveRequestToFilePB, &QPushButton::clicked, this, &ResultPage::slotSaveRequestToFile);
+    connect(ui->sendRequestByEMailPB, &QPushButton::clicked, this, &ResultPage::slotSendRequestByEMail);
+    connect(ui->sendCertificateByEMailPB, &QPushButton::clicked, this, &ResultPage::slotSendCertificateByEMail);
+    connect(ui->uploadToKeyserverPB, &QPushButton::clicked, this, &ResultPage::slotUploadCertificateToDirectoryServer);
+    connect(ui->makeBackupPB, &QPushButton::clicked, this, &ResultPage::slotBackupCertificate);
+    connect(ui->createRevocationRequestPB, &QPushButton::clicked, this, &ResultPage::slotCreateRevocationRequest);
+    connect(ui->createSigningCertificatePB, &QPushButton::clicked, this, &ResultPage::slotCreateSigningCertificate);
+    connect(ui->createEncryptionCertificatePB, &QPushButton::clicked, this, &ResultPage::slotCreateEncryptionCertificate);
+
     ui->dragQueen->setPixmap(QIcon::fromTheme(QStringLiteral("kleopatra")).pixmap(64, 64));
     registerField(QStringLiteral("error"),  ui->errorTB,   "plainText");
     registerField(QStringLiteral("result"), ui->resultTB,  "plainText");
     registerField(QStringLiteral("url"),    ui->dragQueen, "url");
     // hidden field, since QWizard can't deal with non-widget-backed fields...
     auto le = new QLineEdit(this);
     le->hide();
     registerField(QStringLiteral("fingerprint"), le);
 }
 
 ResultPage::~ResultPage() = default;
 
 void ResultPage::initializePage()
 {
     const bool error = isError();
 
     if (error)
     {
         setTitle(i18nc("@title", "Key Creation Failed"));
         setSubTitle(i18n("Key pair creation failed. Please find details about the failure below."));
     } else {
         setTitle(i18nc("@title", "Key Pair Successfully Created"));
         setSubTitle(i18n("Your new key pair was created successfully. Please find details on the result and some suggested next steps below."));
     }
 
     ui->resultTB                 ->setVisible(!error);
     ui->errorTB                  ->setVisible(error);
     ui->dragQueen                ->setVisible(!error &&!pgp());
     ui->restartWizardPB          ->setVisible(error);
     ui->nextStepsGB              ->setVisible(!error);
     ui->saveRequestToFilePB      ->setVisible(!pgp());
     ui->makeBackupPB             ->setVisible(pgp());
     ui->createRevocationRequestPB->setVisible(pgp() &&false);     // not implemented
 
     ui->sendCertificateByEMailPB ->setVisible(pgp());
     ui->sendRequestByEMailPB     ->setVisible(!pgp());
     ui->uploadToKeyserverPB      ->setVisible(pgp());
 
     if (!error && !pgp())
     {
         if (signingAllowed() && !encryptionAllowed()) {
             successfullyCreatedSigningCertificate = true;
         } else if (!signingAllowed() && encryptionAllowed()) {
             successfullyCreatedEncryptionCertificate = true;
         } else {
             successfullyCreatedEncryptionCertificate = successfullyCreatedSigningCertificate = true;
         }
     }
 
     ui->createSigningCertificatePB->setVisible(successfullyCreatedEncryptionCertificate &&!successfullyCreatedSigningCertificate);
     ui->createEncryptionCertificatePB->setVisible(successfullyCreatedSigningCertificate &&!successfullyCreatedEncryptionCertificate);
 
     if (error) {
         wizard()->setOptions(wizard()->options() & ~QWizard::NoCancelButtonOnLastPage);
     } else {
         wizard()->setOptions(wizard()->options() | QWizard::NoCancelButtonOnLastPage);
     }
 
     if (!initialized) {
         connect(ui->restartWizardPB, &QAbstractButton::clicked,
                 this, [this]() {
                     restartAtEnterDetailsPage();
                 });
     }
     initialized = true;
 }
 
 bool ResultPage::isError() const
 {
     return !ui->errorTB->document()->isEmpty();
 }
 
 bool ResultPage::isComplete() const
 {
     return !isError();
 }
 
 Key ResultPage::key() const
 {
     return KeyCache::instance()->findByFingerprint(fingerprint().toLatin1().constData());
 }
 
 void ResultPage::slotSaveRequestToFile()
 {
     QString fileName = FileDialog::getSaveFileName(this, i18nc("@title", "Save Request"),
                         QStringLiteral("imp"), i18n("PKCS#10 Requests (*.p10)"));
     if (fileName.isEmpty()) {
         return;
     }
     if (!fileName.endsWith(QLatin1String(".p10"), Qt::CaseInsensitive)) {
         fileName += QLatin1String(".p10");
     }
     QFile src(QUrl(url()).toLocalFile());
     if (!src.copy(fileName))
         KMessageBox::error(this,
                             xi18nc("@info",
                                     "Could not copy temporary file <filename>%1</filename> "
                                     "to file <filename>%2</filename>: <message>%3</message>",
                                     src.fileName(), fileName, src.errorString()),
                             i18nc("@title", "Error Saving Request"));
     else
         KMessageBox::information(this,
                                     xi18nc("@info",
                                         "<para>Successfully wrote request to <filename>%1</filename>.</para>"
                                         "<para>You should now send the request to the Certification Authority (CA).</para>",
                                         fileName),
                                     i18nc("@title", "Request Saved"));
 }
 
 void ResultPage::slotSendRequestByEMail()
 {
     if (pgp()) {
         return;
     }
     const KConfigGroup config(KSharedConfig::openConfig(), "CertificateCreationWizard");
     invokeMailer(config.readEntry("CAEmailAddress"),    // to
                     i18n("Please process this certificate."), // subject
                     i18n("Please process this certificate and inform the sender about the location to fetch the resulting certificate.\n\nThanks,\n"), // body
                     QUrl(url()).toLocalFile());    // attachment
 }
 
 void ResultPage::slotSendCertificateByEMail()
 {
     if (!pgp() || exportCertificateCommand) {
         return;
     }
     auto cmd = new ExportCertificateCommand(key());
     connect(cmd, &ExportCertificateCommand::finished, this, &ResultPage::slotSendCertificateByEMailContinuation);
     cmd->setOpenPGPFileName(tmpDir().absoluteFilePath(fingerprint() + QLatin1String(".asc")));
     cmd->start();
     exportCertificateCommand = cmd;
 }
 
 void ResultPage::slotSendCertificateByEMailContinuation()
 {
     if (!exportCertificateCommand) {
         return;
     }
     // ### better error handling?
     const QString fileName = exportCertificateCommand->openPGPFileName();
     qCDebug(KLEOPATRA_LOG) << "fileName" << fileName;
     exportCertificateCommand = nullptr;
     if (fileName.isEmpty()) {
         return;
     }
     invokeMailer(QString(),  // to
                     i18n("My new public OpenPGP key"), // subject
                     i18n("Please find attached my new public OpenPGP key."), // body
                     fileName);
 }
 
 void ResultPage::invokeMailer(const QString &to, const QString &subject, const QString &body, const QString &attachment)
 {
     qCDebug(KLEOPATRA_LOG) << "to:" << to << "subject:" << subject
                             << "body:" << body << "attachment:" << attachment;
 
     // RFC 2368 says body's linebreaks need to be encoded as
     // "%0D%0A", so normalize body to CRLF:
     //body.replace(QLatin1Char('\n'), QStringLiteral("\r\n")).remove(QStringLiteral("\r\r"));
 
     QUrlQuery query;
     query.addQueryItem(QStringLiteral("subject"), subject);
     query.addQueryItem(QStringLiteral("body"), body);
     if (!attachment.isEmpty()) {
         query.addQueryItem(QStringLiteral("attach"), attachment);
     }
     QUrl url;
     url.setScheme(QStringLiteral("mailto"));
     url.setQuery(query);
     qCDebug(KLEOPATRA_LOG) << "openUrl" << url;
     QDesktopServices::openUrl(url);
     KMessageBox::information(this,
                                 xi18nc("@info",
                                     "<para><application>Kleopatra</application> tried to send a mail via your default mail client.</para>"
                                     "<para>Some mail clients are known not to support attachments when invoked this way.</para>"
                                     "<para>If your mail client does not have an attachment, then drag the <application>Kleopatra</application> icon and drop it on the message compose window of your mail client.</para>"
                                     "<para>If that does not work, either, save the request to a file, and then attach that.</para>"),
                                 i18nc("@title", "Sending Mail"),
                                 QStringLiteral("newcertificatewizard-mailto-troubles"));
 }
 
 void ResultPage::slotUploadCertificateToDirectoryServer()
 {
     if (pgp()) {
         (new ExportOpenPGPCertsToServerCommand(key()))->start();
     }
 }
 
 void ResultPage::slotBackupCertificate()
 {
     if (pgp()) {
         (new ExportSecretKeyCommand(key()))->start();
     }
 }
 
 void ResultPage::slotCreateRevocationRequest()
 {
 
 }
 
 void ResultPage::slotCreateSigningCertificate()
 {
     if (successfullyCreatedSigningCertificate) {
         return;
     }
     toggleSignEncryptAndRestart();
 }
 
 void ResultPage::slotCreateEncryptionCertificate()
 {
     if (successfullyCreatedEncryptionCertificate) {
         return;
     }
     toggleSignEncryptAndRestart();
 }
 
 void ResultPage::toggleSignEncryptAndRestart()
 {
     if (!wizard()) {
         return;
     }
     if (KMessageBox::warningContinueCancel(
                 this,
                 i18nc("@info",
                         "This operation will delete the certification request. "
                         "Please make sure that you have sent or saved it before proceeding."),
                 i18nc("@title", "Certification Request About To Be Deleted")) != KMessageBox::Continue) {
         return;
     }
     const bool sign = signingAllowed();
     const bool encr = encryptionAllowed();
     setField(QStringLiteral("signingAllowed"),    !sign);
     setField(QStringLiteral("encryptionAllowed"), !encr);
     restartAtEnterDetailsPage();
 }
diff --git a/src/newcertificatewizard/resultpage.ui b/src/newcertificatewizard/resultpage.ui
deleted file mode 100644
index 0f8d945cd..000000000
--- a/src/newcertificatewizard/resultpage.ui
+++ /dev/null
@@ -1,260 +0,0 @@
-<ui version="4.0" >
- <class>Kleo::NewCertificateUi::ResultPage</class>
- <widget class="QWizardPage" name="Kleo::NewCertificateUi::ResultPage" >
-  <property name="geometry" >
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>581</width>
-    <height>685</height>
-   </rect>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout" >
-   <item>
-    <widget class="QGroupBox" name="resultGB" >
-     <property name="title" >
-      <string>Result</string>
-     </property>
-     <layout class="QHBoxLayout" name="horizontalLayout_2" >
-      <item>
-       <widget class="QTextBrowser" name="resultTB" />
-      </item>
-      <item>
-       <widget class="QTextBrowser" name="errorTB" />
-      </item>
-      <item>
-       <widget class="Kleo::DragQueen" name="dragQueen" >
-        <property name="toolTip" >
-         <string>Drag this icon to your mail application's composer to attach the request to a mail.</string>
-        </property>
-        <property name="alignment" >
-         <set>Qt::AlignCenter</set>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <widget class="QPushButton" name="restartWizardPB" >
-     <property name="text" >
-      <string>Restart This Wizard (Keeps Your Parameters)</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QGroupBox" name="nextStepsGB" >
-     <property name="title" >
-      <string>Next Steps</string>
-     </property>
-     <layout class="QVBoxLayout" name="verticalLayout_2" >
-      <item>
-       <widget class="QPushButton" name="saveRequestToFilePB" >
-        <property name="text" >
-         <string>Save Certificate Request To File...</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QPushButton" name="sendRequestByEMailPB" >
-        <property name="text" >
-         <string>Send Certificate Request By EMail...</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QPushButton" name="makeBackupPB" >
-        <property name="text" >
-         <string>Make a Backup Of Your Key Pair...</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QPushButton" name="sendCertificateByEMailPB" >
-        <property name="text" >
-         <string>Send Public Key By EMail...</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QPushButton" name="uploadToKeyserverPB" >
-        <property name="text" >
-         <string>Upload Public Key To Directory Service...</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QPushButton" name="createRevocationRequestPB" >
-        <property name="text" >
-         <string>Create Revocation Request...</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QPushButton" name="createSigningCertificatePB" >
-        <property name="text" >
-         <string>Create Signing Certificate With Same Parameters</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QPushButton" name="createEncryptionCertificatePB" >
-        <property name="text" >
-         <string>Create Encryption Certificate With Same Parameters</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>Kleo::DragQueen</class>
-   <extends>QLabel</extends>
-   <header>utils/dragqueen.h</header>
-  </customwidget>
- </customwidgets>
- <resources/>
- <connections>
-  <connection>
-   <sender>saveRequestToFilePB</sender>
-   <signal>clicked()</signal>
-   <receiver>Kleo::NewCertificateUi::ResultPage</receiver>
-   <slot>slotSaveRequestToFile()</slot>
-   <hints>
-    <hint type="sourcelabel" >
-     <x>34</x>
-     <y>268</y>
-    </hint>
-    <hint type="destinationlabel" >
-     <x>2</x>
-     <y>348</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>sendRequestByEMailPB</sender>
-   <signal>clicked()</signal>
-   <receiver>Kleo::NewCertificateUi::ResultPage</receiver>
-   <slot>slotSendRequestByEMail()</slot>
-   <hints>
-    <hint type="sourcelabel" >
-     <x>32</x>
-     <y>304</y>
-    </hint>
-    <hint type="destinationlabel" >
-     <x>6</x>
-     <y>390</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>sendCertificateByEMailPB</sender>
-   <signal>clicked()</signal>
-   <receiver>Kleo::NewCertificateUi::ResultPage</receiver>
-   <slot>slotSendCertificateByEMail()</slot>
-   <hints>
-    <hint type="sourcelabel" >
-     <x>48</x>
-     <y>406</y>
-    </hint>
-    <hint type="destinationlabel" >
-     <x>4</x>
-     <y>438</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>uploadToKeyserverPB</sender>
-   <signal>clicked()</signal>
-   <receiver>Kleo::NewCertificateUi::ResultPage</receiver>
-   <slot>slotUploadCertificateToDirectoryServer()</slot>
-   <hints>
-    <hint type="sourcelabel" >
-     <x>50</x>
-     <y>449</y>
-    </hint>
-    <hint type="destinationlabel" >
-     <x>2</x>
-     <y>478</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>makeBackupPB</sender>
-   <signal>clicked()</signal>
-   <receiver>Kleo::NewCertificateUi::ResultPage</receiver>
-   <slot>slotBackupCertificate()</slot>
-   <hints>
-    <hint type="sourcelabel" >
-     <x>52</x>
-     <y>363</y>
-    </hint>
-    <hint type="destinationlabel" >
-     <x>4</x>
-     <y>518</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>createRevocationRequestPB</sender>
-   <signal>clicked()</signal>
-   <receiver>Kleo::NewCertificateUi::ResultPage</receiver>
-   <slot>slotCreateRevocationRequest()</slot>
-   <hints>
-    <hint type="sourcelabel" >
-     <x>32</x>
-     <y>472</y>
-    </hint>
-    <hint type="destinationlabel" >
-     <x>2</x>
-     <y>560</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>createSigningCertificatePB</sender>
-   <signal>clicked()</signal>
-   <receiver>Kleo::NewCertificateUi::ResultPage</receiver>
-   <slot>slotCreateSigningCertificate()</slot>
-   <hints>
-    <hint type="sourcelabel" >
-     <x>33</x>
-     <y>528</y>
-    </hint>
-    <hint type="destinationlabel" >
-     <x>7</x>
-     <y>510</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>createEncryptionCertificatePB</sender>
-   <signal>clicked()</signal>
-   <receiver>Kleo::NewCertificateUi::ResultPage</receiver>
-   <slot>slotCreateEncryptionCertificate()</slot>
-   <hints>
-    <hint type="sourcelabel" >
-     <x>37</x>
-     <y>560</y>
-    </hint>
-    <hint type="destinationlabel" >
-     <x>5</x>
-     <y>556</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
- <slots>
-  <slot>slotSaveRequestToFile()</slot>
-  <slot>slotSendRequestByEMail()</slot>
-  <slot>slotSendCertificateByEMail()</slot>
-  <slot>slotUploadCertificateToDirectoryServer()</slot>
-  <slot>slotBackupCertificate()</slot>
-  <slot>slotCreateRevocationRequest()</slot>
-  <slot>slotCreateEncryptionCertificate()</slot>
-  <slot>slotCreateSigningCertificate()</slot>
- </slots>
-</ui>
diff --git a/src/newcertificatewizard/resultpage_p.h b/src/newcertificatewizard/resultpage_p.h
index 558e312b3..1dba7c219 100644
--- a/src/newcertificatewizard/resultpage_p.h
+++ b/src/newcertificatewizard/resultpage_p.h
@@ -1,65 +1,66 @@
 /* -*- mode: c++; c-basic-offset:4 -*-
     newcertificatewizard/resultpage_p.h
 
     This file is part of Kleopatra, the KDE keymanager
     SPDX-FileCopyrightText: 2008 Klarälvdalens Datakonsult AB
     SPDX-FileCopyrightText: 2016, 2017 Bundesamt für Sicherheit in der Informationstechnik
     SPDX-FileContributor: Intevation GmbH
 
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
 #pragma once
 
 #include "wizardpage_p.h"
 
 namespace GpgME
 {
 class Key;
 }
 namespace Kleo
 {
 class ExportCertificateCommand;
 }
 namespace Kleo::NewCertificateUi
 {
-class Ui_ResultPage;
 
 class ResultPage : public WizardPage
 {
     Q_OBJECT
 public:
     explicit ResultPage(QWidget *p = nullptr);
     ~ResultPage() override;
 
     void initializePage() override;
     bool isError() const;
     bool isComplete() const override;
 
 private:
     GpgME::Key key() const;
 
 private Q_SLOTS:
     void slotSaveRequestToFile();
     void slotSendRequestByEMail();
     void slotSendCertificateByEMail();
     void slotSendCertificateByEMailContinuation();
     void invokeMailer(const QString &to, const QString &subject, const QString &body, const QString &attachment);
     void slotUploadCertificateToDirectoryServer();
     void slotBackupCertificate();
     void slotCreateRevocationRequest();
     void slotCreateSigningCertificate();
     void slotCreateEncryptionCertificate();
 
 private:
     void toggleSignEncryptAndRestart();
 
 private:
-    std::unique_ptr<Kleo::NewCertificateUi::Ui_ResultPage> ui;
+    struct UI;
+    std::unique_ptr<UI> ui;
+
     bool initialized : 1;
     bool successfullyCreatedSigningCertificate : 1;
     bool successfullyCreatedEncryptionCertificate : 1;
     QPointer<Kleo::ExportCertificateCommand> exportCertificateCommand;
 };
 
 }