diff --git a/src/ui/MainWindow.cc b/src/ui/MainWindow.cc
index f1f53e4f83a05ce51b96729d9f6e51fe6da1ca90..88a596603dc45096a9c0a223d3206bcf8ac44892 100644
--- a/src/ui/MainWindow.cc
+++ b/src/ui/MainWindow.cc
@@ -1211,23 +1211,24 @@ void MainWindow::UASCreated(UASInterface* uas)
 
         QIcon icon;
         // Set matching icon
-        switch (uas->getSystemType()) {
-        case 0:
+        switch (uas->getSystemType())
+		{
+        case MAV_TYPE_GENERIC:
             icon = QIcon(":/images/mavs/generic.svg");
             break;
-        case 1:
+        case MAV_TYPE_FIXED_WING:
             icon = QIcon(":/images/mavs/fixed-wing.svg");
             break;
-        case 2:
+        case MAV_TYPE_QUADROTOR:
             icon = QIcon(":/images/mavs/quadrotor.svg");
             break;
-        case 3:
+        case MAV_TYPE_COAXIAL:
             icon = QIcon(":/images/mavs/coaxial.svg");
             break;
-        case 4:
+        case MAV_TYPE_HELICOPTER:
             icon = QIcon(":/images/mavs/helicopter.svg");
             break;
-        case 5:
+        case MAV_TYPE_GCS:
             icon = QIcon(":/images/mavs/groundstation.svg");
             break;
         default: