diff --git a/app/build.gradle b/app/build.gradle
index e210a813c..6ff3d738e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -333,7 +333,7 @@ dependencies {
     // implementation 'androidx.activity:activity-ktx:1.4.0'
 
     // TODO substitute for tag after first common release
-    implementation 'com.github.nextcloud.android-common:ui:82f6da3e9638e7578a8df8f6e52884e2923b2760'
+    implementation 'com.github.nextcloud.android-common:ui:999ac56111a93bfbedf98b4d01de286d0ed03c5b'
 }
 
 task installGitHooks(type: Copy, group: "development") {
diff --git a/app/src/main/java/com/nextcloud/talk/conversation/info/GuestAccessHelper.kt b/app/src/main/java/com/nextcloud/talk/conversation/info/GuestAccessHelper.kt
index 5728dd102..4fd3a10b6 100644
--- a/app/src/main/java/com/nextcloud/talk/conversation/info/GuestAccessHelper.kt
+++ b/app/src/main/java/com/nextcloud/talk/conversation/info/GuestAccessHelper.kt
@@ -93,7 +93,7 @@ class GuestAccessHelper(
         val builder = MaterialAlertDialogBuilder(activity)
         builder.apply {
             val dialogPassword = DialogPasswordBinding.inflate(LayoutInflater.from(context))
-            viewThemeUtils.colorEditText(dialogPassword.password)
+            viewThemeUtils.platform.colorEditText(dialogPassword.password)
             setView(dialogPassword.root)
             setTitle(R.string.nc_guest_access_password_dialog_title)
             setPositiveButton(R.string.nc_ok) { _, _ ->
@@ -112,9 +112,9 @@ class GuestAccessHelper(
 
     private fun createDialog(builder: MaterialAlertDialogBuilder) {
         builder.create()
-        viewThemeUtils.colorMaterialAlertDialogBackground(binding.conversationInfoName.context, builder)
+        viewThemeUtils.dialog.colorMaterialAlertDialogBackground(binding.conversationInfoName.context, builder)
         val dialog = builder.show()
-        viewThemeUtils.colorTextButtons(
+        viewThemeUtils.platform.colorTextButtons(
             dialog.getButton(AlertDialog.BUTTON_POSITIVE),
             dialog.getButton(AlertDialog.BUTTON_NEGATIVE)
         )
diff --git a/app/src/main/java/com/nextcloud/talk/ui/theme/TalkSpecificViewThemeUtils.kt b/app/src/main/java/com/nextcloud/talk/ui/theme/TalkSpecificViewThemeUtils.kt
index 54cf257ab..5d9970468 100644
--- a/app/src/main/java/com/nextcloud/talk/ui/theme/TalkSpecificViewThemeUtils.kt
+++ b/app/src/main/java/com/nextcloud/talk/ui/theme/TalkSpecificViewThemeUtils.kt
@@ -195,8 +195,9 @@ class TalkSpecificViewThemeUtils @Inject constructor(
     }
 
     private fun colorDrawable(context: Context, drawable: Drawable) {
-        val scheme = getScheme(context)
-        drawable.setTint(scheme.primary)
+        withScheme(context) { scheme ->
+            drawable.setTint(scheme.primary)
+        }
     }
 
     @TargetApi(Build.VERSION_CODES.O)