diff --git a/qgroundcontrol.qrc b/qgroundcontrol.qrc
index 1381ea905ac7700437896ad634bc7b0e3fff4fe4..b0c13016f84dd3cf3d94e56dcca9a2ef6f7d7bdb 100644
--- a/qgroundcontrol.qrc
+++ b/qgroundcontrol.qrc
@@ -65,17 +65,25 @@
         <file alias="airplaneOpaque.svg">src/FlightMap/Images/airplaneOpaque.svg</file>
         <file alias="ZoomPlus.svg">src/FlightMap/Images/ZoomPlus.svg</file>
         <file alias="ZoomMinus.svg">src/FlightMap/Images/ZoomMinus.svg</file>
-        <file alias="TrashDelete.svg">src/FlightMap/Images/TrashDelete.svg</file>
-        <file alias="XDelete.svg">src/FlightMap/Images/XDelete.svg</file>
 
         <!-- Map Buttons -->
         <file alias="Help.svg">src/FlightMap/Images/Help.svg</file>
+        <file alias="HelpBlack.svg">src/FlightMap/Images/HelpBlack.svg</file>
+        <file alias="MapAddMission.svg">src/FlightMap/Images/MapAddMission.svg</file>
+        <file alias="MapAddMissionBlack.svg">src/FlightMap/Images/MapAddMissionBlack.svg</file>
         <file alias="MapCenter.svg">src/FlightMap/Images/MapCenter.svg</file>
+        <file alias="MapCenterBlack.svg">src/FlightMap/Images/MapCenterBlack.svg</file>
+        <file alias="MapHome.svg">src/FlightMap/Images/MapHome.svg</file>
+        <file alias="MapHomeBlack.svg">src/FlightMap/Images/MapHomeBlack.svg</file>
         <file alias="MapSync.svg">src/FlightMap/Images/MapSync.svg</file>
+        <file alias="MapSyncBlack.svg">src/FlightMap/Images/MapSyncBlack.svg</file>
         <file alias="MapSyncChanged.svg">src/FlightMap/Images/MapSyncChanged.svg</file>
         <file alias="MapType.svg">src/FlightMap/Images/MapType.svg</file>
-        <file alias="MapHome.svg">src/FlightMap/Images/MapHome.svg</file>
-        <file alias="MapAddMission.svg">src/FlightMap/Images/MapAddMission.svg</file>
+        <file alias="MapTypeBlack.svg">src/FlightMap/Images/MapTypeBlack.svg</file>
+        <file alias="TrashDelete.svg">src/FlightMap/Images/TrashDelete.svg</file>
+        <file alias="TrashDeleteBlack.svg">src/FlightMap/Images/TrashDeleteBlack.svg</file>
+        <file alias="XDelete.svg">src/FlightMap/Images/XDelete.svg</file>
+        <file alias="XDeleteBlack.svg">src/FlightMap/Images/XDeleteBlack.svg</file>
 
     </qresource>
     <qresource prefix="/qml">
