diff --git a/app/src/main/java/org/thoughtcrime/securesms/calls/links/CallLinkJoinButton.kt b/app/src/main/java/org/thoughtcrime/securesms/calls/links/CallLinkJoinButton.kt
deleted file mode 100644
index 740efb2510..0000000000
--- a/app/src/main/java/org/thoughtcrime/securesms/calls/links/CallLinkJoinButton.kt
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright 2023 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.thoughtcrime.securesms.calls.links
-
-import android.content.Context
-import android.util.AttributeSet
-import android.view.View
-import androidx.annotation.ColorRes
-import androidx.appcompat.widget.LinearLayoutCompat
-import androidx.core.content.ContextCompat
-import com.google.android.material.button.MaterialButton
-import org.thoughtcrime.securesms.R
-
-/**
- * ConversationItem action button for joining a call link.
- */
-class CallLinkJoinButton @JvmOverloads constructor(
-  context: Context,
-  attrs: AttributeSet? = null
-) : LinearLayoutCompat(context, attrs) {
-  init {
-    orientation = VERTICAL
-    inflate(context, R.layout.call_link_join_button, this)
-  }
-
-  private val joinStroke: View = findViewById(R.id.join_stroke)
-  private val joinButton: MaterialButton = findViewById(R.id.join_button)
-
-  fun setTextColor(@ColorRes textColorResId: Int) {
-    val color = ContextCompat.getColor(context, textColorResId)
-
-    joinButton.setTextColor(color)
-  }
-
-  fun setStrokeColor(@ColorRes strokeColorResId: Int) {
-    val color = ContextCompat.getColor(context, strokeColorResId)
-
-    joinStroke.setBackgroundColor(color)
-  }
-
-  fun setJoinClickListener(onClickListener: OnClickListener) {
-    joinButton.setOnClickListener(onClickListener)
-  }
-}
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 330537b592..15f28829de 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java
@@ -56,11 +56,13 @@ import androidx.annotation.DimenRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.content.ContextCompat;
+import androidx.core.graphics.ColorUtils;
 import androidx.lifecycle.LifecycleOwner;
 import androidx.media3.common.MediaItem;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.bumptech.glide.RequestManager;
+import com.google.android.material.button.MaterialButton;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.common.collect.Sets;
 
@@ -78,7 +80,6 @@ import org.thoughtcrime.securesms.attachments.DatabaseAttachment;
 import org.thoughtcrime.securesms.badges.BadgeImageView;
 import org.thoughtcrime.securesms.badges.gifts.GiftMessageView;
 import org.thoughtcrime.securesms.badges.gifts.OpenableGift;
-import org.thoughtcrime.securesms.calls.links.CallLinkJoinButton;
 import org.thoughtcrime.securesms.calls.links.CallLinks;
 import org.thoughtcrime.securesms.components.AlertView;
 import org.thoughtcrime.securesms.components.AudioView;
@@ -135,7 +136,6 @@ import org.thoughtcrime.securesms.recipients.RecipientForeverObserver;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.revealable.ViewOnceMessageView;
 import org.thoughtcrime.securesms.util.DateUtils;
-import org.thoughtcrime.securesms.util.RemoteConfig;
 import org.thoughtcrime.securesms.util.InterceptableLongClickCopyLinkSpan;
 import org.thoughtcrime.securesms.util.LongClickMovementMethod;
 import org.thoughtcrime.securesms.util.MediaUtil;
@@ -143,6 +143,7 @@ import org.thoughtcrime.securesms.util.MessageRecordUtil;
 import org.thoughtcrime.securesms.util.PlaceholderURLSpan;
 import org.thoughtcrime.securesms.util.Projection;
 import org.thoughtcrime.securesms.util.ProjectionList;
+import org.thoughtcrime.securesms.util.RemoteConfig;
 import org.thoughtcrime.securesms.util.SearchUtil;
 import org.thoughtcrime.securesms.util.ThemeUtil;
 import org.thoughtcrime.securesms.util.UrlClickHandler;
@@ -231,7 +232,7 @@ public final class ConversationItem extends RelativeLayout implements BindableCo
   private                Stub<LinkPreviewView>                   linkPreviewStub;
   private                Stub<BorderlessImageView>               stickerStub;
   private                Stub<ViewOnceMessageView>               revealableStub;
