diff --git a/qgcimages.qrc b/qgcimages.qrc
new file mode 100644
index 0000000..6f06746
--- /dev/null
+++ b/qgcimages.qrc
@@ -0,0 +1,180 @@
+<RCC>
+    <qresource prefix="/qmlimages">
+        <file alias="camera.svg">resources/camera.svg</file>
+        <file alias="adsbVehicle.svg">src/FlightMap/Images/adsbVehicle.svg</file>
+        <file alias="Airframe/AirframeSimulation">src/AutoPilotPlugins/Common/Images/AirframeSimulation.svg</file>
+        <file alias="Airframe/AirframeUnknown">src/AutoPilotPlugins/Common/Images/AirframeUnknown.svg</file>
+        <file alias="Airframe/Boat">src/AutoPilotPlugins/Common/Images/Boat.svg</file>
+        <file alias="Airframe/FlyingWing">src/AutoPilotPlugins/Common/Images/FlyingWing.svg</file>
+        <file alias="Airframe/Helicopter">src/AutoPilotPlugins/Common/Images/Helicopter.svg</file>
+        <file alias="Airframe/HelicopterCoaxial">src/AutoPilotPlugins/Common/Images/HelicopterCoaxial.svg</file>
+        <file alias="Airframe/HexaRotorPlus">src/AutoPilotPlugins/Common/Images/HexaRotorPlus.svg</file>
+        <file alias="Airframe/HexaRotorX">src/AutoPilotPlugins/Common/Images/HexaRotorX.svg</file>
+        <file alias="Airframe/OctoRotorPlus">src/AutoPilotPlugins/Common/Images/OctoRotorPlus.svg</file>
+        <file alias="Airframe/OctoRotorPlusCoaxial">src/AutoPilotPlugins/Common/Images/OctoRotorPlusCoaxial.svg</file>
+        <file alias="Airframe/OctoRotorX">src/AutoPilotPlugins/Common/Images/OctoRotorX.svg</file>
+        <file alias="Airframe/OctoRotorXCoaxial">src/AutoPilotPlugins/Common/Images/OctoRotorXCoaxial.svg</file>
+        <file alias="Airframe/Plane">src/AutoPilotPlugins/Common/Images/Plane.svg</file>
+        <file alias="Airframe/PlaneATail">src/AutoPilotPlugins/Common/Images/PlaneATail.svg</file>
+        <file alias="Airframe/PlaneVTail">src/AutoPilotPlugins/Common/Images/PlaneVTail.svg</file>
+        <file alias="Airframe/QuadRotorATail">src/AutoPilotPlugins/Common/Images/QuadRotorATail.svg</file>
+        <file alias="Airframe/QuadRotorH">src/AutoPilotPlugins/Common/Images/QuadRotorH.svg</file>
+        <file alias="Airframe/QuadRotorPlus">src/AutoPilotPlugins/Common/Images/QuadRotorPlus.svg</file>
+        <file alias="Airframe/QuadRotorVTail">src/AutoPilotPlugins/Common/Images/QuadRotorVTail.svg</file>
+        <file alias="Airframe/QuadRotorWide">src/AutoPilotPlugins/Common/Images/QuadRotorWide.svg</file>
+        <file alias="Airframe/QuadRotorX">src/AutoPilotPlugins/Common/Images/QuadRotorX.svg</file>
+        <file alias="Airframe/Rover">src/AutoPilotPlugins/Common/Images/Rover.svg</file>
+        <file alias="Airframe/VTOLDuoRotorTailSitter">src/AutoPilotPlugins/Common/Images/VTOLDuoRotorTailSitter.svg</file>
+        <file alias="Airframe/VTOLPlane">src/AutoPilotPlugins/Common/Images/VTOLPlane.svg</file>
+        <file alias="Airframe/VTOLQuadRotorTailSitter">src/AutoPilotPlugins/Common/Images/VTOLQuadRotorTailSitter.svg</file>
+        <file alias="Airframe/VTOLTiltRotor">src/AutoPilotPlugins/Common/Images/VTOLTiltRotor.svg</file>
+        <file alias="Airframe/Y6A">src/AutoPilotPlugins/Common/Images/Y6A.svg</file>
+        <file alias="Airframe/Y6B">src/AutoPilotPlugins/Common/Images/Y6B.svg</file>
+        <file alias="Airframe/YMinus">src/AutoPilotPlugins/Common/Images/YMinus.svg</file>
+        <file alias="Airframe/YPlus">src/AutoPilotPlugins/Common/Images/YPlus.svg</file>
+        <file alias="AirframeComponentIcon.png">src/AutoPilotPlugins/Common/Images/AirframeComponentIcon.png</file>
+        <file alias="AirframeFlyingWing.png">src/AutoPilotPlugins/Common/Images/FlyingWing.svg</file>
+        <file alias="AirframeHexaRotorPlus.png">src/AutoPilotPlugins/Common/Images/HexaRotorPlus.svg</file>
+        <file alias="AirframeHexaRotorX.png">src/AutoPilotPlugins/Common/Images/HexaRotorX.svg</file>
+        <file alias="AirframeOctoRotorPlus.png">src/AutoPilotPlugins/Common/Images/OctoRotorPlus.svg</file>
+        <file alias="AirframeOctoRotorX.png">src/AutoPilotPlugins/Common/Images/OctoRotorX.svg</file>
+        <file alias="AirframeQuadRotorH.png">src/AutoPilotPlugins/Common/Images/QuadRotorH.svg</file>
+        <file alias="AirframeQuadRotorPlus.png">src/AutoPilotPlugins/Common/Images/QuadRotorPlus.svg</file>
+        <file alias="AirframeQuadRotorX.png">src/AutoPilotPlugins/Common/Images/QuadRotorX.svg</file>
+        <file alias="AirframeSimulation.png">src/AutoPilotPlugins/Common/Images/AirframeSimulation.svg</file>
+        <file alias="AirframeStandardPlane.png">src/AutoPilotPlugins/Common/Images/Plane.svg</file>
+        <file alias="AlertAircraft.svg">src/FlightMap/Images/AlertAircraft.svg</file>
+        <file alias="Analyze.svg">src/ui/toolbar/Images/Analyze.svg</file>
+        <file alias="APM/BrandImage">src/FirmwarePlugin/APM/APMBrandImage.png</file>
+        <file alias="APM/BrandImageSub">src/FirmwarePlugin/APM/APMBrandImageSub.png</file>
+        <file alias="APMode.svg">src/AutoPilotPlugins/Common/Images/APMode.svg</file>
+        <file alias="Armed.svg">src/ui/toolbar/Images/Armed.svg</file>
+        <file alias="arrow-down.png">src/QmlControls/arrow-down.png</file>
+        <file alias="ArrowCCW.svg">src/AutoPilotPlugins/Common/Images/ArrowCCW.svg</file>
+        <file alias="ArrowCW.svg">src/AutoPilotPlugins/Common/Images/ArrowCW.svg</file>
+        <file alias="ArrowDirection.svg">src/AutoPilotPlugins/Common/Images/ArrowDirection.svg</file>
+        <file alias="attitudeDial.svg">src/FlightMap/Images/attitudeDial.svg</file>
+        <file alias="attitudeInstrument.svg">src/FlightMap/Images/attitudeInstrument.svg</file>
+        <file alias="attitudePointer.svg">src/FlightMap/Images/attitudePointer.svg</file>
+        <file alias="AwarenessAircraft.svg">src/FlightMap/Images/AwarenessAircraft.svg</file>
+        <file alias="Battery.svg">src/ui/toolbar/Images/Battery.svg</file>
+        <file alias="camera_photo.svg">src/Camera/images/camera_photo.svg</file>
+        <file alias="camera_video.svg">src/Camera/images/camera_video.svg</file>
+        <file alias="CameraComponentIcon.png">src/AutoPilotPlugins/PX4/Images/CameraComponentIcon.png</file>
+        <file alias="CameraIcon.svg">src/ui/toolbar/Images/CameraIcon.svg</file>
+        <file alias="CameraTrigger.svg">src/AutoPilotPlugins/PX4/Images/CameraTrigger.svg</file>
+        <file alias="check.svg">resources/check.svg</file>
+        <file alias="checkbox-check.svg">src/QmlControls/checkbox-check.svg</file>
+        <file alias="CogWheel.svg">src/MissionManager/CogWheel.svg</file>
+        <file alias="compassInstrumentArrow.svg">src/FlightMap/Images/compassInstrumentArrow.svg</file>
+        <file alias="compassInstrumentDial.svg">src/FlightMap/Images/compassInstrumentDial.svg</file>
+        <file alias="Connect.svg">src/ui/toolbar/Images/Connect.svg</file>
+        <file alias="crossHair.svg">src/FlightMap/Images/crossHair.svg</file>
+        <file alias="DatalinkLoss.svg">src/AutoPilotPlugins/PX4/Images/DatalinkLoss.svg</file>
+        <file alias="DatalinkLossLight.svg">src/AutoPilotPlugins/PX4/Images/DatalinkLossLight.svg</file>
+        <file alias="Disarmed.svg">src/ui/toolbar/Images/Disarmed.svg</file>
+        <file alias="Disconnect.svg">src/ui/toolbar/Images/Disconnect.svg</file>
+        <file alias="FirmwareUpgradeIcon.png">src/VehicleSetup/FirmwareUpgradeIcon.png</file>
+        <file alias="FlightModesComponentIcon.png">src/AutoPilotPlugins/PX4/Images/FlightModesComponentIcon.png</file>
+        <file alias="Frames/BlueROV1.png">src/AutoPilotPlugins/APM/Images/bluerov-frame.png</file>
+        <file alias="Frames/SimpleROV-3.png">src/AutoPilotPlugins/APM/Images/simple3-frame.png</file>
+        <file alias="Frames/SimpleROV-4.png">src/AutoPilotPlugins/APM/Images/simple4-frame.png</file>
+        <file alias="Frames/SimpleROV-5.png">src/AutoPilotPlugins/APM/Images/simple5-frame.png</file>
+        <file alias="Frames/Vectored.png">src/AutoPilotPlugins/APM/Images/vectored-frame.png</file>
+        <file alias="Frames/Vectored6DOF.png">src/AutoPilotPlugins/APM/Images/vectored6dof-frame.png</file>
+        <file alias="Gears.svg">src/ui/toolbar/Images/Gears.svg</file>
+        <file alias="GeoFence.svg">src/AutoPilotPlugins/PX4/Images/GeoFence.svg</file>
+        <file alias="GeoFenceLight.svg">src/AutoPilotPlugins/PX4/Images/GeoFenceLight.svg</file>
+        <file alias="GeoTagIcon">src/AnalyzeView/GeoTagIcon.svg</file>
+        <file alias="Gps.svg">src/ui/toolbar/Images/Gps.svg</file>
+        <file alias="Hamburger.svg">src/ui/toolbar/Images/Hamburger.svg</file>
+        <file alias="Help.svg">src/FlightMap/Images/Help.svg</file>
+        <file alias="HelpBlack.svg">src/FlightMap/Images/HelpBlack.svg</file>
+        <file alias="Home.svg">src/FlightMap/Images/Home.svg</file>
+        <file alias="Joystick.png">src/ui/toolbar/Images/Joystick.png</file>
+        <file alias="LandMode.svg">src/AutoPilotPlugins/PX4/Images/LandMode.svg</file>
+        <file alias="LandModeCopter.svg">src/AutoPilotPlugins/PX4/Images/LandModeCopter.svg</file>
+        <file alias="LightsComponentIcon.png">src/AutoPilotPlugins/APM/Images/LightsComponentIcon.png</file>
+        <file alias="LogDownloadIcon">src/AnalyzeView/LogDownloadIcon.svg</file>
+        <file alias="LowBattery.svg">src/AutoPilotPlugins/PX4/Images/LowBattery.svg</file>
+        <file alias="LowBatteryLight.svg">src/AutoPilotPlugins/PX4/Images/LowBatteryLight.svg</file>
+        <file alias="MapAddMission.svg">src/FlightMap/Images/MapAddMission.svg</file>
+        <file alias="MapAddMissionBlack.svg">src/FlightMap/Images/MapAddMissionBlack.svg</file>
+        <file alias="MapCenter.svg">src/FlightMap/Images/MapCenter.svg</file>
+        <file alias="MapCenterBlack.svg">src/FlightMap/Images/MapCenterBlack.svg</file>
+        <file alias="MapDrawShape.svg">src/FlightMap/Images/MapDrawShape.svg</file>
+        <file alias="MapHome.svg">src/FlightMap/Images/MapHome.svg</file>
+        <file alias="MapHomeBlack.svg">src/FlightMap/Images/MapHomeBlack.svg</file>
+        <file alias="MapSync.svg">src/FlightMap/Images/MapSync.svg</file>
+        <file alias="MapSyncBlack.svg">src/FlightMap/Images/MapSyncBlack.svg</file>
+        <file alias="MapSyncChanged.svg">src/FlightMap/Images/MapSyncChanged.svg</file>
+        <file alias="MapType.svg">src/FlightMap/Images/MapType.svg</file>
+        <file alias="MapTypeBlack.svg">src/FlightMap/Images/MapTypeBlack.svg</file>
+        <file alias="MavlinkConsoleIcon">src/AnalyzeView/MavlinkConsoleIcon.svg</file>
+        <file alias="MAVLinkInspector">src/AnalyzeView/MAVLinkInspector.svg</file>
+        <file alias="Megaphone.svg">src/ui/toolbar/Images/Megaphone.svg</file>
+        <file alias="MotorComponentIcon.svg">src/AutoPilotPlugins/Common/Images/MotorComponentIcon.svg</file>
+        <file alias="no-logging-light.svg">src/AutoPilotPlugins/PX4/Images/no-logging-light.svg</file>
+        <file alias="no-logging.svg">src/AutoPilotPlugins/PX4/Images/no-logging.svg</file>
+        <file alias="PaperPlane.svg">src/ui/toolbar/Images/PaperPlane.svg</file>
+        <file alias="PiP.svg">src/FlightMap/Images/PiP.svg</file>
+        <file alias="pipHide.svg">src/FlightMap/Images/pipHide.svg</file>
+        <file alias="pipResize.svg">src/FlightMap/Images/pipResize.svg</file>
+        <file alias="Plan.svg">src/ui/toolbar/Images/Plan.svg</file>
+        <file alias="PowerComponentBattery_01cell.svg">src/AutoPilotPlugins/PX4/Images/PowerComponentBattery_01cell.svg</file>
+        <file alias="PowerComponentBattery_02cell.svg">src/AutoPilotPlugins/PX4/Images/PowerComponentBattery_02cell.svg</file>
+        <file alias="PowerComponentBattery_03cell.svg">src/AutoPilotPlugins/PX4/Images/PowerComponentBattery_03cell.svg</file>
+        <file alias="PowerComponentBattery_04cell.svg">src/AutoPilotPlugins/PX4/Images/PowerComponentBattery_04cell.svg</file>
+        <file alias="PowerComponentBattery_05cell.svg">src/AutoPilotPlugins/PX4/Images/PowerComponentBattery_05cell.svg</file>
+        <file alias="PowerComponentBattery_06cell.svg">src/AutoPilotPlugins/PX4/Images/PowerComponentBattery_06cell.svg</file>
+        <file alias="PowerComponentIcon.png">src/AutoPilotPlugins/PX4/Images/PowerComponentIcon.png</file>
+        <file alias="PX4/BrandImage">src/FirmwarePlugin/PX4/PX4BrandImage.png</file>
+        <file alias="Quad.svg">src/ui/toolbar/Images/Quad.svg</file>
+        <file alias="RadioComponentIcon.png">src/AutoPilotPlugins/PX4/Images/RadioComponentIcon.png</file>
+        <file alias="RC.svg">src/ui/toolbar/Images/RC.svg</file>
+        <file alias="RCLoss.svg">src/AutoPilotPlugins/PX4/Images/RCLoss.svg</file>
+        <file alias="RCLossLight.svg">src/AutoPilotPlugins/PX4/Images/RCLossLight.svg</file>
+        <file alias="ReturnToHomeAltitude.svg">src/AutoPilotPlugins/PX4/Images/ReturnToHomeAltitude.svg</file>
+        <file alias="ReturnToHomeAltitudeCopter.svg">src/AutoPilotPlugins/PX4/Images/ReturnToHomeAltitudeCopter.svg</file>
+        <file alias="rollDialWhite.svg">src/FlightMap/Images/rollDialWhite.svg</file>
+        <file alias="rollPointerWhite.svg">src/FlightMap/Images/rollPointerWhite.svg</file>
+        <file alias="RTK.svg">src/ui/toolbar/Images/RTK.svg</file>
+        <file alias="SafetyComponentIcon.png">src/AutoPilotPlugins/PX4/Images/SafetyComponentIcon.png</file>
+        <file alias="scale.png">src/FlightMap/Images/scale.png</file>
+        <file alias="scale_end.png">src/FlightMap/Images/scale_end.png</file>
+        <file alias="scale_endLight.png">src/FlightMap/Images/scale_endLight.png</file>
+        <file alias="scaleLight.png">src/FlightMap/Images/scaleLight.png</file>
+        <file alias="SensorsComponentIcon.png">src/AutoPilotPlugins/PX4/Images/SensorsComponentIcon.png</file>
+        <file alias="Signal0.svg">src/ui/toolbar/Images/Signal0.svg</file>
+        <file alias="Signal100.svg">src/ui/toolbar/Images/Signal100.svg</file>
+        <file alias="Signal20.svg">src/ui/toolbar/Images/Signal20.svg</file>
+        <file alias="Signal40.svg">src/ui/toolbar/Images/Signal40.svg</file>
+        <file alias="Signal60.svg">src/ui/toolbar/Images/Signal60.svg</file>
+        <file alias="Signal80.svg">src/ui/toolbar/Images/Signal80.svg</file>
+        <file alias="StationMode.svg">src/AutoPilotPlugins/Common/Images/StationMode.svg</file>
+        <file alias="SubFrameComponentIcon.png">src/AutoPilotPlugins/APM/Images/SubFrameComponentIcon.png</file>
+        <file alias="subMenuButtonImage.png">resources/CogWheels.png</file>
+        <file alias="subVehicleArrowOpaque.png">src/FlightMap/Images/sub.png</file>
+        <file alias="TelemRSSI.svg">src/ui/toolbar/Images/TelemRSSI.svg</file>
+        <file alias="TuningComponentIcon.png">src/AutoPilotPlugins/PX4/Images/TuningComponentIcon.png</file>
+        <file alias="vehicleArrowOpaque.svg">src/FlightMap/Images/vehicleArrowOpaque.svg</file>
+        <file alias="vehicleArrowOutline.svg">src/FlightMap/Images/vehicleArrowOutline.svg</file>
+        <file alias="VehicleDown.png">src/AutoPilotPlugins/PX4/Images/VehicleDown.png</file>
+        <file alias="VehicleDownRotate.png">src/AutoPilotPlugins/PX4/Images/VehicleDownRotate.png</file>
+        <file alias="VehicleLeft.png">src/AutoPilotPlugins/PX4/Images/VehicleLeft.png</file>
+        <file alias="VehicleLeftRotate.png">src/AutoPilotPlugins/PX4/Images/VehicleLeftRotate.png</file>
+        <file alias="VehicleNoseDown.png">src/AutoPilotPlugins/PX4/Images/VehicleNoseDown.png</file>
+        <file alias="VehicleNoseDownRotate.png">src/AutoPilotPlugins/PX4/Images/VehicleNoseDownRotate.png</file>
+        <file alias="VehicleRight.png">src/AutoPilotPlugins/PX4/Images/VehicleRight.png</file>
+        <file alias="VehicleRightRotate.png">src/AutoPilotPlugins/PX4/Images/VehicleRightRotate.png</file>
+        <file alias="VehicleSummaryIcon.png">src/VehicleSetup/VehicleSummaryIcon.png</file>
+        <file alias="VehicleTailDown.png">src/AutoPilotPlugins/PX4/Images/VehicleTailDown.png</file>
+        <file alias="VehicleTailDownRotate.png">src/AutoPilotPlugins/PX4/Images/VehicleTailDownRotate.png</file>
+        <file alias="VehicleUpsideDown.png">src/AutoPilotPlugins/PX4/Images/VehicleUpsideDown.png</file>
+        <file alias="VehicleUpsideDownRotate.png">src/AutoPilotPlugins/PX4/Images/VehicleUpsideDownRotate.png</file>
+        <file alias="wifi.svg">src/AutoPilotPlugins/Common/Images/wifi.svg</file>
+        <file alias="Yield.svg">src/ui/toolbar/Images/Yield.svg</file>
+        <file alias="ZoomMinus.svg">src/FlightMap/Images/ZoomMinus.svg</file>
+        <file alias="ZoomPlus.svg">src/FlightMap/Images/ZoomPlus.svg</file>
+    </qresource>
+</RCC>
diff --git a/qgcresources.qrc b/qgcresources.qrc
index d6ae623..d108e87 100644
--- a/qgcresources.qrc
+++ b/qgcresources.qrc
@@ -15,184 +15,6 @@
         <file alias="NanumGothic-Regular">resources/fonts/NanumGothic-Regular.ttf</file>
         <file alias="NanumGothic-Bold">resources/fonts/NanumGothic-Bold.ttf</file>
     </qresource>
