diff --git a/src/QmlControls/QGCToolBarButton.qml b/src/QmlControls/QGCToolBarButton.qml
index 826a7729d089829b3e64fc474716723a191185ec..cf9003913a69142fe0f770a667a07104895da21b 100644
--- a/src/QmlControls/QGCToolBarButton.qml
+++ b/src/QmlControls/QGCToolBarButton.qml
@@ -7,7 +7,6 @@
  *
  ****************************************************************************/
 
-
 import QtQuick          2.3
 import QtQuick.Controls 2.4
 
@@ -18,20 +17,22 @@ import QGroundControl.ScreenTools   1.0
 Button {
     id:                 button
     height:             ScreenTools.defaultFontPixelHeight * 3
+    leftPadding:        _horizontalMargin
+    rightPadding:       _horizontalMargin
     autoExclusive:      true
 
     property bool logo: false
 
+    property real _horizontalMargin: ScreenTools.defaultFontPixelWidth
+
     background: Rectangle {
         anchors.fill: parent
         color:  logo ? qgcPal.brandingPurple : (checked ? qgcPal.buttonHighlight : Qt.rgba(0,0,0,0))
     }
 
     contentItem: Row {
-        spacing:                    ScreenTools.defaultFontPixelWidth
-        anchors.left:               button.left
-        anchors.leftMargin:         ScreenTools.defaultFontPixelWidth
-        anchors.verticalCenter:     button.verticalCenter
+        spacing:                ScreenTools.defaultFontPixelWidth
+        anchors.verticalCenter: button.verticalCenter
         QGCColoredImage {
             id:                     _icon
             height:                 ScreenTools.defaultFontPixelHeight * 2
@@ -50,5 +51,4 @@ Button {
             anchors.verticalCenter: parent.verticalCenter
         }
     }
-
 }