diff --git a/src/FlightDisplay/FlightDisplayViewWidgets.qml b/src/FlightDisplay/FlightDisplayViewWidgets.qml
index 6b8309d87654a6c725c9f2abe0a0b4035b4d9538..9e2e7602517c1472ec6547163c87c50cc0bd8aef 100644
--- a/src/FlightDisplay/FlightDisplayViewWidgets.qml
+++ b/src/FlightDisplay/FlightDisplayViewWidgets.qml
@@ -441,7 +441,7 @@ Item {
 
             QGCLabel {
                 anchors.horizontalCenter: parent.horizontalCenter
-                color:      qgcPal.button
+                color:      _lightWidgetBorders ? qgcPal.mapWidgetBorderDark : qgcPal.mapWidgetBorderLight
                 text:       "Click in map to move vehicle"
                 visible:    _activeVehicle && _activeVehicle.guidedMode && _activeVehicle.flying
             }
diff --git a/src/ui/preferences/GeneralSettings.qml b/src/ui/preferences/GeneralSettings.qml
index 41741c4222e7646de5edd205438020eb29921de8..6a1f5ba30599da7b6b272e3716162be7be605865 100644
--- a/src/ui/preferences/GeneralSettings.qml
+++ b/src/ui/preferences/GeneralSettings.qml
@@ -43,22 +43,6 @@ Rectangle {
             anchors.margins:    ScreenTools.defaultFontPixelWidth
             spacing:            ScreenTools.defaultFontPixelHeight / 2
 
-            QGCLabel {
-                text:   qsTr("General Settings")
-                font.pointSize: ScreenTools.mediumFontPointSize
-            }
-
-            Rectangle {
-                height: 1
-                width:  parent.width
-                color:  qgcPal.text
-            }
-
-            Item {
-                height: ScreenTools.defaultFontPixelHeight / 2
-                width:  parent.width
-            }
-
             //-----------------------------------------------------------------
             //-- Base UI Font Point Size
             Row {
diff --git a/src/ui/preferences/LinkSettings.qml b/src/ui/preferences/LinkSettings.qml
index e3eb9a50ff6ec03902d2d5125df2c1671a3b7103..202d5edcd7802d027fc95aaf264c9ee13b9b23bf 100644
--- a/src/ui/preferences/LinkSettings.qml
+++ b/src/ui/preferences/LinkSettings.qml
@@ -59,19 +59,6 @@ Rectangle {
             width:              _linkRoot.width
             anchors.margins:    ScreenTools.defaultFontPixelWidth
             spacing:            ScreenTools.defaultFontPixelHeight / 2
-            QGCLabel {
-                text:   qsTr("Comm Link Settings")
-                font.pointSize: ScreenTools.mediumFontPointSize
-            }
-            Rectangle {
-                height: 1
-                width:  parent.width
-                color:  qgcPal.button
-            }
-            Item {
-                height: ScreenTools.defaultFontPixelHeight / 2
-                width:  parent.width
-            }
             Repeater {
                 model: QGroundControl.linkManager.linkConfigurations
                 delegate:
diff --git a/src/ui/preferences/MavlinkSettings.qml b/src/ui/preferences/MavlinkSettings.qml
index bbc5f79de40cf119270d8128e05ea436fbcf1e8d..349b9d3855f3436c4f7ae23472c0688da18fc411 100644
--- a/src/ui/preferences/MavlinkSettings.qml
+++ b/src/ui/preferences/MavlinkSettings.qml
@@ -40,15 +40,6 @@ Rectangle {
             anchors.margins:    ScreenTools.defaultFontPixelWidth
             anchors.left:       parent.left
             anchors.top:        parent.top
-            QGCLabel {
-                text:   qsTr("MavLink Settings")
-                font.pointSize: ScreenTools.mediumFontPointSize
-            }
-            Rectangle {
-                height: 1
-                width:  parent.width
-                color:  qgcPal.button
-            }
             //-----------------------------------------------------------------
             //-- System ID
             Row {