diff --git a/app/src/main/res/values-v31/keyboard-icons-lxx-light.xml b/app/src/main/res/values-v31/keyboard-icons-lxx-light.xml
index e362daa97..40d5b5c3b 100644
--- a/app/src/main/res/values-v31/keyboard-icons-lxx-light.xml
+++ b/app/src/main/res/values-v31/keyboard-icons-lxx-light.xml
@@ -19,7 +19,7 @@
 -->
 
 <resources>
-    <style name="KeyboardIcons.LXX_Light" parent="KeyboardIcons.LXX_Light.Parent">
+    <style name="KeyboardIcons.LXX_Light" parent="KeyboardIcons.LXX_Light_Parent">
         <!-- Use system accent color for shifted shift key -->
         <item name="iconShiftKeyShifted">@drawable/sym_keyboard_shift_locked_lxx_light_system_accent</item>
     </style>
diff --git a/app/src/main/res/values/keyboard-icons-lxx-light-parent.xml b/app/src/main/res/values/keyboard-icons-lxx-light-parent.xml
index d2cbfe580..41ee053aa 100644
--- a/app/src/main/res/values/keyboard-icons-lxx-light-parent.xml
+++ b/app/src/main/res/values/keyboard-icons-lxx-light-parent.xml
@@ -19,7 +19,7 @@
 -->
 
 <resources>
-    <style name="KeyboardIcons.LXX_Light.Parent">
+    <style name="KeyboardIcons.LXX_Light_Parent">
         <!-- Keyboard icons -->
         <item name="iconShiftKey">@drawable/sym_keyboard_shift_lxx_light</item>
         <item name="iconShiftKeyShifted">@drawable/sym_keyboard_shift_locked_lxx_light</item>
diff --git a/app/src/main/res/values/keyboard-icons-lxx-light.xml b/app/src/main/res/values/keyboard-icons-lxx-light.xml
index abbf73360..f5b9db6c6 100644
--- a/app/src/main/res/values/keyboard-icons-lxx-light.xml
+++ b/app/src/main/res/values/keyboard-icons-lxx-light.xml
@@ -19,5 +19,5 @@
 -->
 
 <resources>
-    <style name="KeyboardIcons.LXX_Light" parent="KeyboardIcons.LXX_Light.Parent" />
+    <style name="KeyboardIcons.LXX_Light" parent="KeyboardIcons.LXX_Light_Parent" />
 </resources>
diff --git a/app/src/main/res/xml-sw600dp/key_settings.xml b/app/src/main/res/xml/key_settings.xml
similarity index 100%
rename from app/src/main/res/xml-sw600dp/key_settings.xml
rename to app/src/main/res/xml/key_settings.xml
diff --git a/app/src/main/res/xml-land/key_space_3kw.xml b/app/src/main/res/xml/key_space_3kw.xml
similarity index 100%
rename from app/src/main/res/xml-land/key_space_3kw.xml
rename to app/src/main/res/xml/key_space_3kw.xml
diff --git a/app/src/main/res/xml-sw600dp/key_space_7kw.xml b/app/src/main/res/xml/key_space_7kw.xml
similarity index 100%
rename from app/src/main/res/xml-sw600dp/key_space_7kw.xml
rename to app/src/main/res/xml/key_space_7kw.xml
diff --git a/app/src/main/res/xml-sw600dp/keys_exclamation_question.xml b/app/src/main/res/xml/keys_exclamation_question.xml
similarity index 100%
rename from app/src/main/res/xml-sw600dp/keys_exclamation_question.xml
rename to app/src/main/res/xml/keys_exclamation_question.xml