diff --git a/src/QGCPalette.cc b/src/QGCPalette.cc
index 6c54fea799dd5984588e165132a48ff5fab931b6..3b10e10fd1e0ae63fbeea3e8f80d36e7162401c8 100644
--- a/src/QGCPalette.cc
+++ b/src/QGCPalette.cc
@@ -59,8 +59,8 @@ void QGCPalette::_buildMap(void)
     DECLARE_QGC_COLOR(buttonHighlightText,  "#2c2c2c", "#ffffff", "#2c2c2c", "#000000")
     DECLARE_QGC_COLOR(primaryButton,        "#585858", "#8cb3be", "#585858", "#8cb3be")
     DECLARE_QGC_COLOR(primaryButtonText,    "#2c2c2c", "#000000", "#2c2c2c", "#000000")
-    DECLARE_QGC_COLOR(textField,            "#ffffff", "#ffffff", "#585858", "#ffffff")
-    DECLARE_QGC_COLOR(textFieldText,        "#808080", "#000000", "#bfbfbf", "#000000")
+    DECLARE_QGC_COLOR(textField,            "#ffffff", "#ffffff", "#707070", "#ffffff")
+    DECLARE_QGC_COLOR(textFieldText,        "#808080", "#000000", "#000000", "#000000")
     DECLARE_QGC_COLOR(mapButton,            "#585858", "#000000", "#585858", "#000000")
     DECLARE_QGC_COLOR(mapButtonHighlight,   "#585858", "#be781c", "#585858", "#be781c")
     DECLARE_QGC_COLOR(mapIndicator,         "#585858", "#be781c", "#585858", "#be781c")
diff --git a/src/QmlControls/QGCCheckBox.qml b/src/QmlControls/QGCCheckBox.qml
index ed602c1678742f9bf8b8f5fb08e9f0e6def34772..5dbfb55053e844a1024289677258c1220353def7 100644
--- a/src/QmlControls/QGCCheckBox.qml
+++ b/src/QmlControls/QGCCheckBox.qml
@@ -53,14 +53,24 @@ CheckBox {
 
             Rectangle {
                 id: baserect
-                gradient: Gradient {
+                property var enabledGradient: Gradient {
                     GradientStop {color: "#eee" ; position: 0}
                     GradientStop {color: control.pressed ? "#eee" : "#fff" ; position: 0.1}
                     GradientStop {color: "#fff" ; position: 1}
                 }
+                property var disabledGradient: Gradient {
+                    GradientStop {color: "#999" ; position: 0}
+                    GradientStop {color: __qgcPal.textField ; position: 0.1}
+                    GradientStop {color: __qgcPal.textField ; position: 0.9}
+                    GradientStop {color: "#999" ; position: 1}
+                }
+                gradient: control.enabled ? enabledGradient : disabledGradient
+
+
                 radius: ScreenTools.defaultFontPixelHeight * 0.16
                 anchors.fill: parent
                 border.color: control.activeFocus ? "#47b" : "#999"
+                opacity: control.enabled ? 1 : 0.5
             }
 
             Image {
diff --git a/src/QmlControls/QGCComboBox.qml b/src/QmlControls/QGCComboBox.qml
index a39c05b3d75519bf7019d51641738affbf3abd45..321df94ec2dcc0cb37010db2c1c869cebaa15e0d 100644
--- a/src/QmlControls/QGCComboBox.qml
+++ b/src/QmlControls/QGCComboBox.qml
@@ -40,9 +40,9 @@ Button {
         background: Rectangle {
             implicitWidth:  ScreenTools.implicitComboBoxWidth
             implicitHeight: ScreenTools.implicitComboBoxHeight
-            color:          control._qgcPal.button
-            border.width:   control._showBorder ? 1: 0
-            border.color:   control._qgcPal.buttonText
+            color:          control._qgcPal.textField
+            border.width:   enabled ? 1 : 0
+            border.color:   "#999"
 
             QGCColoredImage {
                 id:                     image
@@ -52,7 +52,7 @@ Button {
                 anchors.rightMargin:    _dropImageMargin
                 anchors.right:          parent.right
                 source:                 "/qmlimages/arrow-down.png"
-                color:                  control._qgcPal.buttonText
+                color:                  control._qgcPal.textFieldText
             }
         }
 
@@ -67,7 +67,7 @@ Button {
                 anchors.verticalCenter:     parent.verticalCenter
                 anchors.horizontalCenter:   centeredLabel ? parent.horizontalCenter : undefined
                 text:                       control.currentText
-                color:                      control._qgcPal.buttonText
+                color:                      control._qgcPal.textFieldText
                 font.pointSize:             pointSize
             }
         }
diff --git a/src/QmlControls/QGCTextField.qml b/src/QmlControls/QGCTextField.qml
index 7210f1654ae4a38e69e27420a01ffab8792d691f..d8043b4fc0c675f1be73492c9d830af129336013 100644
--- a/src/QmlControls/QGCTextField.qml
+++ b/src/QmlControls/QGCTextField.qml
@@ -61,6 +61,7 @@ TextField {
 
             Rectangle {
                 anchors.fill:           parent
+                border.width:           enabled ? 1 : 0
                 border.color:           root.activeFocus ? "#47b" : "#999"
                 color:                  qgcPal.textField
             }