diff --git a/forms/advanced-scene-switcher.ui b/forms/advanced-scene-switcher.ui
index 682b0223..039e8abb 100644
--- a/forms/advanced-scene-switcher.ui
+++ b/forms/advanced-scene-switcher.ui
@@ -819,7 +819,7 @@
                <property name="maximumSize">
                 <size>
                  <width>22</width>
-                 <height>22</height>
+                 <height>16777215</height>
                 </size>
                </property>
                <property name="text">
@@ -864,7 +864,7 @@
                    <property name="maximumSize">
                     <size>
                      <width>22</width>
-                     <height>22</height>
+                     <height>16777215</height>
                     </size>
                    </property>
                    <property name="flat">
@@ -880,7 +880,7 @@
                    <property name="maximumSize">
                     <size>
                      <width>22</width>
-                     <height>22</height>
+                     <height>16777215</height>
                     </size>
                    </property>
                    <property name="flat">
@@ -935,7 +935,7 @@
                    <property name="maximumSize">
                     <size>
                      <width>22</width>
-                     <height>22</height>
+                     <height>16777215</height>
                     </size>
                    </property>
                    <property name="text">
@@ -954,7 +954,7 @@
                    <property name="maximumSize">
                     <size>
                      <width>22</width>
-                     <height>22</height>
+                     <height>16777215</height>
                     </size>
                    </property>
                    <property name="flat">
@@ -1006,7 +1006,7 @@
                    <property name="maximumSize">
                     <size>
                      <width>22</width>
-                     <height>22</height>
+                     <height>16777215</height>
                     </size>
                    </property>
                    <property name="flat">
@@ -1022,7 +1022,7 @@
                    <property name="maximumSize">
                     <size>
                      <width>22</width>
-                     <height>22</height>
+                     <height>16777215</height>
                     </size>
                    </property>
                    <property name="flat">
@@ -1077,7 +1077,7 @@
                    <property name="maximumSize">
                     <size>
                      <width>22</width>
-                     <height>22</height>
+                     <height>16777215</height>
                     </size>
                    </property>
                    <property name="flat">
@@ -1093,7 +1093,7 @@
                    <property name="maximumSize">
                     <size>
                      <width>22</width>
-                     <height>22</height>
+                     <height>16777215</height>
                     </size>
                    </property>
                    <property name="flat">
diff --git a/src/macro-core/macro-action-run.cpp b/src/macro-core/macro-action-run.cpp
index 66bf700e..2b929ed6 100644
--- a/src/macro-core/macro-action-run.cpp
+++ b/src/macro-core/macro-action-run.cpp
@@ -75,22 +75,22 @@ MacroActionRunEdit::MacroActionRunEdit(
 	_filePath = new FileSelection();
 	_argList = new QListWidget();
 	_addArg = new QPushButton();
-	_addArg->setMaximumSize(QSize(22, 22));
+	_addArg->setMaximumWidth(22);
 	_addArg->setProperty("themeID",
 			     QVariant(QString::fromUtf8("addIconSmall")));
 	_addArg->setFlat(true);
 	_removeArg = new QPushButton();
-	_removeArg->setMaximumSize(QSize(22, 22));
+	_removeArg->setMaximumWidth(22);
 	_removeArg->setProperty("themeID",
 				QVariant(QString::fromUtf8("removeIconSmall")));
 	_removeArg->setFlat(true);
 	_argUp = new QPushButton();
-	_argUp->setMaximumSize(QSize(22, 22));
+	_argUp->setMaximumWidth(22);
 	_argUp->setProperty("themeID",
 			    QVariant(QString::fromUtf8("upArrowIconSmall")));
 	_argUp->setFlat(true);
 	_argDown = new QPushButton();
-	_argDown->setMaximumSize(QSize(22, 22));
+	_argDown->setMaximumWidth(22);
 	_argDown->setProperty(
 		"themeID", QVariant(QString::fromUtf8("downArrowIconSmall")));
 	_argDown->setFlat(true);
diff --git a/src/macro-core/macro-condition-edit.cpp b/src/macro-core/macro-condition-edit.cpp
index 29224164..db76c01d 100644
--- a/src/macro-core/macro-condition-edit.cpp
+++ b/src/macro-core/macro-condition-edit.cpp
@@ -120,7 +120,7 @@ DurationModifierEdit::DurationModifierEdit(QWidget *parent)
 	_condition = new QComboBox(parent);
 	_duration = new DurationSelection(parent);
 	_toggle = new QPushButton(parent);
-	_toggle->setMaximumSize(22, 22);
+	_toggle->setMaximumWidth(22);
 	_toggle->setIcon(
 		QIcon(QString::fromStdString(getDataFilePath("res/time.svg"))));
 	populateDurationModifierTypes(_condition);
diff --git a/src/utils/connection-manager.cpp b/src/utils/connection-manager.cpp
index d84773f0..bcd95a98 100644
--- a/src/utils/connection-manager.cpp
+++ b/src/utils/connection-manager.cpp
@@ -153,7 +153,7 @@ void setButtonIcon(QPushButton *button, const char *path)
 ConnectionSelection::ConnectionSelection(QWidget *parent)
 	: QWidget(parent), _selection(new QComboBox), _modify(new QPushButton)
 {
-	_modify->setMaximumSize(22, 22);
+	_modify->setMaximumWidth(22);
 	setButtonIcon(_modify, ":/settings/images/settings/general.svg");
 	_modify->setFlat(true);
 
diff --git a/src/utils/macro-list.cpp b/src/utils/macro-list.cpp
index 3f39817e..7ec6a28f 100644
--- a/src/utils/macro-list.cpp
+++ b/src/utils/macro-list.cpp
@@ -17,19 +17,19 @@ MacroList::MacroList(QWidget *parent, bool allowDuplicates, bool reorder)
 	_up->setVisible(reorder);
 	_down->setVisible(reorder);
 
-	_add->setMaximumSize(QSize(22, 22));
+	_add->setMaximumWidth(22);
 	_add->setProperty("themeID",
 			  QVariant(QString::fromUtf8("addIconSmall")));
 	_add->setFlat(true);
-	_remove->setMaximumSize(QSize(22, 22));
+	_remove->setMaximumWidth(22);
 	_remove->setProperty("themeID",
 			     QVariant(QString::fromUtf8("removeIconSmall")));
 	_remove->setFlat(true);
-	_up->setMaximumSize(QSize(22, 22));
+	_up->setMaximumWidth(22);
 	_up->setProperty("themeID",
 			 QVariant(QString::fromUtf8("upArrowIconSmall")));
 	_up->setFlat(true);
-	_down->setMaximumSize(QSize(22, 22));
+	_down->setMaximumWidth(22);
 	_down->setProperty("themeID",
 			   QVariant(QString::fromUtf8("downArrowIconSmall")));
 	_down->setFlat(true);