diff --git a/src/blackgui/components/dbloadoverviewcomponent.cpp b/src/blackgui/components/dbloadoverviewcomponent.cpp
index 0675eec29..12f25cd8b 100644
--- a/src/blackgui/components/dbloadoverviewcomponent.cpp
+++ b/src/blackgui/components/dbloadoverviewcomponent.cpp
@@ -71,7 +71,7 @@ namespace BlackGui
             this->ps_setValues();
         }
 
-        void CDbLoadOverviewComponent::setVisibleDbRefreshButtons(bool visible)
+        void CDbLoadOverviewComponent::showVisibleDbRefreshButtons(bool visible)
         {
             ui->lbl_DbRefresh->setVisible(visible);
             ui->tb_DbReloadAircraft->setVisible(visible);
@@ -83,7 +83,7 @@ namespace BlackGui
             ui->tb_DbReloadDistributors->setVisible(visible);
         }
 
-        void CDbLoadOverviewComponent::setVisibleSharedRefreshButtons(bool visible)
+        void CDbLoadOverviewComponent::showVisibleSharedRefreshButtons(bool visible)
         {
             ui->lbl_SharedRefresh->setVisible(visible);
             ui->tb_SharedReloadAircraft->setVisible(visible);
@@ -115,7 +115,7 @@ namespace BlackGui
             return m_loadInProgress;
         }
 
-        void CDbLoadOverviewComponent::showLoadAllButtons(bool shared, bool db)
+        void CDbLoadOverviewComponent::showVisibleLoadAllButtons(bool shared, bool db)
         {
             const bool widget = shared || db;
             ui->wi_LoadAllButtons->setVisible(widget);
diff --git a/src/blackgui/components/dbloadoverviewcomponent.h b/src/blackgui/components/dbloadoverviewcomponent.h
index 3eb63519e..19cd8a53c 100644
--- a/src/blackgui/components/dbloadoverviewcomponent.h
+++ b/src/blackgui/components/dbloadoverviewcomponent.h
@@ -42,10 +42,13 @@ namespace BlackGui
             void display();
 
             //! Visible DB refresh buttons
-            void setVisibleDbRefreshButtons(bool visible);
+            void showVisibleDbRefreshButtons(bool visible);
 
             //! Visible shared refresh buttons
-            void setVisibleSharedRefreshButtons(bool visible);
+            void showVisibleSharedRefreshButtons(bool visible);
+
+            //! Show load all buttons
+            void showVisibleLoadAllButtons(bool shared, bool db);
 
             //! Showing load indicator?
             bool isShowingLoadIndicator() const;
@@ -53,9 +56,6 @@ namespace BlackGui
             //! Loading in progress?
             bool isLoadInProgress() const;
 
-            //! Show load all buttons
-            void showLoadAllButtons(bool shared, bool db);
-
             //! Load all from DB
             void loadAllFromDb();
 
diff --git a/src/blackgui/components/dbloadoverviewcomponent.ui b/src/blackgui/components/dbloadoverviewcomponent.ui
index c290435ea..f28b97768 100644
--- a/src/blackgui/components/dbloadoverviewcomponent.ui
+++ b/src/blackgui/components/dbloadoverviewcomponent.ui
@@ -392,6 +392,12 @@
    </item>
    <item row="0" column="6">
     <widget class="QLabel" name="lbl_DbCount">
+     <property name="minimumSize">
+      <size>
+       <width>60</width>
+       <height>0</height>
+      </size>
+     </property>
      <property name="toolTip">
       <string>DB count</string>
      </property>
@@ -605,6 +611,12 @@
    </item>
    <item row="0" column="5">
     <widget class="QLabel" name="lbl_CacheCount">
+     <property name="minimumSize">
+      <size>
+       <width>60</width>
+       <height>0</height>
+      </size>
+     </property>
      <property name="toolTip">
       <string>Cache count</string>
      </property>
diff --git a/src/blackgui/components/initialdataloadcomponent.cpp b/src/blackgui/components/initialdataloadcomponent.cpp
index 667aff40f..8cf5813bc 100644
--- a/src/blackgui/components/initialdataloadcomponent.cpp
+++ b/src/blackgui/components/initialdataloadcomponent.cpp
@@ -19,7 +19,7 @@ namespace BlackGui
             ui(new Ui::CInitialDataLoadComponent)
         {
             ui->setupUi(this);
-            ui->comp_DataUpdates->showLoadAllButtons(true, false);
+            ui->comp_DataUpdates->showVisibleLoadAllButtons(true, false);
         }
 
         CInitialDataLoadComponent::~CInitialDataLoadComponent()
diff --git a/src/blackgui/components/settingscomponent.cpp b/src/blackgui/components/settingscomponent.cpp
index aea08497b..87614f7fd 100644
--- a/src/blackgui/components/settingscomponent.cpp
+++ b/src/blackgui/components/settingscomponent.cpp
@@ -46,7 +46,8 @@ namespace BlackGui
             this->tabBar()->setExpanding(false);
             this->tabBar()->setUsesScrollButtons(true);
             this->setCurrentIndex(0); // 1st tab
-            ui->comp_DataLoadOverview->setVisibleDbRefreshButtons(CBuildConfig::isDebugBuild() || CBuildConfig::isBetaTest());
+            ui->comp_DataLoadOverview->showVisibleDbRefreshButtons(CBuildConfig::isDebugBuild() || CBuildConfig::isBetaTest());
+            ui->comp_DataLoadOverview->showVisibleLoadAllButtons(false, false);
 
             connect(ui->comp_SettingsGuiGeneral, &CSettingsGuiComponent::changedWindowsOpacity, this, &CSettingsComponent::changedWindowsOpacity);
             connect(ui->pb_Advanced, &QPushButton::released, this, &CSettingsComponent::ps_overviewButtonClicked);