-    <qresource prefix="/qmlimages">
-        <file alias="AirframeComponentIcon.png">src/AutoPilotPlugins/Common/Images/AirframeComponentIcon.png</file>
-        <file alias="AirframeFlyingWing.png">src/AutoPilotPlugins/Common/Images/FlyingWing.svg</file>
-        <file alias="AirframeHexaRotorPlus.png">src/AutoPilotPlugins/Common/Images/HexaRotorPlus.svg</file>
-        <file alias="AirframeHexaRotorX.png">src/AutoPilotPlugins/Common/Images/HexaRotorX.svg</file>
-        <file alias="AirframeOctoRotorPlus.png">src/AutoPilotPlugins/Common/Images/OctoRotorPlus.svg</file>
-        <file alias="AirframeOctoRotorX.png">src/AutoPilotPlugins/Common/Images/OctoRotorX.svg</file>
-        <file alias="AirframeQuadRotorH.png">src/AutoPilotPlugins/Common/Images/QuadRotorH.svg</file>
-        <file alias="AirframeQuadRotorPlus.png">src/AutoPilotPlugins/Common/Images/QuadRotorPlus.svg</file>
-        <file alias="AirframeQuadRotorX.png">src/AutoPilotPlugins/Common/Images/QuadRotorX.svg</file>
-        <file alias="AirframeSimulation.png">src/AutoPilotPlugins/Common/Images/AirframeSimulation.svg</file>
-        <file alias="AirframeStandardPlane.png">src/AutoPilotPlugins/Common/Images/Plane.svg</file>
-        <file alias="Airframe/AirframeSimulation">src/AutoPilotPlugins/Common/Images/AirframeSimulation.svg</file>
-        <file alias="Airframe/AirframeUnknown">src/AutoPilotPlugins/Common/Images/AirframeUnknown.svg</file>
-        <file alias="Airframe/Boat">src/AutoPilotPlugins/Common/Images/Boat.svg</file>
-        <file alias="Airframe/FlyingWing">src/AutoPilotPlugins/Common/Images/FlyingWing.svg</file>
-        <file alias="Airframe/Helicopter">src/AutoPilotPlugins/Common/Images/Helicopter.svg</file>
-        <file alias="Airframe/HexaRotorPlus">src/AutoPilotPlugins/Common/Images/HexaRotorPlus.svg</file>
-        <file alias="Airframe/HexaRotorX">src/AutoPilotPlugins/Common/Images/HexaRotorX.svg</file>
-        <file alias="Airframe/OctoRotorPlus">src/AutoPilotPlugins/Common/Images/OctoRotorPlus.svg</file>
-        <file alias="Airframe/OctoRotorPlusCoaxial">src/AutoPilotPlugins/Common/Images/OctoRotorPlusCoaxial.svg</file>
-        <file alias="Airframe/OctoRotorX">src/AutoPilotPlugins/Common/Images/OctoRotorX.svg</file>
-        <file alias="Airframe/OctoRotorXCoaxial">src/AutoPilotPlugins/Common/Images/OctoRotorXCoaxial.svg</file>
-        <file alias="Airframe/Plane">src/AutoPilotPlugins/Common/Images/Plane.svg</file>
-        <file alias="Airframe/PlaneATail">src/AutoPilotPlugins/Common/Images/PlaneATail.svg</file>
-        <file alias="Airframe/PlaneVTail">src/AutoPilotPlugins/Common/Images/PlaneVTail.svg</file>
-        <file alias="Airframe/QuadRotorATail">src/AutoPilotPlugins/Common/Images/QuadRotorATail.svg</file>
-        <file alias="Airframe/QuadRotorH">src/AutoPilotPlugins/Common/Images/QuadRotorH.svg</file>
-        <file alias="Airframe/QuadRotorPlus">src/AutoPilotPlugins/Common/Images/QuadRotorPlus.svg</file>
-        <file alias="Airframe/QuadRotorVTail">src/AutoPilotPlugins/Common/Images/QuadRotorVTail.svg</file>
-        <file alias="Airframe/QuadRotorWide">src/AutoPilotPlugins/Common/Images/QuadRotorWide.svg</file>
-        <file alias="Airframe/QuadRotorX">src/AutoPilotPlugins/Common/Images/QuadRotorX.svg</file>
-        <file alias="Airframe/Rover">src/AutoPilotPlugins/Common/Images/Rover.svg</file>
-        <file alias="Airframe/VTOLDuoRotorTailSitter">src/AutoPilotPlugins/Common/Images/VTOLDuoRotorTailSitter.svg</file>
-        <file alias="Airframe/VTOLPlane">src/AutoPilotPlugins/Common/Images/VTOLPlane.svg</file>
-        <file alias="Airframe/VTOLQuadRotorTailSitter">src/AutoPilotPlugins/Common/Images/VTOLQuadRotorTailSitter.svg</file>
-        <file alias="Airframe/VTOLTiltRotor">src/AutoPilotPlugins/Common/Images/VTOLTiltRotor.svg</file>
-        <file alias="Airframe/Y6A">src/AutoPilotPlugins/Common/Images/Y6A.svg</file>
-        <file alias="Airframe/Y6B">src/AutoPilotPlugins/Common/Images/Y6B.svg</file>
-        <file alias="Airframe/YMinus">src/AutoPilotPlugins/Common/Images/YMinus.svg</file>
-        <file alias="Airframe/YPlus">src/AutoPilotPlugins/Common/Images/YPlus.svg</file>
-        <file alias="Airframe/HelicopterCoaxial">src/AutoPilotPlugins/Common/Images/HelicopterCoaxial.svg</file>
-        <file alias="wifi.svg">src/AutoPilotPlugins/Common/Images/wifi.svg</file>
-        <file alias="arrow-down.png">src/QmlControls/arrow-down.png</file>
-		<file alias="camera.svg">resources/camera.svg</file>
-        <file alias="camera_photo.svg">src/Camera/images/camera_photo.svg</file>
-        <file alias="camera_video.svg">src/Camera/images/camera_video.svg</file>
-        <file alias="checkbox-check.svg">src/QmlControls/checkbox-check.svg</file>
-        <file alias="FirmwareUpgradeIcon.png">src/VehicleSetup/FirmwareUpgradeIcon.png</file>
-        <file alias="FlightModesComponentIcon.png">src/AutoPilotPlugins/PX4/Images/FlightModesComponentIcon.png</file>
-        <file alias="CameraTrigger.svg">src/AutoPilotPlugins/PX4/Images/CameraTrigger.svg</file>
-        <file alias="CameraComponentIcon.png">src/AutoPilotPlugins/PX4/Images/CameraComponentIcon.png</file>
-        <file alias="DatalinkLoss.svg">src/AutoPilotPlugins/PX4/Images/DatalinkLoss.svg</file>
-        <file alias="DatalinkLossLight.svg">src/AutoPilotPlugins/PX4/Images/DatalinkLossLight.svg</file>
-        <file alias="GeoFence.svg">src/AutoPilotPlugins/PX4/Images/GeoFence.svg</file>
-        <file alias="GeoFenceLight.svg">src/AutoPilotPlugins/PX4/Images/GeoFenceLight.svg</file>
-        <file alias="GeoTagIcon">src/AnalyzeView/GeoTagIcon.svg</file>
-        <file alias="MavlinkConsoleIcon">src/AnalyzeView/MavlinkConsoleIcon.svg</file>
-        <file alias="LandMode.svg">src/AutoPilotPlugins/PX4/Images/LandMode.svg</file>
-        <file alias="LandModeCopter.svg">src/AutoPilotPlugins/PX4/Images/LandModeCopter.svg</file>
-        <file alias="LightsComponentIcon.png">src/AutoPilotPlugins/APM/Images/LightsComponentIcon.png</file>
-        <file alias="SubFrameComponentIcon.png">src/AutoPilotPlugins/APM/Images/SubFrameComponentIcon.png</file>
-        <file alias="Frames/BlueROV1.png">src/AutoPilotPlugins/APM/Images/bluerov-frame.png</file>
-        <file alias="Frames/Vectored.png">src/AutoPilotPlugins/APM/Images/vectored-frame.png</file>
-        <file alias="Frames/Vectored6DOF.png">src/AutoPilotPlugins/APM/Images/vectored6dof-frame.png</file>
-        <file alias="Frames/SimpleROV-3.png">src/AutoPilotPlugins/APM/Images/simple3-frame.png</file>
-        <file alias="Frames/SimpleROV-4.png">src/AutoPilotPlugins/APM/Images/simple4-frame.png</file>
-        <file alias="Frames/SimpleROV-5.png">src/AutoPilotPlugins/APM/Images/simple5-frame.png</file>
-        <file alias="LogDownloadIcon">src/AnalyzeView/LogDownloadIcon.svg</file>
-        <file alias="LowBattery.svg">src/AutoPilotPlugins/PX4/Images/LowBattery.svg</file>
-        <file alias="LowBatteryLight.svg">src/AutoPilotPlugins/PX4/Images/LowBatteryLight.svg</file>
-        <file alias="MAVLinkInspector">src/AnalyzeView/MAVLinkInspector.svg</file>
-        <file alias="MotorComponentIcon.svg">src/AutoPilotPlugins/Common/Images/MotorComponentIcon.svg</file>
-        <file alias="PowerComponentBattery_01cell.svg">src/AutoPilotPlugins/PX4/Images/PowerComponentBattery_01cell.svg</file>
-        <file alias="PowerComponentBattery_02cell.svg">src/AutoPilotPlugins/PX4/Images/PowerComponentBattery_02cell.svg</file>
-        <file alias="PowerComponentBattery_03cell.svg">src/AutoPilotPlugins/PX4/Images/PowerComponentBattery_03cell.svg</file>
-        <file alias="PowerComponentBattery_04cell.svg">src/AutoPilotPlugins/PX4/Images/PowerComponentBattery_04cell.svg</file>
-        <file alias="PowerComponentBattery_05cell.svg">src/AutoPilotPlugins/PX4/Images/PowerComponentBattery_05cell.svg</file>
-        <file alias="PowerComponentBattery_06cell.svg">src/AutoPilotPlugins/PX4/Images/PowerComponentBattery_06cell.svg</file>
-        <file alias="PowerComponentIcon.png">src/AutoPilotPlugins/PX4/Images/PowerComponentIcon.png</file>
-        <file alias="RadioComponentIcon.png">src/AutoPilotPlugins/PX4/Images/RadioComponentIcon.png</file>
-        <file alias="RCLoss.svg">src/AutoPilotPlugins/PX4/Images/RCLoss.svg</file>
-        <file alias="RCLossLight.svg">src/AutoPilotPlugins/PX4/Images/RCLossLight.svg</file>
-        <file alias="ReturnToHomeAltitude.svg">src/AutoPilotPlugins/PX4/Images/ReturnToHomeAltitude.svg</file>
-        <file alias="ReturnToHomeAltitudeCopter.svg">src/AutoPilotPlugins/PX4/Images/ReturnToHomeAltitudeCopter.svg</file>
-        <file alias="SafetyComponentIcon.png">src/AutoPilotPlugins/PX4/Images/SafetyComponentIcon.png</file>
-        <file alias="SensorsComponentIcon.png">src/AutoPilotPlugins/PX4/Images/SensorsComponentIcon.png</file>
-        <file alias="TuningComponentIcon.png">src/AutoPilotPlugins/PX4/Images/TuningComponentIcon.png</file>
-        <file alias="subMenuButtonImage.png">resources/CogWheels.png</file>
-        <file alias="VehicleDown.png">src/AutoPilotPlugins/PX4/Images/VehicleDown.png</file>
-        <file alias="VehicleDownRotate.png">src/AutoPilotPlugins/PX4/Images/VehicleDownRotate.png</file>
-        <file alias="VehicleLeft.png">src/AutoPilotPlugins/PX4/Images/VehicleLeft.png</file>
-        <file alias="VehicleLeftRotate.png">src/AutoPilotPlugins/PX4/Images/VehicleLeftRotate.png</file>
-        <file alias="VehicleNoseDown.png">src/AutoPilotPlugins/PX4/Images/VehicleNoseDown.png</file>
-        <file alias="VehicleNoseDownRotate.png">src/AutoPilotPlugins/PX4/Images/VehicleNoseDownRotate.png</file>
-        <file alias="VehicleRight.png">src/AutoPilotPlugins/PX4/Images/VehicleRight.png</file>
-        <file alias="VehicleRightRotate.png">src/AutoPilotPlugins/PX4/Images/VehicleRightRotate.png</file>
-        <file alias="VehicleSummaryIcon.png">src/VehicleSetup/VehicleSummaryIcon.png</file>
-        <file alias="VehicleTailDown.png">src/AutoPilotPlugins/PX4/Images/VehicleTailDown.png</file>
-        <file alias="VehicleTailDownRotate.png">src/AutoPilotPlugins/PX4/Images/VehicleTailDownRotate.png</file>
-        <file alias="VehicleUpsideDown.png">src/AutoPilotPlugins/PX4/Images/VehicleUpsideDown.png</file>
-        <file alias="VehicleUpsideDownRotate.png">src/AutoPilotPlugins/PX4/Images/VehicleUpsideDownRotate.png</file>
-        <file alias="attitudeDial.svg">src/FlightMap/Images/attitudeDial.svg</file>
-        <file alias="attitudeInstrument.svg">src/FlightMap/Images/attitudeInstrument.svg</file>
-        <file alias="attitudePointer.svg">src/FlightMap/Images/attitudePointer.svg</file>
-        <file alias="compassInstrumentArrow.svg">src/FlightMap/Images/compassInstrumentArrow.svg</file>
-        <file alias="compassInstrumentDial.svg">src/FlightMap/Images/compassInstrumentDial.svg</file>
-        <file alias="crossHair.svg">src/FlightMap/Images/crossHair.svg</file>
-        <file alias="PiP.svg">src/FlightMap/Images/PiP.svg</file>
-        <file alias="pipHide.svg">src/FlightMap/Images/pipHide.svg</file>
-        <file alias="pipResize.svg">src/FlightMap/Images/pipResize.svg</file>
-        <file alias="rollDialWhite.svg">src/FlightMap/Images/rollDialWhite.svg</file>
-        <file alias="rollPointerWhite.svg">src/FlightMap/Images/rollPointerWhite.svg</file>
-        <file alias="scale.png">src/FlightMap/Images/scale.png</file>
-        <file alias="scale_end.png">src/FlightMap/Images/scale_end.png</file>
-        <file alias="scaleLight.png">src/FlightMap/Images/scaleLight.png</file>
-        <file alias="scale_endLight.png">src/FlightMap/Images/scale_endLight.png</file>
-        <file alias="adsbVehicle.svg">src/FlightMap/Images/adsbVehicle.svg</file>
-        <file alias="vehicleArrowOutline.svg">src/FlightMap/Images/vehicleArrowOutline.svg</file>
-        <file alias="vehicleArrowOpaque.svg">src/FlightMap/Images/vehicleArrowOpaque.svg</file>
-        <file alias="ZoomPlus.svg">src/FlightMap/Images/ZoomPlus.svg</file>
-        <file alias="ZoomMinus.svg">src/FlightMap/Images/ZoomMinus.svg</file>
-        <file alias="Help.svg">src/FlightMap/Images/Help.svg</file>
-        <file alias="Home.svg">src/FlightMap/Images/Home.svg</file>
-        <file alias="HelpBlack.svg">src/FlightMap/Images/HelpBlack.svg</file>
-        <file alias="MapAddMission.svg">src/FlightMap/Images/MapAddMission.svg</file>
-        <file alias="MapAddMissionBlack.svg">src/FlightMap/Images/MapAddMissionBlack.svg</file>
-        <file alias="MapCenter.svg">src/FlightMap/Images/MapCenter.svg</file>
-        <file alias="MapCenterBlack.svg">src/FlightMap/Images/MapCenterBlack.svg</file>
-        <file alias="MapDrawShape.svg">src/FlightMap/Images/MapDrawShape.svg</file>
-        <file alias="MapHome.svg">src/FlightMap/Images/MapHome.svg</file>
-        <file alias="MapHomeBlack.svg">src/FlightMap/Images/MapHomeBlack.svg</file>
-        <file alias="MapSync.svg">src/FlightMap/Images/MapSync.svg</file>
-        <file alias="MapSyncBlack.svg">src/FlightMap/Images/MapSyncBlack.svg</file>
-        <file alias="MapSyncChanged.svg">src/FlightMap/Images/MapSyncChanged.svg</file>
-        <file alias="MapType.svg">src/FlightMap/Images/MapType.svg</file>
-        <file alias="MapTypeBlack.svg">src/FlightMap/Images/MapTypeBlack.svg</file>
-        <file alias="Armed.svg">src/ui/toolbar/Images/Armed.svg</file>
-        <file alias="Battery.svg">src/ui/toolbar/Images/Battery.svg</file>
-        <file alias="Connect.svg">src/ui/toolbar/Images/Connect.svg</file>
-        <file alias="Disarmed.svg">src/ui/toolbar/Images/Disarmed.svg</file>
-        <file alias="Disconnect.svg">src/ui/toolbar/Images/Disconnect.svg</file>
-        <file alias="Gears.svg">src/ui/toolbar/Images/Gears.svg</file>
-        <file alias="Analyze.svg">src/ui/toolbar/Images/Analyze.svg</file>
-        <file alias="Gps.svg">src/ui/toolbar/Images/Gps.svg</file>
-        <file alias="RTK.svg">src/ui/toolbar/Images/RTK.svg</file>
-        <file alias="Hamburger.svg">src/ui/toolbar/Images/Hamburger.svg</file>
-        <file alias="Megaphone.svg">src/ui/toolbar/Images/Megaphone.svg</file>
-        <file alias="PaperPlane.svg">src/ui/toolbar/Images/PaperPlane.svg</file>
-        <file alias="Plan.svg">src/ui/toolbar/Images/Plan.svg</file>
-        <file alias="Quad.svg">src/ui/toolbar/Images/Quad.svg</file>
-        <file alias="RC.svg">src/ui/toolbar/Images/RC.svg</file>
-        <file alias="Signal0.svg">src/ui/toolbar/Images/Signal0.svg</file>
-        <file alias="Signal20.svg">src/ui/toolbar/Images/Signal20.svg</file>
-        <file alias="Signal40.svg">src/ui/toolbar/Images/Signal40.svg</file>
-        <file alias="Signal60.svg">src/ui/toolbar/Images/Signal60.svg</file>
-        <file alias="Signal80.svg">src/ui/toolbar/Images/Signal80.svg</file>
-        <file alias="Signal100.svg">src/ui/toolbar/Images/Signal100.svg</file>
-        <file alias="TelemRSSI.svg">src/ui/toolbar/Images/TelemRSSI.svg</file>
-        <file alias="Yield.svg">src/ui/toolbar/Images/Yield.svg</file>
-        <file alias="CameraIcon.svg">src/ui/toolbar/Images/CameraIcon.svg</file>
-        <file alias="Joystick.png">src/ui/toolbar/Images/Joystick.png</file>
-        <file alias="CogWheel.svg">src/MissionManager/CogWheel.svg</file>
-        <file alias="StationMode.svg">src/AutoPilotPlugins/Common/Images/StationMode.svg</file>
-        <file alias="APMode.svg">src/AutoPilotPlugins/Common/Images/APMode.svg</file>
-        <file alias="ArrowDirection.svg">src/AutoPilotPlugins/Common/Images/ArrowDirection.svg</file>
-        <file alias="ArrowCW.svg">src/AutoPilotPlugins/Common/Images/ArrowCW.svg</file>
-        <file alias="ArrowCCW.svg">src/AutoPilotPlugins/Common/Images/ArrowCCW.svg</file>
-        <file alias="APM/BrandImage">src/FirmwarePlugin/APM/APMBrandImage.png</file>
-        <file alias="APM/BrandImageSub">src/FirmwarePlugin/APM/APMBrandImageSub.png</file>
-        <file alias="PX4/BrandImage">src/FirmwarePlugin/PX4/PX4BrandImage.png</file>
-        <file alias="subVehicleArrowOpaque.png">src/FlightMap/Images/sub.png</file>
-        <file alias="AlertAircraft.svg">src/FlightMap/Images/AlertAircraft.svg</file>
-        <file alias="AwarenessAircraft.svg">src/FlightMap/Images/AwarenessAircraft.svg</file>
-        <file alias="check.svg">resources/check.svg</file>
-        <file alias="no-logging.svg">src/AutoPilotPlugins/PX4/Images/no-logging.svg</file>
-        <file alias="no-logging-light.svg">src/AutoPilotPlugins/PX4/Images/no-logging-light.svg</file>
-    </qresource>
     <qresource prefix="/res">
         <file alias="action.svg">resources/action.svg</file>
         <file alias="AntennaRC">resources/Antenna_RC.svg</file>
