diff --git a/src/ui/form/controls/controlutil.cpp b/src/ui/form/controls/controlutil.cpp
index e3b3e8c3..327ef929 100644
--- a/src/ui/form/controls/controlutil.cpp
+++ b/src/ui/form/controls/controlutil.cpp
@@ -12,8 +12,6 @@
 #include <QToolButton>
 #include <QWidgetAction>
 
-#include "widebutton.h"
-
 QCheckBox *ControlUtil::createCheckBox(bool checked,
                                        const std::function<void (bool checked)> &onToggled)
 {
@@ -39,7 +37,7 @@ QComboBox *ControlUtil::createComboBox(const QStringList &texts,
 QPushButton *ControlUtil::createButton(const QString &iconPath,
                                        const std::function<void ()> &onClicked)
 {
-    auto c = new WideButton(QIcon(iconPath));
+    auto c = new QPushButton(QIcon(iconPath), QString());
 
     c->connect(c, &QPushButton::clicked, onClicked);
 
@@ -72,7 +70,6 @@ QPushButton *ControlUtil::createLinkButton(const QString &iconPath,
 QLabel *ControlUtil::createLabel(const QString &text)
 {
     auto c = new QLabel(text);
-    c->setIndent(2);  // Workaround for clipping bug
     return c;
 }
 
diff --git a/src/ui/form/opt/pages/mainpage.cpp b/src/ui/form/opt/pages/mainpage.cpp
index b1a8004d..c5bed4dd 100644
--- a/src/ui/form/opt/pages/mainpage.cpp
+++ b/src/ui/form/opt/pages/mainpage.cpp
@@ -90,9 +90,9 @@ QLayout *MainPage::setupDialogButtons()
 
     buttonsLayout->addStretch();
 
-    m_btOk = new WideButton(QIcon(":/images/tick.png"));
-    m_btApply = new WideButton(QIcon(":/images/accept.png"));
-    m_btCancel = new WideButton(QIcon(":/images/cancel.png"));
+    m_btOk = new QPushButton(QIcon(":/images/tick.png"), QString());
+    m_btApply = new QPushButton(QIcon(":/images/accept.png"), QString());
+    m_btCancel = new QPushButton(QIcon(":/images/cancel.png"), QString());
 
     connect(m_btOk, &QAbstractButton::clicked, ctrl(), &OptionsController::saveChanges);
     connect(m_btApply, &QAbstractButton::clicked, ctrl(), &OptionsController::applyChanges);
diff --git a/src/ui/form/prog/programswindow.cpp b/src/ui/form/prog/programswindow.cpp
index d5e6f2c4..23df7932 100644
--- a/src/ui/form/prog/programswindow.cpp
+++ b/src/ui/form/prog/programswindow.cpp
@@ -287,8 +287,8 @@ void ProgramsWindow::setupAppEditForm()
     // OK/Cancel
     auto buttonsLayout = new QHBoxLayout();
 
-    m_btEditOk = new WideButton(QIcon(":/images/tick.png"));
-    m_btEditCancel = new WideButton(QIcon(":/images/cancel.png"));
+    m_btEditOk = new QPushButton(QIcon(":/images/tick.png"), QString());
+    m_btEditCancel = new QPushButton(QIcon(":/images/cancel.png"), QString());
 
     buttonsLayout->addWidget(m_btEditOk, 1, Qt::AlignRight);
     buttonsLayout->addWidget(m_btEditCancel);
diff --git a/src/ui/main.cpp b/src/ui/main.cpp
index 5986b002..4b8d38fe 100644
--- a/src/ui/main.cpp
+++ b/src/ui/main.cpp
@@ -21,7 +21,6 @@ static void registerMetaTypes(void)
 
 int main(int argc, char *argv[])
 {
-    QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
     QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
     QApplication::setAttribute(Qt::AA_DisableWindowContextHelpButton);