diff --git a/app/src/main/res/drawable/ic_safety_number_compact_16.xml b/app/src/main/res/drawable/ic_safety_number_compact_16.xml
new file mode 100644
index 0000000000..fa9ab7bb70
--- /dev/null
+++ b/app/src/main/res/drawable/ic_safety_number_compact_16.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M10.96 5.3c0.17-0.25 0.1-0.6-0.16-0.76-0.26-0.17-0.6-0.1-0.76 0.16L7.2 9.05 5.93 7.41C5.75 7.17 5.4 7.13 5.16 7.31c-0.24 0.2-0.28 0.54-0.1 0.78l1.76 2.25c0.1 0.14 0.28 0.22 0.45 0.21 0.18 0 0.34-0.1 0.44-0.25l3.25-5Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M6.7 14.66c0.76 0.61 1.84 0.61 2.6 0l2.42-1.97c1.37-1.11 2.23-2.73 2.39-4.5l0.33-3.62c0.09-0.95-0.5-1.83-1.4-2.13l-3.6-1.2c-0.94-0.32-1.94-0.32-2.88 0l-3.6 1.2c-0.9 0.3-1.49 1.18-1.4 2.13L1.89 8.2c0.16 1.76 1.02 3.38 2.4 4.49l2.42 1.97Zm1.9-0.86c-0.35 0.29-0.85 0.29-1.2 0l-2.42-1.97c-1.14-0.92-1.86-2.27-2-3.73L2.67 4.47c-0.04-0.44 0.22-0.85 0.64-1l3.6-1.2c0.72-0.23 1.48-0.23 2.2 0l3.6 1.2c0.42 0.15 0.68 0.56 0.64 1L13.01 8.1c-0.13 1.46-0.85 2.8-1.99 3.73L8.6 13.8Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_timer_conversation_badge_compact_16.xml b/app/src/main/res/drawable/ic_timer_conversation_badge_compact_16.xml
new file mode 100644
index 0000000000..8895ee5192
--- /dev/null
+++ b/app/src/main/res/drawable/ic_timer_conversation_badge_compact_16.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M8 4.45C8.3 4.45 8.55 4.7 8.55 5v3.1c0.3 0.19 0.5 0.52 0.5 0.9 0 0.58-0.47 1.05-1.05 1.05-0.58 0-1.05-0.47-1.05-1.05 0-0.38 0.2-0.71 0.5-0.9V5C7.45 4.7 7.7 4.45 8 4.45Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M8 0.45C8.3 0.45 8.55 0.7 8.55 1v0.97c1.4 0.12 2.67 0.67 3.68 1.53l0.76-0.76c0.21-0.22 0.56-0.22 0.77 0 0.22 0.21 0.22 0.56 0 0.77L13 4.27c0.97 1.14 1.55 2.62 1.55 4.23 0 3.62-2.93 6.55-6.55 6.55-3.62 0-6.55-2.93-6.55-6.55 0-3.43 2.64-6.25 6-6.53V1C7.45 0.7 7.7 0.45 8 0.45ZM2.55 8.5c0 3.01 2.44 5.45 5.45 5.45 3.01 0 5.45-2.44 5.45-5.45 0-3.01-2.44-5.45-5.45-5.45-3.01 0-5.45 2.44-5.45 5.45Z"/>
+</vector>
diff --git a/app/src/main/res/layout/conversation_title_view.xml b/app/src/main/res/layout/conversation_title_view.xml
index 283be2ee9f..b45de1cef0 100644
--- a/app/src/main/res/layout/conversation_title_view.xml
+++ b/app/src/main/res/layout/conversation_title_view.xml
@@ -80,12 +80,13 @@
 
         <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/verified_indicator"
-            android:layout_width="12dp"
-            android:layout_height="match_parent"
-            android:layout_marginEnd="3dp"
-            android:tint="@color/signal_inverse_transparent_80"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical|start"
+            android:layout_marginEnd="2dp"
+            android:tint="@color/signal_colorOnSurfaceVariant"
             android:visibility="gone"
-            app:srcCompat="@drawable/symbol_safety_number_24"
+            app:srcCompat="@drawable/ic_safety_number_compact_16"
             tools:visibility="visible" />
 
         <TextView
@@ -99,7 +100,7 @@
             android:gravity="center_vertical"
             android:maxLines="1"
             android:text="@string/ConversationTitleView_verified"
-            android:textColor="@color/signal_inverse_transparent_80"
+            android:textColor="@color/signal_colorOnSurfaceVariant"
             android:textDirection="ltr" />
 
         <org.thoughtcrime.securesms.components.emoji.EmojiTextView
@@ -111,7 +112,7 @@
             android:ellipsize="end"
             android:gravity="center_vertical"
             android:maxLines="1"
-            android:textColor="@color/signal_inverse_transparent_80"
+            android:textColor="@color/signal_colorOnSurfaceVariant"
             android:textDirection="ltr"
             tools:text="(123) 123-1234" />
 
diff --git a/app/src/main/res/layout/expiration_timer_badge.xml b/app/src/main/res/layout/expiration_timer_badge.xml
index 5eef9db331..3fa0dbb034 100644
--- a/app/src/main/res/layout/expiration_timer_badge.xml
+++ b/app/src/main/res/layout/expiration_timer_badge.xml
@@ -6,19 +6,20 @@
     android:id="@+id/expiration_badge_container"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:layout_marginEnd="11dp"
+    android:layout_marginEnd="12dp"
     android:gravity="center"
-    android:visibility="gone"
+    android:visibility="visible"
     android:orientation="horizontal">
 
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/menu_badge_icon"
-        android:layout_width="14dp"
-        android:layout_height="14dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:layout_marginEnd="3dp"
+        android:layout_marginEnd="2dp"
         android:scaleType="fitCenter"
-        app:srcCompat="@drawable/ic_timer_conversation_badge" />
+        android:tint="@color/signal_colorOnSurfaceVariant"
+        app:srcCompat="@drawable/ic_timer_conversation_badge_compact_16" />
 
     <TextView
         android:id="@+id/expiration_badge"
@@ -26,10 +27,8 @@
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|center_horizontal"
         android:gravity="center_horizontal|bottom"
-        android:paddingTop="1dp"
-        android:paddingBottom="3dp"
-        android:textColor="@color/signal_inverse_transparent_80"
-        android:textSize="14dp"
+        android:textColor="@color/signal_colorOnSurfaceVariant"
+        style="@style/Signal.Text.BodySmall"
         tools:text="1w"
         tools:ignore="SpUsage" />
 </LinearLayout>
\ No newline at end of file