diff --git a/src/blackcore/context.cpp b/src/blackcore/context.cpp
index f2c1cd536..66f72aab6 100644
--- a/src/blackcore/context.cpp
+++ b/src/blackcore/context.cpp
@@ -6,6 +6,7 @@
  * including this file, may be copied, modified, propagated, or distributed except according to the terms
  * contained in the LICENSE file.
  */
+
 #include "context.h"
 #include <QDebug>
 
diff --git a/src/blackcore/context.h b/src/blackcore/context.h
index 4d04e54bf..692ab51e8 100644
--- a/src/blackcore/context.h
+++ b/src/blackcore/context.h
@@ -7,6 +7,8 @@
  * contained in the LICENSE file.
  */
 
+//! \file
+
 #ifndef BLACKCORE_CONTEXT_H
 #define BLACKCORE_CONTEXT_H
 
diff --git a/src/blackcore/context_network_impl.cpp b/src/blackcore/context_network_impl.cpp
index 5f1163f6e..cf5bf3b38 100644
--- a/src/blackcore/context_network_impl.cpp
+++ b/src/blackcore/context_network_impl.cpp
@@ -95,9 +95,9 @@ namespace BlackCore
      */
     void CContextNetwork::gracefulShutdown()
     {
-        if (this->m_vatsimBookingReader) this->m_vatsimBookingReader->quit();
-        if (this->m_vatsimDataFileReader) this->m_vatsimDataFileReader->quit();
-        if (this->isConnected()) this->disconnectFromNetwork();
+        if (this->m_vatsimBookingReader)  { this->m_vatsimBookingReader->quit(); }
+        if (this->m_vatsimDataFileReader) { this->m_vatsimDataFileReader->quit(); }
+        if (this->isConnected()) { this->disconnectFromNetwork(); }
     }
 
     /*
diff --git a/src/blackgui/components/settingscomponent.h b/src/blackgui/components/settingscomponent.h
index bdf86aa30..153171a92 100644
--- a/src/blackgui/components/settingscomponent.h
+++ b/src/blackgui/components/settingscomponent.h
@@ -40,7 +40,6 @@ namespace BlackGui
             enum SettingTab
             {
                 SettingTabNetwork = 0,
-                SettingTabAircraft,
                 SettingTabAircraftAudio,
                 SettingTabSimulator,
                 SettingTabGui,
diff --git a/src/blackmisc/avcallsign.cpp b/src/blackmisc/avcallsign.cpp
index dd4fe6d77..e36e129ad 100644
--- a/src/blackmisc/avcallsign.cpp
+++ b/src/blackmisc/avcallsign.cpp
@@ -63,7 +63,7 @@ namespace BlackMisc
             if ("FSS" == sfx) { return CIconList::iconByIndex(CIcons::NetworkRoleFss); }
             if ("ATIS" == sfx) { return CIconList::iconByIndex(CIcons::AviationAtis); }
             if ("EXAM" == sfx) { return CIconList::iconByIndex(CIcons::NetworkRoleMnt); }
-            if ("VATSIM" == sfx) { return CIconList::iconByIndex(CIcons::NetworkVatsimLogo); }
+            if ("VATSIM" == sfx) { return CIconList::iconByIndex(CIcons::NetworkVatsimLogoWhite); }
             return CIconList::iconByIndex(CIcons::NetworkRoleUnknown);
         }
 
diff --git a/src/blackmisc/blackmisc.qrc b/src/blackmisc/blackmisc.qrc
index b4a10cec3..8017b5005 100644
--- a/src/blackmisc/blackmisc.qrc
+++ b/src/blackmisc/blackmisc.qrc
@@ -85,6 +85,8 @@
         <file>icons/vatsim/SUP.png</file>
         <file>icons/vatsim/VatsimLogo16.png</file>
         <file>icons/vatsim/VatsimLogo32.png</file>
+        <file>icons/vatsim/VatsimLogoWhite16.png</file>
+        <file>icons/vatsim/VatsimLogoWhite32.png</file>
     </qresource>
     <qresource prefix="/diagona">
         <file>icons/diagona/icons/application-cloud.png</file>
diff --git a/src/blackmisc/iconlist.cpp b/src/blackmisc/iconlist.cpp
index 7c7ed5597..a8162c43c 100644
--- a/src/blackmisc/iconlist.cpp
+++ b/src/blackmisc/iconlist.cpp
@@ -36,6 +36,7 @@ namespace BlackMisc
         static const CIconList icons(
         {
             // keep indexes alphabetically sorted and in sync with CIcons
+            // req. for "iconByIndex"
             CIcon(CIcons::ApplicationIconAircrafts, "aircrafts"),
             CIcon(CIcons::ApplicationIconAtc, "ATC"),
             CIcon(CIcons::ApplicationIconAudio, "audio"),
@@ -76,6 +77,7 @@ namespace BlackMisc
             CIcon(CIcons::NetworkRoleTower, "ATC tower"),
             CIcon(CIcons::NetworkRoleUnknown, "unknown"),
             CIcon(CIcons::NetworkVatsimLogo, "VATSIM"),
+            CIcon(CIcons::NetworkVatsimLogoWhite, "VATSIM"),
             CIcon(CIcons::NotSet, "?"),
             CIcon(CIcons::StandardIconAppAircrafts16, "aircrafts"),
             CIcon(CIcons::StandardIconAppAtc16, "ATC"),
diff --git a/src/blackmisc/icons.cpp b/src/blackmisc/icons.cpp
index 214249902..a391cee86 100644
--- a/src/blackmisc/icons.cpp
+++ b/src/blackmisc/icons.cpp
@@ -463,6 +463,18 @@ namespace BlackMisc
         return pm;
     }
 
+    const QPixmap &CIcons::vatsimLogoWhite16()
+    {
+        static const QPixmap pm(":/vatsim/icons/vatsim/VatsimLogoWhite16.png");
+        return pm;
+    }
+
+    const QPixmap &CIcons::vatsimLogoWhite32()
+    {
+        static const QPixmap pm(":/vatsim/icons/vatsim/VatsimLogoWhite32.png");
+        return pm;
+    }
+
     const QPixmap &CIcons::capabilityVoice()
     {
         static const QPixmap pm(":/diagona/icons/diagona/icons/headphone.png");
@@ -537,6 +549,7 @@ namespace BlackMisc
         case NetworkRoleTower: return roleTower();
         case NetworkRoleUnknown: return roleUnknown();
         case NetworkVatsimLogo: return vatsimLogo16();
+        case NetworkVatsimLogoWhite: return vatsimLogoWhite16();
         case NotSet: return empty();
         case StandardIconAppAircrafts16: return appAircrafts16();
         case StandardIconAppAtc16: return appAtc16();
diff --git a/src/blackmisc/icons.h b/src/blackmisc/icons.h
index 78663430d..f3cd2142b 100644
--- a/src/blackmisc/icons.h
+++ b/src/blackmisc/icons.h
@@ -68,6 +68,7 @@ namespace BlackMisc
             NetworkRoleTower,
             NetworkRoleUnknown,
             NetworkVatsimLogo,
+            NetworkVatsimLogoWhite,
             NotSet,
             StandardIconAppAircrafts16,
             StandardIconAppAtc16,
@@ -462,6 +463,12 @@ namespace BlackMisc
         //! VATSIM logo
         static const QPixmap &vatsimLogo32();
 
+        //! VATSIM logo
+        static const QPixmap &vatsimLogoWhite16();
+
+        //! VATSIM logo
+        static const QPixmap &vatsimLogoWhite32();
+
         //! Full voice capability
         static const QPixmap &capabilityVoice();
 
diff --git a/src/blackmisc/icons/vatsim/VatsimLogoWhite16.png b/src/blackmisc/icons/vatsim/VatsimLogoWhite16.png
new file mode 100644
index 000000000..fc428253f
Binary files /dev/null and b/src/blackmisc/icons/vatsim/VatsimLogoWhite16.png differ
diff --git a/src/blackmisc/icons/vatsim/VatsimLogoWhite32.png b/src/blackmisc/icons/vatsim/VatsimLogoWhite32.png
new file mode 100644
index 000000000..2b6acf0a3
Binary files /dev/null and b/src/blackmisc/icons/vatsim/VatsimLogoWhite32.png differ