diff --git a/res/drawable/ic_folder_drafts.xml b/res/drawable/ic_folder_drafts.xml
index fa57c6ee8..ff4526dbd 100644
--- a/res/drawable/ic_folder_drafts.xml
+++ b/res/drawable/ic_folder_drafts.xml
@@ -15,7 +15,7 @@
      limitations under the License.
 -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android"
-          xmlns:app="http://schemas.android.com/apk/res/com.android.email">
+          xmlns:app="http://schemas.android.com/apk/res-auto">
     <item app:state_drag_mode="true" android:state_drag_can_accept="false"
           android:drawable="@drawable/ic_folder_drafts_holo_gray" />
     <item android:state_activated="true" android:drawable="@drawable/ic_folder_drafts_holo_dark" />
diff --git a/res/drawable/ic_folder_inbox.xml b/res/drawable/ic_folder_inbox.xml
index f97099a85..116124a5d 100644
--- a/res/drawable/ic_folder_inbox.xml
+++ b/res/drawable/ic_folder_inbox.xml
@@ -15,7 +15,7 @@
      limitations under the License.
 -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res/com.android.email">
+        xmlns:app="http://schemas.android.com/apk/res-auto">
     <item app:state_drag_mode="true" android:state_drag_can_accept="false"
           android:drawable="@drawable/ic_folder_inbox_holo_gray" />
     <item android:state_activated="true" android:drawable="@drawable/ic_folder_inbox_holo_dark" />
diff --git a/res/drawable/ic_folder_outbox.xml b/res/drawable/ic_folder_outbox.xml
index efd96f300..f41423f9e 100644
--- a/res/drawable/ic_folder_outbox.xml
+++ b/res/drawable/ic_folder_outbox.xml
@@ -15,7 +15,7 @@
      limitations under the License.
 -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android"
-          xmlns:app="http://schemas.android.com/apk/res/com.android.email">
+          xmlns:app="http://schemas.android.com/apk/res-auto">
     <item app:state_drag_mode="true" android:state_drag_can_accept="false"
           android:drawable="@drawable/ic_folder_outbox_holo_gray" />
     <item android:state_activated="true" android:drawable="@drawable/ic_folder_outbox_holo_dark" />
diff --git a/res/drawable/ic_folder_sent.xml b/res/drawable/ic_folder_sent.xml
index cc21d4a45..d1f267f37 100644
--- a/res/drawable/ic_folder_sent.xml
+++ b/res/drawable/ic_folder_sent.xml
@@ -15,7 +15,7 @@
      limitations under the License.
 -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android"
-          xmlns:app="http://schemas.android.com/apk/res/com.android.email">
+          xmlns:app="http://schemas.android.com/apk/res-auto">
     <item app:state_drag_mode="true" android:state_drag_can_accept="false"
           android:drawable="@drawable/ic_folder_sent_holo_gray" />
     <item android:state_activated="true" android:drawable="@drawable/ic_folder_sent_holo_dark" />
diff --git a/res/drawable/ic_folder_star.xml b/res/drawable/ic_folder_star.xml
index c63797020..ebca3e560 100644
--- a/res/drawable/ic_folder_star.xml
+++ b/res/drawable/ic_folder_star.xml
@@ -15,7 +15,7 @@
      limitations under the License.
 -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android"
-          xmlns:app="http://schemas.android.com/apk/res/com.android.email">
+          xmlns:app="http://schemas.android.com/apk/res-auto">
     <item app:state_drag_mode="true" android:state_drag_can_accept="false"
           android:drawable="@drawable/ic_folder_star_holo_gray" />
     <item android:state_activated="true" android:drawable="@drawable/ic_folder_star_holo_dark" />
diff --git a/res/drawable/ic_folder_trash.xml b/res/drawable/ic_folder_trash.xml
index 287f8bb39..374ecd5d9 100644
--- a/res/drawable/ic_folder_trash.xml
+++ b/res/drawable/ic_folder_trash.xml
@@ -15,7 +15,7 @@
      limitations under the License.
 -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android"
-          xmlns:app="http://schemas.android.com/apk/res/com.android.email">
+          xmlns:app="http://schemas.android.com/apk/res-auto">
     <item app:state_drag_mode="true" android:state_drag_can_accept="false"
           android:drawable="@drawable/ic_folder_trash_holo_gray" />
     <item android:state_activated="true" android:drawable="@drawable/ic_folder_trash_holo_dark" />
diff --git a/res/drawable/ic_folder_unread.xml b/res/drawable/ic_folder_unread.xml
index b5649cc66..9ac1a77b9 100644
--- a/res/drawable/ic_folder_unread.xml
+++ b/res/drawable/ic_folder_unread.xml
@@ -15,7 +15,7 @@
      limitations under the License.
 -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android"
-          xmlns:app="http://schemas.android.com/apk/res/com.android.email">
+          xmlns:app="http://schemas.android.com/apk/res-auto">
     <item app:state_drag_mode="true" android:state_drag_can_accept="false"
           android:drawable="@drawable/ic_folder_unread_holo_gray" />
     <item android:state_activated="true" android:drawable="@drawable/ic_folder_unread_holo_dark" />
diff --git a/res/xml/services.xml b/res/xml/services.xml
index 0cd01c66b..86aca05f5 100644
--- a/res/xml/services.xml
+++ b/res/xml/services.xml
@@ -48,7 +48,7 @@
          syncContacts: whether this service is capable of syncing contacts (offering a checkbox)
 -->
 
-<emailservices xmlns:email="http://schemas.android.com/apk/res/com.android.email">
+<emailservices xmlns:email="http://schemas.android.com/apk/res-auto">
     <emailservice
         email:protocol="pop3"
         email:name="@string/pop3_name"