diff --git a/app/src/main/java/org/mozilla/fenix/ext/Int.kt b/app/src/main/java/org/mozilla/fenix/ext/Int.kt
index 756e027ca..d48a85195 100644
--- a/app/src/main/java/org/mozilla/fenix/ext/Int.kt
+++ b/app/src/main/java/org/mozilla/fenix/ext/Int.kt
@@ -5,12 +5,6 @@
 package org.mozilla.fenix.ext
 
 import android.content.Context
-import android.util.TypedValue
+import org.mozilla.fenix.DefaultThemeManager
 
-fun Int.getColorFromAttr(context: Context): Int {
-    val typedValue = TypedValue()
-    val typedArray = context.obtainStyledAttributes(typedValue.data, intArrayOf(this))
-    val color = typedArray.getColor(0, 0)
-    typedArray.recycle()
-    return color
-}
+fun Int.getColorFromAttr(context: Context): Int = DefaultThemeManager.resolveAttribute(this, context)
diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt
index abaf7120a..9bfaf8bea 100644
--- a/buildSrc/src/main/java/Dependencies.kt
+++ b/buildSrc/src/main/java/Dependencies.kt
@@ -26,7 +26,7 @@ private object Versions {
 
     const val appservices_gradle_plugin = "0.4.4"
     const val mozilla_android_components = "0.51.0-SNAPSHOT"
-    const val mozilla_appservices = "0.25.2"
+    const val mozilla_appservices = "0.26.0"
 
     const val autodispose = "1.1.0"
     const val adjust = "4.11.4"