diff --git a/apps/wizard/existinginstallationpage.cpp b/apps/wizard/existinginstallationpage.cpp
index d5ba009799..0129be9ccf 100644
--- a/apps/wizard/existinginstallationpage.cpp
+++ b/apps/wizard/existinginstallationpage.cpp
@@ -5,6 +5,8 @@
 #include <QFileInfo>
 #include <QMessageBox>
 
+#include <components/misc/scalableicon.hpp>
+
 #include "mainwizard.hpp"
 
 Wizard::ExistingInstallationPage::ExistingInstallationPage(QWidget* parent)
@@ -18,6 +20,8 @@ Wizard::ExistingInstallationPage::ExistingInstallationPage(QWidget* parent)
     QListWidgetItem* emptyItem = new QListWidgetItem(tr("No existing installations detected"));
     emptyItem->setFlags(Qt::NoItemFlags);
 
+    browseButton->setIcon(Misc::ScalableIcon::load(":folder"));
+
     installationsList->insertItem(0, emptyItem);
 }
 
diff --git a/apps/wizard/installationtargetpage.cpp b/apps/wizard/installationtargetpage.cpp
index 1da28b1237..1159d152c6 100644
--- a/apps/wizard/installationtargetpage.cpp
+++ b/apps/wizard/installationtargetpage.cpp
@@ -8,6 +8,7 @@
 
 #include <components/files/configurationmanager.hpp>
 #include <components/files/conversion.hpp>
+#include <components/misc/scalableicon.hpp>
 
 #include "mainwizard.hpp"
 
@@ -19,7 +20,7 @@ Wizard::InstallationTargetPage::InstallationTargetPage(QWidget* parent, const Fi
 
     setupUi(this);
 
-    folderIconLabel->setPixmap(QIcon(":folder").pixmap(QSize(48, 48)));
+    folderIcon->setIcon(Misc::ScalableIcon::load(":folder"));
 
     registerField(QLatin1String("installation.path*"), targetLineEdit);
 }
diff --git a/apps/wizard/languageselectionpage.cpp b/apps/wizard/languageselectionpage.cpp
index 7d4c2184ee..895e959545 100644
--- a/apps/wizard/languageselectionpage.cpp
+++ b/apps/wizard/languageselectionpage.cpp
@@ -1,5 +1,7 @@
 #include "languageselectionpage.hpp"
 
+#include <components/misc/scalableicon.hpp>
+
 #include "mainwizard.hpp"
 
 Wizard::LanguageSelectionPage::LanguageSelectionPage(QWidget* parent)
@@ -9,7 +11,7 @@ Wizard::LanguageSelectionPage::LanguageSelectionPage(QWidget* parent)
 
     setupUi(this);
 
-    flagIconLabel->setPixmap(QIcon(":preferences-desktop-locale").pixmap(QSize(48, 48)));
+    flagIcon->setIcon(Misc::ScalableIcon::load(":preferences-desktop-locale"));
 
     registerField(QLatin1String("installation.language"), languageComboBox, "currentData", "currentDataChanged");
 }
diff --git a/apps/wizard/methodselectionpage.cpp b/apps/wizard/methodselectionpage.cpp
index 2ff7db5487..1c80608a17 100644
--- a/apps/wizard/methodselectionpage.cpp
+++ b/apps/wizard/methodselectionpage.cpp
@@ -1,6 +1,8 @@
 #include "methodselectionpage.hpp"
 #include "mainwizard.hpp"
 
+#include <components/misc/scalableicon.hpp>
+
 #include <QDesktopServices>
 #include <QUrl>
 
@@ -11,9 +13,9 @@ Wizard::MethodSelectionPage::MethodSelectionPage(QWidget* parent)
 
     setupUi(this);
 
-    installerIconLabel->setPixmap(QIcon(":system-installer").pixmap(QSize(48, 48)));
-    folderIconLabel->setPixmap(QIcon(":folder").pixmap(QSize(48, 48)));
-    buyIconLabel->setPixmap(QIcon(":dollar").pixmap(QSize(48, 48)));
+    installerIcon->setIcon(Misc::ScalableIcon::load(":system-installer"));
+    folderIcon->setIcon(Misc::ScalableIcon::load(":folder"));
+    buyLinkButton->setIcon(Misc::ScalableIcon::load(":dollar"));
 
 #ifndef OPENMW_USE_UNSHIELD
     retailDiscRadioButton->setEnabled(false);
@@ -23,7 +25,7 @@ Wizard::MethodSelectionPage::MethodSelectionPage(QWidget* parent)
 
     registerField(QLatin1String("installation.retailDisc"), retailDiscRadioButton);
 
-    connect(buyLinkButton, &QCommandLinkButton::released, this, &MethodSelectionPage::handleBuyButton);
+    connect(buyLinkButton, &QPushButton::released, this, &MethodSelectionPage::handleBuyButton);
 }
 
 int Wizard::MethodSelectionPage::nextId() const
