diff --git a/src/AutoPilotPlugins/PX4/AirframeFactMetaData.xml b/src/AutoPilotPlugins/PX4/AirframeFactMetaData.xml
index c9dabddde259df2cb9be319734f634f703b34f92..d257142342b734e6e354218283bf0b0b9348d8af 100644
--- a/src/AutoPilotPlugins/PX4/AirframeFactMetaData.xml
+++ b/src/AutoPilotPlugins/PX4/AirframeFactMetaData.xml
@@ -59,7 +59,7 @@
       <type>Flying Wing</type>
     </airframe>
   </airframe_group>
-  <airframe_group image="AirframeStandardPlane.png" name="Hexarotor +">
+  <airframe_group image="AirframeHexaRotorPlus.png" name="Hexarotor +">
     <airframe id="7001" maintainer="Anton Babushkin &lt;anton@px4.io&gt;" name="Generic Hexarotor + geometry">
       <maintainer>Anton Babushkin &lt;anton@px4.io&gt;</maintainer>
       <type>Hexarotor +</type>
@@ -68,13 +68,13 @@
       <output name="AUX3">feed-through of RC AUX3 channel</output>
     </airframe>
   </airframe_group>
-  <airframe_group image="AirframeStandardPlane.png" name="Hexarotor Coaxial&#10;Lorenz Meier &lt;lorenz@px4.io&gt;">
-    <airframe id="11001" maintainer="John Doe &lt;john@example.com&gt;" name="Generic Hexa coaxial geometry">
-      <type>Hexarotor Coaxial
-Lorenz Meier &lt;lorenz@px4.io&gt;</type>
+  <airframe_group image="" name="Hexarotor Coaxial">
+    <airframe id="11001" maintainer="Lorenz Meier &lt;lorenz@px4.io&gt;" name="Generic Hexa coaxial geometry">
+      <maintainer>Lorenz Meier &lt;lorenz@px4.io&gt;</maintainer>
+      <type>Hexarotor Coaxial</type>
     </airframe>
   </airframe_group>
-  <airframe_group image="AirframeStandardPlane.png" name="Hexarotor x">
+  <airframe_group image="AirframeHexaRotorX.png" name="Hexarotor x">
     <airframe id="6001" maintainer="Anton Babushkin &lt;anton@px4.io&gt;" name="Generic Hexarotor x geometry">
       <maintainer>Anton Babushkin &lt;anton@px4.io&gt;</maintainer>
       <type>Hexarotor x</type>
@@ -83,7 +83,7 @@ Lorenz Meier &lt;lorenz@px4.io&gt;</type>
       <output name="AUX3">feed-through of RC AUX3 channel</output>
     </airframe>
   </airframe_group>
-  <airframe_group image="AirframeStandardPlane.png" name="Octorotor +">
+  <airframe_group image="AirframeOctoRotorPlus.png" name="Octorotor +">
     <airframe id="9001" maintainer="Anton Babushkin &lt;anton@px4.io&gt;" name="Generic Octocopter + geometry">
       <maintainer>Anton Babushkin &lt;anton@px4.io&gt;</maintainer>
       <type>Octorotor +</type>
@@ -92,13 +92,13 @@ Lorenz Meier &lt;lorenz@px4.io&gt;</type>
       <output name="AUX3">feed-through of RC AUX3 channel</output>
     </airframe>
   </airframe_group>
-  <airframe_group image="AirframeStandardPlane.png" name="Octorotor Coaxial">
+  <airframe_group image="" name="Octorotor Coaxial">
     <airframe id="12001" maintainer="Lorenz Meier &lt;lorenz@px4.io&gt;" name="Generic 10&quot; Octo coaxial geometry">
       <maintainer>Lorenz Meier &lt;lorenz@px4.io&gt;</maintainer>
       <type>Octorotor Coaxial</type>
     </airframe>
   </airframe_group>
