diff --git a/src/plugins/coreplugin/welcomepagehelper.cpp b/src/plugins/coreplugin/welcomepagehelper.cpp
index c1cf35beb3d..87ee6a07c4b 100644
--- a/src/plugins/coreplugin/welcomepagehelper.cpp
+++ b/src/plugins/coreplugin/welcomepagehelper.cpp
@@ -134,12 +134,10 @@ static const TextFormat &buttonTF(Button::Role role, WidgetState state)
 }
 
 Button::Button(const QString &text, Role role, QWidget *parent)
-    : QPushButton(text, parent)
+    : QAbstractButton(parent)
     , m_role(role)
 {
-    // Prevent QMacStyle::subElementRect(SE_PushButtonLayoutItem) from changing our geometry
-    setFlat(true);
-
+    setText(text);
     updateMargins();
     if (m_role == SmallList)
         setCheckable(true);
diff --git a/src/plugins/coreplugin/welcomepagehelper.h b/src/plugins/coreplugin/welcomepagehelper.h
index 84a6ec358b3..201d5e43483 100644
--- a/src/plugins/coreplugin/welcomepagehelper.h
+++ b/src/plugins/coreplugin/welcomepagehelper.h
@@ -70,7 +70,7 @@ CORE_EXPORT QWidget *createRule(Qt::Orientation orientation, QWidget *parent = n
 
 } // namespace WelcomePageHelpers
 
-class CORE_EXPORT Button : public QPushButton
+class CORE_EXPORT Button : public QAbstractButton
 {
 public:
     enum Role {
diff --git a/src/plugins/extensionmanager/extensionsbrowser.h b/src/plugins/extensionmanager/extensionsbrowser.h
index 4724e53cf5d..2daa2362ba0 100644
--- a/src/plugins/extensionmanager/extensionsbrowser.h
+++ b/src/plugins/extensionmanager/extensionsbrowser.h
@@ -9,10 +9,10 @@
 #include <QWidget>
 
 QT_BEGIN_NAMESPACE
+class QAbstractButton;
 class QItemSelectionModel;
 class QLineEdit;
 class QListView;
-class QPushButton;
 class QSortFilterProxyModel;
 QT_END_NAMESPACE
 
@@ -58,7 +58,7 @@ private:
 
     QScopedPointer<QStandardItemModel> m_model;
     QLineEdit *m_searchBox;
-    QPushButton *m_updateButton;
+    QAbstractButton *m_updateButton;
     QListView *m_extensionsView;
     QItemSelectionModel *m_selectionModel = nullptr;
     QSortFilterProxyModel *m_filterProxyModel;
diff --git a/src/plugins/welcome/welcomeplugin.cpp b/src/plugins/welcome/welcomeplugin.cpp
index 8f969c107fe..994d097024c 100644
--- a/src/plugins/welcome/welcomeplugin.cpp
+++ b/src/plugins/welcome/welcomeplugin.cpp
@@ -73,7 +73,7 @@ private:
     TopArea *m_topArea;
     SideArea *m_sideArea;
     QList<IWelcomePage *> m_pluginList;
-    QList<QPushButton *> m_pageButtons;
+    QList<QAbstractButton *> m_pageButtons;
     QButtonGroup *m_buttonGroup;
     Id m_activePage;
     Id m_defaultPage;