diff --git a/wayland_cursor_theme.cpp b/wayland_cursor_theme.cpp
index d8dcc3c80..c2f92367e 100644
--- a/wayland_cursor_theme.cpp
+++ b/wayland_cursor_theme.cpp
@@ -1,123 +1,124 @@
 /********************************************************************
  KWin - the KDE window manager
  This file is part of the KDE project.
 
 Copyright (C) 2015 Martin Gräßlin <mgraesslin@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) any later version.
 
 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 "wayland_cursor_theme.h"
 #include "cursor.h"
 #include "wayland_server.h"
 // Qt
 #include <QVector>
 // KWayland
 #include <KWayland/Client/shm_pool.h>
 #include <KWayland/Server/display.h>
 #include <KWayland/Server/output_interface.h>
 // Wayland
 #include <wayland-cursor.h>
 
 namespace KWin
 {
 
 WaylandCursorTheme::WaylandCursorTheme(KWayland::Client::ShmPool *shm, QObject *parent)
     : QObject(parent)
     , m_theme(nullptr)
     , m_shm(shm)
 {
 }
 
 WaylandCursorTheme::~WaylandCursorTheme()
 {
     destroyTheme();
 }
 
 void WaylandCursorTheme::loadTheme()
 {
     if (!m_shm->isValid()) {
         return;
     }
     Cursor *c = Cursor::self();
     int size = c->themeSize();
     if (size == 0) {
         // resolution depended
         // as we don't support per screen cursor sizes yet, we use the first screen
         KWayland::Server::Display *display = waylandServer()->display();
         auto output = display->outputs().first();
         // calculate dots per inch, multiplied with magic constants
         if (output->physicalSize().height()) {
             size = qreal(output->pixelSize().height()) / (qreal(output->physicalSize().height()) * 0.0393701) * 16.0 / 72.0;
         } else {
             // use sensible default
             size = 24;
         }
-        size *= output->scale();
-        connect(output, &KWayland::Server::OutputInterface::scaleChanged, this, &WaylandCursorTheme::loadTheme, Qt::UniqueConnection);
+        connect(output, &KWayland::Server::OutputInterface::pixelSizeChanged, this, &WaylandCursorTheme::loadTheme, Qt::UniqueConnection);
+        connect(output, &KWayland::Server::OutputInterface::physicalSizeChanged, this, &WaylandCursorTheme::loadTheme, Qt::UniqueConnection);
     }
+
     auto theme = wl_cursor_theme_load(c->themeName().toUtf8().constData(),
                                    size, m_shm->shm());
     if (theme) {
         if (!m_theme) {
             // so far the theme had not been created, this means we need to start tracking theme changes
             connect(c, &Cursor::themeChanged, this, &WaylandCursorTheme::loadTheme);
         } else {
             destroyTheme();
         }
         m_theme = theme;
         emit themeChanged();
     }
 }
 
 void WaylandCursorTheme::destroyTheme()
 {
     if (!m_theme) {
         return;
     }
     wl_cursor_theme_destroy(m_theme);
     m_theme = nullptr;
 }
 
 wl_cursor_image *WaylandCursorTheme::get(Qt::CursorShape shape)
 {
     return get(Cursor::self()->cursorName(shape));
 }
 
 wl_cursor_image *WaylandCursorTheme::get(const QByteArray &name)
 {
     if (!m_theme) {
         loadTheme();
     }
     if (!m_theme) {
         // loading cursor failed
         return nullptr;
     }
     wl_cursor *c = wl_cursor_theme_get_cursor(m_theme, name.constData());
     if (!c || c->image_count <= 0) {
         const auto &names = Cursor::self()->cursorAlternativeNames(name);
         for (auto it = names.begin(), end = names.end(); it != end; it++) {
             c = wl_cursor_theme_get_cursor(m_theme, (*it).constData());
             if (c && c->image_count > 0) {
                 break;
             }
         }
     }
     if (!c || c->image_count <= 0) {
         return nullptr;
     }
     // TODO: who deletes c?
     return c->images[0];
 }
 
 }