diff --git a/src/QmlControls/QGCTabButton.qml b/src/QmlControls/QGCTabButton.qml
index 88e56b99351b26688a7042646dd3b6ab80ff75b8..ab3be67154c916178270b4c75ec03bf2eecadbef 100644
--- a/src/QmlControls/QGCTabButton.qml
+++ b/src/QmlControls/QGCTabButton.qml
@@ -1,33 +1,56 @@
-import QtQuick                      2.12
-import QtQuick.Controls             2.12
-import QtQuick.Controls.impl        2.12
-import QtQml                        2.12
+/****************************************************************************
+ *
+ * (c) 2009-2020 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+ *
+ * QGroundControl is licensed according to the terms in the file
+ * COPYING.md in the root of the source code directory.
+ *
+ ****************************************************************************/
+
+import QtQuick                  2.12
+import QtQuick.Controls         2.12
+import QtQuick.Controls.impl    2.12
+import QtQuick.Templates        2.12 as T
 
-import QGroundControl               1.0
-import QGroundControl.Palette       1.0
-import QGroundControl.Controls      1.0
 import QGroundControl.ScreenTools   1.0
+import QGroundControl.Palette       1.0
+
+T.TabButton {
+    id: control
+
+    implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset,
+                            implicitContentWidth + leftPadding + rightPadding)
+    implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
+                             implicitContentHeight + topPadding + bottomPadding)
+
+    QGCPalette { id: qgcPal; colorGroupEnabled: enabled }
 
-TabButton {
-    id:             control
     font.pointSize: ScreenTools.defaultFontPointSize
     font.family:    ScreenTools.normalFontFamily
-    icon.color:     _showHighlight ? qgcPal.buttonHighlightText : qgcPal.buttonText
 
-    property bool _showHighlight: (pressed | hovered | checked)
+    padding: 6
+    spacing: 6
+
+    //icon.width: 24
+    icon.height: ScreenTools.defaultFontPixelHeight
+    icon.color: checked ? qgcPal.buttonHighlightText : qgcPal.buttonText
 
-    QGCPalette { id: qgcPal; colorGroupEnabled: enabled }
 
     contentItem: IconLabel {
-        spacing:    control.spacing
-        mirrored:   control.mirrored
-        display:    control.display
-        icon:       control.icon
-        font:       control.font
-        color:      _showHighlight ? qgcPal.buttonHighlightText : qgcPal.buttonText
+        spacing: control.spacing
+        mirrored: control.mirrored
+        display: control.display
+
+        icon: control.icon
+        text: control.text
+        font: control.font
+        color: checked ? qgcPal.buttonHighlightText : qgcPal.buttonText
     }
 
     background: Rectangle {
-        color: _showHighlight ? qgcPal.buttonHighlight : qgcPal.button
+        implicitHeight: 40
+        color: checked ? qgcPal.buttonHighlight : qgcPal.button
+        /*color: Color.blend(control.checked ? control.palette.window : control.palette.dark,
+                                             control.palette.mid, control.down ? 0.5 : 0.0)*/
     }
 }