77 files changed, 233 insertions, 148 deletions
diff --git a/res/drawable/auto_blue.png b/res/drawable/auto_blue.png
deleted file mode 100644
index acf632e16..000000000
--- a/res/drawable/auto_blue.png
+++ /dev/null
diff --git a/res/drawable/beautify_progressbar_style.xml b/res/drawable/beautify_progressbar_style.xml
index 962d8dedb..962d8dedb 100755..100644
--- a/res/drawable/beautify_progressbar_style.xml
+++ b/res/drawable/beautify_progressbar_style.xml
diff --git a/res/drawable/bg_pressed.xml b/res/drawable/bg_pressed.xml
index 979cc86bd..e3a0c102b 100644
--- a/res/drawable/bg_pressed.xml
+++ b/res/drawable/bg_pressed.xml
@@ -16,5 +16,6 @@
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_pressed="true" android:drawable="@drawable/list_pressed_holo_light" />
+    <item android:state_selected="true" android:drawable="@drawable/list_pressed_holo_light" />
     <item android:drawable="@android:color/transparent" />
 </selector>
diff --git a/res/drawable/clock.png b/res/drawable/clock.png
deleted file mode 100644
index 50d0e2a4e..000000000
--- a/res/drawable/clock.png
+++ /dev/null
diff --git a/res/drawable/cloudy.png b/res/drawable/cloudy.png
deleted file mode 100644
index b29ab9e5d..000000000
--- a/res/drawable/cloudy.png
+++ /dev/null
diff --git a/res/drawable/cloudy_blue.png b/res/drawable/cloudy_blue.png
deleted file mode 100644
index 303a2703e..000000000
--- a/res/drawable/cloudy_blue.png
+++ /dev/null
diff --git a/res/drawable/countdown_timer.png b/res/drawable/countdown_timer.png
deleted file mode 100644
index ddd0175ef..000000000
--- a/res/drawable/countdown_timer.png
+++ /dev/null
diff --git a/res/drawable/exposure.png b/res/drawable/exposure.png
deleted file mode 100644
index 85f3b4e72..000000000
--- a/res/drawable/exposure.png
+++ /dev/null
diff --git a/res/drawable/face_detection.png b/res/drawable/face_detection.png
deleted file mode 100644
index 7081cec41..000000000
--- a/res/drawable/face_detection.png
+++ /dev/null
diff --git a/res/drawable/filters.png b/res/drawable/filters.png
deleted file mode 100644
index e9527a3aa..000000000
--- a/res/drawable/filters.png
+++ /dev/null
diff --git a/res/drawable/flash.png b/res/drawable/flash.png
deleted file mode 100644
index 09d400487..000000000
--- a/res/drawable/flash.png
+++ /dev/null
diff --git a/res/drawable/flash_auto.png b/res/drawable/flash_auto.png
deleted file mode 100644
index 0661ea61d..000000000
--- a/res/drawable/flash_auto.png
+++ /dev/null
diff --git a/res/drawable/flash_off.png b/res/drawable/flash_off.png
deleted file mode 100644
index af122bb7e..000000000
--- a/res/drawable/flash_off.png
+++ /dev/null
diff --git a/res/drawable/fluorescent.png b/res/drawable/fluorescent.png
deleted file mode 100644
index d25f7473e..000000000
--- a/res/drawable/fluorescent.png
+++ /dev/null
diff --git a/res/drawable/fluorescent_blue.png b/res/drawable/fluorescent_blue.png
deleted file mode 100644
index 7fb7836dd..000000000
--- a/res/drawable/fluorescent_blue.png
+++ /dev/null
diff --git a/res/drawable/gps_location.png b/res/drawable/gps_location.png
deleted file mode 100644
index 09e011ab3..000000000
--- a/res/drawable/gps_location.png
+++ /dev/null
diff --git a/res/drawable/high_video_frame_rate.png b/res/drawable/high_video_frame_rate.png
deleted file mode 100644
index 9cef42d8c..000000000
--- a/res/drawable/high_video_frame_rate.png
+++ /dev/null
diff --git a/res/drawable/ic_location.xml b/res/drawable/ic_location.xml
index 9151b8a38..709aa0c3d 100644
--- a/res/drawable/ic_location.xml
+++ b/res/drawable/ic_location.xml
@@ -6,7 +6,7 @@
     android:viewportHeight="24">
 
     <path
-        android:fillColor="@color/white"
+        android:fillColor="?attr/iconColor"
         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
