diff --git a/briar-android/src/main/res/drawable/bubble_completed.xml b/briar-android/src/main/res/drawable/bubble_completed.xml
index 2e4e30055..314054fee 100644
--- a/briar-android/src/main/res/drawable/bubble_completed.xml
+++ b/briar-android/src/main/res/drawable/bubble_completed.xml
@@ -7,7 +7,7 @@
 		android:radius="32dp"/>
 
 	<solid
-		android:color="@color/step_bubble_completed_background"/>
+		android:color="?colorTertiaryContainer"/>
 
 </shape>
 
diff --git a/briar-android/src/main/res/drawable/bubble_current.xml b/briar-android/src/main/res/drawable/bubble_current.xml
index e74b8e3ed..b2c41c30c 100644
--- a/briar-android/src/main/res/drawable/bubble_current.xml
+++ b/briar-android/src/main/res/drawable/bubble_current.xml
@@ -7,7 +7,7 @@
 		android:radius="32dp"/>
 
 	<solid
-		android:color="@color/step_bubble_current_background"/>
+		android:color="?colorTertiary"/>
 
 </shape>
 
diff --git a/briar-android/src/main/res/drawable/bubble_future.xml b/briar-android/src/main/res/drawable/bubble_future.xml
index 55deccd4d..779f8995b 100644
--- a/briar-android/src/main/res/drawable/bubble_future.xml
+++ b/briar-android/src/main/res/drawable/bubble_future.xml
@@ -7,7 +7,7 @@
 		android:radius="32dp"/>
 
 	<solid
-		android:color="@color/step_bubble_future_background"/>
+		android:color="?colorSurfaceDim"/>
 
 </shape>
 
diff --git a/briar-android/src/main/res/layout/fragment_link_exchange.xml b/briar-android/src/main/res/layout/fragment_link_exchange.xml
index 638612a1c..ccc4f380c 100644
--- a/briar-android/src/main/res/layout/fragment_link_exchange.xml
+++ b/briar-android/src/main/res/layout/fragment_link_exchange.xml
@@ -49,7 +49,7 @@
 				android:layout_height="1dp"
 				android:layout_margin="16dp"
 				android:alpha="0.5"
-				android:background="@color/step_bubble_current_background"
+				android:background="?colorTertiary"
 				app:layout_constraintBottom_toBottomOf="@+id/stepOne"
 				app:layout_constraintEnd_toStartOf="@+id/stepTwo"
 				app:layout_constraintStart_toEndOf="@+id/stepOne"
@@ -99,7 +99,7 @@
 				app:layout_constraintStart_toStartOf="parent"
 				app:layout_constraintTop_toBottomOf="@+id/imageView"
 				app:srcCompat="@drawable/ic_call_made"
-				app:tint="@color/step_bubble_current_foreground" />
+				app:tint="?colorOnTertiary" />
 
 			<TextView
 				android:id="@+id/yourLink"
@@ -171,7 +171,7 @@
 				app:layout_constraintStart_toStartOf="parent"
 				app:layout_constraintTop_toBottomOf="@+id/copyButton"
 				app:srcCompat="@drawable/ic_call_received"
-				app:tint="@color/step_bubble_current_foreground" />
+				app:tint="?colorOnTertiary" />
 
 			<TextView
 				android:id="@+id/inputLink"
diff --git a/briar-android/src/main/res/layout/fragment_nickname.xml b/briar-android/src/main/res/layout/fragment_nickname.xml
index b6e7e07ff..7969de7c9 100644
--- a/briar-android/src/main/res/layout/fragment_nickname.xml
+++ b/briar-android/src/main/res/layout/fragment_nickname.xml
@@ -49,7 +49,7 @@
 				android:layout_width="0dp"
 				android:layout_height="1dp"
 				android:layout_margin="16dp"
-				android:background="@color/step_bubble_current_background"
+				android:background="?colorTertiary"
 				app:layout_constraintBottom_toBottomOf="@+id/stepOne"
 				app:layout_constraintEnd_toStartOf="@+id/stepTwo"
 				app:layout_constraintStart_toEndOf="@+id/stepOne"
@@ -102,7 +102,7 @@
 				app:layout_constraintStart_toStartOf="parent"
 				app:layout_constraintTop_toBottomOf="@+id/imageView"
 				app:srcCompat="@drawable/ic_person"
-				app:tint="@color/step_bubble_current_foreground" />
+				app:tint="?colorOnTertiary" />
 
 			<TextView
 				android:id="@+id/nicknameIntro"
diff --git a/briar-android/src/main/res/values-night/color.xml b/briar-android/src/main/res/values-night/color.xml
index 67e6ef45e..98f47069c 100644
--- a/briar-android/src/main/res/values-night/color.xml
+++ b/briar-android/src/main/res/values-night/color.xml
@@ -31,14 +31,12 @@
 	<color name="il_orange">@color/briar_orange_400</color>
 	<color name="il_red">@color/briar_red_500_new</color>
 
