diff --git a/src/MissionEditor/MissionSettingsEditor.qml b/src/MissionEditor/MissionSettingsEditor.qml
index 729370c2a8699c1eb167de54c750ac2fd0533d4d..b209b6e113f13d30339a7112bea2b3bbfea00c22 100644
--- a/src/MissionEditor/MissionSettingsEditor.qml
+++ b/src/MissionEditor/MissionSettingsEditor.qml
@@ -53,10 +53,7 @@ Rectangle {
                     anchors.top:    parent.top
                     spacing:        _margin
 
-                    QGCLabel {
-                        text: qsTr("Planned Home Position")
-                        color: qgcPal.buttonHighlight
-                    }
+                    QGCLabel { text: qsTr("Planned Home Position") }
 
                     Rectangle {
                         anchors.left:   parent.left
@@ -96,7 +93,6 @@ Rectangle {
 
                     QGCLabel {
                         text:           qsTr("Vehicle Info")
-                        color:          qgcPal.buttonHighlight
                         visible:        _multipleFirmware
                     }
 
diff --git a/src/MissionEditor/SurveyItemEditor.qml b/src/MissionEditor/SurveyItemEditor.qml
index 7d442e427eea01a58fdf7339af2f154949a06bb6..75f952acac609ad749d4e1c41a34d52e6d40a2d6 100644
--- a/src/MissionEditor/SurveyItemEditor.qml
+++ b/src/MissionEditor/SurveyItemEditor.qml
@@ -286,7 +286,7 @@ Rectangle {
             }
         }
 
-        QGCLabel { text: qsTr("Camera"); color: qgcPal.buttonHighlight; visible: gridTypeCombo.currentIndex !== _gridTypeManual}
+        QGCLabel { text: qsTr("Camera"); visible: gridTypeCombo.currentIndex !== _gridTypeManual}
 
         Rectangle {
             anchors.left:   parent.left
@@ -420,7 +420,7 @@ Rectangle {
                 }
             }
 
-            QGCLabel { text: qsTr("Grid"); color: qgcPal.buttonHighlight;}
+            QGCLabel { text: qsTr("Grid") }
 
             Rectangle {
                 anchors.left:   parent.left
@@ -523,7 +523,7 @@ Rectangle {
             spacing:        _margin
             visible:        gridTypeCombo.currentIndex == _gridTypeManual
 
-            QGCLabel { text: qsTr("Grid"); color: qgcPal.buttonHighlight;}
+            QGCLabel { text: qsTr("Grid") }
 
             Rectangle {
                 anchors.left:   parent.left
@@ -547,7 +547,7 @@ Rectangle {
                 onClicked:      missionItem.gridAltitudeRelative = checked
             }
 
-            QGCLabel { text: qsTr("Camera"); color: qgcPal.buttonHighlight;}
+            QGCLabel { text: qsTr("Camera") }
 
             Rectangle {
                 anchors.left:   parent.left
@@ -578,7 +578,7 @@ Rectangle {
             }
         }
 
-        QGCLabel { text: qsTr("Polygon"); color: qgcPal.buttonHighlight;}
+        QGCLabel { text: qsTr("Polygon") }
 
         Rectangle {
             anchors.left:   parent.left
@@ -621,7 +621,7 @@ Rectangle {
             }
         }
 
-        QGCLabel { text: qsTr("Statistics"); color: qgcPal.buttonHighlight;}
+        QGCLabel { text: qsTr("Statistics") }
 
         Rectangle {
             anchors.left:   parent.left
diff --git a/src/QmlControls/QGCComboBox.qml b/src/QmlControls/QGCComboBox.qml
index 8b00e725da12a41aba40d6e064aff8a779c58293..9950708b4bca2c8efbd8cbea510649343ed5bc93 100644
--- a/src/QmlControls/QGCComboBox.qml
+++ b/src/QmlControls/QGCComboBox.qml
@@ -19,7 +19,7 @@ ComboBox {
 
         background: Item {
             implicitWidth:      Math.round(ScreenTools.defaultFontPixelWidth * 4.5)
-            implicitHeight:     ScreenTools.isMobile ? Math.max(25, Math.round(ScreenTools.defaultFontPixelHeight * 2)) : Math.max(25, Math.round(ScreenTools.defaultFontPixelHeight * 1.2))
+            implicitHeight:     Math.round(ScreenTools.defaultFontPixelHeight * (ScreenTools.isMobile ? 2 : 1.2))
 
             Rectangle {
                 anchors.fill:   parent
diff --git a/src/QmlControls/QGCTextField.qml b/src/QmlControls/QGCTextField.qml
index 6542d290b1dc62d244167320a81449a89d04751d..502e428be11c2cdc92659363de48d45a4db65da9 100644
--- a/src/QmlControls/QGCTextField.qml
+++ b/src/QmlControls/QGCTextField.qml
@@ -26,7 +26,8 @@ TextField {
     QGCPalette { id: qgcPal; colorGroupEnabled: enabled }
 
     textColor:          qgcPal.textFieldText
-    height:             Math.round(Math.max(25, ScreenTools.defaultFontPixelHeight * (ScreenTools.isMobile ? 2.5 : 1.2)))
+
+    implicitHeight: Math.round(ScreenTools.defaultFontPixelHeight * (ScreenTools.isMobile ? 2 : 1.2))
 
     QGCLabel {
         id:             unitsLabelWidthGenerator
diff --git a/src/QmlControls/ToolStrip.qml b/src/QmlControls/ToolStrip.qml
index 337b1b40fd5883da38e1ce9ddca5da3c539a9686..89ae07a46b4beaf8a623a21bcfc3bdcdd6910a14 100644
--- a/src/QmlControls/ToolStrip.qml
+++ b/src/QmlControls/ToolStrip.qml
@@ -48,12 +48,13 @@ Rectangle {
     }
 
     MouseArea {
-        x:          -_root.x
-        y:          -_root.y
-        width:      _root.parent.width
-        height:     _root.parent.height
-        visible:    dropPanel.visible
-        onClicked:  dropPanel.hide()
+        x:                  -_root.x
+        y:                  -_root.y
+        width:              _root.parent.width
+        height:             _root.parent.height
+        visible:            dropPanel.visible
+        onClicked:          dropPanel.hide()
+        preventStealing:    true
     }
 
     Column {
@@ -144,11 +145,15 @@ Rectangle {
                     }
 
                     MouseArea {
-                        anchors.left:   parent.left
-                        anchors.right:  parent.right
-                        anchors.top:    parent.top
-                        height:         parent.height + (_showOptionalElements? buttonLabel.height + buttonColumn.spacing : 0)
-                        visible:        _root.buttonEnabled ? _root.buttonEnabled[index] : true
+                        // Size of mouse area is expanded to make touch easier
+                        anchors.leftMargin:     buttonStripColumn.margins
+                        anchors.rightMargin:    buttonStripColumn.margins
+                        anchors.left:           parent.left
+                        anchors.right:          parent.right
+                        anchors.top:            parent.top
+                        height:                 parent.height + (_showOptionalElements? buttonLabel.height + buttonColumn.spacing : 0)
+                        visible:                _root.buttonEnabled ? _root.buttonEnabled[index] : true
+                        preventStealing:        true
 
                         onClicked: {
                             if (modelData.dropPanelComponent === undefined) {