-  <airframe_group image="AirframeStandardPlane.png" name="Octorotor x">
+  <airframe_group image="AirframeOctoRotorX.png" name="Octorotor x">
     <airframe id="8001" maintainer="Anton Babushkin &lt;anton@px4.io&gt;" name="Generic Octocopter X geometry">
       <maintainer>Anton Babushkin &lt;anton@px4.io&gt;</maintainer>
       <type>Octorotor x</type>
@@ -113,8 +113,8 @@ Lorenz Meier &lt;lorenz@px4.io&gt;</type>
       <type>Quadrotor +</type>
     </airframe>
   </airframe_group>
-  <airframe_group image="AirframeStandardPlane.png" name="Quadrotor Wide">
-    <airframe id="10015" maintainer="Anton Babushkin &lt;anton@px4.io&gt;, Simon Wilks &lt;simon@px4.io&gt;" name="Team Blacksheep Discovery Quadcopter">
+  <airframe_group image="AirframeQuadRotorH.png" name="Quadrotor Wide">
+    <airframe id="10015" maintainer="Anton Babushkin &lt;anton@px4.io&gt;, Simon Wilks &lt;simon@px4.io&gt;" name="Team Blacksheep Discovery">
       <maintainer>Anton Babushkin &lt;anton@px4.io&gt;, Simon Wilks &lt;simon@px4.io&gt;</maintainer>
       <type>Quadrotor Wide</type>
     </airframe>
@@ -126,7 +126,7 @@ Lorenz Meier &lt;lorenz@px4.io&gt;</type>
       <maintainer>Thomas Gubler &lt;thomas@px4.io&gt;</maintainer>
       <type>Quadrotor Wide</type>
     </airframe>
-    <airframe id="10018" maintainer="Simon Wilks &lt;simon@px4.io&gt;" name="Team Blacksheep Discovery Long Range Quadcopter&#10;Setup: 15 x 5&quot; Props, 6S 4000mAh TBS LiPo, TBS 30A ESCs, TBS 400kV Motors">
+    <airframe id="10018" maintainer="Simon Wilks &lt;simon@px4.io&gt;" name="Team Blacksheep Discovery Endurance">
       <maintainer>Simon Wilks &lt;simon@px4.io&gt;</maintainer>
       <type>Quadrotor Wide</type>
     </airframe>
@@ -165,16 +165,14 @@ Lorenz Meier &lt;lorenz@px4.io&gt;</type>
       <maintainer>Pavel Kirienko &lt;pavel@px4.io&gt;</maintainer>
       <type>Quadrotor x</type>
     </airframe>
-    <airframe id="4020" maintainer="Thomas Gubler &lt;thomas@px4.io&gt;" name="Hobbyking Micro Integrated PCB Quadcopter&#10;with SimonK ESC firmware and Mystery A1510 motors">
+    <airframe id="4020" maintainer="Thomas Gubler &lt;thomas@px4.io&gt;" name="Hobbyking Micro PCB">
       <maintainer>Thomas Gubler &lt;thomas@px4.io&gt;</maintainer>
       <type>Quadrotor x</type>
     </airframe>
   </airframe_group>
-  <airframe_group image="AirframeStandardPlane.png" name="Rover&#10;loading default values for the axialracing ax10&#10;load some defaults e.g. PWM values">
+  <airframe_group image="" name="Rover">
     <airframe id="50001" maintainer="John Doe &lt;john@example.com&gt;" name="Axial Racing AX10">
-      <type>Rover
-loading default values for the axialracing ax10
-load some defaults e.g. PWM values</type>
+      <type>Rover</type>
     </airframe>
   </airframe_group>
   <airframe_group image="AirframeSimulation.png" name="Simulation">
@@ -220,7 +218,7 @@ load some defaults e.g. PWM values</type>
       <output name="MAIN4">rudder</output>
       <output name="MAIN5">flaps</output>
     </airframe>
-    <airframe id="2102" maintainer="Lorenz Meier &lt;lorenz@px4.io&gt;" name="Skywalker (3DR or Generic)">
+    <airframe id="2102" maintainer="Lorenz Meier &lt;lorenz@px4.io&gt;" name="Skywalker (3DR Aero)">
       <maintainer>Lorenz Meier &lt;lorenz@px4.io&gt;</maintainer>
       <type>Standard Plane</type>
       <output name="AUX1">feed-through of RC AUX1 channel</output>
