1 files changed, 8 insertions, 18 deletions

diff --git a/src/plugins/extensionmanager/extensionsbrowser.cpp b/src/plugins/extensionmanager/extensionsbrowser.cpp
index 1758694ab97..dba1936d607 100644
--- a/src/plugins/extensionmanager/extensionsbrowser.cpp
+++ b/src/plugins/extensionmanager/extensionsbrowser.cpp
@@ -41,7 +41,7 @@ using PluginSpecList = QList<const PluginSpec *>;
 using Tags = QStringList;
 
 constexpr QSize itemSize = {330, 86};
-constexpr int gapSize = 2 * WelcomePageHelpers::GridItemGap;
+constexpr int gapSize = StyleHelper::SpacingTokens::ExVPaddingGapXl;
 constexpr QSize cellSize = {itemSize.width() + gapSize, itemSize.height() + gapSize};
 
 enum Role {
@@ -62,16 +62,6 @@ ItemData itemData(const QModelIndex &index)
     };
 }
 
-void setBackgroundColor(QWidget *widget, Theme::Color colorRole)
-{
-    QPalette palette = creatorTheme()->palette();
-    palette.setColor(QPalette::Window,
-                     creatorTheme()->color(colorRole));
-    widget->setPalette(palette);
-    widget->setBackgroundRole(QPalette::Window);
-    widget->setAutoFillBackground(true);
-}
-
 static QColor colorForExtensionName(const QString &name)
 {
     const size_t hash = qHash(name);
@@ -390,7 +380,7 @@ public:
         }
         {
             constexpr int textX = 80;
-            constexpr int rightMargin = 2 * WelcomePageHelpers::ItemGap;
+            constexpr int rightMargin = StyleHelper::SpacingTokens::ExVPaddingGapXl;
             constexpr int maxTextWidth = itemSize.width() - textX - rightMargin;
             constexpr Qt::TextElideMode elideMode = Qt::ElideRight;
 
@@ -440,8 +430,7 @@ ExtensionsBrowser::ExtensionsBrowser()
     m_searchBox = new Core::SearchBox;
     m_searchBox->setFixedWidth(itemSize.width());
 
-    m_updateButton = new WelcomePageButton;
-    m_updateButton->setText(Tr::tr("Install..."));
+    m_updateButton = new Button(Tr::tr("Install..."), Button::MediumPrimary);
 
     m_filterProxyModel = new QSortFilterProxyModel(this);
     m_filterProxyModel->setFilterCaseSensitivity(Qt::CaseInsensitive);
@@ -469,9 +458,10 @@ ExtensionsBrowser::ExtensionsBrowser()
         noMargin(), spacing(0),
     }.attachTo(this);
 
-    setBackgroundColor(this, Theme::Token_Background_Default);
-    setBackgroundColor(m_extensionsView, Theme::Token_Background_Default);
-    setBackgroundColor(m_extensionsView->viewport(), Theme::Token_Background_Default);
+    WelcomePageHelpers::setBackgroundColor(this, Theme::Token_Background_Default);
+    WelcomePageHelpers::setBackgroundColor(m_extensionsView, Theme::Token_Background_Default);
+    WelcomePageHelpers::setBackgroundColor(m_extensionsView->viewport(),
+                                           Theme::Token_Background_Default);
 
     auto updateModel = [this] {
         m_model.reset(extensionsModel());
@@ -488,7 +478,7 @@ ExtensionsBrowser::ExtensionsBrowser()
 
     connect(ExtensionSystem::PluginManager::instance(),
             &ExtensionSystem::PluginManager::pluginsChanged, this, updateModel);
-    connect(m_searchBox->m_lineEdit, &Utils::FancyLineEdit::textChanged,
+    connect(m_searchBox, &QLineEdit::textChanged,
             m_filterProxyModel, &QSortFilterProxyModel::setFilterWildcard);
 }