diff --git a/src/gui/Base/HUserAvatar.qml b/src/gui/Base/HUserAvatar.qml
index eca7e78c..a9d42f12 100644
--- a/src/gui/Base/HUserAvatar.qml
+++ b/src/gui/Base/HUserAvatar.qml
@@ -84,7 +84,7 @@ HAvatar {
                 theme.controls.presence.offline
 
             border.color: theme.controls.presence.border
-            border.width: Math.ceil(diameter / 10)
+            border.width: theme.controls.presence.borderWidth
 
             Behavior on color   { HColorAnimation {} }
             Behavior on opacity { HNumberAnimation {} }
diff --git a/src/themes/Glass.qpl b/src/themes/Glass.qpl
index 3a6709b2..ea166049 100644
--- a/src/themes/Glass.qpl
+++ b/src/themes/Glass.qpl
@@ -272,6 +272,7 @@ controls:
         color unavailable: colors.middleBackground
         color offline:     hsluv(0, 0, 60, 1)
         color border:      "black"
+        int borderWidth:   2 * uiScale
         real opacity:      1.0
         real radius:       6.0 * uiScale
 
diff --git a/src/themes/Midnight.qpl b/src/themes/Midnight.qpl
index 7ac0d09c..41eb16d6 100644
--- a/src/themes/Midnight.qpl
+++ b/src/themes/Midnight.qpl
@@ -278,6 +278,7 @@ controls:
         color unavailable: colors.middleBackground
         color offline:     hsluv(0, 0, 60, 1)
         color border:      "black"
+        int borderWidth:   2 * uiScale
         real opacity:      1.0
         real radius:       6.0 * uiScale