diff --git a/res/drawable/ic_scene_mode_auto_wb.xml b/res/drawable/ic_scene_mode_auto_wb.xml
new file mode 100644
index 000000000..f8e95803c
--- /dev/null
+++ b/res/drawable/ic_scene_mode_auto_wb.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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="M10.3,16L9.6,14H6.4L5.7,16H3.8L7,7H9L12.2,16M22,7L20.8,13.29L19.3,7H17.7L16.21,13.29L15,7H14.24C12.77,5.17 10.5,4 8,4A8,8 0 0,0 0,12A8,8 0 0,0 8,20C11.13,20 13.84,18.19 15.15,15.57L15.25,16H17L18.5,9.9L20,16H21.75L23.8,7M6.85,12.65H9.15L8,9L6.85,12.65Z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_cloudy.xml b/res/drawable/ic_scene_mode_cloudy.xml
new file mode 100644
index 000000000..70d11d165
--- /dev/null
+++ b/res/drawable/ic_scene_mode_cloudy.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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="M19.35,10.03C18.67,6.59 15.64,4 12,4C9.11,4 6.6,5.64 5.35,8.03C2.34,8.36 0,10.9 0,14A6,6 0 0,0 6,20H19A5,5 0 0,0 24,15C24,12.36 21.95,10.22 19.35,10.03Z" />
+</vector>
diff --git a/res/drawable/ic_scene_mode_fluorescent.xml b/res/drawable/ic_scene_mode_fluorescent.xml
new file mode 100644
index 000000000..db9347c2c
--- /dev/null
+++ b/res/drawable/ic_scene_mode_fluorescent.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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.96,19.95L6.76,18.15L5.34,16.74L3.55,18.53M3.55,4.46L5.34,6.26L6.76,4.84L4.96,3.05M20.45,18.53L18.66,16.74L17.24,18.15L19.04,19.95M13,22.45V19.5H11V22.45C11.32,22.45 13,22.45 13,22.45M19.04,3.05L17.24,4.84L18.66,6.26L20.45,4.46M11,3.5H13V0.55H11M5,14.5H19V8.5H5V14.5Z" />
+</vector>
diff --git a/res/drawable/ic_settings_camera.xml b/res/drawable/ic_settings_camera.xml
index 1f823bbe9..6451ffa7c 100644
--- a/res/drawable/ic_settings_camera.xml
+++ b/res/drawable/ic_settings_camera.xml
@@ -1,10 +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>
+<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_continuous.xml b/res/drawable/ic_settings_continuous.xml
index 9b1945e29..5fac55837 100644
--- a/res/drawable/ic_settings_continuous.xml
+++ b/res/drawable/ic_settings_continuous.xml
@@ -6,7 +6,7 @@
     android:viewportHeight="24">
 
     <path
-        android:fillColor="@color/white"
+        android:fillColor="?attr/iconColor"
         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" />
diff --git a/res/drawable/ic_settings_encoder_audio.xml b/res/drawable/ic_settings_encoder_audio.xml
index b66ff6028..3f3974aca 100644
--- a/res/drawable/ic_settings_encoder_audio.xml
+++ b/res/drawable/ic_settings_encoder_audio.xml
@@ -8,7 +8,7 @@
     <path
         android:pathData="M0 0h24v24H0z" />
     <path
-        android:fillColor="@color/white"
+        android:fillColor="?attr/iconColor"
         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
diff --git a/res/drawable/ic_settings_encoder_video.xml b/res/drawable/ic_settings_encoder_video.xml
index e6963d385..91fccc718 100644
--- a/res/drawable/ic_settings_encoder_video.xml
+++ b/res/drawable/ic_settings_encoder_video.xml
@@ -6,7 +6,7 @@
     android:viewportHeight="24">
 
     <path
-        android:fillColor="@color/white"
+        android:fillColor="?attr/iconColor"
         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
diff --git a/res/drawable/ic_settings_exposure.xml b/res/drawable/ic_settings_exposure.xml
index 9cd119f5d..fec79949d 100644
--- a/res/drawable/ic_settings_exposure.xml
+++ b/res/drawable/ic_settings_exposure.xml
@@ -6,7 +6,7 @@
     android:viewportHeight="24">
 
     <path
-        android:fillColor="@color/white"
+        android:fillColor="?attr/iconColor"
         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" />
diff --git a/res/drawable/ic_settings_facerec.xml b/res/drawable/ic_settings_facerec.xml
index 46d43647b..5f86f1275 100644
--- a/res/drawable/ic_settings_facerec.xml
+++ b/res/drawable/ic_settings_facerec.xml
@@ -6,7 +6,7 @@
     android:viewportHeight="24">
 
     <path
