diff --git a/AnkiDroid/src/main/res/layout-xlarge/card_browser.xml b/AnkiDroid/src/main/res/layout-sw600dp/card_browser.xml
similarity index 96%
rename from AnkiDroid/src/main/res/layout-xlarge/card_browser.xml
rename to AnkiDroid/src/main/res/layout-sw600dp/card_browser.xml
index 1b2cf1436563..1096d44b2d6c 100644
--- a/AnkiDroid/src/main/res/layout-xlarge/card_browser.xml
+++ b/AnkiDroid/src/main/res/layout-sw600dp/card_browser.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
     <LinearLayout
diff --git a/AnkiDroid/src/main/res/layout-xlarge/card_template_editor.xml b/AnkiDroid/src/main/res/layout-sw600dp/card_template_editor.xml
similarity index 96%
rename from AnkiDroid/src/main/res/layout-xlarge/card_template_editor.xml
rename to AnkiDroid/src/main/res/layout-sw600dp/card_template_editor.xml
index cf2833ae9954..4bf39ec6e17e 100644
--- a/AnkiDroid/src/main/res/layout-xlarge/card_template_editor.xml
+++ b/AnkiDroid/src/main/res/layout-sw600dp/card_template_editor.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/AnkiDroid/src/main/res/layout-xlarge/homescreen.xml b/AnkiDroid/src/main/res/layout-sw600dp/homescreen.xml
similarity index 100%
rename from AnkiDroid/src/main/res/layout-xlarge/homescreen.xml
rename to AnkiDroid/src/main/res/layout-sw600dp/homescreen.xml
diff --git a/AnkiDroid/src/main/res/layout-xlarge/note_editor.xml b/AnkiDroid/src/main/res/layout-sw600dp/note_editor.xml
similarity index 100%
rename from AnkiDroid/src/main/res/layout-xlarge/note_editor.xml
rename to AnkiDroid/src/main/res/layout-sw600dp/note_editor.xml