diff --git a/reviewboard/static/rb/css/defs.less b/reviewboard/static/rb/css/defs.less
index 6595067a7d2f223c32194477fb5891244a5239ea..827f5f1aea72d1239938c2446b8cf57d62d28618 100644
--- a/reviewboard/static/rb/css/defs.less
+++ b/reviewboard/static/rb/css/defs.less
@@ -405,7 +405,14 @@
 @page-sidebar-item-vert-padding: 6px;
 @page-sidebar-section-vert-padding: 8px;
 
-// Review request labels in datagrids.
+/**
+ * Review request labels in datagrids.
+ *
+ * Deprecated:
+ *     7.0.3:
+ *     Use ``var(--rb-p-flag-draft-*)`` variables instead of the
+ *     ``summary-label-draft-*`` and ``summary-label-text-color`` definitions.
+ */
 @summary-label-draft-bg: @draft-color;
 @summary-label-draft-border-color: @draft-border-color;
 @summary-label-text-color: #005500;
diff --git a/reviewboard/static/rb/css/pages/diffviewer.less b/reviewboard/static/rb/css/pages/diffviewer.less
index 6316bde32c80d3eb62c95fc822ec7c39889e734c..67872267bf80fadbb00dff290d830d3cc435f62e 100644
--- a/reviewboard/static/rb/css/pages/diffviewer.less
+++ b/reviewboard/static/rb/css/pages/diffviewer.less
@@ -1134,10 +1134,10 @@
 
   .commentflag-inner {
     border-radius: @comment-flag-border-radius;
-    background-color: @comment-flag-color;
-    border: 1px solid @comment-flag-border-color;
+    background-color: var(--rb-p-flag-published-bg);
+    border: 1px solid var(--rb-p-flag-published-border-color);
     bottom: 0.2em;
-    color: @comment-flag-text-color;
+    color: var(--rb-p-flag-published-fg);
     cursor: pointer;
     font-size: 90%;
     font-weight: normal;
@@ -1159,22 +1159,22 @@
 }
 
 .selected .commentflag .commentflag-inner {
-  background-color: @comment-flag-color;
+  background-color: var(--rb-p-flag-published-bg);
 }
 
 .selected .commentflag .commentflag-inner,
 .commentflag .commentflag-inner:hover {
-  background-color: @comment-flag-hover-color;
+  background-color: var(--rb-p-flag-published-hover-bg);
 }
 
 .commentflag.draft .commentflag-inner {
-  background-color: @comment-flag-draft-color;
-  border-color: @comment-flag-draft-border-color;
+  background-color: var(--rb-p-flag-draft-bg);
+  border-color: var(--rb-p-flag-draft-border-color);
 }
 
 .selected .commentflag.draft .commentflag-inner,
 .commentflag.draft .commentflag-inner:hover {
-  background-color: @comment-flag-draft-hover-color;
+  background-color: var(--rb-p-flag-draft-hover-bg);
 }
 
 .ghost-commentflag {
diff --git a/reviewboard/static/rb/css/pages/image-review-ui.less b/reviewboard/static/rb/css/pages/image-review-ui.less
index 85b2d8023b69cc2a6637ba7b79a07feb2a768465..f982e69d9992ca0be1a5a6e378e3287337bba38e 100644
--- a/reviewboard/static/rb/css/pages/image-review-ui.less
+++ b/reviewboard/static/rb/css/pages/image-review-ui.less
@@ -165,14 +165,15 @@
   }
 
   .selection {
-    border: 1px #a1c0e3 solid;
+    border: 1px var(--rb-p-flag-published-bg) solid;
     position: absolute;
 
     &.draft {
-      border: 1px #aceb6f solid;
+      border: 1px var(--rb-p-flag-draft-bg) solid;
 
       .selection-flag {
-        background: #aceb6f;
+        background-color: var(--rb-p-flag-draft-bg);
+        color: var(--rb-p-flag-draft-fg);
       }
 
       &.can-update-bound {
@@ -180,7 +181,7 @@
           cursor: move;
         }
         .resize-icon {
-          background-color: #aceb6f;
+          background-color: var(--rb-p-flag-draft-bg);
           bottom: 0;
           right: 0;
           position: absolute;
@@ -193,7 +194,8 @@
   }
 
   .selection-flag {
-    background-color: #a1c0e3;
+    background-color: var(--rb-p-flag-published-bg);
+    color: var(--rb-p-flag-published-fg);
     cursor: pointer;
     height: 2em;
     left: 0px;
diff --git a/reviewboard/static/rb/css/pages/reviews.less b/reviewboard/static/rb/css/pages/reviews.less
index 0b24af159ddad8c1e05a90f30d5df0f6373254cc..cdf4b7782c79618de686a6251f1f80b8041f112b 100644
--- a/reviewboard/static/rb/css/pages/reviews.less
+++ b/reviewboard/static/rb/css/pages/reviews.less
@@ -4,6 +4,7 @@
 
 @import (reference) "rb/css/assets/paths.less";
 @import (reference) "rb/css/defs.less";
+@import (reference) "rb/css/syntax.less";
 @import (reference) "rb/css/mixins/upload-diff.less";
 @import (reference) "rb/css/ui/colors.less";
 
@@ -1830,9 +1831,10 @@ pre.reviewtext {
   padding: var(--ink-u-spacing-m);
   position: absolute;
   max-width: 60em;
+  z-index: calc(var(--ink-z-event-overlay) + 1);
 
   &.comments {
-    border: 1px black solid;
+    border: 1px var(--ink-p-black) solid;
     border-bottom: 0;
     padding: 0;
     min-width: 25em;
@@ -1843,8 +1845,8 @@ pre.reviewtext {
       padding: 0;
 
       > li {
-        background-color: @comments-tooltip-background;
-        border-bottom: 1px @comments-tooltip-border-color solid;
+        background-color: var(--rb-p-flag-published-bg);
+        border-bottom: 1px var(--ink-p-light__blue-600) solid;
         display: flex;
         flex-direction: column;
         gap: inherit;
@@ -1852,8 +1854,8 @@ pre.reviewtext {
         padding: var(--ink-u-spacing-m);
 
         &.draft {
-          background-color: @comments-tooltip-draft-background;
-          border-bottom: 1px black solid;
+          background-color: var(--rb-p-flag-draft-bg);
+          border-bottom: 1px var(--rb-p-flag-draft-border-color) solid;
         }
 
         div {
@@ -1873,13 +1875,10 @@ pre.reviewtext {
         .rich-text {
           line-height: 1.2;
 
-          code {
-            border-color: @comments-tooltip-border-color;
-          }
-
           .codehilite {
             .flush-codehilite();
-            border-color: @comments-tooltip-border-color;
+            background: @default-code-theme-light-rich-text-code-bg;
+            color: var(--ink-p-fg-on-light);
             margin: 0 calc(-1 * var(--ink-u-spacing-m));
             padding: var(--ink-u-spacing-xs) var(--ink-u-spacing-m);
           }
diff --git a/reviewboard/static/rb/css/syntax.less b/reviewboard/static/rb/css/syntax.less
index 37a283e97011a1b7384847f81c9f51953d759101..1d4b74c282b903f9b1e4816dba700aa3e07bacff 100644
--- a/reviewboard/static/rb/css/syntax.less
+++ b/reviewboard/static/rb/css/syntax.less
@@ -7,7 +7,7 @@
  */
 
 
-/* Dark diff UI colors. */
+/* Light diff UI colors. */
 @default-code-theme-light-diff-delete-bg: #FDE9ED;
 @default-code-theme-light-diff-delete-highlight-bg:
   rgba(200, 0, 0, 0.15);
@@ -54,6 +54,10 @@
 
 @default-code-theme-dark-diff-linenum-fg: rgba(255, 255, 255, 0.8);
 
+/* Rich text colors. */
+@default-code-theme-light-rich-text-code-bg: #FBFAF8;
+@default-code-theme-dark-rich-text-code-bg: rgba(0, 0, 0, 0.08);
+
 
 /* Ensure the variables don't leak out of the scope of this theme. */
 &:root {
@@ -62,10 +66,10 @@
     var(--if-dark, @default-code-theme-dark-diff-linenum-fg);
 
   --rb-theme-rich-text-code-bg:
-      var(--if-light, #FBFAF8)
-      var(--if-dark, rgba(0, 0, 0, 0.08));
+      var(--if-light, @default-code-theme-light-rich-text-code-bg)
+      var(--if-dark, @default-code-theme-dark-rich-text-code-bg);
 
-  --rb-theme-rich-text-code-fg: color: var(--ink-p-fg);
+  --rb-theme-rich-text-code-fg: var(--ink-p-fg);
 
   --rb-theme-diff-equals-bg:
     var(--if-dark, @default-code-theme-dark-diff-equal-bg)
diff --git a/reviewboard/static/rb/css/ui/colors.less b/reviewboard/static/rb/css/ui/colors.less
index e85ee42bca632dec67797a89cefc64375556ca8b..2cfc4e5933634665d557631d65b23e196afa9322 100644
--- a/reviewboard/static/rb/css/ui/colors.less
+++ b/reviewboard/static/rb/css/ui/colors.less
@@ -150,6 +150,17 @@
         /** Label color for draft items. */
         draft-label-fg: var(--ink-p-green-600);
 
+        /** Flag and indicator colors. */
+        flag-draft-bg: var(--ink-p-light__green-200);
+        flag-draft-hover-bg: var(--ink-p-light__green-100);
+        flag-draft-fg: var(--ink-p-light__green-900);
+        flag-draft-border-color: var(--ink-p-light__green-500);
+
+        flag-published-bg: var(--ink-p-light__blue-400);
+        flag-published-hover-bg: var(--ink-p-light__blue-300);
+        flag-published-fg: var(--ink-p-light__blue-900);
+        flag-published-border-color: var(--ink-p-dark__blue-300);
+
         issue-bg: var(--ink-p-light__yellow-300);
 
         issue-border-color: var(--ink-p-container-border-color);
diff --git a/reviewboard/static/rb/css/ui/datagrids.less b/reviewboard/static/rb/css/ui/datagrids.less
index 7565965fba562bbcddbdbba41295028d4e72561f..8c16bdd9682cd68f3221d6a12d43c34df323ecfb 100644
--- a/reviewboard/static/rb/css/ui/datagrids.less
+++ b/reviewboard/static/rb/css/ui/datagrids.less
@@ -447,9 +447,9 @@ body.datagrid-page {
       line-height: 1.4;
 
       &.label-draft {
-        background: @summary-label-draft-bg;
-        border: 1px @summary-label-draft-border-color solid;
-        color: @summary-label-text-color;
+        background: var(--rb-p-flag-draft-bg);
+        border: var(--ink-u-border-thin) var(--rb-p-flag-draft-border-color) solid;
+        color: var(--rb-p-flag-draft-fg);
       }
 
       &.label-submitted {
diff --git a/reviewboard/static/rb/css/ui/review-request/field-state-label.less b/reviewboard/static/rb/css/ui/review-request/field-state-label.less
index a42d46f7499c2109c8b42a75c2e06fdfe5ef6690..75f71aa3ddab26c66f4e57442e6ed972a500cba1 100644
--- a/reviewboard/static/rb/css/ui/review-request/field-state-label.less
+++ b/reviewboard/static/rb/css/ui/review-request/field-state-label.less
@@ -46,25 +46,25 @@
  .rb-c-field-state-label {
   @_label-vars: #rb-ns-ui.field-state-label();
 
-  border-radius: @_label-vars[@border-radius];
+  border-radius: var(--ink-u-border-radius-s);
   line-height: @_label-vars[@line-height];
   padding: @_label-vars[@padding-vert] @_label-vars[@padding-horiz];
   width: fit-content;
 
   &.-is-deleted {
     background: @_label-vars[@bg-color-deleted];
-    border: @_label-vars[@border-width]
+    border: var(--ink-u-border-thin)
             solid
             @_label-vars[@border-color-deleted];
     color: @_label-vars[@text-color-deleted];
   }
 
   &.-is-draft {
-    background: @_label-vars[@bg-color-draft];
-    border: @_label-vars[@border-width]
+    background: var(--rb-p-flag-draft-bg);
+    border: var(--ink-u-border-thin) 
             solid
-            @_label-vars[@border-color-draft];
-    color: @_label-vars[@text-color-draft];
+            var(--rb-p-flag-draft-border-color);
+    color:  var(--rb-p-flag-draft-fg);
   }
 
   &.-is-inline {
