diff --git a/customize.dist/src/less2/include/colortheme-dark.less b/customize.dist/src/less2/include/colortheme-dark.less
index 4ca59b4b8..0882fbd41 100644
--- a/customize.dist/src/less2/include/colortheme-dark.less
+++ b/customize.dist/src/less2/include/colortheme-dark.less
@@ -142,6 +142,7 @@
 @cp_buttons-default-color: @cryptpad_text_col;
 @cp_buttons-default-border: @cryptpad_text_col;
 @cp_buttons-red: #E55236;
+@cp_buttons-red-text: @cryptpad_color_light_red;
 @cp_buttons-red-color: #FFF;
 @cp_buttons-red-border: transparent;
 @cp_buttons-primary: @cryptpad_color_brand;
@@ -159,7 +160,7 @@
 @cp_sidebar-right-bg: @cryptpad_color_grey_900;
 @cp_sidebar-right-fg: @cryptpad_text_col; // XXX was black
 @cp_sidebar-left-active: @cp_sidebar-right-bg;
-@cp_sidebar-hint: @cryptpad_color_hint_grey;
+@cp_sidebar-hint: fade(@cryptpad_text_col, 80%);
 
 // Drive
 @cp_drive-bg: @cp_sidebar-right-bg;
@@ -264,10 +265,10 @@
 @cp_snapshots-hover: @cryptpad_color_help_grey;
 
 // Support
-@cp_support-bg: @cryptpad_color_lighter_grey;
+@cp_support-bg: @cryptpad_color_grey_800;
 @cp_support-msg-fg: @cryptpad_text_col;
-@cp_support-msg-bg: @cryptpad_color_grey;
-@cp_support-header-bg: @cryptpad_color_help_grey;
+@cp_support-msg-bg: @cryptpad_color_grey_900;
+@cp_support-header-bg: @cryptpad_color_grey_800;
 
 // Toolbar
 @cp_toolbar-bg: @cryptpad_color_grey_900;
diff --git a/customize.dist/src/less2/include/colortheme.less b/customize.dist/src/less2/include/colortheme.less
index 6dab44aaa..2869703b2 100644
--- a/customize.dist/src/less2/include/colortheme.less
+++ b/customize.dist/src/less2/include/colortheme.less
@@ -142,6 +142,7 @@
 @cp_buttons-default-color: @cryptpad_text_col;
 @cp_buttons-default-border: @cryptpad_text_col;
 @cp_buttons-red: #E55236;
+@cp_buttons-red-text: @cp_buttons-red;
 @cp_buttons-red-color: #FFF;
 @cp_buttons-red-border: transparent;
 @cp_buttons-primary: @cryptpad_color_brand;
diff --git a/customize.dist/src/less2/include/forms.less b/customize.dist/src/less2/include/forms.less
index 0f5a6193b..4962f3891 100644
--- a/customize.dist/src/less2/include/forms.less
+++ b/customize.dist/src/less2/include/forms.less
@@ -142,7 +142,7 @@
 
         &.danger-alt, &.btn-danger-alt, &.btn-danger-outline {
             border-color: @cp_buttons-red;
-            color: @cp_buttons-red;
+            color: @cp_buttons-red-text;
             &:hover, &:not(:disabled):active, &:focus {
                 border-color: @cp_buttons-red;
                 color: @cp_buttons-red-color;