diff --git a/src/blackgui/components/cockpitcomponent.ui b/src/blackgui/components/cockpitcomponent.ui
index ed78783f1..5ce77758d 100644
--- a/src/blackgui/components/cockpitcomponent.ui
+++ b/src/blackgui/components/cockpitcomponent.ui
@@ -37,16 +37,10 @@
    </property>
    <item alignment="Qt::AlignTop">
     <widget class="BlackGui::Components::CCockpitComComponent" name="comp_CockpitComComponent">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
      <property name="minimumSize">
       <size>
        <width>0</width>
-       <height>90</height>
+       <height>100</height>
       </size>
      </property>
     </widget>
diff --git a/src/blackgui/components/infobarstatuscomponent.ui b/src/blackgui/components/infobarstatuscomponent.ui
index f7df09f5a..1145731c3 100644
--- a/src/blackgui/components/infobarstatuscomponent.ui
+++ b/src/blackgui/components/infobarstatuscomponent.ui
@@ -6,14 +6,14 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>201</width>
-    <height>20</height>
+    <width>249</width>
+    <height>25</height>
    </rect>
   </property>
   <property name="minimumSize">
    <size>
     <width>0</width>
-    <height>20</height>
+    <height>25</height>
    </size>
   </property>
   <property name="windowTitle">
@@ -37,11 +37,11 @@
    </property>
    <item>
     <widget class="BlackGui::Components::CTransponderModeComponent" name="comp_XpdrMode">
-     <property name="frameShape">
-      <enum>QFrame::StyledPanel</enum>
-     </property>
-     <property name="frameShadow">
-      <enum>QFrame::Raised</enum>
+     <property name="minimumSize">
+      <size>
+       <width>25</width>
+       <height>25</height>
+      </size>
      </property>
     </widget>
    </item>
diff --git a/src/blackgui/components/transpondermodecomponent.ui b/src/blackgui/components/transpondermodecomponent.ui
index 7e1c47a22..9fd4889e5 100644
--- a/src/blackgui/components/transpondermodecomponent.ui
+++ b/src/blackgui/components/transpondermodecomponent.ui
@@ -2,14 +2,6 @@
 <ui version="4.0">
  <class>CTransponderModeComponent</class>
  <widget class="QFrame" name="CTransponderModeComponent">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>25</width>
-    <height>25</height>
-   </rect>
-  </property>
   <property name="minimumSize">
    <size>
     <width>25</width>
diff --git a/src/blackgui/share/qss/infobar.qss b/src/blackgui/share/qss/infobar.qss
index 8d5abcebb..0d24bb3c5 100644
--- a/src/blackgui/share/qss/infobar.qss
+++ b/src/blackgui/share/qss/infobar.qss
@@ -7,6 +7,7 @@
 BlackGui--CDockWidgetInfoBar {
   background: black; /* background is background color here */
   background-image: url(:/textures/icons/textures/texture-inner.jpg);
+  min-height: 1.25em;
 }
 
 BlackGui--CDockWidgetInfoBar[floating="true"] {
@@ -14,8 +15,8 @@ BlackGui--CDockWidgetInfoBar[floating="true"] {
 }
 
 BlackGui--Components--CTransponderModeComponent {
-  min-width:  2em;
-  min-height: 2em;
+  padding: 0px;
+  margin:  0px;
 }
 
 QToolButton[xpdrmodeshort="I"] {
diff --git a/src/swiftguistandard/swiftguistd.ui b/src/swiftguistandard/swiftguistd.ui
index d89bdab37..8a77b90fa 100644
--- a/src/swiftguistandard/swiftguistd.ui
+++ b/src/swiftguistandard/swiftguistd.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>350</width>
+    <width>375</width>
     <height>600</height>
    </rect>
   </property>
@@ -202,7 +202,7 @@
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>350</width>
+     <width>375</width>
      <height>19</height>
     </rect>
    </property>
@@ -332,8 +332,8 @@
       <widget class="BlackGui::Components::CInfoBarStatusComponent" name="comp_InfoBarStatus" native="true">
        <property name="minimumSize">
         <size>
-         <width>200</width>
-         <height>20</height>
+         <width>250</width>
+         <height>25</height>
         </size>
        </property>
       </widget>
diff --git a/src/swiftlauncher/swiftlauncher.ui b/src/swiftlauncher/swiftlauncher.ui
index f45d265f5..f7badfd61 100644
--- a/src/swiftlauncher/swiftlauncher.ui
+++ b/src/swiftlauncher/swiftlauncher.ui
@@ -7,13 +7,13 @@
     <x>0</x>
     <y>0</y>
     <width>400</width>
-    <height>650</height>
+    <height>675</height>
    </rect>
   </property>
   <property name="minimumSize">
    <size>
     <width>400</width>
-    <height>650</height>
+    <height>675</height>
    </size>
   </property>
   <property name="windowTitle">
@@ -99,7 +99,7 @@
                <x>0</x>
                <y>0</y>
                <width>392</width>
-               <height>299</height>
+               <height>275</height>
               </rect>
              </property>
              <attribute name="label">
@@ -130,7 +130,7 @@
                <x>0</x>
                <y>0</y>
                <width>392</width>
-               <height>299</height>
+               <height>275</height>
               </rect>
              </property>
              <attribute name="label">
@@ -194,8 +194,8 @@
               <rect>
                <x>0</x>
                <y>0</y>
-               <width>392</width>
-               <height>299</height>
+               <width>371</width>
+               <height>298</height>
               </rect>
              </property>
              <attribute name="label">
@@ -361,7 +361,7 @@
                <x>0</x>
                <y>0</y>
                <width>392</width>
-               <height>299</height>
+               <height>275</height>
               </rect>
              </property>
              <attribute name="label">
@@ -403,7 +403,7 @@
                    <property name="minimumSize">
                     <size>
                      <width>0</width>
-                     <height>110</height>
+                     <height>120</height>
                     </size>
                    </property>
                   </widget>
@@ -442,8 +442,8 @@
                      <rect>
                       <x>0</x>
                       <y>0</y>
-                      <width>376</width>
-                      <height>126</height>
+                      <width>380</width>
+                      <height>94</height>
                      </rect>
                     </property>
                     <layout class="QVBoxLayout" name="vl_DataUpdatesScrollArea">
@@ -494,7 +494,7 @@
                <x>0</x>
                <y>0</y>
                <width>392</width>
-               <height>299</height>
+               <height>275</height>
               </rect>
              </property>
              <attribute name="label">
@@ -520,18 +520,12 @@
             </widget>
            </widget>
           </item>
-          <item>
+          <item alignment="Qt::AlignBottom">
            <widget class="QToolBox" name="tb_Start">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
             <property name="minimumSize">
              <size>
               <width>0</width>
-              <height>160</height>
+              <height>175</height>
              </size>
             </property>
             <property name="currentIndex">
@@ -543,7 +537,7 @@
                <x>0</x>
                <y>0</y>
                <width>392</width>
-               <height>136</height>
+               <height>144</height>
               </rect>
              </property>
              <attribute name="label">