diff --git a/src/AutoPilotPlugins/APM/APMPowerComponent.qml b/src/AutoPilotPlugins/APM/APMPowerComponent.qml
index 3bb5028e5696c5185995071c4f7ab57f9c726277..8552e8c1e71b5bd751a4383e1d05bdab173616d9 100644
--- a/src/AutoPilotPlugins/APM/APMPowerComponent.qml
+++ b/src/AutoPilotPlugins/APM/APMPowerComponent.qml
@@ -214,10 +214,9 @@ SetupPage {
                 QGCLabel { text: qsTr("Battery monitor:") }
 
                 FactComboBox {
-                    id:                     monitorCombo
-                    Layout.minimumWidth:    _fieldWidth
-                    fact:                   battMonitor
-                    indexModel:             false
+                    id:         monitorCombo
+                    fact:       battMonitor
+                    indexModel: false
                 }
 
                 QGCLabel {
diff --git a/src/QmlControls/QGCComboBox.qml b/src/QmlControls/QGCComboBox.qml
index 73ed7a27ebde47e708e0ecb108be2f69db50f19d..a39c05b3d75519bf7019d51641738affbf3abd45 100644
--- a/src/QmlControls/QGCComboBox.qml
+++ b/src/QmlControls/QGCComboBox.qml
@@ -21,6 +21,8 @@ Button {
     property var    _qgcPal:            QGCPalette { colorGroupEnabled: enabled }
     property int    _horizontalPadding: ScreenTools.defaultFontPixelWidth
     property int    _verticalPadding:   Math.round(ScreenTools.defaultFontPixelHeight / 2)
+    property real   _dropImageWidth:    ScreenTools.defaultFontPixelHeight / 2
+    property real   _dropImageMargin:   _dropImageWidth / 2
     property var    __popup:            popup
 
     signal activated(int index)
@@ -44,10 +46,10 @@ Button {
 
             QGCColoredImage {
                 id:                     image
-                width:                  ScreenTools.defaultFontPixelHeight / 2
-                height:                 width
+                width:                  _dropImageWidth
+                height:                 _dropImageWidth
                 anchors.verticalCenter: parent.verticalCenter
-                anchors.rightMargin:    width / 2
+                anchors.rightMargin:    _dropImageMargin
                 anchors.right:          parent.right
                 source:                 "/qmlimages/arrow-down.png"
                 color:                  control._qgcPal.buttonText
@@ -56,7 +58,7 @@ Button {
 
         /*! This defines the label of the button.  */
         label: Item {
-            implicitWidth:  text.implicitWidth
+            implicitWidth:  text.implicitWidth + _dropImageWidth
             implicitHeight: text.implicitHeight
             baselineOffset: text.y + text.baselineOffset