diff --git a/qgcresources.qrc b/qgcresources.qrc
index 24aba6af8e02680c712ff63ca693ec4aedefa59e..a334c0e8e1ba8f1d3baf9b71e365ca50b1d7e92e 100644
--- a/qgcresources.qrc
+++ b/qgcresources.qrc
@@ -57,7 +57,7 @@
         <file alias="Airframe/HelicopterCoaxial">src/AutoPilotPlugins/Common/Images/HelicopterCoaxial.svg</file>
         <file alias="wifi.svg">src/AutoPilotPlugins/Common/Images/wifi.svg</file>
         <file alias="arrow-down.png">src/QmlControls/arrow-down.png</file>
-		<file alias="camera.svg">resources/camera.svg</file>
+        <file alias="camera.svg">resources/camera.svg</file>
         <file alias="camera_photo.svg">src/Camera/images/camera_photo.svg</file>
         <file alias="camera_video.svg">src/Camera/images/camera_video.svg</file>
         <file alias="checkbox-check.svg">src/QmlControls/checkbox-check.svg</file>
@@ -186,6 +186,8 @@
         <file alias="AlertAircraft.svg">src/FlightMap/Images/AlertAircraft.svg</file>
         <file alias="AwarenessAircraft.svg">src/FlightMap/Images/AwarenessAircraft.svg</file>
         <file alias="check.svg">resources/check.svg</file>
+        <file alias="Target.svg">src/FlightMap/Images/Target.svg</file>
+        <file alias="TargetBlack.svg">src/FlightMap/Images/TargetBlack.svg</file>
     </qresource>
     <qresource prefix="/res">
         <file alias="action.svg">resources/action.svg</file>
@@ -200,7 +202,7 @@
         <file alias="counter-clockwise-arrow.svg">resources/counter-clockwise-arrow.svg</file>
         <file alias="chevron-down.svg">resources/chevron-down.svg</file>
         <file alias="chevron-up.svg">resources/chevron-up.svg</file>
-		<file alias="DropArrow.svg">resources/DropArrow.svg</file>
+        <file alias="DropArrow.svg">resources/DropArrow.svg</file>
         <file alias="gear-black.svg">resources/gear-black.svg</file>
         <file alias="gear-white.svg">resources/gear-white.svg</file>
         <file alias="helicoptericon.svg">resources/helicoptericon.svg</file>
@@ -213,7 +215,7 @@
         <file alias="Play">resources/Play.svg</file>
         <file alias="PowerButton">resources/PowerButton.svg</file>
         <file alias="QGCLogoBlack">resources/QGCLogoBlack.svg</file>
-		<file alias="QGCLogoFull">resources/QGCLogoFull.svg</file>
+        <file alias="QGCLogoFull">resources/QGCLogoFull.svg</file>
         <file alias="QGCLogoWhite">resources/QGCLogoWhite.svg</file>
         <file alias="QGCLogoArrow">resources/QGCLogoArrow.svg</file>
         <file alias="QGroundControlConnect">resources/QGroundControlConnect.svg</file>
