diff --git a/lib/pangea/message_token_text/message_token_button.dart b/lib/pangea/message_token_text/message_token_button.dart
index 7e855e223..cba22ec44 100644
--- a/lib/pangea/message_token_text/message_token_button.dart
+++ b/lib/pangea/message_token_text/message_token_button.dart
@@ -296,13 +296,18 @@ class MessageTokenButtonContent extends StatelessWidget {
       BorderRadius.circular(AppConfig.borderRadius - 4);
 
   Color _color(BuildContext context) {
+    final bool isLight = Theme.of(context).brightness == Brightness.light;
     if (activity == null) {
-      return Theme.of(context).colorScheme.primary;
+      return isLight
+          ? Theme.of(context).colorScheme.primary
+          : Theme.of(context).colorScheme.primaryContainer;
     }
     if (isActivityCompleteOrNullForToken) {
       return AppConfig.gold;
     }
-    return Theme.of(context).colorScheme.primary;
+    return isLight
+        ? Theme.of(context).colorScheme.primary
+        : Theme.of(context).colorScheme.primaryContainer;
   }
 
   @override
@@ -384,10 +389,15 @@ class MessageTokenButtonContent extends StatelessWidget {
           borderRadius: _borderRadius,
           child: CustomPaint(
             painter: DottedBorderPainter(
-              color: Theme.of(context)
-                  .colorScheme
-                  .primary
-                  .withAlpha((colorAlpha * 255).toInt()),
+              color: Theme.of(context).brightness == Brightness.light
+                  ? Theme.of(context)
+                      .colorScheme
+                      .primary
+                      .withAlpha((colorAlpha * 255).toInt())
+                  : Theme.of(context)
+                      .colorScheme
+                      .primaryContainer
+                      .withAlpha((colorAlpha * 275).toInt()),
               borderRadius: _borderRadius,
             ),
             child: Container(