-	<color name="step_bubble_completed_background">@color/briar_blue_800_new</color>
-	<color name="step_bubble_completed_foreground">@color/briar_blue_300</color>
-	<color name="step_bubble_current_background">@color/briar_blue_400_new</color>
-	<color name="step_bubble_current_foreground">@color/briar_blue_900</color>
-	<color name="step_bubble_future_background">@color/briar_night_700_new</color>
-	<color name="step_bubble_future_foreground">@color/briar_night_100</color>
-
+	<color name="md_theme_tertiary">@color/briar_blue_400_new</color>
+	<color name="md_theme_onTertiary">@color/briar_blue_900</color>
+	<color name="md_theme_tertiaryContainer">@color/briar_blue_800_new</color>
+	<color name="md_theme_onTertiaryContainer">@color/briar_blue_300</color>
 	<color name="md_theme_onBackground">#E0E4D2</color>
 	<color name="md_theme_onSurface">#E0E4D2</color>
+	<color name="md_theme_surfaceDim">@color/briar_night_700_new</color>
 	<color name="md_theme_error">@color/briar_red_400</color>
 </resources>
diff --git a/briar-android/src/main/res/values/color.xml b/briar-android/src/main/res/values/color.xml
index 063d5619a..0dd322ade 100644
--- a/briar-android/src/main/res/values/color.xml
+++ b/briar-android/src/main/res/values/color.xml
@@ -78,13 +78,6 @@
 	<color name="il_orange">@color/briar_orange_500_new</color>
 	<color name="il_red">@color/briar_red_600</color>
 
-	<color name="step_bubble_completed_background">@color/briar_blue_100</color>
-	<color name="step_bubble_completed_foreground">@color/briar_blue_600_new</color>
-	<color name="step_bubble_current_background">@color/briar_blue_600_new</color>
-	<color name="step_bubble_current_foreground">@android:color/white</color>
-	<color name="step_bubble_future_background">@color/briar_gray_200_new</color>
-	<color name="step_bubble_future_foreground">@color/briar_gray_700</color>
-
 	<!-- text colors -->
 	<color name="briar_text_link">@color/briar_blue_400</color>
 	<color name="briar_text_link_inverse">@android:color/white</color>
@@ -115,8 +108,12 @@
 	<color name="md_theme_inversePrimary">#98DA27</color>
 	<color name="md_theme_secondary">@color/briar_night_700</color>
 	<color name="md_theme_onSecondary">@android:color/white</color>
-
+	<color name="md_theme_tertiaryContainer">@color/briar_blue_100</color>
+	<color name="md_theme_onTertiaryContainer">@color/briar_blue_600_new</color>
+	<color name="md_theme_tertiary">@color/briar_blue_600_new</color>
+	<color name="md_theme_onTertiary">@android:color/white</color>
 	<color name="md_theme_onBackground">#191D12</color>
 	<color name="md_theme_onSurface">#191D12</color>
+	<color name="md_theme_surfaceDim">@color/briar_gray_200_new</color>
 	<color name="md_theme_error">@color/briar_red_600</color>
 </resources>
diff --git a/briar-android/src/main/res/values/styles.xml b/briar-android/src/main/res/values/styles.xml
index 7b02d5f2b..085ff7b24 100644
--- a/briar-android/src/main/res/values/styles.xml
+++ b/briar-android/src/main/res/values/styles.xml
@@ -148,19 +148,19 @@
 		<item name="android:layout_height">28dp</item>
 		<item name="android:background">@drawable/bubble_current</item>
 		<item name="android:gravity">center</item>
-		<item name="android:textColor">@color/step_bubble_current_foreground</item>
+		<item name="android:textColor">?colorOnTertiary</item>
 		<item name="android:textSize">18sp</item>
 	</style>
 
 	<style name="StepBubble.Upcoming">
 		<item name="android:background">@drawable/bubble_future</item>
-		<item name="android:textColor">@color/step_bubble_future_foreground</item>
+		<item name="android:textColor">?colorOnSurface</item>
 	</style>
 
 	<style name="StepBubble.Completed">
 		<item name="android:background">@drawable/bubble_completed</item>
 		<item name="android:scaleType">center</item>
-		<item name="tint">@color/step_bubble_completed_foreground</item>
+		<item name="tint">?colorOnTertiaryContainer</item>
 		<item name="srcCompat">@drawable/ic_check_white</item>
 	</style>
 
diff --git a/briar-android/src/main/res/values/themes.xml b/briar-android/src/main/res/values/themes.xml
index 2510409d5..c2e1041db 100644
--- a/briar-android/src/main/res/values/themes.xml
+++ b/briar-android/src/main/res/values/themes.xml
@@ -8,10 +8,15 @@
 		<item name="colorOnPrimaryContainer">@color/md_theme_onPrimary</item>
 		<item name="colorSecondary">@color/md_theme_secondary</item>
 		<item name="colorOnSecondary">@color/md_theme_onSecondary</item>
+		<item name="colorTertiary">@color/md_theme_tertiary</item>
+		<item name="colorOnTertiary">@color/md_theme_onTertiary</item>
+		<item name="colorTertiaryContainer">@color/md_theme_tertiaryContainer</item>
+		<item name="colorOnTertiaryContainer">@color/md_theme_onTertiaryContainer</item>
 		<item name="android:colorBackground">@color/window_background</item>
 		<item name="colorOnBackground">@color/md_theme_onBackground</item>
 		<item name="colorSurface">@color/card_background</item>
 		<item name="colorOnSurface">@color/md_theme_onSurface</item>
+		<item name="colorSurfaceDim">@color/md_theme_surfaceDim</item>
 		<item name="colorError">@color/md_theme_error</item>
 		<item name="android:statusBarColor">#000000</item>