@@ -239,64 +61,64 @@
         <file>resources/icons/qgroundcontrol.ico</file>
     </qresource>
     <qresource prefix="/res/firmware">
-        <file alias="px4.png">resources/firmware/px4.png</file>
-        <file alias="apm.png">resources/firmware/apm.png</file>
         <file alias="3drradio.png">resources/firmware/3drradio.png</file>
+        <file alias="apm.png">resources/firmware/apm.png</file>
+        <file alias="px4.png">resources/firmware/px4.png</file>
     </qresource>
     <qresource prefix="/res/mavs">
-        <file alias="Helicopter">resources/mavs/helicopter.svg</file>
-        <file alias="Unknown">resources/mavs/unknown.svg</file>
-        <file alias="FixedWing">resources/mavs/fixed-wing.svg</file>
-        <file alias="Groundstation">resources/mavs/groundstation.svg</file>
-        <file alias="Generic">resources/mavs/generic.svg</file>
-        <file alias="QuadRotor">resources/mavs/quadrotor.svg</file>
-        <file alias="Coaxial">resources/mavs/coaxial.svg</file>
         <file alias="Airship">resources/mavs/airship.svg</file>
         <file alias="AntennaTracker">resources/mavs/antenna-tracker.svg</file>
+        <file alias="Coaxial">resources/mavs/coaxial.svg</file>
+        <file alias="FixedWing">resources/mavs/fixed-wing.svg</file>
         <file alias="FlappingWing">resources/mavs/flapping-wing.svg</file>
         <file alias="FreeBallon">resources/mavs/free-balloon.svg</file>
