From d1747c19c3df39ce105795b17868d0f9c2e71f36 Mon Sep 17 00:00:00 2001
From: jrizzoli <joey@cyanogenmoditalia.it>
Date: Wed, 20 Jan 2016 21:27:46 +0100
Subject: Snap: Add icons to all remaining preferences

Change-Id: I0a06b550ae4137d0e665947d8a8574c3b26fcb95
Signed-off-by: jrizzoli <joey@cyanogenmoditalia.it>
---
 res/drawable/ic_settings_advanced.xml      | 15 ++++++
 res/drawable/ic_settings_ae.xml            | 23 +++++++++
 res/drawable/ic_settings_antibanding.xml   | 16 ++++++
 res/drawable/ic_settings_auto_exposure.xml | 14 ++++++
 res/drawable/ic_settings_bright_screen.xml |  9 ++--
 res/drawable/ic_settings_cds.xml           | 15 ++++++
 res/drawable/ic_settings_contrast.xml      | 14 ++++++
 res/drawable/ic_settings_denoise.xml       | 16 ++++++
 res/drawable/ic_settings_encoder_audio.xml | 16 ++++++
 res/drawable/ic_settings_encoder_video.xml | 14 ++++++
 res/drawable/ic_settings_focus_time.xml    | 11 ++--
 res/drawable/ic_settings_focus_zone.xml    | 16 ++++++
 res/drawable/ic_settings_format.xml        | 14 ++++++
 res/drawable/ic_settings_hdr_auto.xml      | 24 +++++++++
 res/drawable/ic_settings_histogram.xml     | 16 ++++++
 res/drawable/ic_settings_manualexp.xml     | 15 ++++++
 res/drawable/ic_settings_manualfocus.xml   | 15 ++++++
 res/drawable/ic_settings_onex.xml          | 14 ++++++
 res/drawable/ic_settings_picturesize.xml   |  8 +--
 res/drawable/ic_settings_powershutter.xml  |  9 ++--
 res/drawable/ic_settings_rotation.xml      | 18 +++++++
 res/drawable/ic_settings_saturation.xml    | 15 ++++++
 res/drawable/ic_settings_sharpness.xml     | 14 ++++++
 res/drawable/ic_settings_size.xml          | 16 ++++++
 res/drawable/ic_settings_skin.xml          | 17 +++++++
 res/drawable/ic_settings_sound.xml         | 15 ++++++
 res/drawable/ic_settings_stabilization.xml | 17 +++++++
 res/drawable/ic_settings_timelapse.xml     | 16 ++++++
 res/drawable/ic_settings_tnr.xml           | 32 ++++++++++++
 res/drawable/ic_settings_wb.xml            | 16 ++++++
 res/drawable/ic_settings_zsl.xml           | 71 ++++++++++++++++++++++++++
 res/xml/camera_preferences.xml             | 81 ++++++++++++++++++------------
 res/xml/video_preferences.xml              | 33 ++++++++----
 33 files changed, 597 insertions(+), 58 deletions(-)
 create mode 100644 res/drawable/ic_settings_advanced.xml
 create mode 100644 res/drawable/ic_settings_ae.xml
 create mode 100644 res/drawable/ic_settings_antibanding.xml
 create mode 100644 res/drawable/ic_settings_auto_exposure.xml
 create mode 100644 res/drawable/ic_settings_cds.xml
 create mode 100644 res/drawable/ic_settings_contrast.xml
 create mode 100644 res/drawable/ic_settings_denoise.xml
 create mode 100644 res/drawable/ic_settings_encoder_audio.xml
 create mode 100644 res/drawable/ic_settings_encoder_video.xml
 create mode 100644 res/drawable/ic_settings_focus_zone.xml
 create mode 100644 res/drawable/ic_settings_format.xml
 create mode 100644 res/drawable/ic_settings_hdr_auto.xml
 create mode 100644 res/drawable/ic_settings_histogram.xml
 create mode 100644 res/drawable/ic_settings_manualexp.xml
 create mode 100644 res/drawable/ic_settings_manualfocus.xml
 create mode 100644 res/drawable/ic_settings_onex.xml
 create mode 100644 res/drawable/ic_settings_rotation.xml
 create mode 100644 res/drawable/ic_settings_saturation.xml
 create mode 100644 res/drawable/ic_settings_sharpness.xml
 create mode 100644 res/drawable/ic_settings_size.xml
 create mode 100644 res/drawable/ic_settings_skin.xml
 create mode 100644 res/drawable/ic_settings_sound.xml
 create mode 100644 res/drawable/ic_settings_stabilization.xml
 create mode 100644 res/drawable/ic_settings_timelapse.xml
 create mode 100644 res/drawable/ic_settings_tnr.xml
 create mode 100644 res/drawable/ic_settings_wb.xml
 create mode 100644 res/drawable/ic_settings_zsl.xml

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_bright_screen.xml b/res/drawable/ic_settings_bright_screen.xml
index 825098584..657584fc3 100644
--- a/res/drawable/ic_settings_bright_screen.xml
+++ b/res/drawable/ic_settings_bright_screen.xml
@@ -5,9 +5,12 @@
     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" />
