diff --git a/app/src/main/java/org/thoughtcrime/securesms/preferences/StoragePreferenceFragment.java b/app/src/main/java/org/thoughtcrime/securesms/preferences/StoragePreferenceFragment.java
index 4ceb22881..f6f8ab678 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/preferences/StoragePreferenceFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/StoragePreferenceFragment.java
@@ -215,7 +215,7 @@ public class StoragePreferenceFragment extends ListSummaryPreferenceFragment {
       }
 
       AlertDialog dialog = new AlertDialog.Builder(activity)
-                                          .setTitle(R.string.preferences_Storage__custom_conversation_length_limit)
+                                          .setTitle(R.string.preferences__conversation_length_limit)
                                           .setView(view)
                                           .setPositiveButton(android.R.string.ok, (d, w) -> onSelectionChanged(Integer.parseInt(editText.getText().toString())))
                                           .setNegativeButton(android.R.string.cancel, (d, w) -> updateSettingsList())
diff --git a/app/src/main/res/layout/customizable_single_select_item.xml b/app/src/main/res/layout/customizable_single_select_item.xml
index 91b5dadc9..c983f3fe2 100644
--- a/app/src/main/res/layout/customizable_single_select_item.xml
+++ b/app/src/main/res/layout/customizable_single_select_item.xml
@@ -16,8 +16,9 @@
         android:id="@+id/customizable_single_select_radio"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:paddingEnd="20dp"
         android:clickable="false"
+        android:paddingEnd="20dp"
+        android:theme="?radio_theme"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
@@ -28,7 +29,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:gravity="center_vertical"
-        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:textAppearance="?android:attr/textAppearanceListItem"
         android:textColor="?attr/textColorAlertDialogListItem"
         app:layout_constraintBottom_toTopOf="@id/customizable_single_select_summary"
         app:layout_constraintStart_toEndOf="@id/customizable_single_select_radio"
diff --git a/app/src/main/res/layout/group_mention_setting_dialog.xml b/app/src/main/res/layout/group_mention_setting_dialog.xml
index 8f00ecf76..b54aba5cc 100644
--- a/app/src/main/res/layout/group_mention_setting_dialog.xml
+++ b/app/src/main/res/layout/group_mention_setting_dialog.xml
@@ -28,7 +28,8 @@
         android:paddingEnd="?attr/dialogPreferredPadding"
         android:text="@string/GroupMentionSettingDialog_always_notify_me"
         android:textAppearance="?android:attr/textAppearanceMedium"
-        android:textColor="?attr/textColorAlertDialogListItem" />
+        android:textColor="?attr/textColorAlertDialogListItem"
+        android:theme="?radio_theme" />
 
     <CheckedTextView
         android:id="@+id/group_mention_setting_dont_notify"
@@ -43,6 +44,7 @@
         android:paddingEnd="?attr/dialogPreferredPadding"
         android:text="@string/GroupMentionSettingDialog_dont_notify_me"
         android:textAppearance="?android:attr/textAppearanceMedium"
-        android:textColor="?attr/textColorAlertDialogListItem" />
+        android:textColor="?attr/textColorAlertDialogListItem"
+        android:theme="?radio_theme" />
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/single_select_item.xml b/app/src/main/res/layout/single_select_item.xml
index af7baac1a..7abb84c2f 100644
--- a/app/src/main/res/layout/single_select_item.xml
+++ b/app/src/main/res/layout/single_select_item.xml
@@ -11,6 +11,7 @@
     android:minHeight="?attr/listPreferredItemHeightSmall"
     android:paddingStart="20dp"
     android:paddingEnd="?attr/dialogPreferredPadding"
-    tools:text="Pick me!"
-    android:textAppearance="?android:attr/textAppearanceMedium"
-    android:textColor="?attr/textColorAlertDialogListItem" />
+    android:textAppearance="?android:attr/textAppearanceListItem"
+    android:textColor="?attr/textColorAlertDialogListItem"
+    android:theme="?radio_theme"
+    tools:text="Pick me!" />
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index abdaa25e0..6b7a0c486 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -20,6 +20,8 @@
     <attr name="secondary_background" format="reference" />
     <attr name="secondary_background_bubble" format="reference" />
 
+    <attr name="radio_theme" format="reference" />
+
     <attr name="conversation_list_item_background" format="reference"/>
     <attr name="conversation_list_item_contact_color" format="reference|color"/>
     <attr name="conversation_list_item_subject_color" format="reference|color"/>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7b1370628..88c143ece 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2137,7 +2137,6 @@
     <string name="preferences_storage__none">None</string>
     <string name="preferences_storage__s_messages">%1$s messages</string>
     <string name="preferences_storage__custom">Custom</string>
-    <string name="preferences_Storage__custom_conversation_length_limit">Custom conversation length limit</string>
     <string name="preferences_advanced__use_system_emoji">Use system emoji</string>
     <string name="preferences_advanced__disable_signal_built_in_emoji_support">Disable Signal\'s built-in emoji support</string>
     <string name="preferences_advanced__relay_all_calls_through_the_signal_server_to_avoid_revealing_your_ip_address">Relay all calls through the Signal server to avoid revealing your IP address to your contact. Enabling will reduce call quality.</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index b2be0b79b..f1341369d 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -501,6 +501,14 @@
         <item name="shapeAppearanceOverlay">@style/ShapeAppearanceOverlay.Signal.Button.Rounded</item>
     </style>
 
+    <style name="Widget.Signal.CompoundButton.RadioButton" parent="Widget.AppCompat.CompoundButton.RadioButton">
+        <item name="colorControlNormal">@color/core_grey_20</item>
+    </style>
+
+    <style name="Widget.Signal.CompoundButton.RadioButton.Light">
+        <item name="colorControlNormal">@color/core_grey_50</item>
+    </style>
+
     <style name="ShapeAppearanceOverlay.Signal.Button.Rounded" parent="">
         <item name="cornerFamily">rounded</item>
         <item name="cornerSize">50%</item>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index ec7f07019..2100fc805 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -197,6 +197,8 @@
         <item name="android:homeAsUpIndicator">@drawable/ic_arrow_left_24</item>
         <!--<item name="android:windowContentOverlay">@drawable/compat_actionbar_shadow_background</item>-->
 
+        <item name="radio_theme">@style/Widget.Signal.CompoundButton.RadioButton.Light</item>
+
         <item name="kbs_splash_image">@drawable/ic_kbs_splash_light_svg</item>
         <item name="kbs_confirm_lottie_loading">@raw/lottie_kbs_loading_light</item>
         <item name="kbs_confirm_lottie_success">@raw/lottie_kbs_success_light</item>
@@ -532,6 +534,8 @@
         <item name="homeAsUpIndicator">@drawable/ic_arrow_left_24</item>
         <item name="android:homeAsUpIndicator">@drawable/ic_arrow_left_24</item>
 
+        <item name="radio_theme">@style/Widget.Signal.CompoundButton.RadioButton</item>
+
         <item name="tinted_circle_background">@drawable/tinted_circle_dark</item>
 
         <item name="kbs_splash_image">@drawable/ic_kbs_splash_dark_svg</item>