diff --git a/qgcresources.qrc b/qgcresources.qrc
index 703a8361fde52bcb8e6d5e2d0b243a78ecb6c64f..0ac994c112a6def4c0c417214b6db55c1307eb3c 100644
--- a/qgcresources.qrc
+++ b/qgcresources.qrc
@@ -54,11 +54,11 @@
         <file alias="DatalinkLossLight.svg">src/AutoPilotPlugins/PX4/Images/DatalinkLossLight.svg</file>
         <file alias="GeoFence.svg">src/AutoPilotPlugins/PX4/Images/GeoFence.svg</file>
         <file alias="GeoFenceLight.svg">src/AutoPilotPlugins/PX4/Images/GeoFenceLight.svg</file>
-        <file alias="GeoTagIcon">src/AnalyzeView/GeoTagIcon.png</file>
+        <file alias="GeoTagIcon">src/AnalyzeView/GeoTagIcon.svg</file>
         <file alias="LandMode.svg">src/AutoPilotPlugins/PX4/Images/LandMode.svg</file>
         <file alias="LandModeCopter.svg">src/AutoPilotPlugins/PX4/Images/LandModeCopter.svg</file>
         <file alias="LightsComponentIcon.png">src/AutoPilotPlugins/APM/Images/LightsComponentIcon.png</file>
-        <file alias="LogDownloadIcon">src/AnalyzeView/LogDownloadIcon.png</file>
+        <file alias="LogDownloadIcon">src/AnalyzeView/LogDownloadIcon.svg</file>
         <file alias="LowBattery.svg">src/AutoPilotPlugins/PX4/Images/LowBattery.svg</file>
         <file alias="LowBatteryLight.svg">src/AutoPilotPlugins/PX4/Images/LowBatteryLight.svg</file>
         <file alias="MotorComponentIcon.svg">src/AutoPilotPlugins/Common/Images/MotorComponentIcon.svg</file>
diff --git a/src/AnalyzeView/AnalyzeView.qml b/src/AnalyzeView/AnalyzeView.qml
index 33545d0f97c0afb42e10e37e120dd6617b9f1975..cb827796f4d905fbb7f66791ee6f3ac5294e9958 100644
--- a/src/AnalyzeView/AnalyzeView.qml
+++ b/src/AnalyzeView/AnalyzeView.qml
@@ -86,25 +86,25 @@ Rectangle {
 
                 model: ListModel {
                     ListElement {
-                        buttonImage:    "/qmlimages/LogDownloadIcon"
-                        buttonText:     qsTr("Log Download")
-                        pageSource:     "LogDownloadPage.qml"
+                        buttonImage:        "/qmlimages/LogDownloadIcon"
+                        buttonText:         qsTr("Log Download")
+                        pageSource:         "LogDownloadPage.qml"
                     }
                     ListElement {
-                        buttonImage:    "/qmlimages/GeoTagIcon"
-                        buttonText:     qsTr("GeoTag Images")
-                        pageSource:     "GeoTagPage.qml"
+                        buttonImage:        "/qmlimages/GeoTagIcon"
+                        buttonText:         qsTr("GeoTag Images")
+                        pageSource:         "GeoTagPage.qml"
                     }
                 }
 
                 Component.onCompleted: itemAt(0).checked = true
 
                 SubMenuButton {
-                    imageResource:  buttonImage
-                    setupIndicator: false
-                    exclusiveGroup: setupButtonGroup
-                    text:           buttonText
-                    onClicked:      panelLoader.source = pageSource
+                    imageResource:      buttonImage
+                    setupIndicator:     false
+                    exclusiveGroup:     setupButtonGroup
+                    text:               buttonText
+                    onClicked:          panelLoader.source = pageSource
                 }
             }
         }
