diff --git a/src/gui/Base/HListView.qml b/src/gui/Base/HListView.qml
index a4ff865a..d700d5e1 100644
--- a/src/gui/Base/HListView.qml
+++ b/src/gui/Base/HListView.qml
@@ -91,6 +91,12 @@ ListView {
 
     highlight: Rectangle {
         color: theme.controls.listView.highlight
+
+        Rectangle {
+            width: theme.controls.listView.highlightBorderThickness
+            height: parent.height
+            color: theme.controls.listView.highlightBorder
+        }
     }
 
     ScrollBar.vertical: HScrollBar {
diff --git a/src/gui/Pages/AddAccount/ServerBrowser.qml b/src/gui/Pages/AddAccount/ServerBrowser.qml
index 6fb71466..d9743185 100644
--- a/src/gui/Pages/AddAccount/ServerBrowser.qml
+++ b/src/gui/Pages/AddAccount/ServerBrowser.qml
@@ -229,5 +229,11 @@ HBox {
 
         Layout.fillWidth: true
         Layout.fillHeight: true
+
+        Rectangle {
+            z: -10
+            anchors.fill: parent
+            color: theme.colors.strongBackground
+        }
     }
 }
diff --git a/src/gui/Pages/AddAccount/ServerDelegate.qml b/src/gui/Pages/AddAccount/ServerDelegate.qml
index 0b5dcc78..ce9669f6 100644
--- a/src/gui/Pages/AddAccount/ServerDelegate.qml
+++ b/src/gui/Pages/AddAccount/ServerDelegate.qml
@@ -11,6 +11,7 @@ HTile {
     property string loadingIconStep
 
 
+    backgroundColor: "transparent"
     contentOpacity: model.status === "Failed" ? 0.3 : 1  // XXX
     rightPadding: 0
 
diff --git a/src/themes/Glass.qpl b/src/themes/Glass.qpl
index 32114cef..a9f962e5 100644
--- a/src/themes/Glass.qpl
+++ b/src/themes/Glass.qpl
@@ -183,6 +183,8 @@ controls:
         color highlight: hsluv(
             colors.hue, colors.bgSaturation * 2, 0, colors.opacity / 2,
         )
+        color highlightBorder: colors.strongAccentElement
+        int highlightBorderThickness: 1
         color smallPaneHighlight: colors.accentBackground
 
     textField:
diff --git a/src/themes/Midnight.qpl b/src/themes/Midnight.qpl
index edb88fcc..2df548d7 100644
--- a/src/themes/Midnight.qpl
+++ b/src/themes/Midnight.qpl
@@ -189,6 +189,8 @@ controls:
             colors.intensity * 1,
             colors.opacity / 1.5,
         )
+        color highlightBorder: colors.strongAccentElement
+        int highlightBorderThickness: 1
         color smallPaneHighlight: colors.accentBackground
 
     textField: