diff --git a/plasmoid/lib/appearanceoptionpage.ui b/plasmoid/lib/appearanceoptionpage.ui
index 042ede0..aa8a604 100644
--- a/plasmoid/lib/appearanceoptionpage.ui
+++ b/plasmoid/lib/appearanceoptionpage.ui
@@ -2,6 +2,12 @@
 <ui version="4.0">
  <class>Plasmoid::AppearanceOptionPage</class>
  <widget class="QWidget" name="Plasmoid::AppearanceOptionPage">
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
   <property name="windowTitle">
    <string>Appearance</string>
   </property>
diff --git a/widgets/settings/appearanceoptionpage.ui b/widgets/settings/appearanceoptionpage.ui
index d05af04..0f91988 100644
--- a/widgets/settings/appearanceoptionpage.ui
+++ b/widgets/settings/appearanceoptionpage.ui
@@ -2,6 +2,12 @@
 <ui version="4.0">
  <class>QtGui::AppearanceOptionPage</class>
  <widget class="QWidget" name="QtGui::AppearanceOptionPage">
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
   <property name="windowTitle">
    <string>Appearance</string>
   </property>
diff --git a/widgets/settings/autostartoptionpage.ui b/widgets/settings/autostartoptionpage.ui
index 5d9a26c..ffb961f 100644
--- a/widgets/settings/autostartoptionpage.ui
+++ b/widgets/settings/autostartoptionpage.ui
@@ -2,6 +2,12 @@
 <ui version="4.0">
  <class>QtGui::AutostartOptionPage</class>
  <widget class="QWidget" name="QtGui::AutostartOptionPage">
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
   <property name="windowTitle">
    <string>Autostart</string>
   </property>
diff --git a/widgets/settings/connectionoptionpage.ui b/widgets/settings/connectionoptionpage.ui
index b23817b..f09b250 100644
--- a/widgets/settings/connectionoptionpage.ui
+++ b/widgets/settings/connectionoptionpage.ui
@@ -2,6 +2,12 @@
 <ui version="4.0">
  <class>QtGui::ConnectionOptionPage</class>
  <widget class="QWidget" name="QtGui::ConnectionOptionPage">
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
   <property name="windowTitle">
    <string>Connection</string>
   </property>
@@ -75,7 +81,8 @@
          <string>Move currently selected configuration down</string>
         </property>
         <property name="icon">
-         <iconset theme="go-down"/>
+         <iconset theme="go-down">
+          <normaloff>.</normaloff>.</iconset>
         </property>
        </widget>
       </item>
@@ -91,7 +98,8 @@
          <string>Move currently selected configuration up</string>
         </property>
         <property name="icon">
-         <iconset theme="go-up"/>
+         <iconset theme="go-up">
+          <normaloff>.</normaloff>.</iconset>
         </property>
        </widget>
       </item>
@@ -448,17 +456,17 @@
   </layout>
  </widget>
  <customwidgets>
+  <customwidget>
+   <class>QtUtilities::ClearLineEdit</class>
+   <extends>QLineEdit</extends>
+   <header location="global">qtutilities/widgets/clearlineedit.h</header>
+  </customwidget>
   <customwidget>
    <class>QtUtilities::PathSelection</class>
    <extends>QWidget</extends>
    <header location="global">qtutilities/widgets/pathselection.h</header>
    <container>1</container>
   </customwidget>
-  <customwidget>
-   <class>QtUtilities::ClearLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header location="global">qtutilities/widgets/clearlineedit.h</header>
-  </customwidget>
  </customwidgets>
  <resources>
   <include location="../resources/syncthingwidgetsicons.qrc"/>
diff --git a/widgets/settings/iconsoptionpage.ui b/widgets/settings/iconsoptionpage.ui
index dedd49e..a32792e 100644
--- a/widgets/settings/iconsoptionpage.ui
+++ b/widgets/settings/iconsoptionpage.ui
@@ -2,6 +2,12 @@
 <ui version="4.0">
  <class>QtGui::IconsOptionPage</class>
  <widget class="QWidget" name="QtGui::IconsOptionPage">
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
   <property name="windowTitle">
    <string>Icons</string>
   </property>
