diff --git a/app/src/main/java/com/keylesspalace/tusky/LoginActivity.kt b/app/src/main/java/com/keylesspalace/tusky/LoginActivity.kt
index f68b2337..13699723 100644
--- a/app/src/main/java/com/keylesspalace/tusky/LoginActivity.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/LoginActivity.kt
@@ -20,7 +20,6 @@ import android.content.Context
 import android.content.Intent
 import android.content.SharedPreferences
 import android.net.Uri
-import android.os.Build
 import android.os.Bundle
 import android.text.method.LinkMovementMethod
 import android.util.Log
@@ -28,6 +27,7 @@ import android.view.MenuItem
 import android.view.View
 import android.widget.TextView
 import androidx.appcompat.app.AlertDialog
+import androidx.browser.customtabs.CustomTabColorSchemeParams
 import androidx.browser.customtabs.CustomTabsIntent
 import com.bumptech.glide.Glide
 import com.keylesspalace.tusky.di.Injectable
@@ -346,16 +346,19 @@ class LoginActivity : BaseActivity(), Injectable {
         private fun openInCustomTab(uri: Uri, context: Context): Boolean {
 
             val toolbarColor = ThemeUtils.getColor(context, R.attr.colorSurface)
-            val customTabsIntentBuilder = CustomTabsIntent.Builder()
+            val navigationbarColor = ThemeUtils.getColor(context, android.R.attr.navigationBarColor)
+            val navigationbarDividerColor = ThemeUtils.getColor(context, R.attr.dividerColor)
+
+            val colorSchemeParams = CustomTabColorSchemeParams.Builder()
                     .setToolbarColor(toolbarColor)
+                    .setNavigationBarColor(navigationbarColor)
+                    .setNavigationBarDividerColor(navigationbarDividerColor)
+                    .build()
 
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) {
-                customTabsIntentBuilder.setNavigationBarColor(
-                        ThemeUtils.getColor(context, android.R.attr.navigationBarColor)
-                )
-            }
+            val customTabsIntent = CustomTabsIntent.Builder()
+                    .setDefaultColorSchemeParams(colorSchemeParams)
+                    .build()
 
-            val customTabsIntent = customTabsIntentBuilder.build()
             try {
                 customTabsIntent.launchUrl(context, uri)
             } catch (e: ActivityNotFoundException) {
diff --git a/app/src/main/java/com/keylesspalace/tusky/util/LinkHelper.java b/app/src/main/java/com/keylesspalace/tusky/util/LinkHelper.java
index 64e329c8..ec0c8a3e 100644
--- a/app/src/main/java/com/keylesspalace/tusky/util/LinkHelper.java
+++ b/app/src/main/java/com/keylesspalace/tusky/util/LinkHelper.java
@@ -19,7 +19,6 @@ import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
-import android.os.Build;
 import android.text.SpannableStringBuilder;
 import android.text.Spanned;
 import android.text.method.LinkMovementMethod;
@@ -31,6 +30,7 @@ import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.browser.customtabs.CustomTabColorSchemeParams;
 import androidx.browser.customtabs.CustomTabsIntent;
 import androidx.preference.PreferenceManager;
 
@@ -229,18 +229,20 @@ public class LinkHelper {
      */
     public static void openLinkInCustomTab(Uri uri, Context context) {
         int toolbarColor = ThemeUtils.getColor(context, R.attr.colorSurface);
+        int navigationbarColor = ThemeUtils.getColor(context, android.R.attr.navigationBarColor);
+        int navigationbarDividerColor = ThemeUtils.getColor(context, R.attr.dividerColor);
 
-        CustomTabsIntent.Builder customTabsIntentBuilder = new CustomTabsIntent.Builder()
+        CustomTabColorSchemeParams colorSchemeParams = new CustomTabColorSchemeParams.Builder()
                 .setToolbarColor(toolbarColor)
-                .setShowTitle(true);
+                .setNavigationBarColor(navigationbarColor)
+                .setNavigationBarDividerColor(navigationbarDividerColor)
+                .build();
 
-        if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) {
-            customTabsIntentBuilder.setNavigationBarColor(
-                    ThemeUtils.getColor(context, android.R.attr.navigationBarColor)
-            );
-        }
+        CustomTabsIntent customTabsIntent = new CustomTabsIntent.Builder()
+                .setDefaultColorSchemeParams(colorSchemeParams)
+                .setShowTitle(true)
+                .build();
 
-        CustomTabsIntent customTabsIntent = customTabsIntentBuilder.build();
         try {
             customTabsIntent.launchUrl(context, uri);
         } catch (ActivityNotFoundException e) {