diff --git a/qgcimages.qrc b/qgcimages.qrc
index 75fbb02..317c55a 100644
--- a/qgcimages.qrc
+++ b/qgcimages.qrc
@@ -125,6 +125,10 @@
src/AutoPilotPlugins/PX4/Images/no-logging.svg
src/AutoPilotPlugins/PX4/Images/ObjectAvoidance.svg
src/ui/toolbar/Images/PaperPlane.svg
+ resources/PatternCamera.png
+ resources/PatternGrid.png
+ resources/PatternPresets.png
+ resources/PatternTerrain.png
src/FlightMap/Images/PiP.svg
src/FlightMap/Images/pipHide.svg
src/FlightMap/Images/pipResize.svg
diff --git a/qgroundcontrol.qrc b/qgroundcontrol.qrc
index 35ab7cf..978507c 100644
--- a/qgroundcontrol.qrc
+++ b/qgroundcontrol.qrc
@@ -181,6 +181,8 @@
src/PlanView/TakeoffItemMapVisual.qml
src/QmlControls/ToolStrip.qml
src/PlanView/TransectStyleComplexItemStats.qml
+ src/PlanView/TransectStyleComplexItemTabBar.qml
+ src/PlanView/TransectStyleComplexItemTerrainFollow.qml
src/QmlControls/VehicleRotationCal.qml
src/QmlControls/VehicleSummaryRow.qml
src/QmlControls/VerticalFactValueGrid.qml
diff --git a/resources/PatternCamera.png b/resources/PatternCamera.png
new file mode 100644
index 0000000..cc784b2
Binary files /dev/null and b/resources/PatternCamera.png differ
diff --git a/resources/PatternGrid.png b/resources/PatternGrid.png
new file mode 100644
index 0000000..736c896
Binary files /dev/null and b/resources/PatternGrid.png differ
diff --git a/resources/PatternPresets.png b/resources/PatternPresets.png
new file mode 100644
index 0000000..059b586
Binary files /dev/null and b/resources/PatternPresets.png differ
diff --git a/resources/PatternTerrain.png b/resources/PatternTerrain.png
new file mode 100644
index 0000000..ad75eaf
Binary files /dev/null and b/resources/PatternTerrain.png differ
diff --git a/src/PlanView/TransectStyleComplexItemTabBar.qml b/src/PlanView/TransectStyleComplexItemTabBar.qml
new file mode 100644
index 0000000..597ec96
--- /dev/null
+++ b/src/PlanView/TransectStyleComplexItemTabBar.qml
@@ -0,0 +1,18 @@
+import QtQuick 2.3
+
+import QGroundControl 1.0
+import QGroundControl.ScreenTools 1.0
+import QGroundControl.Controls 1.0
+
+QGCTabBar {
+ id: tabBar
+ anchors.left: parent.left
+ anchors.right: parent.right
+
+ Component.onCompleted: currentIndex = QGroundControl.settingsManager.planViewSettings.displayPresetsTabFirst.rawValue ? 2 : 0
+
+ QGCTabButton { icon.source: "/qmlimages/PatternGrid.png"; icon.height: ScreenTools.defaultFontPixelHeight }
+ QGCTabButton { icon.source: "/qmlimages/PatternCamera.png"; icon.height: ScreenTools.defaultFontPixelHeight }
+ QGCTabButton { icon.source: "/qmlimages/PatternTerrain.png"; icon.height: ScreenTools.defaultFontPixelHeight }
+ QGCTabButton { icon.source: "/qmlimages/PatternPresets.png"; icon.height: ScreenTools.defaultFontPixelHeight }
+}