diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/MediaReviewFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/MediaReviewFragment.kt
index f473466302..78c9050902 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/MediaReviewFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/MediaReviewFragment.kt
@@ -294,7 +294,7 @@ class MediaReviewFragment : Fragment(R.layout.v2_media_review_fragment) {
 
   private fun presentSendButton(sendType: MessageSendType) {
     val sendButtonTint = if (sendType.usesSignalTransport) {
-      R.color.signal_colorSecondaryContainer
+      R.color.signal_colorOnSecondaryContainer
     } else {
       R.color.core_grey_50
     }
diff --git a/app/src/main/res/layout/multiselect_forward_fragment_bottom_bar.xml b/app/src/main/res/layout/multiselect_forward_fragment_bottom_bar.xml
index 3913f24320..916e6d2bf4 100644
--- a/app/src/main/res/layout/multiselect_forward_fragment_bottom_bar.xml
+++ b/app/src/main/res/layout/multiselect_forward_fragment_bottom_bar.xml
@@ -82,9 +82,9 @@
             android:background="@drawable/circle_tintable"
             android:contentDescription="@string/ShareActivity__share"
             android:scaleType="centerInside"
-            app:backgroundTint="@color/signal_colorSecondaryContainer"
+            app:backgroundTint="@color/signal_colorOnSecondaryContainer"
             app:srcCompat="@drawable/ic_send_24"
-            app:tint="@color/signal_colorOnSecondaryContainer" />
+            app:tint="@color/signal_colorSecondaryContainer" />
 
     </FrameLayout>
 
diff --git a/app/src/main/res/layout/stories_text_post_creation_fragment.xml b/app/src/main/res/layout/stories_text_post_creation_fragment.xml
index 32d2e88236..d72e1091e6 100644
--- a/app/src/main/res/layout/stories_text_post_creation_fragment.xml
+++ b/app/src/main/res/layout/stories_text_post_creation_fragment.xml
@@ -80,7 +80,7 @@
         android:layout_width="48dp"
         android:layout_height="48dp"
         android:layout_marginEnd="10dp"
-        android:background="@color/signal_colorSecondaryContainer"
+        android:background="@color/signal_colorOnSecondaryContainer"
         android:padding="4dp"
         android:scaleType="centerInside"
         app:layout_constraintBottom_toBottomOf="@id/toggle_spacer"
@@ -88,7 +88,7 @@
         app:layout_constraintTop_toTopOf="@id/toggle_spacer"
         app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Signal.Circle"
         app:srcCompat="@drawable/ic_arrow_end_24"
-        app:tint="@color/signal_colorOnSecondaryContainer" />
+        app:tint="@color/signal_colorSecondaryContainer" />
 
     <androidx.constraintlayout.widget.Barrier
         android:id="@+id/button_bar_barrier"
diff --git a/app/src/main/res/layout/stories_text_post_link_entry_content.xml b/app/src/main/res/layout/stories_text_post_link_entry_content.xml
index b76c072474..d5d7b493da 100644
--- a/app/src/main/res/layout/stories_text_post_link_entry_content.xml
+++ b/app/src/main/res/layout/stories_text_post_link_entry_content.xml
@@ -70,7 +70,7 @@
         android:layout_width="48dp"
         android:layout_height="48dp"
         android:layout_marginEnd="12dp"
-        android:background="@color/signal_colorSecondaryContainer"
+        android:background="@color/signal_colorOnSecondaryContainer"
         android:padding="4dp"
         android:scaleType="centerInside"
         app:layout_constraintBottom_toBottomOf="@id/input"
@@ -78,6 +78,6 @@
         app:layout_constraintTop_toTopOf="@id/input"
         app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Signal.Circle"
         app:srcCompat="@drawable/ic_check_24"
-        app:tint="@color/signal_colorOnSecondaryContainer" />
+        app:tint="@color/signal_colorSecondaryContainer" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/stories_text_post_text_entry_content.xml b/app/src/main/res/layout/stories_text_post_text_entry_content.xml
index 9919a4f494..ea8a5b768a 100644
--- a/app/src/main/res/layout/stories_text_post_text_entry_content.xml
+++ b/app/src/main/res/layout/stories_text_post_text_entry_content.xml
@@ -69,7 +69,7 @@
         android:layout_width="48dp"
         android:layout_height="48dp"
         android:layout_marginEnd="16dp"
-        android:background="@color/signal_colorSecondaryContainer"
+        android:background="@color/signal_colorOnSecondaryContainer"
         android:contentDescription="@string/TextStoryPostTextEntryFragment__done_adding_text"
         android:padding="4dp"
         android:scaleType="centerInside"
@@ -78,7 +78,7 @@
         app:layout_constraintTop_toTopOf="@id/color_bar"
         app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Signal.Circle"
         app:srcCompat="@drawable/ic_check_24"
-        app:tint="@color/signal_colorOnSecondaryContainer" />
+        app:tint="@color/signal_colorSecondaryContainer" />
 
     <org.thoughtcrime.securesms.mediasend.v2.text.TextFontButton
         android:id="@+id/font_button"
diff --git a/app/src/main/res/layout/v2_media_review_fragment.xml b/app/src/main/res/layout/v2_media_review_fragment.xml
index 68c0547a39..d5ced9b296 100644
--- a/app/src/main/res/layout/v2_media_review_fragment.xml
+++ b/app/src/main/res/layout/v2_media_review_fragment.xml
@@ -285,7 +285,7 @@
             android:layout_marginStart="12dp"
             android:layout_marginEnd="10dp"
             android:layout_marginBottom="16dp"
-            android:background="@color/signal_colorSecondaryContainer"
+            android:background="@color/signal_colorOnSecondaryContainer"
             android:padding="4dp"
             android:scaleType="centerInside"
             android:translationY="48dp"
@@ -296,7 +296,7 @@
             app:layout_goneMarginStart="10dp"
             app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Signal.Circle"
             app:srcCompat="@drawable/ic_arrow_end_24"
-            app:tint="@color/signal_colorOnSecondaryContainer"
+            app:tint="@color/signal_colorSecondaryContainer"
             tools:translationY="0dp" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>