diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/DeviceViewMessageHandler.java b/web/gui/src/main/java/org/onosproject/ui/impl/DeviceViewMessageHandler.java
index fa03537..7f6c253 100644
--- a/web/gui/src/main/java/org/onosproject/ui/impl/DeviceViewMessageHandler.java
+++ b/web/gui/src/main/java/org/onosproject/ui/impl/DeviceViewMessageHandler.java
@@ -128,6 +128,10 @@
     }
 
     private static String getTypeIconId(Device d) {
+        String uiType = d.annotations().value(AnnotationKeys.UI_TYPE);
+        if (uiType != null && !uiType.isEmpty()) {
+            return uiType;
+        }
         return DEV_ICON_PREFIX + d.type().toString();
     }