diff --git a/src/FlightMap/Images/Target.svg b/src/FlightMap/Images/Target.svg
new file mode 100644
index 0000000000000000000000000000000000000000..049e39fd04ee992b86185130644a60d0728a02bc
--- /dev/null
+++ b/src/FlightMap/Images/Target.svg
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.2" width="229.47mm" height="229.47mm" viewBox="1656 1644 22947 22947" preserveAspectRatio="xMidYMid" fill-rule="evenodd" stroke-width="28.222" stroke-linejoin="round" xmlns="http://www.w3.org/2000/svg" xmlns:ooo="http://xml.openoffice.org/svg/export" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:presentation="http://sun.com/xmlns/staroffice/presentation" xmlns:smil="http://www.w3.org/2001/SMIL20/" xmlns:anim="urn:oasis:names:tc:opendocument:xmlns:animation:1.0" xml:space="preserve">
+ <defs class="ClipPathGroup">
+  <clipPath id="presentation_clip_path" clipPathUnits="userSpaceOnUse">
+   <rect x="1656" y="1644" width="22947" height="22947"/>
+  </clipPath>
+  <clipPath id="presentation_clip_path_shrink" clipPathUnits="userSpaceOnUse">
+   <rect x="1678" y="1666" width="22902" height="22902"/>
+  </clipPath>
+ </defs>
+ <defs class="TextShapeIndex">
+  <g ooo:slide="id1" ooo:id-list="id3 id4 id5 id6 id7"/>
+ </defs>
+ <defs class="EmbeddedBulletChars">
+  <g id="bullet-char-template-57356" transform="scale(0.00048828125,-0.00048828125)">
+   <path d="M 580,1141 L 1163,571 580,0 -4,571 580,1141 Z"/>
+  </g>
+  <g id="bullet-char-template-57354" transform="scale(0.00048828125,-0.00048828125)">
+   <path d="M 8,1128 L 1137,1128 1137,0 8,0 8,1128 Z"/>
+  </g>
+  <g id="bullet-char-template-10146" transform="scale(0.00048828125,-0.00048828125)">
+   <path d="M 174,0 L 602,739 174,1481 1456,739 174,0 Z M 1358,739 L 309,1346 659,739 1358,739 Z"/>
+  </g>
+  <g id="bullet-char-template-10132" transform="scale(0.00048828125,-0.00048828125)">
+   <path d="M 2015,739 L 1276,0 717,0 1260,543 174,543 174,936 1260,936 717,1481 1274,1481 2015,739 Z"/>
+  </g>
+  <g id="bullet-char-template-10007" transform="scale(0.00048828125,-0.00048828125)">
+   <path d="M 0,-2 C -7,14 -16,27 -25,37 L 356,567 C 262,823 215,952 215,954 215,979 228,992 255,992 264,992 276,990 289,987 310,991 331,999 354,1012 L 381,999 492,748 772,1049 836,1024 860,1049 C 881,1039 901,1025 922,1006 886,937 835,863 770,784 769,783 710,716 594,584 L 774,223 C 774,196 753,168 711,139 L 727,119 C 717,90 699,76 672,76 641,76 570,178 457,381 L 164,-76 C 142,-110 111,-127 72,-127 30,-127 9,-110 8,-76 1,-67 -2,-52 -2,-32 -2,-23 -1,-13 0,-2 Z"/>
+  </g>
+  <g id="bullet-char-template-10004" transform="scale(0.00048828125,-0.00048828125)">
+   <path d="M 285,-33 C 182,-33 111,30 74,156 52,228 41,333 41,471 41,549 55,616 82,672 116,743 169,778 240,778 293,778 328,747 346,684 L 369,508 C 377,444 397,411 428,410 L 1163,1116 C 1174,1127 1196,1133 1229,1133 1271,1133 1292,1118 1292,1087 L 1292,965 C 1292,929 1282,901 1262,881 L 442,47 C 390,-6 338,-33 285,-33 Z"/>
+  </g>
+  <g id="bullet-char-template-9679" transform="scale(0.00048828125,-0.00048828125)">
+   <path d="M 813,0 C 632,0 489,54 383,161 276,268 223,411 223,592 223,773 276,916 383,1023 489,1130 632,1184 813,1184 992,1184 1136,1130 1245,1023 1353,916 1407,772 1407,592 1407,412 1353,268 1245,161 1136,54 992,0 813,0 Z"/>
+  </g>
+  <g id="bullet-char-template-8226" transform="scale(0.00048828125,-0.00048828125)">
+   <path d="M 346,457 C 273,457 209,483 155,535 101,586 74,649 74,723 74,796 101,859 155,911 209,963 273,989 346,989 419,989 480,963 531,910 582,859 608,796 608,723 608,648 583,586 532,535 482,483 420,457 346,457 Z"/>
+  </g>
+  <g id="bullet-char-template-8211" transform="scale(0.00048828125,-0.00048828125)">
+   <path d="M -4,459 L 1135,459 1135,606 -4,606 -4,459 Z"/>
+  </g>
+  <g id="bullet-char-template-61548" transform="scale(0.00048828125,-0.00048828125)">
+   <path d="M 173,740 C 173,903 231,1043 346,1159 462,1274 601,1332 765,1332 928,1332 1067,1274 1183,1159 1299,1043 1357,903 1357,740 1357,577 1299,437 1183,322 1067,206 928,148 765,148 601,148 462,206 346,322 231,437 173,577 173,740 Z"/>
+  </g>
+ </defs>
+ <defs class="TextEmbeddedBitmaps"/>
+ <g class="SlideGroup">
+  <g>
+   <g id="container-id1">
+    <g id="id1" class="Slide" clip-path="url(#presentation_clip_path)">
+     <g class="Page">
+      <g class="com.sun.star.drawing.ClosedBezierShape">
+       <g id="id3">
+        <rect class="BoundingBox" stroke="none" fill="none" x="2632" y="2623" width="20989" height="20990"/>
+        <path fill="none" stroke="rgb(255,255,255)" stroke-width="1312" stroke-linejoin="miter" d="M 22964,13118 C 22964,14929 22551,16468 21646,18037 20740,19605 19613,20732 18045,21638 16476,22543 14937,22956 13126,22956 11315,22956 9775,22543 8207,21638 6638,20732 5512,19605 4606,18037 3700,16468 3288,14929 3288,13118 3288,11307 3700,9767 4606,8199 5512,6630 6638,5504 8207,4598 9775,3692 11315,3280 13126,3280 14937,3280 16476,3692 18045,4598 19613,5504 20740,6630 21646,8199 22551,9767 22964,11307 22964,13118 Z"/>
+       </g>
+      </g>
+      <g class="com.sun.star.drawing.ClosedBezierShape">
+       <g id="id4">
+        <rect class="BoundingBox" stroke="none" fill="none" x="6567" y="6557" width="13119" height="13120"/>
+        <path fill="none" stroke="rgb(255,255,255)" stroke-width="1312" stroke-linejoin="miter" d="M 19029,13117 C 19029,14204 18781,15127 18238,16068 17695,17009 17018,17686 16077,18229 15136,18772 14213,19020 13126,19020 12039,19020 11116,18772 10174,18229 9233,17686 8557,17009 8014,16068 7470,15127 7223,14204 7223,13117 7223,12030 7470,11107 8014,10165 8557,9224 9233,8548 10174,8005 11116,7461 12039,7214 13126,7214 14213,7214 15136,7461 16077,8005 17018,8548 17695,9224 18238,10165 18781,11107 19029,12030 19029,13117 Z"/>
+       </g>
+      </g>
+      <g class="com.sun.star.drawing.ClosedBezierShape">
+       <g id="id5">
+        <rect class="BoundingBox" stroke="none" fill="none" x="10254" y="10245" width="5745" height="5745"/>
+        <path fill="rgb(255,255,255)" stroke="none" d="M 15998,13117 C 15998,13646 15878,14095 15614,14553 15349,15011 15020,15340 14562,15605 14104,15869 13655,15989 13126,15989 12597,15989 12148,15869 11690,15605 11232,15340 10903,15011 10639,14553 10374,14095 10254,13646 10254,13117 10254,12588 10374,12139 10639,11681 10903,11223 11232,10894 11690,10630 12148,10365 12597,10245 13126,10245 13655,10245 14104,10365 14562,10630 15020,10894 15349,11223 15614,11681 15878,12139 15998,12588 15998,13117 Z"/>
+       </g>
+      </g>
+      <g class="com.sun.star.drawing.LineShape">
+       <g id="id6">
+        <rect class="BoundingBox" stroke="none" fill="none" x="12799" y="1644" width="657" height="22948"/>
+        <path fill="none" stroke="rgb(255,255,255)" stroke-width="656" stroke-linejoin="miter" d="M 13127,1644 L 13127,24591"/>
+       </g>
+      </g>
+      <g class="com.sun.star.drawing.LineShape">
+       <g id="id7">
+        <rect class="BoundingBox" stroke="none" fill="none" x="1656" y="12791" width="22948" height="657"/>
+        <path fill="none" stroke="rgb(255,255,255)" stroke-width="656" stroke-linejoin="miter" d="M 24603,13119 L 1656,13119"/>
+       </g>
+      </g>
+     </g>
+    </g>
+   </g>
+  </g>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/src/FlightMap/Images/TargetBlack.svg b/src/FlightMap/Images/TargetBlack.svg
new file mode 100644
index 0000000000000000000000000000000000000000..2126c4dc484f26873473aad1cf05f8f5fdcd2c40
--- /dev/null
+++ b/src/FlightMap/Images/TargetBlack.svg
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg12417"
+   sodipodi:docname="TargetBlack.svg"
+   viewBox="0 0 200.13 200.02"
+   version="1.1"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  <defs
+     id="defs3789" />
+  <title
+     id="title825">Target</title>
+  <sodipodi:namedview
+     id="base"
+     fit-margin-left="10"
+     inkscape:zoom="2.8284271"
+     height="0px"
+     borderopacity="1.0"
+     inkscape:current-layer="layer1"
+     inkscape:cx="104.88808"
+     inkscape:cy="99.561717"
+     fit-margin-right="10"
+     inkscape:window-maximized="1"
+     showgrid="false"
+     width="0px"
+     inkscape:guide-bbox="true"
+     showguides="true"
+     bordercolor="#666666"
+     inkscape:window-x="67"
+     inkscape:window-y="27"
+     fit-margin-bottom="10"
+     inkscape:window-width="1853"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     pagecolor="#ffffff"
+     inkscape:document-units="px"
+     inkscape:window-height="1025"
+     fit-margin-top="10" />
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     transform="translate(-248.44 -442.39)">
+    <g
+       id="g818"
+       transform="translate(-.96350 -1.0044)">
+      <path
+         id="path12427-9-3-9"
+         sodipodi:rx="180.62735"
+         sodipodi:ry="180.62735"
+         style="color:#000000;stroke:#000000;stroke-width:24.084;fill:none"
+         sodipodi:type="arc"
+         d="M 531.76691,557.68408 A 180.62735,180.62735 0 0 1 351.13956,738.31143 180.62735,180.62735 0 0 1 170.51221,557.68408 180.62735,180.62735 0 0 1 351.13956,377.05673 180.62735,180.62735 0 0 1 531.76691,557.68408 Z"
+         transform="matrix(.41522 0 0 .41522 203.67 311.84)"
+         sodipodi:cy="557.68408"
+         sodipodi:cx="351.13956" />
+      <path
+         id="path12427-9-3-9-8-5"
+         sodipodi:rx="180.62735"
+         sodipodi:ry="180.62735"
+         style="color:#000000;stroke:#000000;stroke-width:40.139;fill:none"
+         sodipodi:type="arc"
+         d="M 531.76691,557.68408 A 180.62735,180.62735 0 0 1 351.13956,738.31143 180.62735,180.62735 0 0 1 170.51221,557.68408 180.62735,180.62735 0 0 1 351.13956,377.05673 180.62735,180.62735 0 0 1 531.76691,557.68408 Z"
+         transform="matrix(.24913 0 0 .24913 261.99 404.46)"
+         sodipodi:cy="557.68408"
+         sodipodi:cx="351.13956" />
+      <path
+         id="path12427-9-3-9-8-2-3"
+         sodipodi:rx="180.62735"
+         sodipodi:ry="180.62735"
+         style="color:#000000;fill:#000000"
+         sodipodi:type="arc"
+         d="M 531.76691,557.68408 A 180.62735,180.62735 0 0 1 351.13956,738.31143 180.62735,180.62735 0 0 1 170.51221,557.68408 180.62735,180.62735 0 0 1 351.13956,377.05673 180.62735,180.62735 0 0 1 531.76691,557.68408 Z"
+         transform="matrix(.12121 0 0 .12121 306.91 475.8)"
+         sodipodi:cy="557.68408"
+         sodipodi:cx="351.13956" />
+      <path
+         id="path13189-0"
+         d="m349.48 455.93v174.95"
+         style="stroke:#000000;stroke-linecap:round;stroke-width:5;fill:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path45"
+         style="stroke:#000000;stroke-linecap:round;stroke-width:5;fill:none"
+         inkscape:connector-curvature="0"
+         d="m436.98 543.41h-174.95" />
+    </g>
+  </g>
+  <metadata
+     id="metadata3786">
+    <rdf:RDF>
+      <cc:Work>
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
+        <dc:publisher>
+          <cc:Agent
+             rdf:about="http://openclipart.org/">
+            <dc:title>Openclipart</dc:title>
+          </cc:Agent>
+        </dc:publisher>
+        <dc:title>Target</dc:title>
+        <dc:date>2012-02-15T07:37:04</dc:date>
+        <dc:description>Target symbol</dc:description>
+        <dc:source>https://openclipart.org/detail/168253/target-by-fanda@cz</dc:source>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Fanda@CZ</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>target</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/publicdomain/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+</svg>
diff --git a/src/QuadView/QuadView.qml b/src/QuadView/QuadView.qml
index 15f81051084a0e17a4f27c23f544907f47fe33a4..fdde5fef2217a4c701d6eb0d32d64492c411b27f 100644
--- a/src/QuadView/QuadView.qml
+++ b/src/QuadView/QuadView.qml
@@ -588,7 +588,7 @@ QGCView {
                 rotateImage:        [ masterController.syncInProgress, false, false, false, false, false, false ]
                 animateImage:       [ masterController.dirty, false, false, false, false, false, false ]
                 buttonEnabled:      [ !masterController.syncInProgress, true, true, true, true, true, true ]
-                buttonVisible:      [ true, true, _waypointsOnlyMode, true, true, _showZoom, _showZoom ]
+                buttonVisible:      [ true, true, true, true, true, _showZoom, _showZoom ]
                 maxHeight:          mapScale.y - toolStrip.y
 
                 property bool _showZoom: !ScreenTools.isMobile
@@ -607,7 +607,7 @@ QGCView {
                     },
                     {
                         name:                   qsTr("ROI"),
-                        iconSource:             "/qmlimages/MapAddMission.svg",
+                        iconSource:             "/qmlimages/Target.svg",
                         toggle:                 true
                     },
                     {
@@ -649,7 +649,7 @@ QGCView {
                         editorMap.zoomLevel += 0.5
                         break
                     case 6:
-                        editorMap.zoomLevel -= 0.5
+                        //editorMap.zoomLevel -= 0.5
                         break
                     }
                 }