diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/sounds/SoundsAndNotificationsSettingsViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/sounds/SoundsAndNotificationsSettingsViewModel.kt
index 285f387b4e..7f9f53de9b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/sounds/SoundsAndNotificationsSettingsViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/sounds/SoundsAndNotificationsSettingsViewModel.kt
@@ -22,7 +22,7 @@ class SoundsAndNotificationsSettingsViewModel(
     store.update(Recipient.live(recipientId).liveData) { recipient, state ->
       state.copy(
         recipientId = recipientId,
-        muteUntil = recipient.muteUntil,
+        muteUntil = if (recipient.isMuted) recipient.muteUntil else 0L,
         mentionSetting = recipient.mentionSetting,
         hasMentionsSupport = recipient.isPushV2Group,
         hasCustomNotificationSettings = recipient.notificationChannel != null || !NotificationChannels.supported()
diff --git a/app/src/main/res/layout/edit_profile_name_fragment.xml b/app/src/main/res/layout/edit_profile_name_fragment.xml
index 619bd7b8d3..c1ded3c5b1 100644
--- a/app/src/main/res/layout/edit_profile_name_fragment.xml
+++ b/app/src/main/res/layout/edit_profile_name_fragment.xml
@@ -13,7 +13,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:navigationIcon="@drawable/ic_x"
+        app:navigationIcon="@drawable/ic_x_tinted"
         app:title="@string/EditProfileNameFragment_your_name"
         app:titleTextAppearance="@style/Signal.Text.Title" />
 
@@ -25,6 +25,7 @@
         android:layout_gravity="center"
         android:hint="@string/EditProfileNameFragment_first_name"
         android:minHeight="56dp"
+        android:theme="@style/ThemeOverlay.Signal.EditProfileInput"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/toolbar">
 
@@ -46,6 +47,7 @@
         android:layout_marginTop="20dp"
         android:hint="@string/EditProfileNameFragment_last_name_optional"
         android:minHeight="56dp"
+        android:theme="@style/ThemeOverlay.Signal.EditProfileInput"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/edit_profile_given_name_wrapper">
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 5440539d3f..b1a263eefd 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -533,7 +533,7 @@
         <item name="boxCornerRadiusTopStart">10dp</item>
         <item name="boxStrokeWidth">0dp</item>
         <item name="boxStrokeWidthFocused">0dp</item>
-        <item name="hintTextAppearance">@style/Signal.Text.Caption</item>
+        <item name="hintTextColor">@color/signal_accent_primary</item>
         <item name="android:textColorHint">@color/signal_text_hint</item>
     </style>
 </resources>
diff --git a/app/src/main/res/values/text_styles.xml b/app/src/main/res/values/text_styles.xml
index 29542ca565..ca23b2b874 100644
--- a/app/src/main/res/values/text_styles.xml
+++ b/app/src/main/res/values/text_styles.xml
@@ -50,7 +50,6 @@
         <item name="android:letterSpacing" tools:ignore="NewApi">0.03</item>
     </style>
 
-
     <style name="Signal.Text.Caption.MessageSent">
         <item name="android:textColor">@color/signal_text_secondary</item>
         <item name="android:shadowRadius">0</item>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 376b7c7f06..134ac830cc 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -456,5 +456,12 @@
         <item name="chipBackgroundColor">@color/core_grey_05</item>
         <item name="closeIconTint">@color/core_grey_60</item>
     </style>
+    
+    <style name="ThemeOverlay.Signal.EditProfileInput" parent="ThemeOverlay.MaterialComponents">
+        <item name="colorAccent">@color/signal_accent_primary</item>
+        <item name="colorControlNormal">@color/signal_accent_primary</item>
+        <item name="colorControlHighlight">@color/signal_accent_primary</item>
+        <item name="colorControlActivated">@color/signal_accent_primary</item>
+    </style>
 
 </resources>