+        <file alias="Generic">resources/mavs/generic.svg</file>
         <file alias="GroundRover">resources/mavs/ground-rover.svg</file>
+        <file alias="Groundstation">resources/mavs/groundstation.svg</file>
+        <file alias="Helicopter">resources/mavs/helicopter.svg</file>
         <file alias="HexaRotor">resources/mavs/hexarotor.svg</file>
         <file alias="Kite">resources/mavs/kite.svg</file>
         <file alias="OctoRotor">resources/mavs/octorotor.svg</file>
+        <file alias="QuadRotor">resources/mavs/quadrotor.svg</file>
         <file alias="Rocket">resources/mavs/rocket.svg</file>
         <file alias="Submarine">resources/mavs/submarine.svg</file>
         <file alias="SurfaceBoat">resources/mavs/surface-boat.svg</file>
         <file alias="TriCopter">resources/mavs/tricopter.svg</file>
+        <file alias="Unknown">resources/mavs/unknown.svg</file>
     </qresource>
     <qresource prefix="/res/calibration">
         <file alias="accel_back.png">resources/calibration/accel_back.png</file>
+        <file alias="accel_down.png">resources/calibration/accel_down.png</file>
         <file alias="accel_front.png">resources/calibration/accel_front.png</file>
+        <file alias="accel_left.png">resources/calibration/accel_left.png</file>
         <file alias="accel_right.png">resources/calibration/accel_right.png</file>
