diff --git a/Panel.qml b/Panel.qml
index 2cbdf9b..69e8d5f 100644
--- a/Panel.qml
+++ b/Panel.qml
@@ -1022,10 +1022,9 @@ Panel {
             event.accepted = true
           }
         }
-        background: Rectangle {
+        background: BorderSurface {
           color: Color.background
-          border.color: root.dim
-          border.width: 1
+          borderSpec: Border.flat(root.dim, 1)
           radius: Style.cornerRadius
         }
 
diff --git a/TailscaleIcon.qml b/TailscaleIcon.qml
index e0f3a1b..c8b2556 100644
--- a/TailscaleIcon.qml
+++ b/TailscaleIcon.qml
@@ -1,5 +1,6 @@
 import QtQuick
 import qs.Commons
+import qs.Ui
 
 Item {
   id: root
@@ -42,7 +43,7 @@ Item {
     rotation: -45
   }
 
-  Rectangle {
+  BorderSurface {
     visible: root.warning
     width: Math.max(7, parent.width * 0.42)
     height: width
@@ -50,8 +51,7 @@ Item {
     color: root.badgeColor
     anchors.right: parent.right
     anchors.bottom: parent.bottom
-    border.color: Color.popups.background
-    border.width: 1
+    borderSpec: Border.flat(Color.popups.background, 1)
 
     Text {
       anchors.centerIn: parent