diff --git a/src/QmlControls/QGCToolBarButton.qml b/src/QmlControls/QGCToolBarButton.qml
index dbe704477c334585159815d62ee4919fd39ebead..0bfa181400d566c7d8115951b9773bd49b698e02 100644
--- a/src/QmlControls/QGCToolBarButton.qml
+++ b/src/QmlControls/QGCToolBarButton.qml
@@ -3,12 +3,14 @@ import QtQuick.Controls 1.2
 import QtQuick.Controls.Styles 1.2
 import QtQuick.Controls.Private 1.0
 
+import QGroundControl.Controls 1.0
 import QGroundControl.Palette 1.0
 
-Button {
+QGCButton {
     id: button
     property bool repaintChevron: false
     property var  __qgcPal: QGCPalette { colorGroupEnabled: enabled }
+    property bool showHighlight: __showHighlight
     style: ButtonStyle {
         background: Item {
             anchors.margins: 3
@@ -21,6 +23,7 @@ Button {
                     onHoveredChanged: chevron.requestPaint()
                     onPressedChanged: chevron.requestPaint()
                     onCheckedChanged: chevron.requestPaint()
+                    onShowHighlightChanged: chevron.requestPaint()
                     onRepaintChevronChanged: {
                         if(repaintChevron) {
                             chevron.requestPaint()
@@ -42,7 +45,7 @@ Button {
                     context.lineTo(0, height);
                     context.closePath();
                     context.strokeStyle = __qgcPal.windowShade
-                    context.fillStyle = (button.hovered && !button.pressed) ? __qgcPal.buttonHighlight : (button.checked ? __qgcPal.buttonHighlight : __qgcPal.button);
+                    context.fillStyle = showHighlight ? __qgcPal.buttonHighlight : (button.checked ? __qgcPal.buttonHighlight : __qgcPal.button);
                     context.stroke();
                     context.fill();
                 }
@@ -52,7 +55,7 @@ Button {
             text: button.text
             horizontalAlignment: Text.AlignHCenter
             verticalAlignment: Text.AlignVCenter
-            color: (button.hovered && !button.pressed) ? __qgcPal.buttonHighlightText : (button.checked ? __qgcPal.primaryButtonText : __qgcPal.buttonText)
+            color: showHighlight ? __qgcPal.buttonHighlightText : (button.checked ? __qgcPal.primaryButtonText : __qgcPal.buttonText)
         }
     }
 }
diff --git a/src/ui/toolbar/MainToolBar.qml b/src/ui/toolbar/MainToolBar.qml
index 3ff0ea53757f3cd576be99b3d3a3563e8361eeae..c044fbc170996e72cc9d1f76bf9ec09a99a5755b 100644
--- a/src/ui/toolbar/MainToolBar.qml
+++ b/src/ui/toolbar/MainToolBar.qml
@@ -46,11 +46,15 @@ Rectangle {
 
     property var colorBlue:       "#1a6eaa"
     property var colorGreen:      "#079527"
-    property var colorGreenText:  "#00d930"
     property var colorRed:        "#a81a1b"
     property var colorOrange:     "#a76f26"
     property var colorWhite:      "#f0f0f0"
 
+    property var colorOrangeText: (qgcPal.globalTheme === QGCPalette.Light) ? "#b75711" : "#ea8225"
+    property var colorRedText:    (qgcPal.globalTheme === QGCPalette.Light) ? "#ee1112" : "#ef2526"
+    property var colorGreenText:  (qgcPal.globalTheme === QGCPalette.Light) ? "#046b1b" : "#00d930"
+    property var colorWhiteText:  (qgcPal.globalTheme === QGCPalette.Light) ? "#343333" : "#f0f0f0"
+
     id: toolBarHolder
     color: qgcPal.windowShade
 
@@ -390,7 +394,7 @@ Rectangle {
                         font.pointSize: 12 * dpiFactor
                         font.weight: Font.DemiBold
                         anchors.centerIn: parent
-                        color: (mainToolBar.systemArmed) ? colorRed : colorGreen
+                        color: (mainToolBar.systemArmed) ? colorOrangeText : colorGreenText
                     }
                 }
 
@@ -409,7 +413,7 @@ Rectangle {
                         font.pointSize: 12 * dpiFactor
                         font.weight: Font.DemiBold
                         anchors.centerIn: parent
-                        color: (mainToolBar.currentState === "STANDBY") ? colorGreen : colorRed
+                        color: (mainToolBar.currentState === "STANDBY") ? colorGreenText : colorRedText
                     }
                 }
 
@@ -431,7 +435,7 @@ Rectangle {
                     font.weight: Font.DemiBold
                     anchors.horizontalCenter: parent.horizontalCenter
                     anchors.verticalCenter: parent.verticalCenter
-                    color: qgcPal.text
+                    color: colorWhiteText
                 }
             }
 
@@ -452,7 +456,7 @@ Rectangle {
                     font.weight: Font.DemiBold
                     anchors.verticalCenter: parent.verticalCenter
                     anchors.horizontalCenter: parent.horizontalCenter
-                    color: colorRed
+                    color: colorRedText
                 }
             }
         }