@@ -255,33 +253,33 @@ load some defaults e.g. PWM values</type>
       <output name="MAIN5">flaps</output>
     </airframe>
   </airframe_group>
-  <airframe_group image="AirframeStandardPlane.png" name="Tricopter Y+">
-    <airframe id="14001" maintainer="Trent Lukaczyk &lt;aerialhedgehog@gmail.com&gt;" name="Generic Tricopter Y Geometry&#10;Yaw Servo +Output ==&gt; +Yaw Vehicle Rotation">
+  <airframe_group image="" name="Tricopter Y+">
+    <airframe id="14001" maintainer="Trent Lukaczyk &lt;aerialhedgehog@gmail.com&gt;" name="Generic Tricopter Y+ Geometry">
       <maintainer>Trent Lukaczyk &lt;aerialhedgehog@gmail.com&gt;</maintainer>
       <type>Tricopter Y+</type>
     </airframe>
   </airframe_group>
-  <airframe_group image="AirframeStandardPlane.png" name="Tricopter Y-">
-    <airframe id="14002" maintainer="Trent Lukaczyk &lt;aerialhedgehog@gmail.com&gt;" name="Generic Tricopter Y Geometry&#10;Yaw Servo +Output ==&gt; -Yaw Vehicle Rotation">
+  <airframe_group image="" name="Tricopter Y-">
+    <airframe id="14002" maintainer="Trent Lukaczyk &lt;aerialhedgehog@gmail.com&gt;" name="Generic Tricopter Y- Geometry">
       <maintainer>Trent Lukaczyk &lt;aerialhedgehog@gmail.com&gt;</maintainer>
       <type>Tricopter Y-</type>
     </airframe>
   </airframe_group>
-  <airframe_group image="AirframeStandardPlane.png" name="VTOL Tailsitter">
-    <airframe id="13001" maintainer="Roman Bapst &lt;roman@px4.io&gt;" name="Duorotor Tailsitter&#10;Generic configuration file for a tailsitter with motors in tandem configuration.">
+  <airframe_group image="" name="VTOL Tailsitter">
+    <airframe id="13001" maintainer="Roman Bapst &lt;roman@px4.io&gt;" name="Duorotor Tailsitter">
       <maintainer>Roman Bapst &lt;roman@px4.io&gt;</maintainer>
       <type>VTOL Tailsitter</type>
     </airframe>
-    <airframe id="13003" maintainer="Roman Bapst &lt;roman@px4.io&gt;" name="Quadrotor X Tailsitter&#10;Generic configuration file for a tailsitter with motors in X configuration.">
+    <airframe id="13003" maintainer="Roman Bapst &lt;roman@px4.io&gt;" name="Quadrotor X Tailsitter">
       <maintainer>Roman Bapst &lt;roman@px4.io&gt;</maintainer>
       <type>VTOL Tailsitter</type>
     </airframe>
-    <airframe id="13004" maintainer="Roman Bapst &lt;roman@px4.io&gt;" name="Quadrotor + Tailsitter&#10;Generic configuration file for a tailsitter with motors in X configuration.">
+    <airframe id="13004" maintainer="Roman Bapst &lt;roman@px4.io&gt;" name="Quadrotor + Tailsitter">
       <maintainer>Roman Bapst &lt;roman@px4.io&gt;</maintainer>
       <type>VTOL Tailsitter</type>
     </airframe>
   </airframe_group>
-  <airframe_group image="AirframeStandardPlane.png" name="VTOL Tiltrotor">
+  <airframe_group image="" name="VTOL Tiltrotor">
     <airframe id="13002" maintainer="Roman Bapst &lt;roman@px4.io&gt;" name="BirdsEyeView Aerobotics FireFly6">
       <maintainer>Roman Bapst &lt;roman@px4.io&gt;</maintainer>
       <type>VTOL Tiltrotor</type>