-  private                Stub<CallLinkJoinButton>                joinCallLinkStub;
+  private                Stub<MaterialButton>                    joinCallLinkStub;
   private                Stub<Button>                            callToActionStub;
   private                Stub<GiftMessageView>                   giftViewStub;
   private                Stub<PaymentMessageView>                paymentViewStub;
@@ -1166,9 +1167,9 @@ public final class ConversationItem extends RelativeLayout implements BindableCo
         CallLinkRootKey callLinkRootKey = CallLinks.parseUrl(linkPreview.getUrl());
         if (callLinkRootKey != null) {
           joinCallLinkStub.setVisibility(View.VISIBLE);
-          joinCallLinkStub.get().setTextColor(messageRecord.isOutgoing() ? R.color.signal_colorOnCustom : R.color.signal_colorPrimary);
-          joinCallLinkStub.get().setStrokeColor(messageRecord.isOutgoing() ? R.color.signal_colorOnCustom : R.color.signal_colorOutline);
-          joinCallLinkStub.get().setJoinClickListener(v -> {
+          joinCallLinkStub.get().setTextColor(ContextCompat.getColor(context, messageRecord.isOutgoing() ? R.color.signal_light_colorOnPrimary : R.color.signal_colorOnPrimaryContainer));
+          joinCallLinkStub.get().setBackgroundColor(ContextCompat.getColor(context, messageRecord.isOutgoing() ? R.color.signal_light_colorTransparent2 : R.color.signal_colorOnPrimary));
+          joinCallLinkStub.get().setOnClickListener(v -> {
             if (eventListener != null) {
               eventListener.onJoinCallLink(callLinkRootKey);
             }
diff --git a/app/src/main/res/layout/call_link_join_button.xml b/app/src/main/res/layout/call_link_join_button.xml
index 83f9368ab9..a7cd0993e2 100644
--- a/app/src/main/res/layout/call_link_join_button.xml
+++ b/app/src/main/res/layout/call_link_join_button.xml
@@ -4,17 +4,9 @@
   -->
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <View
-        android:id="@+id/join_stroke"
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:layout_marginStart="12dp"
-        android:layout_marginEnd="12dp"
-        android:background="@color/core_white" />
-
     <com.google.android.material.button.MaterialButton
         android:id="@+id/join_button"
-        style="@style/Widget.Signal.Button.TextButton"
+        style="@style/Widget.Material3.Button"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="@string/ConversationItem__join_call" />
diff --git a/app/src/main/res/layout/conversation_item_join_button.xml b/app/src/main/res/layout/conversation_item_join_button.xml
index 5197fbad18..f33aaa8cf6 100644
--- a/app/src/main/res/layout/conversation_item_join_button.xml
+++ b/app/src/main/res/layout/conversation_item_join_button.xml
@@ -2,7 +2,10 @@
   ~ Copyright 2023 Signal Messenger, LLC
   ~ SPDX-License-Identifier: AGPL-3.0-only
   -->
-<org.thoughtcrime.securesms.calls.links.CallLinkJoinButton
-    xmlns:android="http://schemas.android.com/apk/res/android"
+
+<com.google.android.material.button.MaterialButton xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/join_button"
+    style="@style/Widget.Material3.Button"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content" />
\ No newline at end of file
+    android:layout_height="wrap_content"
+    android:text="@string/ConversationItem__join_call" />
diff --git a/app/src/main/res/layout/conversation_item_received_multimedia.xml b/app/src/main/res/layout/conversation_item_received_multimedia.xml
index 18b630070b..c7ad05d80b 100644
--- a/app/src/main/res/layout/conversation_item_received_multimedia.xml
+++ b/app/src/main/res/layout/conversation_item_received_multimedia.xml
@@ -235,6 +235,9 @@
             android:id="@+id/conversation_item_join_button"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
+            android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
+            android:layout_marginBottom="20dp"
             android:layout="@layout/conversation_item_join_button" />
 
         <ViewStub
diff --git a/app/src/main/res/layout/conversation_item_sent_multimedia.xml b/app/src/main/res/layout/conversation_item_sent_multimedia.xml
index 19ca933f8f..d52583fca6 100644
--- a/app/src/main/res/layout/conversation_item_sent_multimedia.xml
+++ b/app/src/main/res/layout/conversation_item_sent_multimedia.xml
@@ -176,6 +176,9 @@
             android:id="@+id/conversation_item_join_button"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
+            android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
+            android:layout_marginBottom="20dp"
             android:layout="@layout/conversation_item_join_button" />
 
         <org.thoughtcrime.securesms.components.ConversationItemFooter