2 files changed, 5 insertions, 14 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoaintegration.mm b/src/plugins/platforms/cocoa/qcocoaintegration.mm
index 1e578e5052..deddcd3f98 100644
--- a/src/plugins/platforms/cocoa/qcocoaintegration.mm
+++ b/src/plugins/platforms/cocoa/qcocoaintegration.mm
@@ -472,13 +472,7 @@ QList<QCocoaWindow *> *QCocoaIntegration::popupWindowStack()
 
 void QCocoaIntegration::setApplicationIcon(const QIcon &icon) const
 {
-    NSImage *image = nil;
-    if (!icon.isNull()) {
-        NSSize size = [[[NSApplication sharedApplication] dockTile] size];
-        QPixmap pixmap = icon.pixmap(size.width, size.height);
-        image = [NSImage imageFromQImage:pixmap.toImage()];
-    }
-    [[NSApplication sharedApplication] setApplicationIconImage:image];
+    NSApp.applicationIconImage = [NSImage imageFromQIcon:icon];
 }
 
 void QCocoaIntegration::beep() const
diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm
index 6ba0cee310..c539afbfcd 100644
--- a/src/plugins/platforms/cocoa/qcocoawindow.mm
+++ b/src/plugins/platforms/cocoa/qcocoawindow.mm
@@ -894,13 +894,10 @@ void QCocoaWindow::setWindowIcon(const QIcon &icon)
 
     QMacAutoReleasePool pool;
 
-    if (icon.isNull()) {
-        NSWorkspace *workspace = [NSWorkspace sharedWorkspace];
-        [iconButton setImage:[workspace iconForFile:m_view.window.representedFilename]];
-    } else {
-        QPixmap pixmap = icon.pixmap(QSize(22, 22));
-        iconButton.image = [NSImage imageFromQImage:pixmap.toImage()];
-    }
+    if (icon.isNull())
+        iconButton.image = [NSWorkspace.sharedWorkspace iconForFile:m_view.window.representedFilename];
+    else
+        iconButton.image = [NSImage imageFromQIcon:icon];
 }
 
 void QCocoaWindow::setAlertState(bool enabled)