diff --git a/app/src/main/java/org/thoughtcrime/securesms/avatar/AvatarSelection.kt b/app/src/main/java/org/thoughtcrime/securesms/avatar/AvatarSelection.kt
index d4184cd32d..d84bc9508c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/avatar/AvatarSelection.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/avatar/AvatarSelection.kt
@@ -40,7 +40,8 @@ object AvatarSelection {
         inputFile: Uri?,
         outputFile: Uri?,
         @StringRes title: Int,
-        bgColor: Int
+        bgColor: Int,
+        txtColor: Int
     ) {
         launcher.launch(
             options(inputFile) {
@@ -53,6 +54,7 @@ object AvatarSelection {
                 setBackgroundColor(ContextCompat.getColor(activity, R.color.avatar_background))
                 setToolbarColor(bgColor)
                 setActivityBackgroundColor(bgColor)
+                setToolbarTintColor(txtColor)
                 setActivityTitle(activity.getString(title))
             }
         )
diff --git a/app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt
index dac2329f5d..b6ba9730ce 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt
@@ -113,6 +113,7 @@ class SettingsActivity : PassphraseRequiredActionBarActivity() {
     private val hexEncodedPublicKey: String get() = TextSecurePreferences.getLocalNumber(this)!!
 
     private val bgColor by lazy { getColorFromAttr(android.R.attr.colorPrimary) }
+    private val txtColor by lazy { getColorFromAttr(android.R.attr.textColorPrimary) }
 
     private val onAvatarCropped = registerForActivityResult(CropImageContract()) { result ->
         when {
@@ -230,7 +231,8 @@ class SettingsActivity : PassphraseRequiredActionBarActivity() {
                     inputFile = inputFile,
                     outputFile = outputFile,
                     title = R.string.CropImageActivity_profile_avatar,
-                    bgColor = bgColor
+                    bgColor = bgColor,
+                    txtColor = txtColor
                 )
             }
         }