diff --git a/custom-example/custom.qrc b/custom-example/custom.qrc
index 08de536f4c3729b2b70885b89c3e3838650edc1f..1c8f6a95fc1ee24f5fc130ead469df7d36061f80 100644
--- a/custom-example/custom.qrc
+++ b/custom-example/custom.qrc
@@ -10,6 +10,7 @@
         <file alias="CustomModeIndicator.qml">res/MainToolbar/CustomModeIndicator.qml</file>
         <file alias="CustomMultiVehicleSelector.qml">res/MainToolbar/CustomMultiVehicleSelector.qml</file>
         <file alias="CustomRCRSSIIndicator.qml">res/MainToolbar/CustomRCRSSIIndicator.qml</file>
+        <file alias="PairingIndicator.qml">res/PairingIndicator.qml</file>
         <file alias="PreFlightCheckList.qml">res/PreFlightCheckList.qml</file>
     </qresource>
     <qresource prefix="custom/img">
@@ -25,12 +26,16 @@
         <file alias="compass_pointer.svg">res/Images/compass_pointer.svg</file>
         <file alias="distance.svg">res/Images/distance.svg</file>
         <file alias="gimbal_icon.svg">res/Images/gimbal_icon.svg</file>
-        <file alias="gimbal_position.svg">res/Images/gimbal_position.svg</file>
         <file alias="gimbal_pitch_indoors.svg">res/Images/gimbal_pitch_indoors.svg</file>
         <file alias="gimbal_pitch_outdoors.svg">res/Images/gimbal_pitch_outdoors.svg</file>
+        <file alias="gimbal_position.svg">res/Images/gimbal_position.svg</file>
         <file alias="horizontal_speed.svg">res/Images/horizontal_speed.svg</file>
         <file alias="microSD.svg">res/Images/microSD.svg</file>
         <file alias="odometer.svg">res/Images/odometer.svg</file>
+        <file alias="PairingButton.svg">res/Images/PairingButton.svg</file>
+        <file alias="PairingConnected.svg">res/Images/PairingConnected.svg</file>
+        <file alias="PairingError.svg">res/Images/PairingError.svg</file>
+        <file alias="PairingIcon.svg">res/Images/PairingIcon.svg</file>
         <file alias="thermal-brightness.svg">res/Images/thermal-brightness.svg</file>
         <file alias="thermal-palette.svg">res/Images/thermal-palette.svg</file>
         <file alias="thermal-pip.svg">res/Images/thermal-pip.svg</file>
diff --git a/src/PairingManager/Images/PairingButton.svg b/custom-example/res/Images/PairingButton.svg
similarity index 100%
rename from src/PairingManager/Images/PairingButton.svg
rename to custom-example/res/Images/PairingButton.svg
diff --git a/src/PairingManager/Images/PairingConnected.svg b/custom-example/res/Images/PairingConnected.svg
similarity index 100%
rename from src/PairingManager/Images/PairingConnected.svg
rename to custom-example/res/Images/PairingConnected.svg
diff --git a/src/PairingManager/Images/PairingError.svg b/custom-example/res/Images/PairingError.svg
similarity index 100%
rename from src/PairingManager/Images/PairingError.svg
rename to custom-example/res/Images/PairingError.svg
diff --git a/src/PairingManager/Images/PairingIcon.svg b/custom-example/res/Images/PairingIcon.svg
similarity index 100%
rename from src/PairingManager/Images/PairingIcon.svg
rename to custom-example/res/Images/PairingIcon.svg
diff --git a/src/PairingManager/Images/PairingIconLight.svg b/custom-example/res/Images/PairingIconLight.svg
similarity index 100%
rename from src/PairingManager/Images/PairingIconLight.svg
rename to custom-example/res/Images/PairingIconLight.svg
diff --git a/custom-example/res/MainToolbar/CustomMainToolBarIndicators.qml b/custom-example/res/MainToolbar/CustomMainToolBarIndicators.qml
index 858bb85bb8d6737bf940f79fde16f57af34530e8..a86c52d589dc05a8e7afd38476f8b0f02372eff3 100644
--- a/custom-example/res/MainToolbar/CustomMainToolBarIndicators.qml
+++ b/custom-example/res/MainToolbar/CustomMainToolBarIndicators.qml
@@ -87,7 +87,7 @@ Item {
             anchors.top:            parent.top
             anchors.bottom:         parent.bottom
             anchors.margins:        _indicatorMargins
-            source:                 "/toolbar/PairingIndicator.qml"
+            source:                 "/custom/PairingIndicator.qml"
         }
     }
     //-------------------------------------------------------------------------