+        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_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_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_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_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_focus_time.xml b/res/drawable/ic_settings_focus_time.xml
index c6a2e29bb..f08fa3e1c 100644
--- a/res/drawable/ic_settings_focus_time.xml
+++ b/res/drawable/ic_settings_focus_time.xml
@@ -7,10 +7,11 @@
 
     <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" />
+        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="M.21 .16 h24v24h-24z" />
+        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_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_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_onex.xml b/res/drawable/ic_settings_onex.xml
new file mode 100644
index 000000000..5d5efd9b8
--- /dev/null
+++ b/res/drawable/ic_settings_onex.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-2zm-5
+14h-2V9h-2V7h4v10z" />
+</vector>
diff --git a/res/drawable/ic_settings_picturesize.xml b/res/drawable/ic_settings_picturesize.xml
index e74229fc8..268781633 100644
--- a/res/drawable/ic_settings_picturesize.xml
+++ b/res/drawable/ic_settings_picturesize.xml
@@ -5,10 +5,10 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
 
-    <path
-        android:pathData="M0 0h24v24H0z" />
     <path
         android:fillColor="@color/white"
-        android:pathData="M16 10h-2v2h2v-2zm0 4h-2v2h2v-2zm-8-4H6v2h2v-2zm4 0h-2v2h2v-2zm8-6H4c-1.1 0-2
-.9-2 2v12c0 1.1 .9 2 2 2h16c1.1 0 2-.9 2-2V6c0-1.1-.9-2-2-2zm0 14H4V6h16v12z" />
+        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_powershutter.xml b/res/drawable/ic_settings_powershutter.xml
index 1f723df09..1f457adb5 100644
--- a/res/drawable/ic_settings_powershutter.xml
+++ b/res/drawable/ic_settings_powershutter.xml
@@ -5,10 +5,11 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
 
+    <path
+        android:pathData="M0 0h24v24H0z" />
     <path
         android:fillColor="@color/white"
-        android:pathData="M3 4V1h2v3h3v2H5v3H3V6H0V4h3zm3 6V7h3V4h7l1.83 2H21c1.1 0 2 .9 2 2v12c0 1.1-.9
-2-2 2H5c-1.1 0-2-.9-2-2V10h3zm7 9c2.76 0 5-2.24 5-5s-2.24-5-5-5-5 2.24-5 5 2.24
-5 5 5zm-3.2-5c0 1.77 1.43 3.2 3.2 3.2s3.2-1.43 3.2-3.2-1.43-3.2-3.2-3.2-3.2
-1.43-3.2 3.2z" />
+        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_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_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_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_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_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/xml/camera_preferences.xml b/res/xml/camera_preferences.xml
index f036dee54..70bcfa07b 100644
--- a/res/xml/camera_preferences.xml
+++ b/res/xml/camera_preferences.xml
@@ -26,7 +26,7 @@
             camera:entries="@array/pref_camera_flashmode_entries"
             camera:entryValues="@array/pref_camera_flashmode_entryvalues"
             camera:labelList="@array/pref_camera_flashmode_labels"