diff --git a/src/FlightMap/Images/HelpBlack.svg b/src/FlightMap/Images/HelpBlack.svg
new file mode 100644
index 0000000000000000000000000000000000000000..74988e5406befad1aec14f337bd61f3191e4d9ea
--- /dev/null
+++ b/src/FlightMap/Images/HelpBlack.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="-89 46 72 72" enable-background="new -89 46 72 72" xml:space="preserve">
+<circle fill="none" stroke="#231F20" stroke-width="2" stroke-miterlimit="10" cx="-53" cy="82" r="22.38"/>
+<g>
+	<path fill="#231F20" d="M-54.662,89.026c-0.012-0.439-0.018-0.768-0.018-0.987c0-1.291,0.183-2.406,0.548-3.344
+		c0.268-0.707,0.7-1.419,1.297-2.138c0.438-0.524,1.227-1.288,2.365-2.293s1.878-1.806,2.219-2.403
+		c0.341-0.597,0.511-1.249,0.511-1.955c0-1.279-0.499-2.403-1.498-3.372c-0.998-0.969-2.222-1.453-3.671-1.453
+		c-1.4,0-2.569,0.439-3.507,1.316c-0.938,0.877-1.553,2.248-1.845,4.112l-3.379-0.402c0.304-2.497,1.209-4.41,2.712-5.738
+		c1.504-1.328,3.492-1.992,5.964-1.992c2.618,0,4.706,0.713,6.265,2.138c1.559,1.425,2.338,3.149,2.338,5.172
+		c0,1.17-0.274,2.248-0.822,3.235s-1.619,2.187-3.215,3.6c-1.072,0.95-1.772,1.651-2.1,2.102c-0.329,0.451-0.572,0.969-0.731,1.553
+		c-0.158,0.585-0.25,1.535-0.274,2.851H-54.662z M-54.863,95.623v-3.746h3.744v3.746H-54.863z"/>
+</g>
+</svg>
diff --git a/src/FlightMap/Images/HomeBlack.svg b/src/FlightMap/Images/HomeBlack.svg
new file mode 100644
index 0000000000000000000000000000000000000000..ae78ea2b4c2445f74e23b4027c5be4fd3bd9fd2e
--- /dev/null
+++ b/src/FlightMap/Images/HomeBlack.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 72 72" enable-background="new 0 0 72 72" xml:space="preserve">
+<g>
+	<polygon points="70.2,41.7 36,1.797 1.8,41.7 10.35,41.7 10.35,70.203 27.45,70.203 27.45,47.401 44.55,47.401 44.55,70.203 
+		61.65,70.203 61.65,41.7 	"/>
+</g>
+</svg>
diff --git a/src/FlightMap/Images/MapAddMissionBlack.svg b/src/FlightMap/Images/MapAddMissionBlack.svg
new file mode 100644
index 0000000000000000000000000000000000000000..bf305631784d892dd15623ea1dc0f1dca19cbd28
--- /dev/null
+++ b/src/FlightMap/Images/MapAddMissionBlack.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="-89 46 72 72" enable-background="new -89 46 72 72" xml:space="preserve">
+<g>
+	<path fill="#231F20" d="M-55.213,94.612V84.146h-10.386v-4.373h10.385V69.384h4.425v10.389h10.387v4.373h-10.386v10.466H-55.213z"
+		/>
+</g>
+<circle fill="none" stroke="#231F20" stroke-width="2" stroke-miterlimit="10" cx="-53" cy="82" r="22.38"/>
+</svg>
diff --git a/src/FlightMap/Images/MapCenterBlack.svg b/src/FlightMap/Images/MapCenterBlack.svg
new file mode 100644
index 0000000000000000000000000000000000000000..c14f59d51ac5c171ab470b8b4159094d8a75361c
--- /dev/null
+++ b/src/FlightMap/Images/MapCenterBlack.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="-89 46 72 72" enable-background="new -89 46 72 72" xml:space="preserve">
+<g>
+	<circle fill="none" stroke="#231F20" stroke-width="2" stroke-miterlimit="10" cx="-53" cy="82" r="22.38"/>
+	<line fill="none" stroke="#231F20" stroke-width="2" stroke-miterlimit="10" x1="-75.464" y1="81.975" x2="-64.423" y2="82.025"/>
+	<line fill="none" stroke="#231F20" stroke-width="2" stroke-miterlimit="10" x1="-53.025" y1="104.464" x2="-52.975" y2="93.423"/>
+	<line fill="none" stroke="#231F20" stroke-width="2" stroke-miterlimit="10" x1="-30.536" y1="82.025" x2="-41.577" y2="81.975"/>
+	<line fill="none" stroke="#231F20" stroke-width="2" stroke-miterlimit="10" x1="-52.975" y1="59.536" x2="-53.025" y2="70.577"/>
+</g>
+</svg>
diff --git a/src/FlightMap/Images/MapHomeBlack.svg b/src/FlightMap/Images/MapHomeBlack.svg
new file mode 100644
index 0000000000000000000000000000000000000000..e3ae61df8a4af662b58dff39b98ccd446376ba71
--- /dev/null
+++ b/src/FlightMap/Images/MapHomeBlack.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="-89 46 72 72" enable-background="new -89 46 72 72" xml:space="preserve">
+<g>
+	<polygon fill="#231F20" points="-40.4,82.098 -53,67.397 -65.6,82.098 -62.45,82.098 -62.45,92.599 -56.15,92.599 -56.15,84.199 
+		-49.85,84.199 -49.85,92.599 -43.55,92.599 -43.55,82.098 	"/>
+</g>
+<circle fill="none" stroke="#231F20" stroke-width="2" stroke-miterlimit="10" cx="-53" cy="82" r="22.38"/>
+</svg>
diff --git a/src/FlightMap/Images/MapSyncBlack.svg b/src/FlightMap/Images/MapSyncBlack.svg
new file mode 100644
index 0000000000000000000000000000000000000000..92cbcbe2a061a8c80a1e10cb6823cff28e4f0a6c
--- /dev/null
+++ b/src/FlightMap/Images/MapSyncBlack.svg
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="-89 46 72 72" enable-background="new -89 46 72 72" xml:space="preserve">
+<path fill="none" stroke="#231F20" stroke-width="2" stroke-miterlimit="10" d="M-56.963,64.442
+	c-4.199,0.947-8.074,3.392-10.749,7.186c-5.728,8.125-3.785,19.355,4.339,25.083c0.007,0.005,0.014,0.009,0.022,0.014"/>
+<g>
+	<polygon fill="#231F20" points="-59.303,88.472 -69.431,103.621 -56.794,101.11 	"/>
+</g>
+<path fill="none" stroke="#231F20" stroke-width="2" stroke-miterlimit="10" d="M-49.038,99.558
+	c4.199-0.947,8.074-3.392,10.749-7.186c5.728-8.125,3.785-19.355-4.339-25.083c-0.007-0.005-0.014-0.009-0.022-0.014"/>
+<g>
+	<polygon fill="#231F20" points="-46.698,75.528 -36.57,60.379 -49.207,62.89 	"/>
+</g>
+<g>
+	<path fill="none" d="M-71.309,68.986"/>
+</g>
+</svg>
diff --git a/src/FlightMap/Images/MapTypeBlack.svg b/src/FlightMap/Images/MapTypeBlack.svg
new file mode 100644
index 0000000000000000000000000000000000000000..2713c431aece1bb0344931c0c0007577b8f4dc2d
--- /dev/null
+++ b/src/FlightMap/Images/MapTypeBlack.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="-89 46 72 72" enable-background="new -89 46 72 72" xml:space="preserve">
+<polyline fill="none" stroke="#231F20" stroke-width="2" stroke-miterlimit="10" points="-33.676,83.43 -30.5,85.789 -53,102.501 
+	-75.5,85.789 -72.467,83.536 "/>
+<path fill="none" stroke="#231F20" stroke-width="2" stroke-miterlimit="10" d="M-53,69.077"/>
+<polygon fill="none" stroke="#231F20" stroke-width="2" stroke-miterlimit="10" points="-30.5,78.211 -53,94.923 -75.5,78.211 
+	-53,61.499 "/>
+</svg>
diff --git a/src/FlightMap/Images/TrashDelete.svg b/src/FlightMap/Images/TrashDelete.svg
index 470443e06efa5f26e9da68f45c83eb9785111d25..1b0826ba046132064adf73ab0793056024898f77 100644
--- a/src/FlightMap/Images/TrashDelete.svg
+++ b/src/FlightMap/Images/TrashDelete.svg
@@ -5,7 +5,7 @@
 <g>
 	<path fill="none" d="M-71.309,68.986"/>
 </g>