diff --git a/src/ui/toolbar/PairingIndicator.qml b/custom-example/res/PairingIndicator.qml
similarity index 98%
rename from src/ui/toolbar/PairingIndicator.qml
rename to custom-example/res/PairingIndicator.qml
index b1006bd489985367538e72c971cefed28377007d..e003dc072e5092c74f787cdd71444663297a5bfe 100644
--- a/src/ui/toolbar/PairingIndicator.qml
+++ b/custom-example/res/PairingIndicator.qml
@@ -66,7 +66,7 @@ Item {
             height:             parent.height
             width:              height
             color:              qgcPal.text
-            source:             "/qmlimages/PairingIcon.svg"
+            source:             "/custom/img/PairingIcon.svg"
             sourceSize.width:   width
             fillMode:           Image.PreserveAspectFit
             smooth:             true
@@ -138,7 +138,7 @@ Item {
                 QGCColoredImage {
                     height:             ScreenTools.defaultFontPixelHeight * 6
                     width:              height
-                    source:             "/qmlimages/PairingButton.svg"
+                    source:             "/custom/img/PairingButton.svg"
                     sourceSize.height:  height
                     fillMode:           Image.PreserveAspectFit
                     mipmap:             true
@@ -306,7 +306,7 @@ Item {
                 Image {
                     height:             ScreenTools.defaultFontPixelHeight * 4
                     width:              height
-                    source:             "/qmlimages/PairingError.svg"
+                    source:             "/custom/img/PairingError.svg"
                     sourceSize.height:  height
                     fillMode:           Image.PreserveAspectFit
                     mipmap:             true
@@ -319,7 +319,7 @@ Item {
                     id:                 connectedIndicator
                     height:             width * 0.2
                     width:              _contentWidth
-                    source:             "/qmlimages/PairingConnected.svg"
+                    source:             "/custom/img/PairingConnected.svg"
                     sourceSize.height:  height
                     fillMode:           Image.PreserveAspectFit
                     mipmap:             true
diff --git a/custom-example/src/FirmwarePlugin/CustomFirmwarePlugin.cc b/custom-example/src/FirmwarePlugin/CustomFirmwarePlugin.cc
index 420c72a5d1b32afc9a985534cf17ac416d84eef3..a460de252f4aacf49c5aeeeae212bc89de7d17a9 100644
--- a/custom-example/src/FirmwarePlugin/CustomFirmwarePlugin.cc
+++ b/custom-example/src/FirmwarePlugin/CustomFirmwarePlugin.cc
@@ -56,7 +56,7 @@ CustomFirmwarePlugin::toolBarIndicators(const Vehicle* vehicle)
     Q_UNUSED(vehicle);
     if(_toolBarIndicatorList.size() == 0) {
 #if defined(QGC_ENABLE_PAIRING)
-        _toolBarIndicatorList.append(QVariant::fromValue(QUrl::fromUserInput("qrc:/toolbar/PairingIndicator.qml")));
+        _toolBarIndicatorList.append(QVariant::fromValue(QUrl::fromUserInput("qrc:/custom/PairingIndicator.qml")));
 #endif
         _toolBarIndicatorList.append(QVariant::fromValue(QUrl::fromUserInput("qrc:/toolbar/GPSIndicator.qml")));
         _toolBarIndicatorList.append(QVariant::fromValue(QUrl::fromUserInput("qrc:/toolbar/TelemetryRSSIIndicator.qml")));
diff --git a/qgcimages.qrc b/qgcimages.qrc
index 8d12d67fadd289b59f594b0e82c1f4c19acbb047..e025d9c09b730e59d24846e64480bce57053d876 100644
--- a/qgcimages.qrc
+++ b/qgcimages.qrc
@@ -121,10 +121,6 @@
         <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="ObjectAvoidance.svg">src/AutoPilotPlugins/PX4/Images/ObjectAvoidance.svg</file>
-        <file alias="PairingButton.svg">src/PairingManager/Images/PairingButton.svg</file>
-        <file alias="PairingConnected.svg">src/PairingManager/Images/PairingConnected.svg</file>
-        <file alias="PairingError.svg">src/PairingManager/Images/PairingError.svg</file>
-        <file alias="PairingIcon.svg">src/PairingManager/Images/PairingIcon.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>
diff --git a/qgroundcontrol.qrc b/qgroundcontrol.qrc
index b1bc3f5855dc8cb7a61cd35d948cbfd8561461bf..148e3fa81f0656f24069cc7b43b58aa672f4e2fa 100644
--- a/qgroundcontrol.qrc
+++ b/qgroundcontrol.qrc
@@ -14,7 +14,6 @@
         <file alias="MessageIndicator.qml">src/ui/toolbar/MessageIndicator.qml</file>
         <file alias="ModeIndicator.qml">src/ui/toolbar/ModeIndicator.qml</file>
         <file alias="MultiVehicleSelector.qml">src/ui/toolbar/MultiVehicleSelector.qml</file>
-        <file alias="PairingIndicator.qml">src/ui/toolbar/PairingIndicator.qml</file>
         <file alias="RCRSSIIndicator.qml">src/ui/toolbar/RCRSSIIndicator.qml</file>
         <file alias="TelemetryRSSIIndicator.qml">src/ui/toolbar/TelemetryRSSIIndicator.qml</file>
         <file alias="VTOLModeIndicator.qml">src/ui/toolbar/VTOLModeIndicator.qml</file>