diff --git a/src/MissionManager/CorridorScanPlanCreator.cc b/src/MissionManager/CorridorScanPlanCreator.cc
index c52ba079324fbc67ebeefbb17426a280910405d0..4ca876a93b56160287e358a409e24e7392bab01c 100644
--- a/src/MissionManager/CorridorScanPlanCreator.cc
+++ b/src/MissionManager/CorridorScanPlanCreator.cc
@@ -21,7 +21,7 @@ CorridorScanPlanCreator::CorridorScanPlanCreator(PlanMasterController* planMaste
 void CorridorScanPlanCreator::createPlan(const QGeoCoordinate& mapCenterCoord)
 {
     _planMasterController->removeAll();
-    VisualMissionItem* takeoffItem = _missionController->insertSimpleMissionItem(mapCenterCoord, -1);
+    VisualMissionItem* takeoffItem = _missionController->insertTakeoffItem(mapCenterCoord, -1);
     takeoffItem->setWizardMode(true);
     _missionController->insertComplexMissionItem(MissionController::patternCorridorScanName, mapCenterCoord, -1)->setWizardMode(true);
     if (_planMasterController->managerVehicle()->fixedWing()) {
diff --git a/src/MissionManager/StructureScanPlanCreator.cc b/src/MissionManager/StructureScanPlanCreator.cc
index 5f1b09eaceaa56c760dcdca91f40926882867198..566de61955576c5f74facb16eddbbfecbae6e9bb 100644
--- a/src/MissionManager/StructureScanPlanCreator.cc
+++ b/src/MissionManager/StructureScanPlanCreator.cc
@@ -21,7 +21,7 @@ StructureScanPlanCreator::StructureScanPlanCreator(PlanMasterController* planMas
 void StructureScanPlanCreator::createPlan(const QGeoCoordinate& mapCenterCoord)
 {
     _planMasterController->removeAll();
-    VisualMissionItem* takeoffItem = _missionController->insertSimpleMissionItem(mapCenterCoord, -1);
+    VisualMissionItem* takeoffItem = _missionController->insertTakeoffItem(mapCenterCoord, -1);
     takeoffItem->setWizardMode(true);
     _missionController->insertComplexMissionItem(MissionController::patternStructureScanName, mapCenterCoord, -1)->setWizardMode(true);
     if (_planMasterController->managerVehicle()->fixedWing()) {
diff --git a/src/MissionManager/SurveyPlanCreator.cc b/src/MissionManager/SurveyPlanCreator.cc
index e2715aeea49ecb98c22786c86141be6e605947ea..872fc75ec6d2d9b68fe49e8f193ad48e294e8721 100644
--- a/src/MissionManager/SurveyPlanCreator.cc
+++ b/src/MissionManager/SurveyPlanCreator.cc
@@ -22,7 +22,7 @@ SurveyPlanCreator::SurveyPlanCreator(PlanMasterController* planMasterController,
 void SurveyPlanCreator::createPlan(const QGeoCoordinate& mapCenterCoord)
 {
     _planMasterController->removeAll();
-    VisualMissionItem* takeoffItem = _missionController->insertSimpleMissionItem(mapCenterCoord, -1);
+    VisualMissionItem* takeoffItem = _missionController->insertTakeoffItem(mapCenterCoord, -1);
     takeoffItem->setWizardMode(true);
     _missionController->insertComplexMissionItem(MissionController::patternSurveyName, mapCenterCoord, -1)->setWizardMode(true);
     if (_planMasterController->managerVehicle()->fixedWing()) {
diff --git a/src/PlanView/MissionItemEditor.qml b/src/PlanView/MissionItemEditor.qml
index 3c43cde6d97016a57438bb444b9dea794ee5afaa..ac8f8345b35f089f2a7f8fe321900cb76f0d44fb 100644
--- a/src/PlanView/MissionItemEditor.qml
+++ b/src/PlanView/MissionItemEditor.qml
@@ -221,14 +221,13 @@ Rectangle {
             QGCLabel { text: missionItem.commandName }
 
             QGCColoredImage {
-                height:             ScreenTools.implicitComboBoxHeight - (ScreenTools.comboBoxPadding * 2)
+                height:             ScreenTools.defaultFontPixelWidth
                 width:              height
-                sourceSize.height:  height
                 fillMode:           Image.PreserveAspectFit
                 smooth:             true
                 antialiasing:       true
                 color:              qgcPal.text
-                source:             "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/double-arrow.png"
+                source:             "/qmlimages/arrow-down.png"
             }
         }
 
@@ -252,7 +251,7 @@ Rectangle {
         id:                     commandLabel
         anchors.leftMargin:     ScreenTools.comboBoxPadding
         anchors.fill:           commandPicker
-        visible:                (!missionItem.isCurrentItem || !missionItem.isSimpleItem || _waypointsOnlyMode) && !missionItem.isTakeoffItem
+        visible:                !missionItem.isCurrentItem || !missionItem.isSimpleItem || _waypointsOnlyMode || missionItem.isTakeoffItem
         verticalAlignment:      Text.AlignVCenter
         text:                   missionItem.commandName
         color:                  _outerTextColor
diff --git a/src/PlanView/PlanView.qml b/src/PlanView/PlanView.qml
index 71aa7b06975c213e17714663a1dfaaf9aa13a04e..5d9e5912d5afc06819cc432ef8486a9eb8514c08 100644
--- a/src/PlanView/PlanView.qml
+++ b/src/PlanView/PlanView.qml
@@ -533,6 +533,7 @@ Item {
                 anchorPoint.x:  sourceItem.width / 2
                 anchorPoint.y:  sourceItem.height / 2
                 z:              QGroundControl.zOrderWaypointLines + 1
+                visible:        _editingLayer == _layerMission
 
                 sourceItem: SplitIndicator {
                     onClicked:  insertSimpleMissionItem(splitSegmentItem.coordinate, _missionController.visualItemIndexFromSequenceNumber(_missionController.currentPlanViewIndex))