diff --git a/desktop/app/src/devices/ArchivedDevice.tsx b/desktop/app/src/devices/ArchivedDevice.tsx
index 0be1e4965..d0c5ff5e6 100644
--- a/desktop/app/src/devices/ArchivedDevice.tsx
+++ b/desktop/app/src/devices/ArchivedDevice.tsx
@@ -44,9 +44,9 @@ export default class ArchivedDevice extends BaseDevice {
         title: options.title,
         os: options.os,
         serial: options.serial,
+        icon: 'box',
       },
     );
-    this.icon = 'box';
     this.connected.set(false);
     this.source = options.source || '';
     this.supportRequestDetails = options.supportRequestDetails;
diff --git a/desktop/app/src/devices/BaseDevice.tsx b/desktop/app/src/devices/BaseDevice.tsx
index 44ba664ae..e50c51da9 100644
--- a/desktop/app/src/devices/BaseDevice.tsx
+++ b/desktop/app/src/devices/BaseDevice.tsx
@@ -79,7 +79,9 @@ export default class BaseDevice {
   }
 
   // possible src of icon to display next to the device title
-  icon: string | null | undefined;
+  get icon() {
+    return this.description.icon;
+  }
 
   logListeners: Map<Symbol, DeviceLogListener> = new Map();
 
diff --git a/desktop/app/src/server/devices/android/AndroidDevice.tsx b/desktop/app/src/server/devices/android/AndroidDevice.tsx
index d56ac0030..06fbcd421 100644
--- a/desktop/app/src/server/devices/android/AndroidDevice.tsx
+++ b/desktop/app/src/server/devices/android/AndroidDevice.tsx
@@ -41,12 +41,12 @@ export default class AndroidDevice extends ServerDevice {
       deviceType,
       title,
       os: 'Android',
+      icon: 'mobile',
       specs,
       abiList,
       sdkVersion,
     });
     this.adb = adb;
-    // TODO: this.icon = 'mobile';
   }
 
   startLogging() {
diff --git a/desktop/app/src/server/devices/desktop/MacDevice.tsx b/desktop/app/src/server/devices/desktop/MacDevice.tsx
index 7ddb6bf96..612279847 100644
--- a/desktop/app/src/server/devices/desktop/MacDevice.tsx
+++ b/desktop/app/src/server/devices/desktop/MacDevice.tsx
@@ -17,7 +17,7 @@ export default class MacDevice extends ServerDevice {
       deviceType: 'physical',
       title: 'Mac',
       os: 'MacOS',
+      icon: 'app-apple',
     });
-    // TODO: this.icon = 'app-apple';
   }
 }
diff --git a/desktop/app/src/server/devices/desktop/WindowsDevice.tsx b/desktop/app/src/server/devices/desktop/WindowsDevice.tsx
index 8e0d83722..9c415cdd7 100644
--- a/desktop/app/src/server/devices/desktop/WindowsDevice.tsx
+++ b/desktop/app/src/server/devices/desktop/WindowsDevice.tsx
@@ -17,7 +17,7 @@ export default class WindowsDevice extends ServerDevice {
       deviceType: 'physical',
       title: 'Windows',
       os: 'Windows',
+      icon: 'app-microsoft-windows',
     });
-    // TODO:    this.icon = 'app-microsoft-windows';
   }
 }
diff --git a/desktop/app/src/server/devices/ios/IOSDevice.tsx b/desktop/app/src/server/devices/ios/IOSDevice.tsx
index 4f5beac14..5579e3572 100644
--- a/desktop/app/src/server/devices/ios/IOSDevice.tsx
+++ b/desktop/app/src/server/devices/ios/IOSDevice.tsx
@@ -53,8 +53,13 @@ export default class IOSDevice extends ServerDevice {
     deviceType: DeviceType,
     title: string,
   ) {
-    super(flipperServer, {serial, deviceType, title, os: 'iOS'});
-    // TODO: this.icon = 'mobile';
+    super(flipperServer, {
+      serial,
+      deviceType,
+      title,
+      os: 'iOS',
+      icon: 'mobile',
+    });
     this.buffer = '';
     this.iOSBridge = iOSBridge;
   }
diff --git a/desktop/flipper-plugin/src/types/server-types.tsx b/desktop/flipper-plugin/src/types/server-types.tsx
index 313f2190b..40a925e2f 100644
--- a/desktop/flipper-plugin/src/types/server-types.tsx
+++ b/desktop/flipper-plugin/src/types/server-types.tsx
@@ -33,6 +33,7 @@ export type DeviceDescription = {
   readonly title: string;
   readonly deviceType: DeviceType;
   readonly serial: string;
+  readonly icon?: string;
   // Android specific information
   readonly specs?: DeviceSpec[];
   readonly abiList?: string[];