From 1a7d451750e1bccc734baa7870c6858cc2a01218 Mon Sep 17 00:00:00 2001
From: Joey Rizzoli <joey@cyanogenmoditalia.it>
Date: Sun, 11 Dec 2016 21:30:18 +0100
Subject: Snap: update caf icons

Change-Id: I1adaf709253637bde037b5aea1f856fc5b9029c7
Signed-off-by: Joey Rizzoli <joey@cyanogenmoditalia.it>
---
 res/drawable-hdpi/ic_eis_menu.png                  | Bin 3364 -> 0 bytes
 res/drawable-hdpi/ic_muted_button.png              | Bin 3484 -> 0 bytes
 res/drawable-hdpi/ic_notification.png              | Bin 1110 -> 0 bytes
 res/drawable-hdpi/ic_scene_mode_optizoom.png       | Bin 4076 -> 0 bytes
 res/drawable-hdpi/ic_scene_mode_refocus.png        | Bin 6195 -> 0 bytes
 res/drawable-hdpi/ic_settings_chromaflash.png      | Bin 3041 -> 0 bytes
 res/drawable-hdpi/ic_settings_filter_on.png        | Bin 2311 -> 0 bytes
 res/drawable-hdpi/ic_settings_selfiemirror.png     | Bin 1463 -> 0 bytes
 res/drawable-hdpi/ic_ts_makeup_back.png            | Bin 1285 -> 0 bytes
 res/drawable-hdpi/ic_ts_makeup_off.png             | Bin 1781 -> 0 bytes
 res/drawable-hdpi/ic_ts_makeup_on.png              | Bin 1391 -> 0 bytes
 res/drawable-hdpi/ic_unmuted_button.png            | Bin 2532 -> 0 bytes
 res/drawable-hdpi/pick_the_best_photo.png          | Bin 55579 -> 0 bytes
 res/drawable-hdpi/pick_the_best_photo_selected.png | Bin 1151 -> 0 bytes
 .../pick_the_best_photo_unselected.png             | Bin 1005 -> 0 bytes
 res/drawable-hdpi/remaining_sheets.png             | Bin 1398 -> 0 bytes
 res/drawable-mdpi/ic_notification.png              | Bin 841 -> 0 bytes
 res/drawable-mdpi/ic_ts_makeup_back.png            | Bin 1181 -> 0 bytes
 res/drawable-mdpi/ic_ts_makeup_off.png             | Bin 2284 -> 0 bytes
 res/drawable-mdpi/ic_ts_makeup_on.png              | Bin 2498 -> 0 bytes
 res/drawable-mdpi/remaining_sheets.png             | Bin 1324 -> 0 bytes
 res/drawable-xhdpi/ic_eis_menu.png                 | Bin 4387 -> 0 bytes
 res/drawable-xhdpi/ic_muted_button.png             | Bin 4559 -> 0 bytes
 res/drawable-xhdpi/ic_notification.png             | Bin 1465 -> 0 bytes
 res/drawable-xhdpi/ic_scene_mode_optizoom.png      | Bin 5520 -> 0 bytes
 res/drawable-xhdpi/ic_scene_mode_refocus.png       | Bin 8973 -> 0 bytes
 res/drawable-xhdpi/ic_settings_chromaflash.png     | Bin 4055 -> 0 bytes
 res/drawable-xhdpi/ic_settings_filter_on.png       | Bin 2731 -> 0 bytes
 res/drawable-xhdpi/ic_settings_selfiemirror.png    | Bin 2319 -> 0 bytes
 res/drawable-xhdpi/ic_ts_makeup_back.png           | Bin 1357 -> 0 bytes
 res/drawable-xhdpi/ic_ts_makeup_off.png            | Bin 1674 -> 0 bytes
 res/drawable-xhdpi/ic_ts_makeup_on.png             | Bin 1901 -> 0 bytes
 res/drawable-xhdpi/ic_unmuted_button.png           | Bin 3238 -> 0 bytes
 res/drawable-xhdpi/pick_the_best_photo.png         | Bin 56319 -> 0 bytes
 .../pick_the_best_photo_selected.png               | Bin 1726 -> 0 bytes
 .../pick_the_best_photo_unselected.png             | Bin 1523 -> 0 bytes
 res/drawable-xhdpi/remaining_sheets.png            | Bin 1777 -> 0 bytes
 res/drawable-xxhdpi/ic_eis_menu.png                | Bin 6783 -> 0 bytes
 res/drawable-xxhdpi/ic_muted_button.png            | Bin 7013 -> 0 bytes
 res/drawable-xxhdpi/ic_notification.png            | Bin 1951 -> 0 bytes
 res/drawable-xxhdpi/ic_refocus_editor_cancel.png   | Bin 1744 -> 0 bytes
 res/drawable-xxhdpi/ic_refocus_editor_confirm.png  | Bin 1566 -> 0 bytes
 res/drawable-xxhdpi/ic_scene_mode_optizoom.png     | Bin 8137 -> 0 bytes
 res/drawable-xxhdpi/ic_scene_mode_refocus.png      | Bin 13604 -> 0 bytes
 res/drawable-xxhdpi/ic_settings_chromaflash.png    | Bin 5787 -> 0 bytes
 res/drawable-xxhdpi/ic_settings_filter_on.png      | Bin 3301 -> 0 bytes
 res/drawable-xxhdpi/ic_settings_selfiemirror.png   | Bin 3219 -> 0 bytes
 res/drawable-xxhdpi/ic_ts_makeup_back.png          | Bin 1433 -> 0 bytes
 res/drawable-xxhdpi/ic_ts_makeup_off.png           | Bin 2564 -> 0 bytes
 res/drawable-xxhdpi/ic_ts_makeup_on.png            | Bin 2897 -> 0 bytes
 res/drawable-xxhdpi/ic_unmuted_button.png          | Bin 4708 -> 0 bytes
 res/drawable-xxhdpi/ic_videocam_white_24dp.png     | Bin 178 -> 0 bytes
 res/drawable-xxhdpi/pick_the_best_photo.png        | Bin 57779 -> 0 bytes
 .../pick_the_best_photo_selected.png               | Bin 2306 -> 0 bytes
 .../pick_the_best_photo_unselected.png             | Bin 2118 -> 0 bytes
 res/drawable-xxhdpi/remaining_sheets.png           | Bin 2467 -> 0 bytes
 res/drawable/ic_eis_menu.xml                       |  17 ++++++++++
 res/drawable/ic_muted_button.xml                   |  17 ++++++++++
 res/drawable/ic_notification.xml                   |  18 +++++++++++
 res/drawable/ic_refocus_editor_cancel.xml          |  14 +++++++++
 res/drawable/ic_refocus_editor_confirm.xml         |  13 ++++++++
 res/drawable/ic_scene_mode_optizoom.xml            |  15 +++++++++
 res/drawable/ic_scene_mode_refocus.xml             |  15 +++++++++
 res/drawable/ic_settings_beutification.xml         |  16 ++++++++++
 res/drawable/ic_settings_chromaflash.xml           |  11 +++++++
 res/drawable/ic_settings_filter_on.xml             |  16 ++++++++++
 res/drawable/ic_settings_redeye.xml                |   4 +--
 res/drawable/ic_settings_selfiemirror.xml          |  15 +++++++++
 res/drawable/ic_settings_touchafec.xml             |  18 +++++++++++
 res/drawable/ic_ts_makeup_back.xml                 |  13 ++++++++
 res/drawable/ic_ts_makeup_clean_selector.xml       |  31 ++++++------------
 res/drawable/ic_ts_makeup_custom_selector.xml      |  34 ++++++++------------
 res/drawable/ic_ts_makeup_level_1_selector.xml     |  34 ++++++++------------
 res/drawable/ic_ts_makeup_level_2_selector.xml     |  35 +++++++++------------
 res/drawable/ic_ts_makeup_level_3_selector.xml     |  34 +++++++++-----------
 res/drawable/ic_ts_makeup_level_off_selector.xml   |  34 ++++++++------------
 res/drawable/ic_ts_makeup_off.xml                  |  16 ++++++++++
 res/drawable/ic_ts_makeup_on.xml                   |  16 ++++++++++
 res/drawable/ic_ts_makeup_whiten_selector.xml      |  34 +++++++++-----------
 res/drawable/ic_unmuted_button.xml                 |  15 +++++++++
 res/drawable/ic_videocam_white_24dp.xml            |  14 +++++++++
 res/drawable/pick_the_best_photo.xml               |  12 +++++++
 res/drawable/pick_the_best_photo_selected.xml      |  16 ++++++++++
 res/drawable/pick_the_best_photo_unselected.xml    |  15 +++++++++
 res/drawable/remaining_sheets.xml                  |  11 +++++++
 res/xml/camera_preferences.xml                     |  19 ++++++-----
 86 files changed, 416 insertions(+), 156 deletions(-)
 delete mode 100644 res/drawable-hdpi/ic_eis_menu.png
 delete mode 100644 res/drawable-hdpi/ic_muted_button.png
 delete mode 100644 res/drawable-hdpi/ic_notification.png
 delete mode 100644 res/drawable-hdpi/ic_scene_mode_optizoom.png
 delete mode 100644 res/drawable-hdpi/ic_scene_mode_refocus.png
 delete mode 100644 res/drawable-hdpi/ic_settings_chromaflash.png
 delete mode 100644 res/drawable-hdpi/ic_settings_filter_on.png
 delete mode 100644 res/drawable-hdpi/ic_settings_selfiemirror.png
 delete mode 100644 res/drawable-hdpi/ic_ts_makeup_back.png
 delete mode 100644 res/drawable-hdpi/ic_ts_makeup_off.png
 delete mode 100644 res/drawable-hdpi/ic_ts_makeup_on.png
 delete mode 100644 res/drawable-hdpi/ic_unmuted_button.png
 delete mode 100644 res/drawable-hdpi/pick_the_best_photo.png
 delete mode 100644 res/drawable-hdpi/pick_the_best_photo_selected.png
 delete mode 100644 res/drawable-hdpi/pick_the_best_photo_unselected.png
 delete mode 100644 res/drawable-hdpi/remaining_sheets.png
 delete mode 100644 res/drawable-mdpi/ic_notification.png
 delete mode 100644 res/drawable-mdpi/ic_ts_makeup_back.png
 delete mode 100644 res/drawable-mdpi/ic_ts_makeup_off.png
 delete mode 100644 res/drawable-mdpi/ic_ts_makeup_on.png
 delete mode 100644 res/drawable-mdpi/remaining_sheets.png
 delete mode 100644 res/drawable-xhdpi/ic_eis_menu.png
 delete mode 100644 res/drawable-xhdpi/ic_muted_button.png
 delete mode 100644 res/drawable-xhdpi/ic_notification.png
 delete mode 100644 res/drawable-xhdpi/ic_scene_mode_optizoom.png
 delete mode 100644 res/drawable-xhdpi/ic_scene_mode_refocus.png
 delete mode 100644 res/drawable-xhdpi/ic_settings_chromaflash.png
 delete mode 100644 res/drawable-xhdpi/ic_settings_filter_on.png
 delete mode 100644 res/drawable-xhdpi/ic_settings_selfiemirror.png
 delete mode 100644 res/drawable-xhdpi/ic_ts_makeup_back.png
 delete mode 100644 res/drawable-xhdpi/ic_ts_makeup_off.png
 delete mode 100644 res/drawable-xhdpi/ic_ts_makeup_on.png
 delete mode 100644 res/drawable-xhdpi/ic_unmuted_button.png
 delete mode 100644 res/drawable-xhdpi/pick_the_best_photo.png
 delete mode 100644 res/drawable-xhdpi/pick_the_best_photo_selected.png
 delete mode 100644 res/drawable-xhdpi/pick_the_best_photo_unselected.png
 delete mode 100644 res/drawable-xhdpi/remaining_sheets.png
 delete mode 100644 res/drawable-xxhdpi/ic_eis_menu.png
 delete mode 100644 res/drawable-xxhdpi/ic_muted_button.png
 delete mode 100644 res/drawable-xxhdpi/ic_notification.png
 delete mode 100644 res/drawable-xxhdpi/ic_refocus_editor_cancel.png
 delete mode 100644 res/drawable-xxhdpi/ic_refocus_editor_confirm.png
 delete mode 100644 res/drawable-xxhdpi/ic_scene_mode_optizoom.png
 delete mode 100644 res/drawable-xxhdpi/ic_scene_mode_refocus.png
 delete mode 100644 res/drawable-xxhdpi/ic_settings_chromaflash.png
 delete mode 100644 res/drawable-xxhdpi/ic_settings_filter_on.png
 delete mode 100644 res/drawable-xxhdpi/ic_settings_selfiemirror.png
 delete mode 100644 res/drawable-xxhdpi/ic_ts_makeup_back.png
 delete mode 100644 res/drawable-xxhdpi/ic_ts_makeup_off.png
 delete mode 100644 res/drawable-xxhdpi/ic_ts_makeup_on.png
 delete mode 100644 res/drawable-xxhdpi/ic_unmuted_button.png
 delete mode 100644 res/drawable-xxhdpi/ic_videocam_white_24dp.png
 delete mode 100644 res/drawable-xxhdpi/pick_the_best_photo.png
 delete mode 100644 res/drawable-xxhdpi/pick_the_best_photo_selected.png
 delete mode 100644 res/drawable-xxhdpi/pick_the_best_photo_unselected.png
 delete mode 100644 res/drawable-xxhdpi/remaining_sheets.png
 create mode 100644 res/drawable/ic_eis_menu.xml
 create mode 100644 res/drawable/ic_muted_button.xml
 create mode 100644 res/drawable/ic_notification.xml
 create mode 100644 res/drawable/ic_refocus_editor_cancel.xml
 create mode 100644 res/drawable/ic_refocus_editor_confirm.xml
 create mode 100644 res/drawable/ic_scene_mode_optizoom.xml
 create mode 100644 res/drawable/ic_scene_mode_refocus.xml
 create mode 100644 res/drawable/ic_settings_beutification.xml
 create mode 100644 res/drawable/ic_settings_chromaflash.xml
 create mode 100644 res/drawable/ic_settings_filter_on.xml
 create mode 100644 res/drawable/ic_settings_selfiemirror.xml
 create mode 100644 res/drawable/ic_settings_touchafec.xml
 create mode 100644 res/drawable/ic_ts_makeup_back.xml
 create mode 100644 res/drawable/ic_ts_makeup_off.xml
 create mode 100644 res/drawable/ic_ts_makeup_on.xml
 create mode 100644 res/drawable/ic_unmuted_button.xml
 create mode 100644 res/drawable/ic_videocam_white_24dp.xml
 create mode 100644 res/drawable/pick_the_best_photo.xml
 create mode 100644 res/drawable/pick_the_best_photo_selected.xml
 create mode 100644 res/drawable/pick_the_best_photo_unselected.xml
 create mode 100644 res/drawable/remaining_sheets.xml