-        <file alias="accel_down.png">resources/calibration/accel_down.png</file>
         <file alias="accel_up.png">resources/calibration/accel_up.png</file>
-        <file alias="accel_left.png">resources/calibration/accel_left.png</file>
     </qresource>
     <qresource prefix="/qml/calibration/mode1">
         <file alias="radioCenter.png">resources/calibration/mode1/radioCenter.png</file>
         <file alias="radioHome.png">resources/calibration/mode1/radioHome.png</file>
+        <file alias="radioPitchDown.png">resources/calibration/mode1/radioPitchDown.png</file>
+        <file alias="radioPitchUp.png">resources/calibration/mode1/radioPitchUp.png</file>
         <file alias="radioRollLeft.png">resources/calibration/mode1/radioRollLeft.png</file>
         <file alias="radioRollRight.png">resources/calibration/mode1/radioRollRight.png</file>
-        <file alias="radioPitchUp.png">resources/calibration/mode1/radioPitchUp.png</file>
-        <file alias="radioPitchDown.png">resources/calibration/mode1/radioPitchDown.png</file>
+        <file alias="radioSwitchMinMax.png">resources/calibration/mode1/radioSwitchMinMax.png</file>
+        <file alias="radioThrottleDown.png">resources/calibration/mode1/radioThrottleDown.png</file>
+        <file alias="radioThrottleUp.png">resources/calibration/mode1/radioThrottleUp.png</file>
         <file alias="radioYawLeft.png">resources/calibration/mode1/radioYawLeft.png</file>
         <file alias="radioYawRight.png">resources/calibration/mode1/radioYawRight.png</file>