-        android:fillColor="@color/white"
+        android:fillColor="?attr/iconColor"
         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
diff --git a/res/drawable/ic_settings_flash.xml b/res/drawable/ic_settings_flash.xml
index 5de3ba969..10e13c2cf 100644
--- a/res/drawable/ic_settings_flash.xml
+++ b/res/drawable/ic_settings_flash.xml
@@ -8,6 +8,6 @@
     <path
         android:pathData="M0 0h24v24H0z" />
     <path
-        android:fillColor="#FFFFFF"
+        android:fillColor="?attr/iconColor"
         android:pathData="M7 2v11h3v9l7-12h-4l4-8z" />
 </vector>
diff --git a/res/drawable/ic_settings_format.xml b/res/drawable/ic_settings_format.xml
index c5f897db0..987b5f4d1 100644
--- a/res/drawable/ic_settings_format.xml
+++ b/res/drawable/ic_settings_format.xml
@@ -8,7 +8,7 @@
     <path
         android:pathData="M0 0h24v24H0z" />
     <path
-        android:fillColor="@color/white"
+        android:fillColor="?attr/iconColor"
         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_hfr.xml b/res/drawable/ic_settings_hfr.xml
new file mode 100644
index 000000000..7876d34a1
--- /dev/null
+++ b/res/drawable/ic_settings_hfr.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="?attr/iconColor" 
+        android:pathData="M18,6v6h-3V6H18zM18,4h-3c-1.1,0 -2,0.9 
+        -2,2v6c0,1.1 0.9,2 2,2h3c1.1,0 2,-0.9 2,-2V6C20,4.9 19.1,4 
+        18,4zM11,6V4H6C4.9,4 4,4.9 4,6v6c0,1.1 0.9,2 2,2h3c1.1,0 2,-0.9 
+        2,-2v-2c0,-1.1 -0.9,-2 
+        -2,-2H6V6H11zM9,10v2H6v-2H9zM5,22H3v-5h2V22zM9,22H7v-5h2V22zM13,22h-2v-5h2V22zM21,22h-6v-5h6V22z"/>
+</vector>
diff --git a/res/drawable/ic_settings_powermode.xml b/res/drawable/ic_settings_powermode.xml
index 5fd679d09..e7a2c0adf 100644
--- a/res/drawable/ic_settings_powermode.xml
+++ b/res/drawable/ic_settings_powermode.xml
@@ -1,10 +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>
+<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_quality.xml b/res/drawable/ic_settings_quality.xml
index 6d76669a6..37d6446fa 100644
--- a/res/drawable/ic_settings_quality.xml
+++ b/res/drawable/ic_settings_quality.xml
@@ -8,7 +8,7 @@
     <path
         android:pathData="M24 24H0V0h24v24z" />
     <path
-        android:fillColor="@color/white"
+        android:fillColor="?attr/iconColor"
         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
diff --git a/res/drawable/ic_settings_redeye.xml b/res/drawable/ic_settings_redeye.xml
index 0cea289af..7e2b70bfb 100644
--- a/res/drawable/ic_settings_redeye.xml
+++ b/res/drawable/ic_settings_redeye.xml
@@ -6,6 +6,6 @@
     android:viewportHeight="24">
 
     <path
-        android:fillColor="@color/white"
+        android:fillColor="?attr/iconColor"
         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_reset.xml b/res/drawable/ic_settings_reset.xml
new file mode 100644
index 000000000..7502fa84f
--- /dev/null
+++ b/res/drawable/ic_settings_reset.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:fillColor="?attr/iconColor" 
+        android:pathData="M12,5V2L8,6l4,4V7c3.31,0 6,2.69 6,6c0,2.97 
+        -2.17,5.43 -5,5.91v2.02c3.95,-0.49 7,-3.85 7,-7.93C20,8.58 
+        16.42,5 12,5z"/>
+
+    <path
+        android:fillColor="?attr/iconColor" 
+        android:pathData="M6,13c0,-1.65 0.67,-3.15 
+        1.76,-4.24L6.34,7.34C4.9,8.79 4,10.79 4,13c0,4.08 3.05,7.44 
+        7,7.93v-2.02C8.17,18.43 6,15.97 6,13z"/>
+</vector>
diff --git a/res/drawable/ic_settings_rotation.xml b/res/drawable/ic_settings_rotation.xml
index 64298eadc..e3a7d5701 100644
--- a/res/drawable/ic_settings_rotation.xml
+++ b/res/drawable/ic_settings_rotation.xml
@@ -6,7 +6,7 @@
     android:viewportHeight="24">
 
     <path