diff --git a/res/drawable-hdpi/ic_eis_menu.png b/res/drawable-hdpi/ic_eis_menu.png
deleted file mode 100644
index 292be7ac5..000000000
Binary files a/res/drawable-hdpi/ic_eis_menu.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_muted_button.png b/res/drawable-hdpi/ic_muted_button.png
deleted file mode 100644
index 5068ae16e..000000000
Binary files a/res/drawable-hdpi/ic_muted_button.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_notification.png b/res/drawable-hdpi/ic_notification.png
deleted file mode 100644
index 2286682a9..000000000
Binary files a/res/drawable-hdpi/ic_notification.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_scene_mode_optizoom.png b/res/drawable-hdpi/ic_scene_mode_optizoom.png
deleted file mode 100644
index bdf3d634a..000000000
Binary files a/res/drawable-hdpi/ic_scene_mode_optizoom.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_scene_mode_refocus.png b/res/drawable-hdpi/ic_scene_mode_refocus.png
deleted file mode 100644
index 5118e59f8..000000000
Binary files a/res/drawable-hdpi/ic_scene_mode_refocus.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_settings_chromaflash.png b/res/drawable-hdpi/ic_settings_chromaflash.png
deleted file mode 100644
index a58bc00bf..000000000
Binary files a/res/drawable-hdpi/ic_settings_chromaflash.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_settings_filter_on.png b/res/drawable-hdpi/ic_settings_filter_on.png
deleted file mode 100644
index 32835f907..000000000
Binary files a/res/drawable-hdpi/ic_settings_filter_on.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_settings_selfiemirror.png b/res/drawable-hdpi/ic_settings_selfiemirror.png
deleted file mode 100644
index 870093c57..000000000
Binary files a/res/drawable-hdpi/ic_settings_selfiemirror.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_ts_makeup_back.png b/res/drawable-hdpi/ic_ts_makeup_back.png
deleted file mode 100644
index 7adc9bfe9..000000000
Binary files a/res/drawable-hdpi/ic_ts_makeup_back.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_ts_makeup_off.png b/res/drawable-hdpi/ic_ts_makeup_off.png
deleted file mode 100644
index 46dcff740..000000000
Binary files a/res/drawable-hdpi/ic_ts_makeup_off.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_ts_makeup_on.png b/res/drawable-hdpi/ic_ts_makeup_on.png
deleted file mode 100644
index 759993bc0..000000000
Binary files a/res/drawable-hdpi/ic_ts_makeup_on.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_unmuted_button.png b/res/drawable-hdpi/ic_unmuted_button.png
deleted file mode 100644
index bcd722e99..000000000
Binary files a/res/drawable-hdpi/ic_unmuted_button.png and /dev/null differ
diff --git a/res/drawable-hdpi/pick_the_best_photo.png b/res/drawable-hdpi/pick_the_best_photo.png
deleted file mode 100644
index f0b892136..000000000
Binary files a/res/drawable-hdpi/pick_the_best_photo.png and /dev/null differ
diff --git a/res/drawable-hdpi/pick_the_best_photo_selected.png b/res/drawable-hdpi/pick_the_best_photo_selected.png
deleted file mode 100644
index d2b5f1508..000000000
Binary files a/res/drawable-hdpi/pick_the_best_photo_selected.png and /dev/null differ
diff --git a/res/drawable-hdpi/pick_the_best_photo_unselected.png b/res/drawable-hdpi/pick_the_best_photo_unselected.png
deleted file mode 100644
index 13bdec3e3..000000000
Binary files a/res/drawable-hdpi/pick_the_best_photo_unselected.png and /dev/null differ
diff --git a/res/drawable-hdpi/remaining_sheets.png b/res/drawable-hdpi/remaining_sheets.png
deleted file mode 100644
index f35a61820..000000000
Binary files a/res/drawable-hdpi/remaining_sheets.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_notification.png b/res/drawable-mdpi/ic_notification.png
deleted file mode 100644
index 497375030..000000000
Binary files a/res/drawable-mdpi/ic_notification.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_ts_makeup_back.png b/res/drawable-mdpi/ic_ts_makeup_back.png
deleted file mode 100644
index 7cec89838..000000000
Binary files a/res/drawable-mdpi/ic_ts_makeup_back.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_ts_makeup_off.png b/res/drawable-mdpi/ic_ts_makeup_off.png
deleted file mode 100644
index 08cdc12e9..000000000
Binary files a/res/drawable-mdpi/ic_ts_makeup_off.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_ts_makeup_on.png b/res/drawable-mdpi/ic_ts_makeup_on.png
deleted file mode 100644
index 82d93f040..000000000
Binary files a/res/drawable-mdpi/ic_ts_makeup_on.png and /dev/null differ
diff --git a/res/drawable-mdpi/remaining_sheets.png b/res/drawable-mdpi/remaining_sheets.png
deleted file mode 100644
index 3326cf92e..000000000
Binary files a/res/drawable-mdpi/remaining_sheets.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_eis_menu.png b/res/drawable-xhdpi/ic_eis_menu.png
deleted file mode 100644
index 01c0a6d07..000000000
Binary files a/res/drawable-xhdpi/ic_eis_menu.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_muted_button.png b/res/drawable-xhdpi/ic_muted_button.png
deleted file mode 100644
index db9ce97ba..000000000
Binary files a/res/drawable-xhdpi/ic_muted_button.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_notification.png b/res/drawable-xhdpi/ic_notification.png
deleted file mode 100644
index bf9861ab1..000000000
Binary files a/res/drawable-xhdpi/ic_notification.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_scene_mode_optizoom.png b/res/drawable-xhdpi/ic_scene_mode_optizoom.png
deleted file mode 100644
index 8a4fc3614..000000000
Binary files a/res/drawable-xhdpi/ic_scene_mode_optizoom.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_scene_mode_refocus.png b/res/drawable-xhdpi/ic_scene_mode_refocus.png
deleted file mode 100644
index 89bff3d2f..000000000
Binary files a/res/drawable-xhdpi/ic_scene_mode_refocus.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_settings_chromaflash.png b/res/drawable-xhdpi/ic_settings_chromaflash.png
deleted file mode 100644
index b21a5a086..000000000
Binary files a/res/drawable-xhdpi/ic_settings_chromaflash.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_settings_filter_on.png b/res/drawable-xhdpi/ic_settings_filter_on.png
deleted file mode 100644
index c1e518e33..000000000
Binary files a/res/drawable-xhdpi/ic_settings_filter_on.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_settings_selfiemirror.png b/res/drawable-xhdpi/ic_settings_selfiemirror.png
deleted file mode 100644
index 692476577..000000000
Binary files a/res/drawable-xhdpi/ic_settings_selfiemirror.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_ts_makeup_back.png b/res/drawable-xhdpi/ic_ts_makeup_back.png
deleted file mode 100644
index 136963769..000000000
Binary files a/res/drawable-xhdpi/ic_ts_makeup_back.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_ts_makeup_off.png b/res/drawable-xhdpi/ic_ts_makeup_off.png
deleted file mode 100644
index e1d4152e0..000000000
Binary files a/res/drawable-xhdpi/ic_ts_makeup_off.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_ts_makeup_on.png b/res/drawable-xhdpi/ic_ts_makeup_on.png
deleted file mode 100644
index 8d07f536a..000000000
Binary files a/res/drawable-xhdpi/ic_ts_makeup_on.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_unmuted_button.png b/res/drawable-xhdpi/ic_unmuted_button.png
deleted file mode 100644
index 78ad39d05..000000000
Binary files a/res/drawable-xhdpi/ic_unmuted_button.png and /dev/null differ
diff --git a/res/drawable-xhdpi/pick_the_best_photo.png b/res/drawable-xhdpi/pick_the_best_photo.png
deleted file mode 100644
index 629af4a09..000000000
Binary files a/res/drawable-xhdpi/pick_the_best_photo.png and /dev/null differ
diff --git a/res/drawable-xhdpi/pick_the_best_photo_selected.png b/res/drawable-xhdpi/pick_the_best_photo_selected.png
deleted file mode 100644
index 92f11cb17..000000000
Binary files a/res/drawable-xhdpi/pick_the_best_photo_selected.png and /dev/null differ
diff --git a/res/drawable-xhdpi/pick_the_best_photo_unselected.png b/res/drawable-xhdpi/pick_the_best_photo_unselected.png
deleted file mode 100644
index a558c7a1f..000000000
Binary files a/res/drawable-xhdpi/pick_the_best_photo_unselected.png and /dev/null differ
diff --git a/res/drawable-xhdpi/remaining_sheets.png b/res/drawable-xhdpi/remaining_sheets.png
deleted file mode 100644
index fe13a55e0..000000000
Binary files a/res/drawable-xhdpi/remaining_sheets.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_eis_menu.png b/res/drawable-xxhdpi/ic_eis_menu.png
deleted file mode 100644
index 62746e18d..000000000
Binary files a/res/drawable-xxhdpi/ic_eis_menu.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_muted_button.png b/res/drawable-xxhdpi/ic_muted_button.png
deleted file mode 100644
index dfc97b86c..000000000
Binary files a/res/drawable-xxhdpi/ic_muted_button.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_notification.png b/res/drawable-xxhdpi/ic_notification.png
deleted file mode 100644
index 061c9cb0f..000000000
Binary files a/res/drawable-xxhdpi/ic_notification.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_refocus_editor_cancel.png b/res/drawable-xxhdpi/ic_refocus_editor_cancel.png
deleted file mode 100644
index e58839ddd..000000000
Binary files a/res/drawable-xxhdpi/ic_refocus_editor_cancel.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_refocus_editor_confirm.png b/res/drawable-xxhdpi/ic_refocus_editor_confirm.png
deleted file mode 100644
index 9e4dd5e6f..000000000
Binary files a/res/drawable-xxhdpi/ic_refocus_editor_confirm.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_scene_mode_optizoom.png b/res/drawable-xxhdpi/ic_scene_mode_optizoom.png
deleted file mode 100644
index e41b3ac23..000000000
Binary files a/res/drawable-xxhdpi/ic_scene_mode_optizoom.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_scene_mode_refocus.png b/res/drawable-xxhdpi/ic_scene_mode_refocus.png
deleted file mode 100644
index 1bfab604b..000000000
Binary files a/res/drawable-xxhdpi/ic_scene_mode_refocus.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_settings_chromaflash.png b/res/drawable-xxhdpi/ic_settings_chromaflash.png
deleted file mode 100644
index d46fc49c6..000000000
Binary files a/res/drawable-xxhdpi/ic_settings_chromaflash.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_settings_filter_on.png b/res/drawable-xxhdpi/ic_settings_filter_on.png
deleted file mode 100644
index 048c08772..000000000
Binary files a/res/drawable-xxhdpi/ic_settings_filter_on.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_settings_selfiemirror.png b/res/drawable-xxhdpi/ic_settings_selfiemirror.png
deleted file mode 100644
index 988d95866..000000000
Binary files a/res/drawable-xxhdpi/ic_settings_selfiemirror.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_ts_makeup_back.png b/res/drawable-xxhdpi/ic_ts_makeup_back.png
deleted file mode 100644
index 5214f0e1e..000000000
Binary files a/res/drawable-xxhdpi/ic_ts_makeup_back.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_ts_makeup_off.png b/res/drawable-xxhdpi/ic_ts_makeup_off.png
deleted file mode 100644
index 2a707fb34..000000000
Binary files a/res/drawable-xxhdpi/ic_ts_makeup_off.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_ts_makeup_on.png b/res/drawable-xxhdpi/ic_ts_makeup_on.png
deleted file mode 100644
index b1655a2d3..000000000
Binary files a/res/drawable-xxhdpi/ic_ts_makeup_on.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_unmuted_button.png b/res/drawable-xxhdpi/ic_unmuted_button.png
deleted file mode 100644
index fd9ec79f9..000000000
Binary files a/res/drawable-xxhdpi/ic_unmuted_button.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_videocam_white_24dp.png b/res/drawable-xxhdpi/ic_videocam_white_24dp.png
deleted file mode 100644
index 1b2583d34..000000000
Binary files a/res/drawable-xxhdpi/ic_videocam_white_24dp.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/pick_the_best_photo.png b/res/drawable-xxhdpi/pick_the_best_photo.png
deleted file mode 100644
index 2374b1848..000000000
Binary files a/res/drawable-xxhdpi/pick_the_best_photo.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/pick_the_best_photo_selected.png b/res/drawable-xxhdpi/pick_the_best_photo_selected.png
deleted file mode 100644
index 522e9f2ba..000000000
Binary files a/res/drawable-xxhdpi/pick_the_best_photo_selected.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/pick_the_best_photo_unselected.png b/res/drawable-xxhdpi/pick_the_best_photo_unselected.png
deleted file mode 100644
index 98e18b07e..000000000
Binary files a/res/drawable-xxhdpi/pick_the_best_photo_unselected.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/remaining_sheets.png b/res/drawable-xxhdpi/remaining_sheets.png
deleted file mode 100644
index 43932d2d6..000000000
Binary files a/res/drawable-xxhdpi/remaining_sheets.png and /dev/null differ
diff --git a/res/drawable/ic_eis_menu.xml b/res/drawable/ic_eis_menu.xml
new file mode 100644
index 000000000..8f022d687
--- /dev/null
+++ b/res/drawable/ic_eis_menu.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <clip-path
+        android:pathData="M0 0h24v24H0z" />
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M23 5.5V20c0 2.2-1.8 4-4 4h-7.3c-1.08 0-2.1-.43-2.85-1.19L1 14.83s1.26-1.23
+1.3-1.25c.22-.19 .49 -.29 .79 -.29 .22 0 .42 .06 .6 .16 .04 .01 4.31 2.46 4.31
+2.46V4c0-.83 .67 -1.5 1.5-1.5S11 3.17 11 4v7h1V1.5c0-.83 .67 -1.5 1.5-1.5S15 .67
+15 1.5V11h1V2.5c0-.83 .67 -1.5 1.5-1.5s1.5 .67 1.5 1.5V11h1V5.5c0-.83 .67 -1.5
+1.5-1.5s1.5 .67 1.5 1.5z" />
+</vector>
diff --git a/res/drawable/ic_muted_button.xml b/res/drawable/ic_muted_button.xml
new file mode 100644
index 000000000..4c74e210d
--- /dev/null
+++ b/res/drawable/ic_muted_button.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:pathData="M0 0h24v24H0zm0 0h24v24H0z" />
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M19 11h-1.7c0 .74-.16 1.43-.43 2.05l1.23 1.23c.56-.98 .9 -2.09 .9 -3.28zm-4.02
+.17 c0-.06 .02 -.11 .02 -.17V5c0-1.66-1.34-3-3-3S9 3.34 9 5v.18l5.98 5.99zM4.27
+3L3 4.27l6.01 6.01V11c0 1.66 1.33 3 2.99 3 .22 0 .44-.03 .65 -.08l1.66 1.66c-.71
+.33 -1.5 .52 -2.31 .52 -2.76 0-5.3-2.1-5.3-5.1H5c0 3.41 2.72 6.23 6
+6.72V21h2v-3.28c.91-.13 1.77-.45 2.54-.9L19.73 21 21 19.73 4.27 3z" />
+</vector>
diff --git a/res/drawable/ic_notification.xml b/res/drawable/ic_notification.xml
new file mode 100644
index 000000000..68792602f
--- /dev/null
+++ b/res/drawable/ic_notification.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M 12 8.8 C 13.7673111995 8.8 15.2 10.2326888005 15.2 12 C 15.2 13.7673111995 13.7673111995 15.2 12 15.2 C 10.2326888005 15.2 8.8 13.7673111995 8.8 12 C 8.8 10.2326888005 10.2326888005 8.8 12 8.8 Z" />
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M9 2L7.17 4H4c-1.1 0-2 .9-2 2v12c0 1.1 .9 2 2 2h16c1.1 0 2-.9
+2-2V6c0-1.1-.9-2-2-2h-3.17L15 2H9zm3 15c-2.76 0-5-2.24-5-5s2.24-5 5-5 5 2.24 5
+5-2.24 5-5 5z" />
+    <path
+        android:pathData="M0 0h24v24H0z" />
+</vector>
diff --git a/res/drawable/ic_refocus_editor_cancel.xml b/res/drawable/ic_refocus_editor_cancel.xml
new file mode 100644
index 000000000..657fb4429
--- /dev/null
+++ b/res/drawable/ic_refocus_editor_cancel.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59
+19 19 17.59 13.41 12z" />
+    <path
+        android:pathData="M0 0h24v24H0z" />
+</vector>
diff --git a/res/drawable/ic_refocus_editor_confirm.xml b/res/drawable/ic_refocus_editor_confirm.xml
new file mode 100644
index 000000000..088df07c7
--- /dev/null
+++ b/res/drawable/ic_refocus_editor_confirm.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:pathData="M0 0h24v24H0z" />
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M9 16.2L4.8 12l-1.4 1.4L9 19 21 7l-1.4-1.4L9 16.2z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_optizoom.xml b/res/drawable/ic_scene_mode_optizoom.xml
new file mode 100644
index 000000000..eba10e65a
--- /dev/null
+++ b/res/drawable/ic_scene_mode_optizoom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M20 4h-3.17L15 2H9L7.17 4H4c-1.1 0-2 .9-2 2v12c0 1.1 .9 2 2 2h16c1.1 0 2-.9
+2-2V6c0-1.1-.9-2-2-2zm-8 3c1.63 0 3.06 .79 3.98 2H12c-1.66 0-3 1.34-3 3 0 .35
+.07 .69 .18 1H7.1c-.06-.32-.1-.66-.1-1 0-2.76 2.24-5 5-5zm0 10c-1.63
+0-3.06-.79-3.98-2H12c1.66 0 3-1.34 3-3 0-.35-.07-.69-.18-1h2.08c.07 .32 .1 .66
+.1 1 0 2.76-2.24 5-5 5z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_refocus.xml b/res/drawable/ic_scene_mode_refocus.xml
new file mode 100644
index 000000000..e8cbdf2f0
--- /dev/null
+++ b/res/drawable/ic_scene_mode_refocus.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M13 7h-2v4H7v2h4v4h2v-4h4v-2h-4V7zm-1-5C6.49 2 2 6.49 2 12s4.49 10 10 10h8c1.1 0
+2-.9 2-2v-8c0-5.51-4.49-10-10-10zm0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8
+8-3.59 8-8 8z" />
+    <path
+        android:pathData="M0 0h24v24H0z" />
+</vector>
diff --git a/res/drawable/ic_settings_beutification.xml b/res/drawable/ic_settings_beutification.xml
new file mode 100644
index 000000000..e2228fb62
--- /dev/null
+++ b/res/drawable/ic_settings_beutification.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0
+12,2M12,8.39C13.57,9.4 15.42,10 17.42,10C18.2,10 18.95,9.91
+19.67,9.74C19.88,10.45 20,11.21 20,12C20,16.41 16.41,20 12,20C9,20 6.39,18.34
+5,15.89L6.75,14V13A1.25,1.25 0 0,1 8,11.75A1.25,1.25 0 0,1
+9.25,13V14H12M16,11.75A1.25,1.25 0 0,0 14.75,13A1.25,1.25 0 0,0
+16,14.25A1.25,1.25 0 0,0 17.25,13A1.25,1.25 0 0,0 16,11.75Z" />
+</vector>
diff --git a/res/drawable/ic_settings_chromaflash.xml b/res/drawable/ic_settings_chromaflash.xml
new file mode 100644
index 000000000..a2cb90e1c
--- /dev/null
+++ b/res/drawable/ic_settings_chromaflash.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M7,2H17L13.5,9H17L10,22V14H7V2M9,4V12H12V14.66L14,11H10.24L13.76,4H9Z" />
+</vector>
diff --git a/res/drawable/ic_settings_filter_on.xml b/res/drawable/ic_settings_filter_on.xml
new file mode 100644
index 000000000..9f0e4ed77
--- /dev/null
+++ b/res/drawable/ic_settings_filter_on.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M2.53 19.65l1.34 .56 v-9.03l-2.43 5.86c-.41 1.02 .08 2.19 1.09
+2.61zm19.5-3.7L17.07 3.98c-.31-.75-1.04-1.21-1.81-1.23-.26 0-.53 .04 -.79 .15
+L7.1 5.95c-.75 .31 -1.21 1.03-1.23 1.8-.01 .27 .04 .54 .15 .8 l4.96 11.97c.31
+.76 1.05 1.22 1.83 1.23 .26 0 .52-.05 .77 -.15l7.36-3.05c1.02-.42 1.51-1.59
+1.09-2.6zM7.88 8.75c-.55 0-1-.45-1-1s.45-1 1-1 1 .45 1 1-.45 1-1 1zm-2 11c0 1.1
+.9 2 2 2h1.45l-3.45-8.34v6.34z" />
+</vector>
diff --git a/res/drawable/ic_settings_redeye.xml b/res/drawable/ic_settings_redeye.xml
index 5f5914009..0cea289af 100644
--- a/res/drawable/ic_settings_redeye.xml
+++ b/res/drawable/ic_settings_redeye.xml
@@ -7,7 +7,5 @@
 
     <path
         android:fillColor="@color/white"
