diff --git a/play-services-core/microg-ui-tools/src/main/res/layout/condition_card.xml b/play-services-core/microg-ui-tools/src/main/res/layout/condition_card.xml
index 7545fb20..d42bf4a6 100644
--- a/play-services-core/microg-ui-tools/src/main/res/layout/condition_card.xml
+++ b/play-services-core/microg-ui-tools/src/main/res/layout/condition_card.xml
@@ -17,7 +17,8 @@
   -->
 
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-             android:layout_width="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
              android:layout_height="wrap_content"
              android:clipChildren="false"
              android:layout_marginBottom="0.25dp"
@@ -49,7 +50,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="36dp"
                 android:layout_marginRight="36dp"
-                android:tint="?android:attr/textColorPrimaryInverse"/>
+                app:tint="?android:attr/textColorPrimaryInverse" />
 
             <TextView
                 android:id="@android:id/title"
@@ -69,7 +70,7 @@
                 android:focusable="true"
                 android:padding="16dp"
                 android:src="@drawable/ic_expand_more"
-                android:tint="?android:attr/textColorPrimaryInverse"/>
+                app:tint="?android:attr/textColorPrimaryInverse" />
 
         </LinearLayout>
 
diff --git a/play-services-core/src/main/res/layout/ask_gcm.xml b/play-services-core/src/main/res/layout/ask_gcm.xml
index 30bb762b..33be0e7b 100755
--- a/play-services-core/src/main/res/layout/ask_gcm.xml
+++ b/play-services-core/src/main/res/layout/ask_gcm.xml
@@ -95,13 +95,13 @@
                     android:visibility="invisible">
                 </TextView>
 
-                <androidx.legacy.widget.Space
+                <View
                     android:id="@*android:id/spacer"
                     android:layout_width="0dp"
                     android:layout_height="0dp"
                     android:layout_weight="1"
                     android:visibility="invisible">
-                </androidx.legacy.widget.Space>
+                </View>
 
                 <Button
                     android:id="@+id/permission_deny_button"