diff --git a/dev/Styles/User/Layout.less b/dev/Styles/User/Layout.less
index 5ad0bb41f..30d112110 100644
--- a/dev/Styles/User/Layout.less
+++ b/dev/Styles/User/Layout.less
@@ -151,7 +151,7 @@ html.rl-side-preview-pane {
 .dropdown-menu * + .dividerbar {
 	margin-top: 9px;
 	padding-top: 9px;
-	border-top: 1px solid #e5e5e5;
+	border-top: 1px solid var(--border-color, #e5e5e5);
 }
 
 .dropdown.show {
diff --git a/integrations/nextcloud/snappymail/app/themes/Nextcloud/styles.css b/integrations/nextcloud/snappymail/app/themes/Nextcloud/styles.css
index 4ebbba172..8d19c48ce 100644
--- a/integrations/nextcloud/snappymail/app/themes/Nextcloud/styles.css
+++ b/integrations/nextcloud/snappymail/app/themes/Nextcloud/styles.css
@@ -83,8 +83,8 @@
 	--main-bg-repeat: repeat;
 	--main-font-size: 14px;
 	--link-color: #369;
-	--border-color: #ddd;
-	--hr-color: #eee;
+	--border-color: var(--color-border);
+	--hr-color: var(--color-border);
 
 	--warning-clr: var(--color-warning);
 	--warning-bg-clr: #fcf8e3;
@@ -149,7 +149,7 @@
 	/* DIALOGS */
 	--dialog-clr: var(--color-main-text);
 	--dialog-bg-clr: var(--color-main-background);
-	--dialog-border-clr: #ddd;
+	--dialog-border-clr: var(--color-border);
 	--dialog-border-radius: var(--border-radius-large);
 
 	/* FORMS */