diff --git a/src/FlightMap/Widgets/QGCInstrumentWidget.qml b/src/FlightMap/Widgets/QGCInstrumentWidget.qml
index 50b4718bc2be00d6989b0b83ea1fb3776edae01f..c7d3bc263bda7f4d01dcddfb4a6d3030251c40b4 100644
--- a/src/FlightMap/Widgets/QGCInstrumentWidget.qml
+++ b/src/FlightMap/Widgets/QGCInstrumentWidget.qml
@@ -52,14 +52,14 @@ Item {
         anchors.right:      parent.right
         anchors.bottom:     parent.bottom
         height:             root.size
-        width:              instruments.width + 8
+        width:              instruments.width + ScreenTools.defaultFontPixelSize
         radius:             root.size / 2
         visible:            _isVisible
         color:              isSatellite ? Qt.rgba(1,1,1,0.5) : Qt.rgba(0,0,0,0.5)
         Row {
             id:                 instruments
             height:             parent.height
-            spacing:            4
+            spacing:            ScreenTools.defaultFontPixelSize / 2
             anchors.horizontalCenter:   parent.horizontalCenter
             QGCAttitudeWidget {
                 id:             attitude
@@ -87,9 +87,9 @@ Item {
         id:                 openButton
         anchors.right:      parent.right
         anchors.bottom:     parent.bottom
-        height:             24
-        width:              24
-        radius:             4
+        height:             ScreenTools.defaultFontPixelSize * 2
+        width:              ScreenTools.defaultFontPixelSize * 2
+        radius:             ScreenTools.defaultFontPixelSize / 3
         visible:            !_isVisible
         color:              isSatellite ? Qt.rgba(1,1,1,0.5) : Qt.rgba(0,0,0,0.5)
         Image {
diff --git a/src/FlightMap/Widgets/QGCPitchIndicator.qml b/src/FlightMap/Widgets/QGCPitchIndicator.qml
index a0f05a6ae47eeabe3630a20cb4dc7ea067fef4e3..884ec64acd638af1534c43614e57d125c6b505da 100644
--- a/src/FlightMap/Widgets/QGCPitchIndicator.qml
+++ b/src/FlightMap/Widgets/QGCPitchIndicator.qml
@@ -34,13 +34,15 @@ import QGroundControl.Controls 1.0
 Rectangle {
     property real pitchAngle:       0
     property real rollAngle:        0
-    property real size:             100
+    property real size:             _defaultSize
     property real _reticleHeight:   1
     property real _reticleSpacing:  size * 0.15
     property real _reticleSlot:     _reticleSpacing + _reticleHeight
     property real _longDash:        size * 0.40
     property real _shortDash:       size * 0.25
-    property real _fontSize:        ScreenTools.defaultFontPixelSize * (size / 100)
+    property real _fontSize:        ScreenTools.defaultFontPixelSize * (size / _defaultSize)
+
+    property real _defaultSize:     ScreenTools.isAndroid ? 300 : 100
 
     height: size * 0.9
     width:  size