diff --git a/Tools/px4airframes/xmlout.py b/Tools/px4airframes/xmlout.py
index 994fb6eeb2..841fabd4b5 100644
--- a/Tools/px4airframes/xmlout.py
+++ b/Tools/px4airframes/xmlout.py
@@ -28,29 +28,55 @@ class XMLOutput():
             xml_group = ET.SubElement(xml_parameters, "airframe_group")
             xml_group.attrib["name"] = group.GetName()
             if (group.GetName() == "Standard Plane"):
-                xml_group.attrib["image"] = "AirframeStandardPlane.png"
+                xml_group.attrib["image"] = "Plane"
             elif (group.GetName() == "Flying Wing"):
-                xml_group.attrib["image"] = "AirframeFlyingWing.png"
+                xml_group.attrib["image"] = "FlyingWing"
             elif (group.GetName() == "Quadrotor x"):
-                xml_group.attrib["image"] = "AirframeQuadRotorX.png"
+                xml_group.attrib["image"] = "QuadRotorX"
             elif (group.GetName() == "Quadrotor +"):
-                xml_group.attrib["image"] = "AirframeQuadRotorPlus.png"
+                xml_group.attrib["image"] = "QuadRotorPlus"
             elif (group.GetName() == "Hexarotor x"):
-                xml_group.attrib["image"] = "AirframeHexaRotorX.png"
+                xml_group.attrib["image"] = "HexaRotorX"
             elif (group.GetName() == "Hexarotor +"):
-                xml_group.attrib["image"] = "AirframeHexaRotorPlus.png"
+                xml_group.attrib["image"] = "HexaRotorPlus"
             elif (group.GetName() == "Octorotor +"):
-                xml_group.attrib["image"] = "AirframeOctoRotorPlus.png"
+                xml_group.attrib["image"] = "OctoRotorPlus"
             elif (group.GetName() == "Octorotor x"):
-                xml_group.attrib["image"] = "AirframeOctoRotorX.png"
+                xml_group.attrib["image"] = "OctoRotorX"
+            elif (group.GetName() == "Octorotor Coaxial"):
+                xml_group.attrib["image"] = "OctoRotorXCoaxial"
             elif (group.GetName() == "Quadrotor Wide"):
-                xml_group.attrib["image"] = "AirframeQuadRotorH.png"
+                xml_group.attrib["image"] = "QuadRotorWide"
             elif (group.GetName() == "Quadrotor H"):
-                xml_group.attrib["image"] = "AirframeQuadRotorH.png"
+                xml_group.attrib["image"] = "QuadRotorH"
             elif (group.GetName() == "Simulation"):
-                xml_group.attrib["image"] = "AirframeSimulation.png"
+                xml_group.attrib["image"] = "AirframeSimulation"
+            elif (group.GetName() == "Plane A-Tail"):
+                xml_group.attrib["image"] = "PlaneATail"
+            elif (group.GetName() == "VTOL Duo Tailsitter"):
+                xml_group.attrib["image"] = "VTOLDuoRotorTailSitter"
+            elif (group.GetName() == "Standard VTOL"):
+                xml_group.attrib["image"] = "VTOLPlane"
+            elif (group.GetName() == "VTOL Quad Tailsitter"):
+                xml_group.attrib["image"] = "VTOLQuadRotorTailSitter"
+            elif (group.GetName() == "VTOLTiltRotor"):
+                xml_group.attrib["image"] = "VTOLTiltRotor"
+            elif (group.GetName() == "Coaxial Helicopter"):
+                xml_group.attrib["image"] = "HelicopterCoaxial"
+            elif (group.GetName() == "Hexarotor Coaxial"):
+                xml_group.attrib["image"] = "Y6A"
+            elif (group.GetName() == "Y6B"):
+                xml_group.attrib["image"] = "Y6B"
+            elif (group.GetName() == "Tricopter Y-"):
+                xml_group.attrib["image"] = "YMinus"
+            elif (group.GetName() == "Tricopter Y+"):
+                xml_group.attrib["image"] = "YPlus"
+            elif (group.GetName() == "Rover"):
+                xml_group.attrib["image"] = "Rover"
+            elif (group.GetName() == "Boat"):
+                xml_group.attrib["image"] = "Boat"
             else:
-                xml_group.attrib["image"] = ""
+                xml_group.attrib["image"] = "AirframeUnknown"
             for param in group.GetParams():
                 if (last_param_name == param.GetName() and not board_specific_param_set) or last_param_name != param.GetName():
                     xml_param = ET.SubElement(xml_group, "airframe")