-            camera:singleIcon="@drawable/ic_settings_flash" />
+            camera:singleIcon="@drawable/ic_flash_on" />
     <IconListPreference
             camera:key="pref_camera_exposure_key"
             camera:defaultValue="@string/pref_exposure_default"
@@ -74,29 +74,32 @@
             camera:entries="@array/pref_camera_focusmode_entries"
             camera:labelList="@array/pref_camera_focusmode_labels"
             camera:entryValues="@array/pref_camera_focusmode_entryvalues" />
-     <IconListPreference
+    <IconListPreference
             camera:key="pref_camera_focustime_key"
             camera:defaultValue="@string/pref_camera_focustime_default"
             camera:title="@string/pref_camera_focustime_title"
             camera:singleIcon="@drawable/ic_settings_focus_time"
             camera:entries="@array/pref_camera_focustime_duration_entries"
             camera:entryValues="@array/pref_camera_focustime_duration_values" />
-    <ListPreference
+    <IconListPreference
             camera:key="pref_camera_ae_bracket_hdr_key"
             camera:defaultValue="@string/pref_camera_ae_bracket_hdr_default"
             camera:title="@string/pref_camera_ae_bracket_hdr_title"
+            camera:singleIcon="@drawable/ic_settings_ae"
             camera:entries="@array/pref_camera_ae_bracket_hdr_entries"
             camera:entryValues="@array/pref_camera_ae_bracket_hdr_entryvalues" />
-     <ListPreference
+    <IconListPreference
             camera:key="pref_camera_cds_mode_key"
             camera:defaultValue="@string/pref_camera_cds_default"
             camera:title="@string/pref_camera_cds_title"
+            camera:singleIcon="@drawable/ic_settings_cds"
             camera:entries="@array/pref_camera_cds_entries"
             camera:entryValues="@array/pref_camera_cds_entryvalues" />
-    <ListPreference
+    <IconListPreference
             camera:key="pref_camera_tnr_mode_key"
             camera:defaultValue="@string/pref_camera_tnr_default"
             camera:title="@string/pref_camera_tnr_title"
+            camera:singleIcon="@drawable/ic_settings_tnr"
             camera:entries="@array/pref_camera_tnr_entries"
             camera:entryValues="@array/pref_camera_tnr_entryvalues" />
     <IconListPreference
@@ -130,22 +133,25 @@
             camera:defaultValue="@string/pref_camera_timer_default"
             camera:singleIcon="@drawable/ic_settings_countdowntimer"
             camera:title="@string/pref_camera_timer_title" />
-    <ListPreference
+    <IconListPreference
             camera:key="pref_camera_timer_sound_key"
             camera:defaultValue="@string/pref_camera_timer_sound_default"
             camera:title="@string/pref_camera_timer_sound_title"
+            camera:singleIcon="@drawable/ic_settings_sound"
             camera:entries="@array/pref_camera_timer_sound_entries"
             camera:entryValues="@array/pref_camera_timer_sound_entryvalues" />
-    <ListPreference
+    <IconListPreference
             camera:key="pref_camera_scenedetect_key"
             camera:defaultValue="@string/pref_camera_scenedetect_default"
             camera:title="@string/pref_camera_scenedetect_title"
+            camera:singleIcon="@drawable/ic_sce"
             camera:entries="@array/pref_camera_scenedetect_entries"
             camera:entryValues="@array/pref_camera_scenedetect_entryvalues" />
-    <ListPreference
+    <IconListPreference
             camera:key="pref_camera_facerc_key"
             camera:defaultValue="@string/pref_camera_facerc_default"
             camera:title="@string/pref_camera_facerc_title"
+            camera:singleIcon="@drawable/ic_settings_facerec"
             camera:entries="@array/pref_camera_facerc_entries"
             camera:entryValues="@array/pref_camera_facerc_entryvalues" />
     <IconListPreference
