diff --git a/doc/assets-attribution.md b/doc/assets-attribution.md index 61b457a28..cd864f254 100644 --- a/doc/assets-attribution.md +++ b/doc/assets-attribution.md @@ -100,5 +100,4 @@ Jonas Schnelli src/qt/res/icons/bitcoin.icns, src/qt/res/src/bitcoin.svg, src/qt/res/src/bitcoin.ico, src/qt/res/src/bitcoin.png, src/qt/res/src/bitcoin_testnet.png, docs/bitcoin_logo_doxygen.png, - src/qt/res/icons/toolbar.png, src/qt/res/icons/toolbar_testnet.png, src/qt/res/images/splash.png, src/qt/res/images/splash_testnet.png diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include index 2052264dc..7e6fa5cb8 100644 --- a/src/Makefile.qt.include +++ b/src/Makefile.qt.include @@ -245,8 +245,6 @@ RES_ICONS = \ qt/res/icons/remove.png \ qt/res/icons/send.png \ qt/res/icons/synced.png \ - qt/res/icons/toolbar.png \ - qt/res/icons/toolbar_testnet.png \ qt/res/icons/transaction0.png \ qt/res/icons/transaction2.png \ qt/res/icons/transaction_conflicted.png \ diff --git a/src/qt/bitcoin.qrc b/src/qt/bitcoin.qrc index 357c6470d..6dba62035 100644 --- a/src/qt/bitcoin.qrc +++ b/src/qt/bitcoin.qrc @@ -4,7 +4,6 @@ res/icons/address-book.png res/icons/quit.png res/icons/send.png - res/icons/toolbar.png res/icons/connect0_16.png res/icons/connect1_16.png res/icons/connect2_16.png @@ -24,7 +23,6 @@ res/icons/editcopy.png res/icons/add.png res/icons/bitcoin_testnet.png - res/icons/toolbar_testnet.png res/icons/edit.png res/icons/history.png res/icons/overview.png diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index e3257e859..bfca5e8d1 100644 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -479,12 +479,12 @@ void BitcoinGUI::createTrayIcon(bool fIsTestnet) if (!fIsTestnet) { trayIcon->setToolTip(tr("Bitcoin Core client")); - trayIcon->setIcon(QIcon(":/icons/toolbar")); + trayIcon->setIcon(QIcon(":/icons/bitcoin")); } else { trayIcon->setToolTip(tr("Bitcoin Core client") + " " + tr("[testnet]")); - trayIcon->setIcon(QIcon(":/icons/toolbar_testnet")); + trayIcon->setIcon(QIcon(":/icons/bitcoin_testnet")); } trayIcon->show(); diff --git a/src/qt/res/icons/toolbar.png b/src/qt/res/icons/toolbar.png deleted file mode 100644 index c82d96519..000000000 Binary files a/src/qt/res/icons/toolbar.png and /dev/null differ diff --git a/src/qt/res/icons/toolbar_testnet.png b/src/qt/res/icons/toolbar_testnet.png deleted file mode 100644 index 5995bc066..000000000 Binary files a/src/qt/res/icons/toolbar_testnet.png and /dev/null differ