-        android:fillColor="@color/white"
+        android:fillColor="?attr/iconColor"
         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
diff --git a/res/drawable/ic_settings_selfiemirror.xml b/res/drawable/ic_settings_selfiemirror.xml
index d6ea4cc50..062d8305b 100644
--- a/res/drawable/ic_settings_selfiemirror.xml
+++ b/res/drawable/ic_settings_selfiemirror.xml
@@ -6,7 +6,7 @@
     android:viewportHeight="24">
 
     <path
-        android:fillColor="@color/white"
+        android:fillColor="?attr/iconColor"
         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" />
diff --git a/res/drawable/ic_settings_size.xml b/res/drawable/ic_settings_size.xml
index 9a4b4f727..cd8509365 100644
--- a/res/drawable/ic_settings_size.xml
+++ b/res/drawable/ic_settings_size.xml
@@ -8,7 +8,7 @@
     <path
         android:pathData="M0,0 L24,0 L24,24 L0,24 Z" />
     <path
-        android:fillColor="@color/white"
+        android:fillColor="?attr/iconColor"
         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
diff --git a/res/drawable/ic_settings_sound.xml b/res/drawable/ic_settings_sound.xml
index 4eeb9fd8c..eb4002760 100644
--- a/res/drawable/ic_settings_sound.xml
+++ b/res/drawable/ic_settings_sound.xml
@@ -6,7 +6,7 @@
     android:viewportHeight="24">
 
     <path
-        android:fillColor="@color/white"
+        android:fillColor="?attr/iconColor"
         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" />
diff --git a/res/drawable/ic_settings_stabilization.xml b/res/drawable/ic_settings_stabilization.xml
index 0ec3ca4aa..a193e74d9 100644
--- a/res/drawable/ic_settings_stabilization.xml
+++ b/res/drawable/ic_settings_stabilization.xml
@@ -6,7 +6,7 @@
     android:viewportHeight="24">
 
     <path
-        android:fillColor="@color/white"
+        android:fillColor="?attr/iconColor"
         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
diff --git a/res/drawable/ic_settings_storage.xml b/res/drawable/ic_settings_storage.xml
index a880b4207..67bf561c1 100644
--- a/res/drawable/ic_settings_storage.xml
+++ b/res/drawable/ic_settings_storage.xml
@@ -6,7 +6,7 @@
     android:viewportHeight="24">
 
     <path
-        android:fillColor="@color/white"
+        android:fillColor="?attr/iconColor"
         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_wb_api2.xml b/res/drawable/ic_settings_wb_api2.xml
