summaryrefslogtreecommitdiffstats
path: root/res/drawable
diff options
context:
space:
mode:
Diffstat (limited to 'res/drawable')
-rw-r--r--res/drawable/btn_new_shutter.xml6
-rw-r--r--res/drawable/btn_shutter_disabled.xml21
-rw-r--r--res/drawable/ic_eis_menu.xml17
-rw-r--r--res/drawable/ic_flash_auto.xml12
-rw-r--r--res/drawable/ic_flash_off.xml14
-rw-r--r--res/drawable/ic_flash_on.xml13
-rw-r--r--res/drawable/ic_hdr.xml18
-rw-r--r--res/drawable/ic_hdr_off.xml17
-rw-r--r--res/drawable/ic_location.xml14
-rw-r--r--res/drawable/ic_location_off.xml16
-rw-r--r--res/drawable/ic_menu_delete.xml9
-rw-r--r--res/drawable/ic_menu_edit.xml9
-rw-r--r--res/drawable/ic_menu_share.xml9
-rw-r--r--res/drawable/ic_muted_button.xml17
-rw-r--r--res/drawable/ic_notification.xml18
-rw-r--r--res/drawable/ic_pan_border_fast.xml12
-rw-r--r--res/drawable/ic_refocus_editor_cancel.xml14
-rw-r--r--res/drawable/ic_refocus_editor_confirm.xml13
-rw-r--r--res/drawable/ic_sce.xml14
-rw-r--r--res/drawable/ic_sce_action.xml16
-rw-r--r--res/drawable/ic_sce_night.xml15
-rw-r--r--res/drawable/ic_sce_off.xml14
-rw-r--r--res/drawable/ic_sce_party.xml20
-rw-r--r--res/drawable/ic_sce_sunset.xml15
-rw-r--r--res/drawable/ic_scene_mode_action.xml19
-rw-r--r--res/drawable/ic_scene_mode_antishake.xml15
-rw-r--r--res/drawable/ic_scene_mode_auto.xml14
-rw-r--r--res/drawable/ic_scene_mode_backlight.xml16
-rw-r--r--res/drawable/ic_scene_mode_beach.xml15
-rw-r--r--res/drawable/ic_scene_mode_candlelight.xml17
-rw-r--r--res/drawable/ic_scene_mode_entry_antimotionblur.xml27
-rw-r--r--res/drawable/ic_scene_mode_entry_aqua.xml17
-rw-r--r--res/drawable/ic_scene_mode_entry_ar.xml25
-rw-r--r--res/drawable/ic_scene_mode_entry_baby.xml36
-rw-r--r--res/drawable/ic_scene_mode_entry_backgroundblur.xml40
-rw-r--r--res/drawable/ic_scene_mode_entry_backlightportrait.xml17
-rw-r--r--res/drawable/ic_scene_mode_entry_barcode.xml14
-rw-r--r--res/drawable/ic_scene_mode_entry_beauty.xml18
-rw-r--r--res/drawable/ic_scene_mode_entry_cine.xml17
-rw-r--r--res/drawable/ic_scene_mode_entry_closeup.xml20
-rw-r--r--res/drawable/ic_scene_mode_entry_dark.xml14
-rw-r--r--res/drawable/ic_scene_mode_entry_dish.xml16
-rw-r--r--res/drawable/ic_scene_mode_entry_document.xml14
-rw-r--r--res/drawable/ic_scene_mode_entry_duskdawn.xml15
-rw-r--r--res/drawable/ic_scene_mode_entry_fallcolor.xml13
-rw-r--r--res/drawable/ic_scene_mode_entry_fireworks.xml19
-rw-r--r--res/drawable/ic_scene_mode_entry_handheldtwilight.xml15
-rw-r--r--res/drawable/ic_scene_mode_entry_highsensitivity.xml20
-rw-r--r--res/drawable/ic_scene_mode_entry_indoor.xml15
-rw-r--r--res/drawable/ic_scene_mode_entry_macro.xml25
-rw-r--r--res/drawable/ic_scene_mode_entry_mix_illuminant.xml18
-rw-r--r--res/drawable/ic_scene_mode_entry_mood.xml18
-rw-r--r--res/drawable/ic_scene_mode_entry_night.xml14
-rw-r--r--res/drawable/ic_scene_mode_entry_nightindoor.xml15
-rw-r--r--res/drawable/ic_scene_mode_entry_nightportrait.xml16
-rw-r--r--res/drawable/ic_scene_mode_entry_oldfilm.xml17
-rw-r--r--res/drawable/ic_scene_mode_entry_spotlight.xml13
-rw-r--r--res/drawable/ic_scene_mode_entry_steadyphoto.xml15
-rw-r--r--res/drawable/ic_scene_mode_entry_supernight.xml15
-rw-r--r--res/drawable/ic_scene_mode_entry_sweepstitch.xml25
-rw-r--r--res/drawable/ic_scene_mode_entry_text.xml14
-rw-r--r--res/drawable/ic_scene_mode_entry_theatre.xml13
-rw-r--r--res/drawable/ic_scene_mode_entry_whiteboard.xml15
-rw-r--r--res/drawable/ic_scene_mode_flower.xml18
-rw-r--r--res/drawable/ic_scene_mode_hdr.xml18
-rw-r--r--res/drawable/ic_scene_mode_landscape.xml11
-rw-r--r--res/drawable/ic_scene_mode_night.xml15
-rw-r--r--res/drawable/ic_scene_mode_optizoom.xml15
-rw-r--r--res/drawable/ic_scene_mode_party.xml23
-rw-r--r--res/drawable/ic_scene_mode_pet.xml36
-rw-r--r--res/drawable/ic_scene_mode_portrait.xml12
-rw-r--r--res/drawable/ic_scene_mode_refocus.xml15
-rw-r--r--res/drawable/ic_scene_mode_smartauto.xml16
-rw-r--r--res/drawable/ic_scene_mode_snow.xml16
-rw-r--r--res/drawable/ic_scene_mode_softskin.xml20
-rw-r--r--res/drawable/ic_scene_mode_sports.xml15
-rw-r--r--res/drawable/ic_scene_mode_sunset.xml15
-rw-r--r--res/drawable/ic_scene_mode_text.xml13
-rw-r--r--res/drawable/ic_settings.xml11
-rw-r--r--res/drawable/ic_settings_advanced.xml15
-rw-r--r--res/drawable/ic_settings_ae.xml23
-rw-r--r--res/drawable/ic_settings_antibanding.xml16
-rw-r--r--res/drawable/ic_settings_auto_exposure.xml14
-rw-r--r--res/drawable/ic_settings_beutification.xml16
-rw-r--r--res/drawable/ic_settings_bright_screen.xml16
-rw-r--r--res/drawable/ic_settings_camera.xml10
-rw-r--r--res/drawable/ic_settings_cds.xml15
-rw-r--r--res/drawable/ic_settings_chromaflash.xml11
-rw-r--r--res/drawable/ic_settings_continuous.xml13
-rw-r--r--res/drawable/ic_settings_contrast.xml14
-rw-r--r--res/drawable/ic_settings_countdowntimer.xml17
-rw-r--r--res/drawable/ic_settings_denoise.xml16
-rw-r--r--res/drawable/ic_settings_duration.xml16
-rw-r--r--res/drawable/ic_settings_encoder_audio.xml16
-rw-r--r--res/drawable/ic_settings_encoder_video.xml14
-rw-r--r--res/drawable/ic_settings_exposure.xml13
-rw-r--r--res/drawable/ic_settings_facerec.xml18
-rw-r--r--res/drawable/ic_settings_filter.xml16
-rw-r--r--res/drawable/ic_settings_filter_on.xml16
-rw-r--r--res/drawable/ic_settings_flash.xml13
-rw-r--r--res/drawable/ic_settings_focus.xml20
-rw-r--r--res/drawable/ic_settings_focus_time.xml17
-rw-r--r--res/drawable/ic_settings_focus_zone.xml16
-rw-r--r--res/drawable/ic_settings_format.xml14
-rw-r--r--res/drawable/ic_settings_fps.xml20
-rw-r--r--res/drawable/ic_settings_hdr_auto.xml24
-rw-r--r--res/drawable/ic_settings_histogram.xml16
-rw-r--r--res/drawable/ic_settings_iso.xml13
-rw-r--r--res/drawable/ic_settings_lightsource.xml16
-rw-r--r--res/drawable/ic_settings_location.xml14
-rw-r--r--res/drawable/ic_settings_manualexp.xml15
-rw-r--r--res/drawable/ic_settings_manualfocus.xml15
-rw-r--r--res/drawable/ic_settings_picturesize.xml14
-rw-r--r--res/drawable/ic_settings_powermode.xml10
-rw-r--r--res/drawable/ic_settings_powershutter.xml15
-rw-r--r--res/drawable/ic_settings_quality.xml16
-rw-r--r--res/drawable/ic_settings_redeye.xml11
-rw-r--r--res/drawable/ic_settings_redeye_preference.xml11
-rw-r--r--res/drawable/ic_settings_rotation.xml18
-rw-r--r--res/drawable/ic_settings_saturation.xml15
-rw-r--r--res/drawable/ic_settings_scenemode.xml14
-rw-r--r--res/drawable/ic_settings_selfiemirror.pngbin2153 -> 0 bytes
-rw-r--r--res/drawable/ic_settings_selfiemirror.xml15
-rw-r--r--res/drawable/ic_settings_sharpness.xml14
-rw-r--r--res/drawable/ic_settings_size.xml16
-rw-r--r--res/drawable/ic_settings_skin.xml17
-rw-r--r--res/drawable/ic_settings_sound.xml15
-rw-r--r--res/drawable/ic_settings_stabilization.xml17
-rw-r--r--res/drawable/ic_settings_storage.xml12
-rw-r--r--res/drawable/ic_settings_timelapse.xml16
-rw-r--r--res/drawable/ic_settings_tnr.xml32
-rw-r--r--res/drawable/ic_settings_touchafec.xml18
-rw-r--r--res/drawable/ic_settings_wb.xml16
-rw-r--r--res/drawable/ic_settings_zoom.xml10
-rw-r--r--res/drawable/ic_settings_zsl.xml71
-rw-r--r--res/drawable/ic_switch_back.xml13
-rw-r--r--res/drawable/ic_switch_camera.xml16
-rw-r--r--res/drawable/ic_switch_front.xml13
-rw-r--r--res/drawable/ic_switch_pan.xml12
-rw-r--r--res/drawable/ic_switch_video.xml12
-rw-r--r--res/drawable/ic_timer.xml17
-rw-r--r--res/drawable/ic_ts_makeup_back.xml13
-rw-r--r--res/drawable/ic_ts_makeup_clean_selector.xml31
-rw-r--r--res/drawable/ic_ts_makeup_custom_selector.xml34
-rw-r--r--res/drawable/ic_ts_makeup_level_1_selector.xml34
-rw-r--r--res/drawable/ic_ts_makeup_level_2_selector.xml35
-rw-r--r--res/drawable/ic_ts_makeup_level_3_selector.xml34
-rw-r--r--res/drawable/ic_ts_makeup_level_off_selector.xml34
-rw-r--r--res/drawable/ic_ts_makeup_off.xml16
-rw-r--r--res/drawable/ic_ts_makeup_on.xml16
-rw-r--r--res/drawable/ic_ts_makeup_whiten_selector.xml34
-rw-r--r--res/drawable/ic_unmuted_button.xml15
-rw-r--r--res/drawable/ic_videocam_white_24dp.xml14
-rw-r--r--res/drawable/list_border.xml2
-rw-r--r--res/drawable/one_ui_shutter_1.pngbin2957 -> 0 bytes
-rw-r--r--res/drawable/one_ui_shutter_2.pngbin3062 -> 0 bytes
-rw-r--r--res/drawable/one_ui_shutter_3.pngbin3184 -> 0 bytes
-rw-r--r--res/drawable/one_ui_shutter_4.pngbin3131 -> 0 bytes
-rw-r--r--res/drawable/one_ui_shutter_5.pngbin2947 -> 0 bytes
-rw-r--r--res/drawable/one_ui_shutter_6.pngbin2699 -> 0 bytes
-rw-r--r--res/drawable/one_ui_shutter_anim.xml72
-rw-r--r--res/drawable/photo_capture.pngbin3153 -> 0 bytes
-rw-r--r--res/drawable/photopage_bottom_button_background.xml5
-rw-r--r--res/drawable/pick_the_best_photo.xml12
-rw-r--r--res/drawable/pick_the_best_photo_selected.xml16
-rw-r--r--res/drawable/pick_the_best_photo_unselected.xml15
-rw-r--r--res/drawable/remaining_sheets.xml11
-rw-r--r--res/drawable/scene_filter_item_bg.xml (renamed from res/drawable/list_selector.xml)2
-rw-r--r--res/drawable/scene_mode_view_border_selected.xml36
-rw-r--r--res/drawable/setting_list_item_bg.xml (renamed from res/drawable/scene_mode_view_border.xml)12
-rw-r--r--res/drawable/setting_picker.xml21
-rw-r--r--res/drawable/shutter_button_anim.xml73
-rw-r--r--res/drawable/shutter_button_normal.xml17
-rw-r--r--res/drawable/shutter_button_pressed.xml17
-rw-r--r--res/drawable/shutter_button_stop.xml17
-rw-r--r--res/drawable/shutter_button_video.xml17
-rw-r--r--res/drawable/shutter_button_video_dim.xml17
-rw-r--r--res/drawable/shutter_button_video_stop.xml17
-rw-r--r--res/drawable/shutter_panorama.xml17
-rw-r--r--res/drawable/shutter_panorama_dim.xml17
-rwxr-xr-xres/drawable/thumb_filter_point_blue.pngbin0 -> 28391 bytes
-rwxr-xr-xres/drawable/thumb_filter_point_green.pngbin0 -> 21762 bytes
-rwxr-xr-xres/drawable/thumb_filter_point_red_yellow.pngbin0 -> 27694 bytes
-rwxr-xr-xres/drawable/thumb_filter_vintage_cold.pngbin0 -> 33844 bytes
-rwxr-xr-xres/drawable/thumb_filter_vintage_warm.pngbin0 -> 34058 bytes
-rwxr-xr-xres/drawable/thumb_filter_washed.pngbin0 -> 34700 bytes
-rw-r--r--res/drawable/video_capture.pngbin2529 -> 0 bytes
187 files changed, 2646 insertions, 384 deletions
diff --git a/res/drawable/btn_new_shutter.xml b/res/drawable/btn_new_shutter.xml
index 5b9d6f724..a41581238 100644
--- a/res/drawable/btn_new_shutter.xml
+++ b/res/drawable/btn_new_shutter.xml
@@ -15,7 +15,7 @@
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:state_pressed="true" android:drawable="@drawable/shutter_button_dim" />
- <item android:drawable="@drawable/shutter_button_0" />
+ <item android:state_pressed="true"
+ android:drawable="@drawable/shutter_button_pressed" />
+ <item android:drawable="@drawable/shutter_button_normal" />
</selector>
-
diff --git a/res/drawable/btn_shutter_disabled.xml b/res/drawable/btn_shutter_disabled.xml
deleted file mode 100644
index 865d83c38..000000000
--- a/res/drawable/btn_shutter_disabled.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- 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_pressed="true" android:drawable="@drawable/btn_shutter_pressed_disabled" />
- <item android:drawable="@drawable/btn_shutter_default_disabled" />
-</selector>
-
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_flash_auto.xml b/res/drawable/ic_flash_auto.xml
new file mode 100644
index 000000000..94d2d9cd6
--- /dev/null
+++ b/res/drawable/ic_flash_auto.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="M3 2v12h3v9l7-12H9l4-9H3zm16 0h-2l-3.2 9h1.9l.7-2h3.2l.7 2h1.9L19 2zm-2.15
+5.65L18 4l1.15 3.65h-2.3z" />
+</vector>
diff --git a/res/drawable/ic_flash_off.xml b/res/drawable/ic_flash_off.xml
new file mode 100644
index 000000000..c3b61d333
--- /dev/null
+++ b/res/drawable/ic_flash_off.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="M3.27 3L2 4.27l5 5V13h3v9l3.58-6.14L17.73 20 19 18.73 3.27 3zM17
+10h-4l4-8H7v2.18l8.46 8.46L17 10z" />
+</vector>
diff --git a/res/drawable/ic_flash_on.xml b/res/drawable/ic_flash_on.xml
new file mode 100644
index 000000000..e0ed36f3e
--- /dev/null
+++ b/res/drawable/ic_flash_on.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="M7 2v11h3v9l7-12h-4l4-8z" />
+</vector>
diff --git a/res/drawable/ic_hdr.xml b/res/drawable/ic_hdr.xml
new file mode 100644
index 000000000..63e9e3438
--- /dev/null
+++ b/res/drawable/ic_hdr.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="48"
+ android:viewportHeight="48">
+
+ <path
+ android:pathData="M0 0h48v48h-48z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M12 22h-4v-8h-4v20h4v-8h4v8h4v-20h-4v8zm14-8h-8v20h8c2.21 0 4-1.79
+4-4v-12c0-2.21-1.79-4-4-4zm0
+16h-4v-12h4v12zm18-8v-4c0-2.21-1.79-4-4-4h-8v20h4v-8h2l2 8h4l-2.38-8.35c1.4-.62
+2.38-2.02 2.38-3.65zm-4 0h-4v-4h4v4z" />
+ <path
+ android:pathData="M0 0h48v48h-48z" />
+</vector>
diff --git a/res/drawable/ic_hdr_off.xml b/res/drawable/ic_hdr_off.xml
new file mode 100644
index 000000000..7e1d8be23
--- /dev/null
+++ b/res/drawable/ic_hdr_off.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="48"
+ android:viewportHeight="48">
+
+ <path
+ android:pathData="M0 0h48v48h-48zm0 0h48v48h-48z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M36 34l-29.46-29.45-2.54 2.54 8 8v6.91h-4v-8h-4v20h4v-8h4v8h4v-14.91l2
+2v12.91h8c1.34 0 2.51-.66 3.24-1.67l12.67 12.67
+2.54-2.55-8.45-8.45zm-10-4h-4v-4.91l4 4v.91zm10-4h2l1.64 6.54 1.45
+1.46h2.91l-2.38-8.35c1.4-.62 2.38-2.02 2.38-3.65v-4c0-2.21-1.79-4-4-4h-8v10.91l4
+4v-2.91zm0-8h4v4h-4v-4zm-6 4.91v-4.91c0-2.21-1.79-4-4-4h-4.91l8.91 8.91z" />
+</vector>
diff --git a/res/drawable/ic_location.xml b/res/drawable/ic_location.xml
new file mode 100644
index 000000000..9151b8a38
--- /dev/null
+++ b/res/drawable/ic_location.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="M12 2C8.13 2 5 5.13 5 9c0 5.25 7 13 7 13s7-7.75 7-13c0-3.87-3.13-7-7-7zm0
+9.5c-1.38 0-2.5-1.12-2.5-2.5s1.12-2.5 2.5-2.5 2.5 1.12 2.5 2.5-1.12 2.5-2.5 2.5z" />
+ <path
+ android:pathData="M0 0h24v24H0z" />
+</vector>
diff --git a/res/drawable/ic_location_off.xml b/res/drawable/ic_location_off.xml
new file mode 100644
index 000000000..416c62707
--- /dev/null
+++ b/res/drawable/ic_location_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:pathData="M0 0h24v24H0zm11.75 11.47l-.11-.11z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M12 6.5c1.38 0 2.5 1.12 2.5 2.5 0 .74-.33 1.39-.83 1.85l3.63 3.63c.98-1.86
+1.7-3.8 1.7-5.48 0-3.87-3.13-7-7-7-1.98 0-3.76 .83 -5.04 2.15l3.19 3.19c.46-.52
+1.11-.84 1.85-.84zm4.37 9.6l-4.63-4.63-.11-.11L3.27 3 2 4.27l3.18 3.18C5.07 7.95
+5 8.47 5 9c0 5.25 7 13 7 13s1.67-1.85 3.38-4.35L18.73 21 20 19.73l-3.63-3.63z" />
+</vector>
diff --git a/res/drawable/ic_menu_delete.xml b/res/drawable/ic_menu_delete.xml
new file mode 100644
index 000000000..8732b858f
--- /dev/null
+++ b/res/drawable/ic_menu_delete.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
+ <path
+ android:fillColor="@android:color/white"
+ android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z"/>
+</vector>
diff --git a/res/drawable/ic_menu_edit.xml b/res/drawable/ic_menu_edit.xml
new file mode 100644
index 000000000..18c9c2c30
--- /dev/null
+++ b/res/drawable/ic_menu_edit.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
+ <path
+ android:fillColor="@android:color/white"
+ android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/>
+</vector>
diff --git a/res/drawable/ic_menu_share.xml b/res/drawable/ic_menu_share.xml
new file mode 100644
index 000000000..9c04fa74e
--- /dev/null
+++ b/res/drawable/ic_menu_share.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
+ <path
+ android:fillColor="@android:color/white"
+ android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z"/>
+</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_pan_border_fast.xml b/res/drawable/ic_pan_border_fast.xml
new file mode 100644
index 000000000..c5da6c8d5
--- /dev/null
+++ b/res/drawable/ic_pan_border_fast.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:strokeWidth="0.1"
+ android:fillColor="@color/red"
+ android:pathData="M11,15H13V17H11V15M11,7H13V13H11V7M12,2C6.47,2 2,6.5 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2M12,20A8,8 0 0,1 4,12A8,8 0 0,1 12,4A8,8 0 0,1 20,12A8,8 0 0,1 12,20Z" />
+</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_sce.xml b/res/drawable/ic_sce.xml
new file mode 100644
index 000000000..e2481b396
--- /dev/null
+++ b/res/drawable/ic_sce.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="M17.13 8.9l.59-1.3 1.3-.6-1.3-.59-.59-1.3-.59 1.3-1.31 .59 1.31 .6
+zm-4.74-2.37l-1.18 2.61-2.61 1.18 2.61 1.18 1.18 2.61 1.19-2.61
+2.6-1.18-2.6-1.18zM19.02 10v9H5V5h9V3H5.02c-1.1 0-2 .9-2 2v14c0 1.1 .9 2 2
+2h14c1.1 0 2-.9 2-2v-9h-2z" />
+</vector>
diff --git a/res/drawable/ic_sce_action.xml b/res/drawable/ic_sce_action.xml
new file mode 100644
index 000000000..e73dd7f40
--- /dev/null
+++ b/res/drawable/ic_sce_action.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="M13.49 5.48c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2zm-3.6 13.9l1-4.4 2.1
+2v6h2v-7.5l-2.1-2 .6-3c1.3 1.5 3.3 2.5 5.5 2.5v-2c-1.9
+0-3.5-1-4.3-2.4l-1-1.6c-.4-.6-1-1-1.7-1-.3 0-.5 .1 -.8 .1 l-5.2
+2.2v4.7h2v-3.4l1.8-.7-1.6 8.1-4.9-1-.4 2 7 1.4z" />
+</vector>
diff --git a/res/drawable/ic_sce_night.xml b/res/drawable/ic_sce_night.xml
new file mode 100644
index 000000000..308de1df3
--- /dev/null
+++ b/res/drawable/ic_sce_night.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/ic_sce_off.xml b/res/drawable/ic_sce_off.xml
new file mode 100644
index 000000000..e2481b396
--- /dev/null
+++ b/res/drawable/ic_sce_off.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="M17.13 8.9l.59-1.3 1.3-.6-1.3-.59-.59-1.3-.59 1.3-1.31 .59 1.31 .6
+zm-4.74-2.37l-1.18 2.61-2.61 1.18 2.61 1.18 1.18 2.61 1.19-2.61
+2.6-1.18-2.6-1.18zM19.02 10v9H5V5h9V3H5.02c-1.1 0-2 .9-2 2v14c0 1.1 .9 2 2
+2h14c1.1 0 2-.9 2-2v-9h-2z" />
+</vector>
diff --git a/res/drawable/ic_sce_party.xml b/res/drawable/ic_sce_party.xml
new file mode 100644
index 000000000..86cc51068
--- /dev/null
+++ b/res/drawable/ic_sce_party.xml
@@ -0,0 +1,20 @@
+<?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 6c1.11 0 2-.9 2-2 0-.38-.1-.73-.29-1.03L12 0l-1.71 2.97c-.19 .3 -.29 .65
+-.29 1.03 0 1.1 .9 2 2 2zm4.6 9.99l-1.07-1.07-1.08 1.07c-1.3 1.3-3.58 1.31-4.89
+0l-1.07-1.07-1.09 1.07C6.75 16.64 5.88 17 4.96 17c-.73 0-1.4-.23-1.96-.61V21c0
+.55 .45 1 1 1h16c.55 0 1-.45 1-1v-4.61c-.56 .38 -1.23 .61 -1.96 .61 -.92
+0-1.79-.36-2.44-1.01zM18 9h-5V7h-2v2H6c-1.66 0-3 1.34-3 3v1.54c0 1.08 .88 1.96
+1.96 1.96 .52 0 1.02-.2 1.38-.57l2.14-2.13 2.13 2.13c.74 .74 2.03 .74 2.77
+0l2.14-2.13 2.13 2.13c.37 .37 .86 .57 1.38 .57 1.08 0 1.96-.88 1.96-1.96V12C21
+10.34 19.66 9 18 9z" />
+</vector>
diff --git a/res/drawable/ic_sce_sunset.xml b/res/drawable/ic_sce_sunset.xml
new file mode 100644
index 000000000..837b321a0
--- /dev/null
+++ b/res/drawable/ic_sce_sunset.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="M6.76 4.84l-1.8-1.79-1.41 1.41 1.79 1.79 1.42-1.41zM4
+10.5H1v2h3v-2zm9-9.95h-2V3.5h2V.55zm7.45 3.91l-1.41-1.41-1.79 1.79 1.41 1.41
+1.79-1.79zm-3.21 13.7l1.79 1.8 1.41-1.41-1.8-1.79-1.4 1.4zM20
+10.5v2h3v-2h-3zm-8-5c-3.31 0-6 2.69-6 6s2.69 6 6 6 6-2.69 6-6-2.69-6-6-6zm-1
+16.95h2V19.5h-2v2.95zm-7.45-3.91l1.41 1.41 1.79-1.8-1.41-1.41-1.79 1.8z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_action.xml b/res/drawable/ic_scene_mode_action.xml
new file mode 100644
index 000000000..7ef3aa4e4
--- /dev/null
+++ b/res/drawable/ic_scene_mode_action.xml
@@ -0,0 +1,19 @@
+<?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,0 L24,0 L24,24 L0,24 Z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M13.49,5.48 C14.59,5.48,15.49,4.58,15.49,3.48 S14.59,1.48,13.49,1.48
+S11.49,2.38,11.49,3.48 S12.39,5.48,13.49,5.48 Z M9.89,19.38 L10.89,14.98
+L12.99,16.98 L12.99,22.98 L14.99,22.98 L14.99,15.48 L12.89,13.48 L13.49,10.48
+C14.79,11.98,16.79,12.98,18.99,12.98 L18.99,10.98
+C17.09,10.98,15.49,9.98,14.69,8.58 L13.69,6.98 C13.29,6.38,12.69,5.98,11.99,5.98
+C11.69,5.98,11.49,6.08,11.19,6.08 L5.99,8.28 L5.99,12.98 L7.99,12.98 L7.99,9.58
+L9.79,8.88 L8.19,16.98 L3.29,15.98 L2.89,17.98 L9.89,19.38 Z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_antishake.xml b/res/drawable/ic_scene_mode_antishake.xml
new file mode 100644
index 000000000..5b5279a5a
--- /dev/null
+++ b/res/drawable/ic_scene_mode_antishake.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="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_scene_mode_auto.xml b/res/drawable/ic_scene_mode_auto.xml
new file mode 100644
index 000000000..e2481b396
--- /dev/null
+++ b/res/drawable/ic_scene_mode_auto.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="M17.13 8.9l.59-1.3 1.3-.6-1.3-.59-.59-1.3-.59 1.3-1.31 .59 1.31 .6
+zm-4.74-2.37l-1.18 2.61-2.61 1.18 2.61 1.18 1.18 2.61 1.19-2.61
+2.6-1.18-2.6-1.18zM19.02 10v9H5V5h9V3H5.02c-1.1 0-2 .9-2 2v14c0 1.1 .9 2 2
+2h14c1.1 0 2-.9 2-2v-9h-2z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_backlight.xml b/res/drawable/ic_scene_mode_backlight.xml
new file mode 100644
index 000000000..64b228eaa
--- /dev/null
+++ b/res/drawable/ic_scene_mode_backlight.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="M3.55 18.54l1.41 1.41 1.79-1.8-1.41-1.41-1.79 1.8zM11 22.45h2V19.5h-2v2.95zM4
+10.5H1v2h3v-2zm11-4.19V1.5H9v4.81C7.21 7.35 6 9.28 6 11.5c0 3.31 2.69 6 6
+6s6-2.69 6-6c0-2.22-1.21-4.15-3-5.19zm5 4.19v2h3v-2h-3zm-2.76 7.66l1.79 1.8
+1.41-1.41-1.8-1.79-1.4 1.4z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_beach.xml b/res/drawable/ic_scene_mode_beach.xml
new file mode 100644
index 000000000..371649809
--- /dev/null
+++ b/res/drawable/ic_scene_mode_beach.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.127 14.56l1.43-1.43 6.44 6.443L19.57
+21zm4.293-5.73l2.86-2.86c-3.95-3.95-10.35-3.96-14.3-.02 3.93-1.3 8.31-.25 11.44
+2.88zM5.95 5.98c-3.94 3.95-3.93 10.35 .02 14.3l2.86-2.86C5.7 14.29 4.65 9.91
+5.95 5.98zm.02-.02l-.01 .01 c-.38 3.01 1.17 6.88 4.3
+10.02l5.73-5.73c-3.13-3.13-7.01-4.68-10.02-4.3z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_candlelight.xml b/res/drawable/ic_scene_mode_candlelight.xml
new file mode 100644
index 000000000..4be42ebd2
--- /dev/null
+++ b/res/drawable/ic_scene_mode_candlelight.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:fillColor="@color/white"
+ android:pathData="M13.5 .67 s.74 2.65 .74 4.8c0 2.06-1.35 3.73-3.41 3.73-2.07
+0-3.63-1.67-3.63-3.73l.03-.36C5.21 7.51 4 10.62 4 14c0 4.42 3.58 8 8 8s8-3.58
+8-8C20 8.61 17.41 3.8 13.5 .67 zM11.71 19c-1.78 0-3.22-1.4-3.22-3.14 0-1.62
+1.05-2.76 2.81-3.12 1.77-.36 3.6-1.21 4.62-2.58 .39 1.29 .59 2.65 .59 4.04 0
+2.65-2.15 4.8-4.8 4.8z" />
+ <path
+ android:pathData="M0 0h24v24H0z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_entry_antimotionblur.xml b/res/drawable/ic_scene_mode_entry_antimotionblur.xml
new file mode 100644
index 000000000..a3954dd19
--- /dev/null
+++ b/res/drawable/ic_scene_mode_entry_antimotionblur.xml
@@ -0,0 +1,27 @@
+<?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,0 L24,0 L24,24 L0,24 Z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M5,17.5 C5.83,17.5,6.5,16.83,6.5,16 S5.83,14.5,5,14.5 S3.5,15.17,3.5,16
+S4.17,17.5,5,17.5 Z M9,13 C9.55,13,10,12.55,10,12 S9.55,11,9,11 S8,11.45,8,12
+S8.45,13,9,13 Z M9,9 C9.55,9,10,8.55,10,8 S9.55,7,9,7 S8,7.45,8,8 S8.45,9,9,9 Z
+M3,21 L21,21 L21,19 L3,19 L3,21 Z M5,9.5 C5.83,9.5,6.5,8.83,6.5,8
+S5.83,6.5,5,6.5 S3.5,7.17,3.5,8 S4.17,9.5,5,9.5 Z M5,13.5
+C5.83,13.5,6.5,12.83,6.5,12 S5.83,10.5,5,10.5 S3.5,11.17,3.5,12
+S4.17,13.5,5,13.5 Z M9,17 C9.55,17,10,16.55,10,16 S9.55,15,9,15 S8,15.45,8,16
+S8.45,17,9,17 Z M17,16.5 C17.28,16.5,17.5,16.28,17.5,16 S17.28,15.5,17,15.5
+S16.5,15.72,16.5,16 S16.72,16.5,17,16.5 Z M3,3 L3,5 L21,5 L21,3 L3,3 Z M17,8.5
+C17.28,8.5,17.5,8.28,17.5,8 S17.28,7.5,17,7.5 S16.5,7.72,16.5,8
+S16.72,8.5,17,8.5 Z M17,12.5 C17.28,12.5,17.5,12.28,17.5,12 S17.28,11.5,17,11.5
+S16.5,11.72,16.5,12 S16.72,12.5,17,12.5 Z M13,9 C13.55,9,14,8.55,14,8
+S13.55,7,13,7 S12,7.45,12,8 S12.45,9,13,9 Z M13,13 C13.55,13,14,12.55,14,12
+S13.55,11,13,11 S12,11.45,12,12 S12.45,13,13,13 Z M13,17
+C13.55,17,14,16.55,14,16 S13.55,15,13,15 S12,15.45,12,16 S12.45,17,13,17 Z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_entry_aqua.xml b/res/drawable/ic_scene_mode_entry_aqua.xml
new file mode 100644
index 000000000..3d32ea1bc
--- /dev/null
+++ b/res/drawable/ic_scene_mode_entry_aqua.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="M24,0 L0,0 L0,24 L24,24 Z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M17.66,7.93 L12,2.27 L6.34,7.93 C3.22,11.05,3.22,16.12,6.34,19.24
+C7.9,20.8,9.95,21.58,12,21.58 C14.05,21.58,16.1,20.8,17.66,19.24
+C20.78,16.12,20.78,11.05,17.66,7.93 Z M12,19.59
+C10.4,19.59,8.89,18.97,7.76,17.83 C6.62,16.69,6,15.19,6,13.59
+S6.62,10.48,7.76,9.35 L12,5.1 L12,19.59 Z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_entry_ar.xml b/res/drawable/ic_scene_mode_entry_ar.xml
new file mode 100644
index 000000000..b294dabbd
--- /dev/null
+++ b/res/drawable/ic_scene_mode_entry_ar.xml
@@ -0,0 +1,25 @@
+<?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,0 L24,0 L24,24 L0,24 Z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M11,4.07 L11,2.05 C8.99,2.25,7.16,3.05,5.68,4.26 L7.1,5.69
+C8.21,4.83,9.54,4.25,11,4.07 Z M18.32,4.26 C16.84,3.05,15.01,2.25,13,2.05
+L13,4.07 C14.46,4.25,15.79,4.83,16.9,5.69 L18.32,4.26 Z M19.93,11 L21.95,11
+C21.75,8.99,20.95,7.16,19.74,5.68 L18.31,7.1 C19.17,8.21,19.75,9.54,19.93,11 Z
+M5.69,7.1 L4.26,5.68 C3.05,7.16,2.25,8.99,2.05,11 L4.07,11
+C4.25,9.54,4.83,8.21,5.69,7.1 Z M4.07,13 L2.05,13
+C2.25,15.01,3.05,16.84,4.26,18.32 L5.69,16.89 C4.83,15.79,4.25,14.46,4.07,13 Z
+M15,12 C15,10.34,13.66,9,12,9 S9,10.34,9,12 S10.34,15,12,15 S15,13.66,15,12 Z
+M18.31,16.9 L19.74,18.33 C20.95,16.85,21.75,15.01,21.95,13.01 L19.93,13.01
+C19.75,14.46,19.17,15.79,18.31,16.9 Z M13,19.93 L13,21.95
+C15.01,21.75,16.84,20.95,18.32,19.74 L16.89,18.31
+C15.79,19.17,14.46,19.75,13,19.93 Z M5.68,19.74 C7.16,20.95,9,21.75,11,21.95
+L11,19.93 C9.54,19.75,8.21,19.17,7.1,18.31 L5.68,19.74 Z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_entry_baby.xml b/res/drawable/ic_scene_mode_entry_baby.xml
new file mode 100644
index 000000000..ac6dbfbc7
--- /dev/null
+++ b/res/drawable/ic_scene_mode_entry_baby.xml
@@ -0,0 +1,36 @@
+<?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,0 L24,0 L24,24 L0,24 Z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M14.5,9.25 C15.1904,9.25,15.75,9.80964,15.75,10.5
+C15.75,11.1904,15.1904,11.75,14.5,11.75 C13.8096,11.75,13.25,11.1904,13.25,10.5
+C13.25,9.80964,13.8096,9.25,14.5,9.25 Z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M9.5,9.25 C10.1904,9.25,10.75,9.80964,10.75,10.5
+C10.75,11.1904,10.1904,11.75,9.5,11.75 C8.80964,11.75,8.25,11.1904,8.25,10.5
+C8.25,9.80964,8.80964,9.25,9.5,9.25 Z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M22.94,12.66 C22.98,12.45,23,12.23,23,12 S22.98,11.55,22.94,11.34
+C22.69,9.83,21.58,8.6,20.13,8.17 C19.6,7.05,18.85,6.07,17.94,5.26
+C16.36,3.85,14.28,3,12,3 S7.64,3.85,6.06,5.26 C5.14,6.07,4.39,7.06,3.87,8.17
+C2.42,8.6,1.31,9.82,1.06,11.34 C1.02,11.55,1,11.77,1,12 S1.02,12.45,1.06,12.66
+C1.31,14.17,2.42,15.4,3.87,15.83 C4.39,16.94,5.14,17.92,6.04,18.72
+C7.62,20.14,9.71,21,12,21 S16.38,20.14,17.97,18.72
+C18.87,17.92,19.62,16.93,20.14,15.83 C21.58,15.4,22.69,14.18,22.94,12.66 Z
+M19,14 C18.9,14,18.81,13.98,18.71,13.97 C18.51,14.64,18.22,15.26,17.85,15.83
+C16.6,17.74,14.45,19,12,19 S7.4,17.74,6.15,15.83
+C5.78,15.26,5.49,14.64,5.29,13.97 C5.19,13.98,5.1,14,5,14 C3.9,14,3,13.1,3,12
+S3.9,10,5,10 C5.1,10,5.19,10.02,5.29,10.03 C5.49,9.36,5.78,8.74,6.15,8.17
+C7.4,6.26,9.55,5,12,5 S16.6,6.26,17.85,8.17 C18.22,8.74,18.51,9.36,18.71,10.03
+C18.81,10.02,18.9,10,19,10 C20.1,10,21,10.9,21,12 S20.1,14,19,14 Z M7.5,14
+C8.26,15.77,9.99,17,12,17 S15.74,15.77,16.5,14 L7.5,14 Z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_entry_backgroundblur.xml b/res/drawable/ic_scene_mode_entry_backgroundblur.xml
new file mode 100644
index 000000000..85e07083c
--- /dev/null
+++ b/res/drawable/ic_scene_mode_entry_backgroundblur.xml
@@ -0,0 +1,40 @@
+<?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="M6,13 C5.45,13,5,13.45,5,14 S5.45,15,6,15 S7,14.55,7,14 S6.55,13,6,13 Z M6,17
+C5.45,17,5,17.45,5,18 S5.45,19,6,19 S7,18.55,7,18 S6.55,17,6,17 Z M6,9
+C5.45,9,5,9.45,5,10 S5.45,11,6,11 S7,10.55,7,10 S6.55,9,6,9 Z M3,9.5
+C2.72,9.5,2.5,9.72,2.5,10 S2.72,10.5,3,10.5 S3.5,10.28,3.5,10 S3.28,9.5,3,9.5 Z
+M6,5 C5.45,5,5,5.45,5,6 S5.45,7,6,7 S7,6.55,7,6 S6.55,5,6,5 Z M21,10.5
+C21.28,10.5,21.5,10.28,21.5,10 S21.28,9.5,21,9.5 S20.5,9.72,20.5,10
+S20.72,10.5,21,10.5 Z M14,7 C14.55,7,15,6.55,15,6 S14.55,5,14,5 S13,5.45,13,6
+S13.45,7,14,7 Z M14,3.5 C14.28,3.5,14.5,3.28,14.5,3 S14.28,2.5,14,2.5
+S13.5,2.72,13.5,3 S13.72,3.5,14,3.5 Z M3,13.5 C2.72,13.5,2.5,13.72,2.5,14
+S2.72,14.5,3,14.5 S3.5,14.28,3.5,14 S3.28,13.5,3,13.5 Z M10,20.5
+C9.72,20.5,9.5,20.72,9.5,21 S9.72,21.5,10,21.5 S10.5,21.28,10.5,21
+S10.28,20.5,10,20.5 Z M10,3.5 C10.28,3.5,10.5,3.28,10.5,3 S10.28,2.5,10,2.5
+S9.5,2.72,9.5,3 S9.72,3.5,10,3.5 Z M10,7 C10.55,7,11,6.55,11,6 S10.55,5,10,5
+S9,5.45,9,6 S9.45,7,10,7 Z M10,12.5 C9.17,12.5,8.5,13.17,8.5,14
+S9.17,15.5,10,15.5 S11.5,14.83,11.5,14 S10.83,12.5,10,12.5 Z M18,13
+C17.45,13,17,13.45,17,14 S17.45,15,18,15 S19,14.55,19,14 S18.55,13,18,13 Z
+M18,17 C17.45,17,17,17.45,17,18 S17.45,19,18,19 S19,18.55,19,18 S18.55,17,18,17
+Z M18,9 C17.45,9,17,9.45,17,10 S17.45,11,18,11 S19,10.55,19,10 S18.55,9,18,9 Z
+M18,5 C17.45,5,17,5.45,17,6 S17.45,7,18,7 S19,6.55,19,6 S18.55,5,18,5 Z M21,13.5
+C20.72,13.5,20.5,13.72,20.5,14 S20.72,14.5,21,14.5 S21.5,14.28,21.5,14
+S21.28,13.5,21,13.5 Z M14,17 C13.45,17,13,17.45,13,18 S13.45,19,14,19
+S15,18.55,15,18 S14.55,17,14,17 Z M14,20.5 C13.72,20.5,13.5,20.72,13.5,21
+S13.72,21.5,14,21.5 S14.5,21.28,14.5,21 S14.28,20.5,14,20.5 Z M10,8.5
+C9.17,8.5,8.5,9.17,8.5,10 S9.17,11.5,10,11.5 S11.5,10.83,11.5,10
+S10.83,8.5,10,8.5 Z M10,17 C9.45,17,9,17.45,9,18 S9.45,19,10,19 S11,18.55,11,18
+S10.55,17,10,17 Z M14,12.5 C13.17,12.5,12.5,13.17,12.5,14 S13.17,15.5,14,15.5
+S15.5,14.83,15.5,14 S14.83,12.5,14,12.5 Z M14,8.5 C13.17,8.5,12.5,9.17,12.5,10
+S13.17,11.5,14,11.5 S15.5,10.83,15.5,10 S14.83,8.5,14,8.5 Z" />
+ <path
+ android:pathData="M0,0 L24,0 L24,24 L0,24 Z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_entry_backlightportrait.xml b/res/drawable/ic_scene_mode_entry_backlightportrait.xml
new file mode 100644
index 000000000..46759eddc
--- /dev/null
+++ b/res/drawable/ic_scene_mode_entry_backlightportrait.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:fillColor="@color/white"
+ android:pathData="M12,5.9 C13.16,5.9,14.1,6.84,14.1,8 S13.16,10.1,12,10.1 S9.9,9.16,9.9,8
+S10.84,5.9,12,5.9 M12,14.9 C14.97,14.9,18.1,16.36,18.1,17 L18.1,18.1 L5.9,18.1
+L5.9,17 C5.9,16.36,9.03,14.9,12,14.9 M12,4 C9.79,4,8,5.79,8,8 S9.79,12,12,12
+S16,10.21,16,8 S14.21,4,12,4 Z M12,13 C9.33,13,4,14.34,4,17 L4,20 L20,20 L20,17
+C20,14.34,14.67,13,12,13 Z" />
+ <path
+ android:pathData="M0,0 L24,0 L24,24 L0,24 Z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_entry_barcode.xml b/res/drawable/ic_scene_mode_entry_barcode.xml
new file mode 100644
index 000000000..c71fa827f
--- /dev/null
+++ b/res/drawable/ic_scene_mode_entry_barcode.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="M4,18 L7,18 L7,5 L4,5 L4,18 Z M18,5 L18,18 L21,18 L21,5 L18,5 Z M8,18 L17,18
+L17,5 L8,5 L8,18 Z" />
+ <path
+ android:pathData="M0,0 L24,0 L24,24 L0,24 Z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_entry_beauty.xml b/res/drawable/ic_scene_mode_entry_beauty.xml
new file mode 100644
index 000000000..dfd0ece4e
--- /dev/null
+++ b/res/drawable/ic_scene_mode_entry_beauty.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:pathData="M0,0 L24,0 L24,24 L0,24 Z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M11.99,2 C6.47,2,2,6.48,2,12 S6.47,22,11.99,22 C17.52,22,22,17.52,22,12
+S17.52,2,11.99,2 Z M12,20 C7.58,20,4,16.42,4,12 S7.58,4,12,4 S20,7.58,20,12
+S16.42,20,12,20 Z M15.5,11 C16.33,11,17,10.33,17,9.5 S16.33,8,15.5,8
+S14,8.67,14,9.5 S14.67,11,15.5,11 Z M8.5,11 C9.33,11,10,10.33,10,9.5
+S9.33,8,8.5,8 S7,8.67,7,9.5 S7.67,11,8.5,11 Z M12,17.5
+C14.33,17.5,16.31,16.04,17.11,14 L6.89,14 C7.69,16.04,9.67,17.5,12,17.5 Z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_entry_cine.xml b/res/drawable/ic_scene_mode_entry_cine.xml
new file mode 100644
index 000000000..1aa822d69
--- /dev/null
+++ b/res/drawable/ic_scene_mode_entry_cine.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:fillColor="@color/white"
+ android:pathData="M18,3 L18,5 L16,5 L16,3 L8,3 L8,5 L6,5 L6,3 L4,3 L4,21 L6,21 L6,19 L8,19 L8,21
+L16,21 L16,19 L18,19 L18,21 L20,21 L20,3 L18,3 Z M8,17 L6,17 L6,15 L8,15 L8,17 Z
+M8,13 L6,13 L6,11 L8,11 L8,13 Z M8,9 L6,9 L6,7 L8,7 L8,9 Z M18,17 L16,17 L16,15
+L18,15 L18,17 Z M18,13 L16,13 L16,11 L18,11 L18,13 Z M18,9 L16,9 L16,7 L18,7
+L18,9 Z" />
+ <path
+ android:pathData="M0,0 L24,0 L24,24 L0,24 Z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_entry_closeup.xml b/res/drawable/ic_scene_mode_entry_closeup.xml
new file mode 100644
index 000000000..b29be6ba8
--- /dev/null
+++ b/res/drawable/ic_scene_mode_entry_closeup.xml
@@ -0,0 +1,20 @@
+<?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="M15.5,14 L14.71,14 L14.43,13.73 C15.41,12.59,16,11.11,16,9.5
+C16,5.91,13.09,3,9.5,3 S3,5.91,3,9.5 S5.91,16,9.5,16
+C11.11,16,12.59,15.41,13.73,14.43 L14,14.71 L14,15.5 L19,20.49 L20.49,19
+L15.5,14 Z M9.5,14 C7.01,14,5,11.99,5,9.5 S7.01,5,9.5,5 S14,7.01,14,9.5
+S11.99,14,9.5,14 Z" />
+ <path
+ android:pathData="M0,0 L24,0 L24,24 L0,24 L0,0 Z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M12,10 L10,10 L10,12 L9,12 L9,10 L7,10 L7,9 L9,9 L9,7 L10,7 L10,9 L12,9 L12,10 Z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_entry_dark.xml b/res/drawable/ic_scene_mode_entry_dark.xml
new file mode 100644
index 000000000..e3f956983
--- /dev/null
+++ b/res/drawable/ic_scene_mode_entry_dark.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="M10,2 C8.18,2,6.47,2.5,5,3.35 C7.99,5.08,10,8.3,10,12 S7.99,18.92,5,20.65
+C6.47,21.5,8.18,22,10,22 C15.52,22,20,17.52,20,12 S15.52,2,10,2 Z" />
+ <path
+ android:pathData="M0,0 L24,0 L24,24 L0,24 Z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_entry_dish.xml b/res/drawable/ic_scene_mode_entry_dish.xml
new file mode 100644
index 000000000..67faf5605
--- /dev/null
+++ b/res/drawable/ic_scene_mode_entry_dish.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,0 L24,0 L24,24 L0,24 L0,0 Z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M18,2.01 L6,2 C4.9,2,4,2.89,4,4 L4,20 C4,21.1,4.9,22,6,22 L18,22
+C19.1,22,20,21.1,20,20 L20,4 C20,2.89,19.1,2.01,18,2.01 Z M18,20 L6,20 L6,10.98
+L18,10.98 L18,20 Z M18,9 L6,9 L6,4 L18,4 L18,9 Z M8,5 L10,5 L10,8 L8,8 Z M8,12
+L10,12 L10,17 L8,17 Z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_entry_document.xml b/res/drawable/ic_scene_mode_entry_document.xml
new file mode 100644
index 000000000..b28527fc7
--- /dev/null
+++ b/res/drawable/ic_scene_mode_entry_document.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="M6,2 C4.9,2,4.01,2.9,4.01,4 L4,20 C4,21.1,4.89,22,5.99,22 L18,22
+C19.1,22,20,21.1,20,20 L20,8 L14,2 L6,2 Z M13,9 L13,3.5 L18.5,9 L13,9 Z" />
+ <path
+ android:pathData="M0,0 L24,0 L24,24 L0,24 Z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_entry_duskdawn.xml b/res/drawable/ic_scene_mode_entry_duskdawn.xml
new file mode 100644
index 000000000..22247cc2d
--- /dev/null
+++ b/res/drawable/ic_scene_mode_entry_duskdawn.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:pathData="M0,0 L24,0 L24,24 L0,24 Z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M20,15.31 L23.31,12 L20,8.69 L20,4 L15.31,4 L12,0.69 L8.69,4 L4,4 L4,8.69
+L0.69,12 L4,15.31 L4,20 L8.69,20 L12,23.31 L15.31,20 L20,20 L20,15.31 Z M12,18
+L12,6 C15.31,6,18,8.69,18,12 S15.31,18,12,18 Z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_entry_fallcolor.xml b/res/drawable/ic_scene_mode_entry_fallcolor.xml
new file mode 100644
index 000000000..7f1c6d3ba
--- /dev/null
+++ b/res/drawable/ic_scene_mode_entry_fallcolor.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,0 L24,0 L24,24 L0,24 Z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M14,6 L10.25,11 L13.1,14.8 L11.5,16 C9.81,13.75,7,10,7,10 L1,18 L23,18 L14,6 Z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_entry_fireworks.xml b/res/drawable/ic_scene_mode_entry_fireworks.xml
new file mode 100644
index 000000000..5b0e9b355
--- /dev/null
+++ b/res/drawable/ic_scene_mode_entry_fireworks.xml
@@ -0,0 +1,19 @@
+<?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,0 L24,0 L24,24 L0,24 Z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M7,11 L1,11 L1,13 L7,13 L7,11 Z M9.17,7.76 L7.05,5.64 L5.64,7.05 L7.76,9.17
+L9.17,7.76 Z M13,1 L11,1 L11,7 L13,7 L13,1 Z M18.36,7.05 L16.95,5.64 L14.83,7.76
+L16.24,9.17 L18.36,7.05 Z M17,11 L17,13 L23,13 L23,11 L17,11 Z M12,9
+C10.34,9,9,10.34,9,12 S10.34,15,12,15 S15,13.66,15,12 S13.66,9,12,9 Z
+M14.83,16.24 L16.95,18.36 L18.36,16.95 L16.24,14.83 L14.83,16.24 Z M5.64,16.95
+L7.05,18.36 L9.17,16.24 L7.76,14.83 L5.64,16.95 Z M11,23 L13,23 L13,17 L11,17
+L11,23 Z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_entry_handheldtwilight.xml b/res/drawable/ic_scene_mode_entry_handheldtwilight.xml
new file mode 100644
index 000000000..f169e2741
--- /dev/null
+++ b/res/drawable/ic_scene_mode_entry_handheldtwilight.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="M9,2 C7.95,2,6.95,2.16,6,2.46 C10.06,3.73,13,7.52,13,12
+C13,16.48,10.06,20.27,6,21.54 C6.95,21.84,7.95,22,9,22 C14.52,22,19,17.52,19,12
+S14.52,2,9,2 Z" />
+ <path
+ android:pathData="M0,0 L24,0 L24,24 L0,24 Z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_entry_highsensitivity.xml b/res/drawable/ic_scene_mode_entry_highsensitivity.xml
new file mode 100644
index 000000000..0ee2e7b23
--- /dev/null
+++ b/res/drawable/ic_scene_mode_entry_highsensitivity.xml
@@ -0,0 +1,20 @@
+<?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,0 L24,0 L24,24 L0,24 Z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M9.4,10.5 L14.17,2.24 C13.47,2.09,12.75,2,12,2 C9.6,2,7.4,2.85,5.68,4.25
+L9.34,10.6 L9.4,10.5 Z M21.54,9 C20.62,6.08,18.39,3.74,15.54,2.66 L11.88,9
+L21.54,9 Z M21.8,10 L14.31,10 L14.6,10.5 L19.36,18.75 C21,16.97,22,14.61,22,12
+C22,11.31,21.93,10.65,21.8,10 Z M8.54,12 L4.64,5.25 C3.01,7.03,2,9.39,2,12
+C2,12.69,2.07,13.35,2.2,14 L9.69,14 L8.54,12 Z M2.46,15
+C3.38,17.92,5.61,20.26,8.46,21.34 L12.12,15 L2.46,15 Z M13.73,15 L9.83,21.76
+C10.53,21.91,11.25,22,12,22 C14.4,22,16.6,21.15,18.32,19.75 L14.66,13.4
+L13.73,15 Z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_entry_indoor.xml b/res/drawable/ic_scene_mode_entry_indoor.xml
new file mode 100644
index 000000000..42a15a01a
--- /dev/null
+++ b/res/drawable/ic_scene_mode_entry_indoor.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="M21,10 C19.9,10,19,10.9,19,12 L19,15 L5,15 L5,12 C5,10.9,4.1,10,3,10
+S1,10.9,1,12 L1,17 C1,18.1,1.9,19,3,19 L21,19 C22.1,19,23,18.1,23,17 L23,12
+C23,10.9,22.1,10,21,10 Z M18,5 L6,5 C4.9,5,4,5.9,4,7 L4,9.15
+C5.16,9.56,6,10.66,6,11.97 L6,14 L18,14 L18,11.97 C18,10.67,18.84,9.57,20,9.15
+L20,7 C20,5.9,19.1,5,18,5 Z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_entry_macro.xml b/res/drawable/ic_scene_mode_entry_macro.xml
new file mode 100644
index 000000000..2ea0e1d54
--- /dev/null
+++ b/res/drawable/ic_scene_mode_entry_macro.xml
@@ -0,0 +1,25 @@
+<?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,0 L24,0 L24,24 L0,24 Z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M18.7,12.4 C18.42,12.24,18.13,12.11,17.84,12 C18.13,11.89,18.42,11.76,18.7,11.6
+C20.62,10.49,21.69,8.48,21.7,6.41 C19.91,5.38,17.63,5.3,15.7,6.41
+C15.42,6.57,15.16,6.76,14.92,6.95 C14.97,6.64,15,6.32,15,6
+C15,3.78,13.79,1.85,12,0.81 C10.21,1.85,9,3.78,9,6 C9,6.32,9.03,6.64,9.08,6.95
+C8.84,6.75,8.58,6.56,8.3,6.4 C6.38,5.29,4.1,5.37,2.3,6.4
+C2.3,8.47,3.37,10.48,5.3,11.59 C5.58,11.75,5.87,11.88,6.16,11.99
+C5.87,12.1,5.58,12.23,5.3,12.39 C3.38,13.5,2.31,15.51,2.3,17.58
+C4.09,18.61,6.37,18.69,8.3,17.58 C8.58,17.42,8.84,17.23,9.08,17.04
+C9.03,17.36,9,17.68,9,18 C9,20.22,10.21,22.15,12,23.19
+C13.79,22.15,15,20.22,15,18 C15,17.68,14.97,17.36,14.92,17.05
+C15.16,17.25,15.42,17.43,15.7,17.59 C17.62,18.7,19.9,18.62,21.7,17.59
+C21.69,15.52,20.62,13.51,18.7,12.4 Z M12,16 C9.79,16,8,14.21,8,12 S9.79,8,12,8
+S16,9.79,16,12 S14.21,16,12,16 Z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_entry_mix_illuminant.xml b/res/drawable/ic_scene_mode_entry_mix_illuminant.xml
new file mode 100644
index 000000000..642de6246
--- /dev/null
+++ b/res/drawable/ic_scene_mode_entry_mix_illuminant.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:pathData="M0,0 L24,0 L24,24 L0,24 L0,0 Z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M5,14.5 L19,14.5 L19,8.5 L5,8.5 L5,14.5 Z M11,0.55 L11,3.5 L13,3.5 L13,0.55
+L11,0.55 Z M19.04,3.05 L17.25,4.84 L18.66,6.25 L20.46,4.46 L19.04,3.05 Z
+M13,22.45 L13,19.5 L11,19.5 L11,22.45 L13,22.45 Z M20.45,18.54 L18.65,16.75
+L17.24,18.16 L19.03,19.96 L20.45,18.54 Z M3.55,4.46 L5.34,6.25 L6.75,4.84
+L4.96,3.05 L3.55,4.46 Z M4.96,19.95 L6.75,18.15 L5.34,16.74 L3.55,18.53
+L4.96,19.95 Z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_entry_mood.xml b/res/drawable/ic_scene_mode_entry_mood.xml
new file mode 100644
index 000000000..6ec74def6
--- /dev/null
+++ b/res/drawable/ic_scene_mode_entry_mood.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:pathData="M0,0 L24,0 L24,24 L0,24 L0,0 Z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M11.99,2 C6.47,2,2,6.48,2,12 S6.47,22,11.99,22 C17.52,22,22,17.52,22,12
+S17.52,2,11.99,2 Z M12,20 C7.58,20,4,16.42,4,12 S7.58,4,12,4 S20,7.58,20,12
+S16.42,20,12,20 Z M15.5,11 C16.33,11,17,10.33,17,9.5 S16.33,8,15.5,8
+S14,8.67,14,9.5 S14.67,11,15.5,11 Z M8.5,11 C9.33,11,10,10.33,10,9.5
+S9.33,8,8.5,8 S7,8.67,7,9.5 S7.67,11,8.5,11 Z M12,14
+C9.67,14,7.69,15.46,6.89,17.5 L17.11,17.5 C16.31,15.46,14.33,14,12,14 Z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_entry_night.xml b/res/drawable/ic_scene_mode_entry_night.xml
new file mode 100644
index 000000000..e3f956983
--- /dev/null
+++ b/res/drawable/ic_scene_mode_entry_night.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="M10,2 C8.18,2,6.47,2.5,5,3.35 C7.99,5.08,10,8.3,10,12 S7.99,18.92,5,20.65
+C6.47,21.5,8.18,22,10,22 C15.52,22,20,17.52,20,12 S15.52,2,10,2 Z" />
+ <path
+ android:pathData="M0,0 L24,0 L24,24 L0,24 Z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_entry_nightindoor.xml b/res/drawable/ic_scene_mode_entry_nightindoor.xml
new file mode 100644
index 000000000..42a15a01a
--- /dev/null
+++ b/res/drawable/ic_scene_mode_entry_nightindoor.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="M21,10 C19.9,10,19,10.9,19,12 L19,15 L5,15 L5,12 C5,10.9,4.1,10,3,10
+S1,10.9,1,12 L1,17 C1,18.1,1.9,19,3,19 L21,19 C22.1,19,23,18.1,23,17 L23,12
+C23,10.9,22.1,10,21,10 Z M18,5 L6,5 C4.9,5,4,5.9,4,7 L4,9.15
+C5.16,9.56,6,10.66,6,11.97 L6,14 L18,14 L18,11.97 C18,10.67,18.84,9.57,20,9.15
+L20,7 C20,5.9,19.1,5,18,5 Z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_entry_nightportrait.xml b/res/drawable/ic_scene_mode_entry_nightportrait.xml
new file mode 100644
index 000000000..17a6484ec
--- /dev/null
+++ b/res/drawable/ic_scene_mode_entry_nightportrait.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="M3,5 L3,19 C3,20.1,3.89,21,5,21 L19,21 C20.1,21,21,20.1,21,19 L21,5
+C21,3.9,20.1,3,19,3 L5,3 C3.89,3,3,3.9,3,5 Z M15,9 C15,10.66,13.66,12,12,12
+S9,10.66,9,9 S10.34,6,12,6 S15,7.34,15,9 Z M6,17 C6,15,10,13.9,12,13.9
+S18,15,18,17 L18,18 L6,18 L6,17 Z" />
+ <path
+ android:pathData="M0,0 L24,0 L24,24 L0,24 Z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_entry_oldfilm.xml b/res/drawable/ic_scene_mode_entry_oldfilm.xml
new file mode 100644
index 000000000..1aa822d69
--- /dev/null
+++ b/res/drawable/ic_scene_mode_entry_oldfilm.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:fillColor="@color/white"
+ android:pathData="M18,3 L18,5 L16,5 L16,3 L8,3 L8,5 L6,5 L6,3 L4,3 L4,21 L6,21 L6,19 L8,19 L8,21
+L16,21 L16,19 L18,19 L18,21 L20,21 L20,3 L18,3 Z M8,17 L6,17 L6,15 L8,15 L8,17 Z
+M8,13 L6,13 L6,11 L8,11 L8,13 Z M8,9 L6,9 L6,7 L8,7 L8,9 Z M18,17 L16,17 L16,15
+L18,15 L18,17 Z M18,13 L16,13 L16,11 L18,11 L18,13 Z M18,9 L16,9 L16,7 L18,7
+L18,9 Z" />
+ <path
+ android:pathData="M0,0 L24,0 L24,24 L0,24 Z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_entry_spotlight.xml b/res/drawable/ic_scene_mode_entry_spotlight.xml
new file mode 100644
index 000000000..9103dffcc
--- /dev/null
+++ b/res/drawable/ic_scene_mode_entry_spotlight.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:fillColor="@color/white"
+ android:pathData="M6,14 L9,17 L9,22 L15,22 L15,17 L18,14 L18,9 L6,9 Z M11,2 L13,2 L13,5 L11,5 Z
+M3.5,5.875 L4.914,4.46 L7.034,6.582 L5.62,7.997 Z M16.96,6.585 L19.083,4.465
+L20.497,5.879 L18.375,8 Z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_entry_steadyphoto.xml b/res/drawable/ic_scene_mode_entry_steadyphoto.xml
new file mode 100644
index 000000000..e5f7b627a
--- /dev/null
+++ b/res/drawable/ic_scene_mode_entry_steadyphoto.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:pathData="M0,0 L24,0 L24,24 L0,24 Z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M19,3 L5,3 C3.9,3,3,3.9,3,5 L3,19 C3,20.1,3.9,21,5,21 L19,21
+C20.1,21,21,20.1,21,19 L21,5 C21,3.9,20.1,3,19,3 Z M19,19 L5,19 L5,5 L19,5
+L19,19 Z M13.96,12.29 L11.21,15.83 L9.25,13.47 L6.5,17 L17.5,17 L13.96,12.29 Z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_entry_supernight.xml b/res/drawable/ic_scene_mode_entry_supernight.xml
new file mode 100644
index 000000000..8460f64fd
--- /dev/null
+++ b/res/drawable/ic_scene_mode_entry_supernight.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="48dp"
+ android:height="48dp"
+ android:viewportWidth="48"
+ android:viewportHeight="48">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M18,4 C15.91,4,13.89,4.32,12,4.92 C20.11,7.47,26,15.05,26,24
+C26,32.95,20.11,40.53,12,43.08 C13.89,43.67,15.91,44,18,44
+C29.05,44,38,35.05,38,24 S29.05,4,18,4 Z" />
+ <path
+ android:pathData="M0,0 L48,0 L48,48 L0,48 Z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_entry_sweepstitch.xml b/res/drawable/ic_scene_mode_entry_sweepstitch.xml
new file mode 100644
index 000000000..5a454596e
--- /dev/null
+++ b/res/drawable/ic_scene_mode_entry_sweepstitch.xml
@@ -0,0 +1,25 @@
+<?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="M4.59,6.89 C5.29,6.18,5.99,5.54,6.3,5.67 C6.8,5.87,6.3,6.7,6,7.19
+C5.75,7.61,3.14,11.08,3.14,13.5 C3.14,14.78,3.62,15.84,4.48,16.48
+C5.23,17.04,6.22,17.21,7.12,16.94 C8.19,16.63,9.07,15.54,10.18,14.17
+C11.39,12.68,13.01,10.73,14.26,10.73 C15.89,10.73,15.91,11.74,16.02,12.52
+C12.24,13.16,10.64,16.19,10.64,17.89 C10.64,19.59,12.08,20.98,13.85,20.98
+C15.48,20.98,18.14,19.65,18.54,14.88 L21,14.88 L21,12.38 L18.53,12.38
+C18.38,10.73,17.44,8.18,14.5,8.18 C12.25,8.18,10.32,10.09,9.56,11.02
+C8.98,11.75,7.5,13.5,7.27,13.74 C7.02,14.04,6.59,14.58,6.16,14.58
+C5.71,14.58,5.44,13.75,5.8,12.66 C6.15,11.57,7.2,9.8,7.65,9.14
+C8.43,8,8.95,7.22,8.95,5.86 C8.95,3.69,7.31,3,6.44,3 C5.12,3,3.97,4,3.72,4.25
+C3.36,4.61,3.06,4.91,2.84,5.18 L4.59,6.89 Z M13.88,18.55
+C13.57,18.55,13.14,18.29,13.14,17.83 C13.14,17.23,13.87,15.63,16.01,15.07
+C15.71,17.76,14.58,18.55,13.88,18.55 Z" />
+ <path
+ android:pathData="M0,0 L24,0 L24,24 L0,24 Z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_entry_text.xml b/res/drawable/ic_scene_mode_entry_text.xml
new file mode 100644
index 000000000..1117908be
--- /dev/null
+++ b/res/drawable/ic_scene_mode_entry_text.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,0 L24,0 L24,24 L0,24 Z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M9,4 L9,7 L14,7 L14,19 L17,19 L17,7 L22,7 L22,4 L9,4 Z M3,12 L6,12 L6,19 L9,19
+L9,12 L12,12 L12,9 L3,9 L3,12 Z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_entry_theatre.xml b/res/drawable/ic_scene_mode_entry_theatre.xml
new file mode 100644
index 000000000..1eec0ac52
--- /dev/null
+++ b/res/drawable/ic_scene_mode_entry_theatre.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:fillColor="@color/white"
+ android:pathData="M4,18 L4,21 L7,21 L7,18 L17,18 L17,21 L20,21 L20,15 L4,15 Z M19,10 L22,10 L22,13
+L19,13 Z M2,10 L5,10 L5,13 L2,13 Z M17,13 L7,13 L7,5 C7,3.9,7.9,3,9,3 L15,3
+C16.1,3,17,3.9,17,5 L17,13 Z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_entry_whiteboard.xml b/res/drawable/ic_scene_mode_entry_whiteboard.xml
new file mode 100644
index 000000000..895035f6c
--- /dev/null
+++ b/res/drawable/ic_scene_mode_entry_whiteboard.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:pathData="M0,0 L24,0 L24,24 L0,24 Z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M19,7 L5,7 C3.9,7,3,7.9,3,9 L3,15 C3,16.1,3.9,17,5,17 L19,17
+C20.1,17,21,16.1,21,15 L21,9 C21,7.9,20.1,7,19,7 Z M19,15 L5,15 L5,9 L19,9
+L19,15 Z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_flower.xml b/res/drawable/ic_scene_mode_flower.xml
new file mode 100644
index 000000000..a738f4c2a
--- /dev/null
+++ b/res/drawable/ic_scene_mode_flower.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="M12 22c4.97 0 9-4.03 9-9-4.97 0-9 4.03-9 9zM5.6 10.25c0 1.38 1.12 2.5 2.5 2.5
+.53 0 1.01-.16 1.42-.44l-.02 .19 c0 1.38 1.12 2.5 2.5 2.5s2.5-1.12
+2.5-2.5l-.02-.19c.4 .28 .89 .44 1.42 .44 1.38 0 2.5-1.12 2.5-2.5
+0-1-.59-1.85-1.43-2.25 .84 -.4 1.43-1.25 1.43-2.25 0-1.38-1.12-2.5-2.5-2.5-.53
+0-1.01 .16 -1.42 .44 l.02-.19C14.5 2.12 13.38 1 12 1S9.5 2.12 9.5 3.5l.02 .19
+c-.4-.28-.89-.44-1.42-.44-1.38 0-2.5 1.12-2.5 2.5 0 1 .59 1.85 1.43 2.25-.84 .4
+-1.43 1.25-1.43 2.25zM12 5.5c1.38 0 2.5 1.12 2.5 2.5s-1.12 2.5-2.5 2.5S9.5 9.38
+9.5 8s1.12-2.5 2.5-2.5zM3 13c0 4.97 4.03 9 9 9 0-4.97-4.03-9-9-9z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_hdr.xml b/res/drawable/ic_scene_mode_hdr.xml
new file mode 100644
index 000000000..63e9e3438
--- /dev/null
+++ b/res/drawable/ic_scene_mode_hdr.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="48"
+ android:viewportHeight="48">
+
+ <path
+ android:pathData="M0 0h48v48h-48z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M12 22h-4v-8h-4v20h4v-8h4v8h4v-20h-4v8zm14-8h-8v20h8c2.21 0 4-1.79
+4-4v-12c0-2.21-1.79-4-4-4zm0
+16h-4v-12h4v12zm18-8v-4c0-2.21-1.79-4-4-4h-8v20h4v-8h2l2 8h4l-2.38-8.35c1.4-.62
+2.38-2.02 2.38-3.65zm-4 0h-4v-4h4v4z" />
+ <path
+ android:pathData="M0 0h48v48h-48z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_landscape.xml b/res/drawable/ic_scene_mode_landscape.xml
new file mode 100644
index 000000000..258f002e1
--- /dev/null
+++ b/res/drawable/ic_scene_mode_landscape.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 6l-3.75 5 2.85 3.8-1.6 1.2C9.81 13.75 7 10 7 10l-6 8h22L14 6z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_night.xml b/res/drawable/ic_scene_mode_night.xml
new file mode 100644
index 000000000..308de1df3
--- /dev/null
+++ b/res/drawable/ic_scene_mode_night.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/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_party.xml b/res/drawable/ic_scene_mode_party.xml
new file mode 100644
index 000000000..47fded30c
--- /dev/null
+++ b/res/drawable/ic_scene_mode_party.xml
@@ -0,0 +1,23 @@
+<?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,0 L24,0 L24,24 L0,24 Z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M12,6 C13.11,6,14,5.1,14,4 C14,3.62,13.9,3.27,13.71,2.97 L12,0 L10.29,2.97
+C10.1,3.27,10,3.62,10,4 C10,5.1,10.9,6,12,6 Z M16.6,15.99 L15.53,14.92
+L14.45,15.99 C13.15,17.29,10.87,17.3,9.56,15.99 L8.49,14.92 L7.4,15.99
+C6.75,16.64,5.88,17,4.96,17 C4.23,17,3.56,16.77,3,16.39 L3,21
+C3,21.55,3.45,22,4,22 L20,22 C20.55,22,21,21.55,21,21 L21,16.39
+C20.44,16.77,19.77,17,19.04,17 C18.12,17,17.25,16.64,16.6,15.99 Z M18,9 L13,9
+L13,7 L11,7 L11,9 L6,9 C4.34,9,3,10.34,3,12 L3,13.54
+C3,14.62,3.88,15.5,4.96,15.5 C5.48,15.5,5.98,15.3,6.34,14.93 L8.48,12.8
+L10.61,14.93 C11.35,15.67,12.64,15.67,13.38,14.93 L15.52,12.8 L17.65,14.93
+C18.02,15.3,18.51,15.5,19.03,15.5 C20.11,15.5,20.99,14.62,20.99,13.54 L20.99,12
+C21,10.34,19.66,9,18,9 Z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_pet.xml b/res/drawable/ic_scene_mode_pet.xml
new file mode 100644
index 000000000..a3bcb5a70
--- /dev/null
+++ b/res/drawable/ic_scene_mode_pet.xml
@@ -0,0 +1,36 @@
+<?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="M4.5,7 C5.88071,7,7,8.11929,7,9.5 C7,10.8807,5.88071,12,4.5,12
+C3.11929,12,2,10.8807,2,9.5 C2,8.11929,3.11929,7,4.5,7 Z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M9,3 C10.3807,3,11.5,4.11929,11.5,5.5 C11.5,6.88071,10.3807,8,9,8
+C7.61929,8,6.5,6.88071,6.5,5.5 C6.5,4.11929,7.61929,3,9,3 Z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M15,3 C16.3807,3,17.5,4.11929,17.5,5.5 C17.5,6.88071,16.3807,8,15,8
+C13.6193,8,12.5,6.88071,12.5,5.5 C12.5,4.11929,13.6193,3,15,3 Z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M19.5,7 C20.8807,7,22,8.11929,22,9.5 C22,10.8807,20.8807,12,19.5,12
+C18.1193,12,17,10.8807,17,9.5 C17,8.11929,18.1193,7,19.5,7 Z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M17.34,14.86 C16.47,13.84,15.74,12.97,14.86,11.95
+C14.4,11.41,13.81,10.87,13.11,10.63 C13,10.59,12.89,10.56,12.78,10.54
+C12.53,10.5,12.26,10.5,12,10.5 S11.47,10.5,11.21,10.55
+C11.1,10.57,10.99,10.6,10.88,10.64 C10.18,10.88,9.6,11.42,9.13,11.96
+C8.26,12.98,7.53,13.85,6.65,14.87 C5.34,16.18,3.73,17.63,4.03,19.66
+C4.32,20.68,5.05,21.69,6.36,21.98 C7.09,22.13,9.42,21.54,11.9,21.54 L12.08,21.54
+C14.56,21.54,16.89,22.12,17.62,21.98 C18.93,21.69,19.66,20.67,19.95,19.66
+C20.26,17.62,18.65,16.17,17.34,14.86 Z" />
+ <path
+ android:pathData="M0,0 L24,0 L24,24 L0,24 Z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_portrait.xml b/res/drawable/ic_scene_mode_portrait.xml
new file mode 100644
index 000000000..587964d1a
--- /dev/null
+++ b/res/drawable/ic_scene_mode_portrait.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="M12 12c2.21 0 4-1.79 4-4s-1.79-4-4-4-4 1.79-4 4 1.79 4 4 4zm0 2c-2.67 0-8 1.34-8
+4v2h16v-2c0-2.66-5.33-4-8-4z" />
+</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_scene_mode_smartauto.xml b/res/drawable/ic_scene_mode_smartauto.xml
new file mode 100644
index 000000000..26799fc99
--- /dev/null
+++ b/res/drawable/ic_scene_mode_smartauto.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="M23 7V1h-6v2H7V1H1v6h2v10H1v6h6v-2h10v2h6v-6h-2V7h2zM3 3h2v2H3V3zm2
+18H3v-2h2v2zm12-2H7v-2H5V7h2V5h10v2h2v10h-2v2zm4 2h-2v-2h2v2zM19
+5V3h2v2h-2zm-5.27 9h-3.49l-.73 2H7.89l3.4-9h1.4l3.41
+9h-1.63l-.74-2zm-3.04-1.26h2.61L12 8.91l-1.31 3.83z" />
+ <path
+ android:pathData="M0 0h24v24H0z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_snow.xml b/res/drawable/ic_scene_mode_snow.xml
new file mode 100644
index 000000000..564a4be0d
--- /dev/null
+++ b/res/drawable/ic_scene_mode_snow.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="M22 11h-4.17l3.24-3.24-1.41-1.42L15 11h-2V9l4.66-4.66-1.42-1.41L13
+6.17V2h-2v4.17L7.76 2.93 6.34 4.34 11 9v2H9L4.34 6.34 2.93 7.76 6.17
+11H2v2h4.17l-3.24 3.24 1.41 1.42L9 13h2v2l-4.66 4.66 1.42 1.41L11
+17.83V22h2v-4.17l3.24 3.24 1.42-1.41L13 15v-2h2l4.66 4.66 1.41-1.42L17.83 13H22z" />
+ <path
+ android:pathData="M0 0h24v24H0z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_softskin.xml b/res/drawable/ic_scene_mode_softskin.xml
new file mode 100644
index 000000000..916a6f55d
--- /dev/null
+++ b/res/drawable/ic_scene_mode_softskin.xml
@@ -0,0 +1,20 @@
+<?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="M9,11.75 C8.31,11.75,7.75,12.31,7.75,13 S8.31,14.25,9,14.25
+S10.25,13.69,10.25,13 S9.69,11.75,9,11.75 Z M15,11.75
+C14.31,11.75,13.75,12.31,13.75,13 S14.31,14.25,15,14.25 S16.25,13.69,16.25,13
+S15.69,11.75,15,11.75 Z M12,2 C6.48,2,2,6.48,2,12 S6.48,22,12,22 S22,17.52,22,12
+S17.52,2,12,2 Z M12,20 C7.59,20,4,16.41,4,12 C4,11.71,4.02,11.42,4.05,11.14
+C6.41,10.09,8.28,8.16,9.26,5.77 C11.07,8.33,14.05,10,17.42,10
+C18.2,10,18.95,9.91,19.67,9.74 C19.88,10.45,20,11.21,20,12
+C20,16.41,16.41,20,12,20 Z" />
+ <path
+ android:pathData="M0,0 L24,0 L24,24 L0,24 Z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_sports.xml b/res/drawable/ic_scene_mode_sports.xml
new file mode 100644
index 000000000..7af0f67f3
--- /dev/null
+++ b/res/drawable/ic_scene_mode_sports.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="M 19.5 18 C 20.3284271247 18 21 18.6715728753 21 19.5 C 21 20.3284271247 20.3284271247 21 19.5 21 C 18.6715728753 21 18 20.3284271247 18 19.5 C 18 18.6715728753 18.6715728753 18 19.5 18 Z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M17 5.92L9 2v18H7v-1.73c-1.79 .35 -3 .99-3 1.73 0 1.1 2.69 2 6 2s6-.9
+6-2c0-.99-2.16-1.81-5-1.97V8.98l6-3.06z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_sunset.xml b/res/drawable/ic_scene_mode_sunset.xml
new file mode 100644
index 000000000..837b321a0
--- /dev/null
+++ b/res/drawable/ic_scene_mode_sunset.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="M6.76 4.84l-1.8-1.79-1.41 1.41 1.79 1.79 1.42-1.41zM4
+10.5H1v2h3v-2zm9-9.95h-2V3.5h2V.55zm7.45 3.91l-1.41-1.41-1.79 1.79 1.41 1.41
+1.79-1.79zm-3.21 13.7l1.79 1.8 1.41-1.41-1.8-1.79-1.4 1.4zM20
+10.5v2h3v-2h-3zm-8-5c-3.31 0-6 2.69-6 6s2.69 6 6 6 6-2.69 6-6-2.69-6-6-6zm-1
+16.95h2V19.5h-2v2.95zm-7.45-3.91l1.41 1.41 1.79-1.8-1.41-1.41-1.79 1.8z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_text.xml b/res/drawable/ic_scene_mode_text.xml
new file mode 100644
index 000000000..737e75254
--- /dev/null
+++ b/res/drawable/ic_scene_mode_text.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 4v3h5v12h3V7h5V4H9zm-6 8h3v7h3v-7h3V9H3v3z" />
+</vector>
diff --git a/res/drawable/ic_settings.xml b/res/drawable/ic_settings.xml
new file mode 100644
index 000000000..53362485c
--- /dev/null
+++ b/res/drawable/ic_settings.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="M3 18h18v-2H3v2zm0-5h18v-2H3v2zm0-7v2h18V6H3z" />
+</vector>
diff --git a/res/drawable/ic_settings_advanced.xml b/res/drawable/ic_settings_advanced.xml
new file mode 100644
index 000000000..2ad7ad7ee
--- /dev/null
+++ b/res/drawable/ic_settings_advanced.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:pathData="M0 0h24v24H0z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M22.7 19l-9.1-9.1c.9-2.3 .4 -5-1.5-6.9-2-2-5-2.4-7.4-1.3L9 6 6 9 1.6 4.7C.4 7.1
+.9 10.1 2.9 12.1c1.9 1.9 4.6 2.4 6.9 1.5l9.1 9.1c.4 .4 1 .4 1.4 0l2.3-2.3c.5-.4
+.5 -1.1 .1 -1.4z" />
+</vector>
diff --git a/res/drawable/ic_settings_ae.xml b/res/drawable/ic_settings_ae.xml
new file mode 100644
index 000000000..965830a43
--- /dev/null
+++ b/res/drawable/ic_settings_ae.xml
@@ -0,0 +1,23 @@
+<?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 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.42
+0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8z" />
+ <path
+ android:pathData="M0 0h24v24H0z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M 10.761719,13.78125 l -1.8789065,0 -0.328125,1.0625 -1.4648438,0
+2.0859376,-5.6875 1.2890627,0 2.101562,5.6875 -1.472656,0 -0.332031,-1.0625 m
+-1.5507815,-1.058594 1.2226565,0 L 9.8203125,10.75 9.2109375,12.722656" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M 16.511719,12.433594 l -2.15625,0 0,1.355469 2.546875,0 0,1.054687 -3.917969,0
+0,-5.6875 3.925781,0 0,1.058594 -2.554687,0 0,1.199219 2.15625,0 0,1.019531" />
+</vector>
diff --git a/res/drawable/ic_settings_antibanding.xml b/res/drawable/ic_settings_antibanding.xml
new file mode 100644
index 000000000..fc78abb84
--- /dev/null
+++ b/res/drawable/ic_settings_antibanding.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="M19.51 3.08L3.08 19.51c.09 .34 .27 .65 .51 .9 .25 .24 .56 .42 .9 .51 L20.93
+4.49c-.19-.69-.73-1.23-1.42-1.41zM11.88 3L3 11.88v2.83L14.71 3h-2.83zM5 3c-1.1
+0-2 .9-2 2v2l4-4H5zm14 18c.55 0 1.05-.22 1.41-.59 .37 -.36 .59 -.86 .59
+-1.41v-2l-4 4h2zm-9.71 0h2.83L21 12.12V9.29L9.29 21z" />
+</vector>
diff --git a/res/drawable/ic_settings_auto_exposure.xml b/res/drawable/ic_settings_auto_exposure.xml
new file mode 100644
index 000000000..a5e157c5b
--- /dev/null
+++ b/res/drawable/ic_settings_auto_exposure.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="M15 17v2h2v-2h2v-2h-2v-2h-2v2h-2v2h2zm5-15H4c-1.1 0-2 .9-2 2v16c0 1.1 .9 2 2
+2h16c1.1 0 2-.9 2-2V4c0-1.1-.9-2-2-2zM5 5h6v2H5V5zm15 15H4L20 4v16z" />
+</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_bright_screen.xml b/res/drawable/ic_settings_bright_screen.xml
new file mode 100644
index 000000000..657584fc3
--- /dev/null
+++ b/res/drawable/ic_settings_bright_screen.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="M21 3H3c-1.1 0-2 .9-2 2v14c0 1.1 .9 2 2 2h18c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2zm0
+16.01H3V4.99h18v14.02zM8 16h2.5l1.5 1.5
+1.5-1.5H16v-2.5l1.5-1.5-1.5-1.5V8h-2.5L12 6.5 10.5 8H8v2.5L6.5 12 8
+13.5V16zm4-7c1.66 0 3 1.34 3 3s-1.34 3-3 3V9z" />
+</vector>
diff --git a/res/drawable/ic_settings_camera.xml b/res/drawable/ic_settings_camera.xml
new file mode 100644
index 000000000..1f823bbe9
--- /dev/null
+++ b/res/drawable/ic_settings_camera.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:height="24dp"
+ android:width="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M4,4H7L9,2H15L17,4H20A2,2 0 0,1 22,6V18A2,2 0 0,1 20,20H4A2,2 0 0,1 2,18V6A2,2 0 0,1 4,4M12,7A5,5 0 0,0 7,12A5,5 0 0,0 12,17A5,5 0 0,0 17,12A5,5 0 0,0 12,7M12,9A3,3 0 0,1 15,12A3,3 0 0,1 12,15A3,3 0 0,1 9,12A3,3 0 0,1 12,9Z" />
+</vector>
diff --git a/res/drawable/ic_settings_cds.xml b/res/drawable/ic_settings_cds.xml
new file mode 100644
index 000000000..778460a9c
--- /dev/null
+++ b/res/drawable/ic_settings_cds.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:pathData="M0 0h24v24H0z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M20 8.69V4h-4.69L12 .69 8.69 4H4v4.69L.69 12 4 15.31V20h4.69L12 23.31 15.31
+20H20v-4.69L23.31 12 20 8.69zM12 18c-.89 0-1.74-.2-2.5-.55C11.56 16.5 13 14.42
+13 12s-1.44-4.5-3.5-5.45C10.26 6.2 11.11 6 12 6c3.31 0 6 2.69 6 6s-2.69 6-6 6z" />
+</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_continuous.xml b/res/drawable/ic_settings_continuous.xml
new file mode 100644
index 000000000..9b1945e29
--- /dev/null
+++ b/res/drawable/ic_settings_continuous.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:fillColor="@color/white"
+ android:pathData="M15.96 10.29l-2.75 3.54-1.96-2.36L8.5 15h11l-3.54-4.71zM3 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_settings_contrast.xml b/res/drawable/ic_settings_contrast.xml
new file mode 100644
index 000000000..6a763c7cf
--- /dev/null
+++ b/res/drawable/ic_settings_contrast.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="M19 3H5c-1.1 0-2 .9-2 2v14c0 1.1 .9 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2zm0
+16l-7-8v8H5l7-8V5h7v14z" />
+</vector>
diff --git a/res/drawable/ic_settings_countdowntimer.xml b/res/drawable/ic_settings_countdowntimer.xml
new file mode 100644
index 000000000..887adeb24
--- /dev/null
+++ b/res/drawable/ic_settings_countdowntimer.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 0h24v24H0z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M15 1H9v2h6V1zm-4
+13h2V8h-2v6zm8.03-6.61l1.42-1.42c-.43-.51-.9-.99-1.41-1.41l-1.42 1.42C16.07 4.74
+14.12 4 12 4c-4.97 0-9 4.03-9 9s4.02 9 9 9 9-4.03
+9-9c0-2.12-.74-4.07-1.97-5.61zM12 20c-3.87 0-7-3.13-7-7s3.13-7 7-7 7 3.13 7
+7-3.13 7-7 7z" />
+</vector>
diff --git a/res/drawable/ic_settings_denoise.xml b/res/drawable/ic_settings_denoise.xml
new file mode 100644
index 000000000..99be11332
--- /dev/null
+++ b/res/drawable/ic_settings_denoise.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="M11 9h2v2h-2zm-2 2h2v2H9zm4 0h2v2h-2zm2-2h2v2h-2zM7 9h2v2H7zm12-6H5c-1.1 0-2
+.9-2 2v14c0 1.1 .9 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2zM9 18H7v-2h2v2zm4
+0h-2v-2h2v2zm4
+0h-2v-2h2v2zm2-7h-2v2h2v2h-2v-2h-2v2h-2v-2h-2v2H9v-2H7v2H5v-2h2v-2H5V5h14v6z" />
+ <path
+ android:pathData="M0 0h24v24H0z" />
+</vector>
diff --git a/res/drawable/ic_settings_duration.xml b/res/drawable/ic_settings_duration.xml
new file mode 100644
index 000000000..ad7cb0f26
--- /dev/null
+++ b/res/drawable/ic_settings_duration.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="M7.88 3.39L6.6 1.86 2 5.71l1.29 1.53 4.59-3.85zM22 5.72l-4.6-3.86-1.29 1.53 4.6
+3.86L22 5.72zM12 4c-4.97 0-9 4.03-9 9s4.02 9 9 9c4.97 0 9-4.03
+9-9s-4.03-9-9-9zm0 16c-3.87 0-7-3.13-7-7s3.13-7 7-7 7 3.13 7 7-3.13 7-7
+7zm1-11h-2v3H8v2h3v3h2v-3h3v-2h-3V9z" />
+</vector>
diff --git a/res/drawable/ic_settings_encoder_audio.xml b/res/drawable/ic_settings_encoder_audio.xml
new file mode 100644
index 000000000..b66ff6028
--- /dev/null
+++ b/res/drawable/ic_settings_encoder_audio.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="M6 3H3v3c1.66 0 3-1.34 3-3zm8 0h-2c0 4.97-4.03 9-9 9v2c6.08 0 11-4.93 11-11zm-4
+0H8c0 2.76-2.24 5-5 5v2c3.87 0 7-3.13 7-7zm0 18h2c0-4.97 4.03-9 9-9v-2c-6.07
+0-11 4.93-11 11zm8 0h3v-3c-1.66 0-3 1.34-3 3zm-4 0h2c0-2.76 2.24-5 5-5v-2c-3.87
+0-7 3.13-7 7z" />
+</vector>
diff --git a/res/drawable/ic_settings_encoder_video.xml b/res/drawable/ic_settings_encoder_video.xml
new file mode 100644
index 000000000..e6963d385
--- /dev/null
+++ b/res/drawable/ic_settings_encoder_video.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="M18 4l2 4h-3l-2-4h-2l2 4h-3l-2-4H8l2 4H7L5 4H4c-1.1 0-1.99 .9 -1.99 2L2 18c0 1.1
+.9 2 2 2h16c1.1 0 2-.9 2-2V4h-4z" />
+ <path
+ android:pathData="M0 0h24v24H0z" />
+</vector>
diff --git a/res/drawable/ic_settings_exposure.xml b/res/drawable/ic_settings_exposure.xml
new file mode 100644
index 000000000..9cd119f5d
--- /dev/null
+++ b/res/drawable/ic_settings_exposure.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:fillColor="@color/white"
+ android:pathData="M17 6c-3.31 0-6 2.69-6 6s2.69 6 6 6 6-2.69 6-6-2.69-6-6-6zM5 8c-2.21 0-4 1.79-4
+4s1.79 4 4 4 4-1.79 4-4-1.79-4-4-4zm0 6c-1.1 0-2-.9-2-2s.9-2 2-2 2 .9 2 2-.9 2-2
+2z" />
+</vector>
diff --git a/res/drawable/ic_settings_facerec.xml b/res/drawable/ic_settings_facerec.xml
new file mode 100644
index 000000000..46d43647b
--- /dev/null
+++ b/res/drawable/ic_settings_facerec.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="M9 11.75c-.69 0-1.25 .56 -1.25 1.25s.56 1.25 1.25 1.25 1.25-.56
+1.25-1.25-.56-1.25-1.25-1.25zm6 0c-.69 0-1.25 .56 -1.25 1.25s.56 1.25 1.25 1.25
+1.25-.56 1.25-1.25-.56-1.25-1.25-1.25zM12 2C6.48 2 2 6.48 2 12s4.48 10 10 10
+10-4.48 10-10S17.52 2 12 2zm0 18c-4.41 0-8-3.59-8-8 0-.29 .02 -.58 .05 -.86
+2.36-1.05 4.23-2.98 5.21-5.37C11.07 8.33 14.05 10 17.42 10c.78 0 1.53-.09
+2.25-.26 .21 .71 .33 1.47 .33 2.26 0 4.41-3.59 8-8 8z" />
+ <path
+ android:pathData="M0 0h24v24H0z" />
+</vector>
diff --git a/res/drawable/ic_settings_filter.xml b/res/drawable/ic_settings_filter.xml
new file mode 100644
index 000000000..9f0e4ed77
--- /dev/null
+++ b/res/drawable/ic_settings_filter.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_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_flash.xml b/res/drawable/ic_settings_flash.xml
new file mode 100644
index 000000000..5de3ba969
--- /dev/null
+++ b/res/drawable/ic_settings_flash.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="#FFFFFF"
+ android:pathData="M7 2v11h3v9l7-12h-4l4-8z" />
+</vector>
diff --git a/res/drawable/ic_settings_focus.xml b/res/drawable/ic_settings_focus.xml
new file mode 100644
index 000000000..5483d5475
--- /dev/null
+++ b/res/drawable/ic_settings_focus.xml
@@ -0,0 +1,20 @@
+<?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="M11 4.07V2.05c-2.01 .2 -3.84 1-5.32 2.21L7.1 5.69c1.11-.86 2.44-1.44
+3.9-1.62zm7.32 .19 C16.84 3.05 15.01 2.25 13 2.05v2.02c1.46 .18 2.79 .76 3.9
+1.62l1.42-1.43zM19.93 11h2.02c-.2-2.01-1-3.84-2.21-5.32L18.31 7.1c.86 1.11 1.44
+2.44 1.62 3.9zM5.69 7.1L4.26 5.68C3.05 7.16 2.25 8.99 2.05 11h2.02c.18-1.46 .76
+-2.79 1.62-3.9zM4.07 13H2.05c.2 2.01 1 3.84 2.21
+5.32l1.43-1.43c-.86-1.1-1.44-2.43-1.62-3.89zM15 12c0-1.66-1.34-3-3-3s-3 1.34-3 3
+1.34 3 3 3 3-1.34 3-3zm3.31 4.9l1.43 1.43c1.21-1.48 2.01-3.32
+2.21-5.32h-2.02c-.18 1.45-.76 2.78-1.62 3.89zM13 19.93v2.02c2.01-.2 3.84-1
+5.32-2.21l-1.43-1.43c-1.1 .86 -2.43 1.44-3.89 1.62zm-7.32-.19C7.16 20.95 9 21.75
+11 21.95v-2.02c-1.46-.18-2.79-.76-3.9-1.62l-1.42 1.43z" />
+</vector>
diff --git a/res/drawable/ic_settings_focus_time.xml b/res/drawable/ic_settings_focus_time.xml
new file mode 100644
index 000000000..f08fa3e1c
--- /dev/null
+++ b/res/drawable/ic_settings_focus_time.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:fillColor="@color/white"
+ android:pathData="M11.99 2C6.47 2 2 6.48 2 12s4.47 10 9.99 10C17.52 22 22 17.52 22 12S17.52 2
+11.99 2zM12 20c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8z" />
+ <path
+ android:pathData="M0 0h24v24H0z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M12.5 7H11v6l5.25 3.15 .75 -1.23-4.5-2.67z" />
+</vector>
diff --git a/res/drawable/ic_settings_focus_zone.xml b/res/drawable/ic_settings_focus_zone.xml
new file mode 100644
index 000000000..c6a2e29bb
--- /dev/null
+++ b/res/drawable/ic_settings_focus_zone.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="M16.21 4.16l4 4v-4zm4 12l-4 4h4zm-12
+4l-4-4v4zm-4-12l4-4h-4zm12.95-.95c-2.73-2.73-7.17-2.73-9.9 0s-2.73 7.17 0 9.9
+7.17 2.73 9.9 0 2.73-7.16 0-9.9zm-1.1 8.8c-2.13 2.13-5.57 2.13-7.7 0s-2.13-5.57
+0-7.7 5.57-2.13 7.7 0 2.13 5.57 0 7.7z" />
+ <path
+ android:pathData="M.21 .16 h24v24h-24z" />
+</vector>
diff --git a/res/drawable/ic_settings_format.xml b/res/drawable/ic_settings_format.xml
new file mode 100644
index 000000000..c5f897db0
--- /dev/null
+++ b/res/drawable/ic_settings_format.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="M21 19V5c0-1.1-.9-2-2-2H5c-1.1 0-2 .9-2 2v14c0 1.1 .9 2 2 2h14c1.1 0 2-.9
+2-2zM8.5 13.5l2.5 3.01L14.5 12l4.5 6H5l3.5-4.5z" />
+</vector>
diff --git a/res/drawable/ic_settings_fps.xml b/res/drawable/ic_settings_fps.xml
new file mode 100644
index 000000000..a94b5c35c
--- /dev/null
+++ b/res/drawable/ic_settings_fps.xml
@@ -0,0 +1,20 @@
+<?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 0h24v24H0V0z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M13.05 9.79L10 7.5v9l3.05-2.29L16 12zm0 0L10 7.5v9l3.05-2.29L16 12zm0 0L10
+7.5v9l3.05-2.29L16 12zM11 4.07V2.05c-2.01 .2 -3.84 1-5.32 2.21L7.1 5.69c1.11-.86
+2.44-1.44 3.9-1.62zM5.69 7.1L4.26 5.68C3.05 7.16 2.25 8.99 2.05 11h2.02c.18-1.46
+.76 -2.79 1.62-3.9zM4.07 13H2.05c.2 2.01 1 3.84 2.21
+5.32l1.43-1.43c-.86-1.1-1.44-2.43-1.62-3.89zm1.61 6.74C7.16 20.95 9 21.75 11
+21.95v-2.02c-1.46-.18-2.79-.76-3.9-1.62l-1.42 1.43zM22 12c0 5.16-3.92 9.42-8.95
+9.95v-2.02C16.97 19.41 20 16.05 20 12s-3.03-7.41-6.95-7.93V2.05C18.08 2.58 22
+6.84 22 12z" />
+</vector>
diff --git a/res/drawable/ic_settings_hdr_auto.xml b/res/drawable/ic_settings_hdr_auto.xml
new file mode 100644
index 000000000..9acbe8694
--- /dev/null
+++ b/res/drawable/ic_settings_hdr_auto.xml
@@ -0,0 +1,24 @@
+<?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 0h24v24H0V0z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M 19.473737,11.523243 v -1 c 0,-0.8000003 -0.7,-1.5000003 -1.5,-1.5000003 h -3.5
+v 6.0000003 h 1.5 v -2 h 1.1 l 0.9,2 h 1.5 l -0.9,-2.1 c 0.5,-0.3 0.9,-0.8
+0.9,-1.4 z m -1.5,0 h -2 v -1 h 2 v 1 z m -12.9999999,-0.5 h -2 V 9.0232427 h
+-1.5 v 6.0000003 h 1.5 v -2.5 h 2 v 2.5 h 1.5 V 9.0232427 h -1.5 V 11.023243 z M
+11.473737,9.0232427 H 7.9737371 v 6.0000003 h 3.4999999 c 0.8,0 1.5,-0.7
+1.5,-1.5 v -3 c 0,-0.8000003 -0.7,-1.5000003 -1.5,-1.5000003 z m 0,4.5000003 H
+9.4737372 v -3 h 1.9999998 v 3 z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M 22.210669,14.370909 l -1.174317,0 -0.205078,0.664062 -0.915527,0
+1.303711,-3.554687 0.805664,0 1.313476,3.554687 -0.92041,0 -0.207519,-0.664062 m
+-0.969239,-0.661621 0.76416,0 -0.3833,-1.232911 -0.38086,1.232911" />
+</vector>
diff --git a/res/drawable/ic_settings_histogram.xml b/res/drawable/ic_settings_histogram.xml
new file mode 100644
index 000000000..e7c9f1427
--- /dev/null
+++ b/res/drawable/ic_settings_histogram.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="M20 2H4c-1.1 0-2 .9-2 2v16c0 1.1 .9 2 2 2h16c1.1 0 2-.9 2-2V4c0-1.1-.9-2-2-2zM8
+20H4v-4h4v4zm0-6H4v-4h4v4zm0-6H4V4h4v4zm6
+12h-4v-4h4v4zm0-6h-4v-4h4v4zm0-6h-4V4h4v4zm6
+12h-4v-4h4v4zm0-6h-4v-4h4v4zm0-6h-4V4h4v4z" />
+</vector>
diff --git a/res/drawable/ic_settings_iso.xml b/res/drawable/ic_settings_iso.xml
new file mode 100644
index 000000000..5292fa9da
--- /dev/null
+++ b/res/drawable/ic_settings_iso.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:fillColor="@color/white"
+ android:pathData="M19 3H5c-1.1 0-2 .9-2 2v14c0 1.1 .9 2 2 2h14c1.1 0 2-.9
+2-2V5c0-1.1-.9-2-2-2zM5.5 7.5h2v-2H9v2h2V9H9v2H7.5V9h-2V7.5zM19 19H5L19
+5v14zm-2-2v-1.5h-5V17h5z" />
+</vector>
diff --git a/res/drawable/ic_settings_lightsource.xml b/res/drawable/ic_settings_lightsource.xml
new file mode 100644
index 000000000..421ef259f
--- /dev/null
+++ b/res/drawable/ic_settings_lightsource.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 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm-1
+17.93c-3.94-.49-7-3.85-7-7.93s3.05-7.44 7-7.93v15.86zm2-15.86c1.03 .13 2 .45
+2.87 .93 H13v-.93zM13 7h5.24c.25 .31 .48 .65 .68 1H13V7zm0 3h6.74c.08 .33 .15
+.66 .19 1H13v-1zm0 9.93V19h2.87c-.87 .48 -1.84 .8 -2.87 .93 zM18.24
+17H13v-1h5.92c-.2 .35 -.43 .69 -.68 1zm1.5-3H13v-1h6.93c-.04 .34 -.11 .67 -.19
+1z" />
+</vector>
diff --git a/res/drawable/ic_settings_location.xml b/res/drawable/ic_settings_location.xml
new file mode 100644
index 000000000..9151b8a38
--- /dev/null
+++ b/res/drawable/ic_settings_location.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="M12 2C8.13 2 5 5.13 5 9c0 5.25 7 13 7 13s7-7.75 7-13c0-3.87-3.13-7-7-7zm0
+9.5c-1.38 0-2.5-1.12-2.5-2.5s1.12-2.5 2.5-2.5 2.5 1.12 2.5 2.5-1.12 2.5-2.5 2.5z" />
+ <path
+ android:pathData="M0 0h24v24H0z" />
+</vector>
diff --git a/res/drawable/ic_settings_manualexp.xml b/res/drawable/ic_settings_manualexp.xml
new file mode 100644
index 000000000..0518a2f7e
--- /dev/null
+++ b/res/drawable/ic_settings_manualexp.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:pathData="M0 0h24v24H0z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M5 8c-2.21 0-4 1.79-4 4s1.79 4 4 4 4-1.79 4-4-1.79-4-4-4zm12-2c-3.31 0-6 2.69-6
+6s2.69 6 6 6 6-2.69 6-6-2.69-6-6-6zm0 10c-2.21 0-4-1.79-4-4s1.79-4 4-4 4 1.79 4
+4-1.79 4-4 4z" />
+</vector>
diff --git a/res/drawable/ic_settings_manualfocus.xml b/res/drawable/ic_settings_manualfocus.xml
new file mode 100644
index 000000000..f337bd7b5
--- /dev/null
+++ b/res/drawable/ic_settings_manualfocus.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:pathData="M0 0h24v24H0z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M12 8c-2.21 0-4 1.79-4 4s1.79 4 4 4 4-1.79 4-4-1.79-4-4-4zm-7 7H3v4c0 1.1 .9 2 2
+2h4v-2H5v-4zM5 5h4V3H5c-1.1 0-2 .9-2
+2v4h2V5zm14-2h-4v2h4v4h2V5c0-1.1-.9-2-2-2zm0 16h-4v2h4c1.1 0 2-.9 2-2v-4h-2v4z" />
+</vector>
diff --git a/res/drawable/ic_settings_picturesize.xml b/res/drawable/ic_settings_picturesize.xml
new file mode 100644
index 000000000..268781633
--- /dev/null
+++ b/res/drawable/ic_settings_picturesize.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 12h-2v3h-3v2h5v-5zM7 9h3V7H5v5h2V9zm14-6H3c-1.1 0-2 .9-2 2v14c0 1.1 .9 2 2
+2h18c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2zm0 16.01H3V4.99h18v14.02z" />
+ <path
+ android:pathData="M0 0h24v24H0z" />
+</vector>
diff --git a/res/drawable/ic_settings_powermode.xml b/res/drawable/ic_settings_powermode.xml
new file mode 100644
index 000000000..5fd679d09
--- /dev/null
+++ b/res/drawable/ic_settings_powermode.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:height="24dp"
+ android:width="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M16,7V3H14V7H10V3H8V7H8C7,7 6,8 6,9V14.5L9.5,18V21H14.5V18L18,14.5V9C18,8 17,7 16,7Z" />
+</vector>
diff --git a/res/drawable/ic_settings_powershutter.xml b/res/drawable/ic_settings_powershutter.xml
new file mode 100644
index 000000000..1f457adb5
--- /dev/null
+++ b/res/drawable/ic_settings_powershutter.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:pathData="M0 0h24v24H0z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M13 3h-2v10h2V3zm4.83 2.17l-1.42 1.42C17.99 7.86 19 9.81 19 12c0 3.87-3.13 7-7
+7s-7-3.13-7-7c0-2.19 1.01-4.14 2.58-5.42L6.17 5.17C4.23 6.82 3 9.26 3 12c0 4.97
+4.03 9 9 9s9-4.03 9-9c0-2.74-1.23-5.18-3.17-6.83z" />
+</vector>
diff --git a/res/drawable/ic_settings_quality.xml b/res/drawable/ic_settings_quality.xml
new file mode 100644
index 000000000..6d76669a6
--- /dev/null
+++ b/res/drawable/ic_settings_quality.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="M24 24H0V0h24v24z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M21 15h2v2h-2v-2zm0-4h2v2h-2v-2zm2 8h-2v2c1 0 2-1 2-2zM13 3h2v2h-2V3zm8
+4h2v2h-2V7zm0-4v2h2c0-1-1-2-2-2zM1 7h2v2H1V7zm16-4h2v2h-2V3zm0 16h2v2h-2v-2zM3
+3C2 3 1 4 1 5h2V3zm6 0h2v2H9V3zM5 3h2v2H5V3zm-4 8v8c0 1.1 .9 2 2 2h12V11H1zm2
+8l2.5-3.21 1.79 2.15 2.5-3.22L13 19H3z" />
+</vector>
diff --git a/res/drawable/ic_settings_redeye.xml b/res/drawable/ic_settings_redeye.xml
new file mode 100644
index 000000000..0cea289af
--- /dev/null
+++ b/res/drawable/ic_settings_redeye.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="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_redeye_preference.xml b/res/drawable/ic_settings_redeye_preference.xml
new file mode 100644
index 000000000..9f5aed6e5
--- /dev/null
+++ b/res/drawable/ic_settings_redeye_preference.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/black"
+ 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_rotation.xml b/res/drawable/ic_settings_rotation.xml
new file mode 100644
index 000000000..64298eadc
--- /dev/null
+++ b/res/drawable/ic_settings_rotation.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="M7.34,6.41 L0.86,12.9 L7.35,19.38 L13.84,12.9 L7.34,6.41 Z M3.69,12.9 L7.35,9.24
+L11,12.9 L7.34,16.56 L3.69,12.9 Z M19.36,6.64 C17.61,4.88,15.3,4,13,4 L13,0.76
+L8.76,5 L13,9.24 L13,6 C14.79,6,16.58,6.68,17.95,8.05
+C20.68,10.78,20.68,15.22,17.95,17.95 C16.58,19.32,14.79,20,13,20
+C12.03,20,11.06,19.79,10.16,19.39 L8.67,20.88 C10.02,21.62,11.51,22,13,22
+C15.3,22,17.61,21.12,19.36,19.36 C22.88,15.85,22.88,10.15,19.36,6.64 Z" />
+ <path
+ android:pathData="M0,0 L24,0 L24,24 L0,24 Z" />
+</vector>
diff --git a/res/drawable/ic_settings_saturation.xml b/res/drawable/ic_settings_saturation.xml
new file mode 100644
index 000000000..399be99ba
--- /dev/null
+++ b/res/drawable/ic_settings_saturation.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:pathData="M0 0h24v24H0z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M20.71 5.63l-2.34-2.34c-.39-.39-1.02-.39-1.41 0l-3.12 3.12-1.93-1.91-1.41 1.41
+1.42 1.42L3 16.25V21h4.75l8.92-8.92 1.42 1.42 1.41-1.41-1.92-1.92
+3.12-3.12c.4-.4 .4 -1.03 .01 -1.42zM6.92 19L5 17.08l8.06-8.06 1.92 1.92L6.92 19z" />
+</vector>
diff --git a/res/drawable/ic_settings_scenemode.xml b/res/drawable/ic_settings_scenemode.xml
new file mode 100644
index 000000000..e2481b396
--- /dev/null
+++ b/res/drawable/ic_settings_scenemode.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="M17.13 8.9l.59-1.3 1.3-.6-1.3-.59-.59-1.3-.59 1.3-1.31 .59 1.31 .6
+zm-4.74-2.37l-1.18 2.61-2.61 1.18 2.61 1.18 1.18 2.61 1.19-2.61
+2.6-1.18-2.6-1.18zM19.02 10v9H5V5h9V3H5.02c-1.1 0-2 .9-2 2v14c0 1.1 .9 2 2
+2h14c1.1 0 2-.9 2-2v-9h-2z" />
+</vector>
diff --git a/res/drawable/ic_settings_selfiemirror.png b/res/drawable/ic_settings_selfiemirror.png
deleted file mode 100644
index 7d99f5c2c..000000000
--- a/res/drawable/ic_settings_selfiemirror.png
+++ /dev/null
Binary files differ
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_sharpness.xml b/res/drawable/ic_settings_sharpness.xml
new file mode 100644
index 000000000..dd186c9dc
--- /dev/null
+++ b/res/drawable/ic_settings_sharpness.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 19h2v2h-2v-2zm0-2h2v-2h-2v2zM3 13h2v-2H3v2zm0
+4h2v-2H3v2zm0-8h2V7H3v2zm0-4h2V3H3v2zm4 0h2V3H7v2zm8 16h2v-2h-2v2zm-4
+0h2v-2h-2v2zm4 0h2v-2h-2v2zm-8 0h2v-2H7v2zm-4 0h2v-2H3v2zM21
+8c0-2.76-2.24-5-5-5h-5v2h5c1.65 0 3 1.35 3 3v5h2V8z" />
+</vector>
diff --git a/res/drawable/ic_settings_size.xml b/res/drawable/ic_settings_size.xml
new file mode 100644
index 000000000..9a4b4f727
--- /dev/null
+++ b/res/drawable/ic_settings_size.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,0 L24,0 L24,24 L0,24 Z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M21,6 L3,6 C1.9,6,1,6.9,1,8 L1,16 C1,17.1,1.9,18,3,18 L21,18
+C22.1,18,23,17.1,23,16 L23,8 C23,6.9,22.1,6,21,6 Z M21,16 L3,16 L3,8 L5,8 L5,12
+L7,12 L7,8 L9,8 L9,12 L11,12 L11,8 L13,8 L13,12 L15,12 L15,8 L17,8 L17,12 L19,12
+L19,8 L21,8 L21,16 Z" />
+</vector>
diff --git a/res/drawable/ic_settings_skin.xml b/res/drawable/ic_settings_skin.xml
new file mode 100644
index 000000000..9e8046473
--- /dev/null
+++ b/res/drawable/ic_settings_skin.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 0h24v24H0z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M11.99 2C6.47 2 2 6.48 2 12s4.47 10 9.99 10C17.52 22 22 17.52 22 12S17.52 2
+11.99 2zM12 20c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8zm3.5-9c.83 0
+1.5-.67 1.5-1.5S16.33 8 15.5 8 14 8.67 14 9.5s.67 1.5 1.5 1.5zm-7 0c.83 0
+1.5-.67 1.5-1.5S9.33 8 8.5 8 7 8.67 7 9.5 7.67 11 8.5 11zm3.5 6.5c2.33 0
+4.31-1.46 5.11-3.5H6.89c.8 2.04 2.78 3.5 5.11 3.5z" />
+</vector>
diff --git a/res/drawable/ic_settings_sound.xml b/res/drawable/ic_settings_sound.xml
new file mode 100644
index 000000000..4eeb9fd8c
--- /dev/null
+++ b/res/drawable/ic_settings_sound.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 9v6h4l5 5V4L7 9H3zm13.5 3c0-1.77-1.02-3.29-2.5-4.03v8.05c1.48-.73 2.5-2.25
+2.5-4.02zM14 3.23v2.06c2.89 .86 5 3.54 5 6.71s-2.11 5.85-5 6.71v2.06c4.01-.91
+7-4.49 7-8.77s-2.99-7.86-7-8.77z" />
+ <path
+ android:pathData="M0 0h24v24H0z" />
+</vector>
diff --git a/res/drawable/ic_settings_stabilization.xml b/res/drawable/ic_settings_stabilization.xml
new file mode 100644
index 000000000..0ec3ca4aa
--- /dev/null
+++ b/res/drawable/ic_settings_stabilization.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:fillColor="@color/white"
+ android:pathData="M23,5.5 L23,20 C23,22.2,21.2,24,19,24 L11.7,24 C10.62,24,9.6,23.57,8.85,22.81
+L1,14.83 S2.26,13.6,2.3,13.58 C2.52,13.39,2.79,13.29,3.09,13.29
+C3.31,13.29,3.51,13.35,3.69,13.45 C3.73,13.46,8,15.91,8,15.91 L8,4
+C8,3.17,8.67,2.5,9.5,2.5 S11,3.17,11,4 L11,11 L12,11 L12,1.5
+C12,0.67,12.67,0,13.5,0 S15,0.67,15,1.5 L15,11 L16,11 L16,2.5
+C16,1.67,16.67,1,17.5,1 S19,1.67,19,2.5 L19,11 L20,11 L20,5.5
+C20,4.67,20.67,4,21.5,4 S23,4.67,23,5.5 Z" />
+</vector>
diff --git a/res/drawable/ic_settings_storage.xml b/res/drawable/ic_settings_storage.xml
new file mode 100644
index 000000000..a880b4207
--- /dev/null
+++ b/res/drawable/ic_settings_storage.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="M18 2h-8L4.02 8 4 20c0 1.1 .9 2 2 2h12c1.1 0 2-.9 2-2V4c0-1.1-.9-2-2-2zm-6
+6h-2V4h2v4zm3 0h-2V4h2v4zm3 0h-2V4h2v4z" />
+</vector>
diff --git a/res/drawable/ic_settings_timelapse.xml b/res/drawable/ic_settings_timelapse.xml
new file mode 100644
index 000000000..e7736cebc
--- /dev/null
+++ b/res/drawable/ic_settings_timelapse.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,0 L24,0 L24,24 L0,24 Z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M16.24,7.76 C15.07,6.59,13.54,6,12,6 L12,12 L7.76,16.24
+C10.1,18.58,13.9,18.58,16.25,16.24 C18.59,13.9,18.59,10.1,16.24,7.76 Z M12,2
+C6.48,2,2,6.48,2,12 S6.48,22,12,22 S22,17.52,22,12 S17.52,2,12,2 Z M12,20
+C7.58,20,4,16.42,4,12 S7.58,4,12,4 S20,7.58,20,12 S16.42,20,12,20 Z" />
+</vector>
diff --git a/res/drawable/ic_settings_tnr.xml b/res/drawable/ic_settings_tnr.xml
new file mode 100644
index 000000000..aaba7c2f3
--- /dev/null
+++ b/res/drawable/ic_settings_tnr.xml
@@ -0,0 +1,32 @@
+<?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,0 L24,0 L24,24 L0,24 L0,0 Z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M17.3008,12.8359 L16.5586,12.8359 L16.5586,14.8437 L15.1875,14.8437
+L15.1875,9.1562 L17.4258,9.1562 C17.7539,9.15621,18.0508,9.19397,18.3164,9.26948
+C18.582,9.3424,18.8086,9.45178,18.9961,9.5976
+C19.1836,9.74083,19.3268,9.91922,19.4258,10.1328
+C19.5274,10.3463,19.5781,10.5937,19.5781,10.875
+C19.5781,11.0938,19.5547,11.2891,19.5078,11.4609
+C19.4609,11.6302,19.3932,11.7799,19.3047,11.9101
+C19.2188,12.0377,19.1146,12.1497,18.9922,12.246
+C18.8698,12.3398,18.7344,12.4218,18.586,12.4921 L19.7735,14.7851
+L19.7735,14.8437 L18.3047,14.8437 L17.3008,12.8359 M16.5586,11.7773
+L17.4258,11.7773 C17.6862,11.7773,17.8815,11.7096,18.0117,11.5742
+C18.1445,11.4362,18.2109,11.2448,18.2109,11
+C18.2109,10.7552,18.1445,10.5638,18.0117,10.4258
+C17.8789,10.2852,17.6836,10.2149,17.4258,10.2149 L16.5586,10.2149
+L16.5586,11.7774 M14.3125,14.8438 L12.9492,14.8438 L10.9336,11.3047
+L10.9336,14.8438 L9.56251,14.8438 L9.56251,9.1563 L10.9336,9.1563
+L12.9453,12.6954 L12.9453,9.15634 L14.3125,9.15634 L14.3125,14.8438
+M8.98047,10.2149 L7.27344,10.2149 L7.27344,14.8438 L5.90235,14.8438
+L5.90235,10.2149 L4.22657,10.2149 L4.22657,9.15631 L8.98048,9.15631
+L8.98048,10.2149" />
+</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_settings_wb.xml b/res/drawable/ic_settings_wb.xml
new file mode 100644
index 000000000..e688c744c
--- /dev/null
+++ b/res/drawable/ic_settings_wb.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="M6.85 12.65h2.3L8 9l-1.15 3.65zM22 7l-1.2 6.29L19.3 7h-1.6l-1.49 6.29L15
+7h-.76C12.77 5.17 10.53 4 8 4c-4.42 0-8 3.58-8 8s3.58 8 8 8c3.13 0 5.84-1.81
+7.15-4.43l.1 .43 H17l1.5-6.1L20 16h1.75l2.05-9H22zm-11.7 9l-.7-2H6.4l-.7 2H3.8L7
+7h2l3.2 9h-1.9z" />
+</vector>
diff --git a/res/drawable/ic_settings_zoom.xml b/res/drawable/ic_settings_zoom.xml
new file mode 100644
index 000000000..b43d55b99
--- /dev/null
+++ b/res/drawable/ic_settings_zoom.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:height="24dp"
+ android:width="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M9.5,3A6.5,6.5 0 0,1 16,9.5C16,11.11 15.41,12.59 14.44,13.73L14.71,14H15.5L20.5,19L19,20.5L14,15.5V14.71L13.73,14.44C12.59,15.41 11.11,16 9.5,16A6.5,6.5 0 0,1 3,9.5A6.5,6.5 0 0,1 9.5,3M9.5,5C7,5 5,7 5,9.5C5,12 7,14 9.5,14C12,14 14,12 14,9.5C14,7 12,5 9.5,5Z" />
+</vector>
diff --git a/res/drawable/ic_settings_zsl.xml b/res/drawable/ic_settings_zsl.xml
new file mode 100644
index 000000000..e893e6674
--- /dev/null
+++ b/res/drawable/ic_settings_zsl.xml
@@ -0,0 +1,71 @@
+<?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,0 L24,0 L24,24 L0,24 Z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M6.80859,13.7891 L9.52734,13.7891 L9.52734,14.8438 L5.09765,14.8438
+L5.09765,14.1211 L7.80859,10.2149 L5.08203,10.2149 L5.08203,9.15631 L9.5,9.15631
+L9.5,9.85943 L6.80859,13.7891" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M13.0781,13.332 C13.0781,13.2435,13.0651,13.164,13.039,13.0937
+C13.0156,13.0208,12.9674,12.9531,12.8945,12.8906
+C12.8216,12.8255,12.7187,12.7617,12.5859,12.6992
+C12.4557,12.6367,12.2838,12.5703,12.0703,12.5
+C11.8203,12.4167,11.5794,12.3229,11.3476,12.2188
+C11.1158,12.1146,10.9101,11.9909,10.7304,11.8477
+C10.5507,11.7045,10.4062,11.5378,10.2968,11.3477
+C10.19,11.155,10.1366,10.931,10.1366,10.6758
+C10.1366,10.431,10.1913,10.211,10.3007,10.0156
+C10.4101,9.81769,10.5624,9.64972,10.7577,9.51169
+C10.953,9.37367,11.1835,9.2669,11.4491,9.19138
+C11.7173,9.11587,12.009,9.0781,12.3241,9.0781
+C12.634,9.07811,12.9191,9.11977,13.1796,9.2031
+C13.44,9.28644,13.664,9.40493,13.8515,9.55857
+C14.039,9.71222,14.1848,9.89842,14.289,10.1172
+C14.3958,10.3334,14.4492,10.5755,14.4492,10.8438 L13.082,10.8438
+C13.082,10.737,13.0651,10.6394,13.0312,10.5508
+C13,10.4597,12.9505,10.3828,12.8828,10.3203
+C12.8177,10.2552,12.7357,10.2044,12.6367,10.168
+C12.5403,10.1315,12.4258,10.1133,12.2929,10.1133
+C12.1627,10.1133,12.0481,10.1289,11.9491,10.1602
+C11.8501,10.1889,11.7668,10.2305,11.6991,10.2852
+C11.634,10.3373,11.5845,10.3985,11.5507,10.4688
+C11.5168,10.5365,11.4999,10.6094,11.4999,10.6875
+C11.4999,10.7734,11.5233,10.8516,11.5702,10.9219
+C11.6197,10.9896,11.6887,11.0547,11.7772,11.1172
+C11.8683,11.1771,11.9777,11.2344,12.1053,11.2891
+C12.2355,11.3412,12.3813,11.3933,12.5428,11.4453
+C12.8449,11.5417,13.1144,11.6484,13.3514,11.7656
+C13.5884,11.8828,13.7876,12.0169,13.9491,12.1679
+C14.1132,12.3189,14.2369,12.4895,14.3202,12.6796
+C14.4061,12.8697,14.4491,13.0845,14.4491,13.3241
+C14.4491,13.5793,14.3983,13.8072,14.2968,14.0077
+C14.1978,14.2056,14.0559,14.3723,13.871,14.5077
+C13.6887,14.6431,13.4673,14.746,13.2069,14.8163
+C12.9491,14.8866,12.6613,14.9218,12.3436,14.9218
+C12.1483,14.9218,11.9543,14.9049,11.7616,14.871
+C11.5689,14.8398,11.384,14.7903,11.2069,14.7226
+C11.0324,14.6549,10.8684,14.5703,10.7147,14.4687
+C10.5638,14.3646,10.4323,14.2409,10.3203,14.0977
+C10.2109,13.9544,10.1237,13.7917,10.0586,13.6094
+C9.99609,13.4271,9.96484,13.224,9.96484,13 L11.3398,13
+C11.3398,13.1667,11.3619,13.3073,11.4062,13.4219
+C11.4505,13.5339,11.5156,13.625,11.6015,13.6953
+C11.6874,13.7656,11.7916,13.8164,11.914,13.8476
+C12.039,13.8763,12.1822,13.8906,12.3437,13.8906
+C12.4739,13.8906,12.5846,13.8763,12.6757,13.8476
+C12.7695,13.8163,12.8463,13.776,12.9062,13.7265
+C12.9661,13.6744,13.0091,13.6145,13.0351,13.5468
+C13.0637,13.4791,13.0781,13.4075,13.0781,13.332" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M16.5313,13.7891 L18.918,13.7891 L18.918,14.8438 L15.1602,14.8438
+L15.1602,9.1563 L16.5313,9.1563 L16.5313,13.7891" />
+</vector>
diff --git a/res/drawable/ic_switch_back.xml b/res/drawable/ic_switch_back.xml
new file mode 100644
index 000000000..85504d616
--- /dev/null
+++ b/res/drawable/ic_switch_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:fillColor="@color/white"
+ android:pathData="M10 20H5v2h5v2l3-3-3-3v2zm4 0v2h5v-2h-5zm3-20H7C5.9 0 5 .9 5 2v14c0 1.1 .9 2 2
+2h10c1.1 0 2-.9 2-2V2c0-1.1-.9-2-2-2zm-5 6c-1.11 0-2-.9-2-2s.89-2 1.99-2 2 .9 2
+2C14 5.1 13.1 6 12 6z" />
+</vector>
diff --git a/res/drawable/ic_switch_camera.xml b/res/drawable/ic_switch_camera.xml
new file mode 100644
index 000000000..7dfd1f211
--- /dev/null
+++ b/res/drawable/ic_switch_camera.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="32dp"
+ android:height="32dp"
+ 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" />
+</vector>
diff --git a/res/drawable/ic_switch_front.xml b/res/drawable/ic_switch_front.xml
new file mode 100644
index 000000000..c2bc25110
--- /dev/null
+++ b/res/drawable/ic_switch_front.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:fillColor="@color/white"
+ android:pathData="M10 20H5v2h5v2l3-3-3-3v2zm4 0v2h5v-2h-5zM12 8c1.1 0 2-.9 2-2s-.9-2-2-2-1.99 .9
+-1.99 2S10.9 8 12 8zm5-8H7C5.9 0 5 .9 5 2v14c0 1.1 .9 2 2 2h10c1.1 0 2-.9
+2-2V2c0-1.1-.9-2-2-2zM7 2h10v10.5c0-1.67-3.33-2.5-5-2.5s-5 .83-5 2.5V2z" />
+</vector>
diff --git a/res/drawable/ic_switch_pan.xml b/res/drawable/ic_switch_pan.xml
new file mode 100644
index 000000000..cbce6ba87
--- /dev/null
+++ b/res/drawable/ic_switch_pan.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="32dp"
+ android:height="32dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M23 18V6c0-1.1-.9-2-2-2H3c-1.1 0-2 .9-2 2v12c0 1.1 .9 2 2 2h18c1.1 0 2-.9
+2-2zM8.5 12.5l2.5 3.01L14.5 11l4.5 6H5l3.5-4.5z" />
+</vector>
diff --git a/res/drawable/ic_switch_video.xml b/res/drawable/ic_switch_video.xml
new file mode 100644
index 000000000..e4dbbe9d2
--- /dev/null
+++ b/res/drawable/ic_switch_video.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="32dp"
+ android:height="32dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <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/ic_timer.xml b/res/drawable/ic_timer.xml
new file mode 100644
index 000000000..887adeb24
--- /dev/null
+++ b/res/drawable/ic_timer.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 0h24v24H0z" />
+ <path
+ android:fillColor="@color/white"
+ android:pathData="M15 1H9v2h6V1zm-4
+13h2V8h-2v6zm8.03-6.61l1.42-1.42c-.43-.51-.9-.99-1.41-1.41l-1.42 1.42C16.07 4.74
+14.12 4 12 4c-4.97 0-9 4.03-9 9s4.02 9 9 9 9-4.03
+9-9c0-2.12-.74-4.07-1.97-5.61zM12 20c-3.87 0-7-3.13-7-7s3.13-7 7-7 7 3.13 7
+7-3.13 7-7 7z" />
+</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/list_border.xml b/res/drawable/list_border.xml
index 1ab11ddfe..7d05a087f 100644
--- a/res/drawable/list_border.xml
+++ b/res/drawable/list_border.xml
@@ -29,7 +29,7 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle" >
- <solid android:color="@color/setting_color" />
+ <solid android:color="@color/popup_background" />
<stroke
android:width="1dip"
diff --git a/res/drawable/one_ui_shutter_1.png b/res/drawable/one_ui_shutter_1.png
deleted file mode 100644
index 46771e0cc..000000000
--- a/res/drawable/one_ui_shutter_1.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable/one_ui_shutter_2.png b/res/drawable/one_ui_shutter_2.png
deleted file mode 100644
index 07e1f72de..000000000
--- a/res/drawable/one_ui_shutter_2.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable/one_ui_shutter_3.png b/res/drawable/one_ui_shutter_3.png
deleted file mode 100644
index 503135797..000000000
--- a/res/drawable/one_ui_shutter_3.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable/one_ui_shutter_4.png b/res/drawable/one_ui_shutter_4.png
deleted file mode 100644
index 9d3f565af..000000000
--- a/res/drawable/one_ui_shutter_4.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable/one_ui_shutter_5.png b/res/drawable/one_ui_shutter_5.png
deleted file mode 100644
index df6ccd79f..000000000
--- a/res/drawable/one_ui_shutter_5.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable/one_ui_shutter_6.png b/res/drawable/one_ui_shutter_6.png
deleted file mode 100644
index 5165ef2c5..000000000
--- a/res/drawable/one_ui_shutter_6.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable/one_ui_shutter_anim.xml b/res/drawable/one_ui_shutter_anim.xml
deleted file mode 100644
index 980b9adad..000000000
--- a/res/drawable/one_ui_shutter_anim.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) 2016, The Linux Foundation. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above
- copyright notice, this list of conditions and the following
- disclaimer in the documentation and/or other materials provided
- with the distribution.
- * Neither the name of The Linux Foundation nor the names of its
- contributors may be used to endorse or promote products derived
- from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
- BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
- IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--->
-<animation-list xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/shutter_button_pressed"
- android:oneshot="true" >
-
- <item
- android:drawable="@drawable/photo_capture"
- android:duration="16"/>
- <item
- android:drawable="@drawable/one_ui_shutter_6"
- android:duration="16"/>
- <item
- android:drawable="@drawable/one_ui_shutter_5"
- android:duration="16"/>
- <item
- android:drawable="@drawable/one_ui_shutter_4"
- android:duration="16"/>
- <item
- android:drawable="@drawable/one_ui_shutter_3"
- android:duration="16"/>
- <item
- android:drawable="@drawable/one_ui_shutter_2"
- android:duration="16"/>
- <item
- android:drawable="@drawable/one_ui_shutter_1"
- android:duration="16"/>
- <item
- android:drawable="@drawable/one_ui_shutter_2"
- android:duration="16"/>
- <item
- android:drawable="@drawable/one_ui_shutter_3"
- android:duration="16"/>
- <item
- android:drawable="@drawable/one_ui_shutter_4"
- android:duration="16"/>
- <item
- android:drawable="@drawable/one_ui_shutter_5"
- android:duration="16"/>
- <item
- android:drawable="@drawable/one_ui_shutter_6"
- android:duration="16"/>
- <item
- android:drawable="@drawable/photo_capture"
- android:duration="16"/>
-</animation-list>
diff --git a/res/drawable/photo_capture.png b/res/drawable/photo_capture.png
deleted file mode 100644
index 89cdb9a8f..000000000
--- a/res/drawable/photo_capture.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable/photopage_bottom_button_background.xml b/res/drawable/photopage_bottom_button_background.xml
deleted file mode 100644
index 0c772ad21..000000000
--- a/res/drawable/photopage_bottom_button_background.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:drawable="@android:color/holo_blue_light" android:state_pressed="true"/>
- <item android:drawable="@color/button_dark_transparent_background" android:state_selected="false"/>
-</selector>
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/drawable/list_selector.xml b/res/drawable/scene_filter_item_bg.xml
index ada9b365a..2e2b06343 100644
--- a/res/drawable/list_selector.xml
+++ b/res/drawable/scene_filter_item_bg.xml
@@ -28,7 +28,7 @@
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:drawable="@color/setting_color_light" android:state_pressed="true"/>
+ <item android:drawable="@color/scene_item_selected" android:state_activated="true"/>
<item android:drawable="@android:color/transparent"/>
</selector>
diff --git a/res/drawable/scene_mode_view_border_selected.xml b/res/drawable/scene_mode_view_border_selected.xml
deleted file mode 100644
index 535e2d168..000000000
--- a/res/drawable/scene_mode_view_border_selected.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) 2014, The Linux Foundation. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above
- copyright notice, this list of conditions and the following
- disclaimer in the documentation and/or other materials provided
- with the distribution.
- * Neither the name of The Linux Foundation nor the names of its
- contributors may be used to endorse or promote products derived
- from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
- BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
- IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--->
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
- android:shape="rectangle" >
-
- <stroke
- android:width="1dip"
- android:color="#cc33b5e5" />
-
-</shape>
diff --git a/res/drawable/scene_mode_view_border.xml b/res/drawable/setting_list_item_bg.xml
index 68431ece6..079f036c0 100644
--- a/res/drawable/scene_mode_view_border.xml
+++ b/res/drawable/setting_list_item_bg.xml
@@ -26,11 +26,11 @@
OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-->
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
- android:shape="rectangle" >
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <stroke
- android:width="1dip"
- android:color="#cc000000" />
+ <item android:drawable="@color/setting_list_pressed" android:state_pressed="true"/>
+ <item android:drawable="@color/setting_list_selected" android:state_checked="true"/>
+ <item android:drawable="@color/setting_list_selected" android:state_activated="true"/>
+ <item android:drawable="@android:color/transparent"/>
-</shape>
+</selector>
diff --git a/res/drawable/setting_picker.xml b/res/drawable/setting_picker.xml
deleted file mode 100644
index c3bff41ea..000000000
--- a/res/drawable/setting_picker.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
- 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_checked="true"
- android:drawable="@drawable/list_pressed_holo_light" />
- <item android:drawable="@android:color/transparent" />
-</selector>
diff --git a/res/drawable/shutter_button_anim.xml b/res/drawable/shutter_button_anim.xml
deleted file mode 100644
index 914977244..000000000
--- a/res/drawable/shutter_button_anim.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) 2014, The Linux Foundation. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above
- copyright notice, this list of conditions and the following
- disclaimer in the documentation and/or other materials provided
- with the distribution.
- * Neither the name of The Linux Foundation nor the names of its
- contributors may be used to endorse or promote products derived
- from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
- BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
- IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--->
-<animation-list xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/shutter_button_pressed"
- android:oneshot="true" >
-
- <item
- android:drawable="@drawable/shutter_button_0"
- android:duration="33"/>
- <item
- android:drawable="@drawable/shutter_button_1"
- android:duration="33"/>
- <item
- android:drawable="@drawable/shutter_button_2"
- android:duration="33"/>
- <item
- android:drawable="@drawable/shutter_button_3"
- android:duration="33"/>
- <item
- android:drawable="@drawable/shutter_button_4"
- android:duration="33"/>
- <item
- android:drawable="@drawable/shutter_button_5"
- android:duration="33"/>
- <item
- android:drawable="@drawable/shutter_button_6"
- android:duration="33"/>
- <item
- android:drawable="@drawable/shutter_button_5"
- android:duration="33"/>
- <item
- android:drawable="@drawable/shutter_button_4"
- android:duration="33"/>
- <item
- android:drawable="@drawable/shutter_button_3"
- android:duration="33"/>
- <item
- android:drawable="@drawable/shutter_button_2"
- android:duration="33"/>
- <item
- android:drawable="@drawable/shutter_button_1"
- android:duration="33"/>
- <item
- android:drawable="@drawable/shutter_button_0"
- android:duration="33"/>
-
-</animation-list>
diff --git a/res/drawable/shutter_button_normal.xml b/res/drawable/shutter_button_normal.xml
new file mode 100644
index 000000000..621922c37
--- /dev/null
+++ b/res/drawable/shutter_button_normal.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="@dimen/shutter_size"
+ android:height="@dimen/shutter_size"
+ android:viewportWidth="80"
+ android:viewportHeight="80">
+
+ <path
+ android:fillColor="@color/shutter"
+ android:strokeWidth="1"
+ android:pathData="M 40 10.5 C 56.29240012 10.5 69.5 23.70759988 69.5 40 C 69.5 56.29240012 56.29240012 69.5 40 69.5 C 23.70759988 69.5 10.5 56.29240012 10.5 40 C 10.5 23.70759988 23.70759988 10.5 40 10.5 Z" />
+ <path
+ android:strokeColor="@color/photo"
+ android:strokeWidth="7"
+ android:pathData="M 40 3.5 C 60.1583933688 3.5 76.5 19.8416066312 76.5 40 C 76.5 60.1583933688 60.1583933688 76.5 40 76.5 C 19.8416066312 76.5 3.5 60.1583933688 3.5 40 C 3.5 19.8416066312 19.8416066312 3.5 40 3.5 Z" />
+
+</vector>
diff --git a/res/drawable/shutter_button_pressed.xml b/res/drawable/shutter_button_pressed.xml
new file mode 100644
index 000000000..98d290ff9
--- /dev/null
+++ b/res/drawable/shutter_button_pressed.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="@dimen/shutter_size"
+ android:height="@dimen/shutter_size"
+ android:viewportWidth="80"
+ android:viewportHeight="80">
+
+ <path
+ android:fillColor="@color/shutter_pressed"
+ android:strokeWidth="1"
+ android:pathData="M 40 12.5 C 55.1878306203 12.5 67.5 24.8121693797 67.5 40 C 67.5 55.1878306203 55.1878306203 67.5 40 67.5 C 24.8121693797 67.5 12.5 55.1878306203 12.5 40 C 12.5 24.8121693797 24.8121693797 12.5 40 12.5 Z" />
+ <path
+ android:strokeColor="@color/photo"
+ android:strokeWidth="7"
+ android:pathData="M 40 3.5 C 60.1583933688 3.5 76.5 19.8416066312 76.5 40 C 76.5 60.1583933688 60.1583933688 76.5 40 76.5 C 19.8416066312 76.5 3.5 60.1583933688 3.5 40 C 3.5 19.8416066312 19.8416066312 3.5 40 3.5 Z" />
+
+</vector>
diff --git a/res/drawable/shutter_button_stop.xml b/res/drawable/shutter_button_stop.xml
new file mode 100644
index 000000000..5d23f2578
--- /dev/null
+++ b/res/drawable/shutter_button_stop.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="@dimen/shutter_size"
+ android:height="@dimen/shutter_size"
+ android:viewportWidth="80"
+ android:viewportHeight="80">
+
+ <path
+ android:fillColor="@color/shutter"
+ android:strokeWidth="1"
+ android:pathData="M 40 12.5 C 55.1878306203 12.5 67.5 24.8121693797 67.5 40 C 67.5 55.1878306203 55.1878306203 67.5 40 67.5 C 24.8121693797 67.5 12.5 55.1878306203 12.5 40 C 12.5 24.8121693797 24.8121693797 12.5 40 12.5 Z" />
+ <path
+ android:strokeColor="@color/pano_stop"
+ android:strokeWidth="7"
+ android:pathData="M 40 3.5 C 60.1583933688 3.5 76.5 19.8416066312 76.5 40 C 76.5 60.1583933688 60.1583933688 76.5 40 76.5 C 19.8416066312 76.5 3.5 60.1583933688 3.5 40 C 3.5 19.8416066312 19.8416066312 3.5 40 3.5 Z" />
+
+</vector>
diff --git a/res/drawable/shutter_button_video.xml b/res/drawable/shutter_button_video.xml
new file mode 100644
index 000000000..3fb897733
--- /dev/null
+++ b/res/drawable/shutter_button_video.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="@dimen/shutter_size"
+ android:height="@dimen/shutter_size"
+ android:viewportWidth="80"
+ android:viewportHeight="80">
+
+ <path
+ android:fillColor="@color/shutter"
+ android:strokeWidth="1"
+ android:pathData="M 40 10.5 C 56.29240012 10.5 69.5 23.70759988 69.5 40 C 69.5 56.29240012 56.29240012 69.5 40 69.5 C 23.70759988 69.5 10.5 56.29240012 10.5 40 C 10.5 23.70759988 23.70759988 10.5 40 10.5 Z" />
+ <path
+ android:strokeColor="@color/video"
+ android:strokeWidth="7"
+ android:pathData="M 40 3.5 C 60.1583933688 3.5 76.5 19.8416066312 76.5 40 C 76.5 60.1583933688 60.1583933688 76.5 40 76.5 C 19.8416066312 76.5 3.5 60.1583933688 3.5 40 C 3.5 19.8416066312 19.8416066312 3.5 40 3.5 Z" />
+
+</vector>
diff --git a/res/drawable/shutter_button_video_dim.xml b/res/drawable/shutter_button_video_dim.xml
new file mode 100644
index 000000000..5e5e35eaa
--- /dev/null
+++ b/res/drawable/shutter_button_video_dim.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="@dimen/shutter_size"
+ android:height="@dimen/shutter_size"
+ android:viewportWidth="80"
+ android:viewportHeight="80">
+
+ <path
+ android:fillColor="@color/shutter_pressed"
+ android:strokeWidth="1"
+ android:pathData="M 40 12.5 C 55.1878306203 12.5 67.5 24.8121693797 67.5 40 C 67.5 55.1878306203 55.1878306203 67.5 40 67.5 C 24.8121693797 67.5 12.5 55.1878306203 12.5 40 C 12.5 24.8121693797 24.8121693797 12.5 40 12.5 Z" />
+ <path
+ android:strokeColor="@color/video"
+ android:strokeWidth="7"
+ android:pathData="M 40 3.5 C 60.1583933688 3.5 76.5 19.8416066312 76.5 40 C 76.5 60.1583933688 60.1583933688 76.5 40 76.5 C 19.8416066312 76.5 3.5 60.1583933688 3.5 40 C 3.5 19.8416066312 19.8416066312 3.5 40 3.5 Z" />
+
+</vector>
diff --git a/res/drawable/shutter_button_video_stop.xml b/res/drawable/shutter_button_video_stop.xml
new file mode 100644
index 000000000..f239f485a
--- /dev/null
+++ b/res/drawable/shutter_button_video_stop.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="@dimen/shutter_size"
+ android:height="@dimen/shutter_size"
+ android:viewportWidth="80"
+ android:viewportHeight="80">
+
+ <path
+ android:fillColor="@color/shutter"
+ android:strokeWidth="1"
+ android:pathData="M 40 12.5 C 55.1878306203 12.5 67.5 24.8121693797 67.5 40 C 67.5 55.1878306203 55.1878306203 67.5 40 67.5 C 24.8121693797 67.5 12.5 55.1878306203 12.5 40 C 12.5 24.8121693797 24.8121693797 12.5 40 12.5 Z" />
+ <path
+ android:strokeColor="@color/video_stop"
+ android:strokeWidth="7"
+ android:pathData="M 40 3.5 C 60.1583933688 3.5 76.5 19.8416066312 76.5 40 C 76.5 60.1583933688 60.1583933688 76.5 40 76.5 C 19.8416066312 76.5 3.5 60.1583933688 3.5 40 C 3.5 19.8416066312 19.8416066312 3.5 40 3.5 Z" />
+
+</vector>
diff --git a/res/drawable/shutter_panorama.xml b/res/drawable/shutter_panorama.xml
new file mode 100644
index 000000000..b5dfe21e1
--- /dev/null
+++ b/res/drawable/shutter_panorama.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="@dimen/shutter_size"
+ android:height="@dimen/shutter_size"
+ android:viewportWidth="80"
+ android:viewportHeight="80">
+
+ <path
+ android:fillColor="@color/shutter"
+ android:strokeWidth="1"
+ android:pathData="M 40 10.5 C 56.29240012 10.5 69.5 23.70759988 69.5 40 C 69.5 56.29240012 56.29240012 69.5 40 69.5 C 23.70759988 69.5 10.5 56.29240012 10.5 40 C 10.5 23.70759988 23.70759988 10.5 40 10.5 Z" />
+ <path
+ android:strokeColor="@color/pano"
+ android:strokeWidth="7"
+ android:pathData="M 40 3.5 C 60.1583933688 3.5 76.5 19.8416066312 76.5 40 C 76.5 60.1583933688 60.1583933688 76.5 40 76.5 C 19.8416066312 76.5 3.5 60.1583933688 3.5 40 C 3.5 19.8416066312 19.8416066312 3.5 40 3.5 Z" />
+
+</vector>
diff --git a/res/drawable/shutter_panorama_dim.xml b/res/drawable/shutter_panorama_dim.xml
new file mode 100644
index 000000000..49845b39b
--- /dev/null
+++ b/res/drawable/shutter_panorama_dim.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="@dimen/shutter_size"
+ android:height="@dimen/shutter_size"
+ android:viewportWidth="80"
+ android:viewportHeight="80">
+
+ <path
+ android:fillColor="@color/shutter_pressed"
+ android:strokeWidth="1"
+ android:pathData="M 40 12.5 C 55.1878306203 12.5 67.5 24.8121693797 67.5 40 C 67.5 55.1878306203 55.1878306203 67.5 40 67.5 C 24.8121693797 67.5 12.5 55.1878306203 12.5 40 C 12.5 24.8121693797 24.8121693797 12.5 40 12.5 Z" />
+ <path
+ android:strokeColor="@color/pano"
+ android:strokeWidth="7"
+ android:pathData="M 40 3.5 C 60.1583933688 3.5 76.5 19.8416066312 76.5 40 C 76.5 60.1583933688 60.1583933688 76.5 40 76.5 C 19.8416066312 76.5 3.5 60.1583933688 3.5 40 C 3.5 19.8416066312 19.8416066312 3.5 40 3.5 Z" />
+
+</vector>
diff --git a/res/drawable/thumb_filter_point_blue.png b/res/drawable/thumb_filter_point_blue.png
new file mode 100755
index 000000000..dd3456d6e
--- /dev/null
+++ b/res/drawable/thumb_filter_point_blue.png
Binary files differ
diff --git a/res/drawable/thumb_filter_point_green.png b/res/drawable/thumb_filter_point_green.png
new file mode 100755
index 000000000..347b34a30
--- /dev/null
+++ b/res/drawable/thumb_filter_point_green.png
Binary files differ
diff --git a/res/drawable/thumb_filter_point_red_yellow.png b/res/drawable/thumb_filter_point_red_yellow.png
new file mode 100755
index 000000000..d7d78cc53
--- /dev/null
+++ b/res/drawable/thumb_filter_point_red_yellow.png
Binary files differ
diff --git a/res/drawable/thumb_filter_vintage_cold.png b/res/drawable/thumb_filter_vintage_cold.png
new file mode 100755
index 000000000..b0c241c08
--- /dev/null
+++ b/res/drawable/thumb_filter_vintage_cold.png
Binary files differ
diff --git a/res/drawable/thumb_filter_vintage_warm.png b/res/drawable/thumb_filter_vintage_warm.png
new file mode 100755
index 000000000..1ed75bff0
--- /dev/null
+++ b/res/drawable/thumb_filter_vintage_warm.png
Binary files differ
diff --git a/res/drawable/thumb_filter_washed.png b/res/drawable/thumb_filter_washed.png
new file mode 100755
index 000000000..23c6342b4
--- /dev/null
+++ b/res/drawable/thumb_filter_washed.png
Binary files differ
diff --git a/res/drawable/video_capture.png b/res/drawable/video_capture.png
deleted file mode 100644
index f0c7c2289..000000000
--- a/res/drawable/video_capture.png
+++ /dev/null
Binary files differ