-        <file alias="radioThrottleUp.png">resources/calibration/mode1/radioThrottleUp.png</file>
-        <file alias="radioThrottleDown.png">resources/calibration/mode1/radioThrottleDown.png</file>
-        <file alias="radioSwitchMinMax.png">resources/calibration/mode1/radioSwitchMinMax.png</file>
     </qresource>
     <qresource prefix="/qml/calibration/mode2">
         <file alias="radioCenter.png">resources/calibration/mode2/radioCenter.png</file>
         <file alias="radioHome.png">resources/calibration/mode2/radioHome.png</file>
+        <file alias="radioPitchDown.png">resources/calibration/mode2/radioPitchDown.png</file>
+        <file alias="radioPitchUp.png">resources/calibration/mode2/radioPitchUp.png</file>
         <file alias="radioRollLeft.png">resources/calibration/mode2/radioRollLeft.png</file>
         <file alias="radioRollRight.png">resources/calibration/mode2/radioRollRight.png</file>
-        <file alias="radioPitchUp.png">resources/calibration/mode2/radioPitchUp.png</file>
-        <file alias="radioPitchDown.png">resources/calibration/mode2/radioPitchDown.png</file>
+        <file alias="radioSwitchMinMax.png">resources/calibration/mode2/radioSwitchMinMax.png</file>
+        <file alias="radioThrottleDown.png">resources/calibration/mode2/radioThrottleDown.png</file>
+        <file alias="radioThrottleUp.png">resources/calibration/mode2/radioThrottleUp.png</file>
         <file alias="radioYawLeft.png">resources/calibration/mode2/radioYawLeft.png</file>
         <file alias="radioYawRight.png">resources/calibration/mode2/radioYawRight.png</file>
