diff --git a/src/ui/QGCToolBar.cc b/src/ui/QGCToolBar.cc
index a5d266ca7c3ac45b93205983030d769b46ef8f47..4dbb791053aede059ae81369b95d230ec5845370 100644
--- a/src/ui/QGCToolBar.cc
+++ b/src/ui/QGCToolBar.cc
@@ -102,7 +102,7 @@ void QGCToolBar::createUI()
     toolBarTimeoutLabel->setObjectName("toolBarTimeoutLabel");
     addWidget(toolBarTimeoutLabel);
 
-    toolBarSafetyLabel = new QLabel("SAFE", this);
+    toolBarSafetyLabel = new QLabel("----", this);
     toolBarSafetyLabel->setToolTip(tr("Vehicle safety state"));
     toolBarSafetyLabel->setAlignment(Qt::AlignCenter);
     addWidget(toolBarSafetyLabel);
@@ -364,7 +364,14 @@ void QGCToolBar::updateView()
     }
     else
     {
-        toolBarSafetyLabel->setStyleSheet("QLabel {color: #14C814;}");
+        if (MainWindow::instance()->getStyle() == MainWindow::QGC_MAINWINDOW_STYLE_LIGHT)
+        {
+            toolBarSafetyLabel->setStyleSheet("QLabel {color: #0D820D;}");
+        }
+        else
+        {
+            toolBarSafetyLabel->setStyleSheet("QLabel {color: #14C814;}");
+        }
         toolBarSafetyLabel->setText(tr("SAFE"));
     }
 
diff --git a/src/ui/linechart/ChartPlot.cc b/src/ui/linechart/ChartPlot.cc
index 71bee45c3b1b1419be1e059f977df215ca304778..1c6ab0793ea3cddb6cadd9ed5cda59401ba48635 100644
--- a/src/ui/linechart/ChartPlot.cc
+++ b/src/ui/linechart/ChartPlot.cc
@@ -110,8 +110,8 @@ void ChartPlot::applyColorScheme(MainWindow::QGC_MAINWINDOW_STYLE style)
     if (style == MainWindow::QGC_MAINWINDOW_STYLE_LIGHT)
     {
         // Set the coloring of the area selector for zooming.
-        zoomer->setRubberBandPen(QPen(Qt::darkRed, zoomerWidth, Qt::DotLine));
-        zoomer->setTrackerPen(QPen(Qt::darkRed));
+        zoomer->setRubberBandPen(QPen(QColor(0x37, 0x9A, 0xC3), zoomerWidth, Qt::DotLine));
+        zoomer->setTrackerPen(QPen(QColor(0x37, 0x9A, 0xC3)));
 
         // Set canvas background
         setCanvasBackground(QColor(0xFF, 0xFF, 0xFF));
@@ -123,8 +123,8 @@ void ChartPlot::applyColorScheme(MainWindow::QGC_MAINWINDOW_STYLE style)
     else
     {
         // Set the coloring of the area selector for zooming.
-        zoomer->setRubberBandPen(QPen(Qt::red, zoomerWidth, Qt::DotLine));
-        zoomer->setTrackerPen(QPen(Qt::red));
+        zoomer->setRubberBandPen(QPen(QColor(0xB8, 0xD3, 0xE6), zoomerWidth, Qt::DotLine));
+        zoomer->setTrackerPen(QPen(QColor(0xB8, 0xD3, 0xE6)));
 
         // Set canvas background
         setCanvasBackground(QColor(0, 0, 0));