diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp
index f30b376fb..3ec0387c3 100644
--- a/src/gui/MainWindow.cpp
+++ b/src/gui/MainWindow.cpp
@@ -688,15 +688,16 @@ MainWindow::MainWindow()
     m_progressBar->setMaximum(100);
     statusBar()->addPermanentWidget(m_progressBar);
 
-    m_clearClipboardButton = new QPushButton(statusBar());
+    m_clearClipboardButton = new QToolButton(statusBar());
     m_clearClipboardButton->setIcon(icons()->icon("sweep"));
     m_clearClipboardButton->setToolTip(tr("Clear the clipboard immediately"));
     m_clearClipboardButton->setObjectName("clearClipboardButton");
     m_clearClipboardButton->setVisible(false);
+    m_clearClipboardButton->setStyleSheet("QToolButton { border: none; background-color: transparent; }");
     statusBar()->addPermanentWidget(m_clearClipboardButton);
 
     connect(clipboard(), &Clipboard::updateCountdown, this, &MainWindow::updateProgressBar);
-    connect(m_clearClipboardButton.data(), &QPushButton::clicked, this, &MainWindow::clearClipboard);
+    connect(m_clearClipboardButton.data(), &QToolButton::clicked, this, &MainWindow::clearClipboard);
     m_actionMultiplexer.connect(SIGNAL(updateSyncProgress(int, QString)), this, SLOT(updateProgressBar(int, QString)));
     m_actionMultiplexer.connect(SIGNAL(databaseSyncInProgress()), this, SLOT(disableMenuAndToolbar()));
     m_actionMultiplexer.connect(SIGNAL(databaseSyncCompleted(QString)), this, SLOT(enableMenuAndToolbar()));
diff --git a/src/gui/MainWindow.h b/src/gui/MainWindow.h
index 73ea946ac..2b38ea84a 100644
--- a/src/gui/MainWindow.h
+++ b/src/gui/MainWindow.h
@@ -23,9 +23,9 @@
 #include <QLabel>
 #include <QMainWindow>
 #include <QProgressBar>
-#include <QPushButton>
 #include <QSystemTrayIcon>
 #include <QTimer>
+#include <QToolButton>
 
 #include "core/SignalMultiplexer.h"
 #include "gui/DatabaseWidget.h"
@@ -192,7 +192,7 @@ private:
     QPointer<QProgressBar> m_progressBar;
     QPointer<QLabel> m_progressBarLabel;
     QPointer<QLabel> m_statusBarLabel;
-    QPointer<QPushButton> m_clearClipboardButton;
+    QPointer<QToolButton> m_clearClipboardButton;
 
     Q_DISABLE_COPY(MainWindow)
 
diff --git a/tests/gui/TestGui.cpp b/tests/gui/TestGui.cpp
index c06388af6..da59fd01f 100644
--- a/tests/gui/TestGui.cpp
+++ b/tests/gui/TestGui.cpp
@@ -2508,7 +2508,7 @@ void TestGui::testClearClipboard()
     QTest::keyClick(entryView, Qt::Key_C, Qt::ControlModifier);
     QTRY_COMPARE(clipboard->text(), entryView->currentEntry()->password());
 
-    QPushButton* clearClipboardButton = m_mainWindow->findChild<QPushButton*>("clearClipboardButton");
+    QToolButton* clearClipboardButton = m_mainWindow->findChild<QToolButton*>("clearClipboardButton");
     QTRY_VERIFY(clearClipboardButton->isVisible());
     clearClipboardButton->click();
     QCOMPARE(clipboard->text(), QString());