diff --git a/src/plugins/android/androiddevice.cpp b/src/plugins/android/androiddevice.cpp
index a1f152a9e28..73a567e789f 100644
--- a/src/plugins/android/androiddevice.cpp
+++ b/src/plugins/android/androiddevice.cpp
@@ -388,8 +388,7 @@ AndroidDevice::AndroidDevice()
     setOsType(OsType::OsTypeOtherUnix);
     setDeviceState(DeviceDisconnected);
 
-    addDeviceAction({Tr::tr("Refresh"), [](const IDevice::Ptr &device, QWidget *parent) {
-        Q_UNUSED(parent)
+    addDeviceAction({Tr::tr("Refresh"), [](const IDevice::Ptr &device) {
         updateDeviceState(device);
     }});
 }
@@ -419,27 +418,26 @@ void AndroidDevice::addActionsIfNotFound()
 
     if (machineType() == Emulator) {
         if (!hasStartAction) {
-            addDeviceAction({startAvdAction, [](const IDevice::Ptr &device, QWidget *) {
+            addDeviceAction({startAvdAction, [](const IDevice::Ptr &device) {
                 static_cast<AndroidDevice *>(device.get())->startAvd();
             }});
         }
 
         if (!hasEraseAction) {
-            addDeviceAction({eraseAvdAction, [](const IDevice::Ptr &device, QWidget *) {
+            addDeviceAction({eraseAvdAction, [](const IDevice::Ptr &device) {
                 s_instance->eraseAvd(device);
             }});
         }
 
         if (!hasAvdArgumentsAction) {
-            addDeviceAction({avdArgumentsAction, [](const IDevice::Ptr &device, QWidget *) {
-                Q_UNUSED(device)
+            addDeviceAction({avdArgumentsAction, [](const IDevice::Ptr &) {
                 setEmulatorArguments();
             }});
         }
     } else if (machineType() == Hardware && !ipRegex.match(id().toString()).hasMatch()) {
         if (!hasSetupWifi) {
-            addDeviceAction({setupWifi, [](const IDevice::Ptr &device, QWidget *parent) {
-                setupWifiForDevice(device, parent);
+            addDeviceAction({setupWifi, [](const IDevice::Ptr &device) {
+                setupWifiForDevice(device, Core::ICore::dialogParent());
             }});
         }
     }
diff --git a/src/plugins/boot2qt/qdbdevice.cpp b/src/plugins/boot2qt/qdbdevice.cpp
index 18b4649fe9d..55253a56846 100644
--- a/src/plugins/boot2qt/qdbdevice.cpp
+++ b/src/plugins/boot2qt/qdbdevice.cpp
@@ -110,11 +110,11 @@ QdbDevice::QdbDevice()
     setDisplayType(Tr::tr("Boot to Qt Device"));
     setType(Constants::QdbLinuxOsType);
 
-    addDeviceAction({Tr::tr("Reboot Device"), [](const IDevice::Ptr &device, QWidget *) {
+    addDeviceAction({Tr::tr("Reboot Device"), [](const IDevice::Ptr &device) {
         (void) new DeviceApplicationObserver(device, CommandLine{device->filePath("reboot")});
     }});
 
-    addDeviceAction({Tr::tr("Restore Default App"), [](const IDevice::Ptr &device, QWidget *) {
+    addDeviceAction({Tr::tr("Restore Default App"), [](const IDevice::Ptr &device) {
         (void) new DeviceApplicationObserver(device, {device->filePath("appcontroller"), {"--remove-default"}});
     }});
 }
diff --git a/src/plugins/docker/dockerdevice.cpp b/src/plugins/docker/dockerdevice.cpp
index 5217d0be38e..5727c843ede 100644
--- a/src/plugins/docker/dockerdevice.cpp
+++ b/src/plugins/docker/dockerdevice.cpp
@@ -668,7 +668,7 @@ DockerDevice::DockerDevice()
     });
 
     addDeviceAction(
-        {Tr::tr("Open Shell in Container"), [](const IDevice::Ptr &device, QWidget *) {
+        {Tr::tr("Open Shell in Container"), [](const IDevice::Ptr &device) {
              expected_str<Environment> env = device->systemEnvironmentWithError();
              if (!env) {
                  QMessageBox::warning(ICore::dialogParent(), Tr::tr("Error"), env.error());
diff --git a/src/plugins/projectexplorer/devicesupport/devicesettingspage.cpp b/src/plugins/projectexplorer/devicesupport/devicesettingspage.cpp
index 29edb86b2eb..fa6ebf3433f 100644
--- a/src/plugins/projectexplorer/devicesupport/devicesettingspage.cpp
+++ b/src/plugins/projectexplorer/devicesupport/devicesettingspage.cpp
@@ -34,8 +34,6 @@
 #include <QVBoxLayout>
 #include <QValidator>
 
-#include <algorithm>
-
 using namespace Core;
 using namespace Utils;
 
@@ -373,7 +371,7 @@ void DeviceSettingsWidget::currentDeviceChanged(int index)
             const IDevice::Ptr device = m_deviceManager->mutableDevice(currentDevice()->id());
             QTC_ASSERT(device, return);
             updateDeviceFromUi();
-            deviceAction.execute(device, this);
+            deviceAction.execute(device);
             // Widget must be set up from scratch, because the action could have
             // changed random attributes.
             currentDeviceChanged(currentIndex());
diff --git a/src/plugins/projectexplorer/devicesupport/idevice.h b/src/plugins/projectexplorer/devicesupport/idevice.h
index 558c1734119..b9e3ecc7e7a 100644
--- a/src/plugins/projectexplorer/devicesupport/idevice.h
+++ b/src/plugins/projectexplorer/devicesupport/idevice.h
@@ -128,7 +128,7 @@ public:
 
     struct DeviceAction {
         QString display;
-        std::function<void(const IDevice::Ptr &device, QWidget *parent)> execute;
+        std::function<void(const IDevice::Ptr &device)> execute;
     };
     void addDeviceAction(const DeviceAction &deviceAction);
     const QList<DeviceAction> deviceActions() const;
diff --git a/src/plugins/qnx/qnxdevice.cpp b/src/plugins/qnx/qnxdevice.cpp
index 19c5e064a94..b33109a8f50 100644
--- a/src/plugins/qnx/qnxdevice.cpp
+++ b/src/plugins/qnx/qnxdevice.cpp
@@ -70,8 +70,8 @@ public:
         setFreePorts(PortList::fromString("10000-10100"));
         setExtraData(RemoteLinux::Constants::SourceProfile, true);
 
-        addDeviceAction({Tr::tr("Deploy Qt libraries..."), [](const IDevice::Ptr &device, QWidget *parent) {
-            QnxDeployQtLibrariesDialog dialog(device, parent);
+        addDeviceAction({Tr::tr("Deploy Qt libraries..."), [](const IDevice::Ptr &device) {
+            QnxDeployQtLibrariesDialog dialog(device, Core::ICore::dialogParent());
             dialog.exec();
         }});
     }
diff --git a/src/plugins/remotelinux/linuxdevice.cpp b/src/plugins/remotelinux/linuxdevice.cpp
index 4dd20618a07..c5786b2e7e7 100644
--- a/src/plugins/remotelinux/linuxdevice.cpp
+++ b/src/plugins/remotelinux/linuxdevice.cpp
@@ -1028,8 +1028,8 @@ LinuxDevice::LinuxDevice()
     sshParams.timeout = 10;
     setSshParameters(sshParams);
 
-    addDeviceAction({Tr::tr("Deploy Public Key..."), [](const IDevice::Ptr &device, QWidget *parent) {
-        if (auto d = Internal::PublicKeyDeploymentDialog::createDialog(device, parent)) {
+    addDeviceAction({Tr::tr("Deploy Public Key..."), [](const IDevice::Ptr &device) {
+        if (auto d = Internal::PublicKeyDeploymentDialog::createDialog(device, Core::ICore::dialogParent())) {
             d->exec();
             delete d;
         }
@@ -1062,7 +1062,7 @@ LinuxDevice::LinuxDevice()
         return {};
     });
 
-    addDeviceAction({Tr::tr("Open Remote Shell"), [](const IDevice::Ptr &device, QWidget *) {
+    addDeviceAction({Tr::tr("Open Remote Shell"), [](const IDevice::Ptr &device) {
                          Result result = device->openTerminal(Environment(), FilePath());
 
                          if (!result)
diff --git a/src/plugins/remotelinux/publickeydeploymentdialog.cpp b/src/plugins/remotelinux/publickeydeploymentdialog.cpp
index 38cdf4fb168..a3d78cbd1dd 100644
--- a/src/plugins/remotelinux/publickeydeploymentdialog.cpp
+++ b/src/plugins/remotelinux/publickeydeploymentdialog.cpp
@@ -28,7 +28,7 @@ public:
 };
 
 PublicKeyDeploymentDialog *PublicKeyDeploymentDialog::createDialog(
-        const DeviceConstRef &device, QWidget *parent)
+        const DeviceConstRef &device, QWidget *parent) // TODO: Use Core::ICore::dialogParent()
 {
     const FilePath dir = device.sshParameters().privateKeyFile.parentDir();
     const FilePath publicKeyFileName = FileUtils::getOpenFilePath(