-        android:pathData="M12 4.5C7 4.5 2.73 7.61 1 12c1.73 4.39 6 7.5 11 7.5s9.27-3.11
-11-7.5c-1.73-4.39-6-7.5-11-7.5zM12 17c-2.76 0-5-2.24-5-5s2.24-5 5-5 5 2.24 5
-5-2.24 5-5 5zm0-8c-1.66 0-3 1.34-3 3s1.34 3 3 3 3-1.34 3-3-1.34-3-3-3z" />
+        android:pathData="M16,5C15.44,5 15,5.44 15,6C15,6.56 15.44,7 16,7C16.56,7 17,6.56 17,6C17,5.44 16.56,5 16,5M16,2C13.27,2 10.94,3.66 10,6C10.94,8.34 13.27,10 16,10C18.73,10 21.06,8.34 22,6C21.06,3.66 18.73,2 16,2M16,3.5A2.5,2.5 0 0,1 18.5,6A2.5,2.5 0 0,1 16,8.5A2.5,2.5 0 0,1 13.5,6A2.5,2.5 0 0,1 16,3.5M3,2V14H6V23L13,11H9L10.12,8.5C9.44,7.76 8.88,6.93 8.5,6C9.19,4.29 10.5,2.88 12.11,2H3Z" />
 </vector>
