diff --git a/deploy/AppImageCommitHash b/deploy/AppImageCommitHash
new file mode 100644
index 0000000000000000000000000000000000000000..1b3e8c9891281ebe88b39f602a52d3537d2525ce
--- /dev/null
+++ b/deploy/AppImageCommitHash
@@ -0,0 +1 @@
+bd79747292138b2ea0
diff --git a/deploy/QGroundControl.AppImage b/deploy/QGroundControl.AppImage
index d01ee0e453e6fada29ea608d16c7ce2939efebd8..89d3312616da9e98c47a933463a331a351ee063b 100755
Binary files a/deploy/QGroundControl.AppImage and b/deploy/QGroundControl.AppImage differ
diff --git a/qgcresources.qrc b/qgcresources.qrc
index 44396e942d71cd9abdf532dc613aed7a6ea700d8..281fac011494b5ad8a1cabbba24100edf060cf3e 100644
--- a/qgcresources.qrc
+++ b/qgcresources.qrc
@@ -233,6 +233,10 @@
         <file alias="XDeleteBlack.svg">resources/XDeleteBlack.svg</file>
         <file alias="waypoint.svg">resources/waypoint.svg</file>
         <file>resources/icons/qgroundcontrol.ico</file>
+        <file alias="service.png">resources/service.png</file>
+        <file alias="street.png">resources/street.png</file>
+        <file alias="measurement.png">resources/measurement.png</file>
+        <file alias="calculator.png">resources/calculator.png</file>
     </qresource>
     <qresource prefix="/res/firmware">
         <file alias="px4.png">resources/firmware/px4.png</file>
diff --git a/resources/calculator.png b/resources/calculator.png
new file mode 100644
index 0000000000000000000000000000000000000000..195b751688ec09942fc4a2f34dfd662811922db4
Binary files /dev/null and b/resources/calculator.png differ
diff --git a/resources/calculator.xcf b/resources/calculator.xcf
new file mode 100644
index 0000000000000000000000000000000000000000..67de6d6aa03d1ae0b37b5aa0255a20cb1855865a
Binary files /dev/null and b/resources/calculator.xcf differ
diff --git a/resources/measurement.png b/resources/measurement.png
new file mode 100644
index 0000000000000000000000000000000000000000..2eb51997c128a73a1f40a903a399cf3610525707
Binary files /dev/null and b/resources/measurement.png differ
diff --git a/resources/measurement.xcf b/resources/measurement.xcf
new file mode 100644
index 0000000000000000000000000000000000000000..6686e8453fe0fdc6a91c4124c935c507a3400e6e
Binary files /dev/null and b/resources/measurement.xcf differ
diff --git a/resources/service.png b/resources/service.png
new file mode 100644
index 0000000000000000000000000000000000000000..444c67d326c80b91f27aaac961aa5604c0bca744
Binary files /dev/null and b/resources/service.png differ
diff --git a/resources/service.xcf b/resources/service.xcf
new file mode 100644
index 0000000000000000000000000000000000000000..5e73d4c6bfd662d1552301c1b507f2ed3ad84100
Binary files /dev/null and b/resources/service.xcf differ
diff --git a/resources/street.png b/resources/street.png
new file mode 100644
index 0000000000000000000000000000000000000000..bdcb0b5675b3f0752db117dfbfe72454692137ea
Binary files /dev/null and b/resources/street.png differ
diff --git a/resources/street.xcf b/resources/street.xcf
new file mode 100644
index 0000000000000000000000000000000000000000..971719da4d2b01b577ca0674e61317d13d6eec41
Binary files /dev/null and b/resources/street.xcf differ
diff --git a/src/WimaView/WimaView.qml b/src/WimaView/WimaView.qml
index 419343dd33e159ecf087e0009442256035b2df31..c98e961ca47753d9d3659d8034d668b6a647ea6d 100644
--- a/src/WimaView/WimaView.qml
+++ b/src/WimaView/WimaView.qml
@@ -672,19 +672,19 @@ QGCView {
                             },
                             {
                                 name:                   qsTr("Measure"),
-                                iconSource:             "/qmlimages/Target.svg"
+                                iconSource:             "/res/measurement.png"
                             },
                             {
                                 name:                   qsTr("Service"),
-                                iconSource:             "/qmlimages/noFlyArea.svg"
+                                iconSource:             "/res/service.png"
                             },
                             {
                                 name:                   qsTr("Corridor"),
-                                iconSource:             "/qmlimages/noFlyArea.svg"
+                                iconSource:             "/res/street.png"
                             },
                             {
                                 name:                   qsTr("Calculate"),
-                                iconSource:             "/res/gear-white.svg"
+                                iconSource:             "/res/calculator.png"
                             },
                             {
                                 name:               qsTr("Center"),
diff --git a/src/ui/toolbar/.directory b/src/ui/toolbar/.directory
new file mode 100644
index 0000000000000000000000000000000000000000..5b37af66ec219a0fcd35ba723fe7abcd7d2a4368
--- /dev/null
+++ b/src/ui/toolbar/.directory
@@ -0,0 +1,4 @@
+[Dolphin]
+PreviewsShown=true
+Timestamp=2019,9,6,11,21,45
+Version=4
diff --git a/src/ui/toolbar/Images/measurement.svg b/src/ui/toolbar/Images/measurement.svg
new file mode 100644
index 0000000000000000000000000000000000000000..9fd49264e17cc19b5087af43948aa1253bb571c2
--- /dev/null
+++ b/src/ui/toolbar/Images/measurement.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
+ "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
+ width="1280.000000pt" height="1224.000000pt" viewBox="0 0 1280.000000 1224.000000"
+ preserveAspectRatio="xMidYMid meet">
+<g transform="translate(0.000000,1224.000000) scale(0.100000,-0.100000)"
+fill="#000000" stroke="none">
+<path d="M6255 11465 c-522 -409 -957 -744 -966 -745 -11 0 -208 245 -513 635
+-274 349 -501 637 -505 639 -4 3 -318 -241 -697 -541 -379 -300 -701 -553
+-715 -562 -25 -15 -1768 -2087 -2215 -2631 -305 -372 -436 -555 -547 -760 -60
+-111 -101 -272 -94 -375 5 -88 30 -220 58 -310 25 -83 95 -228 121 -251 17
+-16 21 -14 75 28 226 176 1843 1440 2666 2083 610 477 1007 780 1020 780 16 0
+234 -269 934 -1154 502 -635 913 -1158 913 -1163 0 -9 -1 -10 -475 -369 -815
+-617 -1688 -1296 -2460 -1913 -452 -361 -815 -658 -815 -666 0 -4 31 -37 68
+-72 200 -189 524 -304 752 -269 98 16 388 113 575 194 214 92 315 140 1964
+944 817 398 1492 723 1500 723 9 0 983 -1237 2241 -2845 1224 -1564 2230
+-2843 2237 -2842 16 3 1403 1087 1403 1097 0 4 -1231 1579 -2735 3501 -1504
+1922 -2733 3498 -2731 3504 1 5 432 345 956 755 524 410 955 750 957 756 6 19
+-447 160 -631 196 -146 28 -329 30 -439 5 -266 -63 -529 -229 -1230 -775 -114
+-89 -213 -162 -220 -162 -11 1 -111 127 -669 842 -82 104 -148 193 -148 197 0
+4 39 39 88 76 791 622 999 813 1140 1045 116 192 153 409 132 770 -19 342 -22
+380 -34 379 -6 0 -438 -335 -961 -744z"/>
+</g>
+</svg>