@@ -170,58 +176,67 @@
             camera:entries="@array/pref_camera_iso_entries"
             camera:singleIcon="@drawable/ic_settings_iso"
             camera:entryValues="@array/pref_camera_iso_entryvalues" />
-    <ListPreference
+    <IconListPreference
             camera:key="pref_camera_histogram_key"
             camera:defaultValue="@string/pref_camera_histogram_default"
             camera:title="@string/pref_camera_histogram_title"
+            camera:singleIcon="@drawable/ic_settings_histogram"
             camera:entries="@array/pref_camera_histogram_entries"
             camera:entryValues="@array/pref_camera_histogram_entryvalues" />
-    <ListPreference
+    <IconListPreference
             camera:key="pref_camera_antibanding_key"
             camera:defaultValue="@string/pref_camera_antibanding_default"
             camera:title="@string/pref_camera_antibanding_title"
             camera:entries="@array/pref_camera_antibanding_entries"
+            camera:singleIcon="@drawable/ic_settings_antibanding"
             camera:entryValues="@array/pref_camera_antibanding_entryvalues" />
-    <ListPreference
+    <IconListPreference
             camera:key="pref_camera_pictureformat_key"
             camera:defaultValue="@string/pref_camera_picture_format_default"
             camera:title="@string/pref_camera_picture_format_title"
+            camera:singleIcon="@drawable/ic_settings_format"
             camera:entries="@array/pref_camera_picture_format_entries"
             camera:entryValues="@array/pref_camera_picture_format_entryvalues" />
-    <ListPreference
+    <IconListPreference
             camera:key="pref_camera_sharpness_key"
             camera:defaultValue="@string/pref_camera_sharpness_default"
             camera:title="@string/pref_camera_sharpness_title"
+            camera:singleIcon="@drawable/ic_settings_sharpness"
             camera:entries="@array/pref_camera_sharpness_entries"
             camera:entryValues="@array/pref_camera_multilevel_sharpness_entryvalues"/>
-    <ListPreference
+    <IconListPreference
             camera:key="pref_camera_contrast_key"
             camera:defaultValue="@string/pref_camera_contrast_default"
             camera:title="@string/pref_camera_contrast_title"
+            camera:singleIcon="@drawable/ic_settings_contrast"
             camera:entries="@array/pref_camera_contrast_entries"
             camera:entryValues="@array/pref_camera_multilevel_entryvalues" />
-    <ListPreference
+    <IconListPreference
             camera:key="pref_camera_saturation_key"
             camera:defaultValue="@string/pref_camera_saturation_default"
             camera:title="@string/pref_camera_saturation_title"
+            camera:singleIcon="@drawable/ic_settings_saturation"
             camera:entries="@array/pref_camera_saturation_entries"
             camera:entryValues="@array/pref_camera_multilevel_entryvalues" />
-    <ListPreference
+    <IconListPreference
             camera:key="pref_camera_denoise_key"
             camera:defaultValue="@string/pref_camera_denoise_default"
             camera:title="@string/pref_camera_denoise_title"
+            camera:singleIcon="@drawable/ic_settings_denoise"
             camera:entries="@array/pref_camera_denoise_entries"
             camera:entryValues="@array/pref_camera_denoise_entryvalues" />
-    <ListPreference
+    <IconListPreference
             camera:key="pref_camera_autoexposure_key"
             camera:defaultValue="@string/pref_camera_autoexposure_default"
             camera:title="@string/pref_camera_autoexposure_title"
             camera:entries="@array/pref_camera_autoexposure_entries"
+            camera:singleIcon="@drawable/ic_settings_auto_exposure"
             camera:entryValues="@array/pref_camera_autoexposure_entryvalues" />
-    <ListPreference
+    <IconListPreference
             camera:key="pref_camera_skinToneEnhancement_key"
             camera:defaultValue="@string/pref_camera_skinToneEnhancement_default"
             camera:title="@string/pref_camera_skinToneEnhancement_title"
