diff --git a/src/blackgui/components/infobarstatuscomponent.cpp b/src/blackgui/components/infobarstatuscomponent.cpp
index cb8dbd0e2..4966ea160 100644
--- a/src/blackgui/components/infobarstatuscomponent.cpp
+++ b/src/blackgui/components/infobarstatuscomponent.cpp
@@ -7,18 +7,18 @@
  * contained in the LICENSE file.
  */
 
-#include "blackconfig/buildconfig.h"
+#include "blackgui/components/infobarstatuscomponent.h"
+#include "blackgui/guiapplication.h"
+#include "blackgui/led.h"
 #include "blackcore/context/contextapplication.h"
 #include "blackcore/context/contextaudio.h"
 #include "blackcore/context/contextnetwork.h"
 #include "blackcore/context/contextsimulator.h"
 #include "blackcore/simulator.h"
-#include "blackgui/components/infobarstatuscomponent.h"
-#include "blackgui/guiapplication.h"
-#include "blackgui/led.h"
 #include "blackmisc/audio/audioutils.h"
 #include "blackmisc/network/server.h"
 #include "blackmisc/simulation/simulatorplugininfo.h"
+#include "blackconfig/buildconfig.h"
 #include "ui_infobarstatuscomponent.h"
 
 #include <QLabel>
@@ -81,6 +81,7 @@ namespace BlackGui
 
         void CInfoBarStatusComponent::initLeds()
         {
+            this->updateSpacing();
             CLedWidget::LedShape shape = CLedWidget::Circle;
             ui->led_DBus->setValues(CLedWidget::Yellow, CLedWidget::Black, shape, "DBus connected", "DBus disconnected", 14);
             ui->led_Network->setValues(CLedWidget::Yellow, CLedWidget::Black, shape, "Network connected", "Network disconnected", 14);
@@ -103,9 +104,17 @@ namespace BlackGui
             ui->led_DBus->setOnToolTip(tooltip);
         }
 
+        void CInfoBarStatusComponent::setSpacing(int spacing)
+        {
+            if (this->layout())
+            {
+                this->layout()->setSpacing(spacing);
+            }
+        }
+
         void CInfoBarStatusComponent::onSimulatorStatusChanged(int status)
         {
-            ISimulator::SimulatorStatus simStatus = static_cast<ISimulator::SimulatorStatus>(status);
+            const ISimulator::SimulatorStatus simStatus = static_cast<ISimulator::SimulatorStatus>(status);
             if (simStatus.testFlag(ISimulator::Connected))
             {
                 // at least connected
@@ -140,10 +149,9 @@ namespace BlackGui
             this->onMapperReady();
         }
 
-        void CInfoBarStatusComponent::onNetworkConnectionChanged(BlackCore::INetwork::ConnectionStatus from, BlackCore::INetwork::ConnectionStatus to)
+        void CInfoBarStatusComponent::onNetworkConnectionChanged(INetwork::ConnectionStatus from, INetwork::ConnectionStatus to)
         {
             Q_UNUSED(from);
-
             switch (to)
             {
             case INetwork::Disconnected:
@@ -190,7 +198,7 @@ namespace BlackGui
                 }
                 else if (actions.size() > 1 && selectedItem == actions.at(1))
                 {
-                    BlackMisc::Audio::startWindowsMixer();
+                    Audio::startWindowsMixer();
                 }
             }
         }
@@ -236,5 +244,13 @@ namespace BlackGui
                 ui->led_Network->setOffToolTip("No network/internet access");
             }
         }
+
+        void CInfoBarStatusComponent::updateSpacing()
+        {
+            if (!sGui || !sGui->mainApplicationWindow()) { return; }
+            const int w = sGui->mainApplicationWindow()->width();
+            const int s = (w >= 400) ? 6 : 2;
+            this->setSpacing(s);
+        }
     } // namespace
 } // namespace
diff --git a/src/blackgui/components/infobarstatuscomponent.h b/src/blackgui/components/infobarstatuscomponent.h
index bcf764f38..b3828b58d 100644
--- a/src/blackgui/components/infobarstatuscomponent.h
+++ b/src/blackgui/components/infobarstatuscomponent.h
@@ -50,6 +50,9 @@ namespace BlackGui
             //! Tooltip for DBus
             void setDBusTooltip(const QString &tooltip);
 
+            //! Set the spacing
+            void setSpacing(int spacing);
+
         private:
             QScopedPointer<Ui::CInfoBarStatusComponent> ui;
             BlackCore::CActionBind m_actionPtt { "/Voice/Activate push-to-talk", BlackMisc::CIcons::radio16(), this, &CInfoBarStatusComponent::onPttChanged };
@@ -74,6 +77,9 @@ namespace BlackGui
 
             //! Internet accessible?
             void onInternetAccessibleChanged(bool access);
+
+            //! Update spacing based on main window size
+            void updateSpacing();
         };
     } // ns
 } // ns
diff --git a/src/blackgui/components/infobarstatuscomponent.ui b/src/blackgui/components/infobarstatuscomponent.ui
index d21cbe593..5f3c4c5b8 100644
--- a/src/blackgui/components/infobarstatuscomponent.ui
+++ b/src/blackgui/components/infobarstatuscomponent.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>226</width>
+    <width>250</width>
     <height>20</height>
    </rect>
   </property>
@@ -21,7 +21,7 @@
   </property>
   <layout class="QHBoxLayout" name="hl_InfoBarStatus">
    <property name="spacing">
-    <number>0</number>
+    <number>2</number>
    </property>
    <property name="leftMargin">
     <number>0</number>
@@ -164,7 +164,7 @@
      </property>
      <property name="sizeHint" stdset="0">
       <size>
-       <width>40</width>
+       <width>20</width>
        <height>20</height>
       </size>
      </property>