diff --git a/res/drawable/ic_settings_selfiemirror.xml b/res/drawable/ic_settings_selfiemirror.xml
new file mode 100644
index 000000000..d6ea4cc50
--- /dev/null
+++ b/res/drawable/ic_settings_selfiemirror.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M3 5v14c0 1.1 .89 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2H5c-1.11 0-2 .9-2
+2zm12 4c0 1.66-1.34 3-3 3s-3-1.34-3-3 1.34-3 3-3 3 1.34 3 3zm-9 8c0-2 4-3.1
+6-3.1s6 1.1 6 3.1v1H6v-1z" />
+    <path
+        android:pathData="M0 0h24v24H0z" />
+</vector>
diff --git a/res/drawable/ic_settings_touchafec.xml b/res/drawable/ic_settings_touchafec.xml
new file mode 100644
index 000000000..357ff6759
--- /dev/null
+++ b/res/drawable/ic_settings_touchafec.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <clip-path
+        android:pathData="M0 0h24v24H0V0z" />
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M9 11.24V7.5C9 6.12 10.12 5 11.5 5S14 6.12 14 7.5v3.74c1.21-.81 2-2.18 2-3.74C16
+5.01 13.99 3 11.5 3S7 5.01 7 7.5c0 1.56 .79 2.93 2 3.74zm9.84
+4.63l-4.54-2.26c-.17-.07-.35-.11-.54-.11H13v-6c0-.83-.67-1.5-1.5-1.5S10 6.67 10
+7.5v10.74l-3.43-.72c-.08-.01-.15-.03-.24-.03-.31 0-.59 .13 -.79 .33 l-.79 .8
+4.94 4.94c.27 .27 .65 .44 1.06 .44 h6.79c.75 0 1.33-.55
+1.44-1.28l.75-5.27c.01-.07 .02 -.14 .02 -.2 0-.62-.38-1.16-.91-1.38z" />
+</vector>
diff --git a/res/drawable/ic_ts_makeup_back.xml b/res/drawable/ic_ts_makeup_back.xml
new file mode 100644
index 000000000..7971b4f1c
--- /dev/null
+++ b/res/drawable/ic_ts_makeup_back.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:pathData="M0 0h24v24H0z" />
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M20 11H7.83l5.59-5.59L12 4l-8 8 8 8 1.41-1.41L7.83 13H20v-2z" />
+</vector>
diff --git a/res/drawable/ic_ts_makeup_clean_selector.xml b/res/drawable/ic_ts_makeup_clean_selector.xml
index 791658dd4..e62155b66 100644
--- a/res/drawable/ic_ts_makeup_clean_selector.xml
+++ b/res/drawable/ic_ts_makeup_clean_selector.xml
@@ -1,22 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2014,2015 Thundersoft Corporation
-    All rights Reserved
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_selected="true" android:drawable="@drawable/ic_ts_makeup_clean_selected" />
-    <item android:drawable="@drawable/ic_ts_makeup_clean" />
-</selector>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M7.5,5.6L5,7L6.4,4.5L5,2L7.5,3.4L10,2L8.6,4.5L10,7L7.5,5.6M19.5,15.4L22,14L20.6,16.5L22,19L19.5,17.6L17,19L18.4,16.5L17,14L19.5,15.4M22,2L20.6,4.5L22,7L19.5,5.6L17,7L18.4,4.5L17,2L19.5,3.4L22,2M13.34,12.78L15.78,10.34L13.66,8.22L11.22,10.66L13.34,12.78M14.37,7.29L16.71,9.63C17.1,10 17.1,10.65 16.71,11.04L5.04,22.71C4.65,23.1 4,23.1 3.63,22.71L1.29,20.37C0.9,20 0.9,19.35 1.29,18.96L12.96,7.29C13.35,6.9 14,6.9 14.37,7.29Z" />
+</vector>
diff --git a/res/drawable/ic_ts_makeup_custom_selector.xml b/res/drawable/ic_ts_makeup_custom_selector.xml
index eecc2c7ce..6f9fff2b5 100644
--- a/res/drawable/ic_ts_makeup_custom_selector.xml
+++ b/res/drawable/ic_ts_makeup_custom_selector.xml
@@ -1,22 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2014,2015 Thundersoft Corporation
-    All rights Reserved
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_selected="true" android:drawable="@drawable/ic_ts_makeup_custom_selected" />
-    <item android:drawable="@drawable/ic_ts_makeup_custom" />
-</selector>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:pathData="M0 0h24v24H0z" />
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M3 17v2h6v-2H3zM3 5v2h10V5H3zm10 16v-2h8v-2h-8v-2h-2v6h2zM7
+9v2H3v2h4v2h2V9H7zm14 4v-2H11v2h10zm-6-4h2V7h4V5h-4V3h-2v6z" />
+</vector>
diff --git a/res/drawable/ic_ts_makeup_level_1_selector.xml b/res/drawable/ic_ts_makeup_level_1_selector.xml
index 38e9193ab..2cd12afce 100644
--- a/res/drawable/ic_ts_makeup_level_1_selector.xml
+++ b/res/drawable/ic_ts_makeup_level_1_selector.xml
@@ -1,22 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2014,2015 Thundersoft Corporation
-    All rights Reserved
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_selected="true" android:drawable="@drawable/ic_ts_makeup_level_1_selected" />
-    <item android:drawable="@drawable/ic_ts_makeup_level_1" />
-</selector>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:pathData="M0 0h24v24H0z" />
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M3 5H1v16c0 1.1 .9 2 2 2h16v-2H3V5zm11 10h2V5h-4v2h2v8zm7-14H7c-1.1 0-2 .9-2
+2v14c0 1.1 .9 2 2 2h14c1.1 0 2-.9 2-2V3c0-1.1-.9-2-2-2zm0 16H7V3h14v14z" />
+</vector>
diff --git a/res/drawable/ic_ts_makeup_level_2_selector.xml b/res/drawable/ic_ts_makeup_level_2_selector.xml
index 76d40bd88..4f8d2611b 100644
--- a/res/drawable/ic_ts_makeup_level_2_selector.xml
+++ b/res/drawable/ic_ts_makeup_level_2_selector.xml
@@ -1,22 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2014,2015 Thundersoft Corporation
-    All rights Reserved
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_selected="true" android:drawable="@drawable/ic_ts_makeup_level_2_selected" />
-    <item android:drawable="@drawable/ic_ts_makeup_level_2" />
-</selector>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:pathData="M0 0h24v24H0z" />
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M3 5H1v16c0 1.1 .9 2 2 2h16v-2H3V5zm18-4H7c-1.1 0-2 .9-2 2v14c0 1.1 .9 2 2
+2h14c1.1 0 2-.9 2-2V3c0-1.1-.9-2-2-2zm0 16H7V3h14v14zm-4-4h-4v-2h2c1.1 0 2-.89
+2-2V7c0-1.11-.9-2-2-2h-4v2h4v2h-2c-1.1 0-2 .89-2 2v4h6v-2z" />
+</vector>
diff --git a/res/drawable/ic_ts_makeup_level_3_selector.xml b/res/drawable/ic_ts_makeup_level_3_selector.xml
index e26ecdfa5..6a2c0d34e 100644
--- a/res/drawable/ic_ts_makeup_level_3_selector.xml
+++ b/res/drawable/ic_ts_makeup_level_3_selector.xml
@@ -1,22 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2014,2015 Thundersoft Corporation
-    All rights Reserved
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
 
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_selected="true" android:drawable="@drawable/ic_ts_makeup_level_3_selected" />
-    <item android:drawable="@drawable/ic_ts_makeup_level_3" />
-</selector>
+    <path
+        android:pathData="M0 0h24v24H0z" />
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M21 1H7c-1.1 0-2 .9-2 2v14c0 1.1 .9 2 2 2h14c1.1 0 2-.9 2-2V3c0-1.1-.9-2-2-2zm0
+16H7V3h14v14zM3 5H1v16c0 1.1 .9 2 2 2h16v-2H3V5zm14 8v-1.5c0-.83-.67-1.5-1.5-1.5
+.83 0 1.5-.67 1.5-1.5V7c0-1.11-.9-2-2-2h-4v2h4v2h-2v2h2v2h-4v2h4c1.1 0 2-.89
+2-2z" />
+</vector>
diff --git a/res/drawable/ic_ts_makeup_level_off_selector.xml b/res/drawable/ic_ts_makeup_level_off_selector.xml
index e1939673a..76c9d411a 100644
--- a/res/drawable/ic_ts_makeup_level_off_selector.xml
+++ b/res/drawable/ic_ts_makeup_level_off_selector.xml
@@ -1,22 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2014,2015 Thundersoft Corporation
-    All rights Reserved
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_selected="true" android:drawable="@drawable/ic_ts_makeup_level_off_selected" />
-    <item android:drawable="@drawable/ic_ts_makeup_level_off" />
-</selector>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:pathData="M0 0h24v24H0z" />
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M3 5H1v16c0 1.1 .9 2 2 2h16v-2H3V5zm18-4H7c-1.1 0-2 .9-2 2v14c0 1.1 .9 2 2
+2h14c1.1 0 2-.9 2-2V3c0-1.1-.9-2-2-2zm0 16H7V3h14v14z" />
+</vector>
diff --git a/res/drawable/ic_ts_makeup_off.xml b/res/drawable/ic_ts_makeup_off.xml
new file mode 100644
index 000000000..e2228fb62
--- /dev/null
+++ b/res/drawable/ic_ts_makeup_off.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0
+12,2M12,8.39C13.57,9.4 15.42,10 17.42,10C18.2,10 18.95,9.91
+19.67,9.74C19.88,10.45 20,11.21 20,12C20,16.41 16.41,20 12,20C9,20 6.39,18.34
+5,15.89L6.75,14V13A1.25,1.25 0 0,1 8,11.75A1.25,1.25 0 0,1
+9.25,13V14H12M16,11.75A1.25,1.25 0 0,0 14.75,13A1.25,1.25 0 0,0
+16,14.25A1.25,1.25 0 0,0 17.25,13A1.25,1.25 0 0,0 16,11.75Z" />
+</vector>
diff --git a/res/drawable/ic_ts_makeup_on.xml b/res/drawable/ic_ts_makeup_on.xml
new file mode 100644
index 000000000..e2228fb62
--- /dev/null
+++ b/res/drawable/ic_ts_makeup_on.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0
+12,2M12,8.39C13.57,9.4 15.42,10 17.42,10C18.2,10 18.95,9.91
+19.67,9.74C19.88,10.45 20,11.21 20,12C20,16.41 16.41,20 12,20C9,20 6.39,18.34
+5,15.89L6.75,14V13A1.25,1.25 0 0,1 8,11.75A1.25,1.25 0 0,1
+9.25,13V14H12M16,11.75A1.25,1.25 0 0,0 14.75,13A1.25,1.25 0 0,0
+16,14.25A1.25,1.25 0 0,0 17.25,13A1.25,1.25 0 0,0 16,11.75Z" />
+</vector>
diff --git a/res/drawable/ic_ts_makeup_whiten_selector.xml b/res/drawable/ic_ts_makeup_whiten_selector.xml
index f1284b604..e2228fb62 100644
--- a/res/drawable/ic_ts_makeup_whiten_selector.xml
+++ b/res/drawable/ic_ts_makeup_whiten_selector.xml
@@ -1,22 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2014,2015 Thundersoft Corporation
-    All rights Reserved
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
 
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_selected="true" android:drawable="@drawable/ic_ts_makeup_whiten_selected" />
-    <item android:drawable="@drawable/ic_ts_makeup_whiten" />
-</selector>
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0
+12,2M12,8.39C13.57,9.4 15.42,10 17.42,10C18.2,10 18.95,9.91
+19.67,9.74C19.88,10.45 20,11.21 20,12C20,16.41 16.41,20 12,20C9,20 6.39,18.34
+5,15.89L6.75,14V13A1.25,1.25 0 0,1 8,11.75A1.25,1.25 0 0,1
+9.25,13V14H12M16,11.75A1.25,1.25 0 0,0 14.75,13A1.25,1.25 0 0,0
+16,14.25A1.25,1.25 0 0,0 17.25,13A1.25,1.25 0 0,0 16,11.75Z" />
+</vector>
diff --git a/res/drawable/ic_unmuted_button.xml b/res/drawable/ic_unmuted_button.xml
new file mode 100644
index 000000000..cb64ba3af
--- /dev/null
+++ b/res/drawable/ic_unmuted_button.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M12 14c1.66 0 2.99-1.34 2.99-3L15 5c0-1.66-1.34-3-3-3S9 3.34 9 5v6c0 1.66 1.34 3
+3 3zm5.3-3c0 3-2.54 5.1-5.3 5.1S6.7 14 6.7 11H5c0 3.41 2.72 6.23 6
+6.72V21h2v-3.28c3.28-.48 6-3.3 6-6.72h-1.7z" />
+    <path
+        android:pathData="M0 0h24v24H0z" />
+</vector>
diff --git a/res/drawable/ic_videocam_white_24dp.xml b/res/drawable/ic_videocam_white_24dp.xml
new file mode 100644
index 000000000..1f48b9b5c
--- /dev/null
+++ b/res/drawable/ic_videocam_white_24dp.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:pathData="M0 0h24v24H0z" />
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M17 10.5V7c0-.55-.45-1-1-1H4c-.55 0-1 .45-1 1v10c0 .55 .45 1 1 1h12c.55 0 1-.45
+1-1v-3.5l4 4v-11l-4 4z" />
+</vector>
diff --git a/res/drawable/pick_the_best_photo.xml b/res/drawable/pick_the_best_photo.xml
new file mode 100644
index 000000000..b5b949fa3
--- /dev/null
+++ b/res/drawable/pick_the_best_photo.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M22 16V4c0-1.1-.9-2-2-2H8c-1.1 0-2 .9-2 2v12c0 1.1 .9 2 2 2h12c1.1 0 2-.9
+2-2zm-11-4l2.03 2.71L16 11l4 5H8l3-4zM2 6v14c0 1.1 .9 2 2 2h14v-2H4V6H2z" />
+</vector>
diff --git a/res/drawable/pick_the_best_photo_selected.xml b/res/drawable/pick_the_best_photo_selected.xml
new file mode 100644
index 000000000..150583269
--- /dev/null
+++ b/res/drawable/pick_the_best_photo_selected.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:pathData="M0 0h24v24H0z" />
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M12 17.27L18.18 21l-1.64-7.03L22 9.24l-7.19-.61L12 2 9.19 8.63 2 9.24l5.46
+4.73L5.82 21z" />
+    <path
+        android:pathData="M0 0h24v24H0z" />
+</vector>
diff --git a/res/drawable/pick_the_best_photo_unselected.xml b/res/drawable/pick_the_best_photo_unselected.xml
new file mode 100644
index 000000000..308de1df3
--- /dev/null
+++ b/res/drawable/pick_the_best_photo_unselected.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M22 9.24l-7.19-.62L12 2 9.19 8.63 2 9.24l5.46 4.73L5.82 21 12 17.27 18.18
+21l-1.63-7.03L22 9.24zM12 15.4l-3.76 2.27 1-4.28-3.32-2.88 4.38-.38L12 6.1l1.71
+4.04 4.38 .38 -3.32 2.88 1 4.28L12 15.4z" />
+    <path
+        android:pathData="M0 0h24v24H0z" />
+</vector>
diff --git a/res/drawable/remaining_sheets.xml b/res/drawable/remaining_sheets.xml
new file mode 100644
index 000000000..beaeb8d33
--- /dev/null
+++ b/res/drawable/remaining_sheets.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M14.4 6L14 4H5v17h2v-7h5.6l.4 2h7V6z" />
+</vector>
diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml
index a91dc0bd9..261bd8f15 100644
--- a/res/xml/camera_preferences.xml
+++ b/res/xml/camera_preferences.xml
@@ -183,11 +183,12 @@
             camera:singleIcon="@drawable/ic_settings_quality"
             camera:entries="@array/pref_camera_jpegquality_entries"
             camera:entryValues="@array/pref_camera_jpegquality_entryvalues" />