diff --git a/src/AnalyzeView/GeoTagIcon.png b/src/AnalyzeView/GeoTagIcon.png
deleted file mode 100644
index 6aa8343a341df18048e0c9feeeb9491e2c63aaa8..0000000000000000000000000000000000000000
Binary files a/src/AnalyzeView/GeoTagIcon.png and /dev/null differ
diff --git a/src/AnalyzeView/GeoTagIcon.svg b/src/AnalyzeView/GeoTagIcon.svg
new file mode 100644
index 0000000000000000000000000000000000000000..ba15cb0ad2c5bc4bc62aa661950ccef7661f5a16
--- /dev/null
+++ b/src/AnalyzeView/GeoTagIcon.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 20.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" style="enable-background:new 0 0 72 72;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;}
+</style>
+<path class="st0" d="M36,7.545c-6.242,0-11.606,2.182-16.091,6.545c-4.424,4.303-6.636,9.545-6.636,15.727
+	c0,6.121,2.212,11.333,6.636,15.636L36,61.364l16.182-15.909c4.364-4.242,6.545-9.455,6.545-15.636
+	c0-6.242-2.182-11.485-6.545-15.727C47.697,9.727,42.303,7.545,36,7.545z M36,0c8.424,0,15.576,2.909,21.455,8.727
+	s8.818,12.848,8.818,21.091s-2.939,15.273-8.818,21.091L36,72L14.636,50.909c-5.939-5.818-8.909-12.848-8.909-21.091
+	s2.97-15.273,8.909-21.091S27.697,0,36,0z M36,20.818c-2.545,0-4.758,0.939-6.636,2.818c-1.879,1.879-2.818,4.106-2.818,6.682
+	s0.939,4.803,2.818,6.682c1.818,1.818,4.03,2.727,6.636,2.727c2.667,0,4.909-0.909,6.727-2.727c1.879-1.879,2.818-4.106,2.818-6.682
+	s-0.939-4.803-2.818-6.682C40.848,21.758,38.606,20.818,36,20.818z M36,17c3.636,0,6.758,1.303,9.364,3.909s3.909,5.727,3.909,9.364
+	s-1.303,6.758-3.909,9.364S39.636,43.545,36,43.545s-6.758-1.303-9.364-3.909s-3.909-5.727-3.909-9.364s1.303-6.758,3.909-9.364
+	S32.364,17,36,17z"/>
+</svg>
diff --git a/src/AnalyzeView/LogDownloadIcon.png b/src/AnalyzeView/LogDownloadIcon.png
deleted file mode 100644
index 6aa8343a341df18048e0c9feeeb9491e2c63aaa8..0000000000000000000000000000000000000000
Binary files a/src/AnalyzeView/LogDownloadIcon.png and /dev/null differ
diff --git a/src/AnalyzeView/LogDownloadIcon.svg b/src/AnalyzeView/LogDownloadIcon.svg
new file mode 100644
index 0000000000000000000000000000000000000000..a8d9b0b7a13af86ff4f58a5f0b6a84aec01bb400
--- /dev/null
+++ b/src/AnalyzeView/LogDownloadIcon.svg
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 20.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" style="enable-background:new 0 0 72 72;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;}
+</style>
+<g>
+	<path class="st0" d="M60.627,1.8H11.373C6.095,1.8,1.8,6.002,1.8,11.181v49.639c0,5.179,4.288,9.381,9.573,9.381h49.254
+		c5.285,0,9.573-4.202,9.573-9.381V11.181C70.207,6.002,65.912,1.8,60.627,1.8z M66.261,60.819c0,3.043-2.529,5.521-5.634,5.521
+		H11.373c-3.106,0-5.634-2.478-5.634-5.521V11.181c0-3.043,2.529-5.521,5.634-5.521h49.254c3.106,0,5.634,2.478,5.634,5.521V60.819
+		L66.261,60.819z"/>
+	<path class="st0" d="M18.496,44.271c-2.329,0-4.224,1.857-4.224,4.132c0,2.282,1.895,4.139,4.224,4.139s4.224-1.857,4.224-4.139
+		C22.72,46.127,20.825,44.271,18.496,44.271z"/>
+	<path class="st0" d="M18.496,31.861c-2.329,0-4.224,1.857-4.224,4.132c0,2.282,1.895,4.139,4.224,4.139s4.224-1.857,4.224-4.139
+		C22.72,33.718,20.825,31.861,18.496,31.861z"/>
+	<path class="st0" d="M18.496,19.458c-2.329,0-4.224,1.857-4.224,4.132c0,2.282,1.895,4.139,4.224,4.139s4.224-1.857,4.224-4.139
+		S20.825,19.458,18.496,19.458z"/>
+	<path class="st0" d="M29.387,20.212h28.89v5.144h-28.89V20.212z"/>
+	<path class="st0" d="M29.387,33.425h28.89v5.151h-28.89V33.425z"/>
+	<path class="st0" d="M29.387,46.637h28.89v5.144h-28.89V46.637z"/>
+</g>
+</svg>
diff --git a/src/QmlControls/SubMenuButton.qml b/src/QmlControls/SubMenuButton.qml
index 640458cebe182dbf142621aabc27445b8ebbd839..6698d27f1fd852760ba2bffe346306a4cecf8276 100644
--- a/src/QmlControls/SubMenuButton.qml
+++ b/src/QmlControls/SubMenuButton.qml
@@ -7,9 +7,11 @@ import QGroundControl.Palette       1.0
 import QGroundControl.ScreenTools   1.0
 
 Button {
+    id: _rootButton
     property bool   setupComplete:  true                                    ///< true: setup complete indicator shows as completed
     property bool   setupIndicator: true                                    ///< true: show setup complete indicator
     property string imageResource:  "/qmlimages/subMenuButtonImage.png"     ///< Button image
+    property size   sourceSize:     Qt.size(ScreenTools.defaultFontPixelHeight * 2, ScreenTools.defaultFontPixelHeight * 2)
 
     text: "Button"  ///< Pass in your own button text
 
@@ -40,9 +42,10 @@ Button {
                 width:                  ScreenTools.defaultFontPixelHeight * 2
                 height:                 ScreenTools.defaultFontPixelHeight * 2
                 fillMode:               Image.PreserveAspectFit
-                smooth:                 true
+                mipmap:                 true
                 color:                  control.setupComplete ? qgcPal.button : "red"
                 source:                 control.imageResource
+                sourceSize:             _rootButton.sourceSize
             }
 
             QGCLabel {
diff --git a/src/ui/toolbar/Images/Analyze.svg b/src/ui/toolbar/Images/Analyze.svg
index 3088987155fecef96a76c4be0d2a2c79ca32600d..d96303a5ef22f9600ddd83b0bd3d7496c58dfed2 100644
--- a/src/ui/toolbar/Images/Analyze.svg
+++ b/src/ui/toolbar/Images/Analyze.svg
@@ -1,34 +1,17 @@
-<?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="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="160 862 72 72" style="enable-background:new 160 862 72 72;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FFFFFF;}
-</style>
-<g>
-	<path class="st0" d="M164.7,888.4c0.4,1.3,0.9,2.5,1.6,3.7l-1.9,2.4c-0.6,0.8-0.5,1.9,0.1,2.6l3.3,3.3c0.7,0.7,1.8,0.8,2.6,0.1
-		l2.4-1.9c1.2,0.7,2.5,1.3,3.9,1.6l0.4,3.1c0.1,1,1,1.7,1.9,1.7h4.6c1,0,1.8-0.7,1.9-1.7l0.3-2.9c1.5-0.4,2.8-0.9,4.1-1.7l2.3,1.8
-		c0.8,0.6,1.9,0.5,2.6-0.1l3.3-3.3c0.7-0.7,0.8-1.8,0.1-2.6l-1.8-2.3c0.7-1.3,1.3-2.6,1.7-4.1l2.7-0.3c1-0.1,1.7-1,1.7-1.9v-4.6
-		c0-1-0.7-1.8-1.7-1.9l-2.7-0.3c-0.4-1.4-0.9-2.8-1.6-4l1.7-2.1c0.6-0.8,0.5-1.9-0.1-2.6l-3.3-3.3c-0.7-0.7-1.8-0.8-2.6-0.1l-2,1.6
-		c-1.3-0.8-2.7-1.4-4.2-1.8l-0.3-2.6c-0.1-1-1-1.7-1.9-1.7h-4.6c-1,0-1.8,0.7-1.9,1.7l-0.3,2.6c-1.5,0.4-3,1-4.3,1.8l-2.1-1.7
-		c-0.8-0.6-1.9-0.5-2.6,0.1l-3.3,3.3c-0.7,0.7-0.8,1.8-0.1,2.6l1.8,2.2c-0.7,1.3-1.3,2.6-1.6,4.1l-2.8,0.3c-1,0.1-1.7,1-1.7,1.9v4.6
-		c0,1,0.7,1.8,1.7,1.9L164.7,888.4z M181.4,875.9c4.2,0,7.6,3.4,7.6,7.6s-3.4,7.6-7.6,7.6c-4.2,0-7.6-3.4-7.6-7.6
-		S177.2,875.9,181.4,875.9z"/>
-	<path class="st0" d="M227,889.5l-2.4-2.1c-0.7-0.6-1.9-0.6-2.6,0.1l-1.3,1.3c-1.1-0.5-2.3-0.9-3.6-1.2l-0.4-1.9
-		c-0.2-1-1.1-1.6-2.1-1.5l-3.2,0.3c-1,0.1-1.7,0.9-1.8,1.9l-0.1,1.9c-1.2,0.4-2.4,1-3.4,1.8l-1.6-1.1c-0.8-0.5-1.9-0.4-2.5,0.4
-		l-2.1,2.4c-0.6,0.7-0.6,1.9,0.1,2.6l1.4,1.5c-0.5,1.1-0.8,2.2-1,3.4l-2,0.4c-1,0.2-1.6,1.1-1.5,2.1l0.3,3.2c0.1,1,0.9,1.7,1.9,1.8
-		l2.2,0.1c0.4,1,0.9,2,1.5,2.9l-1.2,1.8c-0.5,0.8-0.4,1.9,0.4,2.5l2.4,2.1c0.7,0.6,1.9,0.6,2.6-0.1l1.6-1.5c1,0.5,2.1,0.8,3.3,1.1
-		l0.4,2.2c0.2,1,1.1,1.6,2.1,1.5l3.2-0.3c1-0.1,1.7-0.9,1.8-1.9l0.1-2.1c1.2-0.4,2.3-1,3.3-1.7l1.8,1.2c0.8,0.5,1.9,0.4,2.5-0.4
-		l2.1-2.4c0.6-0.7,0.6-1.9-0.1-2.6l-1.4-1.5c0.5-1.1,0.9-2.3,1.1-3.4l1.9-0.4c1-0.2,1.6-1.1,1.5-2.1l-0.3-3.2
-		c-0.1-1-0.9-1.7-1.9-1.8l-1.9-0.1c-0.4-1.1-0.9-2.2-1.6-3.2l1.1-1.6C227.9,891.2,227.8,890.1,227,889.5z M215.1,907.9
-		c-3.4,0.3-6.5-2.3-6.7-5.7c-0.3-3.4,2.3-6.5,5.7-6.7c3.4-0.3,6.5,2.3,6.7,5.7C221,904.6,218.5,907.6,215.1,907.9z"/>
-	<path class="st0" d="M175.8,916.4c-1,0.1-1.7,0.9-1.7,1.9l0,2c0,1,0.7,1.8,1.7,1.9l1.4,0.2c0.2,0.9,0.6,1.7,1,2.5l-0.9,1.1
-		c-0.6,0.8-0.6,1.9,0.1,2.6l1.4,1.4c0.7,0.7,1.8,0.8,2.6,0.2l1.2-0.9c0.8,0.5,1.7,0.9,2.6,1.1l0.2,1.5c0.1,1,0.9,1.7,1.9,1.7l2,0
-		c1,0,1.8-0.7,1.9-1.7l0.2-1.4c1-0.2,1.9-0.6,2.8-1.1l1.1,0.9c0.8,0.6,1.9,0.6,2.6-0.1l1.4-1.4c0.7-0.7,0.8-1.8,0.2-2.6l-0.8-1.1
-		c0.5-0.8,0.9-1.8,1.2-2.7l1.3-0.1c1-0.1,1.7-0.9,1.7-1.9l0-2c0-1-0.7-1.8-1.7-1.9l-1.3-0.2c-0.2-0.9-0.6-1.9-1.1-2.7l0.8-1
-		c0.6-0.8,0.6-1.9-0.1-2.6l-1.4-1.4c-0.7-0.7-1.8-0.8-2.6-0.2l-0.9,0.7c-0.9-0.5-1.8-0.9-2.8-1.2l-0.1-1.2c-0.1-1-0.9-1.7-1.9-1.7
-		l-2,0c-1,0-1.8,0.7-1.9,1.7l-0.2,1.2c-1,0.3-2,0.7-2.9,1.2l-1-0.8c-0.8-0.6-1.9-0.6-2.6,0.1l-1.4,1.4c-0.7,0.7-0.8,1.8-0.2,2.6
-		l0.8,1.1c-0.5,0.8-0.9,1.8-1.1,2.7L175.8,916.4z M188.4,914.2c2.8,0,5.1,2.3,5,5.1c0,2.8-2.3,5.1-5.1,5c-2.8,0-5.1-2.3-5-5.1
-		C183.3,916.4,185.6,914.2,188.4,914.2z"/>
-</g>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 20.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Capa_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" style="enable-background:new 0 0 72 72;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;}
+</style>
+<path class="st0" d="M18.333,42.453h11.67c1.611,0,2.918-1.3,2.918-2.904c0-1.604-1.306-2.904-2.918-2.904h-11.67
+	c-1.611,0-2.918,1.3-2.918,2.904C15.415,41.153,16.721,42.453,18.333,42.453z"/>
+<path class="st0" d="M69.345,65.243l-6.017-5.989c1.473-2.233,2.333-4.901,2.333-7.767c0-6.833-4.876-12.553-11.346-13.897V25.998
+	c0-0.77-0.307-1.509-0.854-2.053L32.065,2.65c-0.547-0.545-1.289-0.85-2.063-0.85H4.718C3.106,1.8,1.8,3.1,1.8,4.704v58.076
+	c0,1.603,1.306,2.904,2.918,2.904h46.68c2.88,0,5.56-0.856,7.805-2.323l6.017,5.989c0.57,0.567,1.316,0.851,2.063,0.851
+	c0.747,0,1.493-0.284,2.063-0.851C70.485,68.215,70.485,66.377,69.345,65.243z M59.826,51.487c0,4.626-3.781,8.389-8.428,8.389
+	s-8.428-3.763-8.428-8.389s3.781-8.389,8.428-8.389C56.045,43.098,59.826,46.861,59.826,51.487z M32.92,11.714l11.434,11.38H32.92
+	V11.714z M7.635,7.608h19.45v18.391c0,1.604,1.306,2.904,2.918,2.904H48.48v8.688c-5.419,1.126-9.716,5.322-10.97,10.67H18.333
+	c-1.611,0-2.918,1.3-2.918,2.904c0,1.603,1.306,2.904,2.918,2.904h19.042c0.397,2.142,1.277,4.117,2.525,5.808H7.635V7.608z"/>
+</svg>