-<rect x="-66.01" y="64" fill="#FFFFFF" width="26.019" height="5.33"/>
-<path fill="#FFFFFF" d="M-39.99,70.89h-26.019V100h26.019L-39.99,70.89L-39.99,70.89z M-43.423,96.166h-3.6V75.034h3.6V96.166z
-	 M-51.2,96.166h-3.6V75.034h3.6V96.166z M-58.645,96.166h-3.6V75.034h3.6V96.166z"/>
+<rect x="-64.709" y="65.8" fill="#FFFFFF" width="23.417" height="4.797"/>
+<path fill="#FFFFFF" d="M-41.291,72.001h-23.417V98.2h23.417L-41.291,72.001L-41.291,72.001z M-44.381,94.749h-3.24V75.731h3.24
+	V94.749z M-51.38,94.749h-3.24V75.731h3.24V94.749z M-58.081,94.749h-3.24V75.731h3.24V94.749z"/>
 </svg>
diff --git a/src/FlightMap/Images/TrashDeleteBlack.svg b/src/FlightMap/Images/TrashDeleteBlack.svg
new file mode 100644
index 0000000000000000000000000000000000000000..17effa14549bd9623d9624dab30619399475345b
--- /dev/null
+++ b/src/FlightMap/Images/TrashDeleteBlack.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="-89 46 72 72" enable-background="new -89 46 72 72" xml:space="preserve">
+<g>
+	<path fill="none" d="M-71.309,68.986"/>
+</g>
+<rect x="-64.709" y="65.8" fill="#231F20" width="23.417" height="4.797"/>
+<path fill="#231F20" d="M-41.291,72.001h-23.417V98.2h23.417L-41.291,72.001L-41.291,72.001z M-44.381,94.749h-3.24V75.731h3.24
+	V94.749z M-51.38,94.749h-3.24V75.731h3.24V94.749z M-58.081,94.749h-3.24V75.731h3.24V94.749z"/>
+</svg>
diff --git a/src/FlightMap/Images/XDelete.svg b/src/FlightMap/Images/XDelete.svg
index 934ccfe9cfcd6b1b77368781ec22977732167ffc..e43804f78f6b9a693a4255398081f56b2cdefae6 100644
--- a/src/FlightMap/Images/XDelete.svg
+++ b/src/FlightMap/Images/XDelete.svg
@@ -3,8 +3,8 @@
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 viewBox="-89 46 72 72" enable-background="new -89 46 72 72" xml:space="preserve">
 <g>
