diff --git a/qgroundcontrol.qrc b/qgroundcontrol.qrc
index 512e9dcd004d2d32f93c3e92d16d781057735e42..53dad4533bfcdc8d2ddc4efefd749939353227ca 100644
--- a/qgroundcontrol.qrc
+++ b/qgroundcontrol.qrc
@@ -143,6 +143,7 @@
src/FlightMap/Widgets/QGCPitchIndicator.qml
src/FlightMap/QGCVideoBackground.qml
src/FlightMap/qmldir
+ src/FlightMap/Widgets/CameraWidget.qml
src/FlightMap/Widgets/ValuesWidget.qml
src/FlightMap/Widgets/VehicleHealthWidget.qml
src/FlightMap/MapItems/VehicleMapItem.qml
diff --git a/src/FlightMap/Widgets/CameraWidget.qml b/src/FlightMap/Widgets/CameraWidget.qml
new file mode 100644
index 0000000000000000000000000000000000000000..8e0ec95ce15a6ef7cfff29826b81e17cb4341eed
--- /dev/null
+++ b/src/FlightMap/Widgets/CameraWidget.qml
@@ -0,0 +1,54 @@
+/****************************************************************************
+ *
+ * (c) 2009-2016 QGROUNDCONTROL PROJECT
+ *
+ * QGroundControl is licensed according to the terms in the file
+ * COPYING.md in the root of the source code directory.
+ *
+ ****************************************************************************/
+
+import QtQuick 2.4
+import QtQuick.Layouts 1.2
+
+import QGroundControl 1.0
+import QGroundControl.Controls 1.0
+import QGroundControl.ScreenTools 1.0
+
+/// Camera controls used in InstrumentSwipeView
+QGCFlickable {
+ id: _root
+ height: Math.min(maxHeight, column.height)
+ contentHeight: column.height
+ flickableDirection: Flickable.VerticalFlick
+ clip: true
+
+ property var qgcView
+ property color textColor
+ property var maxHeight
+
+ property var _activeVehicle: QGroundControl.multiVehicleManager.activeVehicle
+
+ MouseArea {
+ anchors.fill: parent
+ onClicked: showNextPage()
+ }
+
+ Column {
+ id: column
+ width: parent.width
+ spacing: ScreenTools.defaultFontPixelHeight
+
+ QGCLabel {
+ anchors.horizontalCenter: parent.horizontalCenter
+ color: textColor
+ text: qsTr("Camera Controls")
+ }
+
+ QGCButton {
+ anchors.horizontalCenter: parent.horizontalCenter
+ text: qsTr("Trigger Camera")
+ onClicked: _activeVehicle.triggerCamera()
+ enabled: _activeVehicle
+ }
+ }
+}
diff --git a/src/FlightMap/qmldir b/src/FlightMap/qmldir
index 84cdd15c37a80593e0e4d740a7644492051f6948..8d6f8ededb2ef4047b93d5ec908e6b1f06bb2673 100644
--- a/src/FlightMap/qmldir
+++ b/src/FlightMap/qmldir
@@ -5,20 +5,21 @@ FlightMap 1.0 FlightMap.qml
QGCVideoBackground 1.0 QGCVideoBackground.qml
# Widgets
-CenterMapDropButton 1.0 CenterMapDropButton.qml
-CenterMapDropPanel 1.0 CenterMapDropPanel.qml
-InstrumentSwipeView 1.0 InstrumentSwipeView.qml
-MapFitFunctions 1.0 MapFitFunctions.qml
-MapScale 1.0 MapScale.qml
-QGCArtificialHorizon 1.0 QGCArtificialHorizon.qml
-QGCAttitudeHUD 1.0 QGCAttitudeHUD.qml
-QGCAttitudeWidget 1.0 QGCAttitudeWidget.qml
-QGCCompassWidget 1.0 QGCCompassWidget.qml
-QGCPitchIndicator 1.0 QGCPitchIndicator.qml
-QGCSlider 1.0 QGCSlider.qml
-ValuesWidget 1.0 ValuesWidget.qml
-VehicleHealthWidget 1.0 VehicleHealthWidget.qml
-VibrationWidget 1.0 VibrationWidget.qml
+CameraWidget 1.0 CameraWidget.qml
+CenterMapDropButton 1.0 CenterMapDropButton.qml
+CenterMapDropPanel 1.0 CenterMapDropPanel.qml
+InstrumentSwipeView 1.0 InstrumentSwipeView.qml
+MapFitFunctions 1.0 MapFitFunctions.qml
+MapScale 1.0 MapScale.qml
+QGCArtificialHorizon 1.0 QGCArtificialHorizon.qml
+QGCAttitudeHUD 1.0 QGCAttitudeHUD.qml
+QGCAttitudeWidget 1.0 QGCAttitudeWidget.qml
+QGCCompassWidget 1.0 QGCCompassWidget.qml
+QGCPitchIndicator 1.0 QGCPitchIndicator.qml
+QGCSlider 1.0 QGCSlider.qml
+ValuesWidget 1.0 ValuesWidget.qml
+VehicleHealthWidget 1.0 VehicleHealthWidget.qml
+VibrationWidget 1.0 VibrationWidget.qml
# Map items
MissionItemIndicator 1.0 MissionItemIndicator.qml