diff --git a/src/blackgui/components/atcstationcomponent.ui b/src/blackgui/components/atcstationcomponent.ui
index 05c9ac0ad..bde148907 100644
--- a/src/blackgui/components/atcstationcomponent.ui
+++ b/src/blackgui/components/atcstationcomponent.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>278</width>
-    <height>507</height>
+    <width>270</width>
+    <height>499</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -179,86 +179,20 @@
      <property name="checkable">
       <bool>true</bool>
      </property>
-     <layout class="QGridLayout" name="gl_Details">
-      <item row="1" column="1">
-       <widget class="QToolButton" name="tb_AtcStationsLoadMetar">
-        <property name="toolTip">
-         <string>Load METAR</string>
-        </property>
-        <property name="text">
-         <string>METAR</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="2">
-       <widget class="QToolButton" name="tb_AtcStationsAtisReload">
-        <property name="toolTip">
-         <string>Reload ATIS</string>
-        </property>
-        <property name="text">
-         <string>ATIS</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="4">
-       <widget class="QToolButton" name="tb_TextMessageOverlay">
-        <property name="toolTip">
-         <string>text message</string>
-        </property>
-        <property name="text">
-         <string>tm</string>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="0" colspan="5">
-       <widget class="QTextEdit" name="te_AtcStationsOnlineInfo">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>0</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>16777215</width>
-          <height>16777215</height>
-         </size>
-        </property>
-        <property name="readOnly">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0">
-       <widget class="QLineEdit" name="le_AtcStationsOnlineMetar">
-        <property name="toolTip">
-         <string extracomment="METAR: Airport ICAO code">METAR: Airport ICAO code</string>
-        </property>
-        <property name="maxLength">
-         <number>5</number>
-        </property>
-        <property name="placeholderText">
-         <string>e.g. KLAX</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="3">
-       <widget class="QToolButton" name="tb_Audio">
-        <property name="toolTip">
-         <string>goto audio panel</string>
-        </property>
-        <property name="text">
-         <string>audio</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="0" colspan="5">
+     <layout class="QVBoxLayout" name="vl_Details">
+      <property name="leftMargin">
+       <number>3</number>
+      </property>
+      <property name="topMargin">
+       <number>3</number>
+      </property>
+      <property name="rightMargin">
+       <number>3</number>
+      </property>
+      <property name="bottomMargin">
+       <number>3</number>
+      </property>
+      <item>
        <widget class="BlackGui::Components::CSettingsAtcStationsInlineComponent" name="comp_AtcStationsSettings">
         <property name="minimumSize">
          <size>
@@ -268,6 +202,108 @@
         </property>
        </widget>
       </item>
+      <item>
+       <widget class="QWidget" name="wi_ButtonsAndEntry" native="true">
+        <layout class="QHBoxLayout" name="hl_ButtonsAndEntry">
+         <property name="leftMargin">
+          <number>0</number>
+         </property>
+         <property name="topMargin">
+          <number>0</number>
+         </property>
+         <property name="rightMargin">
+          <number>0</number>
+         </property>
+         <property name="bottomMargin">
+          <number>0</number>
+         </property>
+         <item>
+          <widget class="QLineEdit" name="le_AtcStationsOnlineMetar">
+           <property name="maximumSize">
+            <size>
+             <width>75</width>
+             <height>16777215</height>
+            </size>
+           </property>
+           <property name="toolTip">
+            <string extracomment="METAR: Airport ICAO code">METAR: Airport ICAO code</string>
+           </property>
+           <property name="maxLength">
+            <number>5</number>
+           </property>
+           <property name="placeholderText">
+            <string>e.g. KLAX</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QWidget" name="wi_Buttons" native="true">
+           <layout class="QHBoxLayout" name="hl_Buttons">
+            <property name="leftMargin">
+             <number>0</number>
+            </property>
+            <property name="topMargin">
+             <number>0</number>
+            </property>
+            <property name="rightMargin">
+             <number>0</number>
+            </property>
+            <property name="bottomMargin">
+             <number>0</number>
+            </property>
+            <item>
+             <widget class="QToolButton" name="tb_AtcStationsLoadMetar">
+              <property name="toolTip">
+               <string>Load METAR</string>
+              </property>
+              <property name="text">
+               <string>METAR</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QToolButton" name="tb_AtcStationsAtisReload">
+              <property name="toolTip">
+               <string>Reload ATIS</string>
+              </property>
+              <property name="text">
+               <string>ATIS</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QToolButton" name="tb_TextMessageOverlay">
+              <property name="toolTip">
+               <string>text message</string>
+              </property>
+              <property name="text">
+               <string>tm</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QToolButton" name="tb_Audio">
+              <property name="toolTip">
+               <string>goto audio panel</string>
+              </property>
+              <property name="text">
+               <string>audio</string>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </widget>
+         </item>
+        </layout>
+       </widget>
+      </item>
+      <item>
+       <widget class="QTextEdit" name="te_AtcStationsOnlineInfo">
+        <property name="readOnly">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>
@@ -298,8 +334,8 @@
   <tabstop>le_AtcStationsOnlineMetar</tabstop>
   <tabstop>tb_AtcStationsLoadMetar</tabstop>
   <tabstop>tb_AtcStationsAtisReload</tabstop>
-  <tabstop>tb_Audio</tabstop>
   <tabstop>tb_TextMessageOverlay</tabstop>
+  <tabstop>tb_Audio</tabstop>
   <tabstop>te_AtcStationsOnlineInfo</tabstop>
   <tabstop>tvp_AtcStationsOnlineTree</tabstop>
   <tabstop>tvp_AtcStationsBooked</tabstop>
diff --git a/src/blackgui/share/qss/stdwidget.qss b/src/blackgui/share/qss/stdwidget.qss
index 77f77a40b..5f501cf35 100644
--- a/src/blackgui/share/qss/stdwidget.qss
+++ b/src/blackgui/share/qss/stdwidget.qss
@@ -94,14 +94,6 @@ BlackGui--Components--CSetupLoadingDialog #fr_Details {
 }
 */
 
-/* core settings */
-/* needed for CCoreSettingsDialog */
-/* BlackGui::Components::CSettingsComponent */
-BlackGui--Components--CCoreSettingsDialog {
-  background: black; /* background is background color here */
-  background-image: url(:/textures/icons/textures/texture-inner.jpg);
-}
-
 QFileDialog #sidebar {
   background: black;
 }
@@ -212,6 +204,10 @@ QToolButton {
   border: 0px;
 }
 
+#tb_AtcStationsAtisReload,
+#tb_AtcStationsLoadMetar,
+#tb_Audio,
+#tb_TextMessageOverlay,
 QPushButton {
   background-color: rgba(0, 0, 255, 128);
   border-style: 1px solid yellow;