new file mode 100644
index 000000000..ef2199abd
--- /dev/null
+++ b/res/drawable/ic_settings_wb_api2.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="?attr/iconColor"
+        android:pathData="M21.9457,18.9713H2.0543c-0.9179,0 -1.6731,-0.732 -1.6731,-1.6383V6.667c0,-0.9063 0.7552,-1.6383 1.6731,-1.6383H21.9457c0.9179,0 1.6731,0.732 1.6731,1.6383V17.333c0,0.9063 -0.7552,1.6383 -1.6731,1.6383M2.0543,6.1209c-0.3021,0 -0.5577,0.244 -0.5577,0.5461V17.3447c0,0.2905 0.2556,0.5345 0.5577,0.5345H21.9457c0.3021,0 0.5577,-0.244 0.5577,-0.5345V6.667c0,-0.3021 -0.2556,-0.5461 -0.5577,-0.5461H2.0543M3.739,15.7064" />
+    <path
+        android:fillColor="?attr/iconColor"
+        android:pathData="M20.1525,10.654V9.3772A1.7024,1.7024 0,0 0,18.4501 7.6748h-3.4048v8.5119h3.4048A1.7024,1.7024 0,0 0,20.1525 14.4843V13.2076c0,-0.681 -0.5958,-1.2768 -1.2768,-1.2768 0.681,0 1.2768,-0.5958 1.2768,-1.2768m-1.7024,3.8304h-1.7024v-1.7024h1.7024v1.7024m0,-3.4048H16.7477V9.3772h1.7024z" />
+    <path
+        android:fillColor="?attr/iconColor"
+        android:pathData="M5.55,16.187A1.7025,1.7025 0,0 1,3.8475 14.4845V7.6746h1.7025V14.4845H7.2525V8.5258H8.955V14.4845H10.6574V7.6746h1.7025v6.8099a1.7025,1.7025 0,0 1,-1.7025 1.7025z" />
+</vector>
+
diff --git a/res/drawable/ic_settings_zoom.xml b/res/drawable/ic_settings_zoom.xml
index b43d55b99..99a7625fb 100644
--- a/res/drawable/ic_settings_zoom.xml
+++ b/res/drawable/ic_settings_zoom.xml
@@ -1,10 +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>
+<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_switch_bokeh.xml b/res/drawable/ic_switch_bokeh.xml
new file mode 100644
index 000000000..b6619eb99
--- /dev/null
+++ b/res/drawable/ic_switch_bokeh.xml
@@ -0,0 +1,14 @@
+<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="M19.5517,2.5838 L3.1217,19.0138c0.09,0.34 0.27,0.65 0.51,0.9 0.25,0.24 0.56,0.42 0.9,0.51L20.9717,3.9938c-0.19,-0.69 -0.73,-1.23 -1.42,-1.41zM11.9217,2.5038 L3.0417,11.3838v2.83L14.7517,2.5038ZM5.0417,2.5038c-1.1,0 -2,0.9 -2,2v2l4,-4zM19.0417,20.5038c0.55,0 1.05,-0.22 1.41,-0.59 0.37,-0.36 0.59,-0.86 0.59,-1.41v-2l-4,4zM9.3317,20.5038h2.83l8.88,-8.88L21.0417,8.7938Z"
+        android:fillColor="#b1b1b1"/>
+    <path
+        android:pathData="m12.0004,11.421c2.21,0 4,-1.79 4,-4 0,-2.21 -1.79,-4 -4,-4 -2.21,0 -4,1.79 -4,4 0,2.21 1.79,4 4,4zM12.0004,13.421c-2.67,0 -8,1.34 -8,4v2L20.0004,19.421v-2c0,-2.66 -5.33,-4 -8,-4z"
+        android:fillColor="@color/white"/>
+</vector>
+
diff --git a/res/drawable/ic_switch_hfr.xml b/res/drawable/ic_switch_hfr.xml
new file mode 100644
index 000000000..db984715e
--- /dev/null
+++ b/res/drawable/ic_switch_hfr.xml
@@ -0,0 +1,20 @@
+<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="M21.1128,5L2.9503,5C1.5233,5 0.3557,5.9 0.3557,7v10c0,1.1 1.1676,2 2.5946,2L21.1128,19c1.427,0 2.5946,-0.9 2.5946,-2L23.7074,7c0,-1.1 -1.1676,-2 -2.5946,-2zM21.1128,17L2.9503,17L2.9503,7L21.1128,7Z" />
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M8.872,14.8556H8.0985V12.0079H5.1962v2.8477H4.4227V9.0392H5.1962V11.3204H8.0985V9.0392h0.7734z"/>
+    <path
+        android:fillColor="@color/white"
+        android:pathData="m14.1493,9.7267h-2.9414v1.6406h2.5273v0.6875h-2.5273v2.8008H10.4345V9.0392h3.7148z" />
+    <path
+        android:fillColor="@color/white"
+        android:pathData="m19.8446,14.8556h-1.0039l-1.9453,-2.3125h-1.0898v2.3125L15.0321,14.8556L15.0321,9.0392h1.6289q0.5273,0 0.8789,0.0703 0.3516,0.0664 0.6328,0.2422 0.3164,0.1992 0.4922,0.5039 0.1797,0.3008 0.1797,0.7656 0,0.6289 -0.3164,1.0547 -0.3164,0.4219 -0.8711,0.6367zM18.036,10.6759q0,-0.25 -0.0898,-0.4414 -0.0859,-0.1953 -0.2891,-0.3281 -0.168,-0.1133 -0.3984,-0.1563 -0.2305,-0.0469 -0.543,-0.0469h-0.9102v2.1953h0.7813q0.3672,0 0.6406,-0.0625 0.2734,-0.0664 0.4648,-0.2422 0.1758,-0.1641 0.2578,-0.375 0.0859,-0.2148 0.0859,-0.543z" />
+</vector>
+
diff --git a/res/drawable/ic_switch_promode.xml b/res/drawable/ic_switch_promode.xml
new file mode 100644
index 000000000..abe9901e3
--- /dev/null
+++ b/res/drawable/ic_switch_promode.xml
@@ -0,0 +1,11 @@
+<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.4,10.5l4.77,-8.26C13.47,2.09 12.75,2 12,2c-2.4,0 -4.6,0.85 -6.32,2.25l3.66,6.35 0.06,-0.1zM21.54,9c-0.92,-2.92 -3.15,-5.26 -6,-6.34L11.88,9h9.66zM21.8,10h-7.49l0.29,0.5 4.76,8.25C21,16.97 22,14.61 22,12c0,-0.69 -0.07,-1.35 -0.2,-2zM8.54,12l-3.9,-6.75C3.01,7.03 2,9.39 2,12c0,0.69 0.07,1.35 0.2,2h7.49l-1.15,-2zM2.46,15c0.92,2.92 3.15,5.26 6,6.34L12.12,15L2.46,15zM13.73,15l-3.9,6.76c0.7,0.15 1.42,0.24 2.17,0.24 2.4,0 4.6,-0.85 6.32,-2.25l-3.66,-6.35 -0.93,1.6z"/>
+</vector>
+
diff --git a/res/drawable/ic_switch_sat.xml b/res/drawable/ic_switch_sat.xml
new file mode 100644
index 000000000..4112d1beb
--- /dev/null
+++ b/res/drawable/ic_switch_sat.xml
@@ -0,0 +1,20 @@
+<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="M21.1229,4.959L2.9605,4.959c-1.427,0 -2.5946,0.9 -2.5946,2L0.3659,16.959c0,1.1 1.1676,2 2.5946,2L21.1229,18.959c1.427,0 2.5946,-0.9 2.5946,-2L23.7176,6.959c0,-1.1 -1.1676,-2 -2.5946,-2zM21.1229,16.959L2.9605,16.959L2.9605,6.959L21.1229,6.959Z"/>
+    <path
+        android:fillColor="@color/white"
+        android:pathData="m9.2286,13.1127q0,0.3398 -0.1602,0.6719 -0.1563,0.332 -0.4414,0.5625 -0.3125,0.25 -0.7305,0.3906 -0.4141,0.1406 -1,0.1406 -0.6289,0 -1.1328,-0.1172 -0.5,-0.1172 -1.0195,-0.3477v-0.9688h0.0547q0.4414,0.3672 1.0195,0.5664 0.5781,0.1992 1.0859,0.1992 0.7188,0 1.1172,-0.2695 0.4023,-0.2695 0.4023,-0.7188 0,-0.3867 -0.1914,-0.5703 -0.1875,-0.1836 -0.5742,-0.2852Q7.3653,12.2885 7.0216,12.2377 6.6818,12.1869 6.2989,12.1088 5.5255,11.9447 5.1505,11.5502 4.7794,11.1518 4.7794,10.515q0,-0.7305 0.6172,-1.1953 0.6172,-0.4688 1.5664,-0.4688 0.6133,0 1.125,0.1172 0.5117,0.1172 0.9063,0.2891v0.9141h-0.0547q-0.332,-0.2813 -0.875,-0.4648 -0.5391,-0.1875 -1.1055,-0.1875 -0.6211,0 -1,0.2578 -0.375,0.2578 -0.375,0.6641 0,0.3633 0.1875,0.5703 0.1875,0.207 0.6602,0.3164 0.25,0.0547 0.7109,0.1328 0.4609,0.0781 0.7813,0.1602 0.6484,0.1719 0.9766,0.5195 0.3281,0.3477 0.3281,0.9727z"/>
+    <path
+        android:fillColor="@color/white"
+        android:pathData="m14.9786,14.7728h-0.8242l-0.5703,-1.6211h-2.5156l-0.5703,1.6211H9.713L11.8302,8.9564h1.0313zM13.3458,12.4877 L12.3263,9.6322 11.3028,12.4877Z"/>
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M19.5411,9.6439H17.463v5.1289H16.6896V9.6439h-2.0781v-0.6875h4.9297z"/>
+</vector>
+
diff --git a/res/drawable/ic_timer.xml b/res/drawable/ic_timer.xml
index 887adeb24..fea78389c 100644
--- a/res/drawable/ic_timer.xml
+++ b/res/drawable/ic_timer.xml
@@ -8,7 +8,7 @@
     <path
         android:pathData="M0 0h24v24H0z" />
     <path
