diff --git a/src/app/qtcreator.icns b/src/app/qtcreator.icns
index 6c27cfb5038..234075f2de4 100644
Binary files a/src/app/qtcreator.icns and b/src/app/qtcreator.icns differ
diff --git a/src/app/qtcreator.ico b/src/app/qtcreator.ico
index 1d3c1c9f3d6..b32a5ba8480 100644
Binary files a/src/app/qtcreator.ico and b/src/app/qtcreator.ico differ
diff --git a/src/plugins/coreplugin/images/logo/128/QtProject-qtcreator.png b/src/plugins/coreplugin/images/logo/128/QtProject-qtcreator.png
index c24d1d9eb9f..b7d8b35ea43 100644
Binary files a/src/plugins/coreplugin/images/logo/128/QtProject-qtcreator.png and b/src/plugins/coreplugin/images/logo/128/QtProject-qtcreator.png differ
diff --git a/src/plugins/coreplugin/images/logo/16/QtProject-qtcreator.png b/src/plugins/coreplugin/images/logo/16/QtProject-qtcreator.png
index eb218d703ea..e1adcdc5c22 100644
Binary files a/src/plugins/coreplugin/images/logo/16/QtProject-qtcreator.png and b/src/plugins/coreplugin/images/logo/16/QtProject-qtcreator.png differ
diff --git a/src/plugins/coreplugin/images/logo/24/QtProject-qtcreator.png b/src/plugins/coreplugin/images/logo/24/QtProject-qtcreator.png
index d6a2ab0c51a..5a0674d0a08 100644
Binary files a/src/plugins/coreplugin/images/logo/24/QtProject-qtcreator.png and b/src/plugins/coreplugin/images/logo/24/QtProject-qtcreator.png differ
diff --git a/src/plugins/coreplugin/images/logo/256/QtProject-qtcreator.png b/src/plugins/coreplugin/images/logo/256/QtProject-qtcreator.png
index 58090bc3d07..4fc92d89f5c 100644
Binary files a/src/plugins/coreplugin/images/logo/256/QtProject-qtcreator.png and b/src/plugins/coreplugin/images/logo/256/QtProject-qtcreator.png differ
diff --git a/src/plugins/coreplugin/images/logo/32/QtProject-qtcreator.png b/src/plugins/coreplugin/images/logo/32/QtProject-qtcreator.png
index 07e8d08df4e..58d934aa89e 100644
Binary files a/src/plugins/coreplugin/images/logo/32/QtProject-qtcreator.png and b/src/plugins/coreplugin/images/logo/32/QtProject-qtcreator.png differ
diff --git a/src/plugins/coreplugin/images/logo/48/QtProject-qtcreator.png b/src/plugins/coreplugin/images/logo/48/QtProject-qtcreator.png
index ae3551a61bd..bef97356bd4 100644
Binary files a/src/plugins/coreplugin/images/logo/48/QtProject-qtcreator.png and b/src/plugins/coreplugin/images/logo/48/QtProject-qtcreator.png differ
diff --git a/src/plugins/coreplugin/images/logo/512/QtProject-qtcreator.png b/src/plugins/coreplugin/images/logo/512/QtProject-qtcreator.png
index c56fb0383ea..556e512aed4 100644
Binary files a/src/plugins/coreplugin/images/logo/512/QtProject-qtcreator.png and b/src/plugins/coreplugin/images/logo/512/QtProject-qtcreator.png differ
diff --git a/src/plugins/coreplugin/images/logo/64/QtProject-qtcreator.png b/src/plugins/coreplugin/images/logo/64/QtProject-qtcreator.png
index 5b6847e812c..4a5476ef9c7 100644
Binary files a/src/plugins/coreplugin/images/logo/64/QtProject-qtcreator.png and b/src/plugins/coreplugin/images/logo/64/QtProject-qtcreator.png differ
diff --git a/src/plugins/coreplugin/mainwindow.cpp b/src/plugins/coreplugin/mainwindow.cpp
index fe609f40fb5..2db94d27dc5 100644
--- a/src/plugins/coreplugin/mainwindow.cpp
+++ b/src/plugins/coreplugin/mainwindow.cpp
@@ -154,7 +154,7 @@ MainWindow::MainWindow() :
     Utils::HistoryCompleter::setSettings(PluginManager::settings());
 
     setWindowTitle(tr("Qt Creator"));
-    if (!Utils::HostOsInfo::isMacHost())
+    if (Utils::HostOsInfo::isLinuxHost())
         QApplication::setWindowIcon(QIcon(QLatin1String(Constants::ICON_QTLOGO_128)));
     QCoreApplication::setApplicationName(QLatin1String("QtCreator"));
     QCoreApplication::setApplicationVersion(QLatin1String(Core::Constants::IDE_VERSION_LONG));
diff --git a/src/plugins/coreplugin/versiondialog.cpp b/src/plugins/coreplugin/versiondialog.cpp
index 50905598d24..126e29142f1 100644
--- a/src/plugins/coreplugin/versiondialog.cpp
+++ b/src/plugins/coreplugin/versiondialog.cpp
@@ -33,6 +33,7 @@
 #include <app/app_version.h>
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/icore.h>
+#include <utils/hostosinfo.h>
 #include <utils/qtcassert.h>
 
 #include <QDialogButtonBox>
@@ -49,7 +50,8 @@ VersionDialog::VersionDialog(QWidget *parent)
 {
     // We need to set the window icon explicitly here since for some reason the
     // application icon isn't used when the size of the dialog is fixed (at least not on X11/GNOME)
-    setWindowIcon(QIcon(QLatin1String(Constants::ICON_QTLOGO_128)));
+    if (Utils::HostOsInfo::isLinuxHost())
+        setWindowIcon(QIcon(QLatin1String(Constants::ICON_QTLOGO_128)));
 
     setWindowTitle(tr("About Qt Creator"));
     setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);