diff --git a/apps/wizard/ui/installationtargetpage.ui b/apps/wizard/ui/installationtargetpage.ui
index 4b1f4238d4..f77e0623ac 100644
--- a/apps/wizard/ui/installationtargetpage.ui
+++ b/apps/wizard/ui/installationtargetpage.ui
@@ -23,18 +23,18 @@
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
-      <widget class="QLabel" name="folderIconLabel">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
+      <widget class="QToolButton" name="folderIcon">
+       <property name="styleSheet">
+        <string notr="true">QToolButton { border: none; padding: 0px; }</string>
        </property>
-       <property name="textFormat">
-        <enum>Qt::RichText</enum>
+       <property name="text">
+        <string/>
        </property>
-       <property name="alignment">
-        <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+       <property name="iconSize">
+        <size>
+         <width>48</width>
+         <height>48</height>
+        </size>
        </property>
       </widget>
      </item>
@@ -80,7 +80,7 @@
   </layout>
  </widget>
  <resources>
-  <include location="../../wizard/wizard.qrc"/>
+  <include location="../../../files/wizard/wizard.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/apps/wizard/ui/languageselectionpage.ui b/apps/wizard/ui/languageselectionpage.ui
index 3cff2c5b44..f97381eadc 100644
--- a/apps/wizard/ui/languageselectionpage.ui
+++ b/apps/wizard/ui/languageselectionpage.ui
@@ -23,18 +23,18 @@
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
-      <widget class="QLabel" name="flagIconLabel">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
+      <widget class="QToolButton" name="flagIcon">
+       <property name="styleSheet">
+        <string notr="true">QToolButton { border: none; padding: 0px; }</string>
        </property>
-       <property name="textFormat">
-        <enum>Qt::RichText</enum>
+       <property name="text">
+        <string/>
        </property>
-       <property name="alignment">
-        <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+       <property name="iconSize">
+        <size>
+         <width>48</width>
+         <height>48</height>
+        </size>
        </property>
       </widget>
      </item>
diff --git a/apps/wizard/ui/methodselectionpage.ui b/apps/wizard/ui/methodselectionpage.ui
index 28755ad438..ed6f91159d 100644
--- a/apps/wizard/ui/methodselectionpage.ui
+++ b/apps/wizard/ui/methodselectionpage.ui
@@ -52,24 +52,18 @@
       </spacer>
      </item>
      <item>
-      <widget class="QLabel" name="installerIconLabel">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
+      <widget class="QToolButton" name="installerIcon">
+       <property name="styleSheet">
+        <string notr="true">QToolButton { border: none; padding: 0px; }</string>
        </property>
-       <property name="textFormat">
-        <enum>Qt::RichText</enum>
+       <property name="text">
+        <string/>
        </property>
-       <property name="scaledContents">
-        <bool>false</bool>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
-       </property>
-       <property name="buddy">
-        <cstring>retailDiscRadioButton</cstring>
+       <property name="iconSize">
+        <size>
+         <width>48</width>
+         <height>48</height>
+        </size>
        </property>
       </widget>
      </item>
@@ -114,18 +108,15 @@
       </spacer>
      </item>
      <item>
-      <widget class="QLabel" name="folderIconLabel">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
+      <widget class="QToolButton" name="folderIcon">
+       <property name="styleSheet">
+        <string notr="true">QToolButton { border: none; padding: 0px; }</string>
        </property>
-       <property name="textFormat">
-        <enum>Qt::RichText</enum>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+       <property name="iconSize">
+        <size>
+         <width>48</width>
+         <height>48</height>
+        </size>
        </property>
       </widget>
      </item>
@@ -150,6 +141,19 @@
    </item>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <spacer name="horizontalSpacer_5">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
      <item>
       <widget class="QLabel" name="label">
        <property name="text">
@@ -157,6 +161,19 @@
        </property>
       </widget>
      </item>
+     <item>
+      <spacer name="horizontalSpacer_6">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
     </layout>
    </item>
    <item>
@@ -167,7 +184,7 @@
         <enum>Qt::Horizontal</enum>
        </property>
        <property name="sizeType">
-        <enum>QSizePolicy::Maximum</enum>
+        <enum>QSizePolicy::Expanding</enum>
        </property>
        <property name="sizeHint" stdset="0">
         <size>
@@ -178,22 +195,21 @@
       </spacer>
      </item>
      <item>
-      <widget class="QLabel" name="buyIconLabel">
+      <widget class="QPushButton" name="buyLinkButton">
        <property name="sizePolicy">
-        <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
+        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QCommandLinkButton" name="buyLinkButton">
        <property name="text">
         <string>Buy the game</string>
        </property>
-       <property name="checkable">
-        <bool>false</bool>
+       <property name="iconSize">
+        <size>
+         <width>48</width>
+         <height>48</height>
+        </size>
        </property>
       </widget>
      </item>