diff --git a/src/libs/utils/images/extension.png b/src/libs/utils/images/extension.png index 57d48254869..176c5bd4aea 100644 Binary files a/src/libs/utils/images/extension.png and b/src/libs/utils/images/extension.png differ diff --git a/src/libs/utils/images/extension@2x.png b/src/libs/utils/images/extension@2x.png index e90faa2ac01..1436aae56a2 100644 Binary files a/src/libs/utils/images/extension@2x.png and b/src/libs/utils/images/extension@2x.png differ diff --git a/src/plugins/coreplugin/manhattanstyle.cpp b/src/plugins/coreplugin/manhattanstyle.cpp index f64275d3321..b905d2a079f 100644 --- a/src/plugins/coreplugin/manhattanstyle.cpp +++ b/src/plugins/coreplugin/manhattanstyle.cpp @@ -122,13 +122,13 @@ public: void init(); public: - const QPixmap extButtonPixmap; + const QIcon extButtonIcon; const QPixmap closeButtonPixmap; StyleAnimator animator; }; ManhattanStylePrivate::ManhattanStylePrivate() : - extButtonPixmap(Utils::Icons::TOOLBAR_EXTENSION.pixmap()), + extButtonIcon(Utils::Icons::TOOLBAR_EXTENSION.icon()), closeButtonPixmap(Utils::Icons::CLOSE_FOREGROUND.pixmap()) { } @@ -321,9 +321,6 @@ QPixmap ManhattanStyle::standardPixmap(StandardPixmap standardPixmap, const QSty QPixmap pixmap; switch (standardPixmap) { - case QStyle::SP_ToolBarHorizontalExtensionButton: - pixmap = d->extButtonPixmap; - break; case QStyle::SP_TitleBarCloseButton: pixmap = d->closeButtonPixmap; break; @@ -336,7 +333,16 @@ QPixmap ManhattanStyle::standardPixmap(StandardPixmap standardPixmap, const QSty QIcon ManhattanStyle::standardIcon(StandardPixmap standardIcon, const QStyleOption *option, const QWidget *widget) const { - QIcon icon = QProxyStyle::standardIcon(standardIcon, option, widget); + QIcon icon; + switch (standardIcon) { + case QStyle::SP_ToolBarHorizontalExtensionButton: + icon = d->extButtonIcon; + break; + default: + icon = QProxyStyle::standardIcon(standardIcon, option, widget); + break; + } + if (standardIcon == QStyle::SP_ComputerIcon) { // Ubuntu has in some versions a 16x16 icon, see QTCREATORBUG-12832 const QList &sizes = icon.availableSizes(); diff --git a/src/tools/icons/qtcreatoricons.svg b/src/tools/icons/qtcreatoricons.svg index 95e4ce93efb..78844f751b6 100644 --- a/src/tools/icons/qtcreatoricons.svg +++ b/src/tools/icons/qtcreatoricons.svg @@ -156,17 +156,6 @@ x2="160.5" y2="588" gradientUnits="userSpaceOnUse" /> - - - @@ -4191,15 +4180,14 @@