diff --git a/plasmoid/package/contents/ui/FullRepresentation.qml b/plasmoid/package/contents/ui/FullRepresentation.qml
index 1f322468a..1d4daea34 100644
--- a/plasmoid/package/contents/ui/FullRepresentation.qml
+++ b/plasmoid/package/contents/ui/FullRepresentation.qml
@@ -32,8 +32,7 @@ Item {
     ColumnLayout {
         spacing: 5
         visible: devicesView.count == 0
-        width: parent.width
-        height: parent.height
+        anchors.fill: parent
 
         PlasmaExtras.Heading {
             id: heading
@@ -49,6 +48,7 @@ Item {
 
         PlasmaComponents.Label {
             Layout.fillWidth: true
+            Layout.bottomMargin: units.largeSpacing
 
             text: i18n("Install KDE Connect on your Android device to integrate it with Plasma!")
             horizontalAlignment: Text.AlignHCenter
@@ -56,15 +56,19 @@ Item {
         }
 
         PlasmaComponents.Button {
+            Layout.leftMargin: units.largeSpacing
+            Layout.rightMargin: units.largeSpacing
             Layout.alignment: Qt.AlignHCenter
-
+            Layout.fillWidth: true
             text: i18n("Install from Google Play")
             onClicked: Qt.openUrlExternally("https://play.google.com/store/apps/details?id=org.kde.kdeconnect_tp")
         }
 
         PlasmaComponents.Button {
+            Layout.leftMargin: units.largeSpacing
+            Layout.rightMargin: units.largeSpacing
             Layout.alignment: Qt.AlignHCenter
-
+            Layout.fillWidth: true
             text: i18n("Install from F-Droid")
             onClicked: Qt.openUrlExternally("https://f-droid.org/en/packages/org.kde.kdeconnect_tp/")
         }
diff --git a/plasmoid/package/contents/ui/main.qml b/plasmoid/package/contents/ui/main.qml
index c17b35bf1..5235f0002 100644
--- a/plasmoid/package/contents/ui/main.qml
+++ b/plasmoid/package/contents/ui/main.qml
@@ -42,7 +42,7 @@ Item
     Binding {
         target: plasmoid
         property: "status"
-        value: (connectDeviceModel.count > 0) ? PlasmaCore.Types.ActiveStatus : ((pairedDeviceModel.count > 0) ? PlasmaCore.Types.HiddenStatus : PlasmaCore.Types.PassiveStatus)
+        value: (connectDeviceModel.count > 0) ? PlasmaCore.Types.ActiveStatus : PlasmaCore.Types.PassiveStatus
     }
 
     Plasmoid.fullRepresentation: FullRepresentation {