diff --git a/res/drawable-hdpi/wallpaper_bluedotgrid.jpg b/res/drawable-hdpi/wallpaper_bluedotgrid.jpg
deleted file mode 100644
index 468edfe43a..0000000000
Binary files a/res/drawable-hdpi/wallpaper_bluedotgrid.jpg and /dev/null differ
diff --git a/res/drawable-hdpi/wallpaper_bluedotgrid_small.jpg b/res/drawable-hdpi/wallpaper_bluedotgrid_small.jpg
deleted file mode 100644
index 1ff9568ae1..0000000000
Binary files a/res/drawable-hdpi/wallpaper_bluedotgrid_small.jpg and /dev/null differ
diff --git a/res/drawable-hdpi/wallpaper_brown.jpg b/res/drawable-hdpi/wallpaper_brown.jpg
deleted file mode 100644
index 9b7ef20351..0000000000
Binary files a/res/drawable-hdpi/wallpaper_brown.jpg and /dev/null differ
diff --git a/res/drawable-hdpi/wallpaper_brown_small.jpg b/res/drawable-hdpi/wallpaper_brown_small.jpg
deleted file mode 100644
index e5b417e7bd..0000000000
Binary files a/res/drawable-hdpi/wallpaper_brown_small.jpg and /dev/null differ
diff --git a/res/drawable-hdpi/wallpaper_canyon.jpg b/res/drawable-hdpi/wallpaper_canyon.jpg
deleted file mode 100644
index 1b129fd369..0000000000
Binary files a/res/drawable-hdpi/wallpaper_canyon.jpg and /dev/null differ
diff --git a/res/drawable-hdpi/wallpaper_canyon_small.jpg b/res/drawable-hdpi/wallpaper_canyon_small.jpg
deleted file mode 100644
index fd4d72f9e3..0000000000
Binary files a/res/drawable-hdpi/wallpaper_canyon_small.jpg and /dev/null differ
diff --git a/res/drawable-hdpi/wallpaper_cloud.jpg b/res/drawable-hdpi/wallpaper_cloud.jpg
deleted file mode 100644
index f3b5545cde..0000000000
Binary files a/res/drawable-hdpi/wallpaper_cloud.jpg and /dev/null differ
diff --git a/res/drawable-hdpi/wallpaper_cloud_small.jpg b/res/drawable-hdpi/wallpaper_cloud_small.jpg
deleted file mode 100644
index 0e4c14cf4b..0000000000
Binary files a/res/drawable-hdpi/wallpaper_cloud_small.jpg and /dev/null differ
diff --git a/res/drawable-hdpi/wallpaper_desert.jpg b/res/drawable-hdpi/wallpaper_desert.jpg
deleted file mode 100644
index 47daa791a1..0000000000
Binary files a/res/drawable-hdpi/wallpaper_desert.jpg and /dev/null differ
diff --git a/res/drawable-hdpi/wallpaper_desert_small.jpg b/res/drawable-hdpi/wallpaper_desert_small.jpg
deleted file mode 100644
index 9252d368dd..0000000000
Binary files a/res/drawable-hdpi/wallpaper_desert_small.jpg and /dev/null differ
diff --git a/res/drawable-hdpi/wallpaper_despair.jpg b/res/drawable-hdpi/wallpaper_despair.jpg
deleted file mode 100644
index 57e82354ac..0000000000
Binary files a/res/drawable-hdpi/wallpaper_despair.jpg and /dev/null differ
diff --git a/res/drawable-hdpi/wallpaper_despair_small.jpg b/res/drawable-hdpi/wallpaper_despair_small.jpg
deleted file mode 100644
index fc8e3c6788..0000000000
Binary files a/res/drawable-hdpi/wallpaper_despair_small.jpg and /dev/null differ
diff --git a/res/drawable-hdpi/wallpaper_electric.jpg b/res/drawable-hdpi/wallpaper_electric.jpg
deleted file mode 100644
index f7800af1a3..0000000000
Binary files a/res/drawable-hdpi/wallpaper_electric.jpg and /dev/null differ
diff --git a/res/drawable-hdpi/wallpaper_electric_small.jpg b/res/drawable-hdpi/wallpaper_electric_small.jpg
deleted file mode 100644
index 66dd573cf8..0000000000
Binary files a/res/drawable-hdpi/wallpaper_electric_small.jpg and /dev/null differ
diff --git a/res/drawable-hdpi/wallpaper_field.jpg b/res/drawable-hdpi/wallpaper_field.jpg
deleted file mode 100644
index 5bab9b52a1..0000000000
Binary files a/res/drawable-hdpi/wallpaper_field.jpg and /dev/null differ
diff --git a/res/drawable-hdpi/wallpaper_field_small.jpg b/res/drawable-hdpi/wallpaper_field_small.jpg
deleted file mode 100644
index 20d9a48c35..0000000000
Binary files a/res/drawable-hdpi/wallpaper_field_small.jpg and /dev/null differ
diff --git a/res/drawable-hdpi/wallpaper_galaxy.jpg b/res/drawable-hdpi/wallpaper_galaxy.jpg
deleted file mode 100644
index de0f3ff1fb..0000000000
Binary files a/res/drawable-hdpi/wallpaper_galaxy.jpg and /dev/null differ
diff --git a/res/drawable-hdpi/wallpaper_galaxy_small.jpg b/res/drawable-hdpi/wallpaper_galaxy_small.jpg
deleted file mode 100644
index 69d48a2aaa..0000000000
Binary files a/res/drawable-hdpi/wallpaper_galaxy_small.jpg and /dev/null differ
diff --git a/res/drawable-hdpi/wallpaper_goldengate.jpg b/res/drawable-hdpi/wallpaper_goldengate.jpg
deleted file mode 100644
index 2271091909..0000000000
Binary files a/res/drawable-hdpi/wallpaper_goldengate.jpg and /dev/null differ
diff --git a/res/drawable-hdpi/wallpaper_goldengate_small.jpg b/res/drawable-hdpi/wallpaper_goldengate_small.jpg
deleted file mode 100644
index e9aca1e990..0000000000
Binary files a/res/drawable-hdpi/wallpaper_goldengate_small.jpg and /dev/null differ
diff --git a/res/drawable-hdpi/wallpaper_grass.jpg b/res/drawable-hdpi/wallpaper_grass.jpg
deleted file mode 100644
index e9dc54175a..0000000000
Binary files a/res/drawable-hdpi/wallpaper_grass.jpg and /dev/null differ
diff --git a/res/drawable-hdpi/wallpaper_grass_night.jpg b/res/drawable-hdpi/wallpaper_grass_night.jpg
deleted file mode 100644
index b9c74c99e9..0000000000
Binary files a/res/drawable-hdpi/wallpaper_grass_night.jpg and /dev/null differ
diff --git a/res/drawable-hdpi/wallpaper_grass_night_small.jpg b/res/drawable-hdpi/wallpaper_grass_night_small.jpg
deleted file mode 100644
index 353eb189bc..0000000000
Binary files a/res/drawable-hdpi/wallpaper_grass_night_small.jpg and /dev/null differ
diff --git a/res/drawable-hdpi/wallpaper_grass_small.jpg b/res/drawable-hdpi/wallpaper_grass_small.jpg
deleted file mode 100644
index dc45738aa9..0000000000
Binary files a/res/drawable-hdpi/wallpaper_grass_small.jpg and /dev/null differ
diff --git a/res/drawable-hdpi/wallpaper_gray.jpg b/res/drawable-hdpi/wallpaper_gray.jpg
deleted file mode 100644
index 913f0533e9..0000000000
Binary files a/res/drawable-hdpi/wallpaper_gray.jpg and /dev/null differ
diff --git a/res/drawable-hdpi/wallpaper_gray_small.jpg b/res/drawable-hdpi/wallpaper_gray_small.jpg
deleted file mode 100644
index d083a74b06..0000000000
Binary files a/res/drawable-hdpi/wallpaper_gray_small.jpg and /dev/null differ
diff --git a/res/drawable-hdpi/wallpaper_greengray.jpg b/res/drawable-hdpi/wallpaper_greengray.jpg
deleted file mode 100644
index 1f3c86cd95..0000000000
Binary files a/res/drawable-hdpi/wallpaper_greengray.jpg and /dev/null differ
diff --git a/res/drawable-hdpi/wallpaper_greengray_small.jpg b/res/drawable-hdpi/wallpaper_greengray_small.jpg
deleted file mode 100644
index ebf7066362..0000000000
Binary files a/res/drawable-hdpi/wallpaper_greengray_small.jpg and /dev/null differ
diff --git a/res/drawable-hdpi/wallpaper_hazybluedots.jpg b/res/drawable-hdpi/wallpaper_hazybluedots.jpg
deleted file mode 100644
index fe6aeb40ae..0000000000
Binary files a/res/drawable-hdpi/wallpaper_hazybluedots.jpg and /dev/null differ
diff --git a/res/drawable-hdpi/wallpaper_hazybluedots_small.jpg b/res/drawable-hdpi/wallpaper_hazybluedots_small.jpg
deleted file mode 100644
index c645dea57c..0000000000
Binary files a/res/drawable-hdpi/wallpaper_hazybluedots_small.jpg and /dev/null differ
diff --git a/res/drawable-hdpi/wallpaper_lightgrad.jpg b/res/drawable-hdpi/wallpaper_lightgrad.jpg
deleted file mode 100644
index 35a45facb1..0000000000
Binary files a/res/drawable-hdpi/wallpaper_lightgrad.jpg and /dev/null differ
diff --git a/res/drawable-hdpi/wallpaper_lightgrad_small.jpg b/res/drawable-hdpi/wallpaper_lightgrad_small.jpg
deleted file mode 100644
index f909da7afe..0000000000
Binary files a/res/drawable-hdpi/wallpaper_lightgrad_small.jpg and /dev/null differ
diff --git a/res/drawable-hdpi/wallpaper_monumentvalley.jpg b/res/drawable-hdpi/wallpaper_monumentvalley.jpg
deleted file mode 100644
index 1bb5f2c0e5..0000000000
Binary files a/res/drawable-hdpi/wallpaper_monumentvalley.jpg and /dev/null differ
diff --git a/res/drawable-hdpi/wallpaper_monumentvalley_small.jpg b/res/drawable-hdpi/wallpaper_monumentvalley_small.jpg
deleted file mode 100644
index 9ea3309eb0..0000000000
Binary files a/res/drawable-hdpi/wallpaper_monumentvalley_small.jpg and /dev/null differ
diff --git a/res/drawable-hdpi/wallpaper_nexuspattern.jpg b/res/drawable-hdpi/wallpaper_nexuspattern.jpg
deleted file mode 100644
index 212a7b1d33..0000000000
Binary files a/res/drawable-hdpi/wallpaper_nexuspattern.jpg and /dev/null differ
diff --git a/res/drawable-hdpi/wallpaper_nexuspattern_small.jpg b/res/drawable-hdpi/wallpaper_nexuspattern_small.jpg
deleted file mode 100644
index 8e474a5de6..0000000000
Binary files a/res/drawable-hdpi/wallpaper_nexuspattern_small.jpg and /dev/null differ
diff --git a/res/drawable-hdpi/wallpaper_nexusrain.jpg b/res/drawable-hdpi/wallpaper_nexusrain.jpg
deleted file mode 100644
index 46c2971e77..0000000000
Binary files a/res/drawable-hdpi/wallpaper_nexusrain.jpg and /dev/null differ
diff --git a/res/drawable-hdpi/wallpaper_nexusrain_small.jpg b/res/drawable-hdpi/wallpaper_nexusrain_small.jpg
deleted file mode 100644
index a23933948a..0000000000
Binary files a/res/drawable-hdpi/wallpaper_nexusrain_small.jpg and /dev/null differ
diff --git a/res/drawable-hdpi/wallpaper_nexuswallpaper1.png b/res/drawable-hdpi/wallpaper_nexuswallpaper1.png
deleted file mode 100644
index d761b4a550..0000000000
Binary files a/res/drawable-hdpi/wallpaper_nexuswallpaper1.png and /dev/null differ
diff --git a/res/drawable-hdpi/wallpaper_nexuswallpaper1_small.jpg b/res/drawable-hdpi/wallpaper_nexuswallpaper1_small.jpg
deleted file mode 100644
index 70882bbe9e..0000000000
Binary files a/res/drawable-hdpi/wallpaper_nexuswallpaper1_small.jpg and /dev/null differ
diff --git a/res/drawable-hdpi/wallpaper_pcut.jpg b/res/drawable-hdpi/wallpaper_pcut.jpg
deleted file mode 100644
index bb9914da84..0000000000
Binary files a/res/drawable-hdpi/wallpaper_pcut.jpg and /dev/null differ
diff --git a/res/drawable-hdpi/wallpaper_pcut_small.jpg b/res/drawable-hdpi/wallpaper_pcut_small.jpg
deleted file mode 100644
index bd19775b2b..0000000000
Binary files a/res/drawable-hdpi/wallpaper_pcut_small.jpg and /dev/null differ
diff --git a/res/drawable-hdpi/wallpaper_picker_preview.png b/res/drawable-hdpi/wallpaper_picker_preview.png
deleted file mode 100644
index b48899acfc..0000000000
Binary files a/res/drawable-hdpi/wallpaper_picker_preview.png and /dev/null differ
diff --git a/res/drawable-hdpi/wallpaper_ropelights.jpg b/res/drawable-hdpi/wallpaper_ropelights.jpg
deleted file mode 100644
index ca7862f6a5..0000000000
Binary files a/res/drawable-hdpi/wallpaper_ropelights.jpg and /dev/null differ
diff --git a/res/drawable-hdpi/wallpaper_ropelights_small.jpg b/res/drawable-hdpi/wallpaper_ropelights_small.jpg
deleted file mode 100644
index ac6fb29e96..0000000000
Binary files a/res/drawable-hdpi/wallpaper_ropelights_small.jpg and /dev/null differ
diff --git a/res/drawable-hdpi/wallpaper_tree.jpg b/res/drawable-hdpi/wallpaper_tree.jpg
deleted file mode 100644
index f998bea35a..0000000000
Binary files a/res/drawable-hdpi/wallpaper_tree.jpg and /dev/null differ
diff --git a/res/drawable-hdpi/wallpaper_tree_small.jpg b/res/drawable-hdpi/wallpaper_tree_small.jpg
deleted file mode 100644
index 425305af0f..0000000000
Binary files a/res/drawable-hdpi/wallpaper_tree_small.jpg and /dev/null differ
diff --git a/res/drawable-hdpi/wallpaper_x67.jpg b/res/drawable-hdpi/wallpaper_x67.jpg
deleted file mode 100644
index 400aa27be4..0000000000
Binary files a/res/drawable-hdpi/wallpaper_x67.jpg and /dev/null differ
diff --git a/res/drawable-hdpi/wallpaper_x67_small.jpg b/res/drawable-hdpi/wallpaper_x67_small.jpg
deleted file mode 100644
index 10e0faab62..0000000000
Binary files a/res/drawable-hdpi/wallpaper_x67_small.jpg and /dev/null differ
diff --git a/res/drawable-hdpi/wallpaper_zanzibar.jpg b/res/drawable-hdpi/wallpaper_zanzibar.jpg
deleted file mode 100644
index 9218895aa4..0000000000
Binary files a/res/drawable-hdpi/wallpaper_zanzibar.jpg and /dev/null differ
diff --git a/res/drawable-hdpi/wallpaper_zanzibar_small.jpg b/res/drawable-hdpi/wallpaper_zanzibar_small.jpg
deleted file mode 100644
index affdc8c8b1..0000000000
Binary files a/res/drawable-hdpi/wallpaper_zanzibar_small.jpg and /dev/null differ
diff --git a/res/drawable-mdpi/wallpaper_beach.jpg b/res/drawable-mdpi/wallpaper_beach.jpg
deleted file mode 100644
index b502092a7c..0000000000
Binary files a/res/drawable-mdpi/wallpaper_beach.jpg and /dev/null differ
diff --git a/res/drawable-mdpi/wallpaper_beach_small.jpg b/res/drawable-mdpi/wallpaper_beach_small.jpg
deleted file mode 100644
index 46051cc4e7..0000000000
Binary files a/res/drawable-mdpi/wallpaper_beach_small.jpg and /dev/null differ
diff --git a/res/drawable-mdpi/wallpaper_blue.jpg b/res/drawable-mdpi/wallpaper_blue.jpg
deleted file mode 100644
index 0edd6bda8b..0000000000
Binary files a/res/drawable-mdpi/wallpaper_blue.jpg and /dev/null differ
diff --git a/res/drawable-mdpi/wallpaper_blue_small.jpg b/res/drawable-mdpi/wallpaper_blue_small.jpg
deleted file mode 100644
index 5cf585a0e1..0000000000
Binary files a/res/drawable-mdpi/wallpaper_blue_small.jpg and /dev/null differ
diff --git a/res/drawable-mdpi/wallpaper_green.jpg b/res/drawable-mdpi/wallpaper_green.jpg
deleted file mode 100644
index 36c9e08d75..0000000000
Binary files a/res/drawable-mdpi/wallpaper_green.jpg and /dev/null differ
diff --git a/res/drawable-mdpi/wallpaper_green_small.jpg b/res/drawable-mdpi/wallpaper_green_small.jpg
deleted file mode 100644
index d7c28ec1e3..0000000000
Binary files a/res/drawable-mdpi/wallpaper_green_small.jpg and /dev/null differ
diff --git a/res/drawable-mdpi/wallpaper_grey.jpg b/res/drawable-mdpi/wallpaper_grey.jpg
deleted file mode 100644
index ca48e6afc9..0000000000
Binary files a/res/drawable-mdpi/wallpaper_grey.jpg and /dev/null differ
diff --git a/res/drawable-mdpi/wallpaper_grey_small.jpg b/res/drawable-mdpi/wallpaper_grey_small.jpg
deleted file mode 100644
index 1734d2e966..0000000000
Binary files a/res/drawable-mdpi/wallpaper_grey_small.jpg and /dev/null differ
diff --git a/res/drawable-mdpi/wallpaper_jellyfish.jpg b/res/drawable-mdpi/wallpaper_jellyfish.jpg
deleted file mode 100644
index 659228b1ed..0000000000
Binary files a/res/drawable-mdpi/wallpaper_jellyfish.jpg and /dev/null differ
diff --git a/res/drawable-mdpi/wallpaper_jellyfish_small.jpg b/res/drawable-mdpi/wallpaper_jellyfish_small.jpg
deleted file mode 100644
index 4e5d134643..0000000000
Binary files a/res/drawable-mdpi/wallpaper_jellyfish_small.jpg and /dev/null differ
diff --git a/res/drawable-mdpi/wallpaper_lake.jpg b/res/drawable-mdpi/wallpaper_lake.jpg
deleted file mode 100644
index 5ba522f57b..0000000000
Binary files a/res/drawable-mdpi/wallpaper_lake.jpg and /dev/null differ
diff --git a/res/drawable-mdpi/wallpaper_lake_small.jpg b/res/drawable-mdpi/wallpaper_lake_small.jpg
deleted file mode 100644
index 36d56ccc7b..0000000000
Binary files a/res/drawable-mdpi/wallpaper_lake_small.jpg and /dev/null differ
diff --git a/res/drawable-mdpi/wallpaper_mountain.jpg b/res/drawable-mdpi/wallpaper_mountain.jpg
deleted file mode 100644
index 137617793a..0000000000
Binary files a/res/drawable-mdpi/wallpaper_mountain.jpg and /dev/null differ
diff --git a/res/drawable-mdpi/wallpaper_mountain_small.jpg b/res/drawable-mdpi/wallpaper_mountain_small.jpg
deleted file mode 100644
index e2d5ac2651..0000000000
Binary files a/res/drawable-mdpi/wallpaper_mountain_small.jpg and /dev/null differ
diff --git a/res/drawable-mdpi/wallpaper_nexuswallpaper1.png b/res/drawable-mdpi/wallpaper_nexuswallpaper1.png
deleted file mode 100644
index b5e8767b39..0000000000
Binary files a/res/drawable-mdpi/wallpaper_nexuswallpaper1.png and /dev/null differ
diff --git a/res/drawable-mdpi/wallpaper_path.jpg b/res/drawable-mdpi/wallpaper_path.jpg
deleted file mode 100644
index e1c98c0569..0000000000
Binary files a/res/drawable-mdpi/wallpaper_path.jpg and /dev/null differ
diff --git a/res/drawable-mdpi/wallpaper_path_small.jpg b/res/drawable-mdpi/wallpaper_path_small.jpg
deleted file mode 100644
index f47d7a74f8..0000000000
Binary files a/res/drawable-mdpi/wallpaper_path_small.jpg and /dev/null differ
diff --git a/res/drawable-mdpi/wallpaper_picker_preview.png b/res/drawable-mdpi/wallpaper_picker_preview.png
deleted file mode 100644
index b48899acfc..0000000000
Binary files a/res/drawable-mdpi/wallpaper_picker_preview.png and /dev/null differ
diff --git a/res/drawable-mdpi/wallpaper_pink.jpg b/res/drawable-mdpi/wallpaper_pink.jpg
deleted file mode 100644
index 74403e5529..0000000000
Binary files a/res/drawable-mdpi/wallpaper_pink.jpg and /dev/null differ
diff --git a/res/drawable-mdpi/wallpaper_pink_small.jpg b/res/drawable-mdpi/wallpaper_pink_small.jpg
deleted file mode 100644
index 42b17709fb..0000000000
Binary files a/res/drawable-mdpi/wallpaper_pink_small.jpg and /dev/null differ
diff --git a/res/drawable-mdpi/wallpaper_road.jpg b/res/drawable-mdpi/wallpaper_road.jpg
deleted file mode 100644
index 3aaa639545..0000000000
Binary files a/res/drawable-mdpi/wallpaper_road.jpg and /dev/null differ
diff --git a/res/drawable-mdpi/wallpaper_road_small.jpg b/res/drawable-mdpi/wallpaper_road_small.jpg
deleted file mode 100644
index 0b0c390dba..0000000000
Binary files a/res/drawable-mdpi/wallpaper_road_small.jpg and /dev/null differ
diff --git a/res/drawable-mdpi/wallpaper_snow_leopard.jpg b/res/drawable-mdpi/wallpaper_snow_leopard.jpg
deleted file mode 100644
index bcbc51e7b8..0000000000
Binary files a/res/drawable-mdpi/wallpaper_snow_leopard.jpg and /dev/null differ
diff --git a/res/drawable-mdpi/wallpaper_snow_leopard_small.jpg b/res/drawable-mdpi/wallpaper_snow_leopard_small.jpg
deleted file mode 100644
index 99db5c6931..0000000000
Binary files a/res/drawable-mdpi/wallpaper_snow_leopard_small.jpg and /dev/null differ
diff --git a/res/drawable-mdpi/wallpaper_sunrise.jpg b/res/drawable-mdpi/wallpaper_sunrise.jpg
deleted file mode 100644
index 4ee8d5dde3..0000000000
Binary files a/res/drawable-mdpi/wallpaper_sunrise.jpg and /dev/null differ
diff --git a/res/drawable-mdpi/wallpaper_sunrise_small.jpg b/res/drawable-mdpi/wallpaper_sunrise_small.jpg
deleted file mode 100644
index 248b7e78fe..0000000000
Binary files a/res/drawable-mdpi/wallpaper_sunrise_small.jpg and /dev/null differ
diff --git a/res/drawable-mdpi/wallpaper_sunset.jpg b/res/drawable-mdpi/wallpaper_sunset.jpg
deleted file mode 100644
index bcfd8d4bd4..0000000000
Binary files a/res/drawable-mdpi/wallpaper_sunset.jpg and /dev/null differ
diff --git a/res/drawable-mdpi/wallpaper_sunset_small.jpg b/res/drawable-mdpi/wallpaper_sunset_small.jpg
deleted file mode 100644
index d5e5add39c..0000000000
Binary files a/res/drawable-mdpi/wallpaper_sunset_small.jpg and /dev/null differ
diff --git a/res/drawable-mdpi/wallpaper_zanzibar.jpg b/res/drawable-mdpi/wallpaper_zanzibar.jpg
deleted file mode 100644
index fb133741eb..0000000000
Binary files a/res/drawable-mdpi/wallpaper_zanzibar.jpg and /dev/null differ
diff --git a/res/drawable-mdpi/wallpaper_zanzibar_small.jpg b/res/drawable-mdpi/wallpaper_zanzibar_small.jpg
deleted file mode 100644
index 700a7fee1e..0000000000
Binary files a/res/drawable-mdpi/wallpaper_zanzibar_small.jpg and /dev/null differ
diff --git a/res/drawable-nodpi/wallpaper_architecture.jpg b/res/drawable-nodpi/wallpaper_architecture.jpg
new file mode 100644
index 0000000000..82aafb7487
Binary files /dev/null and b/res/drawable-nodpi/wallpaper_architecture.jpg differ
diff --git a/res/drawable-nodpi/wallpaper_architecture_small.jpg b/res/drawable-nodpi/wallpaper_architecture_small.jpg
new file mode 100644
index 0000000000..f17d9e8a11
Binary files /dev/null and b/res/drawable-nodpi/wallpaper_architecture_small.jpg differ
diff --git a/res/drawable-nodpi/wallpaper_bubblegum.jpg b/res/drawable-nodpi/wallpaper_bubblegum.jpg
new file mode 100644
index 0000000000..e8a717d84b
Binary files /dev/null and b/res/drawable-nodpi/wallpaper_bubblegum.jpg differ
diff --git a/res/drawable-nodpi/wallpaper_bubblegum_small.jpg b/res/drawable-nodpi/wallpaper_bubblegum_small.jpg
new file mode 100644
index 0000000000..5875810488
Binary files /dev/null and b/res/drawable-nodpi/wallpaper_bubblegum_small.jpg differ
diff --git a/res/drawable-nodpi/wallpaper_canyon.jpg b/res/drawable-nodpi/wallpaper_canyon.jpg
new file mode 100644
index 0000000000..85aaba46b9
Binary files /dev/null and b/res/drawable-nodpi/wallpaper_canyon.jpg differ
diff --git a/res/drawable-nodpi/wallpaper_canyon_small.jpg b/res/drawable-nodpi/wallpaper_canyon_small.jpg
new file mode 100644
index 0000000000..72513b4f4a
Binary files /dev/null and b/res/drawable-nodpi/wallpaper_canyon_small.jpg differ
diff --git a/res/drawable-nodpi/wallpaper_chroma.jpg b/res/drawable-nodpi/wallpaper_chroma.jpg
new file mode 100644
index 0000000000..7e92243809
Binary files /dev/null and b/res/drawable-nodpi/wallpaper_chroma.jpg differ
diff --git a/res/drawable-nodpi/wallpaper_chroma_small.jpg b/res/drawable-nodpi/wallpaper_chroma_small.jpg
new file mode 100644
index 0000000000..781c2c7ec9
Binary files /dev/null and b/res/drawable-nodpi/wallpaper_chroma_small.jpg differ
diff --git a/res/drawable-nodpi/wallpaper_escape.jpg b/res/drawable-nodpi/wallpaper_escape.jpg
new file mode 100644
index 0000000000..ced555b508
Binary files /dev/null and b/res/drawable-nodpi/wallpaper_escape.jpg differ
diff --git a/res/drawable-nodpi/wallpaper_escape_small.jpg b/res/drawable-nodpi/wallpaper_escape_small.jpg
new file mode 100644
index 0000000000..3a1a9c12cd
Binary files /dev/null and b/res/drawable-nodpi/wallpaper_escape_small.jpg differ
diff --git a/res/drawable-nodpi/wallpaper_fidelity.jpg b/res/drawable-nodpi/wallpaper_fidelity.jpg
new file mode 100644
index 0000000000..1f1eb31ec6
Binary files /dev/null and b/res/drawable-nodpi/wallpaper_fidelity.jpg differ
diff --git a/res/drawable-nodpi/wallpaper_fidelity_small.jpg b/res/drawable-nodpi/wallpaper_fidelity_small.jpg
new file mode 100644
index 0000000000..01092cc3cd
Binary files /dev/null and b/res/drawable-nodpi/wallpaper_fidelity_small.jpg differ
diff --git a/res/drawable-nodpi/wallpaper_flora.jpg b/res/drawable-nodpi/wallpaper_flora.jpg
new file mode 100644
index 0000000000..964e37c353
Binary files /dev/null and b/res/drawable-nodpi/wallpaper_flora.jpg differ
diff --git a/res/drawable-nodpi/wallpaper_flora_small.jpg b/res/drawable-nodpi/wallpaper_flora_small.jpg
new file mode 100644
index 0000000000..7faebc9a42
Binary files /dev/null and b/res/drawable-nodpi/wallpaper_flora_small.jpg differ
diff --git a/res/drawable-nodpi/wallpaper_kepler.jpg b/res/drawable-nodpi/wallpaper_kepler.jpg
new file mode 100644
index 0000000000..4afee40458
Binary files /dev/null and b/res/drawable-nodpi/wallpaper_kepler.jpg differ
diff --git a/res/drawable-nodpi/wallpaper_kepler_small.jpg b/res/drawable-nodpi/wallpaper_kepler_small.jpg
new file mode 100644
index 0000000000..dad79a2745
Binary files /dev/null and b/res/drawable-nodpi/wallpaper_kepler_small.jpg differ
diff --git a/res/drawable-nodpi/wallpaper_leaf.jpg b/res/drawable-nodpi/wallpaper_leaf.jpg
new file mode 100644
index 0000000000..7157ddd222
Binary files /dev/null and b/res/drawable-nodpi/wallpaper_leaf.jpg differ
diff --git a/res/drawable-nodpi/wallpaper_leaf_small.jpg b/res/drawable-nodpi/wallpaper_leaf_small.jpg
new file mode 100644
index 0000000000..f37aab932d
Binary files /dev/null and b/res/drawable-nodpi/wallpaper_leaf_small.jpg differ
diff --git a/res/drawable-nodpi/wallpaper_noir.jpg b/res/drawable-nodpi/wallpaper_noir.jpg
new file mode 100644
index 0000000000..1962495082
Binary files /dev/null and b/res/drawable-nodpi/wallpaper_noir.jpg differ
diff --git a/res/drawable-nodpi/wallpaper_noir_small.jpg b/res/drawable-nodpi/wallpaper_noir_small.jpg
new file mode 100644
index 0000000000..482a832f20
Binary files /dev/null and b/res/drawable-nodpi/wallpaper_noir_small.jpg differ
diff --git a/res/drawable-nodpi/wallpaper_outofthebox.jpg b/res/drawable-nodpi/wallpaper_outofthebox.jpg
new file mode 100644
index 0000000000..6049dccc47
Binary files /dev/null and b/res/drawable-nodpi/wallpaper_outofthebox.jpg differ
diff --git a/res/drawable-nodpi/wallpaper_outofthebox_small.jpg b/res/drawable-nodpi/wallpaper_outofthebox_small.jpg
new file mode 100644
index 0000000000..0b4cde7c0b
Binary files /dev/null and b/res/drawable-nodpi/wallpaper_outofthebox_small.jpg differ
diff --git a/res/drawable-sw600dp-nodpi/bluecrystal.jpg b/res/drawable-sw600dp-nodpi/bluecrystal.jpg
deleted file mode 100755
index d8caefb5b1..0000000000
Binary files a/res/drawable-sw600dp-nodpi/bluecrystal.jpg and /dev/null differ
diff --git a/res/drawable-sw600dp-nodpi/bluecrystal_small.jpg b/res/drawable-sw600dp-nodpi/bluecrystal_small.jpg
deleted file mode 100755
index 810474337d..0000000000
Binary files a/res/drawable-sw600dp-nodpi/bluecrystal_small.jpg and /dev/null differ
diff --git a/res/drawable-sw600dp-nodpi/bluelinebots.jpg b/res/drawable-sw600dp-nodpi/bluelinebots.jpg
deleted file mode 100644
index 26dce370ba..0000000000
Binary files a/res/drawable-sw600dp-nodpi/bluelinebots.jpg and /dev/null differ
diff --git a/res/drawable-sw600dp-nodpi/bluelinebots_small.jpg b/res/drawable-sw600dp-nodpi/bluelinebots_small.jpg
deleted file mode 100755
index 4de80f1329..0000000000
Binary files a/res/drawable-sw600dp-nodpi/bluelinebots_small.jpg and /dev/null differ
diff --git a/res/drawable-sw600dp-nodpi/bots.jpg b/res/drawable-sw600dp-nodpi/bots.jpg
deleted file mode 100755
index ee3b715979..0000000000
Binary files a/res/drawable-sw600dp-nodpi/bots.jpg and /dev/null differ
diff --git a/res/drawable-sw600dp-nodpi/bots_small.jpg b/res/drawable-sw600dp-nodpi/bots_small.jpg
deleted file mode 100755
index 4889897657..0000000000
Binary files a/res/drawable-sw600dp-nodpi/bots_small.jpg and /dev/null differ
diff --git a/res/drawable-sw600dp-nodpi/bucky.jpg b/res/drawable-sw600dp-nodpi/bucky.jpg
deleted file mode 100755
index 20a5034abf..0000000000
Binary files a/res/drawable-sw600dp-nodpi/bucky.jpg and /dev/null differ
diff --git a/res/drawable-sw600dp-nodpi/bucky_small.jpg b/res/drawable-sw600dp-nodpi/bucky_small.jpg
deleted file mode 100755
index 87b4dc9e05..0000000000
Binary files a/res/drawable-sw600dp-nodpi/bucky_small.jpg and /dev/null differ
diff --git a/res/drawable-sw600dp-nodpi/city.jpg b/res/drawable-sw600dp-nodpi/city.jpg
deleted file mode 100644
index 9b4041f9f2..0000000000
Binary files a/res/drawable-sw600dp-nodpi/city.jpg and /dev/null differ
diff --git a/res/drawable-sw600dp-nodpi/city_small.jpg b/res/drawable-sw600dp-nodpi/city_small.jpg
deleted file mode 100644
index e267750cc6..0000000000
Binary files a/res/drawable-sw600dp-nodpi/city_small.jpg and /dev/null differ
diff --git a/res/drawable-sw600dp-nodpi/flowerbot.jpg b/res/drawable-sw600dp-nodpi/flowerbot.jpg
deleted file mode 100644
index 5d9bb75d4a..0000000000
Binary files a/res/drawable-sw600dp-nodpi/flowerbot.jpg and /dev/null differ
diff --git a/res/drawable-sw600dp-nodpi/flowerbot_small.jpg b/res/drawable-sw600dp-nodpi/flowerbot_small.jpg
deleted file mode 100644
index 54778b99ba..0000000000
Binary files a/res/drawable-sw600dp-nodpi/flowerbot_small.jpg and /dev/null differ
diff --git a/res/drawable-sw600dp-nodpi/glowy_hex.jpg b/res/drawable-sw600dp-nodpi/glowy_hex.jpg
deleted file mode 100644
index b007bfdec4..0000000000
Binary files a/res/drawable-sw600dp-nodpi/glowy_hex.jpg and /dev/null differ
diff --git a/res/drawable-sw600dp-nodpi/glowy_hex_small.jpg b/res/drawable-sw600dp-nodpi/glowy_hex_small.jpg
deleted file mode 100644
index bde365dcbe..0000000000
Binary files a/res/drawable-sw600dp-nodpi/glowy_hex_small.jpg and /dev/null differ
diff --git a/res/drawable-sw600dp-nodpi/lotus.jpg b/res/drawable-sw600dp-nodpi/lotus.jpg
deleted file mode 100644
index 1933c20286..0000000000
Binary files a/res/drawable-sw600dp-nodpi/lotus.jpg and /dev/null differ
diff --git a/res/drawable-sw600dp-nodpi/lotus_small.jpg b/res/drawable-sw600dp-nodpi/lotus_small.jpg
deleted file mode 100644
index 6b515efb49..0000000000
Binary files a/res/drawable-sw600dp-nodpi/lotus_small.jpg and /dev/null differ
diff --git a/res/drawable-sw600dp-nodpi/village.jpg b/res/drawable-sw600dp-nodpi/village.jpg
deleted file mode 100644
index 480a07c753..0000000000
Binary files a/res/drawable-sw600dp-nodpi/village.jpg and /dev/null differ
diff --git a/res/drawable-sw600dp-nodpi/village_small.jpg b/res/drawable-sw600dp-nodpi/village_small.jpg
deleted file mode 100644
index 865990416f..0000000000
Binary files a/res/drawable-sw600dp-nodpi/village_small.jpg and /dev/null differ
diff --git a/res/drawable-sw600dp-nodpi/wallpaper_architecture.jpg b/res/drawable-sw600dp-nodpi/wallpaper_architecture.jpg
new file mode 100644
index 0000000000..fae9d4fbf9
Binary files /dev/null and b/res/drawable-sw600dp-nodpi/wallpaper_architecture.jpg differ
diff --git a/res/drawable-sw600dp-nodpi/wallpaper_architecture_small.jpg b/res/drawable-sw600dp-nodpi/wallpaper_architecture_small.jpg
new file mode 100644
index 0000000000..f17d9e8a11
Binary files /dev/null and b/res/drawable-sw600dp-nodpi/wallpaper_architecture_small.jpg differ
diff --git a/res/drawable-sw600dp-nodpi/wallpaper_bubblegum.jpg b/res/drawable-sw600dp-nodpi/wallpaper_bubblegum.jpg
new file mode 100644
index 0000000000..d902912a75
Binary files /dev/null and b/res/drawable-sw600dp-nodpi/wallpaper_bubblegum.jpg differ
diff --git a/res/drawable-sw600dp-nodpi/wallpaper_bubblegum_small.jpg b/res/drawable-sw600dp-nodpi/wallpaper_bubblegum_small.jpg
new file mode 100644
index 0000000000..5875810488
Binary files /dev/null and b/res/drawable-sw600dp-nodpi/wallpaper_bubblegum_small.jpg differ
diff --git a/res/drawable-sw600dp-nodpi/wallpaper_canyon.jpg b/res/drawable-sw600dp-nodpi/wallpaper_canyon.jpg
new file mode 100644
index 0000000000..96e3be5337
Binary files /dev/null and b/res/drawable-sw600dp-nodpi/wallpaper_canyon.jpg differ
diff --git a/res/drawable-sw600dp-nodpi/wallpaper_canyon_small.jpg b/res/drawable-sw600dp-nodpi/wallpaper_canyon_small.jpg
new file mode 100644
index 0000000000..72513b4f4a
Binary files /dev/null and b/res/drawable-sw600dp-nodpi/wallpaper_canyon_small.jpg differ
diff --git a/res/drawable-sw600dp-nodpi/wallpaper_chroma.jpg b/res/drawable-sw600dp-nodpi/wallpaper_chroma.jpg
new file mode 100644
index 0000000000..355286e3e6
Binary files /dev/null and b/res/drawable-sw600dp-nodpi/wallpaper_chroma.jpg differ
diff --git a/res/drawable-sw600dp-nodpi/wallpaper_chroma_small.jpg b/res/drawable-sw600dp-nodpi/wallpaper_chroma_small.jpg
new file mode 100644
index 0000000000..781c2c7ec9
Binary files /dev/null and b/res/drawable-sw600dp-nodpi/wallpaper_chroma_small.jpg differ
diff --git a/res/drawable-sw600dp-nodpi/wallpaper_escape.jpg b/res/drawable-sw600dp-nodpi/wallpaper_escape.jpg
new file mode 100644
index 0000000000..d192ebff53
Binary files /dev/null and b/res/drawable-sw600dp-nodpi/wallpaper_escape.jpg differ
diff --git a/res/drawable-sw600dp-nodpi/wallpaper_escape_small.jpg b/res/drawable-sw600dp-nodpi/wallpaper_escape_small.jpg
new file mode 100644
index 0000000000..3a1a9c12cd
Binary files /dev/null and b/res/drawable-sw600dp-nodpi/wallpaper_escape_small.jpg differ
diff --git a/res/drawable-sw600dp-nodpi/wallpaper_fidelity.jpg b/res/drawable-sw600dp-nodpi/wallpaper_fidelity.jpg
new file mode 100644
index 0000000000..d7ddef4386
Binary files /dev/null and b/res/drawable-sw600dp-nodpi/wallpaper_fidelity.jpg differ
diff --git a/res/drawable-sw600dp-nodpi/wallpaper_fidelity_small.jpg b/res/drawable-sw600dp-nodpi/wallpaper_fidelity_small.jpg
new file mode 100644
index 0000000000..01092cc3cd
Binary files /dev/null and b/res/drawable-sw600dp-nodpi/wallpaper_fidelity_small.jpg differ
diff --git a/res/drawable-sw600dp-nodpi/wallpaper_flora.jpg b/res/drawable-sw600dp-nodpi/wallpaper_flora.jpg
new file mode 100644
index 0000000000..ecdf0becce
Binary files /dev/null and b/res/drawable-sw600dp-nodpi/wallpaper_flora.jpg differ
diff --git a/res/drawable-sw600dp-nodpi/wallpaper_flora_small.jpg b/res/drawable-sw600dp-nodpi/wallpaper_flora_small.jpg
new file mode 100644
index 0000000000..7faebc9a42
Binary files /dev/null and b/res/drawable-sw600dp-nodpi/wallpaper_flora_small.jpg differ
diff --git a/res/drawable-sw600dp-nodpi/wallpaper_kepler.jpg b/res/drawable-sw600dp-nodpi/wallpaper_kepler.jpg
new file mode 100644
index 0000000000..c7c6c2b728
Binary files /dev/null and b/res/drawable-sw600dp-nodpi/wallpaper_kepler.jpg differ
diff --git a/res/drawable-sw600dp-nodpi/wallpaper_kepler_small.jpg b/res/drawable-sw600dp-nodpi/wallpaper_kepler_small.jpg
new file mode 100644
index 0000000000..dad79a2745
Binary files /dev/null and b/res/drawable-sw600dp-nodpi/wallpaper_kepler_small.jpg differ
diff --git a/res/drawable-sw600dp-nodpi/wallpaper_leaf.jpg b/res/drawable-sw600dp-nodpi/wallpaper_leaf.jpg
new file mode 100644
index 0000000000..543d118f21
Binary files /dev/null and b/res/drawable-sw600dp-nodpi/wallpaper_leaf.jpg differ
diff --git a/res/drawable-sw600dp-nodpi/wallpaper_leaf_small.jpg b/res/drawable-sw600dp-nodpi/wallpaper_leaf_small.jpg
new file mode 100644
index 0000000000..f37aab932d
Binary files /dev/null and b/res/drawable-sw600dp-nodpi/wallpaper_leaf_small.jpg differ
diff --git a/res/drawable-sw600dp-nodpi/wallpaper_noir.jpg b/res/drawable-sw600dp-nodpi/wallpaper_noir.jpg
new file mode 100644
index 0000000000..283bf21da2
Binary files /dev/null and b/res/drawable-sw600dp-nodpi/wallpaper_noir.jpg differ
diff --git a/res/drawable-sw600dp-nodpi/wallpaper_noir_small.jpg b/res/drawable-sw600dp-nodpi/wallpaper_noir_small.jpg
new file mode 100644
index 0000000000..482a832f20
Binary files /dev/null and b/res/drawable-sw600dp-nodpi/wallpaper_noir_small.jpg differ
diff --git a/res/drawable-sw600dp-nodpi/wallpaper_outofthebox.jpg b/res/drawable-sw600dp-nodpi/wallpaper_outofthebox.jpg
new file mode 100644
index 0000000000..1529dce4f3
Binary files /dev/null and b/res/drawable-sw600dp-nodpi/wallpaper_outofthebox.jpg differ
diff --git a/res/drawable-sw600dp-nodpi/wallpaper_outofthebox_small.jpg b/res/drawable-sw600dp-nodpi/wallpaper_outofthebox_small.jpg
new file mode 100644
index 0000000000..0b4cde7c0b
Binary files /dev/null and b/res/drawable-sw600dp-nodpi/wallpaper_outofthebox_small.jpg differ
diff --git a/res/values-hdpi/wallpapers.xml b/res/values-hdpi/wallpapers.xml
deleted file mode 100644
index 26961b34fe..0000000000
--- a/res/values-hdpi/wallpapers.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-
-
-
-
-
- - wallpaper_electric
- - wallpaper_grass
- - wallpaper_canyon
- - wallpaper_monumentvalley
- - wallpaper_tree
- - wallpaper_zanzibar
- - wallpaper_field
- - wallpaper_cloud
- - wallpaper_desert
- - wallpaper_goldengate
- - wallpaper_despair
- - wallpaper_grass_night
- - wallpaper_galaxy
- - wallpaper_x67
- - wallpaper_nexusrain
- - wallpaper_nexuspattern
- - wallpaper_nexuswallpaper1
- - wallpaper_brown
- - wallpaper_pcut
- - wallpaper_bluedotgrid
- - wallpaper_hazybluedots
- - wallpaper_ropelights
- - wallpaper_gray
- - wallpaper_greengray
- - wallpaper_lightgrad
-
-
diff --git a/res/values-mdpi/wallpapers.xml b/res/values-mdpi/wallpapers.xml
deleted file mode 100644
index 33039b09e2..0000000000
--- a/res/values-mdpi/wallpapers.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-
-
-
- - wallpaper_lake
- - wallpaper_sunset
- - wallpaper_beach
- - wallpaper_snow_leopard
- - wallpaper_path
- - wallpaper_sunrise
- - wallpaper_mountain
- - wallpaper_road
- - wallpaper_jellyfish
- - wallpaper_zanzibar
- - wallpaper_blue
- - wallpaper_grey
- - wallpaper_green
- - wallpaper_pink
-
-
diff --git a/res/values-sw600dp/wallpapers.xml b/res/values-sw600dp/wallpapers.xml
index 85bb433f1f..fb386f4914 100644
--- a/res/values-sw600dp/wallpapers.xml
+++ b/res/values-sw600dp/wallpapers.xml
@@ -17,14 +17,16 @@
- - bluecrystal
- - bluelinebots
- - glowy_hex
- - bots
- - flowerbot
- - bucky
- - lotus
- - city
- - village
+ - wallpaper_architecture
+ - wallpaper_bubblegum
+ - wallpaper_canyon
+ - wallpaper_chroma
+ - wallpaper_escape
+ - wallpaper_fidelity
+ - wallpaper_flora
+ - wallpaper_kepler
+ - wallpaper_leaf
+ - wallpaper_noir
+ - wallpaper_outofthebox
diff --git a/res/values-xhdpi/wallpapers.xml b/res/values/wallpapers.xml
similarity index 100%
rename from res/values-xhdpi/wallpapers.xml
rename to res/values/wallpapers.xml