-    <ListPreference
+    <IconListPreference
             camera:key="pref_camera_touchafaec_key"
             camera:defaultValue="@string/pref_camera_touchafaec_default"
             camera:title="@string/pref_camera_touchafaec_title"
             camera:entries="@array/pref_camera_touchafaec_entries"
+            camera:singleIcon="@drawable/ic_settings_touchafec"
             camera:entryValues="@array/pref_camera_touchafaec_entryvalues" />
     <IconListPreference
             camera:key="pref_camera_iso_key"
@@ -278,7 +279,7 @@
             camera:defaultValue="@string/pref_camera_tsmakeup_default"
             camera:title="@string/pref_camera_tsmakeup_title"
             camera:entries="@array/pref_camera_tsmakeup_entries"
-            camera:singleIcon="@drawable/ic_ts_makeup_off"
+            camera:singleIcon="@drawable/ic_settings_beutification"
             camera:icons="@array/pref_ts_makeup_icons"
             camera:largeIcons="@array/pref_ts_makeup_icons"
             camera:entryValues="@array/pref_camera_tsmakeup_entryvalues" />
@@ -288,15 +289,17 @@
             camera:title="@string/pref_camera_tsmakeup_title"
             camera:entries="@array/pref_camera_tsmakeup_level_entries"
             camera:thumbnails="@array/tsmakeup_level_thumbnails"