-	<path fill="none" d="M-71.309,68.986"/>
+	<path fill="none" stroke="#FFFFFF" stroke-miterlimit="10" d="M-68.877,70.722"/>
 </g>
-<line fill="none" stroke="#FFFFFF" stroke-width="3" stroke-miterlimit="10" x1="-80" y1="108.997" x2="-26" y2="55.003"/>
-<line fill="none" stroke="#FFFFFF" stroke-width="3" stroke-miterlimit="10" x1="-26.135" y1="109" x2="-80.129" y2="55"/>
+<line fill="none" stroke="#FFFFFF" stroke-width="3" stroke-miterlimit="10" x1="-76.409" y1="105.398" x2="-29.609" y2="58.602"/>
+<line fill="none" stroke="#FFFFFF" stroke-width="3" stroke-miterlimit="10" x1="-29.725" y1="105.4" x2="-76.521" y2="58.6"/>
 </svg>
diff --git a/src/FlightMap/Images/XDeleteBlack.svg b/src/FlightMap/Images/XDeleteBlack.svg
new file mode 100644
index 0000000000000000000000000000000000000000..2aea3867c5c2c96a8a9cb1e7be60582a57676564
--- /dev/null
+++ b/src/FlightMap/Images/XDeleteBlack.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="-89 46 72 72" enable-background="new -89 46 72 72" xml:space="preserve">
+<g>
+	<path fill="none" stroke="#231F20" stroke-miterlimit="10" d="M-68.877,70.722"/>
+</g>
+<line fill="none" stroke="#231F20" stroke-width="3" stroke-miterlimit="10" x1="-76.409" y1="105.398" x2="-29.609" y2="58.602"/>
+<line fill="none" stroke="#231F20" stroke-width="3" stroke-miterlimit="10" x1="-29.725" y1="105.4" x2="-76.521" y2="58.6"/>
+</svg>
diff --git a/src/MissionEditor/MissionEditor.qml b/src/MissionEditor/MissionEditor.qml
index 600817b2386759384e952af791eefce45e4fd6a4..e840da76c341b7f9919ab6181a543ec729767dd8 100644
--- a/src/MissionEditor/MissionEditor.qml
+++ b/src/MissionEditor/MissionEditor.qml
@@ -578,7 +578,7 @@ QGCView {
                         anchors.right:      parent.right
                         width:              ScreenTools.defaultFontPixelHeight * 1.5
                         height:             ScreenTools.defaultFontPixelHeight * 1.5
-                        source:             "/qmlimages/XDelete.svg"
+                        source:             (qgcPal.globalTheme === QGCPalette.Light) ? "/qmlimages/XDeleteBlack.svg" : "/qmlimages/XDelete.svg"
                         fillMode:           Image.PreserveAspectFit
                         mipmap:             true
                         smooth:             true
@@ -616,7 +616,7 @@ QGCView {
                             fillMode:           Image.PreserveAspectFit
                             mipmap:             true
                             smooth:             true
-                            source:             "/qmlimages/MapAddMission.svg"
+                            source:             (qgcPal.globalTheme === QGCPalette.Light) ? "/qmlimages/MapAddMissionBlack.svg" : "/qmlimages/MapAddMission.svg"
                         }
 
                         QGCLabel {
@@ -638,7 +638,7 @@ QGCView {
                             fillMode:           Image.PreserveAspectFit
                             mipmap:             true
                             smooth:             true
-                            source:             "/qmlimages/TrashDelete.svg"
+                            source:             (qgcPal.globalTheme === QGCPalette.Light) ? "/qmlimages/TrashDeleteBlack.svg" : "/qmlimages/TrashDelete.svg"
                         }
 
                         QGCLabel {
@@ -660,7 +660,7 @@ QGCView {
                             fillMode:           Image.PreserveAspectFit
                             mipmap:             true
                             smooth:             true
-                            source:             "/qmlimages/MapHome.svg"
+                            source:             (qgcPal.globalTheme === QGCPalette.Light) ? "/qmlimages/MapHomeBlack.svg" : "/qmlimages/MapHome.svg"
                         }
 
                         QGCLabel {
@@ -683,7 +683,7 @@ QGCView {
                             fillMode:           Image.PreserveAspectFit
                             mipmap:             true
                             smooth:             true
-                            source:             "/qmlimages/MapCenter.svg"
+                            source:             (qgcPal.globalTheme === QGCPalette.Light) ? "/qmlimages/MapCenterBlack.svg" : "/qmlimages/MapCenter.svg"
                         }
 
                         QGCLabel {
@@ -705,7 +705,7 @@ QGCView {
                             fillMode:           Image.PreserveAspectFit
                             mipmap:             true
                             smooth:             true
-                            source:             "/qmlimages/MapSync.svg"
+                            source:             (qgcPal.globalTheme === QGCPalette.Light) ? "/qmlimages/MapSyncBlack.svg" : "/qmlimages/MapSync.svg"
                         }
 
                         QGCLabel {
@@ -727,7 +727,7 @@ QGCView {
                             fillMode:           Image.PreserveAspectFit
                             mipmap:             true
                             smooth:             true
-                            source:             "/qmlimages/MapType.svg"
+                            source:             (qgcPal.globalTheme === QGCPalette.Light) ? "/qmlimages/MapTypeBlack.svg" : "/qmlimages/MapType.svg"
                         }
 
                         QGCLabel {
@@ -742,12 +742,13 @@ QGCView {
                         }
 
                         QGCCheckBox {
-                            anchors.left:   parent.left
-                            anchors.bottom: parent.bottom
-                            checked:        !_showHelp
-                            text:           "Don't show me again"
+                            anchors.left:       parent.left
+                            anchors.bottom:     parent.bottom
+                            anchors.margins:    _margin
+                            checked:            !_showHelp
+                            text:               "Don't show me again"
 
-                            onClicked:      QGroundControl.flightMapSettings.saveBoolMapSetting(editorMap.mapName, _showHelpKey, !checked)
+                            onClicked:          QGroundControl.flightMapSettings.saveBoolMapSetting(editorMap.mapName, _showHelpKey, !checked)
                         }
                     } // Item - margin
                 } // Item - Help Panel