+            camera:singleIcon="@drawable/ic_settings_skin"
             camera:entries="@array/pref_camera_skinToneEnhancement_entries"
             camera:entryValues="@array/pref_camera_skinToneEnhancement_entryvalues" />
     <IconListPreference
@@ -238,16 +253,18 @@
             camera:entries="@array/pref_camera_redeyereduction_entries"
             camera:singleIcon="@drawable/ic_settings_redeye"
             camera:entryValues="@array/pref_camera_redeyereduction_entryvalues" />
-    <ListPreference
+    <IconListPreference
             camera:key="pref_camera_selectablezoneaf_key"
             camera:defaultValue="@string/pref_camera_selectablezoneaf_default"
             camera:title="@string/pref_camera_selectablezoneaf_title"
+            camera:singleIcon="@drawable/ic_settings_focus_zone"
             camera:entries="@array/pref_camera_selectablezoneaf_entries"
             camera:entryValues="@array/pref_camera_selectablezoneaf_entryvalues" />
-    <ListPreference
+    <IconListPreference
             camera:key="pref_camera_zsl_key"
             camera:defaultValue="@string/pref_camera_zsl_default"
             camera:title="@string/pref_camera_zsl_title"
+            camera:singleIcon="@drawable/ic_settings_zsl"
             camera:entries="@array/pref_camera_zsl_entries"
             camera:entryValues="@array/pref_camera_zsl_entryvalues" />
     <IconListPreference
@@ -257,10 +274,11 @@
             camera:entries="@array/pref_camera_savepath_entries"
             camera:singleIcon="@drawable/ic_settings_storage"
             camera:entryValues="@array/pref_camera_savepath_entryvalues" />
-    <ListPreference
+    <IconListPreference
             camera:key="pref_camera_advanced_features_key"
             camera:defaultValue="@string/pref_camera_advanced_feature_default"
             camera:title="@string/pref_camera_advanced_features_title"
+            camera:singleIcon="@drawable/ic_settings_advanced"
             camera:entries="@array/pref_camera_advanced_features_entries"
             camera:entryValues="@array/pref_camera_advanced_features_entryvalues" />
     <IconListPreference
@@ -270,45 +288,46 @@
             camera:entries="@array/pref_camera_longshot_entries"
             camera:singleIcon="@drawable/ic_settings_continuous"
             camera:entryValues="@array/pref_camera_longshot_entryvalues" />
-    <ListPreference
+    <IconListPreference
             camera:key="pref_camera_auto_hdr_key"
             camera:defaultValue="@string/pref_camera_auto_hdr_default"
             camera:title="@string/pref_camera_auto_hdr_title"
             camera:entries="@array/pref_camera_auto_hdr_entries"
+            camera:singleIcon="@drawable/ic_settings_hdr_auto"
             camera:entryValues="@array/pref_camera_auto_hdr_entryvalues" />
-
-    <ListPreference
+    <IconListPreference
             camera:key="pref_camera_hdr_mode_key"
             camera:defaultValue="@string/pref_camera_hdr_mode_default"
             camera:title="@string/pref_camera_hdr_mode_title"
+            camera:singleIcon="@drawable/ic_hdr"
             camera:entries="@array/pref_camera_hdr_mode_entries"
             camera:entryValues="@array/pref_camera_hdr_mode_entryvalues" />
-
-    <ListPreference
+    <IconListPreference
             camera:key="pref_camera_hdr_need_1x_key"
             camera:defaultValue="@string/pref_camera_hdr_need_1x_default"
             camera:title="@string/pref_camera_hdr_need_1x_title"
+            camera:singleIcon="@drawable/ic_settings_onex"
             camera:entries="@array/pref_camera_hdr_need_1x_entries"
             camera:entryValues="@array/pref_camera_hdr_need_1x_entryvalues" />
-
-    <ListPreference
+    <IconListPreference
             camera:key="pref_camera_manual_exp_key"
             camera:defaultValue="@string/pref_camera_manual_exp_default"
             camera:title="@string/pref_camera_manual_exp_title"
