diff --git a/qgcimages.qrc b/qgcimages.qrc
index 75fbb02ee30de6ed5aef11a8d327343e8a075e99..317c55a459c9b7e9e612cf48b801b547b5e716c0 100644
--- a/qgcimages.qrc
+++ b/qgcimages.qrc
@@ -125,6 +125,10 @@
         <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="PaperPlane.svg">src/ui/toolbar/Images/PaperPlane.svg</file>
+        <file alias="PatternCamera.png">resources/PatternCamera.png</file>
+        <file alias="PatternGrid.png">resources/PatternGrid.png</file>
+        <file alias="PatternPresets.png">resources/PatternPresets.png</file>
+        <file alias="PatternTerrain.png">resources/PatternTerrain.png</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>
diff --git a/qgroundcontrol.qrc b/qgroundcontrol.qrc
index 35ab7cff07b8db2d0ce60959ccf970150e2fdabb..978507ce503d4f7e99051901f2499111854544cb 100644
--- a/qgroundcontrol.qrc
+++ b/qgroundcontrol.qrc
@@ -181,6 +181,8 @@
         <file alias="QGroundControl/Controls/TakeoffItemMapVisual.qml">src/PlanView/TakeoffItemMapVisual.qml</file>
         <file alias="QGroundControl/Controls/ToolStrip.qml">src/QmlControls/ToolStrip.qml</file>
         <file alias="QGroundControl/Controls/TransectStyleComplexItemStats.qml">src/PlanView/TransectStyleComplexItemStats.qml</file>
+        <file alias="QGroundControl/Controls/TransectStyleComplexItemTabBar.qml">src/PlanView/TransectStyleComplexItemTabBar.qml</file>
+        <file alias="QGroundControl/Controls/TransectStyleComplexItemTerrainFollow.qml">src/PlanView/TransectStyleComplexItemTerrainFollow.qml</file>
         <file alias="QGroundControl/Controls/VehicleRotationCal.qml">src/QmlControls/VehicleRotationCal.qml</file>
         <file alias="QGroundControl/Controls/VehicleSummaryRow.qml">src/QmlControls/VehicleSummaryRow.qml</file>
         <file alias="QGroundControl/Controls/VerticalFactValueGrid.qml">src/QmlControls/VerticalFactValueGrid.qml</file>
diff --git a/resources/PatternCamera.png b/resources/PatternCamera.png
new file mode 100644
index 0000000000000000000000000000000000000000..cc784b2e028b0e6ebf13c1679c807672fa1fca15
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 0000000000000000000000000000000000000000..736c89627e521363218f816bfff27d6e375b86c7
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 0000000000000000000000000000000000000000..059b5868af30b75b18a3d3d0503d1a5e02c0fe67
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 0000000000000000000000000000000000000000..ad75eafa16e738c38811dc9eb7ce130308300c54
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 0000000000000000000000000000000000000000..597ec9657c4d451cfabfb42bac41109d55a0696e
--- /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 }
+}