diff --git a/libs/breakpad/src/client/linux/crash_generation/crash_generation_client.cc b/libs/breakpad/src/client/linux/crash_generation/crash_generation_client.cc
index d8bfbbad27a7dee75db6325bdafb3db86f40c69a..30485b45fadf631d488780627403dd43abfdf664 100644
--- a/libs/breakpad/src/client/linux/crash_generation/crash_generation_client.cc
+++ b/libs/breakpad/src/client/linux/crash_generation/crash_generation_client.cc
@@ -58,7 +58,8 @@ class CrashGenerationClientImpl : public CrashGenerationClient {
     iov.iov_base = const_cast<void*>(blob);
     iov.iov_len = blob_size;
 
-    struct kernel_msghdr msg = { 0 };
+    struct kernel_msghdr msg;
+    memset(&msg, 0, sizeof(kernel_msghdr));
     msg.msg_iov = &iov;
     msg.msg_iovlen = 1;
     char cmsg[kControlMsgSize] = "";
diff --git a/libs/breakpad/src/client/linux/handler/exception_handler.cc b/libs/breakpad/src/client/linux/handler/exception_handler.cc
index d372a10ca1c48e6483517ea9844dc3e02631359e..69dd1ede2b215e30fc4e740f4ea1b8707bdec8c7 100644
--- a/libs/breakpad/src/client/linux/handler/exception_handler.cc
+++ b/libs/breakpad/src/client/linux/handler/exception_handler.cc
@@ -471,7 +471,7 @@ bool ExceptionHandler::HandleSignal(int /*sig*/, siginfo_t* info, void* uc) {
 // This is a public interface to HandleSignal that allows the client to
 // generate a crash dump. This function may run in a compromised context.
 bool ExceptionHandler::SimulateSignalDelivery(int sig) {
-  siginfo_t siginfo = {};
+  siginfo_t siginfo;
   // Mimic a trusted signal to allow tracing the process (see
   // ExceptionHandler::HandleSignal().
   siginfo.si_code = SI_USER;
diff --git a/libs/breakpad/src/client/linux/log/log.cc b/libs/breakpad/src/client/linux/log/log.cc
index fc23aa6d528a57f067a4748d44ae881224f04ad5..e029edec887d0d38c728664d24378e2ad67502e0 100644
--- a/libs/breakpad/src/client/linux/log/log.cc
+++ b/libs/breakpad/src/client/linux/log/log.cc
@@ -75,9 +75,10 @@ int writeToCrashLog(const char* buf) {
 
 int write(const char* buf, size_t nbytes) {
 #if defined(__ANDROID__)
-  return __android_log_write(ANDROID_LOG_WARN, kAndroidLogTag, buf);
+    (void)nbytes;
+    return __android_log_write(ANDROID_LOG_WARN, kAndroidLogTag, buf);
 #else
-  return sys_write(2, buf, nbytes);
+    return sys_write(2, buf, nbytes);
 #endif
 }
 
diff --git a/libs/breakpad/src/client/linux/microdump_writer/microdump_writer.cc b/libs/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
index 3764eec2cfee6fcb133b1bc0768cb701f23dcb8b..17e655de350359221e189af19ba976395dee6b42 100644
--- a/libs/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
+++ b/libs/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
@@ -449,7 +449,8 @@ class MicrodumpWriter {
     }
 
     // Copy as many bytes of |identifier| as will fit into a MDGUID
-    MDGUID module_identifier = {0};
+    MDGUID module_identifier;
+    memset(&module_identifier, 0, sizeof(MDGUID));
     memcpy(&module_identifier, &identifier_bytes[0],
            std::min(sizeof(MDGUID), identifier_bytes.size()));
 
diff --git a/libs/breakpad/src/client/linux/minidump_writer/linux_dumper.cc b/libs/breakpad/src/client/linux/minidump_writer/linux_dumper.cc
index 3b8c80ab79bbf2f43c2a746b49a9cd342d14661e..ea440f70087a077b31af951dbb15358d770ad3ba 100644
--- a/libs/breakpad/src/client/linux/minidump_writer/linux_dumper.cc
+++ b/libs/breakpad/src/client/linux/minidump_writer/linux_dumper.cc
@@ -874,7 +874,8 @@ bool LinuxDumper::HandleDeletedFileInMapping(char* path) const {
   char exe_link[NAME_MAX];
   if (!BuildProcPath(exe_link, pid_, "exe"))
     return false;
-  MappingInfo new_mapping = {0};
+  MappingInfo new_mapping;
+  memset(&new_mapping, 0, sizeof(MappingInfo));
   if (!SafeReadLink(exe_link, new_mapping.name))
     return false;
   char new_path[PATH_MAX];
diff --git a/src/FlightDisplay/FlightDisplayView.qml b/src/FlightDisplay/FlightDisplayView.qml
index 697a18c1177bbc86c9e0a18ab064def6443c0f7e..db2b793e170b9c43d25e5f9e5b8a991e3ca49319 100644
--- a/src/FlightDisplay/FlightDisplayView.qml
+++ b/src/FlightDisplay/FlightDisplayView.qml
@@ -407,7 +407,7 @@ QGCView {
             id:                 toolStrip
             anchors.leftMargin: ScreenTools.defaultFontPixelWidth
             anchors.left:       _panel.left
-            anchors.topMargin:  ScreenTools.toolbarHeight + _margins
+            anchors.topMargin:  ScreenTools.toolbarHeight + (_margins * 2)
             anchors.top:        _panel.top
             z:                  _panel.z + 4
             title:              qsTr("Fly")
diff --git a/src/QGCApplication.cc b/src/QGCApplication.cc
index d4b453f8ba6fc1157557d6aa196346987148a477..dd3a451e9a535291b06112fd282e8c40e5ff1ae8 100644
--- a/src/QGCApplication.cc
+++ b/src/QGCApplication.cc
@@ -144,10 +144,10 @@ static QObject* qgroundcontrolQmlGlobalSingletonFactory(QQmlEngine*, QJSEngine*)
 // breakpad support
 #include "client/linux/handler/exception_handler.h"
 
-static bool dumpCallback(const google_breakpad::MinidumpDescriptor& descriptor, void* context, bool succeeded)
+static bool dumpCallback(const google_breakpad::MinidumpDescriptor& descriptor, void* /*context*/, bool succeeded)
 {
-  qDebug() << "dumpCallback" << succeeded << descriptor.path();
-  return succeeded;
+    qDebug() << "dumpCallback" << succeeded << descriptor.path();
+    return succeeded;
 }
 #endif
 
diff --git a/src/QmlControls/ToolStrip.qml b/src/QmlControls/ToolStrip.qml
index 5f8746a9d263b6499063f479c64361bb6b27012f..4d7d9aeebd548193390277908f58a205f734adb0 100644
--- a/src/QmlControls/ToolStrip.qml
+++ b/src/QmlControls/ToolStrip.qml
@@ -19,6 +19,8 @@ Rectangle {
     width:      ScreenTools.isMobile ? ScreenTools.minTouchPixels : ScreenTools.defaultFontPixelWidth * 6
     height:     buttonStripColumn.height + (buttonStripColumn.anchors.margins * 2)
     radius:     _radius
+    border.width:   1
+    border.color:   qgcPal.globalTheme === QGCPalette.Light ? Qt.rgba(0,0,0,0.35) : Qt.rgba(1,1,1,0.35)
 
     property string title:              "Title"
     property alias  model:              repeater.model