+            camera:singleIcon="@drawable/ic_settings_manualexp"
             camera:entries="@array/pref_camera_manual_exp_entries"
             camera:entryValues="@array/pref_camera_manual_exp_entry_values" />
-
-    <ListPreference
+    <IconListPreference
             camera:key="pref_camera_manual_wb_key"
             camera:defaultValue="@string/pref_camera_manual_wb_default"
             camera:title="@string/pref_camera_manual_wb_title"
+            camera:singleIcon="@drawable/ic_settings_wb"
             camera:entries="@array/pref_camera_manual_wb_entries"
             camera:entryValues="@array/pref_camera_manual_wb_entry_values" />
-
-    <ListPreference
+    <IconListPreference
             camera:key="pref_camera_manual_focus_key"
             camera:defaultValue="@string/pref_camera_manual_focus_default"
             camera:title="@string/pref_camera_manual_focus_title"
+            camera:singleIcon="@drawable/ic_settings_manualfocus"
             camera:entries="@array/pref_camera_manual_focus_entries"
             camera:entryValues="@array/pref_camera_manual_focus_entry_values" />
     <IconListPreference
diff --git a/res/xml/video_preferences.xml b/res/xml/video_preferences.xml
index dec916695..7c4cffbaf 100644
--- a/res/xml/video_preferences.xml
+++ b/res/xml/video_preferences.xml
@@ -23,34 +23,39 @@
             camera:entries="@array/pref_video_quality_entries"
             camera:singleIcon="@drawable/ic_settings_quality"
             camera:entryValues="@array/pref_video_quality_entryvalues"/>
-    <ListPreference
+    <IconListPreference
             camera:key="pref_camera_videoencoder_key"
             camera:defaultValue="@string/pref_camera_videoencoder_default"
             camera:title="@string/pref_camera_videoencoder_title"
+            camera:singleIcon="@drawable/ic_settings_encoder_video"
             camera:entries="@array/pref_camera_videoencoder_entries"
             camera:entryValues="@array/pref_camera_videoencoder_entryvalues" />
-    <ListPreference
+    <IconListPreference
             camera:key="pref_camera_audioencoder_key"
             camera:defaultValue="@string/pref_camera_audioencoder_default"
             camera:title="@string/pref_camera_audioencoder_title"
+            camera:singleIcon="@drawable/ic_settings_encoder_audio"
             camera:entries="@array/pref_camera_audioencoder_entries"
             camera:entryValues="@array/pref_camera_audioencoder_entryvalues" />
-    <ListPreference
+    <IconListPreference
             camera:key="pref_camera_video_cds_mode_key"
             camera:defaultValue="@string/pref_camera_video_cds_default"
             camera:title="@string/pref_camera_video_cds_title"
+            camera:singleIcon="@drawable/ic_settings_cds"
             camera:entries="@array/pref_camera_video_cds_entries"
             camera:entryValues="@array/pref_camera_video_cds_entryvalues" />
-    <ListPreference
+    <IconListPreference
             camera:key="pref_camera_video_tnr_mode_key"
             camera:defaultValue="@string/pref_camera_video_tnr_default"
             camera:title="@string/pref_camera_video_tnr_title"
+            camera:singleIcon="@drawable/ic_settings_tnr"
             camera:entries="@array/pref_camera_video_tnr_entries"
             camera:entryValues="@array/pref_camera_video_tnr_entryvalues" />
     <IconListPreference
             camera:key="pref_video_time_lapse_frame_interval_key"
             camera:defaultValue="@string/pref_video_time_lapse_frame_interval_default"
             camera:title="@string/pref_video_time_lapse_frame_interval_title"
+            camera:singleIcon="@drawable/ic_settings_timelapse"
             camera:entries="@array/pref_video_time_lapse_frame_interval_entries"
             camera:entryValues="@array/pref_video_time_lapse_frame_interval_entryvalues"/>
     <IconListPreference
