diff --git a/src/ui/toolbar/MainToolBar.qml b/src/ui/toolbar/MainToolBar.qml
index 8d6e9aed99b8ff466a72c9086f40218871ede385..1953f5e7ebc63dc8bfb13873d3795855859763fb 100644
--- a/src/ui/toolbar/MainToolBar.qml
+++ b/src/ui/toolbar/MainToolBar.qml
@@ -67,7 +67,7 @@ Rectangle {
     function getBatteryColor() {
         if(activeVehicle) {
             if(activeVehicle.battery.percentRemaining.value > 75) {
-                return colorGreen
+                return qgcPal.text
             }
             if(activeVehicle.battery.percentRemaining.value > 50) {
                 return colorOrange
diff --git a/src/ui/toolbar/MainToolBarIndicators.qml b/src/ui/toolbar/MainToolBarIndicators.qml
index 8b059e70d2fe538f1ed613a54c30bfc8ddf25afd..7c209998f53555972c8667efb6a13c20d0ee66b8 100644
--- a/src/ui/toolbar/MainToolBarIndicators.qml
+++ b/src/ui/toolbar/MainToolBarIndicators.qml
@@ -24,19 +24,6 @@ Row {
 
     QGCPalette { id: qgcPal }
 
-    //-------------------------------------------------------------------------
-    function getSatStrength(hdop) {
-        if (hdop <= 1.0)
-            return 100
-        if (hdop <= 1.4)
-            return 75
-        if (hdop <= 1.8)
-            return 50
-        if (hdop <= 3.0)
-            return 25
-        return 0
-    }
-
     //-------------------------------------------------------------------------
     function getMessageColor() {
         if (activeVehicle) {
@@ -130,38 +117,40 @@ Row {
     //-- GPS Indicator
     Item {
         id:     satelitte
-        width:  gpsRow.width * 1.1
+        width:  (gpsValuesColumn.x + gpsValuesColumn.width) * 1.1
         height: mainWindow.tbCellHeight
-        Row {
-            id:         gpsRow
-            height:     parent.height
-            spacing:    ScreenTools.defaultFontPixelWidth
-            QGCColoredImage {
-                id:             gpsIcon
-                source:         "/qmlimages/Gps.svg"
-                fillMode:       Image.PreserveAspectFit
-                width:          mainWindow.tbCellHeight * 0.65
-                height:         mainWindow.tbCellHeight * 0.5
-                sourceSize.height: height
-                opacity:        (activeVehicle && activeVehicle.gps.count.value >= 0) ? 1 : 0.5
-                color:          qgcPal.buttonText
-                anchors.verticalCenter: parent.verticalCenter
+
+        QGCColoredImage {
+            id:             gpsIcon
+            source:         "/qmlimages/Gps.svg"
+            fillMode:       Image.PreserveAspectFit
+            width:          mainWindow.tbCellHeight * 0.65
+            height:         mainWindow.tbCellHeight * 0.5
+            sourceSize.height: height
+            opacity:        (activeVehicle && activeVehicle.gps.count.value >= 0) ? 1 : 0.5
+            color:          qgcPal.buttonText
+            anchors.verticalCenter: parent.verticalCenter
+        }
+
+        Column {
+            id:                     gpsValuesColumn
+            anchors.verticalCenter: parent.verticalCenter
+            anchors.leftMargin:     ScreenTools.defaultFontPixelWidth / 2
+            anchors.left:           gpsIcon.right
+
+            QGCLabel {
+                visible:    activeVehicle && !isNaN(activeVehicle.gps.hdop.value)
+                color:      qgcPal.buttonText
+                text:       activeVehicle ? activeVehicle.gps.count.valueString : ""
             }
-            SignalStrength {
-                size:           mainWindow.tbCellHeight * 0.5
-                percent:        activeVehicle ? getSatStrength(activeVehicle.gps.hdop.value) : ""
-                anchors.verticalCenter: parent.verticalCenter
+
+            QGCLabel {
+                visible:    activeVehicle && !isNaN(activeVehicle.gps.hdop.value)
+                color:      qgcPal.buttonText
+                text:       activeVehicle ? activeVehicle.gps.hdop.value.toFixed(1) : ""
             }
-        }
-        QGCLabel {
-            anchors.top:        parent.top
-            anchors.leftMargin: ScreenTools.defaultFontPixelWidth
-            anchors.horizontalCenter: parent.horizontalCenter
-            visible:            activeVehicle && !isNaN(activeVehicle.gps.hdop.value)
-            font.pointSize:     ScreenTools.smallFontPointSize
-            color:              qgcPal.buttonText
-            text:               activeVehicle ? activeVehicle.gps.hdop.value.toFixed(1) : ""
-        }
+        } // Column
+
         MouseArea {
             anchors.fill:   parent
             onClicked: {