diff --git a/customize.dist/src/less2/include/colortheme-dark.less b/customize.dist/src/less2/include/colortheme-dark.less
index 5577d62e5..467276e76 100644
--- a/customize.dist/src/less2/include/colortheme-dark.less
+++ b/customize.dist/src/less2/include/colortheme-dark.less
@@ -224,11 +224,11 @@
 @cp_creation-error-fg: @cryptpad_color_light_grey;
 
 // Export
-@cp_export-bg: @cryptpad_color_white;
+@cp_export-bg: @cryptpad_color_grey_900;
 @cp_export-fg: @cryptpad_text_col;
-@cp_export-hint: @cryptpad_color_hint_grey;
-@cp_export-error-bg: @cryptpad_color_grey;
-@cp_export-error-bg2: @cryptpad_color_neutral2_grey;
+@cp_export-hint: fade(@cryptpad_text_col, 80%);
+@cp_export-error-bg: @cryptpad_color_grey_800;
+@cp_export-error-bg2: @cryptpad_color_red_fader;
 
 // File upload
 @cp_upload-fg: @cryptpad_color_brand_300;
diff --git a/customize.dist/src/less2/include/colortheme.less b/customize.dist/src/less2/include/colortheme.less
index 8461475c1..1bfcb051d 100644
--- a/customize.dist/src/less2/include/colortheme.less
+++ b/customize.dist/src/less2/include/colortheme.less
@@ -224,11 +224,11 @@
 @cp_creation-error-fg: @cryptpad_color_light_grey;
 
 // Export
-@cp_export-bg: @cryptpad_color_white;
+@cp_export-bg: @cryptpad_color_grey_200;
 @cp_export-fg: @cryptpad_text_col;
-@cp_export-hint: @cryptpad_color_hint_grey;
-@cp_export-error-bg: @cryptpad_color_grey;
-@cp_export-error-bg2: @cryptpad_color_neutral2_grey;
+@cp_export-hint: fade(@cryptpad_text_col, 80%);
+@cp_export-error-bg: @cryptpad_color_grey_300;
+@cp_export-error-bg2: @cryptpad_color_red_fader;
 
 // File upload
 @cp_upload-fg: @cryptpad_color_brand;
diff --git a/customize.dist/src/less2/include/export.less b/customize.dist/src/less2/include/export.less
index 208832851..301bd1404 100644
--- a/customize.dist/src/less2/include/export.less
+++ b/customize.dist/src/less2/include/export.less
@@ -14,14 +14,14 @@
             // XXX Keep hardcoded progress bar colors for now...
             .cp-export-progress-bar-container {
                 height: 24px;
-                background: white;
-                border: 1px solid @cryptpad_color_grey;
+                background: @cp_loading-progress-bg;
+                border: 1px solid @cp_loading-progress-bar-bg;
                 width: 80%;
                 margin: auto;
                 position: relative;
                 .cp-export-progress-bar {
                     height: 100%;
-                    background: #5cb85c; // Same color as loading screen bar
+                    background: @cp_loading-progress-bar-bg; // Same color as loading screen bar
                     width: 0%;
                     display: inline-block;
                 }
@@ -62,7 +62,6 @@
                 overflow-x: auto;
                 max-height: 300px;
                 background: @cp_export-error-bg;
-                border: 1px solid @cp_export-hint;
                 padding: 5px 20px;
                 margin-top: 1rem;
                 & > p {
@@ -79,6 +78,9 @@
                         .link {
                             padding: 0 20px;
                             font-size: 14px;
+                            a {
+                                color: @cp_loading-link;
+                            }
                         }
                         .reason {
                             padding: 0 20px;