diff --git a/src/client/theme/dark.json b/src/client/theme/dark.json
index 498c9ecdd9..8a39648037 100644
--- a/src/client/theme/dark.json
+++ b/src/client/theme/dark.json
@@ -14,9 +14,11 @@
 	"primaryForeground": "#fff",
 	"bg": ":darken<8<$secondary",
 	"text": "$text",
-	"scrollbarTrack": "#282c37",
-	"scrollbarHandle": "#454954",
-	"scrollbarHandleHover": "#535660",
+
+	"scrollbarTrack": ":darken<5<$secondary",
+	"scrollbarHandle": ":lighten<5<$secondary",
+	"scrollbarHandleHover": ":lighten<10<$secondary",
+
 	"face": "$secondary",
 	"faceText": "#fff",
 	"faceHeader": ":lighten<5<$secondary",
diff --git a/src/client/theme/light.json b/src/client/theme/light.json
index d05ee995f6..f5003ae2ec 100644
--- a/src/client/theme/light.json
+++ b/src/client/theme/light.json
@@ -14,9 +14,11 @@
 	"primaryForeground": "#fff",
 	"bg": ":darken<8<$secondary",
 	"text": "$text",
+
 	"scrollbarTrack": "#fff",
 	"scrollbarHandle": "#00000033",
 	"scrollbarHandleHover": "#00000066",
+
 	"face": "$secondary",
 	"faceText": "#444",
 	"faceHeader": ":lighten<5<$secondary",