-            camera:singleIcon="@drawable/ic_ts_makeup_off"
+            camera:singleIcon="@drawable/ic_settings_beutification"
             camera:entryValues="@array/pref_camera_tsmakeup_level_entryvalues" />
-    <ListPreference
+    <IconListPreference
             camera:key="pref_camera_tsmakeup_whiten"
             camera:defaultValue="@string/pref_camera_tsmakeup_level_default"
+            camera:singleIcon="@drawable/ic_settings_beutification"
             camera:title="@string/pref_camera_tsmakeup_title" />
-    <ListPreference
+    <IconListPreference
             camera:key="pref_camera_tsmakeup_clean"
             camera:defaultValue="@string/pref_camera_tsmakeup_level_default"
+            camera:singleIcon="@drawable/ic_settings_beutification"
             camera:title="@string/pref_camera_tsmakeup_title" />
     <IconListPreference
             camera:key="pref_camera_redeyereduction_key"
@@ -319,7 +322,7 @@
             camera:entries="@array/pref_camera_shuttersound_entries"
             camera:singleIcon="@drawable/ic_settings_shuttersound"
             camera:entryValues="@array/pref_camera_shuttersound_entryvalues" />
-    <ListPreference
+    <IconListPreference
             camera:key="pref_camera_selectablezoneaf_key"
             camera:defaultValue="@string/pref_camera_selectablezoneaf_default"
             camera:title="@string/pref_camera_selectablezoneaf_title"
@@ -397,14 +400,14 @@
             camera:entries="@array/pref_camera_manual_focus_entries"
             camera:entryValues="@array/pref_camera_manual_focus_entry_values" />
 
-    <ListPreference
+    <IconListPreference
             camera:key="pref_camera_instant_capture_key"
             camera:defaultValue="@string/pref_camera_instant_capture_default"
             camera:title="@string/pref_camera_instant_capture_title"
             camera:entries="@array/pref_camera_instant_capture_entries"
             camera:entryValues="@array/pref_camera_instant_capture_entry_values" />
 
-    <ListPreference
+    <IconListPreference
             camera:key="pref_camera2_camera2_key"
             camera:defaultValue="@string/pref_camera2_camera2_default"
             camera:title="@string/pref_camera2_camera2_title"
-- 
cgit v1.2.3