diff --git a/src/AutoPilotPlugins/PX4/SensorsComponent.qml b/src/AutoPilotPlugins/PX4/SensorsComponent.qml
index bce10ff337739ca6e47f6c471e61715b0b0cd720..3b3dccac13da4d691d27a5568f9746f600c71932 100644
--- a/src/AutoPilotPlugins/PX4/SensorsComponent.qml
+++ b/src/AutoPilotPlugins/PX4/SensorsComponent.qml
@@ -57,8 +57,8 @@ QGCView {
     // Used to pass help text to the preCalibrationDialog dialog
     property string preCalibrationDialogHelp
 
-    readonly property int sideBarH1PointSize: (ScreenTools.defaultFontPizelSize * 1.3 + 0.5)
-    readonly property int mainTextH1PointSize: (ScreenTools.defaultFontPizelSize * 1.5 + 0.5)
+    readonly property int sideBarH1PointSize:  ScreenTools.mediumFontPixelSize
+    readonly property int mainTextH1PointSize: ScreenTools.mediumFontPixelSize // Seems to be unused
 
     readonly property int rotationColumnWidth: 250
     readonly property var rotations: [
diff --git a/src/ui/toolbar/MainToolBar.cc b/src/ui/toolbar/MainToolBar.cc
index 0381943a66e02d2b716c79d74a25baeaed623e5f..845662df04e1db7cb4674d09762fa4c421ae2f37 100644
--- a/src/ui/toolbar/MainToolBar.cc
+++ b/src/ui/toolbar/MainToolBar.cc
@@ -31,6 +31,7 @@ This file is part of the QGROUNDCONTROL project
 #include <QQmlEngine>
 
 #include "MainToolBar.h"
+#include "ScreenTools.h"
 #include "MainWindow.h"
 #include "UASMessageView.h"
 #include "UASMessageHandler.h"
@@ -63,6 +64,8 @@ MainToolBar::MainToolBar(QWidget* parent)
     if(pl) {
         pl->setContentsMargins(0,0,0,0);
     }
+    setMinimumHeight(40 * ScreenTools::pixelSizeFactor_s());
+    setMaximumHeight(40 * ScreenTools::pixelSizeFactor_s());
     // Tool Bar Preferences
     QSettings settings;
     settings.beginGroup(TOOL_BAR_SETTINGS_GROUP);