-        android:fillColor="@color/white"
+        android:fillColor="?attr/iconColor"
         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
diff --git a/res/drawable/icon_exposure.png b/res/drawable/icon_exposure.png
deleted file mode 100644
index ff5397251..000000000
--- a/res/drawable/icon_exposure.png
+++ /dev/null
diff --git a/res/drawable/icon_exposure_blue.png b/res/drawable/icon_exposure_blue.png
deleted file mode 100644
index 544b98ab4..000000000
--- a/res/drawable/icon_exposure_blue.png
+++ /dev/null
diff --git a/res/drawable/icon_iso.png b/res/drawable/icon_iso.png
deleted file mode 100644
index 85662af5e..000000000
--- a/res/drawable/icon_iso.png
+++ /dev/null
diff --git a/res/drawable/icon_iso_blue.png b/res/drawable/icon_iso_blue.png
deleted file mode 100644
index 001d8c9f5..000000000
--- a/res/drawable/icon_iso_blue.png
+++ /dev/null
diff --git a/res/drawable/icon_manual.png b/res/drawable/icon_manual.png
deleted file mode 100644
index 53e2ff5ec..000000000
--- a/res/drawable/icon_manual.png
+++ /dev/null
diff --git a/res/drawable/icon_manual_blue.png b/res/drawable/icon_manual_blue.png
deleted file mode 100644
index 52b2daa19..000000000
--- a/res/drawable/icon_manual_blue.png
+++ /dev/null
diff --git a/res/drawable/icon_white_balance_blue.png b/res/drawable/icon_white_balance_blue.png
deleted file mode 100644
index ca84b89d8..000000000
--- a/res/drawable/icon_white_balance_blue.png
+++ /dev/null
diff --git a/res/drawable/image_stabilization.png b/res/drawable/image_stabilization.png
deleted file mode 100644
index 80ddebcf8..000000000
--- a/res/drawable/image_stabilization.png
+++ /dev/null
diff --git a/res/drawable/incandecent.png b/res/drawable/incandecent.png
deleted file mode 100644
index d601e4b5c..000000000
--- a/res/drawable/incandecent.png
+++ /dev/null
diff --git a/res/drawable/incandecent_blue.png b/res/drawable/incandecent_blue.png
deleted file mode 100644
index 0c3eabf13..000000000
--- a/res/drawable/incandecent_blue.png
+++ /dev/null
diff --git a/res/drawable/promode.png b/res/drawable/promode.png
deleted file mode 100644
index 53e2ff5ec..000000000
--- a/res/drawable/promode.png
+++ /dev/null
diff --git a/res/drawable/promode.xml b/res/drawable/promode.xml
new file mode 100644
index 000000000..542d203ab
--- /dev/null
+++ b/res/drawable/promode.xml
@@ -0,0 +1,8 @@
+<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="M13.73,15L9.83,21.76C10.53,21.91 11.25,22 12,22C14.4,22 16.6,21.15 18.32,19.75L14.66,13.4M2.46,15C3.38,17.92 5.61,20.26 8.45,21.34L12.12,15M8.54,12L4.64,5.25C3,7 2,9.39 2,12C2,12.68 2.07,13.35 2.2,14H9.69M21.8,10H14.31L14.6,10.5L19.36,18.75C21,16.97 22,14.6 22,12C22,11.31 21.93,10.64 21.8,10M21.54,9C20.62,6.07 18.39,3.74 15.55,2.66L11.88,9M9.4,10.5L14.17,2.24C13.47,2.09 12.75,2 12,2C9.6,2 7.4,2.84 5.68,4.25L9.34,10.6L9.4,10.5Z" />
+</vector>
diff --git a/res/drawable/promode_exposure.xml b/res/drawable/promode_exposure.xml
deleted file mode 100644
index ff2afa49a..000000000
--- a/res/drawable/promode_exposure.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Copyright (c) 2017, 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.
-    -->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_selected="true" android:state_pressed="false"
-          android:drawable="@drawable/icon_exposure_blue" />
-    <item android:drawable="@drawable/icon_exposure" />
-</selector>
diff --git a/res/drawable/promode_iso.xml b/res/drawable/promode_iso.xml
deleted file mode 100644
index 26b31a5b8..000000000
--- a/res/drawable/promode_iso.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Copyright (c) 2017, 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.
-    -->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_selected="true" android:state_pressed="false"
-          android:drawable="@drawable/icon_iso_blue" />
-    <item android:drawable="@drawable/icon_iso" />
-</selector>
diff --git a/res/drawable/promode_manual.xml b/res/drawable/promode_manual.xml
deleted file mode 100644
index 133b43180..000000000
--- a/res/drawable/promode_manual.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Copyright (c) 2017, 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.
-    -->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_selected="true" android:state_pressed="false"
-          android:drawable="@drawable/icon_manual_blue" />
-    <item android:drawable="@drawable/icon_manual" />
-</selector>
diff --git a/res/drawable/promode_white_balance.xml b/res/drawable/promode_zoom.xml
index 91b98ac8c..5c56d72f2 100644
--- a/res/drawable/promode_white_balance.xml
+++ b/res/drawable/promode_zoom.xml
@@ -28,6 +28,7 @@
     -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_selected="true" android:state_pressed="false"