@@ -59,7 +64,7 @@
             camera:title="@string/pref_camera_flashmode_title"
             camera:icons="@array/video_flashmode_icons"
             camera:largeIcons="@array/video_flashmode_largeicons"
-            camera:singleIcon="@drawable/ic_settings_flash"
+            camera:singleIcon="@drawable/ic_flash_on"
             camera:entries="@array/pref_camera_video_flashmode_entries"
             camera:labelList="@array/pref_camera_video_flashmode_labels"
             camera:entryValues="@array/pref_camera_video_flashmode_entryvalues"/>
@@ -103,10 +108,11 @@
             camera:largeIcons="@array/camera_recordlocation_largeicons"
             camera:entries="@array/pref_camera_recordlocation_entries"
             camera:entryValues="@array/pref_camera_recordlocation_entryvalues" />
-    <ListPreference
+    <IconListPreference
             camera:key="pref_camera_dis_key"
             camera:defaultValue="@string/pref_camera_dis_default"
             camera:title="@string/pref_camera_dis_title"
+            camera:singleIcon="@drawable/ic_settings_stabilization"
             camera:entries="@array/pref_camera_dis_entries"
             camera:entryValues="@array/pref_camera_dis_entryvalues" />
     <IconListPreference
@@ -124,22 +130,25 @@
             camera:singleIcon="@drawable/ic_settings_fps"
             camera:entries="@array/pref_camera_hfr_entries"
             camera:entryValues="@array/pref_camera_hfr_entryvalues"/>
-    <ListPreference
+    <IconListPreference
             camera:key="pref_camera_see_more_key"
             camera:defaultValue="@string/pref_camera_see_more_default"
             camera:title="@string/pref_camera_see_more_title"
+            camera:singleIcon="@drawable/ic_settings_redeye"
             camera:entries="@array/pref_camera_see_more_entries"
             camera:entryValues="@array/pref_camera_see_more_entryvalues"/>
-    <ListPreference
+    <IconListPreference
             camera:key="pref_camera_video_hdr_key"
             camera:defaultValue="@string/pref_camera_video_hdr_default"
             camera:title="@string/pref_camera_video_hdr_title"
+            camera:singleIcon="@drawable/ic_hdr"
             camera:entries="@array/pref_camera_video_hdr_entries"
             camera:entryValues="@array/pref_camera_video_hdr_entryvalues"/>
-    <ListPreference
+    <IconListPreference
             camera:key="pref_camera_videosnapsize_key"
             camera:defaultValue="@string/pref_camera_videosnapsize_default"
             camera:title="@string/pref_camera_picturesize_title"
+            camera:singleIcon="@drawable/ic_settings_size"
             camera:entries="@array/pref_camera_picturesize_entries"
             camera:entryValues="@array/pref_camera_picturesize_entryvalues" />
     <IconListPreference
@@ -149,16 +158,18 @@
             camera:entries="@array/pref_camera_savepath_entries"
             camera:singleIcon="@drawable/ic_settings_storage"
             camera:entryValues="@array/pref_camera_savepath_entryvalues" />
-    <ListPreference
+    <IconListPreference
             camera:key="pref_camera_video_rotation_key"
             camera:defaultValue="@string/pref_camera_video_rotation_default"
             camera:title="@string/pref_camera_video_rotation_title"
+            camera:singleIcon="@drawable/ic_settings_rotation"
             camera:entries="@array/pref_camera_video_rotation_entries"
             camera:entryValues="@array/pref_camera_video_rotation_entryvalues" />
-    <ListPreference
+    <IconListPreference
             camera:key="pref_camera_antibanding_key"
             camera:defaultValue="@string/pref_camera_antibanding_default"
             camera:title="@string/pref_camera_antibanding_title"
+            camera:singleIcon="@drawable/ic_settings_antibanding"
             camera:entries="@array/pref_camera_antibanding_entries"
             camera:entryValues="@array/pref_camera_antibanding_entryvalues" />
     <IconListPreference
-- 
cgit v1.2.3