-        <file alias="radioThrottleUp.png">resources/calibration/mode2/radioThrottleUp.png</file>
-        <file alias="radioThrottleDown.png">resources/calibration/mode2/radioThrottleDown.png</file>
-        <file alias="radioSwitchMinMax.png">resources/calibration/mode2/radioSwitchMinMax.png</file>
     </qresource>
     <qresource prefix="/db/mapping/joystick">
         <file alias="gamecontrollerdb.txt">resources/SDL_GameControllerDB/gamecontrollerdb.txt</file>
diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro
index 150e309..0243230 100644
--- a/qgroundcontrol.pro
+++ b/qgroundcontrol.pro
@@ -306,13 +306,20 @@ CustomBuild {
     } else {
         RESOURCES += $$PWD/qgcresources.qrc
     }
+    exists($$PWD/custom/qgcimages.qrc) {
+        message("Using custom qgcimages.qrc")
+        RESOURCES += $$PWD/custom/qgcimages.qrc
+    } else {
+        RESOURCES += $$PWD/qgcimages.qrc
+    }
 } else {
     DEFINES += QGC_APPLICATION_NAME=\"\\\"QGroundControl\\\"\"
     DEFINES += QGC_ORG_NAME=\"\\\"QGroundControl.org\\\"\"
     DEFINES += QGC_ORG_DOMAIN=\"\\\"org.qgroundcontrol\\\"\"
     RESOURCES += \
         $$PWD/qgroundcontrol.qrc \
-        $$PWD/qgcresources.qrc
+        $$PWD/qgcresources.qrc \
+        $$PWD/qgcimages.qrc
 }
 
 # On Qt 5.9 android versions there is the following bug: https://bugreports.qt.io/browse/QTBUG-61424