diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java
index e53a133599..71e8f064f2 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java
@@ -420,7 +420,7 @@ public final class ConversationItem extends RelativeLayout implements BindableCo
     setStoryReactionLabel(messageRecord);
     setHasBeenQuoted(conversationMessage);
     setHasBeenScheduled(conversationMessage);
-    setPoll(messageRecord);
+    setPoll(messageRecord, messageRecord.getToRecipient().getChatColors().asSingleColor());
 
     if (audioViewStub.resolved()) {
       audioViewStub.get().setOnLongClickListener(passthroughClickListener);
@@ -1640,10 +1640,10 @@ public final class ConversationItem extends RelativeLayout implements BindableCo
     }
   }
 
-  private void setPoll(@NonNull MessageRecord messageRecord) {
+  private void setPoll(@NonNull MessageRecord messageRecord, int chatColor) {
     if (hasPoll(messageRecord) && !messageRecord.isRemoteDelete()) {
       PollRecord poll = MessageRecordUtil.getPoll(messageRecord);
-      PollComponentKt.setContent(pollView.get(), poll, isOutgoing(), () -> {
+      PollComponentKt.setContent(pollView.get(), poll, isOutgoing(), chatColor, () -> {
         if (eventListener != null && batchSelected.isEmpty()) {
           eventListener.onViewResultsClicked(poll.getId());
         } else {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/PollComponent.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/PollComponent.kt
index f88806eb29..e3cbfd6d5d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/PollComponent.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/PollComponent.kt
@@ -60,6 +60,7 @@ fun setContent(
   composeView: ComposeView,
   poll: PollRecord,
   isOutgoing: Boolean,
+  chatColor: Int,
   onViewVotes: () -> Unit,
   onToggleVote: (PollOption, Boolean) -> Unit = { _, _ -> }
 ) {
@@ -71,7 +72,7 @@ fun setContent(
         poll = poll,
         onViewVotes = onViewVotes,
         onToggleVote = onToggleVote,
-        pollColors = if (isOutgoing) PollColorsType.Outgoing.getColors() else PollColorsType.Incoming.getColors()
+        pollColors = if (isOutgoing) PollColorsType.Outgoing.getColors(chatColor) else PollColorsType.Incoming.getColors(-1)
       )
     }
   }
@@ -82,7 +83,7 @@ private fun Poll(
   poll: PollRecord,
   onViewVotes: () -> Unit = {},
   onToggleVote: (PollOption, Boolean) -> Unit = { _, _ -> },
-  pollColors: PollColors = PollColorsType.Incoming.getColors()
+  pollColors: PollColors = PollColorsType.Incoming.getColors(-1)
 ) {
   val totalVotes = remember(poll.pollOptions) { poll.pollOptions.sumOf { it.voterIds.size } }
   val caption = when {
@@ -244,11 +245,11 @@ class PollColors(
 
 private sealed interface PollColorsType {
   @Composable
-  fun getColors(): PollColors
+  fun getColors(chatColor: Int): PollColors
 
   data object Outgoing : PollColorsType {
     @Composable
-    override fun getColors(): PollColors {
+    override fun getColors(chatColor: Int): PollColors {
       return PollColors(
         text = colorResource(R.color.conversation_item_sent_text_primary_color),
         caption = colorResource(R.color.conversation_item_sent_text_secondary_color),
@@ -256,7 +257,7 @@ private sealed interface PollColorsType {
         progressBackground = SignalTheme.colors.colorTransparent3,
         checkbox = colorResource(R.color.conversation_item_sent_text_secondary_color),
         checkboxBackground = colorResource(R.color.conversation_item_sent_text_primary_color),
-        button = MaterialTheme.colorScheme.primary,
+        button = Color(chatColor),
         buttonBackground = colorResource(R.color.conversation_item_sent_text_primary_color)
       )
     }
@@ -264,7 +265,8 @@ private sealed interface PollColorsType {
 
   data object Incoming : PollColorsType {
     @Composable
-    override fun getColors(): PollColors {
+    override fun getColors(chatColor: Int): PollColors {
+      // TODO(michelle): Get updated button color
       return PollColors(
         text = MaterialTheme.colorScheme.onSurface,
         caption = MaterialTheme.colorScheme.onSurfaceVariant,
@@ -272,8 +274,8 @@ private sealed interface PollColorsType {
         progressBackground = SignalTheme.colors.colorTransparentInverse3,
         checkbox = MaterialTheme.colorScheme.outline,
         checkboxBackground = MaterialTheme.colorScheme.primary,
-        button = MaterialTheme.colorScheme.onSurface,
-        buttonBackground = MaterialTheme.colorScheme.surface
+        button = if (DynamicTheme.isDarkTheme(LocalContext.current)) MaterialTheme.colorScheme.onPrimaryContainer else MaterialTheme.colorScheme.onSurface,
+        buttonBackground = if (DynamicTheme.isDarkTheme(LocalContext.current)) MaterialTheme.colorScheme.primaryContainer else MaterialTheme.colorScheme.surface
       )
     }
   }