diff --git a/Android.mk b/Android.mk
index 4f8feb6..1d1c609 100644
--- a/Android.mk
+++ b/Android.mk
@@ -12,7 +12,7 @@
 endif
 
 src_dirs := src src-bind $(phone_common_dir)/src
-res_dirs := res res-aosp res-common icons/res $(phone_common_dir)/res
+res_dirs := res res-aosp res-common res-icons $(phone_common_dir)/res
 asset_dirs := assets
 
 LOCAL_SRC_FILES := $(call all-java-files-under, $(src_dirs))
diff --git a/icons/res/mipmap-hdpi/ic_contacts_launcher.png b/res-icons/mipmap-hdpi/ic_contacts_launcher.png
similarity index 100%
rename from icons/res/mipmap-hdpi/ic_contacts_launcher.png
rename to res-icons/mipmap-hdpi/ic_contacts_launcher.png
Binary files differ
diff --git a/icons/res/mipmap-hdpi/ic_contacts_launcher_square.png b/res-icons/mipmap-hdpi/ic_contacts_launcher_square.png
similarity index 100%
rename from icons/res/mipmap-hdpi/ic_contacts_launcher_square.png
rename to res-icons/mipmap-hdpi/ic_contacts_launcher_square.png
Binary files differ
diff --git a/icons/res/mipmap-mdpi/ic_contacts_launcher.png b/res-icons/mipmap-mdpi/ic_contacts_launcher.png
similarity index 100%
rename from icons/res/mipmap-mdpi/ic_contacts_launcher.png
rename to res-icons/mipmap-mdpi/ic_contacts_launcher.png
Binary files differ
diff --git a/icons/res/mipmap-mdpi/ic_contacts_launcher_square.png b/res-icons/mipmap-mdpi/ic_contacts_launcher_square.png
similarity index 100%
rename from icons/res/mipmap-mdpi/ic_contacts_launcher_square.png
rename to res-icons/mipmap-mdpi/ic_contacts_launcher_square.png
Binary files differ
diff --git a/icons/res/mipmap-xhdpi/ic_contacts_launcher.png b/res-icons/mipmap-xhdpi/ic_contacts_launcher.png
similarity index 100%
rename from icons/res/mipmap-xhdpi/ic_contacts_launcher.png
rename to res-icons/mipmap-xhdpi/ic_contacts_launcher.png
Binary files differ
diff --git a/icons/res/mipmap-xhdpi/ic_contacts_launcher_square.png b/res-icons/mipmap-xhdpi/ic_contacts_launcher_square.png
similarity index 100%
rename from icons/res/mipmap-xhdpi/ic_contacts_launcher_square.png
rename to res-icons/mipmap-xhdpi/ic_contacts_launcher_square.png
Binary files differ
diff --git a/icons/res/mipmap-xxhdpi/ic_contacts_launcher.png b/res-icons/mipmap-xxhdpi/ic_contacts_launcher.png
similarity index 100%
rename from icons/res/mipmap-xxhdpi/ic_contacts_launcher.png
rename to res-icons/mipmap-xxhdpi/ic_contacts_launcher.png
Binary files differ
diff --git a/icons/res/mipmap-xxhdpi/ic_contacts_launcher_square.png b/res-icons/mipmap-xxhdpi/ic_contacts_launcher_square.png
similarity index 100%
rename from icons/res/mipmap-xxhdpi/ic_contacts_launcher_square.png
rename to res-icons/mipmap-xxhdpi/ic_contacts_launcher_square.png
Binary files differ
diff --git a/icons/res/mipmap-xxxhdpi/ic_contacts_launcher.png b/res-icons/mipmap-xxxhdpi/ic_contacts_launcher.png
similarity index 100%
rename from icons/res/mipmap-xxxhdpi/ic_contacts_launcher.png
rename to res-icons/mipmap-xxxhdpi/ic_contacts_launcher.png
Binary files differ
diff --git a/icons/res/mipmap-xxxhdpi/ic_contacts_launcher_square.png b/res-icons/mipmap-xxxhdpi/ic_contacts_launcher_square.png
similarity index 100%
rename from icons/res/mipmap-xxxhdpi/ic_contacts_launcher_square.png
rename to res-icons/mipmap-xxxhdpi/ic_contacts_launcher_square.png
Binary files differ