diff --git a/customize.dist/src/less2/include/colortheme-dark.less b/customize.dist/src/less2/include/colortheme-dark.less
index 7b6e55dd5..fc17d7d24 100644
--- a/customize.dist/src/less2/include/colortheme-dark.less
+++ b/customize.dist/src/less2/include/colortheme-dark.less
@@ -268,8 +268,8 @@
 // Support
 @cp_support-bg: @cryptpad_color_grey_800;
 @cp_support-msg-fg: @cryptpad_text_col;
-@cp_support-msg-bg: @cryptpad_color_grey_900;
-@cp_support-header-bg: @cryptpad_color_grey_800;
+@cp_support-msg-bg: @cryptpad_color_grey_700;
+@cp_support-header-bg: @cryptpad_color_grey_700;
 
 // Toolbar
 @cp_toolbar-bg: @cryptpad_color_grey_850;
@@ -318,13 +318,11 @@
 @cp_accounts-tab-hover: @cryptpad_color_grey_700;
 @cp_accounts-tab-border: @cryptpad_color_grey_600;
 
-// Admin
-@cp_admin-isadmin-fg: @cryptpad_color_brand;
-@cp_admin-isadmin-bg: @cryptpad_color_white;
-@cp_admin-premium-fg: @cryptpad_color_light_red;
+// Admin Support
+@cp_admin-isadmin-bg: @cryptpad_color_brand_fadest;
 @cp_admin-premium-bg: @cryptpad_color_red_fader;
-@cp_admin-last-fg: @cryptpad_color_light_red;
-@cp_admin-last-bg: @cryptpad_color_red_fader;
+@cp_admin-last-fg: @cryptpad_text_col;
+@cp_admin-last-bg: @cryptpad_color_grey_700;
 
 // Code
 @cp_preview-bg: @cryptpad_color_grey_900;
diff --git a/customize.dist/src/less2/include/colortheme.less b/customize.dist/src/less2/include/colortheme.less
index 0c1d0d25d..c6d3ed7d0 100644
--- a/customize.dist/src/less2/include/colortheme.less
+++ b/customize.dist/src/less2/include/colortheme.less
@@ -266,7 +266,7 @@
 @cp_snapshots-hover: @cryptpad_color_grey_300;
 
 // Support
-@cp_support-bg: @cryptpad_color_grey_100;
+@cp_support-bg: @cryptpad_color_grey_200;
 @cp_support-msg-fg: @cryptpad_text_col;
 @cp_support-msg-bg: @cryptpad_color_grey_300;
 @cp_support-header-bg: @cryptpad_color_grey_300;
@@ -319,12 +319,10 @@
 @cp_accounts-tab-border: @cryptpad_color_grey_500;
 
 // Admin
-@cp_admin-isadmin-fg: @cryptpad_color_brand;
-@cp_admin-isadmin-bg: @cryptpad_color_white;
-@cp_admin-premium-fg: @cryptpad_color_warn_red;
-@cp_admin-premium-bg: lighten(@cryptpad_color_warn_red, 25%);
-@cp_admin-last-fg: @cryptpad_color_warn_red;
-@cp_admin-last-bg: lighten(@cryptpad_color_orange, 25%);
+@cp_admin-isadmin-bg: @cryptpad_color_brand_fadest;
+@cp_admin-premium-bg: @cryptpad_color_red_fader;
+@cp_admin-last-fg: @cryptpad_text_col;
+@cp_admin-last-bg: @cryptpad_color_grey_300;
 
 // Code
 @cp_preview-bg: @cryptpad_color_white;
@@ -333,7 +331,7 @@
 
 // Debug
 @cp_debug-hover: fade(@cryptpad_color_black, 10%);
-@cp_debug-icon-hover: @cryptpad_color_grey_500;
+@cp_debug-icon-hover: @cryptpad_color_grey_300;
 
 // Mediatag
 @cp_mediatag-text-bg: @cryptpad_color_white;
diff --git a/www/admin/app-admin.less b/www/admin/app-admin.less
index da4703203..6d8b5c2b0 100644
--- a/www/admin/app-admin.less
+++ b/www/admin/app-admin.less
@@ -104,7 +104,6 @@
             color: fade(@cryptpad_text_col, 80%);
             .cp-support-ispremium {
                 padding: 0 5px;
-                color: @cp_admin-premium-fg;
                 background-color: @cp_admin-premium-bg;
             }
         }
@@ -118,19 +117,19 @@
             }
         }
         .cp-support-list-message {
+            .cp-support-showdata {
+                background-color: lighten(@cp_admin-last-bg, 5%);
+            }
             &:last-child:not(.cp-support-fromadmin)  {
                 color: @cp_admin-last-fg;
                 background-color: @cp_admin-last-bg;
-                .cp-support-showdata {
-                    background-color: lighten(@cp_admin-last-bg, 5%);
-                }
             }
 
             &:last-child {
                 &.cp-support-frompremium {
                     background-color: @cp_admin-premium-bg;
                     .cp-support-showdata {
-                        background-color: lighten(@cp_admin-premium-bg, 30%);
+                        background-color: fade(@cp_admin-premium-bg, 10%);
                     }
                 }
             }
@@ -160,10 +159,10 @@
     }
 
     .cp-support-fromadmin {
-        color: @cp_admin-isadmin-fg;
-        background-color: @cp_admin-isadmin-bg;
-        .cp-support-message-content {
-            color: @cp_admin-isadmin-fg;
+        background-color: @cp_admin-isadmin-bg !important;
+        .cp-support-message-from, .cp-support-showdata {
+            color: @cryptpad_text_col;
+            background-color: fade(@cp_admin-isadmin-bg, 10%) !important;
         }
     }