File 2000-applet.patch of Package bluedevil6

diff --git a/src/applet/package/contents/ui/FullRepresentation.qml b/src/applet/package/contents/ui/FullRepresentation.qml
index 167bb2bb2f79a006973d2fbaa644cb25da25c767..65e2345b96f768947b92da63c390da0e57b58ab5 100644
--- a/src/applet/package/contents/ui/FullRepresentation.qml
+++ b/src/applet/package/contents/ui/FullRepresentation.qml
@@ -28,6 +28,7 @@ PlasmaExtras.Representation {
     required property PlasmaCore.Action toggleBluetoothAction
 
     readonly property bool emptyList: BluezQt.Manager.devices.length === 0
+    readonly property bool hasHeader: Plasmoid.containmentDisplayHints & PlasmaCore.Types.ContainmentDrawsPlasmoidHeading
 
     implicitWidth: Kirigami.Units.gridUnit * 24
     implicitHeight: Kirigami.Units.gridUnit * 24
@@ -79,7 +80,7 @@ PlasmaExtras.Representation {
         addDeviceAction: root.addDeviceAction
         toggleBluetoothAction: root.toggleBluetoothAction
 
-        visible: BluezQt.Manager.adapters.length > 0
+        visible: !root.hasHeader && BluezQt.Manager.adapters.length > 0
         focus: true
     }
 
@@ -169,15 +170,18 @@ PlasmaExtras.Representation {
                     }
 
                     helpfulAction: {
-                        if (BluezQt.Manager.rfkill.state === BluezQt.Rfkill.Unknown) {
-                            return null;
-                        } else if (BluezQt.Manager.bluetoothBlocked) {
-                            return toggleBluetoothAction;
-                        } else if (root.emptyList) {
-                            return addBluetoothDeviceAction;
-                        } else {
-                            return null;
+                        if (!root.hasHeader) {
+                            if (BluezQt.Manager.rfkill.state === BluezQt.Rfkill.Unknown) {
+                                return null;
+                            }
+                            if (BluezQt.Manager.bluetoothBlocked) {
+                                return toggleBluetoothAction;
+                            }
+                            if (root.emptyList) {
+                                return addBluetoothDeviceAction;
+                            }
                         }
+                        return null;
                     }
                 }
             }
diff --git a/src/applet/package/contents/ui/main.qml b/src/applet/package/contents/ui/main.qml
index b57daeb7e834a70f9df09ae7130326945298880b..d75ce15013a64538a4b1e414493dfc3737c38633 100644
--- a/src/applet/package/contents/ui/main.qml
+++ b/src/applet/package/contents/ui/main.qml
@@ -105,14 +105,18 @@ PlasmoidItem {
             id: addDeviceAction
             text: i18n("Pair Device…")
             icon.name: "list-add-symbolic"
+            priority: PlasmaCore.Action.HighPriority
             visible: !BluezQt.Manager.bluetoothBlocked
-            onTriggered: checked => PlasmaBt.LaunchApp.launchWizard()
+            onTriggered: PlasmaBt.LaunchApp.launchWizard()
+        },
+        PlasmaCore.Action {
+            isSeparator: true
         },
         PlasmaCore.Action {
             id: toggleBluetoothAction
             text: i18n("Enable Bluetooth")
             icon.name: "preferences-system-bluetooth-symbolic"
-            priority: PlasmaCore.Action.LowPriority
+            priority: PlasmaCore.Action.HighPriority
             checkable: true
             checked: BluezQt.Manager.bluetoothOperational
             visible: BluezQt.Manager.bluetoothBlocked || BluezQt.Manager.adapters.length > 0