diff --git a/ChangeLog b/ChangeLog
index d7cc2c347..eeee0c156 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,7 @@
    previous MediaKeys DBUS interface.
 7. Fix desktop detection via XDG_CURRENT_DESKTOP - check for colon separated
    values.
+8. Remove Cantata's high-dpi handling code, this should be done by Qt.
 
 2.1.0
 -----
diff --git a/context/contextwidget.cpp b/context/contextwidget.cpp
index 938419d43..05e55c898 100644
--- a/context/contextwidget.cpp
+++ b/context/contextwidget.cpp
@@ -102,7 +102,7 @@ public:
 
         painter.setFont(f);
         if (isChecked() || mo) {
-            int lh=Utils::isHighDpi() ? 5 : 3;
+            int lh=3;
             #ifdef Q_OS_MAC
             QColor col=OSXStyle::self()->viewPalette().highlight().color();
             #else
diff --git a/gui/currentcover.cpp b/gui/currentcover.cpp
index 3e36cf4bd..9a791e8a8 100644
--- a/gui/currentcover.cpp
+++ b/gui/currentcover.cpp
@@ -134,7 +134,7 @@ const QImage & CurrentCover::stdImage(bool stream)
     QImage &img=stream ? noStreamCover : noCover;
 
     if (img.isNull()) {
-        int iconSize=Icon::stdSize(Utils::scaleForDpi(128));
+        int iconSize=Icon::stdSize(128);
         img = (stream ? Icons::self()->streamIcon : Icons::self()->albumIcon(iconSize)).pixmap(iconSize, iconSize).toImage();
 
         QString &file=stream ? noStreamCoverFileName : noCoverFileName;
diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
index 873958a46..cae5d55d7 100644
--- a/gui/mainwindow.cpp
+++ b/gui/mainwindow.cpp
@@ -2482,7 +2482,7 @@ int MainWindow::calcMinHeight()
 {
     return tabWidget->style()&FancyTabWidget::Side && tabWidget->style()&FancyTabWidget::Large
             ? calcCollapsedSize()+(tabWidget->visibleCount()*tabWidget->tabSize().height())
-            : Utils::scaleForDpi(256);
+            : 256;
 }
 
 int MainWindow::calcCollapsedSize()
diff --git a/playlists/playlistruledialog.cpp b/playlists/playlistruledialog.cpp
index bb07efbeb..f3df259f3 100644
--- a/playlists/playlistruledialog.cpp
+++ b/playlists/playlistruledialog.cpp
@@ -97,7 +97,7 @@ PlaylistRuleDialog::PlaylistRuleDialog(QWidget *parent)
     adjustSize();
     int h=height();
     int w=width();
-    int minW=Utils::scaleForDpi(500);
+    int minW=500;
     setMinimumWidth(minW);
     setMinimumHeight(h);
     if (w<minW) {
diff --git a/support/fancytabwidget.cpp b/support/fancytabwidget.cpp
index f5cd5a152..1bd577373 100644
--- a/support/fancytabwidget.cpp
+++ b/support/fancytabwidget.cpp
@@ -56,7 +56,7 @@
 
 static inline int sidebarSpacing(bool withText)
 {
-    int sp=Utils::scaleForDpi(12);
+    int sp=12;
     if (!withText) {
         sp*=1.25;
     }
@@ -72,8 +72,8 @@ static int largeIconSize=32;
 static int smallIconSize=16;
 void FancyTabWidget::setup()
 {
-    largeIconSize=Icon::stdSize(Utils::scaleForDpi(32));
-    smallIconSize=Icon::stdSize(Utils::scaleForDpi(16));
+    largeIconSize=Icon::stdSize(32);
+    smallIconSize=Icon::stdSize(16);
 }
 
 int FancyTabWidget::iconSize(bool large)
@@ -267,7 +267,7 @@ QSize FancyTab::sizeHint() const
     int iconSize = tabbar->iconSize();
     bool withText = tabbar->showText();
     int spacing = sidebarSpacing(withText);
-    int padding = FancyTabBar::Side==tabbar->position() ? Utils::scaleForDpi(12) : 0;
+    int padding = FancyTabBar::Side==tabbar->position() ? 12 : 0;
     if (withText) {
         QFontMetrics fm(font());
         int textWidth = fm.width(text)*1.1;
@@ -281,7 +281,7 @@ QSize FancyTab::sizeHint() const
 QSize FancyTabBar::tabSizeHint() const
 {
     int spacing = sidebarSpacing(withText);
-    int padding = Side==pos ? Utils::scaleForDpi(12) : 0;
+    int padding = Side==pos ? 12 : 0;
     if (withText) {
         QFontMetrics fm(font());
         int maxTw=0;
diff --git a/support/icon.cpp b/support/icon.cpp
index d6977fedf..8233de619 100644
--- a/support/icon.cpp
+++ b/support/icon.cpp
@@ -41,13 +41,6 @@ int Icon::stdSize(int v)
         return 64;
     }
 
-    if (Utils::isHighDpi()) {
-        if (v<=160) {
-            return 128;
-        } else {
-            return 256;
-        }
-    }
     return 128;
 }
 
diff --git a/support/inputdialog.cpp b/support/inputdialog.cpp
index 195a90b7a..86005c4ec 100644
--- a/support/inputdialog.cpp
+++ b/support/inputdialog.cpp
@@ -67,11 +67,11 @@ void InputDialog::init(bool intInput, const QString &caption, const QString &lab
     if (intInput) {
         spin=new QSpinBox(wid);
         spin->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Preferred);
-        setMinimumWidth(Utils::scaleForDpi(300));
+        setMinimumWidth(300);
     } else {
         edit=new LineEdit(wid);
         edit->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Preferred);
-        setMinimumWidth(Utils::scaleForDpi(350));
+        setMinimumWidth(350);
     }
     layout->addRow(new QLabel(label, wid), intInput ? static_cast<QWidget *>(spin) : static_cast<QWidget *>(edit));
     layout->setMargin(0);
diff --git a/support/spinner.cpp b/support/spinner.cpp
index 3bcd60cba..a7db74c56 100644
--- a/support/spinner.cpp
+++ b/support/spinner.cpp
@@ -33,7 +33,7 @@
 Spinner::Spinner(QObject *p, bool inMiddle)
     : QWidget(0)
     , timer(0)
-    , space(Utils::scaleForDpi(4))
+    , space(4)
     , value(0)
     , active(false)
     , central(inMiddle)
@@ -81,7 +81,7 @@ void Spinner::paintEvent(QPaintEvent *event)
 {
     static const int constParts=8;
 
-    int lineWidth(Utils::scaleForDpi(2));
+    int lineWidth(2);
     QPainter p(this);
     QRectF rectangle(1.5, 1.5, size().width()-3, size().height()-3);
     QColor col(palette().color(QPalette::Text));
diff --git a/support/utils.cpp b/support/utils.cpp
index f719b5198..3cc7f1828 100644
--- a/support/utils.cpp
+++ b/support/utils.cpp
@@ -832,24 +832,11 @@ int Utils::layoutSpacing(QWidget *w)
 {
     int spacing=(w ? w->style() : qApp->style())->layoutSpacing(QSizePolicy::DefaultType, QSizePolicy::DefaultType, Qt::Vertical);
     if (spacing<0) {
-        spacing=scaleForDpi(4);
+        spacing=4;
     }
     return spacing;
 }
 
-double Utils::screenDpiScale()
-{
-    static double scaleFactor=-1.0;
-    if (scaleFactor<0) {
-        QWidget *dw=QApplication::desktop();
-        if (!dw) {
-            return 1.0;
-        }
-        scaleFactor=dw->logicalDpiX()>120 ? qMin(qMax(dw->logicalDpiX()/96.0, 1.0), 4.0) : 1.0;
-    }
-    return scaleFactor;
-}
-
 bool Utils::limitedHeight(QWidget *w)
 {
     static bool init=false;
diff --git a/support/utils.h b/support/utils.h
index 5da2b6201..ad3a2ab62 100644
--- a/support/utils.h
+++ b/support/utils.h
@@ -104,9 +104,6 @@ namespace Utils
     extern double smallFontFactor(const QFont &f);
     extern QFont smallFont(QFont f);
     extern int layoutSpacing(QWidget *w);
-    extern double screenDpiScale();
-    inline bool isHighDpi() { return screenDpiScale()>1.35; }
-    inline int scaleForDpi(int v) { return qRound(screenDpiScale()*v); }
     extern bool limitedHeight(QWidget *w);
     extern void resizeWindow(QWidget *w, bool preserveWidth=true, bool preserveHeight=true);
     extern void raiseWindow(QWidget *w);
diff --git a/tags/tageditor.cpp b/tags/tageditor.cpp
index 66053e502..300c0342b 100644
--- a/tags/tageditor.cpp
+++ b/tags/tageditor.cpp
@@ -371,7 +371,7 @@ TagEditor::TagEditor(QWidget *parent, const QList<Song> &songs,
         connect(ratingWidget, SIGNAL(valueChanged(int)), SLOT(checkRating()));
     }
     adjustSize();
-    int w=Utils::scaleForDpi(600);
+    int w=600;
     if (width()<w) {
         resize(w, height());
     }
diff --git a/widgets/coverwidget.cpp b/widgets/coverwidget.cpp
index a9e723ab1..e4af96f4e 100644
--- a/widgets/coverwidget.cpp
+++ b/widgets/coverwidget.cpp
@@ -158,7 +158,7 @@ CoverWidget::CoverWidget(QWidget *parent)
     QBoxLayout *l=new QBoxLayout(QBoxLayout::LeftToRight, this);
     l->setMargin(0);
     l->setSpacing(0);
-    l->addItem(new QSpacerItem(qMax(Utils::scaleForDpi(8), Utils::layoutSpacing(this)), 4, QSizePolicy::Fixed, QSizePolicy::Fixed));
+    l->addItem(new QSpacerItem(qMax(8, Utils::layoutSpacing(this)), 4, QSizePolicy::Fixed, QSizePolicy::Fixed));
     label=new CoverLabel(this);
     l->addWidget(label);
     label->setStyleSheet(QString("QLabel {border: %1px solid transparent} QToolTip {background-color:#111111; color: #DDDDDD}").arg(constBorder));
diff --git a/widgets/groupedview.cpp b/widgets/groupedview.cpp
index eae78237e..7ffdf9958 100644
--- a/widgets/groupedview.cpp
+++ b/widgets/groupedview.cpp
@@ -345,7 +345,7 @@ void GroupedViewDelegate::paint(QPainter *painter, const QStyleOptionViewItem &o
         }
         gradCol.setAlphaF(selected ? 0.4 : 0.25);
         painter->setRenderHint(QPainter::Antialiasing, true);
-        int radius=Utils::scaleForDpi(3);
+        int radius=3;
         painter->fillPath(Utils::buildPath(border, radius), gradCol);
         painter->setPen(QPen(borderCol, 1));
         painter->drawPath(Utils::buildPath(border, radius));
diff --git a/widgets/multipagewidget.cpp b/widgets/multipagewidget.cpp
index fe4f675b0..899fd8642 100644
--- a/widgets/multipagewidget.cpp
+++ b/widgets/multipagewidget.cpp
@@ -56,7 +56,7 @@ public:
         textSize+=6;
         int size=textSize;
         if (size<72) {
-            size=Utils::scaleForDpi(32);
+            size=32;
         }
         QPalette pal=mainText->palette();
         QColor col(mainText->palette().windowText().color());
diff --git a/widgets/nowplayingwidget.cpp b/widgets/nowplayingwidget.cpp
index d8950d3ae..50834a304 100644
--- a/widgets/nowplayingwidget.cpp
+++ b/widgets/nowplayingwidget.cpp
@@ -273,7 +273,7 @@ NowPlayingWidget::NowPlayingWidget(QWidget *p)
     QBoxLayout *topLayout=new QBoxLayout(QBoxLayout::LeftToRight, 0);
     QBoxLayout *botLayout=new QBoxLayout(QBoxLayout::LeftToRight, 0);
     int space=Utils::layoutSpacing(this);
-    int pad=qMax(space, Utils::scaleForDpi(8));
+    int pad=qMax(space,8);
     #ifdef Q_OS_MAC
     layout->setContentsMargins(pad, 0, pad, 0);
     #else
diff --git a/widgets/thinsplitterhandle.cpp b/widgets/thinsplitterhandle.cpp
index 14d05b937..acd2cbe66 100644
--- a/widgets/thinsplitterhandle.cpp
+++ b/widgets/thinsplitterhandle.cpp
@@ -31,7 +31,7 @@ ThinSplitterHandle::ThinSplitterHandle(Qt::Orientation orientation, QSplitter *p
     , highlightUnderMouse(false)
     , underMouse(false)
 {
-    sz=Utils::scaleForDpi(4);
+    sz=4;
     updateMask();
     setAttribute(Qt::WA_MouseNoMask, true);
 }
@@ -49,7 +49,7 @@ void ThinSplitterHandle::paintEvent(QPaintEvent *event)
     if (underMouse) {
         QColor col(palette().highlight().color());
         QPainter p(this);
-        int width=Utils::scaleForDpi(2);
+        int width=2;
         QRect r=event->rect();
         r=QRect(r.x()+((r.width()-width)/2), r.y(), width, r.height());
         col.setAlphaF(0.5);
diff --git a/widgets/titlewidget.cpp b/widgets/titlewidget.cpp
index 53dc4d004..a5cfbe59d 100644
--- a/widgets/titlewidget.cpp
+++ b/widgets/titlewidget.cpp
@@ -75,8 +75,8 @@ TitleWidget::TitleWidget(QWidget *p)
     if (size<72) {
         size=Icon::stdSize(size);
     }
-    int pad=Utils::scaleForDpi(6);
-    size=qMax(qMax(size, QFontMetrics(mainText->font()).height()+QFontMetrics(subText->font()).height()+spacing), Utils::scaleForDpi(40))+pad;
+    int pad=6;
+    size=qMax(qMax(size, QFontMetrics(mainText->font()).height()+QFontMetrics(subText->font()).height()+spacing), 40)+pad;
     image->setFixedSize(size, size);
     setToolTip(tr("Click to go back"));
     spacing=qMin(4, spacing-1);
@@ -158,7 +158,7 @@ void TitleWidget::update(const Song &sng, const QIcon &icon, const QString &text
     if (icon.isNull()) {
         image->setVisible(false);
     } else {
-        int iconPad=Utils::scaleForDpi(8);
+        int iconPad=8;
         int iconSize=image->width()-iconPad;
         if (iconSize<44 && iconSize>=32) {
             iconSize=32;
diff --git a/widgets/treeview.cpp b/widgets/treeview.cpp
index 824eee7a7..86c9f17f1 100644
--- a/widgets/treeview.cpp
+++ b/widgets/treeview.cpp
@@ -158,7 +158,7 @@ void TreeView::drag(Qt::DropActions supportedActions, QAbstractItemView *view, c
         }
         QDrag *drag = new QDrag(view);
         drag->setMimeData(data);
-        int pixSize=Icon::stdSize(Utils::scaleForDpi(32));
+        int pixSize=Icon::stdSize(32);
         drag->setPixmap(Icon("audio-x-generic").pixmap(pixSize, pixSize));
         drag->start(supportedActions);
     }
diff --git a/widgets/volumeslider.cpp b/widgets/volumeslider.cpp
index 25e74dea1..5c4a75db5 100644
--- a/widgets/volumeslider.cpp
+++ b/widgets/volumeslider.cpp
@@ -86,7 +86,7 @@ VolumeSlider::VolumeSlider(QWidget *p)
     widthStep=4;
     setRange(0, 100);
     setPageStep(Settings::self()->volumeStep());
-    lineWidth=Utils::scaleForDpi(1);
+    lineWidth=1;
 
     int w=lineWidth*widthStep*19;
     int h=lineWidth*constHeightStep*10;