diff --git a/src/blackmisc/blackmisc.qrc b/src/blackmisc/blackmisc.qrc
index 231bfa73e..1ad3e0ed8 100644
--- a/src/blackmisc/blackmisc.qrc
+++ b/src/blackmisc/blackmisc.qrc
@@ -576,4 +576,9 @@
         <file>icons/famfamfam/icons/silk/controller_delete.png</file>
         <file>icons/famfamfam/icons/silk/controller_error.png</file>
     </qresource>
+    <qresource prefix="/os">
+        <file>icons/os/linux_24.png</file>
+        <file>icons/os/macos_24.png</file>
+        <file>icons/os/windows_24.png</file>
+    </qresource>
 </RCC>
diff --git a/src/blackmisc/icon.h b/src/blackmisc/icon.h
index bac5a2c91..08dcf1ecc 100644
--- a/src/blackmisc/icon.h
+++ b/src/blackmisc/icon.h
@@ -58,8 +58,8 @@ namespace BlackMisc
          * the derived class uses this macro to disambiguate the inherited members.
          */
 #       define BLACKMISC_DECLARE_USING_MIXIN_ICON(DERIVED)      \
-    using ::BlackMisc::Mixin::Icon<DERIVED>::toIcon;    \
-    using ::BlackMisc::Mixin::Icon<DERIVED>::toPixmap;
+            using ::BlackMisc::Mixin::Icon<DERIVED>::toIcon;    \
+            using ::BlackMisc::Mixin::Icon<DERIVED>::toPixmap;
     } // Mixin
 
     //! Value object for icons. An icon is stored in the global icon repository and
diff --git a/src/blackmisc/iconlist.cpp b/src/blackmisc/iconlist.cpp
index 101f7d050..3aed5c41a 100644
--- a/src/blackmisc/iconlist.cpp
+++ b/src/blackmisc/iconlist.cpp
@@ -95,7 +95,11 @@ namespace BlackMisc
             CIcon(CIcons::NetworkVatsimLogo, "VATSIM"),
             CIcon(CIcons::NetworkVatsimLogoWhite, "VATSIM"),
             CIcon(CIcons::NotSet, "?"),
-            CIcon(CIcons::StandardIconAppAircrafts16, "aircrafts"),
+            CIcon(CIcons::OSAll, "All OS"),
+            CIcon(CIcons::OSLinux, "Linux"),
+            CIcon(CIcons::OSMacOs, "Mac OS"),
+            CIcon(CIcons::OSWindows, "Windows"),
+            CIcon(CIcons::StandardIconAppAircraft16, "aircraft"),
             CIcon(CIcons::StandardIconAppAtc16, "ATC"),
             CIcon(CIcons::StandardIconAppFlightPlan16, "flight plan"),
             CIcon(CIcons::StandardIconAppLog16, "log"),
diff --git a/src/blackmisc/icons.cpp b/src/blackmisc/icons.cpp
index a05636dab..70503df1e 100644
--- a/src/blackmisc/icons.cpp
+++ b/src/blackmisc/icons.cpp
@@ -472,6 +472,29 @@ namespace BlackMisc
         return pm;
     }
 
+    const QPixmap &CIcons::osAll()
+    {
+        return empty16();
+    }
+
+    const QPixmap &CIcons::osLinux()
+    {
+        static const QPixmap pm(":/os/icons/os/linux_24.png");
+        return pm;
+    }
+
+    const QPixmap &CIcons::osMac()
+    {
+        static const QPixmap pm(":/os/icons/os/macos_24.png");
+        return pm;
+    }
+
+    const QPixmap &CIcons::osWindows()
+    {
+        static const QPixmap pm(":/os/icons/os/windows_24.png");
+        return pm;
+    }
+
     const QPixmap &CIcons::preloader64()
     {
         static const QPixmap pm(":/preloaders/icons/preloaders/FillingRing64.gif");
@@ -1071,7 +1094,11 @@ namespace BlackMisc
         case NetworkVatsimLogo: return vatsimLogo16();
         case NetworkVatsimLogoWhite: return vatsimLogoWhite16();
         case NotSet: return empty();
-        case StandardIconAppAircrafts16: return appAircraft16();
+        case OSAll: return osAll();
+        case OSLinux: return osLinux();
+        case OSMacOs: return osMac();
+        case OSWindows: return osWindows();
+        case StandardIconAppAircraft16: return appAircraft16();
         case StandardIconAppAtc16: return appAtc16();
         case StandardIconAppFlightPlan16: return appFlightPlan16();
         case StandardIconAppLog16: return appLog16();
@@ -1118,6 +1145,8 @@ namespace BlackMisc
         case StandardIconInfo16: return info16();
         case StandardIconJoystick16: return joystick16();
         case StandardIconLoad16: return load16();
+        case StandardIconLockClosed16: return lockClosed16();
+        case StandardIconLockOpen16: return lockOpen16();
         case StandardIconMonitorError16: return monitorError16();
         case StandardIconPaintCan16: return paintCan16();
         case StandardIconPaperPlane16: return paperPlane16();
diff --git a/src/blackmisc/icons.h b/src/blackmisc/icons.h
index 8cb13c595..a968f9cda 100644
--- a/src/blackmisc/icons.h
+++ b/src/blackmisc/icons.h
@@ -89,7 +89,11 @@ namespace BlackMisc
             NetworkVatsimLogo,
             NetworkVatsimLogoWhite,
             NotSet,
-            StandardIconAppAircrafts16,
+            OSAll,
+            OSLinux,
+            OSMacOs,
+            OSWindows,
+            StandardIconAppAircraft16,
             StandardIconAppAtc16,
             StandardIconAppFlightPlan16,
             StandardIconAppLog16,
@@ -440,6 +444,22 @@ namespace BlackMisc
         //! Database table
         static const QPixmap &databaseTable16();
 
+        // --------------------------------------------------
+        // -- OS icons
+        // --------------------------------------------------
+
+        //! All OS
+        static const QPixmap &osAll();
+
+        //! Linux
+        static const QPixmap &osLinux();
+
+        //! MacOS
+        static const QPixmap &osMac();
+
+        //! Windows
+        static const QPixmap &osWindows();
+
         // --------------------------------------------------
         // -- Preloader icons
         // --------------------------------------------------
diff --git a/src/blackmisc/icons/os/linux_24.png b/src/blackmisc/icons/os/linux_24.png
new file mode 100644
index 000000000..e014dc89a
Binary files /dev/null and b/src/blackmisc/icons/os/linux_24.png differ
diff --git a/src/blackmisc/icons/os/macos_24.png b/src/blackmisc/icons/os/macos_24.png
new file mode 100644
index 000000000..058f0ae93
Binary files /dev/null and b/src/blackmisc/icons/os/macos_24.png differ
diff --git a/src/blackmisc/icons/os/windows_24.png b/src/blackmisc/icons/os/windows_24.png
new file mode 100644
index 000000000..cee194d1f
Binary files /dev/null and b/src/blackmisc/icons/os/windows_24.png differ