diff --git a/libdiscover/appstream/AppStreamUtils.h b/libdiscover/appstream/AppStreamUtils.h
index 9dd8c152..78de3c2f 100644
--- a/libdiscover/appstream/AppStreamUtils.h
+++ b/libdiscover/appstream/AppStreamUtils.h
@@ -1,60 +1,78 @@
 /***************************************************************************
  *   Copyright © 2017 Aleix Pol Gonzalez <aleixpol@kde.org>                *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or         *
  *   modify it under the terms of the GNU General Public License as        *
  *   published by the Free Software Foundation; either version 2 of        *
  *   the License or (at your option) version 3 or any later version        *
  *   accepted by the membership of KDE e.V. (or its successor approved     *
  *   by the membership of KDE e.V.), which shall act as a proxy            *
  *   defined in Section 14 of version 3 of the license.                    *
  *                                                                         *
  *   This program is distributed in the hope that it will be useful,       *
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
 #ifndef APPSTREAMUTILS_H
 #define APPSTREAMUTILS_H
 
 #include <QUrl>
 #include <QList>
+#include <QDebug>
 #include <AppStreamQt/image.h>
 #include <AppStreamQt/component.h>
 #include <AppStreamQt/release.h>
+#include <AppStreamQt/screenshot.h>
 
 namespace AppStreamUtils
 {
 static QUrl imageOfKind(const QList<AppStream::Image> &images, AppStream::Image::Kind kind)
 {
     QUrl ret;
     Q_FOREACH (const AppStream::Image &i, images) {
         if (i.kind() == kind) {
             ret = i.url();
             break;
         }
     }
     return ret;
 }
 
 static QString changelogToHtml(const AppStream::Component &appdata)
 {
     if(appdata.releases().isEmpty())
         return {};
 
     const auto release = appdata.releases().constFirst();
     if (release.description().isEmpty())
         return {};
 
     QString changelog = QStringLiteral("<h3>") + release.version() + QStringLiteral("</h3>")
                       + QStringLiteral("<p>") + release.description() + QStringLiteral("</p>");
     return changelog;
 }
 
+static QPair<QList<QUrl>, QList<QUrl>> fetchScreenshots(const AppStream::Component &appdata)
+{
+    QList<QUrl> screenshots, thumbnails;
+    Q_FOREACH (const AppStream::Screenshot &s, appdata.screenshots()) {
+        const auto images = s.images();
+        const QUrl thumbnail = AppStreamUtils::imageOfKind(images, AppStream::Image::KindThumbnail);
+        const QUrl plain = AppStreamUtils::imageOfKind(images, AppStream::Image::KindSource);
+        if (plain.isEmpty())
+            qWarning() << "invalid screenshot for" << appdata.name();
+
+        screenshots << plain;
+        thumbnails << (thumbnail.isEmpty() ? plain : thumbnail);
+    }
+    return {screenshots, thumbnails};
+}
+
 }
 
 #endif
diff --git a/libdiscover/backends/FlatpakBackend/FlatpakResource.cpp b/libdiscover/backends/FlatpakBackend/FlatpakResource.cpp
index f98793ae..86a69d54 100644
--- a/libdiscover/backends/FlatpakBackend/FlatpakResource.cpp
+++ b/libdiscover/backends/FlatpakBackend/FlatpakResource.cpp
@@ -1,551 +1,540 @@
 /***************************************************************************
  *   Copyright © 2013 Aleix Pol Gonzalez <aleixpol@blue-systems.com>       *
  *   Copyright © 2017 Jan Grulich <jgrulich@redhat.com>                    *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or         *
  *   modify it under the terms of the GNU General Public License as        *
  *   published by the Free Software Foundation; either version 2 of        *
  *   the License or (at your option) version 3 or any later version        *
  *   accepted by the membership of KDE e.V. (or its successor approved     *
  *   by the membership of KDE e.V.), which shall act as a proxy            *
  *   defined in Section 14 of version 3 of the license.                    *
  *                                                                         *
  *   This program is distributed in the hope that it will be useful,       *
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
 #include "FlatpakResource.h"
 #include "FlatpakBackend.h"
 
 #include <Transaction/AddonList.h>
 
 #include <AppStreamQt/icon.h>
 #include <AppStreamQt/screenshot.h>
 #include <appstream/AppStreamUtils.h>
 
 #include <KFormat>
 #include <KLocalizedString>
 
 #include <QDir>
 #include <QDebug>
 #include <QDesktopServices>
 #include <QIcon>
 #include <QFileInfo>
 #include <QNetworkAccessManager>
 #include <QNetworkReply>
 #include <QNetworkRequest>
 #include <QStringList>
 #include <QTimer>
 #include <AppStreamQt/release.h>
 
 static QString iconCachePath(const AppStream::Icon &icon)
 {
     Q_ASSERT(icon.kind() == AppStream::Icon::KindRemote);
     return QStringLiteral("%1/icons/%2").arg(QStandardPaths::writableLocation(QStandardPaths::CacheLocation)).arg(icon.url().fileName());
 }
 
 FlatpakResource::FlatpakResource(const AppStream::Component &component, FlatpakInstallation* installation, FlatpakBackend *parent)
     : AbstractResource(parent)
     , m_appdata(component)
     , m_id({installation, QString(), FlatpakResource::DesktopApp, component.id(), QString(), QString() })
     , m_downloadSize(0)
     , m_installedSize(0)
     , m_propertyStates({{DownloadSize, NotKnownYet}, {InstalledSize, NotKnownYet},{RequiredRuntime, NotKnownYet}})
     , m_state(AbstractResource::None)
 {
     setObjectName(packageName());
 
     // Start fetching remote icons during initialization
     const auto icons = m_appdata.icons();
     if (!icons.isEmpty()) {
         foreach (const AppStream::Icon &icon, icons) {
             if (icon.kind() == AppStream::Icon::KindRemote) {
                 const QString fileName = iconCachePath(icon);
                 if (!QFileInfo::exists(fileName)) {
                     const QDir cacheDir(QStandardPaths::writableLocation(QStandardPaths::CacheLocation));
                     // Create $HOME/.cache/discover/icons folder
                     cacheDir.mkdir(QStringLiteral("icons"));
                     QNetworkAccessManager *manager = new QNetworkAccessManager(this);
                     connect(manager, &QNetworkAccessManager::finished, [this, icon, fileName, manager] (QNetworkReply *reply) {
                         if (reply->error() == QNetworkReply::NoError) {
                             QByteArray iconData = reply->readAll();
                             QFile file(fileName);
                             if (file.open(QIODevice::WriteOnly)) {
                                 file.write(iconData);
                             }
                             file.close();
                             Q_EMIT iconChanged();
                         }
                         manager->deleteLater();
                     });
                     manager->get(QNetworkRequest(icon.url()));
                 }
             }
         }
     }
 }
 
 AppStream::Component FlatpakResource::appstreamComponent() const
 {
     return m_appdata;
 }
 
 QList<PackageState> FlatpakResource::addonsInformation()
 {
     return {};
 }
 
 QString FlatpakResource::availableVersion() const
 {
     QString theBranch = branch();
     if (theBranch.isEmpty()) {
         theBranch = i18n("Unknown");
     }
 
     if (!m_appdata.releases().isEmpty()) {
         auto release = m_appdata.releases().constFirst();
         return i18n("%1 (%2)", release.version(), theBranch);
     }
 
     return theBranch;
 }
 
 QString FlatpakResource::appstreamId() const
 {
     return m_id.id;
 }
 
 QString FlatpakResource::arch() const
 {
     return m_id.arch;
 }
 
 QString FlatpakResource::branch() const
 {
     return m_id.branch;
 }
 
 bool FlatpakResource::canExecute() const
 {
     return (m_id.type == DesktopApp && (m_state == AbstractResource::Installed || m_state == AbstractResource::Upgradeable));
 }
 
 void FlatpakResource::updateFromRef(FlatpakRef* ref)
 {
     setArch(QString::fromUtf8(flatpak_ref_get_arch(ref)));
     setBranch(QString::fromUtf8(flatpak_ref_get_branch(ref)));
     setCommit(QString::fromUtf8(flatpak_ref_get_commit(ref)));
     setFlatpakName(QString::fromUtf8(flatpak_ref_get_name(ref)));
     setType(flatpak_ref_get_kind(ref) == FLATPAK_REF_KIND_APP ? FlatpakResource::DesktopApp : FlatpakResource::Runtime);
     setObjectName(packageName());
 }
 
 QStringList FlatpakResource::categories()
 {
     auto cats = m_appdata.categories();
     if (m_appdata.kind() != AppStream::Component::KindAddon)
         cats.append(QStringLiteral("Application"));
     return cats;
 }
 
 QString FlatpakResource::comment()
 {
     const auto summary = m_appdata.summary();
     if (!summary.isEmpty()) {
         return summary;
     }
 
     return QString();
 }
 
 QString FlatpakResource::commit() const
 {
     return m_commit;
 }
 
 int FlatpakResource::downloadSize() const
 {
     return m_downloadSize;
 }
 
 QVariant FlatpakResource::icon() const
 {
     QIcon ret;
     const auto icons = m_appdata.icons();
 
     if (!m_bundledIcon.isNull()) {
         ret = QIcon(m_bundledIcon);
     } else if (icons.isEmpty()) {
         ret = QIcon::fromTheme(QStringLiteral("package-x-generic"));
     } else foreach(const AppStream::Icon &icon, icons) {
         switch (icon.kind()) {
             case AppStream::Icon::KindLocal:
             case AppStream::Icon::KindCached: {
                 const QString path = m_iconPath + icon.url().path();
                 if (QFileInfo::exists(path)) {
                     ret.addFile(path, icon.size());
                 } else {
                     const QString altPath = m_iconPath + QStringLiteral("%1x%2/").arg(icon.size().width()).arg(icon.size().height()) + icon.url().path();
                     if (QFileInfo::exists(altPath)) {
                         ret.addFile(altPath, icon.size());
                     }
                 }
             }   break;
             case AppStream::Icon::KindStock: {
                 const auto ret = QIcon::fromTheme(icon.name());
                 if (!ret.isNull())
                     return ret;
                 break;
             }
             case AppStream::Icon::KindRemote: {
                 const QString fileName = iconCachePath(icon);
                 if (QFileInfo::exists(fileName)) {
                     ret.addFile(fileName, icon.size());
                 }
                 break;
             }
             case AppStream::Icon::KindUnknown:
                 break;
         }
     }
 
     if (ret.isNull()) {
         ret = QIcon::fromTheme(QStringLiteral("package-x-generic"));
     }
 
     return ret;
 }
 
 QString FlatpakResource::installedVersion() const
 {
     // TODO check if there is actually version available
     QString version = branch();
     if (version.isEmpty()) {
         version = i18n("Unknown");
     }
 
     return version;
 }
 
 int FlatpakResource::installedSize() const
 {
     return m_installedSize;
 }
 
 bool FlatpakResource::isTechnical() const
 {
     return m_id.type == FlatpakResource::Runtime;
 }
 
 QUrl FlatpakResource::homepage()
 {
     return m_appdata.url(AppStream::Component::UrlKindHomepage);
 }
 
 QUrl FlatpakResource::helpURL()
 {
     return m_appdata.url(AppStream::Component::UrlKindHelp);
 }
 
 QUrl FlatpakResource::bugURL()
 {
     return m_appdata.url(AppStream::Component::UrlKindBugtracker);
 }
 
 QUrl FlatpakResource::donationURL()
 {
     return m_appdata.url(AppStream::Component::UrlKindDonation);
 }
 
 QString FlatpakResource::flatpakFileType() const
 {
     return m_flatpakFileType;
 }
 
 QString FlatpakResource::flatpakName() const
 {
     // If the flatpak name is not known (known only for installed apps), then use
     // appstream id instead;
     if (m_flatpakName.isEmpty()) {
         return m_id.id;
     }
 
     return m_flatpakName;
 }
 
 QString FlatpakResource::license()
 {
     return m_appdata.projectLicense();
 }
 
 QString FlatpakResource::longDescription()
 {
     return m_appdata.description();
 }
 
 QString FlatpakResource::name() const
 {
     QString name = m_appdata.name();
     if (name.isEmpty()) {
         name = flatpakName();
     }
 
     if (name.startsWith(QLatin1String("(Nightly) "))) {
         return name.mid(10);
     }
 
     return name;
 }
 
 QString FlatpakResource::origin() const
 {
     return m_id.origin;
 }
 
 QString FlatpakResource::packageName() const
 {
     return flatpakName() + QLatin1Char('/') + arch() + QLatin1Char('/') + branch();
 }
 
 FlatpakResource::PropertyState FlatpakResource::propertyState(FlatpakResource::PropertyKind kind) const
 {
     return m_propertyStates[kind];
 }
 
 QUrl FlatpakResource::resourceFile() const
 {
     return m_resourceFile;
 }
 
 QString FlatpakResource::runtime() const
 {
     return m_runtime;
 }
 
 QString FlatpakResource::section()
 {
     return QString();
 }
 
 int FlatpakResource::size()
 {
     if (m_state == Installed) {
         return m_installedSize;
     } else {
         return m_downloadSize;
     }
 }
 
 QString FlatpakResource::sizeDescription()
 {
     KFormat f;
     if (!isInstalled() || canUpgrade()) {
         if (propertyState(DownloadSize) == NotKnownYet || propertyState(InstalledSize) == NotKnownYet) {
             return i18n("Retrieving size information");
         } else if (propertyState(DownloadSize) == UnknownOrFailed || propertyState(InstalledSize) == UnknownOrFailed) {
             return i18n("Unknown size");
         } else {
             return i18nc("@info app size", "%1 to download, %2 on disk", f.formatByteSize(downloadSize()), f.formatByteSize(installedSize()));
         }
     } else {
         if (propertyState(InstalledSize) == NotKnownYet) {
             return i18n("Retrieving size information");
         } else if (propertyState(InstalledSize) == UnknownOrFailed) {
             return i18n("Unknown size");
         } else {
             return i18nc("@info app size", "%1 on disk", f.formatByteSize(installedSize()));
         }
     }
 }
 
 AbstractResource::State FlatpakResource::state()
 {
     return m_state;
 }
 
 FlatpakResource::ResourceType FlatpakResource::type() const
 {
     return m_id.type;
 }
 
 QString FlatpakResource::typeAsString() const
 {
     switch (m_id.type) {
         case FlatpakResource::DesktopApp:
         case FlatpakResource::Source:
             return QLatin1String("app");
         case FlatpakResource::Runtime:
             return QLatin1String("runtime");
         default:
             return QLatin1String("app");
     }
 }
 
 FlatpakResource::Id FlatpakResource::uniqueId() const
 {
     return m_id;
 }
 
 void FlatpakResource::invokeApplication() const
 {
     g_autoptr(GCancellable) cancellable = g_cancellable_new();
     g_autoptr(GError) localError = nullptr;
 
     if (!flatpak_installation_launch(m_id.installation,
                                      flatpakName().toUtf8().constData(),
                                      arch().toUtf8().constData(),
                                      branch().toUtf8().constData(),
                                      nullptr,
                                      cancellable,
                                      &localError)) {
         qWarning() << "Failed to launch " << m_appdata.name() << ": " << localError->message;
     }
 }
 
 void FlatpakResource::fetchChangelog()
 {
     emit changelogFetched(AppStreamUtils::changelogToHtml(m_appdata));
 }
 
 void FlatpakResource::fetchScreenshots()
 {
-    QList<QUrl> thumbnails, screenshots;
-
-    Q_FOREACH (const AppStream::Screenshot &s, m_appdata.screenshots()) {
-        const QUrl thumbnail = AppStreamUtils::imageOfKind(s.images(), AppStream::Image::KindThumbnail);
-        const QUrl plain = AppStreamUtils::imageOfKind(s.images(), AppStream::Image::KindSource);
-        if (plain.isEmpty())
-            qWarning() << "invalid screenshot for" << name();
-
-        screenshots << plain;
-        thumbnails << (thumbnail.isEmpty() ? plain : thumbnail);
-    }
-
-    Q_EMIT screenshotsFetched(thumbnails, screenshots);
+    const auto sc = AppStreamUtils::fetchScreenshots(m_appdata);
+    Q_EMIT screenshotsFetched(sc.first, sc.second);
 }
 
 void FlatpakResource::setArch(const QString &arch)
 {
     m_id.arch = arch;
 }
 
 void FlatpakResource::setBranch(const QString &branch)
 {
     m_id.branch = branch;
 }
 
 void FlatpakResource::setBundledIcon(const QPixmap &pixmap)
 {
     m_bundledIcon = pixmap;
 }
 
 void FlatpakResource::setCommit(const QString &commit)
 {
     m_commit = commit;
 }
 
 void FlatpakResource::setDownloadSize(int size)
 {
     m_downloadSize = size;
 
     setPropertyState(DownloadSize, AlreadyKnown);
 
     Q_EMIT sizeChanged();
 }
 
 void FlatpakResource::setFlatpakFileType(const QString &fileType)
 {
     m_flatpakFileType = fileType;
 }
 
 void FlatpakResource::setFlatpakName(const QString &name)
 {
     m_flatpakName = name;
 }
 
 void FlatpakResource::setIconPath(const QString &path)
 {
     m_iconPath = path;
 }
 
 void FlatpakResource::setInstalledSize(int size)
 {
     m_installedSize = size;
 
     setPropertyState(InstalledSize, AlreadyKnown);
 
     Q_EMIT sizeChanged();
 }
 
 void FlatpakResource::setOrigin(const QString &origin)
 {
     m_id.origin = origin;
 }
 
 void FlatpakResource::setPropertyState(FlatpakResource::PropertyKind kind, FlatpakResource::PropertyState newState)
 {
     auto & state = m_propertyStates[kind];
     if (state != newState) {
         state = newState;
 
         Q_EMIT propertyStateChanged(kind, newState);
     }
 }
 
 void FlatpakResource::setResourceFile(const QUrl &url)
 {
     m_resourceFile = url;
 }
 
 void FlatpakResource::setRuntime(const QString &runtime)
 {
     m_runtime = runtime;
 
     setPropertyState(RequiredRuntime, AlreadyKnown);
 }
 
 void FlatpakResource::setState(AbstractResource::State state)
 {
     if (m_state != state) {
         m_state = state;
 
         if (!backend()->isFetching())
             Q_EMIT stateChanged();
     }
 }
 
 void FlatpakResource::setType(FlatpakResource::ResourceType type)
 {
     m_id.type = type;
 }
 
 QString FlatpakResource::installationPath() const
 {
     return installationPath(m_id.installation);
 }
 
 QString FlatpakResource::installationPath(FlatpakInstallation* flatpakInstallation)
 {
     g_autoptr(GFile) path = flatpak_installation_get_path(flatpakInstallation);
     return QString::fromUtf8(g_file_get_path(path));
 }
 
 QUrl FlatpakResource::url() const
 {
     return m_resourceFile.isEmpty() ? QUrl(QStringLiteral("appstream://") + appstreamId()) : m_resourceFile;
 }
 
 QDate FlatpakResource::releaseDate() const
 {
     if (!m_appdata.releases().isEmpty()) {
         auto release = m_appdata.releases().constFirst();
         return release.timestamp().date();
     }
 
     return {};
 }
diff --git a/libdiscover/backends/PackageKitBackend/AppPackageKitResource.cpp b/libdiscover/backends/PackageKitBackend/AppPackageKitResource.cpp
index 47715ad3..5fc50c62 100644
--- a/libdiscover/backends/PackageKitBackend/AppPackageKitResource.cpp
+++ b/libdiscover/backends/PackageKitBackend/AppPackageKitResource.cpp
@@ -1,246 +1,235 @@
 /***************************************************************************
  *   Copyright © 2013 Aleix Pol Gonzalez <aleixpol@blue-systems.com>       *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or         *
  *   modify it under the terms of the GNU General Public License as        *
  *   published by the Free Software Foundation; either version 2 of        *
  *   the License or (at your option) version 3 or any later version        *
  *   accepted by the membership of KDE e.V. (or its successor approved     *
  *   by the membership of KDE e.V.), which shall act as a proxy            *
  *   defined in Section 14 of version 3 of the license.                    *
  *                                                                         *
  *   This program is distributed in the hope that it will be useful,       *
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
 #include "AppPackageKitResource.h"
 #include <AppStreamQt/screenshot.h>
 #include <AppStreamQt/icon.h>
 #include <AppStreamQt/image.h>
 #include <AppStreamQt/release.h>
 #include <appstream/AppStreamUtils.h>
 #include <PackageKit/Daemon>
 #include <KLocalizedString>
 #include <KToolInvocation>
 #include <QIcon>
 #include <QProcess>
 #include <QStandardPaths>
 #include <QDebug>
 #include "config-paths.h"
 #include "utils.h"
 
 AppPackageKitResource::AppPackageKitResource(const AppStream::Component& data, const QString &packageName, PackageKitBackend* parent)
     : PackageKitResource(packageName, QString(), parent)
     , m_appdata(data)
 {
     Q_ASSERT(data.isValid());
 }
 
 QString AppPackageKitResource::name() const
 {
     QString ret;
     if (!m_appdata.extends().isEmpty()) {
         auto components = backend()->componentsById(m_appdata.extends().constFirst());
 
         if (components.isEmpty())
             qWarning() << "couldn't find" << m_appdata.extends() << "which is supposedly extended by" << m_appdata.id();
         else
             ret = components.constFirst().name() + QStringLiteral(" - ") + m_appdata.name();
     }
 
     if (ret.isEmpty())
         ret = m_appdata.name();
     return ret;
 }
 
 QString AppPackageKitResource::longDescription()
 {
     const auto desc = m_appdata.description();
     if (!desc.isEmpty())
         return desc;
 
     return PackageKitResource::longDescription();
 }
 
 static QIcon componentIcon(const AppStream::Component &comp)
 {
     QIcon ret;
     foreach(const AppStream::Icon &icon, comp.icons()) {
         QStringList stock;
         switch(icon.kind()) {
             case AppStream::Icon::KindLocal:
                 ret.addFile(icon.url().toLocalFile(), icon.size());
                 break;
             case AppStream::Icon::KindCached:
                 ret.addFile(icon.url().toLocalFile(), icon.size());
                 break;
             case AppStream::Icon::KindStock: {
                 const auto ret = QIcon::fromTheme(icon.name());
                 if (!ret.isNull())
                     return ret;
                 break;
             }
             default:
                 break;
         }
     }
     if (ret.isNull()) {
         ret = QIcon::fromTheme(QStringLiteral("package-x-generic"));
     }
     return ret;
 }
 
 QVariant AppPackageKitResource::icon() const
 {
     return componentIcon(m_appdata);
 }
 
 QString AppPackageKitResource::license()
 {
     const auto license = m_appdata.projectLicense();
     return license.isEmpty() ? PackageKitResource::license() : license;
 }
 
 QStringList AppPackageKitResource::mimetypes() const
 {
     return m_appdata.provided(AppStream::Provided::KindMimetype).items();
 }
 
 QStringList AppPackageKitResource::categories()
 {
     auto cats = m_appdata.categories();
     if (m_appdata.kind() != AppStream::Component::KindAddon)
         cats.append(QStringLiteral("Application"));
     return cats;
 }
 
 QString AppPackageKitResource::comment()
 {
     const auto summary = m_appdata.summary();
     if (!summary.isEmpty())
         return summary;
 
     return PackageKitResource::comment();
 }
 
 QString AppPackageKitResource::appstreamId() const
 {
     return m_appdata.id();
 }
 
 QUrl AppPackageKitResource::homepage()
 {
     return m_appdata.url(AppStream::Component::UrlKindHomepage);
 }
 
 QUrl AppPackageKitResource::helpURL()
 {
     return m_appdata.url(AppStream::Component::UrlKindHelp);
 }
 
 QUrl AppPackageKitResource::bugURL()
 {
     return m_appdata.url(AppStream::Component::UrlKindBugtracker);
 }
 
 QUrl AppPackageKitResource::donationURL()
 {
     return m_appdata.url(AppStream::Component::UrlKindDonation);
 }
 
 bool AppPackageKitResource::isTechnical() const
 {
     static QString desktop = QString::fromUtf8(qgetenv("XDG_CURRENT_DESKTOP"));
     const auto desktops = m_appdata.compulsoryForDesktops();
     return (!desktops.isEmpty() && !desktops.contains(desktop)) || m_appdata.kind() == AppStream::Component::KindAddon;
 }
 
 void AppPackageKitResource::fetchScreenshots()
 {
-    QList<QUrl> thumbnails, screenshots;
-
-    Q_FOREACH (const AppStream::Screenshot &s, m_appdata.screenshots()) {
-        const QUrl thumbnail = AppStreamUtils::imageOfKind(s.images(), AppStream::Image::KindThumbnail);
-        const QUrl plain = AppStreamUtils::imageOfKind(s.images(), AppStream::Image::KindSource);
-        if (plain.isEmpty())
-            qWarning() << "invalid screenshot for" << name();
-
-        screenshots << plain;
-        thumbnails << (thumbnail.isEmpty() ? plain : thumbnail);
-    }
-
-    Q_EMIT screenshotsFetched(thumbnails, screenshots);
+    const auto sc = AppStreamUtils::fetchScreenshots(m_appdata);
+    Q_EMIT screenshotsFetched(sc.first, sc.second);
 }
 
 QStringList AppPackageKitResource::allPackageNames() const
 {
     return m_appdata.packageNames();
 }
 
 QList<PackageState> AppPackageKitResource::addonsInformation()
 {
     const PackageKitBackend* p = static_cast<PackageKitBackend*>(parent());
     const QVector<AppPackageKitResource*> res = p->extendedBy(m_appdata.id());
 
     QList<PackageState> ret;
     Q_FOREACH (AppPackageKitResource* r, res) {
         ret += PackageState(r->appstreamId(), r->name(), r->comment(), r->isInstalled());
     }
     return ret;
 }
 
 QStringList AppPackageKitResource::extends() const
 {
     return m_appdata.extends();
 }
 
 QString AppPackageKitResource::changelog() const
 {
     return AppStreamUtils::changelogToHtml(m_appdata);
 }
 
 void AppPackageKitResource::invokeApplication() const
 {
     auto trans = PackageKit::Daemon::getFiles({installedPackageId()});
     connect(trans, &PackageKit::Transaction::files, this, [this](const QString &/*packageID*/, const QStringList &filenames) {
         const auto allServices = QStandardPaths::locateAll(QStandardPaths::ApplicationsLocation, m_appdata.id());
         if (!allServices.isEmpty()) {
             const auto packageServices = kFilter<QStringList>(allServices, [filenames](const QString &file) { return filenames.contains(file); });
             QProcess::startDetached(QStringLiteral(CMAKE_INSTALL_FULL_LIBEXECDIR_KF5 "/discover/runservice"), {packageServices});
         } else {
             const QStringList exes = m_appdata.provided(AppStream::Provided::KindBinary).items();
             const auto packageExecutables = kFilter<QStringList>(allServices, [filenames](const QString &exe) { return filenames.contains(QLatin1Char('/') + exe); });
             if (!packageExecutables.isEmpty()) {
                 QProcess::startDetached(exes.constFirst());
             } else {
                 const auto locations = QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation);
                 const auto desktopFiles = kFilter<QStringList>(filenames, [locations](const QString &exe) {
                     for (const auto &location: locations) {
                         if (exe.startsWith(location))
                             return exe.contains(QLatin1String(".desktop"));
                     }
                     return false;
                 });
                 if (!desktopFiles.isEmpty()) {
                     QProcess::startDetached(QStringLiteral(CMAKE_INSTALL_FULL_LIBEXECDIR_KF5 "/discover/runservice"), { desktopFiles });
                 }
             }
             qWarning() << "Could not find any executables" << exes << filenames;
         }
     });
 }
 
 QDate AppPackageKitResource::releaseDate() const
 {
     if (!m_appdata.releases().isEmpty()) {
         auto release = m_appdata.releases().constFirst();
         return release.timestamp().date();
     }
 
     return {};
 }