@@ -11,10 +17,21 @@
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
-    <widget class="QLabel" name="contextLabel"/>
-   </item>
-   <item>
-    <widget class="QCheckBox" name="contextCheckBox"/>
+    <layout class="QHBoxLayout" name="horizontalLayout_2" stretch="1,0">
+     <item>
+      <widget class="QLabel" name="contextLabel">
+       <property name="minimumSize">
+        <size>
+         <width>0</width>
+         <height>32</height>
+        </size>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QCheckBox" name="contextCheckBox"/>
+     </item>
+    </layout>
    </item>
    <item>
     <widget class="QLabel" name="dragAndDropInfoLabel">
@@ -115,7 +132,8 @@
            <string>Use preset</string>
           </property>
           <property name="icon">
-           <iconset theme="color-profile"/>
+           <iconset theme="color-profile">
+            <normaloff>.</normaloff>.</iconset>
           </property>
          </widget>
         </item>
diff --git a/widgets/settings/launcheroptionpage.ui b/widgets/settings/launcheroptionpage.ui
index e6d81b9..854916a 100644
--- a/widgets/settings/launcheroptionpage.ui
+++ b/widgets/settings/launcheroptionpage.ui
@@ -180,17 +180,17 @@
   </layout>
  </widget>
  <customwidgets>
+  <customwidget>
+   <class>QtUtilities::ClearLineEdit</class>
+   <extends>QLineEdit</extends>
+   <header location="global">qtutilities/widgets/clearlineedit.h</header>
+  </customwidget>
   <customwidget>
    <class>QtUtilities::PathSelection</class>
    <extends>QWidget</extends>
    <header location="global">qtutilities/widgets/pathselection.h</header>
    <container>1</container>
   </customwidget>
-  <customwidget>
-   <class>QtUtilities::ClearLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header location="global">qtutilities/widgets/clearlineedit.h</header>
-  </customwidget>
   <customwidget>
    <class>QtUtilities::ClearPlainTextEdit</class>
    <extends>QPlainTextEdit</extends>
diff --git a/widgets/settings/systemdoptionpage.ui b/widgets/settings/systemdoptionpage.ui
index 7d15b6c..c9fd247 100644
--- a/widgets/settings/systemdoptionpage.ui
+++ b/widgets/settings/systemdoptionpage.ui
@@ -37,6 +37,12 @@
    </item>
    <item>
     <widget class="QWidget" name="systemdFormWidget" native="true">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
      <layout class="QFormLayout" name="formLayout">
       <property name="leftMargin">
        <number>30</number>
@@ -66,6 +72,13 @@
       <item row="0" column="1">
        <widget class="QtUtilities::ClearLineEdit" name="syncthingUnitLineEdit"/>
       </item>
+      <item row="1" column="1">
+       <widget class="QCheckBox" name="systemUnitCheckBox">
+        <property name="text">
+         <string>System unit</string>
+        </property>
+       </widget>
+      </item>
       <item row="2" column="0">
        <widget class="QLabel" name="descriptionLabel">
         <property name="sizePolicy">
@@ -74,12 +87,6 @@
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
-        <property name="minimumSize">
-         <size>
-          <width>0</width>
-          <height>32</height>
-         </size>
-        </property>
         <property name="text">
          <string>Description</string>
         </property>
@@ -89,12 +96,6 @@
        <layout class="QHBoxLayout" name="descriptionHorizontalLayout">
         <item>
          <widget class="QLabel" name="descriptionValueLabel">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Expanding" vsizetype="Minimum">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
           <property name="minimumSize">
            <size>
             <width>0</width>
@@ -286,13 +287,6 @@
         </item>
        </layout>
       </item>
-      <item row="1" column="1">
-       <widget class="QCheckBox" name="systemUnitCheckBox">
-        <property name="text">
-         <string>System unit</string>
-        </property>
-       </widget>
-      </item>
      </layout>
     </widget>
    </item>
diff --git a/widgets/settings/webviewoptionpage.ui b/widgets/settings/webviewoptionpage.ui
index 18f76c3..b971438 100644
--- a/widgets/settings/webviewoptionpage.ui
+++ b/widgets/settings/webviewoptionpage.ui
@@ -2,6 +2,12 @@
 <ui version="4.0">
  <class>QtGui::WebViewOptionPage</class>
  <widget class="QWidget" name="QtGui::WebViewOptionPage">
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
   <property name="windowTitle">
    <string>General</string>
   </property>