diff --git a/plugins/channelrx/demodais/aisdemodgui.ui b/plugins/channelrx/demodais/aisdemodgui.ui
index 85ea93b7b..dce05b852 100644
--- a/plugins/channelrx/demodais/aisdemodgui.ui
+++ b/plugins/channelrx/demodais/aisdemodgui.ui
@@ -487,7 +487,7 @@
        <widget class="QComboBox" name="udpFormat">
         <property name="minimumSize">
          <size>
-          <width>60</width>
+          <width>66</width>
           <height>0</height>
          </size>
         </property>
diff --git a/plugins/feature/antennatools/antennatoolsgui.ui b/plugins/feature/antennatools/antennatoolsgui.ui
index 69f88452a..c7f0cc066 100644
--- a/plugins/feature/antennatools/antennatoolsgui.ui
+++ b/plugins/feature/antennatools/antennatoolsgui.ui
@@ -6,25 +6,25 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>374</width>
+    <width>360</width>
     <height>584</height>
    </rect>
   </property>
   <property name="sizePolicy">
-   <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+   <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
   </property>
   <property name="minimumSize">
    <size>
-    <width>374</width>
+    <width>360</width>
     <height>584</height>
    </size>
   </property>
   <property name="maximumSize">
    <size>
-    <width>374</width>
+    <width>560</width>
     <height>584</height>
    </size>
   </property>
@@ -59,7 +59,7 @@
     <string>Calculators</string>
    </property>
    <property name="currentIndex">
-    <number>1</number>
+    <number>0</number>
    </property>
    <widget class="QWidget" name="dipoleTab">
     <attribute name="title">
@@ -70,7 +70,7 @@
       <widget class="QComboBox" name="dipoleFrequencySelect">
        <property name="minimumSize">
         <size>
-         <width>94</width>
+         <width>90</width>
          <height>0</height>
         </size>
        </property>
@@ -266,7 +266,7 @@
        </property>
        <property name="minimumSize">
         <size>
-         <width>94</width>
+         <width>90</width>
          <height>0</height>
         </size>
        </property>
diff --git a/plugins/feature/aprs/aprsgui.cpp b/plugins/feature/aprs/aprsgui.cpp
index 416de7d4b..f251c9a44 100644
--- a/plugins/feature/aprs/aprsgui.cpp
+++ b/plugins/feature/aprs/aprsgui.cpp
@@ -668,10 +668,6 @@ void APRSGUI::resizeEvent(QResizeEvent* size)
     plotWeather();
     plotTelemetry();
     plotMotion();
-    int maxWidth = getRollupContents()->maximumWidth();
-    int minHeight = getRollupContents()->minimumHeight() + getAdditionalHeight();
-    resize(width() < maxWidth ? width() : maxWidth, minHeight);
-    size->accept();
 }
 
 void APRSGUI::onMenuDialogCalled(const QPoint &p)
diff --git a/plugins/feature/aprs/aprsgui.ui b/plugins/feature/aprs/aprsgui.ui
index 1a6fa0712..92014f20f 100644
--- a/plugins/feature/aprs/aprsgui.ui
+++ b/plugins/feature/aprs/aprsgui.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="sizePolicy">
-   <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+   <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
@@ -22,12 +22,6 @@
     <height>0</height>
    </size>
   </property>
-  <property name="maximumSize">
-   <size>
-    <width>700</width>
-    <height>16777215</height>
-   </size>
-  </property>
   <property name="font">
    <font>
     <family>Liberation Sans</family>
@@ -154,7 +148,7 @@
     </rect>
    </property>
    <property name="sizePolicy">
-    <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+    <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
      <horstretch>0</horstretch>
      <verstretch>0</verstretch>
     </sizepolicy>
@@ -187,6 +181,12 @@
        <number>0</number>
       </property>
       <widget class="QWidget" name="stationTab">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
        <attribute name="title">
         <string>Stations and Objects</string>
        </attribute>
