diff --git a/.gitignore b/.gitignore
index 3184e1aaa05fe59a4a97865d24e7f9accf941260..2baa7745f491e5c87a5159c034c5766a093e3b0a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,7 +20,7 @@ qrc_*.cpp
 tmp
 debug
 release
-qgroundcontrol
+/qgroundcontrol
 mavlinkgen-build-desktop
 qgroundcontrol.xcodeproj/**
 doc/html
@@ -49,4 +49,7 @@ user_config.pri
 *.suo
 *.uhf.txt
 *.opensdf
-apmplanner2.xcodeproj/
+
+thirdParty/qserialport-build-desktop/
+thirdParty/qserialport/bin/
+thirdParty/qserialport/lib/
diff --git a/qml/resources/qgroundcontrol/toolbar/connect.png b/qml/resources/qgroundcontrol/toolbar/connect.png
new file mode 100644
index 0000000000000000000000000000000000000000..8572674974bcefde8dc4b54972a423a5a19837ff
Binary files /dev/null and b/qml/resources/qgroundcontrol/toolbar/connect.png differ
diff --git a/qml/resources/qgroundcontrol/toolbar/disconnect.png b/qml/resources/qgroundcontrol/toolbar/disconnect.png
new file mode 100644
index 0000000000000000000000000000000000000000..57f2f505da1eb32c90369f4fc9b154f7de5646f8
Binary files /dev/null and b/qml/resources/qgroundcontrol/toolbar/disconnect.png differ
diff --git a/qml/resources/qgroundcontrol/toolbar/donate.png b/qml/resources/qgroundcontrol/toolbar/donate.png
new file mode 100644
index 0000000000000000000000000000000000000000..80b1a14612ba76b405ec518f9c81148e6b24d28c
Binary files /dev/null and b/qml/resources/qgroundcontrol/toolbar/donate.png differ
diff --git a/qml/resources/qgroundcontrol/toolbar/flightdata.png b/qml/resources/qgroundcontrol/toolbar/flightdata.png
new file mode 100644
index 0000000000000000000000000000000000000000..aa8fb3663f815da198374f57b40db001778dc462
Binary files /dev/null and b/qml/resources/qgroundcontrol/toolbar/flightdata.png differ
diff --git a/qml/resources/qgroundcontrol/toolbar/flightplanner.png b/qml/resources/qgroundcontrol/toolbar/flightplanner.png
new file mode 100644
index 0000000000000000000000000000000000000000..72e1b40ec8414bb24275b5f8d592b4284184e764
Binary files /dev/null and b/qml/resources/qgroundcontrol/toolbar/flightplanner.png differ
diff --git a/qml/resources/qgroundcontrol/toolbar/hardwareconfig.png b/qml/resources/qgroundcontrol/toolbar/hardwareconfig.png
new file mode 100644
index 0000000000000000000000000000000000000000..56fb5619310d64ab6b454779df81a7824c32fa63
Binary files /dev/null and b/qml/resources/qgroundcontrol/toolbar/hardwareconfig.png differ
diff --git a/qml/resources/qgroundcontrol/toolbar/helpwizard.png b/qml/resources/qgroundcontrol/toolbar/helpwizard.png
new file mode 100644
index 0000000000000000000000000000000000000000..ac5c20a2a7c52fcb60a407c395919addf6202452
Binary files /dev/null and b/qml/resources/qgroundcontrol/toolbar/helpwizard.png differ
diff --git a/qml/resources/qgroundcontrol/toolbar/simulation.png b/qml/resources/qgroundcontrol/toolbar/simulation.png
new file mode 100644
index 0000000000000000000000000000000000000000..e8a1c31a04ab6f9f9267abbf1c0bd08771ef97ce
Binary files /dev/null and b/qml/resources/qgroundcontrol/toolbar/simulation.png differ
diff --git a/qml/resources/qgroundcontrol/toolbar/softwareconfig.png b/qml/resources/qgroundcontrol/toolbar/softwareconfig.png
new file mode 100644
index 0000000000000000000000000000000000000000..e2516db4060dee69ff7486243576d3749edfe97f
Binary files /dev/null and b/qml/resources/qgroundcontrol/toolbar/softwareconfig.png differ
diff --git a/qml/resources/qgroundcontrol/toolbar/terminal.png b/qml/resources/qgroundcontrol/toolbar/terminal.png
new file mode 100644
index 0000000000000000000000000000000000000000..bb639d3bd4c15454884a44cc664ca7585e99e3b7
Binary files /dev/null and b/qml/resources/qgroundcontrol/toolbar/terminal.png differ