-          android:drawable="@drawable/icon_white_balance_blue" />
-    <item android:drawable="@drawable/icon_white_balance" />
+          android:drawable="@drawable/ic_settings_zoom"
+          android:tint="@color/blue" />
+    <item android:drawable="@drawable/ic_settings_zoom" />
 </selector>
diff --git a/res/drawable/selfie_flash.png b/res/drawable/selfie_flash.png
deleted file mode 100644
index 51d03b4f4..000000000
--- a/res/drawable/selfie_flash.png
+++ /dev/null
diff --git a/res/drawable/settings.png b/res/drawable/settings.png
deleted file mode 100644
index a6c699e0c..000000000
--- a/res/drawable/settings.png
+++ /dev/null
diff --git a/res/drawable/storage.png b/res/drawable/storage.png
deleted file mode 100644
index d17cf73a4..000000000
--- a/res/drawable/storage.png
+++ /dev/null
diff --git a/res/drawable/sunlight.png b/res/drawable/sunlight.png
deleted file mode 100644
index cc33dcc3d..000000000
--- a/res/drawable/sunlight.png
+++ /dev/null
diff --git a/res/drawable/sunlight_blue.png b/res/drawable/sunlight_blue.png
deleted file mode 100644
index c390ec653..000000000
--- a/res/drawable/sunlight_blue.png
+++ /dev/null
diff --git a/res/drawable/thumb_filter_point_blue.png b/res/drawable/thumb_filter_point_blue.png
index dd3456d6e..dd3456d6e 100755..100644
--- a/res/drawable/thumb_filter_point_blue.png
+++ b/res/drawable/thumb_filter_point_blue.png
diff --git a/res/drawable/thumb_filter_point_green.png b/res/drawable/thumb_filter_point_green.png
index 347b34a30..347b34a30 100755..100644
--- a/res/drawable/thumb_filter_point_green.png
+++ b/res/drawable/thumb_filter_point_green.png
diff --git a/res/drawable/thumb_filter_point_red_yellow.png b/res/drawable/thumb_filter_point_red_yellow.png
index d7d78cc53..d7d78cc53 100755..100644
--- a/res/drawable/thumb_filter_point_red_yellow.png
+++ b/res/drawable/thumb_filter_point_red_yellow.png
diff --git a/res/drawable/thumb_filter_vintage_cold.png b/res/drawable/thumb_filter_vintage_cold.png
index b0c241c08..b0c241c08 100755..100644
--- a/res/drawable/thumb_filter_vintage_cold.png
+++ b/res/drawable/thumb_filter_vintage_cold.png
diff --git a/res/drawable/thumb_filter_vintage_warm.png b/res/drawable/thumb_filter_vintage_warm.png
index 1ed75bff0..1ed75bff0 100755..100644
--- a/res/drawable/thumb_filter_vintage_warm.png
+++ b/res/drawable/thumb_filter_vintage_warm.png
diff --git a/res/drawable/thumb_filter_washed.png b/res/drawable/thumb_filter_washed.png
index 23c6342b4..23c6342b4 100755..100644
--- a/res/drawable/thumb_filter_washed.png
+++ b/res/drawable/thumb_filter_washed.png
diff --git a/res/drawable/version_info.png b/res/drawable/version_info.png
deleted file mode 100644
index 53f33d086..000000000
--- a/res/drawable/version_info.png
+++ /dev/null
diff --git a/res/drawable/version_info.xml b/res/drawable/version_info.xml
new file mode 100644
index 000000000..8ee4bfc7f
--- /dev/null
+++ b/res/drawable/version_info.xml
@@ -0,0 +1,24 @@
+<!--
+    Copyright (C) 2016 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.
+-->
+<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="?attr/iconColor"
+        android:pathData="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm1 15h-2v-6h2v6zm0-8h-2V7h2v2z"/>
+</vector>
diff --git a/res/drawable/video_encoding.png b/res/drawable/video_encoding.png
deleted file mode 100644
index b4d0a7439..000000000
--- a/res/drawable/video_encoding.png
+++ /dev/null