@@ -568,6 +568,12 @@
            </layout>
           </widget>
           <widget class="QWidget" name="weatherTab">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
            <attribute name="title">
             <string>Weather</string>
            </attribute>
@@ -840,6 +846,12 @@
            </layout>
           </widget>
           <widget class="QWidget" name="motionTab">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
            <attribute name="title">
             <string>Motion</string>
            </attribute>
@@ -1007,6 +1019,12 @@
            </layout>
           </widget>
           <widget class="QWidget" name="telemetryTab">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
            <attribute name="title">
             <string>Telemetry</string>
            </attribute>
@@ -1271,6 +1289,12 @@
            </layout>
           </widget>
           <widget class="QWidget" name="statusTab">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
            <attribute name="title">
             <string>Status</string>
            </attribute>
@@ -1323,6 +1347,12 @@
            </layout>
           </widget>
           <widget class="QWidget" name="packetsTab">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
            <attribute name="title">
             <string>Packets</string>
            </attribute>
@@ -1374,6 +1404,12 @@
        </layout>
       </widget>
       <widget class="QWidget" name="messagesTab">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
        <attribute name="title">
         <string>Messages</string>
        </attribute>
@@ -1453,17 +1489,17 @@
   </widget>
  </widget>
  <customwidgets>
+  <customwidget>
+   <class>ButtonSwitch</class>
+   <extends>QToolButton</extends>
+   <header>gui/buttonswitch.h</header>
+  </customwidget>
   <customwidget>
    <class>RollupContents</class>
    <extends>QWidget</extends>
    <header>gui/rollupcontents.h</header>
    <container>1</container>
   </customwidget>
-  <customwidget>
-   <class>ButtonSwitch</class>
-   <extends>QToolButton</extends>
-   <header>gui/buttonswitch.h</header>
-  </customwidget>
   <customwidget>
    <class>QChartView</class>
    <extends>QGraphicsView</extends>
diff --git a/plugins/feature/simpleptt/simplepttgui.ui b/plugins/feature/simpleptt/simplepttgui.ui
index e3d49567e..0f1e865f7 100644
--- a/plugins/feature/simpleptt/simplepttgui.ui
+++ b/plugins/feature/simpleptt/simplepttgui.ui
@@ -24,7 +24,7 @@
   </property>
   <property name="maximumSize">
    <size>
-    <width>360</width>
+    <width>560</width>
     <height>155</height>
    </size>
   </property>
diff --git a/plugins/samplesource/sdrplayv3/sdrplayv3gui.ui b/plugins/samplesource/sdrplayv3/sdrplayv3gui.ui
index 3f9470b80..aef48776b 100644
--- a/plugins/samplesource/sdrplayv3/sdrplayv3gui.ui
+++ b/plugins/samplesource/sdrplayv3/sdrplayv3gui.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>410</width>
+    <width>360</width>
     <height>234</height>
    </rect>
   </property>
@@ -18,13 +18,13 @@
   </property>
   <property name="minimumSize">
    <size>
-    <width>410</width>
+    <width>360</width>
     <height>234</height>
    </size>
   </property>
   <property name="maximumSize">
    <size>
-    <width>410</width>
+    <width>360</width>
     <height>234</height>
    </size>
   </property>
diff --git a/plugins/samplesource/testsource/testsourcegui.ui b/plugins/samplesource/testsource/testsourcegui.ui
index bd492ff6a..6a25d1d73 100644
--- a/plugins/samplesource/testsource/testsourcegui.ui
+++ b/plugins/samplesource/testsource/testsourcegui.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>381</width>
+    <width>360</width>
     <height>331</height>
    </rect>
   </property>
@@ -18,13 +18,13 @@
   </property>
   <property name="minimumSize">
    <size>
-    <width>381</width>
+    <width>360</width>
     <height>331</height>
    </size>
   </property>
   <property name="maximumSize">
    <size>
-    <width>381</width>
+    <width>360</width>
     <height>331</height>
    </size>
   </property>