From 99bcbd1f8186d52d192bd6542a4a4663d68193cb Mon Sep 17 00:00:00 2001
From: Amit Kumar <mr.doc10jl96@gmail.com>
Date: Fri, 7 Feb 2020 16:16:14 +0530
Subject: [PATCH 1/6] Update new icons

Change-Id: I1a006ba1fc528dc99cda30b8813df72401f3bc26
---
 AndroidManifest.xml                           |  4 +-
 res/drawable/ic_airplane.xml                  | 67 +++-----------
 res/drawable/ic_airplanemode_active.xml       | 44 ++++-----
 res/drawable/ic_apps.xml                      | 63 ++++++++-----
 res/drawable/ic_audio_alarm.xml               | 56 +++++++-----
 res/drawable/ic_audio_alarm_mute.xml          | 71 ++++++++++-----
 res/drawable/ic_audio_ring_notif_mute.xml     | 64 ++++++++-----
 res/drawable/ic_call_24dp.xml                 | 58 ++++++------
 res/drawable/ic_cast_24dp.xml                 | 56 ++++++------
 res/drawable/ic_development.xml               | 37 +++++---
 res/drawable/ic_fingerprint.xml               | 46 +++++-----
 res/drawable/ic_fingerprint_24dp.xml          | 52 ++++++-----
 res/drawable/ic_fingerprint_header.xml        | 43 ++++-----
 res/drawable/ic_fingerprint_list_icon.xml     | 51 ++++++-----
 res/drawable/ic_homepage_microg.xml           | 18 ++++
 res/drawable/ic_homepage_openkeychain.xml     | 26 ++++++
 res/drawable/ic_hotspot.xml                   | 90 +++++++------------
 res/drawable/ic_lock.xml                      | 35 ++++----
 res/drawable/ic_lock_list_icon.xml            | 40 ++++-----
 res/drawable/ic_media_stream.xml              | 52 ++++++-----
 res/drawable/ic_network_cell.xml              | 51 +++++------
 res/drawable/ic_notifications.xml             | 47 +++++-----
 res/drawable/ic_security_pattern_3x3.xml      | 63 ++++++++-----
 res/drawable/ic_security_pattern_4x4.xml      | 66 ++++++++------
 res/drawable/ic_security_pattern_5x5.xml      | 66 ++++++++------
 res/drawable/ic_security_pattern_6x6.xml      | 66 ++++++++------
 res/drawable/ic_settings_data_usage.xml       | 54 ++++++-----
 res/drawable/ic_settings_date_time.xml        | 83 ++++++++++++-----
 res/drawable/ic_settings_development.xml      | 41 +++++----
 res/drawable/ic_settings_gestures.xml         | 39 ++++----
 res/drawable/ic_settings_language.xml         | 49 ++++------
 res/drawable/ic_settings_memory.xml           | 85 ++++++++++--------
 res/drawable/ic_settings_multiuser.xml        | 40 ++++-----
 res/drawable/ic_settings_sim.xml              | 49 +++++-----
 res/drawable/ic_settings_sound.xml            | 49 +++++-----
 res/drawable/ic_settings_wireless.xml         | 48 ++++++----
 res/drawable/ic_storage_apps.xml              | 58 ++++++++----
 res/drawable/ic_system_update.xml             | 47 +++++-----
 res/drawable/ic_system_update_vd_theme_24.xml | 47 +++++-----
 res/drawable/ic_wifi_signal_0.xml             | 52 ++++++-----
 res/drawable/ic_wifi_signal_1.xml             | 51 +++++------
 res/drawable/ic_wifi_signal_2.xml             | 50 +++++------
 res/drawable/ic_wifi_signal_3.xml             | 49 +++++-----
 res/drawable/ic_wifi_signal_4.xml             | 42 ++++-----
 res/drawable/ic_wifi_signal_lock.xml          | 36 +++-----
 res/drawable/ic_wifi_tethering.xml            | 53 ++++++-----
 46 files changed, 1243 insertions(+), 1111 deletions(-)
 create mode 100644 res/drawable/ic_homepage_microg.xml
 create mode 100644 res/drawable/ic_homepage_openkeychain.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index f33ed8e0486..bc930799350 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -3312,7 +3312,7 @@
         <!-- /e/ specific changes -->
         <activity android:name="Settings$MicroGActivity"
             android:label="@string/micro_g"
-            android:icon="@drawable/ic_microg_settings">
+            android:icon="@drawable/ic_homepage_microg">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.MICROG_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -3328,7 +3328,7 @@
 
         <activity android:name="Settings$OpenKeychainActivity"
             android:label="@string/open_keychain"
-            android:icon="@drawable/ic_open_keychain">
+            android:icon="@drawable/ic_homepage_openkeychain">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.OPENKEYCHAIN_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
diff --git a/res/drawable/ic_airplane.xml b/res/drawable/ic_airplane.xml
index b3e0ba0b5e8..faa4575fd17 100644
--- a/res/drawable/ic_airplane.xml
+++ b/res/drawable/ic_airplane.xml
@@ -1,57 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2015 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:name="root"
-    android:alpha="1.0"
-    android:height="48dp"
-    android:width="48dp"
-    android:viewportHeight="48"
-    android:viewportWidth="48" >
-    <group
-        android:name="ic_signal_airplane"
-        android:translateX="21.9995"
-        android:translateY="25.73401" >
-        <group
-            android:name="ic_signal_airplane_pivot"
-            android:translateX="-23.21545"
-            android:translateY="-18.86649" >
-            <clip-path
-                android:name="mask"
-                android:pathData="M 37.8337860107,-40.4599914551 c 0.0,0.0 -35.8077850342,31.5523681641 -35.8077850342,31.5523681641 c 0.0,0.0 9.55097961426,9.55285644531 9.55097961426,9.55285644531 c 0.0,0.0 -2.61698913574,2.09387207031 -2.61698913574,2.09387207031 c 0.0,0.0 -9.75096130371,-9.56428527832 -9.75096130371,-9.56428527832 c 0.0,0.0 -34.6200408936,25.4699249268 -34.6200408936,25.4699249268 c 0.0,0.0 55.9664764404,69.742401123 55.9664764404,69.742401123 c 0.0,0.0 73.2448120117,-59.1047973633 73.2448120117,-59.1047973633 c 0.0,0.0 -55.9664916992,-69.7423400879 -55.9664916992,-69.7423400879 Z" />
-            <group
-                android:name="cross" >
-                <path
-                    android:name="cross_1"
-                    android:pathData="M 7.54049682617,3.9430847168 c 0.0,0.0 0.324981689453,0.399978637695 0.324981689453,0.399978637695 "
-                    android:strokeColor="#FFFFFFFF"
-                    android:strokeAlpha="0"
-                    android:strokeWidth="3.5"
-                    android:fillColor="#00000000" />
-            </group>
-            <group
-                android:name="plane"
-                android:translateX="23.481"
-                android:translateY="18.71151" >
-                <path
-                    android:name="plane_1"
-                    android:pathData="M 18.9439849854,7.98849487305 c 0.0,0.0 0.0,-4.0 0.0,-4.0 c 0.0,0.0 -16.0,-10.0 -16.0,-10.0 c 0.0,0.0 0.0,-11.0 0.0,-11.0 c 0.0,-1.70001220703 -1.30000305176,-3.0 -3.0,-3.0 c -1.69999694824,0.0 -3.0,1.29998779297 -3.0,3.0 c 0.0,0.0 0.0,11.0 0.0,11.0 c 0.0,0.0 -16.0,10.0 -16.0,10.0 c 0.0,0.0 0.0,4.0 0.0,4.0 c 0.0,0.0 16.0,-5.0 16.0,-5.0 c 0.0,0.0 0.0,11.0 0.0,11.0 c 0.0,0.0 -4.0,3.0 -4.0,3.0 c 0.0,0.0 0.0,3.0 0.0,3.0 c 0.0,0.0 7.0,-2.0 7.0,-2.0 c 0.0,0.0 7.0,2.0 7.0,2.0 c 0.0,0.0 0.0,-3.0 0.0,-3.0 c 0.0,0.0 -4.0,-3.0 -4.0,-3.0 c 0.0,0.0 0.0,-11.0 0.0,-11.0 c 0.0,0.0 16.0,5.0 16.0,5.0 Z"
-                    android:fillColor="#FFFFFFFF"
-                    android:fillAlpha="1" />
-            </group>
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="32"
+    android:viewportHeight="33">
+
+    <group>
+        <path
+            android:fillColor="#F2AE00"
+            android:pathData="M25.2477 32.5271H6.75229C3.02611 32.5271 0 29.501 0 25.7748V7.27939C0 3.55321 3.02611 0.5271 6.75229 0.5271H25.2477C28.9739 0.5271 32 3.55321 32 7.27939V25.7748C32 29.501 28.9739 32.5271 25.2477 32.5271Z" />
+        <group>
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M15.9889 6.22719C16.0556 6.22719 16.1444 6.22719 16.2111 6.24941C16.6778 6.36052 17.0111 6.7383 17.0556 7.20496C17.0778 7.3383 17.0556 7.47163 17.0556 7.60496C17.0556 9.58274 17.0556 10.4716 17.0556 12.4494C17.0556 12.6716 17.1222 12.7827 17.3222 12.8716C20.2111 14.4716 23.0778 16.0939 25.9667 17.6939C26.1444 17.7827 26.2111 17.8939 26.2111 18.0939C26.1889 18.7383 26.2111 19.405 26.2111 20.1161C23.1444 19.2272 20.1444 18.3605 17.1 17.4716C17.1 17.605 17.1 17.6939 17.1 17.7827C17.1 19.1827 17.1 21.6716 17.1 23.0716C17.1 23.2494 17.1444 23.3827 17.3 23.4939C17.9 23.9161 18.4778 24.3605 19.0778 24.805C19.2111 24.8939 19.2556 25.005 19.2556 25.1605C19.2556 25.6939 19.2556 26.2494 19.2556 26.805C19.1222 26.7605 19.0111 26.7383 18.9 26.6939C18.0111 26.405 17.1222 26.0939 16.2333 25.805C16.1667 25.7827 16.1 25.7827 16.0333 25.7827C15.9667 25.7827 15.9 25.7827 15.8333 25.805C14.9444 26.0939 14.0778 26.3827 13.1889 26.6716C13.0778 26.7161 12.9667 26.7383 12.8333 26.7827C12.8333 26.1605 12.8333 25.5827 12.8333 24.9827C12.8333 24.9161 12.9444 24.8272 13.0111 24.7827C13.6111 24.3383 14.2111 23.8939 14.8111 23.4272C14.8778 23.3827 14.9444 23.2716 14.9444 23.1827C14.9444 21.6939 14.9444 19.0716 14.9444 17.5827C14.9444 17.5605 14.9222 17.5383 14.9222 17.4939C11.8778 18.3605 8.85555 19.2494 5.81111 20.1161C5.81111 19.3605 5.81111 18.6716 5.81111 17.9605C5.81111 17.8716 5.92222 17.7827 6.01111 17.7383C8.34444 16.4272 10.6778 15.1161 13.0111 13.805C13.5667 13.4939 14.1444 13.1605 14.7 12.8494C14.8778 12.7605 14.9222 12.6494 14.9222 12.4494C14.9222 10.405 14.9222 9.44941 14.9222 7.40496C14.9222 7.18274 14.9889 6.9383 15.0778 6.7383C15.2556 6.42719 15.6333 6.22719 15.9889 6.22719ZM15.9889 4.67163C15.0111 4.67163 14.1222 5.22719 13.7 6.07163C13.5 6.47163 13.3889 6.96052 13.3889 7.42719C13.3889 9.22719 13.3889 10.1383 13.3889 11.8272C13.1667 11.9605 12.9444 12.0716 12.7222 12.205C12.5667 12.2939 12.4111 12.3827 12.2556 12.4716L11.2111 13.0494C9.23333 14.1605 7.25555 15.2716 5.27778 16.3827C4.65555 16.7161 4.3 17.3161 4.27778 17.9383C4.25555 18.4939 4.25555 19.0494 4.27778 19.6272V20.1383C4.27778 20.6272 4.5 21.0939 4.9 21.3827C5.14444 21.5605 5.47778 21.6716 5.81111 21.6716C5.96666 21.6716 6.1 21.6494 6.23333 21.605L11.7889 20.005L13.3667 19.5605C13.3667 20.5827 13.3667 21.6939 13.3667 22.5827C13.1889 22.7161 12.9889 22.8716 12.8111 23.005C12.5444 23.205 12.3 23.3827 12.0333 23.5827C11.3889 24.0716 11.2556 24.6272 11.2333 25.005C11.2111 25.4716 11.2333 25.9383 11.2333 26.405V26.8272C11.2333 27.3161 11.4778 27.7827 11.8556 28.0716C12.1222 28.2716 12.4556 28.3827 12.7889 28.3827C12.9444 28.3827 13.1 28.3605 13.2556 28.3161L13.3889 28.2716C13.4778 28.2494 13.5667 28.2272 13.6556 28.1827C13.9 28.0939 14.1222 28.0272 14.3667 27.9383C14.9 27.7605 15.4556 27.5605 16.0111 27.3827C16.5444 27.5605 17.1 27.7383 17.6111 27.9161C17.8778 28.005 18.1222 28.0939 18.3889 28.1827C18.5 28.2272 18.5889 28.2494 18.6778 28.2716C18.7222 28.2716 18.7444 28.2939 18.7889 28.2939C18.9222 28.3383 19.0778 28.3605 19.2111 28.3605C19.5444 28.3605 19.8778 28.2494 20.1444 28.0494C20.5444 27.7605 20.7667 27.2939 20.7667 26.805C20.7667 26.6494 20.7667 26.4939 20.7667 26.3161C20.7667 25.9161 20.7667 25.5383 20.7667 25.1605C20.7889 24.4939 20.4778 23.9161 19.9444 23.5161C19.6778 23.3161 19.4111 23.1383 19.1667 22.9383C18.9889 22.805 18.7889 22.6716 18.6111 22.5161C18.6111 21.6494 18.6111 20.5383 18.6111 19.5161L25.7444 21.5827C25.8778 21.6272 26.0333 21.6494 26.1667 21.6494C26.5 21.6494 26.8333 21.5383 27.1 21.3383C27.5 21.0494 27.7222 20.5827 27.7222 20.0939C27.7222 19.8939 27.7222 19.6939 27.7222 19.4939C27.7222 19.005 27.7222 18.5605 27.7222 18.0939C27.7444 17.3161 27.3667 16.6939 26.7 16.3161C25.2556 15.5161 23.8333 14.7161 22.3889 13.8939C21.1222 13.1827 19.8778 12.4939 18.6111 11.7827C18.6111 10.605 18.6111 9.80496 18.6111 8.76052V7.56052V7.49385C18.6111 7.36052 18.6111 7.20496 18.5889 7.00496C18.4778 5.87163 17.6556 4.9383 16.5444 4.69385C16.3667 4.69385 16.1889 4.67163 15.9889 4.67163Z" />
         </group>
     </group>
-</vector>
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_airplanemode_active.xml b/res/drawable/ic_airplanemode_active.xml
index 5bcab6b8888..faa4575fd17 100644
--- a/res/drawable/ic_airplanemode_active.xml
+++ b/res/drawable/ic_airplanemode_active.xml
@@ -1,28 +1,18 @@
-<!--
-    Copyright (C) 2017 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.
--->
+<?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.0"
-        android:viewportHeight="24.0"
-        android:tint="@color/green_1">
-    <path
-        android:pathData="M20.8,13.56L13.5,9V3.5C13.5,2.67,12.83,2,12,2s-1.5,0.67-1.5,1.5V9l-7.3,4.56c-0.43,0.27-0.7,0.75-0.7,1.27v0.49
-c0,0.34,0.33,0.58,0.65,0.48l7.35-2.3V19l-1.6,1.2c-0.25,0.19-0.4,0.49-0.4,0.8v0.67c0,0.17,0.14,0.28,0.31,0.24
-c1.94-0.55,1.3-0.37,3.19-0.91c1.21,0.35,1.99,0.57,3.19,0.91c0.17,0.04,0.31-0.07,0.31-0.24V21c0-0.31-0.15-0.61-0.4-0.8L13.5,19
-v-5.5l7.35,2.3c0.32,0.1,0.65-0.14,0.65-0.48v-0.49C21.5,14.31,21.23,13.83,20.8,13.56z"
-        android:fillColor="#FFFFFFFF"/>
-</vector>
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="32"
+    android:viewportHeight="33">
+
+    <group>
+        <path
+            android:fillColor="#F2AE00"
+            android:pathData="M25.2477 32.5271H6.75229C3.02611 32.5271 0 29.501 0 25.7748V7.27939C0 3.55321 3.02611 0.5271 6.75229 0.5271H25.2477C28.9739 0.5271 32 3.55321 32 7.27939V25.7748C32 29.501 28.9739 32.5271 25.2477 32.5271Z" />
+        <group>
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M15.9889 6.22719C16.0556 6.22719 16.1444 6.22719 16.2111 6.24941C16.6778 6.36052 17.0111 6.7383 17.0556 7.20496C17.0778 7.3383 17.0556 7.47163 17.0556 7.60496C17.0556 9.58274 17.0556 10.4716 17.0556 12.4494C17.0556 12.6716 17.1222 12.7827 17.3222 12.8716C20.2111 14.4716 23.0778 16.0939 25.9667 17.6939C26.1444 17.7827 26.2111 17.8939 26.2111 18.0939C26.1889 18.7383 26.2111 19.405 26.2111 20.1161C23.1444 19.2272 20.1444 18.3605 17.1 17.4716C17.1 17.605 17.1 17.6939 17.1 17.7827C17.1 19.1827 17.1 21.6716 17.1 23.0716C17.1 23.2494 17.1444 23.3827 17.3 23.4939C17.9 23.9161 18.4778 24.3605 19.0778 24.805C19.2111 24.8939 19.2556 25.005 19.2556 25.1605C19.2556 25.6939 19.2556 26.2494 19.2556 26.805C19.1222 26.7605 19.0111 26.7383 18.9 26.6939C18.0111 26.405 17.1222 26.0939 16.2333 25.805C16.1667 25.7827 16.1 25.7827 16.0333 25.7827C15.9667 25.7827 15.9 25.7827 15.8333 25.805C14.9444 26.0939 14.0778 26.3827 13.1889 26.6716C13.0778 26.7161 12.9667 26.7383 12.8333 26.7827C12.8333 26.1605 12.8333 25.5827 12.8333 24.9827C12.8333 24.9161 12.9444 24.8272 13.0111 24.7827C13.6111 24.3383 14.2111 23.8939 14.8111 23.4272C14.8778 23.3827 14.9444 23.2716 14.9444 23.1827C14.9444 21.6939 14.9444 19.0716 14.9444 17.5827C14.9444 17.5605 14.9222 17.5383 14.9222 17.4939C11.8778 18.3605 8.85555 19.2494 5.81111 20.1161C5.81111 19.3605 5.81111 18.6716 5.81111 17.9605C5.81111 17.8716 5.92222 17.7827 6.01111 17.7383C8.34444 16.4272 10.6778 15.1161 13.0111 13.805C13.5667 13.4939 14.1444 13.1605 14.7 12.8494C14.8778 12.7605 14.9222 12.6494 14.9222 12.4494C14.9222 10.405 14.9222 9.44941 14.9222 7.40496C14.9222 7.18274 14.9889 6.9383 15.0778 6.7383C15.2556 6.42719 15.6333 6.22719 15.9889 6.22719ZM15.9889 4.67163C15.0111 4.67163 14.1222 5.22719 13.7 6.07163C13.5 6.47163 13.3889 6.96052 13.3889 7.42719C13.3889 9.22719 13.3889 10.1383 13.3889 11.8272C13.1667 11.9605 12.9444 12.0716 12.7222 12.205C12.5667 12.2939 12.4111 12.3827 12.2556 12.4716L11.2111 13.0494C9.23333 14.1605 7.25555 15.2716 5.27778 16.3827C4.65555 16.7161 4.3 17.3161 4.27778 17.9383C4.25555 18.4939 4.25555 19.0494 4.27778 19.6272V20.1383C4.27778 20.6272 4.5 21.0939 4.9 21.3827C5.14444 21.5605 5.47778 21.6716 5.81111 21.6716C5.96666 21.6716 6.1 21.6494 6.23333 21.605L11.7889 20.005L13.3667 19.5605C13.3667 20.5827 13.3667 21.6939 13.3667 22.5827C13.1889 22.7161 12.9889 22.8716 12.8111 23.005C12.5444 23.205 12.3 23.3827 12.0333 23.5827C11.3889 24.0716 11.2556 24.6272 11.2333 25.005C11.2111 25.4716 11.2333 25.9383 11.2333 26.405V26.8272C11.2333 27.3161 11.4778 27.7827 11.8556 28.0716C12.1222 28.2716 12.4556 28.3827 12.7889 28.3827C12.9444 28.3827 13.1 28.3605 13.2556 28.3161L13.3889 28.2716C13.4778 28.2494 13.5667 28.2272 13.6556 28.1827C13.9 28.0939 14.1222 28.0272 14.3667 27.9383C14.9 27.7605 15.4556 27.5605 16.0111 27.3827C16.5444 27.5605 17.1 27.7383 17.6111 27.9161C17.8778 28.005 18.1222 28.0939 18.3889 28.1827C18.5 28.2272 18.5889 28.2494 18.6778 28.2716C18.7222 28.2716 18.7444 28.2939 18.7889 28.2939C18.9222 28.3383 19.0778 28.3605 19.2111 28.3605C19.5444 28.3605 19.8778 28.2494 20.1444 28.0494C20.5444 27.7605 20.7667 27.2939 20.7667 26.805C20.7667 26.6494 20.7667 26.4939 20.7667 26.3161C20.7667 25.9161 20.7667 25.5383 20.7667 25.1605C20.7889 24.4939 20.4778 23.9161 19.9444 23.5161C19.6778 23.3161 19.4111 23.1383 19.1667 22.9383C18.9889 22.805 18.7889 22.6716 18.6111 22.5161C18.6111 21.6494 18.6111 20.5383 18.6111 19.5161L25.7444 21.5827C25.8778 21.6272 26.0333 21.6494 26.1667 21.6494C26.5 21.6494 26.8333 21.5383 27.1 21.3383C27.5 21.0494 27.7222 20.5827 27.7222 20.0939C27.7222 19.8939 27.7222 19.6939 27.7222 19.4939C27.7222 19.005 27.7222 18.5605 27.7222 18.0939C27.7444 17.3161 27.3667 16.6939 26.7 16.3161C25.2556 15.5161 23.8333 14.7161 22.3889 13.8939C21.1222 13.1827 19.8778 12.4939 18.6111 11.7827C18.6111 10.605 18.6111 9.80496 18.6111 8.76052V7.56052V7.49385C18.6111 7.36052 18.6111 7.20496 18.5889 7.00496C18.4778 5.87163 17.6556 4.9383 16.5444 4.69385C16.3667 4.69385 16.1889 4.67163 15.9889 4.67163Z" />
+        </group>
+    </group>
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_apps.xml b/res/drawable/ic_apps.xml
index 883a5ff7570..09827cbdb2b 100644
--- a/res/drawable/ic_apps.xml
+++ b/res/drawable/ic_apps.xml
@@ -1,30 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright (C) 2017 The Android Open Source Project
+  Copyright (C) 2018 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
+  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
+       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.
--->
+  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.0"
-        android:viewportHeight="24.0"
-        android:tint="@color/blue_1">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+
+    <path
+        android:fillColor="#E83A52"
+        android:pathData="M25.2477 32H6.75229C3.02611 32 0 28.9739 0 25.2477V6.75229C0 3.02611 3.02611 0 6.75229 0H25.2477C28.9739 0 32 3.02611 32 6.75229V25.2477C32 28.9739 28.9739 32 25.2477 32Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M6.7749 7.5653C6.7749 7.12878 7.12878 6.7749 7.5653 6.7749H13.6401C14.0766 6.7749 14.4305 7.12878 14.4305 7.5653V13.6401C14.4305 14.0766 14.0766 14.4305 13.6401 14.4305H7.5653C7.12878 14.4305 6.7749 14.0766 6.7749 13.6401V7.5653ZM8.35571 8.35571V12.8497H12.8497V8.35571H8.35571Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M24.4348 7.56531H18.36V13.6401H24.4348V7.56531Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M17.5696 7.5653C17.5696 7.12878 17.9235 6.7749 18.36 6.7749H24.4348C24.8713 6.7749 25.2252 7.12878 25.2252 7.5653V13.6401C25.2252 14.0766 24.8713 14.4305 24.4348 14.4305H18.36C17.9235 14.4305 17.5696 14.0766 17.5696 13.6401V7.5653ZM19.1504 8.35571V12.8497H23.6444V8.35571H19.1504Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M6.7749 18.36C6.7749 17.9235 7.12878 17.5696 7.5653 17.5696H13.6401C14.0766 17.5696 14.4305 17.9235 14.4305 18.36V24.4348C14.4305 24.8713 14.0766 25.2252 13.6401 25.2252H7.5653C7.12878 25.2252 6.7749 24.8713 6.7749 24.4348V18.36ZM8.35571 19.1504V23.6444H12.8497V19.1504H8.35571Z" />
     <path
-        android:pathData="M6 8c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2zm6 12c1.1 0 2-.9 2-2s-.9-2-2-2-2
-.9-2 2 .9 2 2 2zm-6 0c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2zm0-6c1.1 0 2-.9
-2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2zm6 0c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2
-2zm4-8c0 1.1 .9 2 2 2s2-.9 2-2-.9-2-2-2-2 .9-2 2zm-4 2c1.1 0 2-.9
-2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2zm6 6c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2
-2zm0 6c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2z"
-        android:fillColor="#FFFFFFFF"/>
-</vector>
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M17.5696 18.36C17.5696 17.9235 17.9235 17.5696 18.36 17.5696H24.4348C24.8713 17.5696 25.2252 17.9235 25.2252 18.36V24.4348C25.2252 24.8713 24.8713 25.2252 24.4348 25.2252H18.36C17.9235 25.2252 17.5696 24.8713 17.5696 24.4348V18.36ZM19.1504 19.1504V23.6444H23.6444V19.1504H19.1504Z" />
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_audio_alarm.xml b/res/drawable/ic_audio_alarm.xml
index 09c2b682a61..8322313f2fc 100644
--- a/res/drawable/ic_audio_alarm.xml
+++ b/res/drawable/ic_audio_alarm.xml
@@ -1,25 +1,33 @@
-<!--
-Copyright (C) 2014 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.
--->
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="32.0dp"
-        android:height="32.0dp"
-        android:viewportWidth="48.0"
-        android:viewportHeight="48.0"
-        android:tint="@color/red_1">
-    <path
-        android:fillColor="@color/black"
-        android:pathData="M44.0,11.44l-9.19,-7.71 -2.57,3.06 9.19,7.71 2.57,-3.06zm-28.24,-4.66l-2.57,-3.06 -9.19,7.71 2.57,3.06 9.19,-7.71zm9.24,9.22l-3.0,0.0l0.0,12.0l9.49,5.71 1.51,-2.47 -8.0,-4.74l0.0,-10.5zm-1.01,-8.0c-9.95,0.0 -17.99,8.06 -17.99,18.0s8.04,18.0 17.99,18.0 18.01,-8.06 18.01,-18.0 -8.06,-18.0 -18.01,-18.0zm0.01,32.0c-7.73,0.0 -14.0,-6.27 -14.0,-14.0s6.27,-14.0 14.0,-14.0 14.0,6.27 14.0,14.0 -6.26,14.0 -14.0,14.0z"/>
-</vector>
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="32"
+    android:viewportHeight="33">
+
+    <group>
+        <path
+            android:fillColor="#FF7301"
+            android:pathData="M25.2477 32.5271H6.75229C3.02611 32.5271 0 29.501 0 25.7748V7.27939C0 3.55321 3.02611 0.5271 6.75229 0.5271H25.2477C28.9739 0.5271 32 3.55321 32 7.27939V25.7748C32 29.501 28.9739 32.5271 25.2477 32.5271Z" />
+        <group>
+            <path
+                android:fillColor="#0088ED"
+                android:pathData="M7.09998 8.14918C6.29998 8.94918 6.01109 9.9714 6.47776 10.4381L9.38887 7.52696C8.9222 7.06029 7.89998 7.34918 7.09998 8.14918Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M6.47781 11.2158C6.27781 11.2158 6.07781 11.1492 5.92226 10.9936C5.50003 10.5714 5.3667 9.92694 5.5667 9.21583C5.72226 8.66027 6.05559 8.0825 6.54448 7.59361C7.70004 6.46027 9.14448 6.19361 9.92226 6.97138C10.0778 7.12694 10.1445 7.30472 10.1445 7.52694C10.1445 7.72694 10.0556 7.92694 9.92226 8.0825L7.03337 10.9936C6.87781 11.1269 6.67781 11.2158 6.47781 11.2158Z" />
+            <path
+                android:fillColor="#0088ED"
+                android:pathData="M24.9001 8.14918C25.7001 8.94918 25.989 9.9714 25.5223 10.4381L22.6334 7.52696C23.0779 7.06029 24.1001 7.34918 24.9001 8.14918Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M25.5223 11.2159C25.3223 11.2159 25.1223 11.1492 24.9667 10.9937L22.0778 8.08256C21.9223 7.92701 21.8556 7.74923 21.8556 7.52701C21.8556 7.32701 21.9445 7.12701 22.0778 6.97145C22.5 6.54923 23.1445 6.4159 23.8556 6.6159C24.4111 6.77145 24.9889 7.12701 25.4778 7.59367C25.9667 8.08256 26.3 8.66034 26.4556 9.2159C26.6556 9.92701 26.5223 10.5715 26.1 10.9937C25.9223 11.127 25.7223 11.2159 25.5223 11.2159Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M16.0111 9.26039C20.3444 9.26039 23.8778 12.7715 23.8778 17.1271C23.8555 21.4604 20.3444 24.9715 16.0111 24.9715C11.6555 24.9715 8.14442 21.4604 8.14442 17.1271C8.14442 12.7715 11.6555 9.26039 16.0111 9.26039ZM16.0111 7.70483C10.8111 7.70483 6.58887 11.9271 6.58887 17.1271C6.58887 22.3048 10.8111 26.5271 16.0111 26.5271C21.2111 26.5271 25.4333 22.3048 25.4333 17.1048C25.4111 11.9271 21.1889 7.70483 16.0111 7.70483Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M16.0112 17.9048H12.3446C11.9223 17.9048 11.5668 17.5492 11.5668 17.127C11.5668 16.7048 11.9223 16.3492 12.3446 16.3492H15.2112V11.7936C15.2112 11.3714 15.5668 11.0159 15.989 11.0159C16.4112 11.0159 16.7668 11.3714 16.7668 11.7936V17.127C16.789 17.5492 16.4334 17.9048 16.0112 17.9048Z" />
+        </group>
+    </group>
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_audio_alarm_mute.xml b/res/drawable/ic_audio_alarm_mute.xml
index 6dd01ad1a89..04f8a89bbef 100644
--- a/res/drawable/ic_audio_alarm_mute.xml
+++ b/res/drawable/ic_audio_alarm_mute.xml
@@ -1,25 +1,48 @@
-<!--
-Copyright (C) 2014 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.
--->
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="32.0dp"
-        android:height="32.0dp"
-        android:viewportWidth="48.0"
-        android:viewportHeight="48.0"
-        android:tint="@color/red_1">
-    <path
-        android:fillColor="@color/black"
-        android:pathData="M24.0,12.0c7.73,0.0 14.0,6.27 14.0,14.0 0.0,1.69 -0.31,3.3 -0.86,4.8l3.04,3.04c1.16,-2.37 1.82,-5.03 1.82,-7.84 0.0,-9.94 -8.06,-18.0 -18.01,-18.0 -2.81,0.0 -5.46,0.66 -7.84,1.81l3.05,3.05c1.5,-0.55 3.11,-0.86 4.8,-0.86zm20.0,-0.56l-9.19,-7.71 -2.57,3.06 9.19,7.71 2.57,-3.06zm-38.16,-6.85l-2.55,2.54 2.66,2.66 -2.22,1.86 2.84,2.84 2.22,-1.86 1.6,1.6c-2.73,3.16 -4.39,7.27 -4.39,11.77 0.0,9.94 8.04,18.0 17.99,18.0 4.51,0.0 8.62,-1.67 11.77,-4.4l4.4,4.4 2.54,-2.55 -34.91,-34.91 -1.95,-1.95zm27.1,32.19c-2.43,2.01 -5.54,3.22 -8.94,3.22 -7.73,0.0 -14.0,-6.27 -14.0,-14.0 0.0,-3.4 1.21,-6.51 3.22,-8.94l19.72,19.72zm-16.91,-30.23l-2.84,-2.84 -1.7,1.43 2.84,2.84 1.7,-1.43z"/>
-</vector>
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="32"
+    android:viewportHeight="33">
+
+    <group>
+        <path
+            android:fillColor="#FF7301"
+            android:pathData="M25.2477 32.4495H6.75229C3.02611 32.4495 0 29.4234 0 25.6972V7.20176C0 3.47557 3.02611 0.449463 6.75229 0.449463H25.2477C28.9739 0.449463 32 3.47557 32 7.20176V25.6972C32 29.4234 28.9739 32.4495 25.2477 32.4495Z" />
+        <group>
+            <path
+                android:fillColor="#0088ED"
+                android:pathData="M24.9222 8.094C25.7222 8.894 26.0111 9.91622 25.5444 10.3829L22.6333 7.47178C23.0777 7.00511 24.1 7.294 24.9222 8.094Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M25.5445 11.1607C25.3445 11.1607 25.1445 11.094 24.9889 10.9385L22.0778 8.02738C21.7667 7.71627 21.7667 7.22738 22.0778 6.93849C22.5 6.51627 23.1445 6.38294 23.8556 6.58294C24.4111 6.73849 24.9889 7.09405 25.4778 7.56071C25.9667 8.0496 26.3223 8.62738 26.4556 9.18294C26.6556 9.89405 26.5223 10.5385 26.1 10.9607C25.9445 11.094 25.7445 11.1607 25.5445 11.1607Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M13.6557 17.872H12.3446C11.9223 17.872 11.5668 17.5164 11.5668 17.0942C11.5668 16.672 11.9223 16.3164 12.3446 16.3164H13.6557C14.0779 16.3164 14.4334 16.672 14.4334 17.0942C14.4334 17.5164 14.0779 17.872 13.6557 17.872Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M15.989 14.7829C15.5667 14.7829 15.2112 14.4274 15.2112 14.0051V11.7385C15.2112 11.3162 15.5667 10.9607 15.989 10.9607C16.4112 10.9607 16.7667 11.3162 16.7667 11.7385V13.9829C16.7667 14.4274 16.4112 14.7829 15.989 14.7829Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M24.5667 26.4276C24.3667 26.4276 24.1667 26.3609 24.0112 26.2053L5.9223 8.00533C5.61119 7.69422 5.61119 7.20533 5.9223 6.89422C6.23341 6.58311 6.7223 6.58311 7.03341 6.89422L25.1223 25.0942C25.4334 25.4053 25.4334 25.8942 25.1223 26.2053C24.9667 26.3609 24.7667 26.4276 24.5667 26.4276Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M23.6777 21.6495C23.5666 21.6495 23.4555 21.6273 23.3444 21.5607C22.9666 21.3607 22.7888 20.9162 22.9888 20.5162C24.4555 17.5162 23.8555 13.9384 21.4999 11.5829C19.1444 9.22733 15.5444 8.62733 12.5444 10.094C12.1666 10.294 11.6999 10.1162 11.4999 9.73844C11.2999 9.36066 11.4777 8.89399 11.8555 8.69399C15.4555 6.93844 19.7666 7.64955 22.5888 10.4718C25.411 13.294 26.1222 17.6051 24.3666 21.2051C24.2555 21.4718 23.9666 21.6495 23.6777 21.6495Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M15.9889 26.4275C13.5667 26.4275 11.1667 25.4942 9.36667 23.6942C6.54445 20.8719 5.83334 16.5608 7.58889 12.9608C7.78889 12.5831 8.23334 12.4053 8.63334 12.6053C9.01111 12.8053 9.18889 13.2497 8.98889 13.6497C7.52222 16.6497 8.12222 20.2275 10.4778 22.6053C12.8333 24.9608 16.4333 25.5608 19.4111 24.0942C19.7889 23.8942 20.2556 24.0719 20.4556 24.4497C20.6556 24.8275 20.4778 25.2942 20.1 25.4942C18.7889 26.1164 17.3889 26.4275 15.9889 26.4275Z" />
+            <path
+                android:fillColor="#0088ED"
+                android:pathData="M6.2334 9.96094C6.25562 10.1387 6.32229 10.272 6.4334 10.3832L6.54451 10.272L6.2334 9.96094Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M6.43337 11.1609C6.23337 11.1609 6.03337 11.0943 5.87781 10.9387C5.65559 10.7165 5.50003 10.4276 5.45559 10.0943C5.41115 9.76092 5.5667 9.42759 5.87781 9.27203C6.18892 9.11648 6.54448 9.18314 6.78892 9.40537L7.10003 9.71648C7.25559 9.87203 7.32226 10.0498 7.32226 10.272C7.32226 10.4943 7.23337 10.672 7.10003 10.8276L6.98892 10.9387C6.83337 11.0943 6.63337 11.1609 6.43337 11.1609Z" />
+            <path
+                android:fillColor="#0088ED"
+                android:pathData="M9.27778 7.53839L9.34444 7.47172C9.25555 7.38283 9.14444 7.31617 9.01111 7.29395L9.27778 7.53839Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M9.2778 8.31629C9.0778 8.31629 8.8778 8.2274 8.72224 8.09406L8.45557 7.8274C8.21113 7.58295 8.16668 7.20517 8.34446 6.89406C8.52224 6.58295 8.8778 6.44962 9.21113 6.53851C9.50002 6.60517 9.72224 6.73851 9.90002 6.91629C10.2111 7.2274 10.2111 7.71629 9.90002 8.00517L9.83335 8.07184C9.6778 8.24962 9.4778 8.31629 9.2778 8.31629ZM8.83335 7.98295L8.81113 8.0274L8.83335 8.04962V7.98295Z" />
+        </group>
+    </group>
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_audio_ring_notif_mute.xml b/res/drawable/ic_audio_ring_notif_mute.xml
index 0ae9f41e0b5..4398527d7dd 100644
--- a/res/drawable/ic_audio_ring_notif_mute.xml
+++ b/res/drawable/ic_audio_ring_notif_mute.xml
@@ -1,26 +1,42 @@
-<!--
-Copyright (C) 2014 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.
--->
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="32dp"
-        android:height="32dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0"
-        android:tint="@color/red_1">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="32"
+    android:viewportHeight="33">
 
-    <path
-        android:fillColor="@color/black"
-        android:pathData="M11.5,22.0c1.1,0.0 2.0,-0.9 2.0,-2.0l-4.0,0.0C9.5,21.1 10.4,22.0 11.5,22.0zM18.0,10.5c0.0,-3.1 -2.1,-5.6 -5.0,-6.3L13.0,3.5C13.0,2.7 12.3,2.0 11.5,2.0C10.7,2.0 10.0,2.7 10.0,3.5l0.0,0.7C9.5,4.3 9.0,4.5 8.6,4.7l9.4,9.4L18.0,10.5zM17.7,19.0l2.0,2.0l1.3,-1.3L4.3,3.0L3.0,4.3l2.9,2.9C5.3,8.2 5.0,9.3 5.0,10.5L5.0,16.0l-2.0,2.0l0.0,1.0L17.7,19.0z" />
-</vector>
+    <group>
+        <path
+            android:fillColor="#E83A52"
+            android:pathData="M25.2477 32.5593H6.75229C3.02611 32.5593 0 29.5332 0 25.807V7.31162C0 3.58544 3.02611 0.559326 6.75229 0.559326H25.2477C28.9739 0.559326 32 3.58544 32 7.31162V25.807C32 29.5332 28.9739 32.5593 25.2477 32.5593Z" />
+        <group>
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M11.7123 25.3968C13.2468 24.8052 14.1008 23.3137 13.6196 22.0655C13.1384 20.8172 11.5043 20.2848 9.96973 20.8764C8.43517 21.468 7.58124 22.9594 8.06244 24.2077C8.54363 25.4559 10.1777 25.9883 11.7123 25.3968Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M23.422 26.2702C23.222 26.2702 23.022 26.2035 22.8665 26.048L7.95538 11.1368C7.64427 10.8257 7.64427 10.3368 7.95538 10.048C8.26649 9.73684 8.75538 9.73684 9.06649 10.0257L23.9776 24.9368C24.2887 25.248 24.2887 25.7368 23.9776 26.0257C23.822 26.2035 23.622 26.2702 23.422 26.2702Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M23.2666 22.048C23.7777 21.6035 24.1555 21.0035 24.2444 20.3591C24.4444 18.9813 23.2888 17.8924 21.6888 17.9146C20.9777 17.9369 20.311 18.1591 19.7555 18.5369L23.2666 22.048Z" />
+            <path
+                android:fillColor="#0088ED"
+                android:pathData="M12.8444 18.5369C12.8444 20.1146 12.8444 21.3369 12.8666 22.7146V20.2924C12.8666 19.5813 12.8666 19.4035 12.8444 18.5369Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M12.8666 23.4924C12.4444 23.4924 12.0889 23.1368 12.0889 22.7146V21.5146C12.0889 20.5813 12.0889 19.6479 12.0889 18.5368C12.0889 18.2257 12.2666 17.959 12.5555 17.8257C12.8444 17.6924 13.1555 17.759 13.4 17.959C13.5555 18.1146 13.6666 18.3146 13.6666 18.5368C13.6666 19.0257 13.6666 19.2924 13.6666 19.559V20.2924V22.7146C13.6444 23.159 13.2889 23.4924 12.8666 23.4924Z" />
+            <path
+                android:fillColor="#0088ED"
+                android:pathData="M23.4222 11.6257C23.4222 14.3813 23.4222 17.6924 23.4445 20.0702V15.8257C23.4222 14.6035 23.4222 13.1368 23.4222 11.6257Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M23.4222 20.848C23 20.848 22.6444 20.4925 22.6444 20.0702C22.6444 17.6702 22.6222 14.3814 22.6222 11.6258C22.6222 11.2702 22.8444 10.9814 23.1777 10.8702C23.5111 10.7814 23.8666 10.9147 24.0444 11.2036C24.1333 11.3369 24.1555 11.4702 24.1555 11.6258V20.0702C24.2 20.4925 23.8666 20.848 23.4222 20.848Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M21.5332 7.78144C19.4443 8.42589 16.6443 9.38144 14.5332 10.0259C13.9109 10.2259 13.4665 10.5148 13.1998 10.9592L14.8887 12.6481C16.9332 12.0037 19.5554 11.1148 21.5332 10.5148C22.8221 10.1148 23.4221 10.537 23.4221 11.8926V9.137C23.4221 7.78144 22.8443 7.38144 21.5332 7.78144Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M14.8888 13.4036C14.6888 13.4036 14.4888 13.3147 14.3332 13.1814L12.6443 11.4925C12.3777 11.2258 12.3332 10.8258 12.5332 10.5147C12.911 9.93693 13.511 9.51471 14.2888 9.27027C15.2888 8.95915 16.4888 8.55915 17.6443 8.18138C18.8888 7.78138 20.1999 7.35915 21.2888 7.02582C22.1999 6.73693 22.8888 6.8036 23.4221 7.18138C23.9332 7.55915 24.1777 8.2036 24.1777 9.13693V11.8258V11.848C24.1777 12.2703 23.8221 12.6258 23.3999 12.6258C22.9777 12.6258 22.6221 12.2703 22.6221 11.848V11.8258C22.6221 11.248 22.4888 11.1369 22.4888 11.1369C22.4888 11.1369 22.3332 11.048 21.7555 11.2258C20.6666 11.5592 19.3777 11.9814 18.1332 12.3814C17.111 12.7147 16.0443 13.0703 15.111 13.3592C15.0443 13.3814 14.9777 13.4036 14.8888 13.4036ZM14.311 10.9592L15.0888 11.7369C15.8888 11.4703 16.7777 11.1814 17.6443 10.9147C18.8888 10.5147 20.1999 10.0925 21.2888 9.73693C21.7999 9.58138 22.2443 9.51471 22.6221 9.58138V9.13693C22.6221 8.55915 22.4888 8.42582 22.4888 8.42582C22.4888 8.42582 22.3332 8.33693 21.7555 8.51471C20.6888 8.84804 19.3999 9.27027 18.1555 9.67027C16.9999 10.048 15.7999 10.448 14.7777 10.7592C14.5999 10.8036 14.4443 10.8703 14.311 10.9592Z" />
+        </group>
+    </group>
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_call_24dp.xml b/res/drawable/ic_call_24dp.xml
index 26bbde5f3ca..5c337d4ef27 100644
--- a/res/drawable/ic_call_24dp.xml
+++ b/res/drawable/ic_call_24dp.xml
@@ -1,29 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-     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.0"
-        android:viewportHeight="24.0"
-        android:tint="?android:attr/colorAccent">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M6.62,10.79c1.44,2.83 3.76,5.14 6.59,6.59l2.2,-2.2c0.27,-0.27 0.67,-0.36
-        1.02,-0.24 1.12,0.37 2.33,0.57 3.57,0.57 0.55,0 1,0.45 1,1V20c0,0.55 -0.45,1 -1,1 -9.39,0
-         -17,-7.61 -17,-17 0,-0.55 0.45,-1 1,-1h3.5c0.55,0 1,0.45 1,1 0,1.25 0.2,2.45 0.57,3.57
-         0.11,0.35 0.03,0.74 -0.25,1.02l-2.2,2.2z"/>
-</vector>
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="32"
+    android:viewportHeight="33">
+
+    <group>
+        <path
+            android:fillColor="#2CCF69"
+            android:pathData="M25.2477 32.2327H6.75229C3.02611 32.2327 0 29.2066 0 25.4804V6.98496C0 3.25878 3.02611 0.232666 6.75229 0.232666H25.2477C28.9739 0.232666 32 3.25878 32 6.98496V25.4804C32 29.2066 28.9739 32.2327 25.2477 32.2327Z" />
+        <group>
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M7.66662 11.5772C6.91106 10.0661 7.53328 8.22162 9.0444 7.46606L11.7777 12.955C10.2666 13.7105 8.42217 13.0883 7.66662 11.5772Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M10.4222 14.0661C8.99996 14.0661 7.64441 13.2883 6.97774 11.9328C6.02218 10.0217 6.79996 7.71054 8.71107 6.77721C9.08885 6.57721 9.55552 6.73277 9.75552 7.13277L12.4889 12.6217C12.6888 12.9994 12.5333 13.4661 12.1333 13.6661C11.5777 13.9328 11 14.0661 10.4222 14.0661ZM8.35552 11.2217C8.62218 11.7772 9.08885 12.1772 9.66663 12.3772C9.99996 12.4883 10.3333 12.5105 10.6666 12.4883L8.75552 8.62166C8.11107 9.31054 7.91107 10.355 8.35552 11.2217Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M20.6223 24.5327C22.1334 25.2883 23.9778 24.6661 24.7334 23.155L19.2445 20.4216C18.4889 21.9327 19.1112 23.7772 20.6223 24.5327Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M21.9778 25.6217C21.4 25.6217 20.8223 25.4884 20.2667 25.2217C18.3778 24.2884 17.6001 21.955 18.5334 20.0661C18.7334 19.6884 19.2001 19.5328 19.5778 19.7106L25.0667 22.4439C25.4445 22.6439 25.6 23.1106 25.4223 23.4884C24.7556 24.8439 23.4 25.6217 21.9778 25.6217ZM20.9556 23.8439C21.8445 24.2884 22.8889 24.0884 23.5556 23.4439L19.6889 21.5328C19.6445 21.8661 19.6889 22.1995 19.8001 22.5328C20.0001 23.0884 20.4223 23.555 20.9556 23.8439Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M21.5111 25.777C18.7111 25.777 14.5111 23.0659 11.8445 20.3993C8.44448 16.9993 4.93337 11.0437 7.22226 8.75482C7.53337 8.44371 8.02226 8.44371 8.31115 8.75482C8.62226 9.06593 8.62226 9.55482 8.31115 9.84371C7.2667 10.9104 9.22226 15.577 12.9556 19.3104C14.7111 21.0659 16.8445 22.5993 18.8 23.4882C20.5111 24.2659 21.9334 24.4437 22.4223 23.9548C22.7334 23.6437 23.2223 23.6437 23.5111 23.9548C23.8223 24.2659 23.8223 24.7548 23.5111 25.0437C23.0223 25.5548 22.3111 25.777 21.5111 25.777Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M22.2 25.0883C19.4 25.0883 15.2 22.3772 12.5333 19.7105C10.6444 17.8217 9 15.5328 8.04445 13.4217C6.93334 10.955 6.88889 9.08832 7.91111 8.0661C8.22222 7.75499 8.71111 7.75499 9 8.0661C9.31111 8.37721 9.31111 8.8661 9 9.15499C8.51111 9.64388 8.68889 11.0661 9.46667 12.7772C10.3556 14.7328 11.8667 16.8439 13.6444 18.6217C15.4 20.3772 17.5333 21.9105 19.4889 22.7994C21.2 23.5772 22.6222 23.755 23.1111 23.2661C23.4222 22.955 23.9111 22.955 24.2 23.2661C24.5111 23.5772 24.5111 24.0661 24.2 24.355C23.7111 24.8661 23.0222 25.0883 22.2 25.0883Z" />
+        </group>
+    </group>
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_cast_24dp.xml b/res/drawable/ic_cast_24dp.xml
index 7468b49665c..2ac48ef5be5 100644
--- a/res/drawable/ic_cast_24dp.xml
+++ b/res/drawable/ic_cast_24dp.xml
@@ -1,31 +1,27 @@
-<!--
-  Copyright (C) 2017 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.
-  -->
-
+<?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.0"
-        android:viewportHeight="24.0"
-        android:tint="@color/blue_1">
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M1 18v2c0 .55 .45 1 1 1h2c0-1.66-1.34-3-3-3zm0-2.94c-.01 .51 .32 .93 .82 1.02
-2.08 .36 3.74 2 4.1 4.08 .09 .48 .5 .84 .99 .84 .61 0 1.09-.54 1-1.14a6.996
-6.996 0 0 0-5.8-5.78c-.59-.09-1.09 .38 -1.11 .98 zm0-4.03c-.01 .52 .34 .96 .85
-1.01 4.26 .43 7.68 3.82 8.1 8.08 .05 .5 .48 .88 .99 .88 .59 0 1.06-.51
-1-1.1-.52-5.21-4.66-9.34-9.87-9.85-.57-.05-1.05 .4 -1.07 .98 zM21 3H3c-1.1 0-2
-.9-2 2v3h2V5h18v14h-7v2h7c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2z"/>
-</vector>
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="32"
+    android:viewportHeight="33">
+
+    <group>
+        <path
+            android:fillColor="#0088ED"
+            android:pathData="M25.2477 32.155H6.75229C3.02611 32.155 0 29.1289 0 25.4027V6.90732C0 3.18114 3.02611 0.155029 6.75229 0.155029H25.2477C28.9739 0.155029 32 3.18114 32 6.90732V25.4027C32 29.1289 28.9739 32.155 25.2477 32.155Z" />
+        <group>
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M13.3889 24.1328H7.12226C6.70004 24.1328 6.34448 23.7772 6.34448 23.355V8.95502C6.34448 8.5328 6.70004 8.17725 7.12226 8.17725H24.8778C25.3 8.17725 25.6556 8.5328 25.6556 8.95502V12.0661C25.6556 12.4884 25.3 12.8439 24.8778 12.8439C24.4556 12.8439 24.1 12.4884 24.1 12.0661V9.7328H7.90004V22.5772H13.3889C13.8111 22.5772 14.1667 22.9328 14.1667 23.355C14.1667 23.7772 13.8111 24.1328 13.3889 24.1328Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M23.9 23.7995C24.6609 23.7995 25.2778 23.1826 25.2778 22.4217C25.2778 21.6608 24.6609 21.0439 23.9 21.0439C23.1391 21.0439 22.5222 21.6608 22.5222 22.4217C22.5222 23.1826 23.1391 23.7995 23.9 23.7995Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M19.5889 23.8439C19.1667 23.8439 18.8112 23.4883 18.8112 23.0661C18.8112 19.9105 21.3889 17.3328 24.5445 17.3328C24.9667 17.3328 25.3223 17.6883 25.3223 18.1105C25.3223 18.5328 24.9667 18.8883 24.5445 18.8883C22.2334 18.8883 20.3667 20.7772 20.3667 23.0661C20.3667 23.5105 20.0112 23.8439 19.5889 23.8439Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M16.4333 23.8439C16.0111 23.8439 15.6555 23.4884 15.6555 23.0661C15.6555 18.155 19.6555 14.155 24.5666 14.155C24.9889 14.155 25.3444 14.5106 25.3444 14.9328C25.3444 15.355 24.9666 15.7328 24.5444 15.7328C20.5 15.7328 17.2111 19.0217 17.2111 23.0661C17.2111 23.5106 16.8555 23.8439 16.4333 23.8439Z" />
+        </group>
+    </group>
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_development.xml b/res/drawable/ic_development.xml
index 2b1d161588e..64d71f16d36 100644
--- a/res/drawable/ic_development.xml
+++ b/res/drawable/ic_development.xml
@@ -1,15 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="32dp"
-        android:height="32dp"
-        android:viewportWidth="24"
-        android:viewportHeight="24"
-        android:tint="?android:attr/colorControlNormal">
-    <path
-        android:pathData="M0 0h24v24H0z" />
-    <path
-        android:pathData="M7 5h10v2h2V3c0-1.1-.9-1.99-2-1.99L7 1c-1.1 0-2 .9-2 2v4h2V5zm8.41 11.59L20
-12l-4.59-4.59L14 8.83 17.17 12 14 15.17l1.41 1.42zM10 15.17L6.83 12 10 8.83 8.59
-7.41 4 12l4.59 4.59L10 15.17zM17 19H7v-2H5v4c0 1.1 .9 2 2 2h10c1.1 0 2-.9
-2-2v-4h-2v2z"
-        android:fillColor="@android:color/black" />
-</vector>
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="32"
+    android:viewportHeight="33">
+
+    <group>
+        <path
+            android:fillColor="#A7B7C2"
+            android:pathData="M25.2477 32.906H6.75229C3.02611 32.906 0 29.8799 0 26.1537V7.6583C0 3.93212 3.02611 0.906006 6.75229 0.906006H25.2477C28.9739 0.906006 32 3.93212 32 7.6583V26.1537C32 29.8799 28.9739 32.906 25.2477 32.906Z" />
+        <group>
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M22.3889 21.5173C22.1889 21.5173 21.9889 21.4506 21.8333 21.295C21.5222 20.9839 21.5222 20.495 21.8333 20.1839L25.1222 16.9173L21.8555 13.6284C21.5444 13.3173 21.5444 12.8284 21.8555 12.5173C22.1666 12.2062 22.6555 12.2062 22.9666 12.5173L26.8111 16.3617C27.1222 16.6728 27.1222 17.1617 26.8111 17.4728L22.9444 21.295C22.7889 21.4506 22.5889 21.5173 22.3889 21.5173Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M9.61112 21.5173C9.41112 21.5173 9.21112 21.4506 9.05556 21.2951L5.21112 17.4506C4.90001 17.1395 4.90001 16.6506 5.21112 16.3395L9.05556 12.4951C9.36667 12.1839 9.85556 12.1839 10.1667 12.4951C10.4778 12.8062 10.4778 13.2951 10.1667 13.6062L6.85556 16.9173L10.1444 20.2062C10.4556 20.5173 10.4556 21.0062 10.1444 21.3173C10.0111 21.4506 9.81112 21.5173 9.61112 21.5173Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M13.8777 25.7839C13.8111 25.7839 13.7222 25.7839 13.6555 25.7394C13.2555 25.6061 13.0111 25.1839 13.1444 24.7616L18.0777 8.58387C18.2111 8.18387 18.6333 7.93942 19.0555 8.07275C19.4555 8.20609 19.7 8.62831 19.5666 9.05053L14.6111 25.2283C14.5222 25.5616 14.2111 25.7839 13.8777 25.7839Z" />
+        </group>
+    </group>
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_fingerprint.xml b/res/drawable/ic_fingerprint.xml
index 03bc0340714..048826b88d9 100644
--- a/res/drawable/ic_fingerprint.xml
+++ b/res/drawable/ic_fingerprint.xml
@@ -1,37 +1,31 @@
-<!--
-    Copyright (C) 2015 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
--->
-
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="32dp"
-        android:height="32dp"
-        android:viewportWidth="32.0"
-        android:viewportHeight="32.0">
+    android:width="32dp"
+    android:height="32dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+
+    <path
+        android:fillColor="#0088ED"
+        android:pathData="M25.2477 32H6.75229C3.02611 32 0 28.9739 0 25.2477V6.75229C0 3.02611 3.02611 0 6.75229 0H25.2477C28.9739 0 32 3.02611 32 6.75229V25.2477C32 28.9739 28.9739 32 25.2477 32Z" />
     <path
         android:fillColor="#ffffff"
-        android:pathData="M23.7,5.9c-0.1,0.0 -0.2,0.0 -0.3,-0.1C21.0,4.5 18.6,3.9 16.0,3.9c-2.5,0.0 -4.6,0.6 -6.9,1.9C8.8,6.0 8.3,5.9 8.1,5.5C7.9,5.2 8.0,4.7 8.4,4.5c2.5,-1.4 4.9,-2.1 7.7,-2.1c2.8,0.0 5.4,0.7 8.0,2.1c0.4,0.2 0.5,0.6 0.3,1.0C24.2,5.7 24.0,5.9 23.7,5.9z"/>
+        android:fillType="evenOdd"
+        android:pathData="M12.4679 15.2329C13.1843 14.2754 14.3147 13.6401 15.8757 13.6401C17.5339 13.6401 18.7194 14.3627 19.4704 15.3326C20.1987 16.2734 20.5052 17.4252 20.5052 18.3373C20.5052 18.9885 20.3879 19.6171 20.0304 20.0986C19.6403 20.6239 19.0646 20.844 18.4502 20.844C18.0136 20.844 17.6598 20.4902 17.6598 20.0536C17.6598 19.6171 18.0136 19.2632 18.4502 19.2632C18.6713 19.2632 18.7279 19.2011 18.7613 19.1562C18.8271 19.0674 18.9244 18.8379 18.9244 18.3373C18.9244 17.7364 18.7115 16.9347 18.2204 16.3004C17.7519 15.6952 17.0178 15.2209 15.8757 15.2209C14.7946 15.2209 14.1408 15.6357 13.7337 16.1799C13.3018 16.7573 13.098 17.5521 13.098 18.3373C13.098 20.7474 13.7796 22.6033 14.9288 23.7928C15.9886 24.8711 17.428 25.4735 19.1502 25.4735C19.5868 25.4735 19.9406 25.8274 19.9406 26.2639C19.9406 26.7005 19.5868 27.0543 19.1502 27.0543C17.0345 27.0543 15.1776 26.3026 13.7987 24.8981L13.7966 24.896L13.7945 24.8939C12.2801 23.3282 11.5172 21.0296 11.5172 18.3373C11.5172 17.3159 11.7764 16.1573 12.4679 15.2329Z" />
     <path
         android:fillColor="#ffffff"
-        android:pathData="M5.3,13.2c-0.1,0.0 -0.3,0.0 -0.4,-0.1c-0.3,-0.2 -0.4,-0.7 -0.2,-1.0c1.3,-1.9 2.9,-3.4 4.9,-4.5c4.1,-2.2 9.3,-2.2 13.4,0.0c1.9,1.1 3.6,2.5 4.9,4.4c0.2,0.3 0.1,0.8 -0.2,1.0c-0.3,0.2 -0.8,0.1 -1.0,-0.2c-1.2,-1.7 -2.6,-3.0 -4.3,-4.0c-3.7,-2.0 -8.3,-2.0 -12.0,0.0c-1.7,0.9 -3.2,2.3 -4.3,4.0C5.7,13.1 5.5,13.2 5.3,13.2z"/>
+        android:fillType="evenOdd"
+        android:pathData="M11.8278 14.0152C10.852 15.042 10.2527 16.5272 10.2527 18.3373C10.2527 22.0095 11.4916 24.5396 13.2452 26.1301C13.5686 26.4234 13.593 26.9233 13.2997 27.2466C13.0064 27.5699 12.5066 27.5943 12.1832 27.3011C10.0526 25.3686 8.67188 22.3885 8.67188 18.3373C8.67188 16.1728 9.39366 14.2819 10.6818 12.9262C11.9727 11.5677 13.7881 10.7946 15.8758 10.7946C20.5646 10.7946 23.3508 14.6594 23.3508 18.3373C23.3508 19.8609 22.8897 21.2019 22.0156 22.172C21.1349 23.1494 19.888 23.6895 18.4503 23.6895C16.6212 23.6895 15.3816 22.1942 14.931 20.8394C14.6997 20.1436 14.627 19.361 14.8497 18.6732C15.088 17.9373 15.6592 17.3536 16.5527 17.1974C16.9828 17.1223 17.3923 17.4099 17.4674 17.8399C17.5426 18.2699 17.2549 18.6795 16.8249 18.7546C16.5555 18.8017 16.4266 18.9349 16.3536 19.1602C16.2651 19.4336 16.2701 19.8563 16.4311 20.3406C16.7653 21.3457 17.5694 22.1087 18.4503 22.1087C19.4741 22.1087 20.2823 21.7341 20.8412 21.1138C21.4068 20.4862 21.77 19.5463 21.77 18.3373C21.77 15.3759 19.5428 12.3754 15.8758 12.3754C14.1922 12.3754 12.8008 12.9912 11.8278 14.0152Z" />
     <path
         android:fillColor="#ffffff"
-        android:pathData="M13.3,29.6c-0.2,0.0 -0.4,-0.1 -0.5,-0.2c-1.1,-1.2 -1.7,-2.0 -2.6,-3.6c-0.9,-1.7 -1.4,-3.7 -1.4,-5.9c0.0,-4.1 3.3,-7.4 7.4,-7.4c4.1,0.0 7.4,3.3 7.4,7.4c0.0,0.4 -0.3,0.7 -0.7,0.7s-0.7,-0.3 -0.7,-0.7c0.0,-3.3 -2.7,-5.9 -5.9,-5.9c-3.3,0.0 -5.9,2.7 -5.9,5.9c0.0,2.0 0.4,3.8 1.2,5.2c0.8,1.6 1.4,2.2 2.4,3.3c0.3,0.3 0.3,0.8 0.0,1.0C13.7,29.5 13.5,29.6 13.3,29.6z"/>
+        android:fillType="evenOdd"
+        android:pathData="M6.4374 16.5546C6.87318 16.5803 7.20566 16.9543 7.18003 17.3901C7.15721 17.7779 7.13622 18.1386 7.13622 18.4954C7.13622 19.8531 7.24571 21.0907 7.46126 22.2331C7.5422 22.6621 7.26007 23.0754 6.83111 23.1564C6.40215 23.2373 5.9888 22.9552 5.90787 22.5262C5.67176 21.2748 5.55542 19.938 5.55542 18.4954C5.55542 18.0882 5.57915 17.6848 5.60133 17.3078L5.60195 17.2973C5.62758 16.8615 6.00163 16.529 6.4374 16.5546Z" />
     <path
         android:fillColor="#ffffff"
-        android:pathData="M22.6,27.1c-1.6,0.0 -2.9,-0.4 -4.1,-1.2c-1.9,-1.4 -3.1,-3.6 -3.1,-6.0c0.0,-0.4 0.3,-0.7 0.7,-0.7s0.7,0.3 0.7,0.7c0.0,1.9 0.9,3.7 2.5,4.8c0.9,0.6 1.9,1.0 3.2,1.0c0.3,0.0 0.8,0.0 1.3,-0.1c0.4,-0.1 0.8,0.2 0.8,0.6c0.1,0.4 -0.2,0.8 -0.6,0.8C23.4,27.1 22.8,27.1 22.6,27.1z"/>
+        android:fillType="evenOdd"
+        android:pathData="M15.808 9.37191C12.1607 9.37191 9.35645 11.2721 8.04075 14.2736C7.8655 14.6734 7.39932 14.8554 6.99952 14.6802C6.59972 14.5049 6.41769 14.0387 6.59294 13.6389C8.16786 10.0461 11.5513 7.79111 15.808 7.79111C20.3525 7.79111 23.839 10.4454 25.2717 13.7296C26.3844 16.2631 26.422 17.7068 26.422 18.518C26.422 20.6581 25.7884 22.5321 24.5694 23.8807C24.2767 24.2046 23.7769 24.2298 23.453 23.9371C23.1292 23.6444 23.104 23.1446 23.3967 22.8207C24.3005 21.8207 24.8412 20.3525 24.8412 18.518C24.8412 17.8839 24.8337 16.6632 23.8239 14.3644L23.8231 14.3625C22.6359 11.6402 19.7091 9.37191 15.808 9.37191Z" />
     <path
         android:fillColor="#ffffff"
-        android:pathData="M20.0,29.9c-0.1,0.0 -0.1,0.0 -0.2,0.0c-2.1,-0.6 -3.4,-1.4 -4.8,-2.9c-1.8,-1.9 -2.8,-4.4 -2.8,-7.1c0.0,-2.2 1.8,-4.1 4.1,-4.1c2.2,0.0 4.1,1.8 4.1,4.1c0.0,1.4 1.2,2.6 2.6,2.6c1.4,0.0 2.6,-1.2 2.6,-2.6c0.0,-5.1 -4.2,-9.3 -9.3,-9.3c-3.6,0.0 -6.9,2.1 -8.4,5.4C7.3,17.1 7.0,18.4 7.0,19.8c0.0,1.1 0.1,2.7 0.9,4.9c0.1,0.4 -0.1,0.8 -0.4,0.9c-0.4,0.1 -0.8,-0.1 -0.9,-0.4c-0.6,-1.8 -0.9,-3.6 -0.9,-5.4c0.0,-1.6 0.3,-3.1 0.9,-4.4c1.7,-3.8 5.6,-6.3 9.8,-6.3c5.9,0.0 10.7,4.8 10.7,10.7c0.0,2.2 -1.8,4.1 -4.1,4.1s-4.0,-1.8 -4.0,-4.1c0.0,-1.4 -1.2,-2.6 -2.6,-2.6c-1.4,0.0 -2.6,1.2 -2.6,2.6c0.0,2.3 0.9,4.5 2.4,6.1c1.2,1.3 2.4,2.0 4.2,2.5c0.4,0.1 0.6,0.5 0.5,0.9C20.6,29.7 20.3,29.9 20.0,29.9z"/>
-</vector>
+        android:fillType="evenOdd"
+        android:pathData="M15.8081 6.0748C13.9042 6.0748 12.2161 6.53994 10.858 7.34243C10.4822 7.56451 9.99753 7.43987 9.77545 7.06406C9.55338 6.68824 9.67801 6.20355 10.0538 5.98148C11.6767 5.0225 13.647 4.494 15.8081 4.494C18.1926 4.494 20.2599 5.14578 21.9465 6.22135C22.3146 6.45606 22.4227 6.9447 22.188 7.31276C21.9533 7.68082 21.4647 7.78892 21.0966 7.55422C19.6668 6.64249 17.895 6.0748 15.8081 6.0748Z" />
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_fingerprint_24dp.xml b/res/drawable/ic_fingerprint_24dp.xml
index e52f0f5e6bb..2f635bc2358 100644
--- a/res/drawable/ic_fingerprint_24dp.xml
+++ b/res/drawable/ic_fingerprint_24dp.xml
@@ -1,25 +1,31 @@
-<!--
-  ~ 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
-  -->
+<?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.0"
-        android:viewportHeight="24.0"
-        android:tint="?android:attr/colorControlNormal">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+
     <path
-        android:pathData="M17.81,4.47c-0.08,0 -0.16,-0.02 -0.23,-0.06C15.66,3.42 14,3 12.01,3c-1.98,0 -3.86,0.47 -5.57,1.41 -0.24,0.13 -0.54,0.04 -0.68,-0.2 -0.13,-0.24 -0.04,-0.55 0.2,-0.68C7.82,2.52 9.86,2 12.01,2c2.13,0 3.99,0.47 6.03,1.52 0.25,0.13 0.34,0.43 0.21,0.67 -0.09,0.18 -0.26,0.28 -0.44,0.28zM3.5,9.72c-0.1,0 -0.2,-0.03 -0.29,-0.09 -0.23,-0.16 -0.28,-0.47 -0.12,-0.7 0.99,-1.4 2.25,-2.5 3.75,-3.27C9.98,4.04 14,4.03 17.15,5.65c1.5,0.77 2.76,1.86 3.75,3.25 0.16,0.22 0.11,0.54 -0.12,0.7 -0.23,0.16 -0.54,0.11 -0.7,-0.12 -0.9,-1.26 -2.04,-2.25 -3.39,-2.94 -2.87,-1.47 -6.54,-1.47 -9.4,0.01 -1.36,0.7 -2.5,1.7 -3.4,2.96 -0.08,0.14 -0.23,0.21 -0.39,0.21zM9.75,21.79c-0.13,0 -0.26,-0.05 -0.35,-0.15 -0.87,-0.87 -1.34,-1.43 -2.01,-2.64 -0.69,-1.23 -1.05,-2.73 -1.05,-4.34 0,-2.97 2.54,-5.39 5.66,-5.39s5.66,2.42 5.66,5.39c0,0.28 -0.22,0.5 -0.5,0.5s-0.5,-0.22 -0.5,-0.5c0,-2.42 -2.09,-4.39 -4.66,-4.39 -2.57,0 -4.66,1.97 -4.66,4.39 0,1.44 0.32,2.77 0.93,3.85 0.64,1.15 1.08,1.64 1.85,2.42 0.19,0.2 0.19,0.51 0,0.71 -0.11,0.1 -0.24,0.15 -0.37,0.15zM16.92,19.94c-1.19,0 -2.24,-0.3 -3.1,-0.89 -1.49,-1.01 -2.38,-2.65 -2.38,-4.39 0,-0.28 0.22,-0.5 0.5,-0.5s0.5,0.22 0.5,0.5c0,1.41 0.72,2.74 1.94,3.56 0.71,0.48 1.54,0.71 2.54,0.71 0.24,0 0.64,-0.03 1.04,-0.1 0.27,-0.05 0.53,0.13 0.58,0.41 0.05,0.27 -0.13,0.53 -0.41,0.58 -0.57,0.11 -1.07,0.12 -1.21,0.12zM14.91,22c-0.04,0 -0.09,-0.01 -0.13,-0.02 -1.59,-0.44 -2.63,-1.03 -3.72,-2.1 -1.4,-1.39 -2.17,-3.24 -2.17,-5.22 0,-1.62 1.38,-2.94 3.08,-2.94 1.7,0 3.08,1.32 3.08,2.94 0,1.07 0.93,1.94 2.08,1.94s2.08,-0.87 2.08,-1.94c0,-3.77 -3.25,-6.83 -7.25,-6.83 -2.84,0 -5.44,1.58 -6.61,4.03 -0.39,0.81 -0.59,1.76 -0.59,2.8 0,0.78 0.07,2.01 0.67,3.61 0.1,0.26 -0.03,0.55 -0.29,0.64 -0.26,0.1 -0.55,-0.04 -0.64,-0.29 -0.49,-1.31 -0.73,-2.61 -0.73,-3.96 0,-1.2 0.23,-2.29 0.68,-3.24 1.33,-2.79 4.28,-4.6 7.51,-4.6 4.55,0 8.25,3.51 8.25,7.83 0,1.62 -1.38,2.94 -3.08,2.94s-3.08,-1.32 -3.08,-2.94c0,-1.07 -0.93,-1.94 -2.08,-1.94s-2.08,0.87 -2.08,1.94c0,1.71 0.66,3.31 1.87,4.51 0.95,0.94 1.86,1.46 3.27,1.85 0.27,0.07 0.42,0.35 0.35,0.61 -0.05,0.23 -0.26,0.38 -0.47,0.38z"
-        android:fillColor="#000000"/>
-</vector>
+        android:fillColor="#0088ED"
+        android:pathData="M25.2477 32H6.75229C3.02611 32 0 28.9739 0 25.2477V6.75229C0 3.02611 3.02611 0 6.75229 0H25.2477C28.9739 0 32 3.02611 32 6.75229V25.2477C32 28.9739 28.9739 32 25.2477 32Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M12.4679 15.2329C13.1843 14.2754 14.3147 13.6401 15.8757 13.6401C17.5339 13.6401 18.7194 14.3627 19.4704 15.3326C20.1987 16.2734 20.5052 17.4252 20.5052 18.3373C20.5052 18.9885 20.3879 19.6171 20.0304 20.0986C19.6403 20.6239 19.0646 20.844 18.4502 20.844C18.0136 20.844 17.6598 20.4902 17.6598 20.0536C17.6598 19.6171 18.0136 19.2632 18.4502 19.2632C18.6713 19.2632 18.7279 19.2011 18.7613 19.1562C18.8271 19.0674 18.9244 18.8379 18.9244 18.3373C18.9244 17.7364 18.7115 16.9347 18.2204 16.3004C17.7519 15.6952 17.0178 15.2209 15.8757 15.2209C14.7946 15.2209 14.1408 15.6357 13.7337 16.1799C13.3018 16.7573 13.098 17.5521 13.098 18.3373C13.098 20.7474 13.7796 22.6033 14.9288 23.7928C15.9886 24.8711 17.428 25.4735 19.1502 25.4735C19.5868 25.4735 19.9406 25.8274 19.9406 26.2639C19.9406 26.7005 19.5868 27.0543 19.1502 27.0543C17.0345 27.0543 15.1776 26.3026 13.7987 24.8981L13.7966 24.896L13.7945 24.8939C12.2801 23.3282 11.5172 21.0296 11.5172 18.3373C11.5172 17.3159 11.7764 16.1573 12.4679 15.2329Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M11.8278 14.0152C10.852 15.042 10.2527 16.5272 10.2527 18.3373C10.2527 22.0095 11.4916 24.5396 13.2452 26.1301C13.5686 26.4234 13.593 26.9233 13.2997 27.2466C13.0064 27.5699 12.5066 27.5943 12.1832 27.3011C10.0526 25.3686 8.67188 22.3885 8.67188 18.3373C8.67188 16.1728 9.39366 14.2819 10.6818 12.9262C11.9727 11.5677 13.7881 10.7946 15.8758 10.7946C20.5646 10.7946 23.3508 14.6594 23.3508 18.3373C23.3508 19.8609 22.8897 21.2019 22.0156 22.172C21.1349 23.1494 19.888 23.6895 18.4503 23.6895C16.6212 23.6895 15.3816 22.1942 14.931 20.8394C14.6997 20.1436 14.627 19.361 14.8497 18.6732C15.088 17.9373 15.6592 17.3536 16.5527 17.1974C16.9828 17.1223 17.3923 17.4099 17.4674 17.8399C17.5426 18.2699 17.2549 18.6795 16.8249 18.7546C16.5555 18.8017 16.4266 18.9349 16.3536 19.1602C16.2651 19.4336 16.2701 19.8563 16.4311 20.3406C16.7653 21.3457 17.5694 22.1087 18.4503 22.1087C19.4741 22.1087 20.2823 21.7341 20.8412 21.1138C21.4068 20.4862 21.77 19.5463 21.77 18.3373C21.77 15.3759 19.5428 12.3754 15.8758 12.3754C14.1922 12.3754 12.8008 12.9912 11.8278 14.0152Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M6.4374 16.5546C6.87318 16.5803 7.20566 16.9543 7.18003 17.3901C7.15721 17.7779 7.13622 18.1386 7.13622 18.4954C7.13622 19.8531 7.24571 21.0907 7.46126 22.2331C7.5422 22.6621 7.26007 23.0754 6.83111 23.1564C6.40215 23.2373 5.9888 22.9552 5.90787 22.5262C5.67176 21.2748 5.55542 19.938 5.55542 18.4954C5.55542 18.0882 5.57915 17.6848 5.60133 17.3078L5.60195 17.2973C5.62758 16.8615 6.00163 16.529 6.4374 16.5546Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M15.808 9.37191C12.1607 9.37191 9.35645 11.2721 8.04075 14.2736C7.8655 14.6734 7.39932 14.8554 6.99952 14.6802C6.59972 14.5049 6.41769 14.0387 6.59294 13.6389C8.16786 10.0461 11.5513 7.79111 15.808 7.79111C20.3525 7.79111 23.839 10.4454 25.2717 13.7296C26.3844 16.2631 26.422 17.7068 26.422 18.518C26.422 20.6581 25.7884 22.5321 24.5694 23.8807C24.2767 24.2046 23.7769 24.2298 23.453 23.9371C23.1292 23.6444 23.104 23.1446 23.3967 22.8207C24.3005 21.8207 24.8412 20.3525 24.8412 18.518C24.8412 17.8839 24.8337 16.6632 23.8239 14.3644L23.8231 14.3625C22.6359 11.6402 19.7091 9.37191 15.808 9.37191Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M15.8081 6.0748C13.9042 6.0748 12.2161 6.53994 10.858 7.34243C10.4822 7.56451 9.99753 7.43987 9.77545 7.06406C9.55338 6.68824 9.67801 6.20355 10.0538 5.98148C11.6767 5.0225 13.647 4.494 15.8081 4.494C18.1926 4.494 20.2599 5.14578 21.9465 6.22135C22.3146 6.45606 22.4227 6.9447 22.188 7.31276C21.9533 7.68082 21.4647 7.78892 21.0966 7.55422C19.6668 6.64249 17.895 6.0748 15.8081 6.0748Z" />
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_fingerprint_header.xml b/res/drawable/ic_fingerprint_header.xml
index e7ac81ab18f..048826b88d9 100644
--- a/res/drawable/ic_fingerprint_header.xml
+++ b/res/drawable/ic_fingerprint_header.xml
@@ -1,38 +1,31 @@
-<!--
-    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
--->
-
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="32dp"
     android:height="32dp"
-    android:tint="?android:attr/colorPrimary"
-    android:viewportHeight="32.0"
-    android:viewportWidth="32.0">
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+
+    <path
+        android:fillColor="#0088ED"
+        android:pathData="M25.2477 32H6.75229C3.02611 32 0 28.9739 0 25.2477V6.75229C0 3.02611 3.02611 0 6.75229 0H25.2477C28.9739 0 32 3.02611 32 6.75229V25.2477C32 28.9739 28.9739 32 25.2477 32Z" />
     <path
         android:fillColor="#ffffff"
-        android:pathData="M23.7,5.9c-0.1,0.0 -0.2,0.0 -0.3,-0.1C21.0,4.5 18.6,3.9 16.0,3.9c-2.5,0.0 -4.6,0.6 -6.9,1.9C8.8,6.0 8.3,5.9 8.1,5.5C7.9,5.2 8.0,4.7 8.4,4.5c2.5,-1.4 4.9,-2.1 7.7,-2.1c2.8,0.0 5.4,0.7 8.0,2.1c0.4,0.2 0.5,0.6 0.3,1.0C24.2,5.7 24.0,5.9 23.7,5.9z" />
+        android:fillType="evenOdd"
+        android:pathData="M12.4679 15.2329C13.1843 14.2754 14.3147 13.6401 15.8757 13.6401C17.5339 13.6401 18.7194 14.3627 19.4704 15.3326C20.1987 16.2734 20.5052 17.4252 20.5052 18.3373C20.5052 18.9885 20.3879 19.6171 20.0304 20.0986C19.6403 20.6239 19.0646 20.844 18.4502 20.844C18.0136 20.844 17.6598 20.4902 17.6598 20.0536C17.6598 19.6171 18.0136 19.2632 18.4502 19.2632C18.6713 19.2632 18.7279 19.2011 18.7613 19.1562C18.8271 19.0674 18.9244 18.8379 18.9244 18.3373C18.9244 17.7364 18.7115 16.9347 18.2204 16.3004C17.7519 15.6952 17.0178 15.2209 15.8757 15.2209C14.7946 15.2209 14.1408 15.6357 13.7337 16.1799C13.3018 16.7573 13.098 17.5521 13.098 18.3373C13.098 20.7474 13.7796 22.6033 14.9288 23.7928C15.9886 24.8711 17.428 25.4735 19.1502 25.4735C19.5868 25.4735 19.9406 25.8274 19.9406 26.2639C19.9406 26.7005 19.5868 27.0543 19.1502 27.0543C17.0345 27.0543 15.1776 26.3026 13.7987 24.8981L13.7966 24.896L13.7945 24.8939C12.2801 23.3282 11.5172 21.0296 11.5172 18.3373C11.5172 17.3159 11.7764 16.1573 12.4679 15.2329Z" />
     <path
         android:fillColor="#ffffff"
-        android:pathData="M5.3,13.2c-0.1,0.0 -0.3,0.0 -0.4,-0.1c-0.3,-0.2 -0.4,-0.7 -0.2,-1.0c1.3,-1.9 2.9,-3.4 4.9,-4.5c4.1,-2.2 9.3,-2.2 13.4,0.0c1.9,1.1 3.6,2.5 4.9,4.4c0.2,0.3 0.1,0.8 -0.2,1.0c-0.3,0.2 -0.8,0.1 -1.0,-0.2c-1.2,-1.7 -2.6,-3.0 -4.3,-4.0c-3.7,-2.0 -8.3,-2.0 -12.0,0.0c-1.7,0.9 -3.2,2.3 -4.3,4.0C5.7,13.1 5.5,13.2 5.3,13.2z" />
+        android:fillType="evenOdd"
+        android:pathData="M11.8278 14.0152C10.852 15.042 10.2527 16.5272 10.2527 18.3373C10.2527 22.0095 11.4916 24.5396 13.2452 26.1301C13.5686 26.4234 13.593 26.9233 13.2997 27.2466C13.0064 27.5699 12.5066 27.5943 12.1832 27.3011C10.0526 25.3686 8.67188 22.3885 8.67188 18.3373C8.67188 16.1728 9.39366 14.2819 10.6818 12.9262C11.9727 11.5677 13.7881 10.7946 15.8758 10.7946C20.5646 10.7946 23.3508 14.6594 23.3508 18.3373C23.3508 19.8609 22.8897 21.2019 22.0156 22.172C21.1349 23.1494 19.888 23.6895 18.4503 23.6895C16.6212 23.6895 15.3816 22.1942 14.931 20.8394C14.6997 20.1436 14.627 19.361 14.8497 18.6732C15.088 17.9373 15.6592 17.3536 16.5527 17.1974C16.9828 17.1223 17.3923 17.4099 17.4674 17.8399C17.5426 18.2699 17.2549 18.6795 16.8249 18.7546C16.5555 18.8017 16.4266 18.9349 16.3536 19.1602C16.2651 19.4336 16.2701 19.8563 16.4311 20.3406C16.7653 21.3457 17.5694 22.1087 18.4503 22.1087C19.4741 22.1087 20.2823 21.7341 20.8412 21.1138C21.4068 20.4862 21.77 19.5463 21.77 18.3373C21.77 15.3759 19.5428 12.3754 15.8758 12.3754C14.1922 12.3754 12.8008 12.9912 11.8278 14.0152Z" />
     <path
         android:fillColor="#ffffff"
-        android:pathData="M13.3,29.6c-0.2,0.0 -0.4,-0.1 -0.5,-0.2c-1.1,-1.2 -1.7,-2.0 -2.6,-3.6c-0.9,-1.7 -1.4,-3.7 -1.4,-5.9c0.0,-4.1 3.3,-7.4 7.4,-7.4c4.1,0.0 7.4,3.3 7.4,7.4c0.0,0.4 -0.3,0.7 -0.7,0.7s-0.7,-0.3 -0.7,-0.7c0.0,-3.3 -2.7,-5.9 -5.9,-5.9c-3.3,0.0 -5.9,2.7 -5.9,5.9c0.0,2.0 0.4,3.8 1.2,5.2c0.8,1.6 1.4,2.2 2.4,3.3c0.3,0.3 0.3,0.8 0.0,1.0C13.7,29.5 13.5,29.6 13.3,29.6z" />
+        android:fillType="evenOdd"
+        android:pathData="M6.4374 16.5546C6.87318 16.5803 7.20566 16.9543 7.18003 17.3901C7.15721 17.7779 7.13622 18.1386 7.13622 18.4954C7.13622 19.8531 7.24571 21.0907 7.46126 22.2331C7.5422 22.6621 7.26007 23.0754 6.83111 23.1564C6.40215 23.2373 5.9888 22.9552 5.90787 22.5262C5.67176 21.2748 5.55542 19.938 5.55542 18.4954C5.55542 18.0882 5.57915 17.6848 5.60133 17.3078L5.60195 17.2973C5.62758 16.8615 6.00163 16.529 6.4374 16.5546Z" />
     <path
         android:fillColor="#ffffff"
-        android:pathData="M22.6,27.1c-1.6,0.0 -2.9,-0.4 -4.1,-1.2c-1.9,-1.4 -3.1,-3.6 -3.1,-6.0c0.0,-0.4 0.3,-0.7 0.7,-0.7s0.7,0.3 0.7,0.7c0.0,1.9 0.9,3.7 2.5,4.8c0.9,0.6 1.9,1.0 3.2,1.0c0.3,0.0 0.8,0.0 1.3,-0.1c0.4,-0.1 0.8,0.2 0.8,0.6c0.1,0.4 -0.2,0.8 -0.6,0.8C23.4,27.1 22.8,27.1 22.6,27.1z" />
+        android:fillType="evenOdd"
+        android:pathData="M15.808 9.37191C12.1607 9.37191 9.35645 11.2721 8.04075 14.2736C7.8655 14.6734 7.39932 14.8554 6.99952 14.6802C6.59972 14.5049 6.41769 14.0387 6.59294 13.6389C8.16786 10.0461 11.5513 7.79111 15.808 7.79111C20.3525 7.79111 23.839 10.4454 25.2717 13.7296C26.3844 16.2631 26.422 17.7068 26.422 18.518C26.422 20.6581 25.7884 22.5321 24.5694 23.8807C24.2767 24.2046 23.7769 24.2298 23.453 23.9371C23.1292 23.6444 23.104 23.1446 23.3967 22.8207C24.3005 21.8207 24.8412 20.3525 24.8412 18.518C24.8412 17.8839 24.8337 16.6632 23.8239 14.3644L23.8231 14.3625C22.6359 11.6402 19.7091 9.37191 15.808 9.37191Z" />
     <path
         android:fillColor="#ffffff"
-        android:pathData="M20.0,29.9c-0.1,0.0 -0.1,0.0 -0.2,0.0c-2.1,-0.6 -3.4,-1.4 -4.8,-2.9c-1.8,-1.9 -2.8,-4.4 -2.8,-7.1c0.0,-2.2 1.8,-4.1 4.1,-4.1c2.2,0.0 4.1,1.8 4.1,4.1c0.0,1.4 1.2,2.6 2.6,2.6c1.4,0.0 2.6,-1.2 2.6,-2.6c0.0,-5.1 -4.2,-9.3 -9.3,-9.3c-3.6,0.0 -6.9,2.1 -8.4,5.4C7.3,17.1 7.0,18.4 7.0,19.8c0.0,1.1 0.1,2.7 0.9,4.9c0.1,0.4 -0.1,0.8 -0.4,0.9c-0.4,0.1 -0.8,-0.1 -0.9,-0.4c-0.6,-1.8 -0.9,-3.6 -0.9,-5.4c0.0,-1.6 0.3,-3.1 0.9,-4.4c1.7,-3.8 5.6,-6.3 9.8,-6.3c5.9,0.0 10.7,4.8 10.7,10.7c0.0,2.2 -1.8,4.1 -4.1,4.1s-4.0,-1.8 -4.0,-4.1c0.0,-1.4 -1.2,-2.6 -2.6,-2.6c-1.4,0.0 -2.6,1.2 -2.6,2.6c0.0,2.3 0.9,4.5 2.4,6.1c1.2,1.3 2.4,2.0 4.2,2.5c0.4,0.1 0.6,0.5 0.5,0.9C20.6,29.7 20.3,29.9 20.0,29.9z" />
-</vector>
+        android:fillType="evenOdd"
+        android:pathData="M15.8081 6.0748C13.9042 6.0748 12.2161 6.53994 10.858 7.34243C10.4822 7.56451 9.99753 7.43987 9.77545 7.06406C9.55338 6.68824 9.67801 6.20355 10.0538 5.98148C11.6767 5.0225 13.647 4.494 15.8081 4.494C18.1926 4.494 20.2599 5.14578 21.9465 6.22135C22.3146 6.45606 22.4227 6.9447 22.188 7.31276C21.9533 7.68082 21.4647 7.78892 21.0966 7.55422C19.6668 6.64249 17.895 6.0748 15.8081 6.0748Z" />
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_fingerprint_list_icon.xml b/res/drawable/ic_fingerprint_list_icon.xml
index ce1ce5e99e4..2f635bc2358 100644
--- a/res/drawable/ic_fingerprint_list_icon.xml
+++ b/res/drawable/ic_fingerprint_list_icon.xml
@@ -1,24 +1,31 @@
-<!--
-    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
-  -->
+<?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.0"
-        android:viewportHeight="24.0">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+
+    <path
+        android:fillColor="#0088ED"
+        android:pathData="M25.2477 32H6.75229C3.02611 32 0 28.9739 0 25.2477V6.75229C0 3.02611 3.02611 0 6.75229 0H25.2477C28.9739 0 32 3.02611 32 6.75229V25.2477C32 28.9739 28.9739 32 25.2477 32Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M12.4679 15.2329C13.1843 14.2754 14.3147 13.6401 15.8757 13.6401C17.5339 13.6401 18.7194 14.3627 19.4704 15.3326C20.1987 16.2734 20.5052 17.4252 20.5052 18.3373C20.5052 18.9885 20.3879 19.6171 20.0304 20.0986C19.6403 20.6239 19.0646 20.844 18.4502 20.844C18.0136 20.844 17.6598 20.4902 17.6598 20.0536C17.6598 19.6171 18.0136 19.2632 18.4502 19.2632C18.6713 19.2632 18.7279 19.2011 18.7613 19.1562C18.8271 19.0674 18.9244 18.8379 18.9244 18.3373C18.9244 17.7364 18.7115 16.9347 18.2204 16.3004C17.7519 15.6952 17.0178 15.2209 15.8757 15.2209C14.7946 15.2209 14.1408 15.6357 13.7337 16.1799C13.3018 16.7573 13.098 17.5521 13.098 18.3373C13.098 20.7474 13.7796 22.6033 14.9288 23.7928C15.9886 24.8711 17.428 25.4735 19.1502 25.4735C19.5868 25.4735 19.9406 25.8274 19.9406 26.2639C19.9406 26.7005 19.5868 27.0543 19.1502 27.0543C17.0345 27.0543 15.1776 26.3026 13.7987 24.8981L13.7966 24.896L13.7945 24.8939C12.2801 23.3282 11.5172 21.0296 11.5172 18.3373C11.5172 17.3159 11.7764 16.1573 12.4679 15.2329Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M11.8278 14.0152C10.852 15.042 10.2527 16.5272 10.2527 18.3373C10.2527 22.0095 11.4916 24.5396 13.2452 26.1301C13.5686 26.4234 13.593 26.9233 13.2997 27.2466C13.0064 27.5699 12.5066 27.5943 12.1832 27.3011C10.0526 25.3686 8.67188 22.3885 8.67188 18.3373C8.67188 16.1728 9.39366 14.2819 10.6818 12.9262C11.9727 11.5677 13.7881 10.7946 15.8758 10.7946C20.5646 10.7946 23.3508 14.6594 23.3508 18.3373C23.3508 19.8609 22.8897 21.2019 22.0156 22.172C21.1349 23.1494 19.888 23.6895 18.4503 23.6895C16.6212 23.6895 15.3816 22.1942 14.931 20.8394C14.6997 20.1436 14.627 19.361 14.8497 18.6732C15.088 17.9373 15.6592 17.3536 16.5527 17.1974C16.9828 17.1223 17.3923 17.4099 17.4674 17.8399C17.5426 18.2699 17.2549 18.6795 16.8249 18.7546C16.5555 18.8017 16.4266 18.9349 16.3536 19.1602C16.2651 19.4336 16.2701 19.8563 16.4311 20.3406C16.7653 21.3457 17.5694 22.1087 18.4503 22.1087C19.4741 22.1087 20.2823 21.7341 20.8412 21.1138C21.4068 20.4862 21.77 19.5463 21.77 18.3373C21.77 15.3759 19.5428 12.3754 15.8758 12.3754C14.1922 12.3754 12.8008 12.9912 11.8278 14.0152Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M6.4374 16.5546C6.87318 16.5803 7.20566 16.9543 7.18003 17.3901C7.15721 17.7779 7.13622 18.1386 7.13622 18.4954C7.13622 19.8531 7.24571 21.0907 7.46126 22.2331C7.5422 22.6621 7.26007 23.0754 6.83111 23.1564C6.40215 23.2373 5.9888 22.9552 5.90787 22.5262C5.67176 21.2748 5.55542 19.938 5.55542 18.4954C5.55542 18.0882 5.57915 17.6848 5.60133 17.3078L5.60195 17.2973C5.62758 16.8615 6.00163 16.529 6.4374 16.5546Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M15.808 9.37191C12.1607 9.37191 9.35645 11.2721 8.04075 14.2736C7.8655 14.6734 7.39932 14.8554 6.99952 14.6802C6.59972 14.5049 6.41769 14.0387 6.59294 13.6389C8.16786 10.0461 11.5513 7.79111 15.808 7.79111C20.3525 7.79111 23.839 10.4454 25.2717 13.7296C26.3844 16.2631 26.422 17.7068 26.422 18.518C26.422 20.6581 25.7884 22.5321 24.5694 23.8807C24.2767 24.2046 23.7769 24.2298 23.453 23.9371C23.1292 23.6444 23.104 23.1446 23.3967 22.8207C24.3005 21.8207 24.8412 20.3525 24.8412 18.518C24.8412 17.8839 24.8337 16.6632 23.8239 14.3644L23.8231 14.3625C22.6359 11.6402 19.7091 9.37191 15.808 9.37191Z" />
     <path
-        android:fillColor="?attr/suwListItemIconColor"
-        android:pathData="M17.81,4.47c-0.08,0 -0.16,-0.02 -0.23,-0.06C15.66,3.42 14,3 12.01,3c-1.98,0 -3.86,0.47 -5.57,1.41 -0.24,0.13 -0.54,0.04 -0.68,-0.2 -0.13,-0.24 -0.04,-0.55 0.2,-0.68C7.82,2.52 9.86,2 12.01,2c2.13,0 3.99,0.47 6.03,1.52 0.25,0.13 0.34,0.43 0.21,0.67 -0.09,0.18 -0.26,0.28 -0.44,0.28zM3.5,9.72c-0.1,0 -0.2,-0.03 -0.29,-0.09 -0.23,-0.16 -0.28,-0.47 -0.12,-0.7 0.99,-1.4 2.25,-2.5 3.75,-3.27C9.98,4.04 14,4.03 17.15,5.65c1.5,0.77 2.76,1.86 3.75,3.25 0.16,0.22 0.11,0.54 -0.12,0.7 -0.23,0.16 -0.54,0.11 -0.7,-0.12 -0.9,-1.26 -2.04,-2.25 -3.39,-2.94 -2.87,-1.47 -6.54,-1.47 -9.4,0.01 -1.36,0.7 -2.5,1.7 -3.4,2.96 -0.08,0.14 -0.23,0.21 -0.39,0.21zM9.75,21.79c-0.13,0 -0.26,-0.05 -0.35,-0.15 -0.87,-0.87 -1.34,-1.43 -2.01,-2.64 -0.69,-1.23 -1.05,-2.73 -1.05,-4.34 0,-2.97 2.54,-5.39 5.66,-5.39s5.66,2.42 5.66,5.39c0,0.28 -0.22,0.5 -0.5,0.5s-0.5,-0.22 -0.5,-0.5c0,-2.42 -2.09,-4.39 -4.66,-4.39 -2.57,0 -4.66,1.97 -4.66,4.39 0,1.44 0.32,2.77 0.93,3.85 0.64,1.15 1.08,1.64 1.85,2.42 0.19,0.2 0.19,0.51 0,0.71 -0.11,0.1 -0.24,0.15 -0.37,0.15zM16.92,19.94c-1.19,0 -2.24,-0.3 -3.1,-0.89 -1.49,-1.01 -2.38,-2.65 -2.38,-4.39 0,-0.28 0.22,-0.5 0.5,-0.5s0.5,0.22 0.5,0.5c0,1.41 0.72,2.74 1.94,3.56 0.71,0.48 1.54,0.71 2.54,0.71 0.24,0 0.64,-0.03 1.04,-0.1 0.27,-0.05 0.53,0.13 0.58,0.41 0.05,0.27 -0.13,0.53 -0.41,0.58 -0.57,0.11 -1.07,0.12 -1.21,0.12zM14.91,22c-0.04,0 -0.09,-0.01 -0.13,-0.02 -1.59,-0.44 -2.63,-1.03 -3.72,-2.1 -1.4,-1.39 -2.17,-3.24 -2.17,-5.22 0,-1.62 1.38,-2.94 3.08,-2.94 1.7,0 3.08,1.32 3.08,2.94 0,1.07 0.93,1.94 2.08,1.94s2.08,-0.87 2.08,-1.94c0,-3.77 -3.25,-6.83 -7.25,-6.83 -2.84,0 -5.44,1.58 -6.61,4.03 -0.39,0.81 -0.59,1.76 -0.59,2.8 0,0.78 0.07,2.01 0.67,3.61 0.1,0.26 -0.03,0.55 -0.29,0.64 -0.26,0.1 -0.55,-0.04 -0.64,-0.29 -0.49,-1.31 -0.73,-2.61 -0.73,-3.96 0,-1.2 0.23,-2.29 0.68,-3.24 1.33,-2.79 4.28,-4.6 7.51,-4.6 4.55,0 8.25,3.51 8.25,7.83 0,1.62 -1.38,2.94 -3.08,2.94s-3.08,-1.32 -3.08,-2.94c0,-1.07 -0.93,-1.94 -2.08,-1.94s-2.08,0.87 -2.08,1.94c0,1.71 0.66,3.31 1.87,4.51 0.95,0.94 1.86,1.46 3.27,1.85 0.27,0.07 0.42,0.35 0.35,0.61 -0.05,0.23 -0.26,0.38 -0.47,0.38z"/>
-</vector>
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M15.8081 6.0748C13.9042 6.0748 12.2161 6.53994 10.858 7.34243C10.4822 7.56451 9.99753 7.43987 9.77545 7.06406C9.55338 6.68824 9.67801 6.20355 10.0538 5.98148C11.6767 5.0225 13.647 4.494 15.8081 4.494C18.1926 4.494 20.2599 5.14578 21.9465 6.22135C22.3146 6.45606 22.4227 6.9447 22.188 7.31276C21.9533 7.68082 21.4647 7.78892 21.0966 7.55422C19.6668 6.64249 17.895 6.0748 15.8081 6.0748Z" />
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_homepage_microg.xml b/res/drawable/ic_homepage_microg.xml
new file mode 100644
index 00000000000..62aaad0b378
--- /dev/null
+++ b/res/drawable/ic_homepage_microg.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="32dp"
+    android:height="32dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+
+    <path
+        android:fillColor="#A7B7C2"
+        android:pathData="M25.2477 32H6.75229C3.02611 32 0 28.9739 0 25.2477V6.75229C0 3.02611 3.02611 0 6.75229 0H25.2477C28.9739 0 32 3.02611 32 6.75229V25.2477C32 28.9739 28.9739 32 25.2477 32Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M12.8868 12.8016C14.6441 11.0992 17.4446 11.1281 19.1716 12.8825C19.4778 13.1936 19.4739 13.694 19.1628 14.0003C18.8517 14.3065 18.3512 14.3026 18.045 13.9915C16.9273 12.856 15.1225 12.8391 13.989 13.9348C12.8816 15.0269 12.8598 16.8508 13.9775 17.9863C15.0959 19.1225 16.9024 19.1387 18.0357 18.0408C18.3493 17.7371 18.8497 17.745 19.1534 18.0585C19.4571 18.3721 19.4492 18.8725 19.1357 19.1762C17.3784 20.8786 14.5779 20.8496 12.8509 19.0952C11.1239 17.3408 11.1465 14.5143 12.8824 12.8059L12.8868 12.8016Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M14.295 6.00707L18.0664 6.02966L18.2922 8.28795C19.5568 8.64928 20.7311 9.32676 21.6796 10.2752L23.7347 9.4171L25.5639 12.5787L23.7798 13.9337C24.1412 15.3338 24.1186 16.7791 23.7347 18.1341L25.5413 19.5342L23.554 22.741L21.4538 21.8377C21.0021 22.2442 20.5279 22.6281 19.9633 22.9443C19.3762 23.283 18.7438 23.554 18.1115 23.7347L17.7954 25.9704L14.024 26.0155L13.753 23.7572C12.4432 23.3959 11.2463 22.7184 10.2527 21.7474L8.19762 22.6055L6.3684 19.4439L8.15245 18.0889C7.79112 16.7114 7.81371 15.3112 8.17503 13.9788L6.3684 12.6239L8.28795 9.37193L10.4107 10.2301C10.8624 9.801 11.3818 9.39451 11.969 9.07835C12.6013 8.71702 13.2562 8.44603 13.9111 8.26537L14.295 6.00707ZM12.9626 4.40369L12.7594 5.73608L12.5561 7.02331C12.1045 7.20397 11.6528 7.40722 11.2237 7.65563C10.8398 7.90404 10.5011 8.12987 10.1623 8.37828L8.94285 7.88146L7.67821 7.36205L6.97814 8.53636L5.05859 11.7883L4.33594 13.0078L5.46508 13.8659L6.48132 14.6112C6.34582 15.5371 6.34582 16.4855 6.48132 17.4114L5.48767 18.1567L4.3811 18.9923L5.08117 20.1891L6.91039 23.3508L7.61046 24.5477L8.89769 24.0057L10.0494 23.5314C10.7721 24.096 11.5625 24.5477 12.398 24.8864L12.5561 26.151L12.7142 27.5512L14.1369 27.5286L17.9083 27.4834L19.2633 27.4608L19.4439 26.1059L19.6246 24.8186C20.0311 24.6606 20.4376 24.4573 20.8215 24.2315C21.1602 24.0508 21.4764 23.825 21.7925 23.5992L23.012 24.1186L24.2541 24.6606L24.9767 23.5088L26.964 20.3021L27.7093 19.1052L26.5801 18.247L25.5639 17.4566C25.722 16.4856 25.722 15.5145 25.5865 14.5434L26.5801 13.7982L27.6867 12.9626L26.9866 11.7657L25.1574 8.60411L24.4573 7.40722L23.1701 7.94921L22.0184 8.42345C21.3409 7.90404 20.5956 7.45238 19.8052 7.11364L19.6472 5.87158L19.5117 4.47144H18.0889L14.3176 4.44885L12.9626 4.40369Z" />
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_homepage_openkeychain.xml b/res/drawable/ic_homepage_openkeychain.xml
new file mode 100644
index 00000000000..631517bd4f8
--- /dev/null
+++ b/res/drawable/ic_homepage_openkeychain.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="32dp"
+    android:height="32dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+
+    <path
+        android:fillColor="#2CCF69"
+        android:pathData="M25.2477 32H6.75229C3.02611 32 0 28.9739 0 25.2477V6.75229C0 3.02611 3.02611 0 6.75229 0H25.2477C28.9739 0 32 3.02611 32 6.75229V25.2477C32 28.9739 28.9739 32 25.2477 32Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M14.1143 12.4658C14.9624 12.4658 15.6499 11.7783 15.6499 10.9302C15.6499 10.0821 14.9624 9.39453 14.1143 9.39453C13.2661 9.39453 12.5786 10.0821 12.5786 10.9302C12.5786 11.7783 13.2661 12.4658 14.1143 12.4658Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M7.56629 12.4252C7.74598 8.93397 10.6685 6.16209 14.1653 6.1878L14.1708 6.18786C17.7373 6.23918 20.6408 9.13854 20.6408 12.7368C20.6408 15.0558 19.4376 17.1092 17.5921 18.2728V24.8413C17.5921 26.6328 16.1316 28.0932 14.3401 28.0932H11.4043C10.9678 28.0932 10.6139 27.7393 10.6139 27.3028V23.6444C10.6139 23.2078 10.9678 22.854 11.4043 22.854H12.1496V21.5442H11.4043C10.9678 21.5442 10.6139 21.1903 10.6139 20.7538V18.2712C8.69623 17.0555 7.44601 14.8788 7.56619 12.4271L7.56629 12.4252ZM12.1947 19.9634H12.94C13.3765 19.9634 13.7304 20.3172 13.7304 20.7538V23.6444C13.7304 24.0809 13.3765 24.4348 12.94 24.4348H12.1947V26.5124H14.3401C15.2586 26.5124 16.0113 25.7597 16.0113 24.8413V17.818C16.0113 17.5255 16.1727 17.257 16.431 17.1199C18.0086 16.2824 19.0599 14.6274 19.0599 12.7368C19.0599 10.0128 16.8612 7.80902 14.1509 7.76854C11.5066 7.75058 9.28196 9.85555 9.14505 12.5055C9.04831 14.4868 10.1349 16.2412 11.7776 17.1213C12.0344 17.2589 12.1947 17.5266 12.1947 17.818V19.9634Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M17.1405 6.96678C17.1467 6.53029 17.5057 6.18155 17.9421 6.18783C21.5086 6.23914 24.4121 9.13851 24.4121 12.7368C24.4121 15.0817 23.1857 17.1124 21.3634 18.2705V24.8412C21.3634 26.6327 19.9029 28.0932 18.1114 28.0932H15.1757C14.7391 28.0932 14.3853 27.7393 14.3853 27.3028C14.3853 26.8663 14.7391 26.5124 15.1757 26.5124H18.1114C19.0299 26.5124 19.7826 25.7597 19.7826 24.8412V17.818C19.7826 17.527 19.9425 17.2595 20.1988 17.1217C21.7627 16.2811 22.8313 14.6438 22.8313 12.7368C22.8313 10.0119 20.631 7.80748 17.9194 7.76847C17.4829 7.76219 17.1342 7.40326 17.1405 6.96678Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M16.9823 4.87792C15.4315 4.87792 14.182 6.12744 14.182 7.67821C14.182 8.45204 14.4979 9.15714 15.0119 9.67118C15.3206 9.97985 15.3206 10.4803 15.0119 10.789C14.7032 11.0976 14.2028 11.0976 13.8941 10.789C13.0983 9.99321 12.6012 8.89167 12.6012 7.67821C12.6012 5.25438 14.5585 3.29712 16.9823 3.29712C19.3996 3.29712 21.386 5.24794 21.386 7.67821C21.386 8.11473 21.0321 8.46861 20.5955 8.46861C20.159 8.46861 19.8051 8.11473 19.8051 7.67821C19.8051 6.13387 18.5395 4.87792 16.9823 4.87792Z" />
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_hotspot.xml b/res/drawable/ic_hotspot.xml
index d8528ddc4db..3c5dd449af0 100644
--- a/res/drawable/ic_hotspot.xml
+++ b/res/drawable/ic_hotspot.xml
@@ -1,62 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2015 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:name="root"
-    android:alpha="1.0"
-    android:height="48dp"
-    android:width="48dp"
-    android:viewportHeight="48"
-    android:viewportWidth="48" >
-    <group
-        android:name="ic_hotspot"
-        android:translateX="23.9778"
-        android:translateY="24.26443" >
-        <group
-            android:name="ic_hotspot_pivot"
-            android:translateX="-23.21545"
-            android:translateY="-18.86649" >
-            <clip-path
-                android:name="mask"
-                android:pathData="M 38.8337860107,-40.3974914551 c 0.0,0.0 -38.4077911377,30.8523712158 -38.4077911377,30.8523712158 c 0.0,0.0 6.97125244141,7.33258056641 6.97125244141,7.33258056641 c 0.0,0.0 -2.4169921875,2.57838439941 -2.4169921875,2.57838439941 c 0.0,0.0 -6.77128601074,-6.82850646973 -6.77128601074,-6.82850646973 c 0.0,0.0 -32.6199798584,25.1699066162 -32.6199798584,25.1699066162 c 0.0,0.0 55.9664764404,69.742401123 55.9664764404,69.742401123 c 0.0,0.0 27.6589050293,-22.6579437256 27.6589050293,-22.6579437256 c 0.0,0.0 -30.8645172119,-34.00390625 -30.8645172119,-34.00390625 c 0.0,0.0 2.70756530762,-1.99278259277 2.70756530762,-1.99278259277 c 0.0,0.0 1.53030395508,-0.876571655273 1.53030395508,-0.876571655274 c 0.0,0.0 2.85780334473,-3.12069702148 2.85780334473,-3.12069702148 c 0.0,0.0 0.659332275391,0.664688110352 0.659332275391,0.664688110351 c 0.0,0.0 -3.13299560547,2.82977294922 -3.13299560547,2.82977294922 c 0.0,0.0 29.0108337402,34.4080963135 29.0108337402,34.4080963135 c 0.0,0.0 42.8175811768,-34.3554534912 42.8175811768,-34.3554534912 c 0.0,0.0 -55.9664916992,-69.7423400879 -55.9664916992,-69.7423400879 Z" />
-            <group
-                android:name="cross" >
-                <path
-                    android:name="cross_1"
-                    android:pathData="M 4.44044494629,2.24310302734 c 0.0,0.0 0.0875396728516,0.112457275391 0.0875396728516,0.112457275391 "
-                    android:strokeColor="#FFFFFFFF"
-                    android:strokeAlpha="0"
-                    android:strokeWidth="3.5"
-                    android:fillColor="#00000000" />
-            </group>
-            <group
-                android:name="hotspot"
-                android:translateX="23.481"
-                android:translateY="18.71151" >
-                <group
-                    android:name="circles"
-                    android:translateX="-0.23909"
-                    android:translateY="-0.10807" >
-                    <path
-                        android:name="path_3"
-                        android:pathData="M -0.0042724609375,-2.64895629883 c -2.20922851562,0.0 -4.0,1.791015625 -4.0,4.0 c 0.0,2.20922851562 1.79077148438,4.0 4.0,4.0 c 2.208984375,0.0 4.0,-1.79077148438 4.0,-4.0 c 0.0,-2.208984375 -1.791015625,-4.0 -4.0,-4.0 Z M 11.9957275391,1.35104370117 c 0.0,-6.626953125 -5.373046875,-12.0 -12.0,-12.0 c -6.62719726562,0.0 -12.0,5.373046875 -12.0,12.0 c 0.0,4.43603515625 2.41381835938,8.30004882812 5.99194335938,10.3771972656 c 0.0,0.0 2.01586914062,-3.48217773438 2.01586914062,-3.48217773438 c -2.38500976562,-1.38500976562 -4.0078125,-3.93798828125 -4.0078125,-6.89501953125 c 0.0,-4.41796875 3.58178710938,-8.0 8.0,-8.0 c 4.41796875,0.0 8.0,3.58203125 8.0,8.0 c 0.0,2.95703125 -1.623046875,5.51000976562 -4.00805664062,6.89501953125 c 0.0,0.0 2.01586914062,3.48217773438 2.01586914062,3.48217773438 c 3.578125,-2.0771484375 5.9921875,-5.94116210938 5.9921875,-10.3771972656 Z M -0.0042724609375,-18.6489562988 c -11.0451660156,0.0 -20.0,8.9541015625 -20.0,20.0 c 0.0,7.39306640625 4.02099609375,13.8330078125 9.98779296875,17.2951660156 c 0.0,0.0 2.00219726562,-3.458984375 2.00219726562,-3.458984375 c -4.77319335938,-2.77001953125 -7.98999023438,-7.92211914062 -7.98999023438,-13.8361816406 c 0.0,-8.8369140625 7.16381835938,-16.0 16.0,-16.0 c 8.83595275879,0.0 16.0000152588,7.1630859375 16.0000152588,16.0 c 0.0,5.9140625 -3.21704101562,11.0661621094 -7.990234375,13.8361816406 c 0.0,0.0 2.00219726562,3.458984375 2.00219726563,3.458984375 c 5.966796875,-3.46215820312 9.98803710937,-9.90209960938 9.98803710938,-17.2951660156 c 0.0,-11.0458984375 -8.955078125,-20.0 -20.0000152588,-20.0 Z"
-                        android:fillColor="#FFFFFFFF"
-                        android:fillAlpha="1" />
-                </group>
-            </group>
-        </group>
-    </group>
-</vector>
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+
+    <path
+        android:fillColor="#24527F"
+        android:pathData="M25.2477 32H6.75229C3.02611 32 0 28.9739 0 25.2477V6.75229C0 3.02611 3.02611 0 6.75229 0H25.2477C28.9739 0 32 3.02611 32 6.75229V25.2477C32 28.9739 28.9739 32 25.2477 32Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M13.4369 26.0605C14.5344 26.0605 15.4242 25.1708 15.4242 24.0732C15.4242 22.9757 14.5344 22.0859 13.4369 22.0859C12.3393 22.0859 11.4496 22.9757 11.4496 24.0732C11.4496 25.1708 12.3393 26.0605 13.4369 26.0605Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M16.9429 21.5381C14.9933 19.5885 11.8353 19.5885 9.88568 21.5381C9.57701 21.8468 9.07655 21.8468 8.76788 21.5381C8.45921 21.2295 8.45921 20.729 8.76788 20.4203C11.3348 17.8534 15.4937 17.8534 18.0607 20.4203C18.3694 20.729 18.3694 21.2295 18.0607 21.5381C17.752 21.8468 17.2516 21.8468 16.9429 21.5381Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M19.5625 18.9412C16.1676 15.5463 10.6836 15.5463 7.28863 18.9412C6.97996 19.2499 6.47951 19.2499 6.17083 18.9412C5.86216 18.6325 5.86216 18.1321 6.17083 17.8234C10.1831 13.8111 16.668 13.8111 20.6803 17.8234C20.989 18.1321 20.989 18.6325 20.6803 18.9412C20.3716 19.2499 19.8712 19.2499 19.5625 18.9412Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M13.0981 6.77478C13.0981 6.33825 13.452 5.98438 13.8885 5.98438H24.2541C24.6906 5.98438 25.0445 6.33825 25.0445 6.77478V25.767C25.0445 26.2035 24.6906 26.5574 24.2541 26.5574H19.9408C19.5042 26.5574 19.1504 26.2035 19.1504 25.767C19.1504 25.3305 19.5042 24.9766 19.9408 24.9766H23.4637V7.56518H14.6789V11.1559C14.6789 11.5924 14.3251 11.9463 13.8885 11.9463C13.452 11.9463 13.0981 11.5924 13.0981 11.1559V6.77478Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M25.2704 9.95898H24.4574V13.1658H25.2704V9.95898Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M25.2704 14.4983H24.4574V15.921H25.2704V14.4983Z" />
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_lock.xml b/res/drawable/ic_lock.xml
index 975cbf54efb..02ede02fc47 100644
--- a/res/drawable/ic_lock.xml
+++ b/res/drawable/ic_lock.xml
@@ -1,24 +1,19 @@
-<!--
-    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
--->
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="32dp"
     android:height="32dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0">
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+
+    <path
+        android:fillColor="#E83A52"
+        android:pathData="M25.2477 32H6.75229C3.02611 32 0 28.9739 0 25.2477V6.75229C0 3.02611 3.02611 0 6.75229 0H25.2477C28.9739 0 32 3.02611 32 6.75229V25.2477C32 28.9739 28.9739 32 25.2477 32Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M9.28161 15.7178C9.12022 15.7178 8.98803 15.8488 8.98803 16.0113V24.2541C8.98803 24.4155 9.11908 24.5477 9.28161 24.5477H22.7184C22.881 24.5477 23.012 24.4155 23.012 24.2541V16.0113C23.012 15.85 22.881 15.7178 22.7184 15.7178H9.28161ZM7.40723 16.0113C7.40723 14.9544 8.26869 14.137 9.28161 14.137H22.7184C23.7754 14.137 24.5928 14.9984 24.5928 16.0113V24.2541C24.5928 25.267 23.7754 26.1285 22.7184 26.1285H9.28161C8.22466 26.1285 7.40723 25.267 7.40723 24.2541V16.0113Z" />
     <path
-        android:fillColor="?android:attr/colorPrimary"
-        android:pathData="M18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM12,17c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM15.1,8L8.9,8L8.9,6c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2z" />
-</vector>
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M15.9887 7.47497C13.7379 7.47497 11.9012 9.31164 11.9012 11.5625V14.9048C11.9012 15.3413 11.5474 15.6952 11.1108 15.6952C10.6743 15.6952 10.3204 15.3413 10.3204 14.9048V11.5625C10.3204 8.43858 12.8649 5.89417 15.9887 5.89417C19.1126 5.89417 21.6571 8.43858 21.6571 11.5625V14.9048C21.6571 15.3413 21.3032 15.6952 20.8667 15.6952C20.4301 15.6952 20.0763 15.3413 20.0763 14.9048V11.5625C20.0763 9.31164 18.2396 7.47497 15.9887 7.47497Z" />
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_lock_list_icon.xml b/res/drawable/ic_lock_list_icon.xml
index 7a323f29585..02ede02fc47 100644
--- a/res/drawable/ic_lock_list_icon.xml
+++ b/res/drawable/ic_lock_list_icon.xml
@@ -1,25 +1,19 @@
-<!--
-    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.
--->
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24.0dp"
-    android:height="24.0dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0"
-    android:tint="?attr/suwListItemIconColor">
+    android:width="32dp"
+    android:height="32dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+
+    <path
+        android:fillColor="#E83A52"
+        android:pathData="M25.2477 32H6.75229C3.02611 32 0 28.9739 0 25.2477V6.75229C0 3.02611 3.02611 0 6.75229 0H25.2477C28.9739 0 32 3.02611 32 6.75229V25.2477C32 28.9739 28.9739 32 25.2477 32Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M9.28161 15.7178C9.12022 15.7178 8.98803 15.8488 8.98803 16.0113V24.2541C8.98803 24.4155 9.11908 24.5477 9.28161 24.5477H22.7184C22.881 24.5477 23.012 24.4155 23.012 24.2541V16.0113C23.012 15.85 22.881 15.7178 22.7184 15.7178H9.28161ZM7.40723 16.0113C7.40723 14.9544 8.26869 14.137 9.28161 14.137H22.7184C23.7754 14.137 24.5928 14.9984 24.5928 16.0113V24.2541C24.5928 25.267 23.7754 26.1285 22.7184 26.1285H9.28161C8.22466 26.1285 7.40723 25.267 7.40723 24.2541V16.0113Z" />
     <path
-        android:fillColor="@android:color/white"
-        android:pathData="M18.0,8.0l-1.0,0.0L17.0,6.0c0.0,-2.76 -2.24,-5.0 -5.0,-5.0S7.0,3.24 7.0,6.0l0.0,2.0L6.0,8.0c-1.1,0.0 -2.0,0.9 -2.0,2.0l0.0,10.0c0.0,1.0 0.9,2.0 2.0,2.0l12.0,0.0c1.1,0.0 2.0,-0.9 2.0,-2.0L20.0,10.0c0.0,-1.1 -0.9,-2.0 -2.0,-2.0zm-6.0,9.0c-1.1,0.0 -2.0,-0.9 -2.0,-2.0s0.9,-2.0 2.0,-2.0 2.0,0.9 2.0,2.0 -0.9,2.0 -2.0,2.0zm3.1,-9.0L8.9,8.0L8.9,6.0c0.0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0.0 3.1,1.39 3.1,3.1l0.0,2.0z"/>
-</vector>
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M15.9887 7.47497C13.7379 7.47497 11.9012 9.31164 11.9012 11.5625V14.9048C11.9012 15.3413 11.5474 15.6952 11.1108 15.6952C10.6743 15.6952 10.3204 15.3413 10.3204 14.9048V11.5625C10.3204 8.43858 12.8649 5.89417 15.9887 5.89417C19.1126 5.89417 21.6571 8.43858 21.6571 11.5625V14.9048C21.6571 15.3413 21.3032 15.6952 20.8667 15.6952C20.4301 15.6952 20.0763 15.3413 20.0763 14.9048V11.5625C20.0763 9.31164 18.2396 7.47497 15.9887 7.47497Z" />
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_media_stream.xml b/res/drawable/ic_media_stream.xml
index a963a05f69f..19567cbd8b6 100644
--- a/res/drawable/ic_media_stream.xml
+++ b/res/drawable/ic_media_stream.xml
@@ -1,25 +1,29 @@
-<!--
-    Copyright (C) 2017 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.
--->
+<?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.0"
-        android:viewportHeight="24.0"
-        android:tint="@color/red_1">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M18,3h-5c-0.55,0 -1,0.45 -1,1v8.3a3.88,3.88 0,0 0,-2.9 -0.04c-1.79,0.67 -3.11,2.35 -3.1,4.26A4.483,4.483 0,0 0,10.5 21c2.5,0 4.5,-2.3 4.5,-4.5V6h3c0.55,0 1,-0.45 1,-1V4c0,-0.55 -0.45,-1 -1,-1z"/>
-</vector>
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="32"
+    android:viewportHeight="33">
+
+    <group>
+        <path
+            android:fillColor="#E83A52"
+            android:pathData="M25.2477 32.637H6.75229C3.02611 32.637 0 29.6109 0 25.8847V7.38926C0 3.66307 3.02611 0.636963 6.75229 0.636963H25.2477C28.9739 0.636963 32 3.66307 32 7.38926V25.8847C32 29.6109 28.9739 32.637 25.2477 32.637Z" />
+        <group>
+            <group>
+                <path
+                    android:fillColor="#ffffff"
+                    android:pathData="M11.6781 26.364C13.2012 25.7769 14.053 24.3076 13.5807 23.0822C13.1083 21.8569 11.4907 21.3395 9.96755 21.9266C8.44444 22.5138 7.59264 23.9831 8.065 25.2085C8.53737 26.4338 10.155 26.9512 11.6781 26.364Z" />
+                <path
+                    android:fillColor="#ffffff"
+                    android:pathData="M22.055 23.8975C23.5781 23.3103 24.4299 21.841 23.9575 20.6157C23.4851 19.3903 21.8675 18.8729 20.3444 19.4601C18.8213 20.0472 17.9695 21.5165 18.4418 22.7419C18.9142 23.9673 20.5318 24.4846 22.055 23.8975Z" />
+                <path
+                    android:fillColor="#ffffff"
+                    android:pathData="M12.8223 20.3928C12.8223 18.1039 12.8 14.5261 12.8 12.7705C12.8 11.5928 13.3556 10.8594 14.4667 10.5261C16.5334 9.88165 19.3112 8.94832 21.3778 8.30387C22.6667 7.90387 23.2445 8.32609 23.2445 9.65943V17.9483V20.6372V12.3261C23.2445 10.9928 22.6667 10.5705 21.3778 10.9705C19.3112 11.615 16.5334 12.5483 14.4667 13.1928C13.3556 13.5483 12.8 14.2816 12.8 15.4372C12.8 17.1928 12.8 20.7705 12.8223 23.0594V20.3928Z" />
+                <path
+                    android:fillColor="#ffffff"
+                    android:pathData="M12.8222 23.8372C12.4 23.8372 12.0444 23.4816 12.0444 23.0594C12.0444 20.7705 12.0222 17.1927 12.0222 15.4372C12.0222 15.3927 12.0222 15.3483 12.0222 15.2816C12.0222 14.2816 12.0222 13.3927 12.0222 12.7483C12.0222 11.2372 12.8 10.215 14.2444 9.74829C15.2444 9.43718 16.4222 9.0594 17.5556 8.68162C18.8 8.28162 20.0667 7.8594 21.1556 7.52606C22.0667 7.23718 22.7555 7.30384 23.2667 7.68162C23.7778 8.0594 24.0222 8.70384 24.0222 9.63718V12.3038V12.3261V20.615C24.0222 21.0372 23.6667 21.3927 23.2444 21.3927C22.8222 21.3927 22.4667 21.0372 22.4667 20.615V12.3038C22.4667 11.7483 22.3333 11.615 22.3333 11.615C22.3333 11.615 22.1778 11.5261 21.6 11.7038C20.5333 12.0372 19.2667 12.4594 18.0444 12.8594C16.8889 13.2372 15.7111 13.615 14.7111 13.9261C13.9556 14.1705 13.6222 14.5705 13.5778 15.3038C13.5778 16.9927 13.5778 18.9261 13.6 20.3705V23.0594C13.6 23.5038 13.2444 23.8372 12.8222 23.8372ZM22.1778 8.92607C22.0667 8.92607 21.8889 8.94829 21.6 9.03718C20.5333 9.37051 19.2667 9.77051 18.0444 10.1705C16.8889 10.5483 15.7111 10.9261 14.7111 11.2372C13.9111 11.4816 13.6 11.9038 13.5778 12.7038C13.7778 12.5927 14 12.5038 14.2444 12.4372C15.2444 12.1261 16.4222 11.7483 17.5556 11.3705C18.8 10.9705 20.0667 10.5483 21.1556 10.215C21.6667 10.0594 22.0889 10.015 22.4667 10.0594V9.63718C22.4667 9.12607 22.3778 8.97051 22.3333 8.94829C22.3333 8.94829 22.2889 8.92607 22.1778 8.92607Z" />
+            </group>
+        </group>
+    </group>
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_network_cell.xml b/res/drawable/ic_network_cell.xml
index b54302da755..9f7f4fca468 100644
--- a/res/drawable/ic_network_cell.xml
+++ b/res/drawable/ic_network_cell.xml
@@ -1,26 +1,27 @@
-<!--
-    Copyright (C) 2017 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.
--->
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:autoMirrored="true"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0"
-        android:tint="@color/blue_1">
-    <path
-        android:pathData="m3.8,22l17.19,0c0.55,0 1.01,-0.45 1.01,-1.01l0,-17.19c0,-0.71 -0.87,-1.08 -1.38,-0.57l-17.38,17.39c-0.51,0.51 -0.15,1.38 0.56,1.38z"
-        android:fillColor="#FFFFFFFF"/>
-</vector>
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="32"
+    android:viewportHeight="33">
+
+    <group>
+        <path
+            android:fillColor="#0088ED"
+            android:pathData="M25.2477 32.1628H6.75229C3.02611 32.1628 0 29.1367 0 25.4106V6.91514C0 3.18895 3.02611 0.162842 6.75229 0.162842H25.2477C28.9739 0.162842 32 3.18895 32 6.91514V25.4106C32 29.1367 28.9739 32.1628 25.2477 32.1628Z" />
+        <group>
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M23.0999 26.5962C22.6777 26.5962 22.3221 26.2406 22.3221 25.8184V6.50727C22.3221 6.08505 22.6777 5.72949 23.0999 5.72949C23.5221 5.72949 23.8777 6.08505 23.8777 6.50727V25.8184C23.8777 26.2406 23.5444 26.5962 23.0999 26.5962Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M18.3666 26.5962C17.9444 26.5962 17.5889 26.2406 17.5889 25.8184V11.3295C17.5889 10.9073 17.9444 10.5518 18.3666 10.5518C18.7889 10.5518 19.1444 10.9073 19.1444 11.3295V25.8184C19.1444 26.2406 18.8111 26.5962 18.3666 26.5962Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M13.6332 26.5962C13.211 26.5962 12.8555 26.2407 12.8555 25.8185V16.1518C12.8555 15.7296 13.211 15.374 13.6332 15.374C14.0555 15.374 14.411 15.7296 14.411 16.1518V25.7962C14.411 26.2407 14.0555 26.5962 13.6332 26.5962Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M8.89997 26.5963C8.47775 26.5963 8.12219 26.2407 8.12219 25.8185V20.9963C8.12219 20.5741 8.47775 20.2185 8.89997 20.2185C9.32219 20.2185 9.67775 20.5518 9.67775 20.9963V25.8185C9.67775 26.2407 9.32219 26.5963 8.89997 26.5963Z" />
+        </group>
+    </group>
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_notifications.xml b/res/drawable/ic_notifications.xml
index ec2422dbd14..e111d369dc5 100644
--- a/res/drawable/ic_notifications.xml
+++ b/res/drawable/ic_notifications.xml
@@ -1,25 +1,26 @@
-<!--
-    Copyright (C) 2017 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.
--->
+<?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.0"
-        android:viewportHeight="24.0"
-        android:tint="?android:attr/colorControlNormal">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+
+    <path
+        android:fillColor="#FF7301"
+        android:pathData="M25.2477 32H6.75229C3.02611 32 0 28.9739 0 25.2477V6.75229C0 3.02611 3.02611 0 6.75229 0H25.2477C28.9739 0 32 3.02611 32 6.75229V25.2477C32 28.9739 28.9739 32 25.2477 32Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M16.0113 27.0092C15.0854 27.0092 14.3176 26.2414 14.3176 25.3155H17.7051C17.7051 26.2414 16.9372 27.0092 16.0113 27.0092Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M13.5272 24.5251H18.4955V25.3155C18.4955 26.6779 17.3738 27.7996 16.0113 27.7996C14.6489 27.7996 13.5272 26.6779 13.5272 25.3155V24.5251ZM15.5814 26.1059C15.7102 26.1776 15.857 26.2188 16.0113 26.2188C16.1657 26.2188 16.3125 26.1776 16.4413 26.1059H15.5814Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M16.0113 5.78124C15.3699 5.78124 14.8596 6.30211 14.8596 6.93297C14.8596 7.3695 14.5057 7.72338 14.0692 7.72338C13.6327 7.72338 13.2788 7.3695 13.2788 6.93297C13.2788 5.44105 14.4849 4.20044 16.0113 4.20044C17.5033 4.20044 18.7439 5.40649 18.7439 6.93297C18.7439 7.3695 18.39 7.72338 17.9535 7.72338C17.5169 7.72338 17.1631 7.3695 17.1631 6.93297C17.1631 6.29149 16.6422 5.78124 16.0113 5.78124Z" />
     <path
-        android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4c0,1.1 0.89,2 2,2zM18,16v-5c0,-3.07 -1.64,-5.64 -4.5,-6.32L13.5,4c0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.5,0.67 -1.5,1.5v0.68C7.63,5.36 6,7.92 6,11v5l-2,2v1h16v-1l-2,-2z"
-        android:fillColor="#FFFFFFFF"/>
-</vector>
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M15.882 8.08488C19.5982 8.00746 22.6056 11.1187 22.6056 14.7918V18.4277C22.6056 19.1517 22.9419 19.8468 23.5392 20.308C23.5395 20.3082 23.5398 20.3084 23.54 20.3086L25.3006 21.6629C25.5689 21.8692 25.676 22.2235 25.567 22.5439C25.458 22.8643 25.1571 23.0798 24.8187 23.0798H7.22661C6.88817 23.0798 6.58728 22.8643 6.4783 22.5439C6.36932 22.2235 6.47644 21.8692 6.74469 21.6629L8.501 20.3119C9.08025 19.8497 9.41715 19.152 9.41715 18.4277V14.6789C9.41715 11.0856 12.2918 8.16181 15.8815 8.08489L15.882 8.08488ZM15.9151 9.66534C18.7026 9.60737 21.0248 11.9612 21.0248 14.7918V18.4277C21.0248 19.6132 21.5618 20.7404 22.497 21.499H9.54663C10.4597 20.7415 10.998 19.6149 10.998 18.4277V14.6789C10.998 11.9492 13.1816 9.72416 15.9149 9.66534" />
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_security_pattern_3x3.xml b/res/drawable/ic_security_pattern_3x3.xml
index b8e4df44a0f..9799b5c960a 100644
--- a/res/drawable/ic_security_pattern_3x3.xml
+++ b/res/drawable/ic_security_pattern_3x3.xml
@@ -1,26 +1,41 @@
-<!--
-     Copyright (C) 2016 The CyanogenMod 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.0"
-        android:viewportHeight="24.0">
-    <path
-        android:pathData="M4,17.268C3.402,17.613 3,18.26 3,19C3,20.105 3.895,21 5,21C5.74,21 6.387,20.598 6.732,20L9.268,20C9.613,20.598 10.26,21 11,21C12.105,21 13,20.105 13,19C13,17.895 12.105,17 11,17C10.26,17 9.613,17.402 9.268,18L6.732,18C6.557,17.696 6.304,17.443 6,17.268L6,14.732C6.598,14.387 7,13.74 7,13C7,11.895 6.105,11 5,11C3.895,11 3,11.895 3,13C3,13.74 3.402,14.387 4,14.732L4,17.268ZM21,11L21,9.5C21,8.67 20.33,8 19.5,8C20.33,8 21,7.33 21,6.5L21,5C21,3.89 20.1,3 19,3L15,3L15,5L19,5L19,7L17,7L17,9L19,9L19,11L15,11L15,13L19,13C20.1,13 21,12.11 21,11ZM5,9C6.105,9 7,8.105 7,7C7,5.895 6.105,5 5,5C3.895,5 3,5.895 3,7C3,8.105 3.895,9 5,9ZM11,9C12.105,9 13,8.105 13,7C13,5.895 12.105,5 11,5C9.895,5 9,5.895 9,7C9,8.105 9.895,9 11,9ZM11,15C12.105,15 13,14.105 13,13C13,11.895 12.105,11 11,11C9.895,11 9,11.895 9,13C9,14.105 9.895,15 11,15ZM17,21C18.105,21 19,20.105 19,19C19,17.895 18.105,17 17,17C15.895,17 15,17.895 15,19C15,20.105 15.895,21 17,21Z"
-        android:strokeColor="#00000000"
-        android:fillColor="#777777"
-        android:strokeWidth="1"/>
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="32"
+    android:viewportHeight="33">
+
+    <group>
+        <path
+            android:fillColor="#FF7301"
+            android:pathData="M25.2477 32.1589H6.75229C3.02611 32.1589 0 29.1328 0 25.4066V6.91123C0 3.18505 3.02611 0.158936 6.75229 0.158936H25.2477C28.9739 0.158936 32 3.18505 32 6.91123V25.4066C32 29.1328 28.9739 32.1589 25.2477 32.1589Z" />
+        <group>
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M22.4111 20.3145C22.7222 20.3145 23.0111 20.2256 23.2333 20.0256C23.4555 19.8478 23.5889 19.5589 23.5889 19.2034C23.5889 18.9367 23.5 18.6922 23.3222 18.5145C23.1444 18.3145 22.8778 18.2256 22.5667 18.2256C22.3444 18.2256 22.1667 18.2478 22.0333 18.3145C21.9 18.3811 21.7889 18.4478 21.7 18.5589C21.6111 18.6478 21.5444 18.7811 21.4778 18.9367C21.4111 19.0922 21.3444 19.2256 21.2778 19.3811C21.2333 19.4478 21.1889 19.5145 21.1 19.5589C21.0111 19.6034 20.9 19.6256 20.7889 19.6256C20.6556 19.6256 20.5222 19.5589 20.4111 19.4478C20.3 19.3367 20.2333 19.1811 20.2333 19.0034C20.2333 18.8256 20.2778 18.6256 20.3889 18.4256C20.5 18.2256 20.6556 18.0256 20.8778 17.8478C21.1 17.67 21.3444 17.5145 21.6778 17.4034C21.9889 17.2922 22.3444 17.2478 22.7222 17.2478C23.0555 17.2478 23.3667 17.2922 23.6555 17.3811C23.9444 17.47 24.1889 17.6034 24.3889 17.7811C24.5889 17.9589 24.7444 18.1589 24.8555 18.3811C24.9667 18.6034 25.0111 18.87 25.0111 19.1145C25.0111 19.47 24.9444 19.7589 24.7889 20.0034C24.6333 20.2478 24.4111 20.4922 24.1444 20.7367C24.4111 20.8922 24.6555 21.0478 24.8333 21.2478C25.0111 21.4256 25.1667 21.6478 25.2555 21.87C25.3444 22.0922 25.3889 22.3367 25.3889 22.6034C25.3889 22.9145 25.3222 23.2256 25.1889 23.5367C25.0555 23.8256 24.8778 24.0922 24.6333 24.3367C24.3889 24.5589 24.1 24.7589 23.7444 24.8922C23.3889 25.0256 23.0333 25.0922 22.6111 25.0922C22.1889 25.0922 21.8111 25.0256 21.4778 24.87C21.1444 24.7145 20.8778 24.5367 20.6556 24.3145C20.4333 24.0922 20.2778 23.8478 20.1667 23.6256C20.0556 23.3811 20.0111 23.1811 20.0111 23.0256C20.0111 22.8256 20.0778 22.67 20.2111 22.5367C20.3444 22.4034 20.5 22.3589 20.7 22.3589C20.7889 22.3589 20.9 22.3811 20.9889 22.4478C21.0778 22.5145 21.1444 22.5811 21.1667 22.6478C21.3444 23.1367 21.5444 23.4922 21.7444 23.7367C21.9444 23.9811 22.2555 24.0922 22.6333 24.0922C22.8555 24.0922 23.0555 24.0478 23.2555 23.9367C23.4555 23.8256 23.6333 23.67 23.7444 23.47C23.8778 23.27 23.9444 23.0256 23.9444 22.7367C23.9444 22.3367 23.8333 22.0034 23.6111 21.7811C23.3889 21.5589 23.0778 21.4256 22.6778 21.4256C22.6111 21.4256 22.5 21.4256 22.3444 21.4478C22.1889 21.47 22.1 21.47 22.0556 21.47C21.8556 21.47 21.7222 21.4256 21.6111 21.3367C21.5 21.2478 21.4556 21.1145 21.4556 20.9367C21.4556 20.7589 21.5222 20.6256 21.6333 20.5367C21.7444 20.4478 21.9444 20.3811 22.1889 20.3811H22.4111V20.3145Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M8.09997 10.1589C8.90998 10.1589 9.56663 9.50227 9.56663 8.69225C9.56663 7.88223 8.90998 7.22559 8.09997 7.22559C7.28995 7.22559 6.6333 7.88223 6.6333 8.69225C6.6333 9.50227 7.28995 10.1589 8.09997 10.1589Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M15.411 10.1589C16.221 10.1589 16.8777 9.50227 16.8777 8.69225C16.8777 7.88223 16.221 7.22559 15.411 7.22559C14.601 7.22559 13.9443 7.88223 13.9443 8.69225C13.9443 9.50227 14.601 10.1589 15.411 10.1589Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M22.7444 10.1589C23.5544 10.1589 24.211 9.50227 24.211 8.69225C24.211 7.88223 23.5544 7.22559 22.7444 7.22559C21.9344 7.22559 21.2777 7.88223 21.2777 8.69225C21.2777 9.50227 21.9344 10.1589 22.7444 10.1589Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M8.09997 17.4702C8.90998 17.4702 9.56663 16.8135 9.56663 16.0035C9.56663 15.1935 8.90998 14.5369 8.09997 14.5369C7.28995 14.5369 6.6333 15.1935 6.6333 16.0035C6.6333 16.8135 7.28995 17.4702 8.09997 17.4702Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M15.411 17.4702C16.221 17.4702 16.8777 16.8135 16.8777 16.0035C16.8777 15.1935 16.221 14.5369 15.411 14.5369C14.601 14.5369 13.9443 15.1935 13.9443 16.0035C13.9443 16.8135 14.601 17.4702 15.411 17.4702Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M8.09997 24.8034C8.90998 24.8034 9.56663 24.1468 9.56663 23.3368C9.56663 22.5268 8.90998 21.8701 8.09997 21.8701C7.28995 21.8701 6.6333 22.5268 6.6333 23.3368C6.6333 24.1468 7.28995 24.8034 8.09997 24.8034Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M15.411 24.8034C16.221 24.8034 16.8777 24.1468 16.8777 23.3368C16.8777 22.5268 16.221 21.8701 15.411 21.8701C14.601 21.8701 13.9443 22.5268 13.9443 23.3368C13.9443 24.1468 14.601 24.8034 15.411 24.8034Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M8.10004 16.781C7.67782 16.781 7.32227 16.4254 7.32227 16.0032V8.69208C7.32227 8.26986 7.67782 7.91431 8.10004 7.91431H15.4112C15.8334 7.91431 16.1889 8.26986 16.1889 8.69208C16.1889 9.11431 15.8334 9.46986 15.4112 9.46986H8.87782V16.0032C8.87782 16.4254 8.52227 16.781 8.10004 16.781Z" />
+        </group>
+    </group>
 </vector>
diff --git a/res/drawable/ic_security_pattern_4x4.xml b/res/drawable/ic_security_pattern_4x4.xml
index 92c580f5e2c..6d10dafd317 100644
--- a/res/drawable/ic_security_pattern_4x4.xml
+++ b/res/drawable/ic_security_pattern_4x4.xml
@@ -1,26 +1,42 @@
-<!--
-     Copyright (C) 2016 The CyanogenMod 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.
--->
+<?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.0"
-        android:viewportHeight="24.0">
-    <path
-        android:pathData="M4,17.268C3.402,17.613 3,18.26 3,19C3,20.105 3.895,21 5,21C5.74,21 6.387,20.598 6.732,20L9.268,20C9.613,20.598 10.26,21 11,21C12.105,21 13,20.105 13,19C13,17.895 12.105,17 11,17C10.26,17 9.613,17.402 9.268,18L6.732,18C6.557,17.696 6.304,17.443 6,17.268L6,14.732C6.598,14.387 7,13.74 7,13C7,11.895 6.105,11 5,11C3.895,11 3,11.895 3,13C3,13.74 3.402,14.387 4,14.732L4,17.268ZM21,13L21,3L19,3L19,7L17,7L17,3L15,3L15,9L19,9L19,13L21,13ZM5,9C6.105,9 7,8.105 7,7C7,5.895 6.105,5 5,5C3.895,5 3,5.895 3,7C3,8.105 3.895,9 5,9ZM11,9C12.105,9 13,8.105 13,7C13,5.895 12.105,5 11,5C9.895,5 9,5.895 9,7C9,8.105 9.895,9 11,9ZM11,15C12.105,15 13,14.105 13,13C13,11.895 12.105,11 11,11C9.895,11 9,11.895 9,13C9,14.105 9.895,15 11,15ZM17,21C18.105,21 19,20.105 19,19C19,17.895 18.105,17 17,17C15.895,17 15,17.895 15,19C15,20.105 15.895,21 17,21Z"
-        android:strokeColor="#00000000"
-        android:fillColor="#777777"
-        android:strokeWidth="1"/>
-</vector>
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="32"
+    android:viewportHeight="33">
+
+    <group>
+        <path
+            android:fillColor="#FF7301"
+            android:pathData="M25.2477 32.9099H6.75229C3.02611 32.9099 0 29.8838 0 26.1576V7.66221C0 3.93602 3.02611 0.909912 6.75229 0.909912H25.2477C28.9739 0.909912 32 3.93602 32 7.66221V26.1576C32 29.8838 28.9739 32.9099 25.2477 32.9099Z" />
+        <group>
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M23.0889 25.0432V24.0655H20.4667C20.1333 24.0655 19.8889 23.9988 19.7111 23.8432C19.5333 23.6877 19.4667 23.4877 19.4667 23.221C19.4667 23.1544 19.4889 23.0877 19.5111 23.021C19.5333 22.9544 19.5778 22.8877 19.6222 22.7988C19.6667 22.7321 19.7111 22.6432 19.7778 22.5766C19.8222 22.5099 19.8889 22.421 19.9778 22.3099L22.7556 18.5988C22.9333 18.3544 23.0889 18.1766 23.2 18.0655C23.3111 17.9544 23.4667 17.9099 23.6222 17.9099C24.1556 17.9099 24.4222 18.221 24.4222 18.821V22.8877H24.6445C24.9111 22.8877 25.1333 22.9321 25.2889 22.9988C25.4445 23.0655 25.5333 23.2432 25.5333 23.4877C25.5333 23.6877 25.4667 23.8432 25.3333 23.9321C25.2 24.021 25 24.0655 24.7333 24.0655H24.4222V25.0432C24.4222 25.3099 24.3556 25.5099 24.2445 25.6432C24.1333 25.7766 23.9778 25.8432 23.7778 25.8432C23.5778 25.8432 23.4222 25.7766 23.3111 25.6432C23.1556 25.5099 23.0889 25.3099 23.0889 25.0432ZM20.8445 22.8877H23.0889V19.8432L20.8445 22.8877Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M7.95556 10.9099C8.76558 10.9099 9.42222 10.2532 9.42222 9.44323C9.42222 8.63321 8.76558 7.97656 7.95556 7.97656C7.14554 7.97656 6.48889 8.63321 6.48889 9.44323C6.48889 10.2532 7.14554 10.9099 7.95556 10.9099Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M15.2666 10.9099C16.0766 10.9099 16.7333 10.2532 16.7333 9.44323C16.7333 8.63321 16.0766 7.97656 15.2666 7.97656C14.4566 7.97656 13.7999 8.63321 13.7999 9.44323C13.7999 10.2532 14.4566 10.9099 15.2666 10.9099Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M22.6 10.9099C23.41 10.9099 24.0666 10.2532 24.0666 9.44323C24.0666 8.63321 23.41 7.97656 22.6 7.97656C21.7899 7.97656 21.1333 8.63321 21.1333 9.44323C21.1333 10.2532 21.7899 10.9099 22.6 10.9099Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M7.95556 18.2212C8.76558 18.2212 9.42222 17.5645 9.42222 16.7545C9.42222 15.9445 8.76558 15.2878 7.95556 15.2878C7.14554 15.2878 6.48889 15.9445 6.48889 16.7545C6.48889 17.5645 7.14554 18.2212 7.95556 18.2212Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M15.2666 18.2212C16.0766 18.2212 16.7333 17.5645 16.7333 16.7545C16.7333 15.9445 16.0766 15.2878 15.2666 15.2878C14.4566 15.2878 13.7999 15.9445 13.7999 16.7545C13.7999 17.5645 14.4566 18.2212 15.2666 18.2212Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M7.95556 25.5544C8.76558 25.5544 9.42222 24.8978 9.42222 24.0878C9.42222 23.2777 8.76558 22.6211 7.95556 22.6211C7.14554 22.6211 6.48889 23.2777 6.48889 24.0878C6.48889 24.8978 7.14554 25.5544 7.95556 25.5544Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M15.2666 25.5544C16.0766 25.5544 16.7333 24.8978 16.7333 24.0878C16.7333 23.2777 16.0766 22.6211 15.2666 22.6211C14.4566 22.6211 13.7999 23.2777 13.7999 24.0878C13.7999 24.8978 14.4566 25.5544 15.2666 25.5544Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M7.95563 17.532C7.53341 17.532 7.17786 17.1764 7.17786 16.7542V9.44306C7.17786 9.02084 7.53341 8.66528 7.95563 8.66528H15.2667C15.689 8.66528 16.0445 9.02084 16.0445 9.44306C16.0445 9.86528 15.689 10.2208 15.2667 10.2208H8.73341V16.7542C8.73341 17.1764 8.37786 17.532 7.95563 17.532Z" />
+        </group>
+    </group>
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_security_pattern_5x5.xml b/res/drawable/ic_security_pattern_5x5.xml
index 7b4dabaad79..144c2b29108 100644
--- a/res/drawable/ic_security_pattern_5x5.xml
+++ b/res/drawable/ic_security_pattern_5x5.xml
@@ -1,26 +1,42 @@
-<!--
-     Copyright (C) 2016 The CyanogenMod 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.
--->
+<?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.0"
-        android:viewportHeight="24.0">
-    <path
-        android:pathData="M4,17.268C3.402,17.613 3,18.26 3,19C3,20.105 3.895,21 5,21C5.74,21 6.387,20.598 6.732,20L9.268,20C9.613,20.598 10.26,21 11,21C12.105,21 13,20.105 13,19C13,17.895 12.105,17 11,17C10.26,17 9.613,17.402 9.268,18L6.732,18C6.557,17.696 6.304,17.443 6,17.268L6,14.732C6.598,14.387 7,13.74 7,13C7,11.895 6.105,11 5,11C3.895,11 3,11.895 3,13C3,13.74 3.402,14.387 4,14.732L4,17.268ZM21,11L21,9C21,7.89 20.1,7 19,7L17,7L17,5L21,5L21,3L15,3L15,9L19,9L19,11L15,11L15,13L19,13C20.1,13 21,12.11 21,11ZM5,9C6.105,9 7,8.105 7,7C7,5.895 6.105,5 5,5C3.895,5 3,5.895 3,7C3,8.105 3.895,9 5,9ZM11,9C12.105,9 13,8.105 13,7C13,5.895 12.105,5 11,5C9.895,5 9,5.895 9,7C9,8.105 9.895,9 11,9ZM11,15C12.105,15 13,14.105 13,13C13,11.895 12.105,11 11,11C9.895,11 9,11.895 9,13C9,14.105 9.895,15 11,15ZM17,21C18.105,21 19,20.105 19,19C19,17.895 18.105,17 17,17C15.895,17 15,17.895 15,19C15,20.105 15.895,21 17,21Z"
-        android:strokeColor="#00000000"
-        android:fillColor="#777777"
-        android:strokeWidth="1"/>
-</vector>
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="32"
+    android:viewportHeight="33">
+
+    <group>
+        <path
+            android:fillColor="#FF7301"
+            android:pathData="M25.2477 32.6609H6.75229C3.02611 32.6609 0 29.6348 0 25.9086V7.41318C0 3.687 3.02611 0.660889 6.75229 0.660889H25.2477C28.9739 0.660889 32 3.687 32 7.41318V25.9086C32 29.6348 28.9739 32.6609 25.2477 32.6609Z" />
+        <group>
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M24.4111 19.0831H21.9222L21.6333 20.772C22.1222 20.5053 22.5889 20.372 23.0111 20.372C23.3444 20.372 23.6556 20.4386 23.9444 20.5497C24.2333 20.6831 24.5 20.8386 24.7222 21.0608C24.9444 21.2831 25.1222 21.5497 25.2333 21.8608C25.3667 22.172 25.4111 22.4831 25.4111 22.8386C25.4111 23.3497 25.3 23.8164 25.0778 24.2164C24.8556 24.6386 24.5222 24.9719 24.1 25.2164C23.6778 25.4608 23.1889 25.5942 22.6111 25.5942C21.9889 25.5942 21.4778 25.4831 21.0778 25.2386C20.6778 25.0164 20.4111 24.7497 20.2556 24.4386C20.1 24.1497 20.0111 23.8831 20.0111 23.6608C20.0111 23.5275 20.0778 23.3942 20.1889 23.2831C20.3 23.172 20.4556 23.1053 20.6111 23.1053C20.9 23.1053 21.1222 23.2831 21.2556 23.6164C21.3889 23.9275 21.5889 24.172 21.8111 24.3497C22.0333 24.5275 22.3222 24.6164 22.6111 24.6164C22.8778 24.6164 23.1222 24.5497 23.3222 24.4164C23.5222 24.2831 23.6778 24.0831 23.7889 23.8386C23.9 23.5942 23.9444 23.3053 23.9444 22.9942C23.9444 22.6608 23.8778 22.372 23.7667 22.1275C23.6556 21.8831 23.5 21.7053 23.3 21.5942C23.1 21.4831 22.8778 21.4164 22.6333 21.4164C22.3222 21.4164 22.1222 21.4608 21.9889 21.5275C21.8556 21.5942 21.6778 21.7275 21.4333 21.9053C21.1889 22.0831 20.9889 22.172 20.8333 22.172C20.6556 22.172 20.5 22.1053 20.3667 21.9942C20.2333 21.8608 20.1667 21.7275 20.1667 21.572C20.1667 21.5497 20.1889 21.4386 20.2333 21.2164L20.6778 18.7053C20.7222 18.3942 20.8111 18.1942 20.9444 18.0608C21.0778 17.9275 21.3 17.8608 21.5889 17.8608H24.3667C24.9222 17.8608 25.1889 18.0608 25.1889 18.4831C25.1889 18.6608 25.1222 18.8164 24.9889 18.9275C24.8556 19.0164 24.6556 19.0831 24.4111 19.0831Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M8.05553 10.6609C8.86555 10.6609 9.5222 10.0042 9.5222 9.19421C9.5222 8.38419 8.86555 7.72754 8.05553 7.72754C7.24552 7.72754 6.58887 8.38419 6.58887 9.19421C6.58887 10.0042 7.24552 10.6609 8.05553 10.6609Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M15.3666 10.6609C16.1766 10.6609 16.8332 10.0042 16.8332 9.19421C16.8332 8.38419 16.1766 7.72754 15.3666 7.72754C14.5566 7.72754 13.8999 8.38419 13.8999 9.19421C13.8999 10.0042 14.5566 10.6609 15.3666 10.6609Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M22.6999 10.6609C23.51 10.6609 24.1666 10.0042 24.1666 9.19421C24.1666 8.38419 23.51 7.72754 22.6999 7.72754C21.8899 7.72754 21.2333 8.38419 21.2333 9.19421C21.2333 10.0042 21.8899 10.6609 22.6999 10.6609Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M8.05553 17.9722C8.86555 17.9722 9.5222 17.3155 9.5222 16.5055C9.5222 15.6955 8.86555 15.0388 8.05553 15.0388C7.24552 15.0388 6.58887 15.6955 6.58887 16.5055C6.58887 17.3155 7.24552 17.9722 8.05553 17.9722Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M15.3666 17.9722C16.1766 17.9722 16.8332 17.3155 16.8332 16.5055C16.8332 15.6955 16.1766 15.0388 15.3666 15.0388C14.5566 15.0388 13.8999 15.6955 13.8999 16.5055C13.8999 17.3155 14.5566 17.9722 15.3666 17.9722Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M8.05553 25.3054C8.86555 25.3054 9.5222 24.6488 9.5222 23.8387C9.5222 23.0287 8.86555 22.3721 8.05553 22.3721C7.24552 22.3721 6.58887 23.0287 6.58887 23.8387C6.58887 24.6488 7.24552 25.3054 8.05553 25.3054Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M15.3666 25.3054C16.1766 25.3054 16.8332 24.6488 16.8332 23.8387C16.8332 23.0287 16.1766 22.3721 15.3666 22.3721C14.5566 22.3721 13.8999 23.0287 13.8999 23.8387C13.8999 24.6488 14.5566 25.3054 15.3666 25.3054Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M8.05561 17.2829C7.63339 17.2829 7.27783 16.9274 7.27783 16.5051V9.19404C7.27783 8.77182 7.63339 8.41626 8.05561 8.41626H15.3667C15.7889 8.41626 16.1445 8.77182 16.1445 9.19404C16.1445 9.61626 15.7889 9.97182 15.3667 9.97182H8.83339V16.5051C8.83339 16.9274 8.47783 17.2829 8.05561 17.2829Z" />
+        </group>
+    </group>
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_security_pattern_6x6.xml b/res/drawable/ic_security_pattern_6x6.xml
index 1861284dbbf..63ccabf6355 100644
--- a/res/drawable/ic_security_pattern_6x6.xml
+++ b/res/drawable/ic_security_pattern_6x6.xml
@@ -1,26 +1,42 @@
-<!--
-     Copyright (C) 2016 The CyanogenMod 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.
--->
+<?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.0"
-        android:viewportHeight="24.0">
-    <path
-        android:pathData="M17,13L19,13C20.1,13 21,12.11 21,11L21,9C21,7.89 20.1,7 19,7L17,7L17,5L21,5L21,3L17,3C15.9,3 15,3.89 15,5L15,11C15,12.11 15.9,13 17,13L17,13ZM4,17.268C3.402,17.613 3,18.26 3,19C3,20.105 3.895,21 5,21C5.74,21 6.387,20.598 6.732,20L9.268,20C9.613,20.598 10.26,21 11,21C12.105,21 13,20.105 13,19C13,17.895 12.105,17 11,17C10.26,17 9.613,17.402 9.268,18L6.732,18C6.557,17.696 6.304,17.443 6,17.268L6,14.732C6.598,14.387 7,13.74 7,13C7,11.895 6.105,11 5,11C3.895,11 3,11.895 3,13C3,13.74 3.402,14.387 4,14.732L4,17.268ZM17,9L19,9L19,11L17,11L17,9ZM5,9C6.105,9 7,8.105 7,7C7,5.895 6.105,5 5,5C3.895,5 3,5.895 3,7C3,8.105 3.895,9 5,9ZM11,9C12.105,9 13,8.105 13,7C13,5.895 12.105,5 11,5C9.895,5 9,5.895 9,7C9,8.105 9.895,9 11,9ZM11,15C12.105,15 13,14.105 13,13C13,11.895 12.105,11 11,11C9.895,11 9,11.895 9,13C9,14.105 9.895,15 11,15ZM17,21C18.105,21 19,20.105 19,19C19,17.895 18.105,17 17,17C15.895,17 15,17.895 15,19C15,20.105 15.895,21 17,21Z"
-        android:strokeColor="#00000000"
-        android:fillColor="#777777"
-        android:strokeWidth="1"/>
-</vector>
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="32"
+    android:viewportHeight="33">
+
+    <group>
+        <path
+            android:fillColor="#FF7301"
+            android:pathData="M25.2477 32.4119H6.75229C3.02611 32.4119 0 29.3858 0 25.6596V7.16416C0 3.43798 3.02611 0.411865 6.75229 0.411865H25.2477C28.9739 0.411865 32 3.43798 32 7.16416V25.6596C32 29.3858 28.9739 32.4119 25.2477 32.4119Z" />
+        <group>
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M21.3889 21.0563C21.6334 20.7674 21.8778 20.5674 22.1667 20.4341C22.4556 20.3007 22.7667 20.2341 23.1 20.2341C23.4334 20.2341 23.7445 20.3007 24.0111 20.4118C24.3 20.5452 24.5445 20.723 24.7445 20.9452C24.9667 21.1674 25.1222 21.4341 25.2334 21.7452C25.3445 22.0563 25.4111 22.3896 25.4111 22.723C25.4111 23.2118 25.3 23.6563 25.0778 24.0563C24.8556 24.4563 24.5445 24.7674 24.1445 24.9896C23.7445 25.2118 23.2778 25.323 22.7667 25.323C22.1889 25.323 21.6778 25.1896 21.2556 24.9007C20.8334 24.6118 20.5 24.1896 20.2778 23.6341C20.0556 23.0785 19.9222 22.3896 19.9222 21.5896C19.9222 20.923 19.9889 20.3452 20.1222 19.8118C20.2556 19.3007 20.4556 18.8563 20.7 18.523C20.9445 18.1896 21.2556 17.923 21.6334 17.7452C21.9889 17.5674 22.4111 17.4785 22.8778 17.4785C23.3222 17.4785 23.7222 17.5674 24.0556 17.7452C24.3889 17.923 24.6556 18.1452 24.8334 18.3896C25.0111 18.6341 25.1 18.9007 25.1 19.123C25.1 19.2563 25.0556 19.3896 24.9445 19.523C24.8334 19.6341 24.7 19.7007 24.5222 19.7007C24.3667 19.7007 24.2334 19.6563 24.1222 19.5674C24.0111 19.4785 23.9 19.3452 23.8556 19.1896C23.7667 18.9896 23.6556 18.8118 23.4778 18.6785C23.3 18.5452 23.1 18.4785 22.8778 18.4785C22.7 18.4785 22.5 18.523 22.3222 18.6341C22.1445 18.7452 21.9889 18.8785 21.8556 19.0563C21.5667 19.4563 21.4334 20.1007 21.3889 21.0563ZM22.7889 24.323C23.1445 24.323 23.4334 24.1896 23.6556 23.9007C23.8778 23.6118 24.0111 23.2341 24.0111 22.7674C24.0111 22.4563 23.9667 22.1674 23.8556 21.9452C23.7445 21.723 23.5889 21.5452 23.4111 21.4118C23.2334 21.3007 23.0111 21.2341 22.7889 21.2341C22.5667 21.2341 22.3667 21.3007 22.1667 21.4118C21.9667 21.523 21.8111 21.7007 21.7 21.923C21.5889 22.1452 21.5222 22.3896 21.5222 22.7007C21.5222 23.1674 21.6556 23.5674 21.9 23.8785C22.1222 24.1452 22.4334 24.323 22.7889 24.323Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M8.05553 10.4118C8.86555 10.4118 9.5222 9.7552 9.5222 8.94518C9.5222 8.13516 8.86555 7.47852 8.05553 7.47852C7.24552 7.47852 6.58887 8.13516 6.58887 8.94518C6.58887 9.7552 7.24552 10.4118 8.05553 10.4118Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M15.3666 10.4118C16.1766 10.4118 16.8332 9.7552 16.8332 8.94518C16.8332 8.13516 16.1766 7.47852 15.3666 7.47852C14.5566 7.47852 13.8999 8.13516 13.8999 8.94518C13.8999 9.7552 14.5566 10.4118 15.3666 10.4118Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M22.6999 10.4118C23.51 10.4118 24.1666 9.7552 24.1666 8.94518C24.1666 8.13516 23.51 7.47852 22.6999 7.47852C21.8899 7.47852 21.2333 8.13516 21.2333 8.94518C21.2333 9.7552 21.8899 10.4118 22.6999 10.4118Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M8.05553 17.7231C8.86555 17.7231 9.5222 17.0665 9.5222 16.2565C9.5222 15.4464 8.86555 14.7898 8.05553 14.7898C7.24552 14.7898 6.58887 15.4464 6.58887 16.2565C6.58887 17.0665 7.24552 17.7231 8.05553 17.7231Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M15.3666 17.7231C16.1766 17.7231 16.8332 17.0665 16.8332 16.2565C16.8332 15.4464 16.1766 14.7898 15.3666 14.7898C14.5566 14.7898 13.8999 15.4464 13.8999 16.2565C13.8999 17.0665 14.5566 17.7231 15.3666 17.7231Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M8.05553 25.0564C8.86555 25.0564 9.5222 24.3997 9.5222 23.5897C9.5222 22.7797 8.86555 22.123 8.05553 22.123C7.24552 22.123 6.58887 22.7797 6.58887 23.5897C6.58887 24.3997 7.24552 25.0564 8.05553 25.0564Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M15.3666 25.0564C16.1766 25.0564 16.8332 24.3997 16.8332 23.5897C16.8332 22.7797 16.1766 22.123 15.3666 22.123C14.5566 22.123 13.8999 22.7797 13.8999 23.5897C13.8999 24.3997 14.5566 25.0564 15.3666 25.0564Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M8.05561 17.0339C7.63339 17.0339 7.27783 16.6783 7.27783 16.2561V8.94501C7.27783 8.52279 7.63339 8.16724 8.05561 8.16724H15.3667C15.7889 8.16724 16.1445 8.52279 16.1445 8.94501C16.1445 9.36724 15.7889 9.72279 15.3667 9.72279H8.83339V16.2561C8.83339 16.6783 8.47783 17.0339 8.05561 17.0339Z" />
+        </group>
+    </group>
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_settings_data_usage.xml b/res/drawable/ic_settings_data_usage.xml
index 2fde41116f1..3127640b0cc 100644
--- a/res/drawable/ic_settings_data_usage.xml
+++ b/res/drawable/ic_settings_data_usage.xml
@@ -1,31 +1,27 @@
-<!--
-    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.
--->
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24.0dp"
-        android:height="24.0dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0"
-        android:tint="@color/green_1">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+
+    <path
+        android:fillColor="#E83A52"
+        android:pathData="M25.2477 32H6.75229C3.02611 32 0 28.9739 0 25.2477V6.75229C0 3.02611 3.02611 0 6.75229 0H25.2477C28.9739 0 32 3.02611 32 6.75229V25.2477C32 28.9739 28.9739 32 25.2477 32Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M11.1571 5.6909C11.3671 5.69119 11.5683 5.77503 11.7164 5.92392L15.8717 10.1018C16.1795 10.4113 16.1781 10.9117 15.8686 11.2196C15.5591 11.5274 15.0587 11.526 14.7508 11.2165L11.1545 7.60062L7.53705 11.218C7.22837 11.5267 6.72792 11.5267 6.41925 11.218C6.11058 10.9094 6.11058 10.4089 6.41925 10.1002L10.5971 5.92241C10.7456 5.77391 10.9471 5.69062 11.1571 5.6909Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M11.156 5.6909C11.5925 5.6909 11.9464 6.04478 11.9464 6.48131V25.5187C11.9464 25.9552 11.5925 26.3091 11.156 26.3091C10.7195 26.3091 10.3656 25.9552 10.3656 25.5187V6.48131C10.3656 6.04478 10.7195 5.6909 11.156 5.6909Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M16.1299 20.7819C16.4386 20.4733 16.9391 20.4733 17.2477 20.7819L20.8652 24.3994L24.4615 20.7835C24.7694 20.474 25.2698 20.4726 25.5793 20.7804C25.8888 21.0883 25.8902 21.5887 25.5823 21.8982L21.4271 26.0761C21.279 26.225 21.0777 26.3088 20.8678 26.3091C20.6578 26.3094 20.4563 26.2261 20.3078 26.0776L16.1299 21.8997C15.8213 21.5911 15.8213 21.0906 16.1299 20.7819Z" />
     <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M18.32 16.75l1.32 .76 c.26 .15 .34 .51 .15 .74 -2.09 2.6-5.44 4.14-9.14
-3.65-4.4-.58-7.96-4.12-8.56-8.52C1.34 7.8 5.21 2.95 10.43 2.12c.3-.05 .57 .2 .57
-.5v1.53c0 .24-.18 .44 -.41 .49 -3.6 .69 -6.29 3.95-6.07 7.79 .21 3.82 3.43 6.95
-7.25 7.07 2.37 .08 4.51-.96 5.93-2.63a.48 .48 0 0 1 .62-.12zM19.5 12c0 .83-.14
-1.63-.39 2.38-.08 .23 .01 .47 .21 .59 l1.33 .77 c.26 .15 .61 .04 .72-.24 .4
--1.09 .63 -2.27 .63 -3.5 0-4.99-3.65-9.12-8.43-9.88-.3-.04-.57 .2 -.57 .5
-v1.53c0 .24 .18 .44 .41 .48 3.46 .68 6.09 3.72 6.09 7.37z"/>
-</vector>
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M20.8667 5.6909C21.3032 5.6909 21.6571 6.04478 21.6571 6.48131V25.5187C21.6571 25.9552 21.3032 26.3091 20.8667 26.3091C20.4302 26.3091 20.0763 25.9552 20.0763 25.5187V6.48131C20.0763 6.04478 20.4302 5.6909 20.8667 5.6909Z" />
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_settings_date_time.xml b/res/drawable/ic_settings_date_time.xml
index ecc4ce81143..4fb4cee7154 100644
--- a/res/drawable/ic_settings_date_time.xml
+++ b/res/drawable/ic_settings_date_time.xml
@@ -1,25 +1,60 @@
-<!--
-     Copyright (C) 2015 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.
--->
+<?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.0"
-        android:viewportHeight="24.0"
-        android:tint="@color/blue_1">
-    <path
-        android:fillColor="#FFFFFFFF"
-        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,8zM11.75,6.1c-0.5,0 -0.75,0.32 -0.75,0.72L11,13l4.64,2.78c0.34,0.2 0.78,0.1 0.98,-0.24a0.71,0.71 0,0 0,-0.25 -0.99l-3.87,-2.3L12.5,6.82c0,-0.4 -0.25,-0.72 -0.75,-0.72z"/>
-</vector>
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+
+    <path
+        android:fillColor="#E83A52"
+        android:pathData="M25.2477 32H6.75229C3.02611 32 0 28.9739 0 25.2477V6.75229C0 3.02611 3.02611 0 6.75229 0H25.2477C28.9739 0 32 3.02611 32 6.75229V25.2477C32 28.9739 28.9739 32 25.2477 32Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M14.1144 8.87512C14.1144 8.43859 14.4682 8.08472 14.9048 8.08472H25.993C26.4295 8.08472 26.7834 8.43859 26.7834 8.87512V25.3381C26.7834 25.7746 26.4295 26.1285 25.993 26.1285H7.8363C7.39977 26.1285 7.0459 25.7746 7.0459 25.3381V15.4016C7.0459 14.9651 7.39977 14.6112 7.8363 14.6112C8.27283 14.6112 8.6267 14.9651 8.6267 15.4016V24.5477H25.2026V9.66552H14.9048C14.4682 9.66552 14.1144 9.31165 14.1144 8.87512Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M10.3204 6.66198C12.7142 6.66198 14.6338 8.60411 14.6338 10.9753C14.6338 13.3465 12.6916 15.2887 10.3204 15.2887C7.92662 15.2887 6.00707 13.3465 6.00707 10.9753C6.00707 8.60411 7.94921 6.66198 10.3204 6.66198ZM10.3204 5.08118C7.06847 5.08118 4.42627 7.72338 4.42627 10.9753C4.42627 14.2273 7.06847 16.8695 10.3204 16.8695C13.5724 16.8695 16.2146 14.2273 16.2146 10.9753C16.2146 7.72338 13.5724 5.08118 10.3204 5.08118Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M10.3204 7.85876C10.757 7.85876 11.1108 8.21264 11.1108 8.64917V10.1848H12.6691C13.1056 10.1848 13.4595 10.5387 13.4595 10.9752C13.4595 11.4117 13.1056 11.7656 12.6691 11.7656H10.3204C9.8839 11.7656 9.53003 11.4117 9.53003 10.9752V8.64917C9.53003 8.21264 9.8839 7.85876 10.3204 7.85876Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M18.4503 6.54907C18.8868 6.54907 19.2407 6.90295 19.2407 7.33947V10.4108C19.2407 10.8473 18.8868 11.2012 18.4503 11.2012C18.0138 11.2012 17.6599 10.8473 17.6599 10.4108V7.33947C17.6599 6.90295 18.0138 6.54907 18.4503 6.54907Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M22.4023 6.54907C22.8389 6.54907 23.1927 6.90295 23.1927 7.33947V10.4108C23.1927 10.8473 22.8389 11.2012 22.4023 11.2012C21.9658 11.2012 21.6119 10.8473 21.6119 10.4108V7.33947C21.6119 6.90295 21.9658 6.54907 22.4023 6.54907Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M18.7439 21.1151C19.1956 21.1151 19.5569 21.4764 19.5569 21.9281C19.5569 22.3798 19.1956 22.7411 18.7439 22.7411C18.2922 22.7411 17.9309 22.3798 17.9309 21.9281C17.9309 21.4764 18.2922 21.1151 18.7439 21.1151Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M15.0853 21.1151C15.537 21.1151 15.8983 21.4764 15.8983 21.9281C15.8983 22.3798 15.537 22.7411 15.0853 22.7411C14.6337 22.7411 14.2723 22.3798 14.2723 21.9281C14.2723 21.4764 14.6337 21.1151 15.0853 21.1151Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M11.427 21.1151C11.8787 21.1151 12.24 21.4764 12.24 21.9281C12.24 22.3798 11.8787 22.7411 11.427 22.7411C10.9753 22.7411 10.614 22.3798 10.614 21.9281C10.614 21.4764 10.9753 21.1151 11.427 21.1151Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M22.4022 21.1151C22.8539 21.1151 23.2152 21.4764 23.2152 21.9281C23.2152 22.3798 22.8539 22.7411 22.4022 22.7411C21.9506 22.7411 21.5892 22.3798 21.5892 21.9281C21.5892 21.4764 21.9506 21.1151 22.4022 21.1151Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M18.7439 17.4565C19.1956 17.4565 19.5569 17.8179 19.5569 18.2695C19.5569 18.7212 19.1956 19.0825 18.7439 19.0825C18.2922 19.0825 17.9309 18.7212 17.9309 18.2695C17.9309 17.8179 18.2922 17.4565 18.7439 17.4565Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M15.0853 17.4565C15.537 17.4565 15.8983 17.8179 15.8983 18.2695C15.8983 18.7212 15.537 19.0825 15.0853 19.0825C14.6337 19.0825 14.2723 18.7212 14.2723 18.2695C14.2723 17.8179 14.6337 17.4565 15.0853 17.4565Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M11.427 17.4565C11.8787 17.4565 12.24 17.8179 12.24 18.2695C12.24 18.7212 11.8787 19.0825 11.427 19.0825C10.9753 19.0825 10.614 18.7212 10.614 18.2695C10.614 17.8179 10.9753 17.4565 11.427 17.4565Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M22.4022 17.4565C22.8539 17.4565 23.2152 17.8179 23.2152 18.2695C23.2152 18.7212 22.8539 19.0825 22.4022 19.0825C21.9506 19.0825 21.5892 18.7212 21.5892 18.2695C21.5892 17.8179 21.9506 17.4565 22.4022 17.4565Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M18.7439 13.7981C19.1956 13.7981 19.5569 14.1594 19.5569 14.6111C19.5569 15.0627 19.1956 15.4241 18.7439 15.4241C18.2922 15.4241 17.9309 15.0627 17.9309 14.6111C17.9309 14.1594 18.2922 13.7981 18.7439 13.7981Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M22.4023 13.7981C22.854 13.7981 23.2153 14.1594 23.2153 14.6111C23.2153 15.0627 22.854 15.4241 22.4023 15.4241C21.9507 15.4241 21.5894 15.0627 21.5894 14.6111C21.5894 14.1594 21.9507 13.7981 22.4023 13.7981Z" />
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_settings_development.xml b/res/drawable/ic_settings_development.xml
index a22908df3ac..6d6075fc134 100644
--- a/res/drawable/ic_settings_development.xml
+++ b/res/drawable/ic_settings_development.xml
@@ -1,21 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2015 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.
--->
-
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/ic_settings_development_alpha"
-    android:tint="@color/red_1" />
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="32"
+    android:viewportHeight="33">
 
+    <group>
+        <path
+            android:fillColor="#A7B7C2"
+            android:pathData="M25.2477 32.906H6.75229C3.02611 32.906 0 29.8799 0 26.1537V7.6583C0 3.93212 3.02611 0.906006 6.75229 0.906006H25.2477C28.9739 0.906006 32 3.93212 32 7.6583V26.1537C32 29.8799 28.9739 32.906 25.2477 32.906Z" />
+        <group>
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M22.3889 21.5173C22.1889 21.5173 21.9889 21.4506 21.8333 21.295C21.5222 20.9839 21.5222 20.495 21.8333 20.1839L25.1222 16.9173L21.8555 13.6284C21.5444 13.3173 21.5444 12.8284 21.8555 12.5173C22.1666 12.2062 22.6555 12.2062 22.9666 12.5173L26.8111 16.3617C27.1222 16.6728 27.1222 17.1617 26.8111 17.4728L22.9444 21.295C22.7889 21.4506 22.5889 21.5173 22.3889 21.5173Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M9.61112 21.5173C9.41112 21.5173 9.21112 21.4506 9.05556 21.2951L5.21112 17.4506C4.90001 17.1395 4.90001 16.6506 5.21112 16.3395L9.05556 12.4951C9.36667 12.1839 9.85556 12.1839 10.1667 12.4951C10.4778 12.8062 10.4778 13.2951 10.1667 13.6062L6.85556 16.9173L10.1444 20.2062C10.4556 20.5173 10.4556 21.0062 10.1444 21.3173C10.0111 21.4506 9.81112 21.5173 9.61112 21.5173Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M13.8777 25.7839C13.8111 25.7839 13.7222 25.7839 13.6555 25.7394C13.2555 25.6061 13.0111 25.1839 13.1444 24.7616L18.0777 8.58387C18.2111 8.18387 18.6333 7.93942 19.0555 8.07275C19.4555 8.20609 19.7 8.62831 19.5666 9.05053L14.6111 25.2283C14.5222 25.5616 14.2111 25.7839 13.8777 25.7839Z" />
+        </group>
+    </group>
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_settings_gestures.xml b/res/drawable/ic_settings_gestures.xml
index 4a61f1972be..5023a13ffa1 100644
--- a/res/drawable/ic_settings_gestures.xml
+++ b/res/drawable/ic_settings_gestures.xml
@@ -1,28 +1,19 @@
-<!--
-    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.
--->
+<?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="32.0"
-        android:viewportHeight="32.0"
-        android:tint="@color/blue_1">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+
+    <path
+        android:fillColor="#0088ED"
+        android:pathData="M25.2477 32H6.75229C3.02611 32 0 28.9739 0 25.2477V6.75229C0 3.02611 3.02611 0 6.75229 0H25.2477C28.9739 0 32 3.02611 32 6.75229V25.2477C32 28.9739 28.9739 32 25.2477 32Z" />
     <path
-        android:fillColor="#FF000000"
-        android:pathData="M20,20.2V24H6V5.3h8.7l2.4,-4H7.6c-2.2,0 -4,1.8 -4,4v21.3c0,2.2 1.8,4 4,4h10.7c2.2,0 4,-1.8 4,-4V14.9L20,20.2zM15.6,28h-5.3v-1.3h5.3V28z"/>
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M12.127 11.3141C12.127 9.92797 13.3634 8.84713 14.752 9.01647C14.7584 9.01726 14.7649 9.01812 14.7713 9.01907C15.9524 9.19277 16.7791 10.2482 16.7791 11.3819V14.1489C17.0136 14.0681 17.2644 14.0241 17.5243 14.0241C18.1095 14.0241 18.6485 14.2471 19.0599 14.6117C19.4714 14.2471 20.0104 14.0241 20.5956 14.0241C21.1807 14.0241 21.7197 14.2471 22.1312 14.6117C22.5427 14.2471 23.0817 14.0241 23.6669 14.0241C24.939 14.0241 25.9929 15.078 25.9929 16.3501V17.2083C25.9929 18.2467 25.6681 20.4592 25.3616 22.3377C25.2055 23.2938 25.0496 24.1897 24.9327 24.8475C24.8743 25.1766 24.8256 25.4462 24.7916 25.6342C24.7744 25.7286 24.7613 25.8011 24.7522 25.8513C24.7494 25.8669 24.7471 25.8798 24.7452 25.8901C24.7441 25.8965 24.7431 25.9019 24.7423 25.9063L24.7423 25.9066C24.6858 26.2877 24.3573 26.5802 23.9604 26.5802C23.5239 26.5802 23.17 26.2263 23.17 25.7898C23.1705 25.7628 23.1728 25.7234 23.174 25.7109C23.1747 25.7036 23.1761 25.6917 23.1767 25.687C23.1774 25.6817 23.1781 25.677 23.1786 25.6735C23.179 25.671 23.1793 25.6691 23.1794 25.668C23.1805 25.6613 23.1814 25.6555 23.1819 25.6525C23.1831 25.6457 23.1844 25.638 23.1857 25.6309C23.1883 25.6161 23.192 25.5954 23.1966 25.5702C23.2019 25.5407 23.2087 25.5032 23.2168 25.4585C23.2226 25.4266 23.2291 25.3911 23.2361 25.3524C23.2699 25.1654 23.3183 24.8977 23.3763 24.5711C23.4923 23.9177 23.6469 23.0295 23.8014 22.0831C24.1159 20.1563 24.4121 18.0893 24.4121 17.2083V16.3501C24.4121 15.9511 24.0659 15.6049 23.6669 15.6049C23.2678 15.6049 22.9216 15.9511 22.9216 16.3501C22.9216 16.7866 22.5678 17.1405 22.1312 17.1405C21.6947 17.1405 21.3408 16.7866 21.3408 16.3501C21.3408 15.9511 20.9946 15.6049 20.5956 15.6049C20.1965 15.6049 19.8504 15.9511 19.8504 16.3501C19.8504 16.7866 19.4965 17.1405 19.0599 17.1405C18.6234 17.1405 18.2695 16.7866 18.2695 16.3501C18.2695 15.9511 17.9234 15.6049 17.5243 15.6049C17.1253 15.6049 16.7791 15.9511 16.7791 16.3501C16.7791 16.7866 16.4252 17.1405 15.9887 17.1405C15.5521 17.1405 15.1983 16.7866 15.1983 16.3501V11.3819C15.1983 10.9835 14.9011 10.6413 14.5507 10.5845C14.0918 10.5344 13.7078 10.8966 13.7078 11.3141V19.6246C13.7078 19.9358 13.5253 20.2179 13.2415 20.3455C12.9577 20.4731 12.6255 20.4223 12.3928 20.2158L9.21231 17.3937C8.93044 17.1886 8.68733 17.1221 8.49114 17.1207C8.29062 17.1193 8.07761 17.1854 7.85932 17.3435C7.54873 17.5866 7.4805 18.0269 7.71191 18.3661L8.62818 19.4127C9.19381 20.0588 9.9482 20.9205 10.7033 21.7828C11.4584 22.6452 12.2142 23.5083 12.7826 24.1571C13.0668 24.4815 13.3041 24.7523 13.471 24.9427C13.5545 25.0379 13.6202 25.1128 13.6654 25.1642C13.7045 25.2087 13.718 25.2239 13.7179 25.2241C13.7177 25.2242 13.7113 25.2174 13.7021 25.2083C14.0108 25.517 14.0108 26.0174 13.7021 26.3261C13.3935 26.6348 12.893 26.6348 12.5843 26.3261C12.5622 26.304 12.5172 26.2526 12.4892 26.2206C12.4849 26.2157 12.481 26.2113 12.4777 26.2075C12.4321 26.1555 12.3659 26.0802 12.2824 25.9849C12.1152 25.7942 11.8777 25.5232 11.5935 25.1987C11.025 24.5498 10.2691 23.6866 9.51399 22.8242C8.75885 21.9618 8.00443 21.1001 7.43879 20.454L6.49635 19.3775C6.49631 19.3775 6.49628 19.3774 7.091 18.8568L6.49635 19.3775C6.48137 19.3604 6.46707 19.3426 6.45362 19.3242C5.71248 18.3136 5.87177 16.8753 6.90367 16.0842C6.90813 16.0807 6.91263 16.0774 6.91716 16.074C7.3738 15.7392 7.9148 15.5358 8.50243 15.54C9.09109 15.5442 9.66399 15.7562 10.1849 16.1469C10.2022 16.1599 10.219 16.1736 10.2352 16.188L12.127 17.8666V11.3141Z" />
     <path
-        android:fillColor="#FF000000"
-        android:pathData="M28.5,7l1.1,-2.4L32,3.5l-2.4,-1.1L28.5,0l-1.1,2.4L25,3.5l2.4,1.1L28.5,7zM21,7.4l-2.2,-4.8l-2.2,4.8l-4.8,2.2l4.8,2.2l2.2,4.8l2.2,-4.8l4.8,-2.2L21,7.4zM28.5,12.2l-1.1,2.4L25,15.6l2.4,1.1l1.1,2.4l1.1,-2.4l2.4,-1.1l-2.4,-1.1L28.5,12.2z"/>
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M8.89758 11.0882C8.89758 7.96434 11.4194 5.4425 14.5433 5.4425C17.6672 5.4425 20.189 7.96434 20.189 11.0882C20.189 11.5248 19.8352 11.8786 19.3986 11.8786C18.9621 11.8786 18.6082 11.5248 18.6082 11.0882C18.6082 8.83739 16.7942 7.02331 14.5433 7.02331C12.2925 7.02331 10.4784 8.83739 10.4784 11.0882C10.4784 11.5248 10.1245 11.8786 9.68799 11.8786C9.25146 11.8786 8.89758 11.5248 8.89758 11.0882Z" />
 </vector>
\ No newline at end of file
diff --git a/res/drawable/ic_settings_language.xml b/res/drawable/ic_settings_language.xml
index 33b7403aa5f..962bfe0a9d5 100644
--- a/res/drawable/ic_settings_language.xml
+++ b/res/drawable/ic_settings_language.xml
@@ -1,36 +1,17 @@
-<!--
-    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.
--->
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24.0dp"
-        android:height="24.0dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0"
-        android:tint="@color/blue_1">
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M11.99,2.0C6.47,2.0 2.0,6.48 2.0,12.0s4.47,10.0 9.99,10.0C17.52,22.0 22.0,17.52 22.0,12.0S17.52,2.0 11.99,2.0z
-        m6.93,6.0l-2.95,0.0c-0.32,-1.25 -0.78,-2.45 -1.38,-3.56 1.8,0.63 3.37,1.91 4.33,3.56z
-        M12.0,4.04c0.83,1.2 1.48,2.53 1.91,3.96l-3.82,0.0c0.43,-1.43 1.08,-2.76 1.91,-3.96z
-        M4.26,14.0C4.1,13.36 4.0,12.69 4.0,12.0s0.1,-1.3 0.26,-2.0l3.38,0.0c0.0,0.66 -0.14,1.32 -0.14,2.0 0.0,0.6 0.06,1.3 0.14,2.0L4.26,14.0z
-        m0.82,2.0 l2.95,0.0c0.32,1.2 0.78,2.45 1.38,3.56 -1.84,-0.63 -3.37,-1.9 -4.33,-3.56z
-        m2.95,-8.0 L5.08,8.  c0.96,-1.66 2.49,-2.93 4.33,-3.56 C8.81,5.55 8.35,6.75 8.03,8.0z
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
 
-        M12.0,19.96c-0.83,-1.2 -1.48,-2.53 -1.91,-3.96l3.82,0.0c-0.43,1.43 -1.08,2.76 -1.91,3.96z
-        M14.34,14.0 L9.66,14.0c-0.09,-0.66 -0.16,-1.32 -0.16,-2.0 0.0,-0.6 0.07,-1.3 0.16,-2.0l4.68,0.0c0.0,0.6 0.16,1.3 0.16,2.0 0.0,0.68 -0.07,1.34 -0.16,2.0z
-        m0.25,5.56c0.6,-1.11 1.06,-2.31 1.38,-3.56l2.95,0.0c-0.96,1.65 -2.49,2.93 -4.33,3.56z
-        M16.36,14.0c0.08,-0.6 0.14,-1.3 0.14,-2.0 0.0,-0.68 -0.06,-1.34 -0.14,-2.0l3.38,0.0c0.1,0.6 0.26,1.3 0.26,2.0s-0.1,1.36 -0.26,2.0l-3.38,0.0z
-        "/>
-</vector>
+    <path
+        android:fillColor="#0088ED"
+        android:pathData="M25.2477 32H6.75229C3.02611 32 0 28.9739 0 25.2477V6.75229C0 3.02611 3.02611 0 6.75229 0H25.2477C28.9739 0 32 3.02611 32 6.75229V25.2477C32 28.9739 28.9739 32 25.2477 32Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M20.0311 7.13622C23.3056 7.13622 25.9704 9.82359 25.9704 13.0755V17.2534C25.9704 20.5279 23.283 23.1927 20.0311 23.1927H14.0692L11.0656 26.2188V23.1249C8.2202 22.6733 6.02966 20.2117 6.02966 17.2534V13.0981C6.02966 9.82359 8.71702 7.15881 11.969 7.15881H20.0311V7.13622ZM20.0311 5.55542H11.969C7.81371 5.55542 4.44885 8.94286 4.44885 13.0755V17.2534C4.44885 20.4601 6.54906 23.3056 9.48484 24.3444V26.1962C9.48484 26.8285 9.86875 27.4157 10.4559 27.6641C10.6592 27.7544 10.8624 27.777 11.0656 27.777C11.4721 27.777 11.8786 27.6189 12.1948 27.3028L14.7467 24.7509H20.0537C24.2089 24.7509 27.5738 21.3635 27.5738 17.2308V13.0981C27.5738 8.94286 24.1863 5.55542 20.0311 5.55542Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M18.2097 17.6706L17.7826 16.5477H14.1453L13.7181 17.695C13.5513 18.1425 13.4089 18.4456 13.291 18.6043C13.173 18.7589 12.9797 18.8362 12.7112 18.8362C12.4834 18.8362 12.282 18.7528 12.107 18.586C11.9321 18.4192 11.8446 18.23 11.8446 18.0184C11.8446 17.8964 11.8649 17.7703 11.9056 17.6401C11.9463 17.5099 12.0134 17.3288 12.107 17.0969L14.3955 11.2871C14.4606 11.1203 14.5379 10.921 14.6274 10.6891C14.721 10.4531 14.8187 10.2578 14.9204 10.1032C15.0262 9.9486 15.1625 9.82451 15.3293 9.73094C15.5001 9.63329 15.7097 9.58447 15.9578 9.58447C16.2101 9.58447 16.4196 9.63329 16.5864 9.73094C16.7573 9.82451 16.8936 9.94657 16.9953 10.0971C17.1011 10.2476 17.1886 10.4104 17.2577 10.5853C17.331 10.7562 17.4225 10.9861 17.5323 11.2749L19.8697 17.0481C20.0528 17.4875 20.1443 17.8069 20.1443 18.0062C20.1443 18.2137 20.0568 18.4049 19.8819 18.5799C19.711 18.7508 19.5035 18.8362 19.2594 18.8362C19.117 18.8362 18.995 18.8098 18.8933 18.7569C18.7915 18.708 18.7061 18.6409 18.6369 18.5555C18.5678 18.466 18.4925 18.3317 18.4111 18.1527C18.3338 17.9696 18.2667 17.8089 18.2097 17.6706ZM14.6213 15.1868H17.2943L15.9456 11.4946L14.6213 15.1868Z" />
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_settings_memory.xml b/res/drawable/ic_settings_memory.xml
index 56d50326617..88c3c83e355 100644
--- a/res/drawable/ic_settings_memory.xml
+++ b/res/drawable/ic_settings_memory.xml
@@ -1,38 +1,51 @@
-<!--
-     Copyright (C) 2015 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.
--->
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="32dp"
-        android:height="32dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0"
-        android:tint="@color/orange_1">
-    <path
-        android:pathData="M6.0,4.0l0.0,16.0 12.0,0.0 0.0,-16.0 -12.0,0.0z
-        M6.0,5.25l0,1.5 -3,0 0,-1.5 3,0z
-        M6.0,9.25l0,1.5 -3,0 0,-1.5 3,0z
-        M6.0,13.25l0,1.5 -3,0 0,-1.5 3,0z
-        M6.0,17.25l0,1.5 -3,0 0,-1.5 3,0z
-        M21.0,5.25l0,1.5 -3,0 0,-1.5 3,0z
-        M21.0,9.25l0,1.5 -3,0 0,-1.5 3,0z
-        M21.0,13.25l0,1.5 -3,0 0,-1.5 3,0z
-        M21.0,17.25l0,1.5 -3,0 0,-1.5 3,0z
+    android:width="32dp"
+    android:height="32dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
 
-        M11.5,14.5l1,0 0,3 -1,0 0,-3z
-        M13.25,14.5l1,0 0,3 -1,0 0,-3z
-        M15.0,14.5l1,0 0,3 -1,0 0,-3z
-        "
-        android:fillColor="@android:color/black" />
-</vector>
+    <path
+        android:fillColor="#953EB4"
+        android:pathData="M25.2477 32H6.75229C3.02611 32 0 28.9739 0 25.2477V6.75229C0 3.02611 3.02611 0 6.75229 0H25.2477C28.9739 0 32 3.02611 32 6.75229V25.2477C32 28.9739 28.9739 32 25.2477 32Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M7.76843 8.85248C7.76843 8.41595 8.12231 8.06207 8.55883 8.06207H23.4184C23.8549 8.06207 24.2088 8.41595 24.2088 8.85248V23.712C24.2088 24.1486 23.8549 24.5024 23.4184 24.5024H8.55883C8.12231 24.5024 7.76843 24.1486 7.76843 23.712V8.85248ZM9.34924 9.64288V22.9216H22.628V9.64288H9.34924Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M13.4821 14.5434C13.4821 14.1069 13.8359 13.753 14.2725 13.753H17.7502C18.1868 13.753 18.5406 14.1069 18.5406 14.5434V18.0212C18.5406 18.4577 18.1868 18.8116 17.7502 18.8116H14.2725C13.8359 18.8116 13.4821 18.4577 13.4821 18.0212V14.5434ZM15.0629 15.3338V17.2308H16.9598V15.3338H15.0629Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M17.7502 5.87158C18.1868 5.87158 18.5406 6.22546 18.5406 6.66198V8.85253C18.5406 9.28906 18.1868 9.64293 17.7502 9.64293C17.3137 9.64293 16.9598 9.28906 16.9598 8.85253V6.66198C16.9598 6.22546 17.3137 5.87158 17.7502 5.87158Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M14.2725 5.87158C14.709 5.87158 15.0629 6.22546 15.0629 6.66198V8.85253C15.0629 9.28906 14.709 9.64293 14.2725 9.64293C13.8359 9.64293 13.4821 9.28906 13.4821 8.85253V6.66198C13.4821 6.22546 13.8359 5.87158 14.2725 5.87158Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M17.7502 22.9443C18.1868 22.9443 18.5406 23.2981 18.5406 23.7347V25.9478C18.5406 26.3843 18.1868 26.7382 17.7502 26.7382C17.3137 26.7382 16.9598 26.3843 16.9598 25.9478V23.7347C16.9598 23.2981 17.3137 22.9443 17.7502 22.9443Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M14.2725 22.9443C14.709 22.9443 15.0629 23.2981 15.0629 23.7347V25.9478C15.0629 26.3843 14.709 26.7382 14.2725 26.7382C13.8359 26.7382 13.4821 26.3843 13.4821 25.9478V23.7347C13.4821 23.2981 13.8359 22.9443 14.2725 22.9443Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M22.6506 18.0438C22.6506 17.6072 23.0045 17.2534 23.441 17.2534H25.6542C26.0907 17.2534 26.4446 17.6072 26.4446 18.0438C26.4446 18.4803 26.0907 18.8342 25.6542 18.8342H23.441C23.0045 18.8342 22.6506 18.4803 22.6506 18.0438Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M22.6506 14.5434C22.6506 14.1069 23.0045 13.753 23.441 13.753H25.6542C26.0907 13.753 26.4446 14.1069 26.4446 14.5434C26.4446 14.9799 26.0907 15.3338 25.6542 15.3338H23.441C23.0045 15.3338 22.6506 14.9799 22.6506 14.5434Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M5.578 18.0438C5.578 17.6072 5.93188 17.2534 6.36841 17.2534H8.55895C8.99548 17.2534 9.34935 17.6072 9.34935 18.0438C9.34935 18.4803 8.99548 18.8342 8.55895 18.8342H6.36841C5.93188 18.8342 5.578 18.4803 5.578 18.0438Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M5.578 14.5434C5.578 14.1069 5.93188 13.753 6.36841 13.753H8.55895C8.99548 13.753 9.34935 14.1069 9.34935 14.5434C9.34935 14.9799 8.99548 15.3338 8.55895 15.3338H6.36841C5.93188 15.3338 5.578 14.9799 5.578 14.5434Z" />
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_settings_multiuser.xml b/res/drawable/ic_settings_multiuser.xml
index 4dd83a50e24..c3f6657589f 100644
--- a/res/drawable/ic_settings_multiuser.xml
+++ b/res/drawable/ic_settings_multiuser.xml
@@ -1,25 +1,19 @@
-<!--
-    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.
--->
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24.0dp"
-        android:height="24.0dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0"
-        android:tint="?android:attr/colorControlNormal">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+
+    <path
+        android:fillColor="#0088ED"
+        android:pathData="M25.2477 32H6.75229C3.02611 32 0 28.9739 0 25.2477V6.75229C0 3.02611 3.02611 0 6.75229 0H25.2477C28.9739 0 32 3.02611 32 6.75229V25.2477C32 28.9739 28.9739 32 25.2477 32Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M16.0112 7.13622C13.6165 7.13622 11.6753 9.07748 11.6753 11.4721C11.6753 13.8668 13.6165 15.8081 16.0112 15.8081C18.4059 15.8081 20.3471 13.8668 20.3471 11.4721C20.3471 9.07748 18.4059 7.13622 16.0112 7.13622ZM10.0945 11.4721C10.0945 8.20443 12.7435 5.55542 16.0112 5.55542C19.2789 5.55542 21.9279 8.20443 21.9279 11.4721C21.9279 14.7399 19.2789 17.3889 16.0112 17.3889C12.7435 17.3889 10.0945 14.7399 10.0945 11.4721Z" />
     <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M12.0,12.0c2.21,0.0 4.0,-1.79 4.0,-4.0s-1.79,-4.0 -4.0,-4.0 -4.0,1.79 -4.0,4.0 1.79,4.0 4.0,4.0zm0.0,2.0c-2.67,0.0 -8.0,1.34 -8.0,4.0l0.0,2.0l16.0,0.0l0.0,-2.0c0.0,-2.66 -5.33,-4.0 -8.0,-4.0z"/>
-</vector>
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M15.9808 17.9534H16.0414C16.9734 17.9534 17.9269 17.9533 18.807 18.0684C19.7037 18.1856 20.5879 18.4287 21.3577 18.9598C22.9442 20.0543 23.7346 22.1344 23.7346 25.6767C23.7346 26.1133 23.3807 26.4671 22.9441 26.4671C22.5076 26.4671 22.1537 26.1133 22.1537 25.6767C22.1537 22.2861 21.3859 20.8997 20.46 20.261C19.9737 19.9255 19.3632 19.7353 18.6021 19.6358C17.834 19.5354 16.9779 19.5342 16.0112 19.5342C15.0388 19.5342 14.1799 19.5354 13.4106 19.6359C12.6485 19.7353 12.0391 19.9255 11.5546 20.2605C10.6318 20.8986 9.86865 22.2842 9.86865 25.6767C9.86865 26.1133 9.51477 26.4671 9.07824 26.4671C8.64172 26.4671 8.28784 26.1133 8.28784 25.6767C8.28784 22.1363 9.07166 20.0554 10.6555 18.9603C11.4243 18.4287 12.3083 18.1855 13.206 18.0683C14.0871 17.9533 15.0434 17.9534 15.9808 17.9534Z" />
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_settings_sim.xml b/res/drawable/ic_settings_sim.xml
index 466116f54c2..ee6a6df4c90 100644
--- a/res/drawable/ic_settings_sim.xml
+++ b/res/drawable/ic_settings_sim.xml
@@ -1,28 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2015 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="24.0dp"
-        android:height="24.0dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0"
-        android:tint="@color/blue_2">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+
+    <path
+        android:fillColor="#2CCF69"
+        android:pathData="M25.2477 32H6.75229C3.02611 32 0 28.9739 0 25.2477V6.75229C0 3.02611 3.02611 0 6.75229 0H25.2477C28.9739 0 32 3.02611 32 6.75229V25.2477C32 28.9739 28.9739 32 25.2477 32Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M7.29431 5.35215C7.29431 4.91563 7.64819 4.56175 8.08471 4.56175H18.6535C18.8637 4.56175 19.0653 4.64549 19.2136 4.79445L24.4754 10.0789C24.6229 10.227 24.7058 10.4275 24.7058 10.6366V26.6478C24.7058 27.0844 24.3519 27.4382 23.9153 27.4382H8.08471C7.64819 27.4382 7.29431 27.0844 7.29431 26.6478V5.35215ZM8.87512 6.14256V25.8574H23.1249V10.963L18.3251 6.14256H8.87512Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M10.5914 16.0113C10.5914 15.5747 10.9453 15.2209 11.3818 15.2209H20.6408C21.0774 15.2209 21.4312 15.5747 21.4312 16.0113V23.5088C21.4312 23.9453 21.0774 24.2992 20.6408 24.2992H11.3818C10.9453 24.2992 10.5914 23.9453 10.5914 23.5088V16.0113ZM12.1722 16.8017V22.7184H19.8504V16.8017H12.1722Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M10.7043 19.76C10.7043 19.3235 11.0582 18.9696 11.4947 18.9696H17.5696C18.0061 18.9696 18.36 19.3235 18.36 19.76V23.5088C18.36 23.9453 18.0061 24.2992 17.5696 24.2992H11.4947C11.0582 24.2992 10.7043 23.9453 10.7043 23.5088V19.76ZM12.2852 20.5504V22.7184H16.7792V20.5504H12.2852Z" />
     <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M19.99 4c0-1.1-.89-2-1.99-2h-8L4 8v12c0 1.1.9 2 2 2h12.01c1.1 0 1.99-.9 1.99-2l-.01-16zM9 19H7v-2h2v2zm8 0h-2v-2h2v2zm-8-4H7v-4h2v4zm4 4h-2v-4h2v4zm0-6h-2v-2h2v2zm4 2h-2v-4h2v4z"/>
-      <path android:pathData="M0 0h24v24H0z"/>
-</vector>
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M16.0112 15.6048C16.4478 15.6048 16.8016 15.9587 16.8016 16.3952V19.2858C16.8016 19.7223 16.4478 20.0762 16.0112 20.0762C15.5747 20.0762 15.2208 19.7223 15.2208 19.2858V16.3952C15.2208 15.9587 15.5747 15.6048 16.0112 15.6048Z" />
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_settings_sound.xml b/res/drawable/ic_settings_sound.xml
index eb4b98a75d8..a248eb82846 100644
--- a/res/drawable/ic_settings_sound.xml
+++ b/res/drawable/ic_settings_sound.xml
@@ -1,30 +1,23 @@
-<!--
-    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.
--->
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24.0dp"
-        android:height="24.0dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0"
-        android:tint="@color/red_1">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+
+    <path
+        android:fillColor="#FF7301"
+        android:pathData="M25.2477 32H6.75229C3.02611 32 0 28.9739 0 25.2477V6.75229C0 3.02611 3.02611 0 6.75229 0H25.2477C28.9739 0 32 3.02611 32 6.75229V25.2477C32 28.9739 28.9739 32 25.2477 32Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M19.1335 11.1616C19.4422 10.8529 19.9426 10.8529 20.2513 11.1616C22.9312 13.8414 22.9312 18.181 20.2513 20.8609C19.9426 21.1695 19.4422 21.1695 19.1335 20.8609C18.8248 20.5522 18.8248 20.0517 19.1335 19.7431C21.196 17.6805 21.196 14.3419 19.1335 12.2794C18.8248 11.9707 18.8248 11.4702 19.1335 11.1616Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M21.866 8.42901C22.1747 8.12034 22.6752 8.12034 22.9838 8.42901C27.1768 12.6219 27.1768 19.4005 22.9838 23.5934C22.6752 23.9021 22.1747 23.9021 21.866 23.5934C21.5574 23.2847 21.5574 22.7843 21.866 22.4756C25.4416 18.9 25.4416 13.1224 21.866 9.54681C21.5574 9.23814 21.5574 8.73768 21.866 8.42901Z" />
     <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M3 10v4c0 .55 .45 1 1 1h3l3.29 3.29c.63 .63 1.71 .18
-1.71-.71V6.41c0-.89-1.08-1.34-1.71-.71L7 9H4c-.55 0-1 .45-1 1zm13.5 2A4.5 4.5 0
-0 0 14 7.97v8.05c1.48-.73 2.5-2.25 2.5-4.02zM14 4.46v.19c0 .38 .25 .71 .61
-.85C17.18 6.54 19 9.06 19 12s-1.82 5.46-4.39 6.5c-.36 .14 -.61 .47 -.61 .85
-v.19c0 .63 .63 1.08 1.22 .86 a8.995 8.995 0 0 0 0-16.8c-.59-.23-1.22 .23 -1.22
-.86 z"/>
-</vector>
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M16.7002 5.43588C16.9942 5.55887 17.1856 5.84638 17.1856 6.16506V25.8348C17.1856 26.1532 16.9945 26.4405 16.7009 26.5637C16.4072 26.6868 16.0684 26.6217 15.8412 26.3986L9.56799 20.2342H6.68457C6.47269 20.2342 6.26968 20.1491 6.12109 19.9981C5.97251 19.8471 5.89079 19.6427 5.89427 19.4308L6.00719 12.5656C6.01428 12.1342 6.36602 11.7882 6.79748 11.7882H9.56718L15.8402 5.60226C16.0672 5.3785 16.4062 5.3129 16.7002 5.43588ZM15.6048 8.05454L10.4463 13.1414C10.2984 13.2872 10.0991 13.369 9.89134 13.369H7.57499L7.48808 18.6534H9.89134C10.0986 18.6534 10.2975 18.7348 10.4453 18.88L15.6048 23.95V8.05454Z" />
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_settings_wireless.xml b/res/drawable/ic_settings_wireless.xml
index 383ded0dfd0..0cc986b48ac 100644
--- a/res/drawable/ic_settings_wireless.xml
+++ b/res/drawable/ic_settings_wireless.xml
@@ -1,25 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright (C) 2016 The Android Open Source Project
+  Copyright (C) 2018 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
+  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
+       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.
--->
+  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="24.0dp"
-        android:height="24.0dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0"
-        android:tint="@color/blue_1">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+
+    <path
+        android:fillColor="#0088ED"
+        android:pathData="M25.2477 32H6.75229C3.02611 32 0 28.9739 0 25.2477V6.75229C0 3.02611 3.02611 0 6.75229 0H25.2477C28.9739 0 32 3.02611 32 6.75229V25.2477C32 28.9739 28.9739 32 25.2477 32Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M16.0113 24.7057C17.4082 24.7057 18.5406 23.5733 18.5406 22.1764C18.5406 20.7795 17.4082 19.6471 16.0113 19.6471C14.6145 19.6471 13.4821 20.7795 13.4821 22.1764C13.4821 23.5733 14.6145 24.7057 16.0113 24.7057Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M21.5479 18.5556C18.4932 15.4804 13.5075 15.4777 10.4277 18.5575C10.119 18.8662 9.61854 18.8662 9.30987 18.5575C9.0012 18.2488 9.0012 17.7484 9.30987 17.4397C13.0049 13.7446 18.9945 13.7419 22.6695 17.4416C22.9771 17.7513 22.9754 18.2517 22.6657 18.5594C22.356 18.867 21.8556 18.8653 21.5479 18.5556Z" />
     <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M23.66,8.11c0.39,-0.48 0.29,-1.19 -0.22,-1.54C21.67,5.36 17.55,3 12,3 6.44,3 2.33,5.36 0.56,6.57c-0.51,0.35 -0.61,1.06 -0.23,1.54L11.16,21.6c0.42,0.53 1.23,0.53 1.66,0L23.66,8.11z"/>
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M25.4804 14.6744C20.2328 9.44807 11.7669 9.4497 6.54339 14.6732C6.23472 14.9819 5.73427 14.9819 5.4256 14.6732C5.11692 14.3646 5.11692 13.8641 5.4256 13.5554C11.2677 7.71331 20.7327 7.71494 26.5959 13.5543C26.9052 13.8623 26.9062 14.3628 26.5982 14.6721C26.2901 14.9814 25.7897 14.9824 25.4804 14.6744Z" />
 </vector>
diff --git a/res/drawable/ic_storage_apps.xml b/res/drawable/ic_storage_apps.xml
index b15153f7db3..09827cbdb2b 100644
--- a/res/drawable/ic_storage_apps.xml
+++ b/res/drawable/ic_storage_apps.xml
@@ -1,25 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright (C) 2017 The Android Open Source Project
+  Copyright (C) 2018 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
+  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
+       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.
--->
+  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.0"
-        android:viewportHeight="24.0"
-        android:tint="@color/blue_1">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+
+    <path
+        android:fillColor="#E83A52"
+        android:pathData="M25.2477 32H6.75229C3.02611 32 0 28.9739 0 25.2477V6.75229C0 3.02611 3.02611 0 6.75229 0H25.2477C28.9739 0 32 3.02611 32 6.75229V25.2477C32 28.9739 28.9739 32 25.2477 32Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M6.7749 7.5653C6.7749 7.12878 7.12878 6.7749 7.5653 6.7749H13.6401C14.0766 6.7749 14.4305 7.12878 14.4305 7.5653V13.6401C14.4305 14.0766 14.0766 14.4305 13.6401 14.4305H7.5653C7.12878 14.4305 6.7749 14.0766 6.7749 13.6401V7.5653ZM8.35571 8.35571V12.8497H12.8497V8.35571H8.35571Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M24.4348 7.56531H18.36V13.6401H24.4348V7.56531Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M17.5696 7.5653C17.5696 7.12878 17.9235 6.7749 18.36 6.7749H24.4348C24.8713 6.7749 25.2252 7.12878 25.2252 7.5653V13.6401C25.2252 14.0766 24.8713 14.4305 24.4348 14.4305H18.36C17.9235 14.4305 17.5696 14.0766 17.5696 13.6401V7.5653ZM19.1504 8.35571V12.8497H23.6444V8.35571H19.1504Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M6.7749 18.36C6.7749 17.9235 7.12878 17.5696 7.5653 17.5696H13.6401C14.0766 17.5696 14.4305 17.9235 14.4305 18.36V24.4348C14.4305 24.8713 14.0766 25.2252 13.6401 25.2252H7.5653C7.12878 25.2252 6.7749 24.8713 6.7749 24.4348V18.36ZM8.35571 19.1504V23.6444H12.8497V19.1504H8.35571Z" />
     <path
-        android:fillColor="#FF000000"
-        android:pathData="M6,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,20c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM6,20c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM6,14c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,14c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM16,6c0,1.1 0.9,2 2,2s2,-0.9 2,-2 -0.9,-2 -2,-2 -2,0.9 -2,2zM12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM18,14c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM18,20c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2z"/>
-</vector>
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M17.5696 18.36C17.5696 17.9235 17.9235 17.5696 18.36 17.5696H24.4348C24.8713 17.5696 25.2252 17.9235 25.2252 18.36V24.4348C25.2252 24.8713 24.8713 25.2252 24.4348 25.2252H18.36C17.9235 25.2252 17.5696 24.8713 17.5696 24.4348V18.36ZM19.1504 19.1504V23.6444H23.6444V19.1504H19.1504Z" />
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_system_update.xml b/res/drawable/ic_system_update.xml
index ef8f9913bc3..8cfe6ae07ac 100644
--- a/res/drawable/ic_system_update.xml
+++ b/res/drawable/ic_system_update.xml
@@ -1,25 +1,24 @@
-<!--
-    Copyright (C) 2017 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.
--->
+<?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.0"
-        android:viewportHeight="24.0"
-        android:tint="?android:attr/colorControlNormal">
-    <path
-        android:pathData="M17,1.01L7,1c-1.1,0 -2,0.9 -2,2v18c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2L19,3c0,-1.1 -0.9,-1.99 -2,-1.99zM17,19L7,19L7,5h10v14zM16,13h-3L13,8h-2v5L8,13l4,4 4,-4z"
-        android:fillColor="#FFFFFFFF"/>
-</vector>
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="32"
+    android:viewportHeight="33">
+
+    <group>
+        <path
+            android:fillColor="#E83A52"
+            android:pathData="M25.2477 32.657H6.75229C3.02611 32.657 0 29.6309 0 25.9047V7.40928C0 3.68309 3.02611 0.656982 6.75229 0.656982H25.2477C28.9739 0.656982 32 3.68309 32 7.40928V25.9047C32 29.6309 28.9739 32.657 25.2477 32.657Z" />
+        <group>
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M15.9999 19.8015C15.7999 19.8015 15.5999 19.7126 15.4443 19.5793L11.6443 15.7793C11.3332 15.4681 11.3332 14.9793 11.6443 14.6904C11.9555 14.4015 12.4443 14.3793 12.7332 14.6904L15.9777 17.9348L19.2443 14.6904C19.5555 14.3793 20.0443 14.3793 20.3332 14.6904C20.6443 15.0015 20.6443 15.4904 20.3332 15.7793L16.5555 19.5793C16.3999 19.7126 16.1999 19.8015 15.9999 19.8015Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M15.9999 19.8015C15.5777 19.8015 15.2222 19.4459 15.2222 19.0237V7.75703C15.2222 7.3348 15.5777 6.97925 15.9999 6.97925C16.4222 6.97925 16.7777 7.3348 16.7777 7.75703V19.0237C16.7777 19.4459 16.4222 19.8015 15.9999 19.8015Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M23.5333 26.3349H8.46662C8.0444 26.3349 7.68884 25.9793 7.68884 25.5571V10.4904C7.68884 10.0682 8.0444 9.71265 8.46662 9.71265H10.2666C10.6888 9.71265 11.0444 10.0682 11.0444 10.4904C11.0444 10.9126 10.6888 11.2682 10.2666 11.2682H9.2444V24.7793H22.7555V11.2682H21.6666C21.2444 11.2682 20.8888 10.9126 20.8888 10.4904C20.8888 10.0682 21.2444 9.71265 21.6666 9.71265H23.5333C23.9555 9.71265 24.3111 10.0682 24.3111 10.4904V25.5571C24.3111 25.9793 23.9555 26.3349 23.5333 26.3349Z" />
+        </group>
+    </group>
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_system_update_vd_theme_24.xml b/res/drawable/ic_system_update_vd_theme_24.xml
index 1c982e44007..8cfe6ae07ac 100644
--- a/res/drawable/ic_system_update_vd_theme_24.xml
+++ b/res/drawable/ic_system_update_vd_theme_24.xml
@@ -1,25 +1,24 @@
-<!--
-    Copyright (C) 2017 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.
--->
+<?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.0"
-        android:viewportHeight="24.0"
-        android:tint="@color/green_1">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M17,1.01L7,1c-1.1,0 -2,0.9 -2,2v18c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2L19,3c0,-1.1 -0.9,-1.99 -2,-1.99zM17,19L7,19L7,5h10v14zM16,13h-3L13,8h-2v5L8,13l4,4 4,-4z"/>
-</vector>
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="32"
+    android:viewportHeight="33">
+
+    <group>
+        <path
+            android:fillColor="#E83A52"
+            android:pathData="M25.2477 32.657H6.75229C3.02611 32.657 0 29.6309 0 25.9047V7.40928C0 3.68309 3.02611 0.656982 6.75229 0.656982H25.2477C28.9739 0.656982 32 3.68309 32 7.40928V25.9047C32 29.6309 28.9739 32.657 25.2477 32.657Z" />
+        <group>
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M15.9999 19.8015C15.7999 19.8015 15.5999 19.7126 15.4443 19.5793L11.6443 15.7793C11.3332 15.4681 11.3332 14.9793 11.6443 14.6904C11.9555 14.4015 12.4443 14.3793 12.7332 14.6904L15.9777 17.9348L19.2443 14.6904C19.5555 14.3793 20.0443 14.3793 20.3332 14.6904C20.6443 15.0015 20.6443 15.4904 20.3332 15.7793L16.5555 19.5793C16.3999 19.7126 16.1999 19.8015 15.9999 19.8015Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M15.9999 19.8015C15.5777 19.8015 15.2222 19.4459 15.2222 19.0237V7.75703C15.2222 7.3348 15.5777 6.97925 15.9999 6.97925C16.4222 6.97925 16.7777 7.3348 16.7777 7.75703V19.0237C16.7777 19.4459 16.4222 19.8015 15.9999 19.8015Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M23.5333 26.3349H8.46662C8.0444 26.3349 7.68884 25.9793 7.68884 25.5571V10.4904C7.68884 10.0682 8.0444 9.71265 8.46662 9.71265H10.2666C10.6888 9.71265 11.0444 10.0682 11.0444 10.4904C11.0444 10.9126 10.6888 11.2682 10.2666 11.2682H9.2444V24.7793H22.7555V11.2682H21.6666C21.2444 11.2682 20.8888 10.9126 20.8888 10.4904C20.8888 10.0682 21.2444 9.71265 21.6666 9.71265H23.5333C23.9555 9.71265 24.3111 10.0682 24.3111 10.4904V25.5571C24.3111 25.9793 23.9555 26.3349 23.5333 26.3349Z" />
+        </group>
+    </group>
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_wifi_signal_0.xml b/res/drawable/ic_wifi_signal_0.xml
index 55faf64f675..8e6dbbb858c 100644
--- a/res/drawable/ic_wifi_signal_0.xml
+++ b/res/drawable/ic_wifi_signal_0.xml
@@ -1,26 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2015 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="26dp"
-  android:height="24dp"
-  android:viewportWidth="26"
-  android:viewportHeight="24">
-  <path
-    android:fillAlpha="0.3"
-    android:fillColor="?attr/wifi_signal_color"
-    android:pathData="M13.0,22.0L25.6,6.5C25.1,6.1 20.3,2.1 13.0,2.1S0.9,6.1 0.4,6.5L13.0,22.0L13.0,22.0L13.0,22.0L13.0,22.0L13.0,22.0z"/>
+    android:width="26dp"
+    android:height="24dp"
+    android:viewportWidth="33"
+    android:viewportHeight="32">
+
+  <group>
+    <path
+        android:fillColor="#0088ED"
+        android:fillAlpha="0.2"
+        android:fillType="evenOdd"
+        android:pathData="M16.2935 27.2857C18.0292 27.2857 19.4363 25.8786 19.4363 24.1429C19.4363 22.4071 18.0292 21 16.2935 21C14.5577 21 13.1506 22.4071 13.1506 24.1429C13.1506 25.8786 14.5577 27.2857 16.2935 27.2857Z" />
+    <path
+        android:fillColor="#0088ED"
+        android:fillType="evenOdd"
+        android:fillAlpha="0.2"
+        android:pathData="M22.3007 20.3643C19.1483 17.2119 14.0101 17.2119 10.8577 20.3643C10.4672 20.7548 9.83405 20.7548 9.44353 20.3643C9.053 19.9737 9.053 19.3406 9.44353 18.95C13.3769 15.0167 19.7815 15.0167 23.7149 18.95C24.1054 19.3406 24.1054 19.9737 23.7149 20.3643C23.3244 20.7548 22.6912 20.7548 22.3007 20.3643Z" />
+    <path
+        android:fillColor="#0088ED"
+        android:fillType="evenOdd"
+        android:fillAlpha="0.2"
+        android:pathData="M26.5007 16.0785C21.0617 10.6395 12.2676 10.642 6.85948 16.0768C6.46991 16.4683 5.83675 16.4698 5.44527 16.0803C5.05378 15.6907 5.05223 15.0575 5.44179 14.6661C11.6337 8.44368 21.6967 8.44619 27.9149 14.6643C28.3054 15.0548 28.3054 15.688 27.9149 16.0785C27.5244 16.4691 26.8912 16.4691 26.5007 16.0785Z" />
+    <path
+        android:fillColor="#0088ED"
+        android:fillAlpha="0.2"
+        android:fillType="evenOdd"
+        android:strokeAlpha="0.2"
+        android:strokeWidth="1"
+        android:pathData="M30.5851 11.7487C22.9481 4.08446 10.5251 4.08265 2.85774 11.75C2.46722 12.1405 1.83405 12.1405 1.44353 11.75C1.053 11.3594 1.053 10.7263 1.44353 10.3357C9.8905 1.88878 23.5818 1.88697 32.0019 10.337C32.3917 10.7282 32.3906 11.3614 31.9993 11.7512C31.6081 12.141 30.975 12.1399 30.5851 11.7487Z" />
+  </group>
 </vector>
\ No newline at end of file
diff --git a/res/drawable/ic_wifi_signal_1.xml b/res/drawable/ic_wifi_signal_1.xml
index e0a207266d1..e8431c068bc 100644
--- a/res/drawable/ic_wifi_signal_1.xml
+++ b/res/drawable/ic_wifi_signal_1.xml
@@ -1,29 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2015 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="26dp"
     android:height="24dp"
-    android:viewportWidth="26"
-    android:viewportHeight="24">
-    <path
-        android:fillAlpha="0.3"
-        android:fillColor="?attr/wifi_signal_color"
-        android:pathData="M13.1,22.0L25.6,6.5C25.1,6.1 20.3,2.1 13.0,2.1S0.9,6.1 0.5,6.5L13.1,22.0L13.1,22.0L13.1,22.0L13.1,22.0L13.1,22.0z"/>
-    <path
-        android:fillColor="?attr/wifi_signal_color"
-        android:pathData="M13.1,22.0l5.5,-6.8c-0.2,-0.2 -2.3,-1.9 -5.5,-1.9s-5.3,1.8 -5.5,1.9L13.1,22.0L13.1,22.0L13.1,22.0L13.1,22.0L13.1,22.0z"/>
-</vector>
+    android:viewportWidth="33"
+    android:viewportHeight="32">
+
+    <group>
+        <path
+            android:fillColor="#0088ED"
+            android:pathData="M16.2935 27.2857C18.0292 27.2857 19.4363 25.8786 19.4363 24.1429C19.4363 22.4071 18.0292 21 16.2935 21C14.5577 21 13.1506 22.4071 13.1506 24.1429C13.1506 25.8786 14.5577 27.2857 16.2935 27.2857Z" />
+        <path
+            android:fillColor="#0088ED"
+            android:fillType="evenOdd"
+            android:fillAlpha="0.2"
+            android:pathData="M22.3007 20.3643C19.1483 17.2119 14.0101 17.2119 10.8577 20.3643C10.4672 20.7548 9.83405 20.7548 9.44353 20.3643C9.053 19.9737 9.053 19.3406 9.44353 18.95C13.3769 15.0167 19.7815 15.0167 23.7149 18.95C24.1054 19.3406 24.1054 19.9737 23.7149 20.3643C23.3244 20.7548 22.6912 20.7548 22.3007 20.3643Z" />
+        <path
+            android:fillColor="#0088ED"
+            android:fillType="evenOdd"
+            android:fillAlpha="0.2"
+            android:pathData="M26.5007 16.0785C21.0617 10.6395 12.2676 10.642 6.85948 16.0768C6.46991 16.4683 5.83675 16.4698 5.44527 16.0803C5.05378 15.6907 5.05223 15.0575 5.44179 14.6661C11.6337 8.44368 21.6967 8.44619 27.9149 14.6643C28.3054 15.0548 28.3054 15.688 27.9149 16.0785C27.5244 16.4691 26.8912 16.4691 26.5007 16.0785Z" />
+        <path
+            android:fillColor="#0088ED"
+            android:fillAlpha="0.2"
+            android:fillType="evenOdd"
+            android:strokeAlpha="0.2"
+            android:strokeWidth="1"
+            android:pathData="M30.5851 11.7487C22.9481 4.08446 10.5251 4.08265 2.85774 11.75C2.46722 12.1405 1.83405 12.1405 1.44353 11.75C1.053 11.3594 1.053 10.7263 1.44353 10.3357C9.8905 1.88878 23.5818 1.88697 32.0019 10.337C32.3917 10.7282 32.3906 11.3614 31.9993 11.7512C31.6081 12.141 30.975 12.1399 30.5851 11.7487Z" />
+    </group>
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_wifi_signal_2.xml b/res/drawable/ic_wifi_signal_2.xml
index d0daa603604..f520283d064 100644
--- a/res/drawable/ic_wifi_signal_2.xml
+++ b/res/drawable/ic_wifi_signal_2.xml
@@ -1,29 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2015 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="26dp"
     android:height="24dp"
-    android:viewportWidth="26"
-    android:viewportHeight="24">
-    <path
-        android:fillAlpha="0.3"
-        android:fillColor="?attr/wifi_signal_color"
-        android:pathData="M13.0,22.0L25.6,6.5C25.1,6.1 20.3,2.1 13.0,2.1S0.9,6.1 0.4,6.5L13.0,22.0L13.0,22.0L13.0,22.0L13.0,22.0L13.0,22.0z"/>
-    <path
-        android:fillColor="?attr/wifi_signal_color"
-        android:pathData="M13.0,22.0l7.6,-9.4C20.3,12.4 17.4,10.0 13.0,10.0s-7.3,2.4 -7.6,2.7L13.0,22.0L13.0,22.0L13.0,22.0L13.0,22.0L13.0,22.0z"/>
-</vector>
+    android:viewportWidth="33"
+    android:viewportHeight="32">
+
+    <group>
+        <path
+            android:fillColor="#0088ED"
+            android:pathData="M16.2935 27.2857C18.0292 27.2857 19.4363 25.8786 19.4363 24.1429C19.4363 22.4071 18.0292 21 16.2935 21C14.5577 21 13.1506 22.4071 13.1506 24.1429C13.1506 25.8786 14.5577 27.2857 16.2935 27.2857Z" />
+        <path
+            android:fillColor="#0088ED"
+            android:fillType="evenOdd"
+            android:pathData="M22.3007 20.3643C19.1483 17.2119 14.0101 17.2119 10.8577 20.3643C10.4672 20.7548 9.83405 20.7548 9.44353 20.3643C9.053 19.9737 9.053 19.3406 9.44353 18.95C13.3769 15.0167 19.7815 15.0167 23.7149 18.95C24.1054 19.3406 24.1054 19.9737 23.7149 20.3643C23.3244 20.7548 22.6912 20.7548 22.3007 20.3643Z" />
+        <path
+            android:fillColor="#0088ED"
+            android:fillType="evenOdd"
+            android:fillAlpha="0.2"
+            android:pathData="M26.5007 16.0785C21.0617 10.6395 12.2676 10.642 6.85948 16.0768C6.46991 16.4683 5.83675 16.4698 5.44527 16.0803C5.05378 15.6907 5.05223 15.0575 5.44179 14.6661C11.6337 8.44368 21.6967 8.44619 27.9149 14.6643C28.3054 15.0548 28.3054 15.688 27.9149 16.0785C27.5244 16.4691 26.8912 16.4691 26.5007 16.0785Z" />
+        <path
+            android:fillColor="#0088ED"
+            android:fillAlpha="0.2"
+            android:fillType="evenOdd"
+            android:strokeAlpha="0.2"
+            android:strokeWidth="1"
+            android:pathData="M30.5851 11.7487C22.9481 4.08446 10.5251 4.08265 2.85774 11.75C2.46722 12.1405 1.83405 12.1405 1.44353 11.75C1.053 11.3594 1.053 10.7263 1.44353 10.3357C9.8905 1.88878 23.5818 1.88697 32.0019 10.337C32.3917 10.7282 32.3906 11.3614 31.9993 11.7512C31.6081 12.141 30.975 12.1399 30.5851 11.7487Z" />
+    </group>
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_wifi_signal_3.xml b/res/drawable/ic_wifi_signal_3.xml
index c542c69c520..f89289e3385 100644
--- a/res/drawable/ic_wifi_signal_3.xml
+++ b/res/drawable/ic_wifi_signal_3.xml
@@ -1,29 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2015 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="26dp"
     android:height="24dp"
-    android:viewportWidth="26"
-    android:viewportHeight="24">
-    <path
-        android:fillAlpha="0.3"
-        android:fillColor="?attr/wifi_signal_color"
-        android:pathData="M13.0,22.0L25.6,6.5C25.1,6.1 20.3,2.1 13.0,2.1S0.9,6.1 0.4,6.5L13.0,22.0L13.0,22.0L13.0,22.0L13.0,22.0L13.0,22.0z"/>
-    <path
-        android:fillColor="?attr/wifi_signal_color"
-        android:pathData="M13.0,22.0l9.2,-11.4c-0.4,-0.3 -3.9,-3.2 -9.2,-3.2s-8.9,3.0 -9.2,3.2L13.0,22.0L13.0,22.0L13.0,22.0L13.0,22.0L13.0,22.0z"/>
-</vector>
+    android:viewportWidth="33"
+    android:viewportHeight="32">
+
+    <group>
+        <path
+            android:fillColor="#0088ED"
+            android:pathData="M16.2935 27.2857C18.0292 27.2857 19.4363 25.8786 19.4363 24.1429C19.4363 22.4071 18.0292 21 16.2935 21C14.5577 21 13.1506 22.4071 13.1506 24.1429C13.1506 25.8786 14.5577 27.2857 16.2935 27.2857Z" />
+        <path
+            android:fillColor="#0088ED"
+            android:fillType="evenOdd"
+            android:pathData="M22.3007 20.3643C19.1483 17.2119 14.0101 17.2119 10.8577 20.3643C10.4672 20.7548 9.83405 20.7548 9.44353 20.3643C9.053 19.9737 9.053 19.3406 9.44353 18.95C13.3769 15.0167 19.7815 15.0167 23.7149 18.95C24.1054 19.3406 24.1054 19.9737 23.7149 20.3643C23.3244 20.7548 22.6912 20.7548 22.3007 20.3643Z" />
+        <path
+            android:fillColor="#0088ED"
+            android:fillType="evenOdd"
+            android:pathData="M26.5007 16.0785C21.0617 10.6395 12.2676 10.642 6.85948 16.0768C6.46991 16.4683 5.83675 16.4698 5.44527 16.0803C5.05378 15.6907 5.05223 15.0575 5.44179 14.6661C11.6337 8.44368 21.6967 8.44619 27.9149 14.6643C28.3054 15.0548 28.3054 15.688 27.9149 16.0785C27.5244 16.4691 26.8912 16.4691 26.5007 16.0785Z" />
+        <path
+            android:fillColor="#0088ED"
+            android:fillAlpha="0.2"
+            android:fillType="evenOdd"
+            android:strokeAlpha="0.2"
+            android:strokeWidth="1"
+            android:pathData="M30.5851 11.7487C22.9481 4.08446 10.5251 4.08265 2.85774 11.75C2.46722 12.1405 1.83405 12.1405 1.44353 11.75C1.053 11.3594 1.053 10.7263 1.44353 10.3357C9.8905 1.88878 23.5818 1.88697 32.0019 10.337C32.3917 10.7282 32.3906 11.3614 31.9993 11.7512C31.6081 12.141 30.975 12.1399 30.5851 11.7487Z" />
+    </group>
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_wifi_signal_4.xml b/res/drawable/ic_wifi_signal_4.xml
index bb7dbd04b29..6314dfb9440 100644
--- a/res/drawable/ic_wifi_signal_4.xml
+++ b/res/drawable/ic_wifi_signal_4.xml
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2015 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="26dp"
     android:height="24dp"
-    android:viewportWidth="26"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="?attr/wifi_signal_color"
-        android:pathData="M13.0,22.0L25.6,6.5C25.1,6.1 20.3,2.1 13.0,2.1S0.9,6.1 0.4,6.5L13.0,22.0L13.0,22.0L13.0,22.0L13.0,22.0L13.0,22.0z"/>
-</vector>
+    android:viewportWidth="33"
+    android:viewportHeight="32">
+
+    <group>
+        <path
+            android:fillColor="#0088ED"
+            android:pathData="M16.4825 27.2857C18.2182 27.2857 19.6253 25.8786 19.6253 24.1429C19.6253 22.4071 18.2182 21 16.4825 21C14.7467 21 13.3396 22.4071 13.3396 24.1429C13.3396 25.8786 14.7467 27.2857 16.4825 27.2857Z" />
+        <path
+            android:fillColor="#0088ED"
+            android:fillType="evenOdd"
+            android:pathData="M22.4896 20.3643C19.3373 17.2119 14.199 17.2119 11.0467 20.3643C10.6562 20.7548 10.023 20.7548 9.63249 20.3643C9.24197 19.9737 9.24197 19.3406 9.63249 18.95C13.5659 15.0167 19.9705 15.0167 23.9039 18.95C24.2944 19.3406 24.2944 19.9737 23.9039 20.3643C23.5133 20.7548 22.8802 20.7548 22.4896 20.3643Z" />
+        <path
+            android:fillColor="#0088ED"
+            android:fillType="evenOdd"
+            android:pathData="M26.6896 16.0785C21.2506 10.6395 12.4566 10.642 7.04844 16.0768C6.65888 16.4683 6.02571 16.4698 5.63423 16.0803C5.24275 15.6907 5.24119 15.0575 5.63076 14.6661C11.8226 8.44368 21.8857 8.44619 28.1038 14.6643C28.4944 15.0548 28.4944 15.688 28.1038 16.0785C27.7133 16.4691 27.0802 16.4691 26.6896 16.0785Z" />
+        <path
+            android:fillColor="#0088ED"
+            android:fillType="evenOdd"
+            android:pathData="M30.7741 11.7487C23.137 4.08446 10.714 4.08265 3.04671 11.75C2.65618 12.1405 2.02302 12.1405 1.63249 11.75C1.24197 11.3594 1.24197 10.7263 1.63249 10.3357C10.0795 1.88878 23.7707 1.88697 32.1908 10.337C32.5806 10.7282 32.5795 11.3614 32.1883 11.7512C31.7971 12.141 31.1639 12.1399 30.7741 11.7487Z" />
+    </group>
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_wifi_signal_lock.xml b/res/drawable/ic_wifi_signal_lock.xml
index b94f06c1d4e..9c0a9845d93 100644
--- a/res/drawable/ic_wifi_signal_lock.xml
+++ b/res/drawable/ic_wifi_signal_lock.xml
@@ -1,29 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2015 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:width="26dp"
     android:height="24dp"
-    android:viewportWidth="72"
-    android:viewportHeight="72">
-    <group
-        android:translateX="52.0"
-        android:translateY="42.0">
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+
+    <group>
+        <path
+            android:fillColor="#0088ED"
+            android:pathData="M31.1684 24.4571H24.3684V29H31.1684V24.4571Z" />
+        <path
+            android:fillColor="#0088ED"
+            android:pathData="M31.197 30H24.397C23.8541 30 23.397 29.5429 23.397 29V24.4571C23.397 23.9143 23.8541 23.4571 24.397 23.4571H31.197C31.7398 23.4571 32.197 23.9143 32.197 24.4571V29C32.197 29.5714 31.7398 30 31.197 30ZM25.3684 28H30.1684V25.4571H25.3684V28Z" />
         <path
-            android:fillColor="?attr/wifi_signal_color"
-            android:pathData="M18.0,8.0l-1.0,0.0L17.0,6.0c0.0,-2.76 -2.24,-5.0 -5.0,-5.0S7.0,3.24 7.0,6.0l0.0,2.0L6.0,8.0c-1.1,0.0 -2.0,0.9 -2.0,2.0l0.0,10.0c0.0,1.0 0.9,2.0 2.0,2.0l12.0,0.0c1.1,0.0 2.0,-0.9 2.0,-2.0L20.0,10.0c0.0,-1.1 -0.9,-2.0 -2.0,-2.0zm-6.0,9.0c-1.1,0.0 -2.0,-0.9 -2.0,-2.0s0.9,-2.0 2.0,-2.0 2.0,0.9 2.0,2.0 -0.9,2.0 -2.0,2.0zm3.1,-9.0L8.9,8.0L8.9,6.0c0.0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0.0 3.1,1.39 3.1,3.1l0.0,2.0z"/>
+            android:fillColor="#0088ED"
+            android:pathData="M29.9111 25.4571C29.3683 25.4571 28.9111 25 28.9111 24.4571V22.1429C28.9111 21.5143 28.3969 21 27.7683 21C27.1397 21 26.6255 21.5143 26.6255 22.1429V24.4571C26.6255 25 26.1683 25.4571 25.6255 25.4571C25.0826 25.4571 24.6255 25 24.6255 24.4571V22.1429C24.6255 20.4286 26.0255 19 27.7683 19C29.5111 19 30.9111 20.4 30.9111 22.1429V24.4571C30.9111 25.0286 30.454 25.4571 29.9111 25.4571Z" />
     </group>
 </vector>
\ No newline at end of file
diff --git a/res/drawable/ic_wifi_tethering.xml b/res/drawable/ic_wifi_tethering.xml
index 3dcd447f9b9..3c5dd449af0 100644
--- a/res/drawable/ic_wifi_tethering.xml
+++ b/res/drawable/ic_wifi_tethering.xml
@@ -1,25 +1,32 @@
-<!--
-    Copyright (C) 2017 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.
--->
+<?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.0"
-        android:viewportHeight="24.0"
-        android:tint="@color/blue_1">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+
+    <path
+        android:fillColor="#24527F"
+        android:pathData="M25.2477 32H6.75229C3.02611 32 0 28.9739 0 25.2477V6.75229C0 3.02611 3.02611 0 6.75229 0H25.2477C28.9739 0 32 3.02611 32 6.75229V25.2477C32 28.9739 28.9739 32 25.2477 32Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M13.4369 26.0605C14.5344 26.0605 15.4242 25.1708 15.4242 24.0732C15.4242 22.9757 14.5344 22.0859 13.4369 22.0859C12.3393 22.0859 11.4496 22.9757 11.4496 24.0732C11.4496 25.1708 12.3393 26.0605 13.4369 26.0605Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M16.9429 21.5381C14.9933 19.5885 11.8353 19.5885 9.88568 21.5381C9.57701 21.8468 9.07655 21.8468 8.76788 21.5381C8.45921 21.2295 8.45921 20.729 8.76788 20.4203C11.3348 17.8534 15.4937 17.8534 18.0607 20.4203C18.3694 20.729 18.3694 21.2295 18.0607 21.5381C17.752 21.8468 17.2516 21.8468 16.9429 21.5381Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M19.5625 18.9412C16.1676 15.5463 10.6836 15.5463 7.28863 18.9412C6.97996 19.2499 6.47951 19.2499 6.17083 18.9412C5.86216 18.6325 5.86216 18.1321 6.17083 17.8234C10.1831 13.8111 16.668 13.8111 20.6803 17.8234C20.989 18.1321 20.989 18.6325 20.6803 18.9412C20.3716 19.2499 19.8712 19.2499 19.5625 18.9412Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M13.0981 6.77478C13.0981 6.33825 13.452 5.98438 13.8885 5.98438H24.2541C24.6906 5.98438 25.0445 6.33825 25.0445 6.77478V25.767C25.0445 26.2035 24.6906 26.5574 24.2541 26.5574H19.9408C19.5042 26.5574 19.1504 26.2035 19.1504 25.767C19.1504 25.3305 19.5042 24.9766 19.9408 24.9766H23.4637V7.56518H14.6789V11.1559C14.6789 11.5924 14.3251 11.9463 13.8885 11.9463C13.452 11.9463 13.0981 11.5924 13.0981 11.1559V6.77478Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M25.2704 9.95898H24.4574V13.1658H25.2704V9.95898Z" />
     <path
-        android:pathData="M12,11c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM18,13a6,6 0,0 0,-6.75 -5.95c-2.62,0.32 -4.78,2.41 -5.18,5.02 -0.32,2.14 0.49,4.11 1.92,5.39 0.48,0.43 1.24,0.33 1.56,-0.23 0.24,-0.42 0.14,-0.94 -0.22,-1.26a3.99,3.99 0,0 1,-1.22 -3.94,3.954 3.954,0 0,1 2.9,-2.91A4.007,4.007 0,0 1,16 13c0,1.18 -0.51,2.23 -1.33,2.96 -0.36,0.33 -0.47,0.85 -0.23,1.27 0.31,0.54 1.04,0.69 1.5,0.28A5.97,5.97 0,0 0,18 13zM10.83,3.07c-4.62,0.52 -8.35,4.33 -8.78,8.96a9.966,9.966 0,0 0,4.02 9.01c0.48,0.35 1.16,0.2 1.46,-0.31 0.25,-0.43 0.14,-0.99 -0.26,-1.29 -2.28,-1.69 -3.65,-4.55 -3.16,-7.7 0.54,-3.5 3.46,-6.29 6.98,-6.68C15.91,4.51 20,8.28 20,13c0,2.65 -1.29,4.98 -3.27,6.44 -0.4,0.3 -0.51,0.85 -0.26,1.29 0.3,0.52 0.98,0.66 1.46,0.31A9.96,9.96 0,0 0,22 13c0,-5.91 -5.13,-10.62 -11.17,-9.93z"
-        android:fillColor="#FFFFFFFF"/>
-</vector>
+        android:fillColor="#ffffff"
+        android:pathData="M25.2704 14.4983H24.4574V15.921H25.2704V14.4983Z" />
+</vector>
\ No newline at end of file
-- 
GitLab


From 40de1099009fba9ea3067f59eb606b237a7abf96 Mon Sep 17 00:00:00 2001
From: Amit Kumar <mr.doc10jl96@gmail.com>
Date: Thu, 20 Feb 2020 20:57:57 +0530
Subject: [PATCH 2/6] Update following icons:

res/drawable/ic_audio_ring.xml
res/drawable/ic_call_24dp.xml
res/drawable/ic_devices_other.xml
res/drawable/ic_devices_other_black.xml
res/drawable/ic_folder_vd_theme_24.xml
res/drawable/ic_local_movies.xml
res/drawable/ic_local_phone_24_lib.xml
res/drawable/ic_menu_add.xml
res/drawable/ic_photo_library.xml
res/drawable/ic_private_dns.xml
res/drawable/ic_restore.xml
res/drawable/ic_sd_card.xml
res/drawable/ic_settings.xml
res/drawable/ic_settings_24dp.xml
res/drawable/ic_settings_memory.xml
res/drawable/ic_usb.xml
res/drawable/ic_videogame_vd_theme_24.xml
res/drawable/ic_vpn_key.xml
res/drawable/ring_notif_increasing.xml
res/xml/network_and_internet.xml

Change-Id: I50c3de03733ccc8dbe066dc246a4c8774c7b5957
---
 res/drawable/ic_audio_ring.xml            | 64 ++++++++++++--------
 res/drawable/ic_call_24dp.xml             |  2 +-
 res/drawable/ic_devices_other.xml         | 48 ++++++---------
 res/drawable/ic_devices_other_black.xml   | 20 +++++++
 res/drawable/ic_folder_vd_theme_24.xml    | 42 ++++++-------
 res/drawable/ic_local_movies.xml          | 60 ++++++++++++-------
 res/drawable/ic_local_phone_24_lib.xml    | 33 ++++++++++
 res/drawable/ic_menu_add.xml              | 43 ++++++-------
 res/drawable/ic_menu_delete.xml           | 52 +++++++++-------
 res/drawable/ic_photo_library.xml         | 50 +++++++++-------
 res/drawable/ic_private_dns.xml           | 30 ++++++++++
 res/drawable/ic_restore.xml               | 53 +++++++---------
 res/drawable/ic_settings.xml              | 45 +++++---------
 res/drawable/ic_settings_24dp.xml         | 41 ++++++-------
 res/drawable/ic_settings_memory.xml       |  4 +-
 res/drawable/ic_usb.xml                   | 73 ++++++++++++++++-------
 res/drawable/ic_videogame_vd_theme_24.xml | 56 +++++++++--------
 res/drawable/ic_vpn_key.xml               | 47 ++++++++-------
 res/drawable/ring_notif_increasing.xml    | 49 +++++++--------
 res/xml/network_and_internet.xml          | 22 ++++++-
 20 files changed, 484 insertions(+), 350 deletions(-)
 create mode 100644 res/drawable/ic_devices_other_black.xml
 create mode 100644 res/drawable/ic_local_phone_24_lib.xml
 create mode 100644 res/drawable/ic_private_dns.xml

diff --git a/res/drawable/ic_audio_ring.xml b/res/drawable/ic_audio_ring.xml
index f76ddb26c13..474e6ba83fc 100644
--- a/res/drawable/ic_audio_ring.xml
+++ b/res/drawable/ic_audio_ring.xml
@@ -1,27 +1,43 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2016 The CyanogenMod 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="32dp"
-    android:height="32dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="@color/red_1">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="33"
+    android:viewportHeight="33">
 
-    <path
-        android:fillColor="@android:color/black"
-        android:pathData="M23.71,16.67C20.66,13.78 16.54,12 12,12 7.46,12 3.34,13.78 0.29,16.67c-0.18,0.18 -0.29,0.43 -0.29,0.71 0,0.28 0.11,0.53 0.29,0.71l2.48,2.48c0.18,0.18 0.43,0.29 0.71,0.29 0.27,0 0.52,-0.11 0.7,-0.28 0.79,-0.74 1.69,-1.36 2.66,-1.85 0.33,-0.16 0.56,-0.5 0.56,-0.9v-3.1c1.45,-0.48 3,-0.73 4.6,-0.73s3.15,0.25 4.6,0.72v3.1c0,0.39 0.23,0.74 0.56,0.9 0.98,0.49 1.87,1.12 2.66,1.85 0.18,0.18 0.43,0.28 0.7,0.28 0.28,0 0.53,-0.11 0.71,-0.29l2.48,-2.48c0.18,-0.18 0.29,-0.43 0.29,-0.71 0,-0.27 -0.11,-0.52 -0.29,-0.7zM21.16,6.26l-1.41,-1.41 -3.56,3.55 1.41,1.41s3.45,-3.52 3.56,-3.55zM13,2h-2v5h2V2zM6.4,9.81L7.81,8.4 4.26,4.84 2.84,6.26c0.11,0.03 3.56,3.55 3.56,3.55z" />
-</vector>
+    <group>
+        <path
+            android:fillColor="#FF7301"
+            android:pathData="M25.8827 32H7.3873C3.66112 32 0.63501 28.9739 0.63501 25.2477V6.75229C0.63501 3.02611 3.66112 0 7.3873 0H25.8827C29.6089 0 32.635 3.02611 32.635 6.75229V25.2477C32.635 28.9739 29.6089 32 25.8827 32Z" />
+        <group>
+            <path
+                android:fillColor="#ffffff"
+                android:fillType="evenOdd"
+                android:pathData="M14.3572 24.3555C14.3572 23.926 14.7054 23.5778 15.135 23.5778H18.1794C18.3893 23.5778 18.5903 23.6626 18.7368 23.813C18.8832 23.9635 18.9626 24.1667 18.9569 24.3766C18.9236 25.6077 17.9019 26.6444 16.6461 26.6444C15.3646 26.6444 14.3572 25.5998 14.3572 24.3555Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:fillType="evenOdd"
+                android:pathData="M16.6459 6.91109C16.1199 6.91109 15.6903 7.34064 15.6903 7.86664C15.6903 8.2962 15.3421 8.64442 14.9125 8.64442C14.483 8.64442 14.1348 8.2962 14.1348 7.86664C14.1348 6.48153 15.2608 5.35553 16.6459 5.35553C18.031 5.35553 19.157 6.48153 19.157 7.86664C19.157 8.2962 18.8088 8.64442 18.3792 8.64442C17.9497 8.64442 17.6014 8.2962 17.6014 7.86664C17.6014 7.34064 17.1719 6.91109 16.6459 6.91109Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:fillType="evenOdd"
+                android:pathData="M16.5198 8.82234C19.8893 8.74677 22.6237 11.5879 22.6237 14.9111V18.1778C22.6237 18.803 22.9112 19.3933 23.4237 19.7778C23.427 19.7802 23.4302 19.7826 23.4334 19.7851L25.0112 21.0073C25.2741 21.211 25.3784 21.5592 25.2708 21.8739C25.1632 22.1885 24.8674 22.4 24.5349 22.4H8.75707C8.42452 22.4 8.12876 22.1885 8.02115 21.8739C7.91353 21.5592 8.01787 21.211 8.28076 21.0073L9.85854 19.7851L9.85872 19.785C10.3511 19.4037 10.646 18.7895 10.646 18.1555V14.8C10.646 11.5311 13.2748 8.87493 16.5198 8.82234ZM21.0682 14.9111C21.0682 12.4129 19.0042 10.3214 16.5527 10.3775L16.5471 10.3777C14.149 10.4154 12.2015 12.3809 12.2015 14.8V18.1555C12.2015 19.1675 11.7734 20.1586 11.0147 20.8444H22.2717C21.499 20.1642 21.0682 19.1937 21.0682 18.1778V14.9111Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:fillType="evenOdd"
+                android:pathData="M6.35718 14.3555C6.35718 13.926 6.7054 13.5778 7.13496 13.5778H8.09051C8.52007 13.5778 8.86829 13.926 8.86829 14.3555C8.86829 14.7851 8.52007 15.1333 8.09051 15.1333H7.13496C6.7054 15.1333 6.35718 14.7851 6.35718 14.3555Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:fillType="evenOdd"
+                android:pathData="M24.4238 14.3555C24.4238 13.926 24.7721 13.5778 25.2016 13.5778H26.1349C26.5645 13.5778 26.9127 13.926 26.9127 14.3555C26.9127 14.7851 26.5645 15.1333 26.1349 15.1333H25.2016C24.7721 15.1333 24.4238 14.7851 24.4238 14.3555Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:fillType="evenOdd"
+                android:pathData="M9.36282 7.07223C9.66656 6.76849 10.159 6.76849 10.4628 7.07223L11.1294 7.73889C11.4332 8.04264 11.4332 8.5351 11.1294 8.83884C10.8257 9.14258 10.3332 9.14258 10.0295 8.83884L9.36282 8.17217C9.05907 7.86843 9.05907 7.37597 9.36282 7.07223Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:fillType="evenOdd"
+                android:pathData="M23.9073 7.07223C24.211 7.37597 24.211 7.86843 23.9073 8.17217L23.2406 8.83884C22.9369 9.14258 22.4444 9.14258 22.1406 8.83884C21.8369 8.5351 21.8369 8.04264 22.1406 7.73889L22.8073 7.07223C23.1111 6.76849 23.6035 6.76849 23.9073 7.07223Z" />
+        </group>
+    </group>
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_call_24dp.xml b/res/drawable/ic_call_24dp.xml
index 5c337d4ef27..175bf205449 100644
--- a/res/drawable/ic_call_24dp.xml
+++ b/res/drawable/ic_call_24dp.xml
@@ -2,7 +2,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="32"
+    android:viewportWidth="33"
     android:viewportHeight="33">
 
     <group>
diff --git a/res/drawable/ic_devices_other.xml b/res/drawable/ic_devices_other.xml
index b22e48356e6..6338301e6f1 100644
--- a/res/drawable/ic_devices_other.xml
+++ b/res/drawable/ic_devices_other.xml
@@ -1,32 +1,20 @@
-<!--
-    Copyright (C) 2017 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.0"
-        android:viewportHeight="24.0"
-        android:tint="?android:attr/colorControlNormal">
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M3,6h17c0.55,0,1-0.45,1-1v0c0-0.55-0.45-1-1-1H3C1.9,4,1,4.9,1,6v12c0,1.1,0.9,2,2,2h3c0.55,0,1-0.45,1-1v0
-        c0-0.55-0.45-1-1-1H3V6z
-        M13,12H9v1.78C8.39,14.33,8,15.11,8,16c0,0.89,0.39,1.67,1,2.22V20h4v-1.78c0.61-0.55,1-1.34,1-2.22
-        s-0.39-1.67-1-2.22V12z
-        M11,17.5c-0.83,0-1.5-0.67-1.5-1.5s0.67-1.5,1.5-1.5s1.5,0.67,1.5,1.5S11.83,17.5,11,17.5z
-        M22,8h-6
-        c-0.5,0-1,0.5-1,1v10c0,0.5,0.5,1,1,1h6c0.5,0,1-0.5,1-1V9C23,8.5,22.5,8,22,8z
-        M21,18h-4v-8h4V18z" />
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="33"
+    android:viewportHeight="33">
+  <path
+      android:pathData="M25.3827,32H6.8873C3.1611,32 0.135,28.9739 0.135,25.2477V6.7523C0.135,3.0261 3.1611,0 6.8873,0H25.3827C29.1089,0 32.135,3.0261 32.135,6.7523V25.2477C32.135,28.9739 29.1089,32 25.3827,32Z"
+      android:fillColor="#0088ED"/>
+  <path
+      android:pathData="M5.1484,7.2041C5.1484,6.7676 5.5023,6.4137 5.9388,6.4137H24.3665C24.803,6.4137 25.1569,6.7676 25.1569,7.2041V8.13C25.1569,8.5665 24.803,8.9204 24.3665,8.9204C23.93,8.9204 23.5761,8.5665 23.5761,8.13V7.9945H6.7292V19.8054H15.9431C16.3796,19.8054 16.7335,20.1592 16.7335,20.5958C16.7335,21.0323 16.3796,21.3862 15.9431,21.3862H5.9388C5.5023,21.3862 5.1484,21.0323 5.1484,20.5958V7.2041Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M17.7722,10.5462C17.7722,10.1097 18.1261,9.7558 18.5626,9.7558H26.3537C26.7903,9.7558 27.1441,10.1097 27.1441,10.5462V24.8186C27.1441,25.2551 26.7903,25.609 26.3537,25.609H18.5626C18.1261,25.609 17.7722,25.2551 17.7722,24.8186V23.1023C17.7722,23.064 17.7749,23.0263 17.7802,22.9894C17.7749,22.9525 17.7722,22.9148 17.7722,22.8765V10.5462ZM19.345,22.9894C19.3503,23.0263 19.353,23.064 19.353,23.1023V24.0282H25.5633V11.3366H19.353V22.8765C19.353,22.9148 19.3503,22.9525 19.345,22.9894Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M22.4469,21.77C22.8534,21.77 23.1921,22.1088 23.1921,22.5153C23.1921,22.9217 22.8534,23.2605 22.4469,23.2605C22.0404,23.2605 21.7017,22.9217 21.7017,22.5153C21.7017,22.1088 22.0404,21.77 22.4469,21.77Z"
+      android:fillColor="#ffffff"/>
 </vector>
diff --git a/res/drawable/ic_devices_other_black.xml b/res/drawable/ic_devices_other_black.xml
new file mode 100644
index 00000000000..6338301e6f1
--- /dev/null
+++ b/res/drawable/ic_devices_other_black.xml
@@ -0,0 +1,20 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="33"
+    android:viewportHeight="33">
+  <path
+      android:pathData="M25.3827,32H6.8873C3.1611,32 0.135,28.9739 0.135,25.2477V6.7523C0.135,3.0261 3.1611,0 6.8873,0H25.3827C29.1089,0 32.135,3.0261 32.135,6.7523V25.2477C32.135,28.9739 29.1089,32 25.3827,32Z"
+      android:fillColor="#0088ED"/>
+  <path
+      android:pathData="M5.1484,7.2041C5.1484,6.7676 5.5023,6.4137 5.9388,6.4137H24.3665C24.803,6.4137 25.1569,6.7676 25.1569,7.2041V8.13C25.1569,8.5665 24.803,8.9204 24.3665,8.9204C23.93,8.9204 23.5761,8.5665 23.5761,8.13V7.9945H6.7292V19.8054H15.9431C16.3796,19.8054 16.7335,20.1592 16.7335,20.5958C16.7335,21.0323 16.3796,21.3862 15.9431,21.3862H5.9388C5.5023,21.3862 5.1484,21.0323 5.1484,20.5958V7.2041Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M17.7722,10.5462C17.7722,10.1097 18.1261,9.7558 18.5626,9.7558H26.3537C26.7903,9.7558 27.1441,10.1097 27.1441,10.5462V24.8186C27.1441,25.2551 26.7903,25.609 26.3537,25.609H18.5626C18.1261,25.609 17.7722,25.2551 17.7722,24.8186V23.1023C17.7722,23.064 17.7749,23.0263 17.7802,22.9894C17.7749,22.9525 17.7722,22.9148 17.7722,22.8765V10.5462ZM19.345,22.9894C19.3503,23.0263 19.353,23.064 19.353,23.1023V24.0282H25.5633V11.3366H19.353V22.8765C19.353,22.9148 19.3503,22.9525 19.345,22.9894Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M22.4469,21.77C22.8534,21.77 23.1921,22.1088 23.1921,22.5153C23.1921,22.9217 22.8534,23.2605 22.4469,23.2605C22.0404,23.2605 21.7017,22.9217 21.7017,22.5153C21.7017,22.1088 22.0404,21.77 22.4469,21.77Z"
+      android:fillColor="#ffffff"/>
+</vector>
diff --git a/res/drawable/ic_folder_vd_theme_24.xml b/res/drawable/ic_folder_vd_theme_24.xml
index 0f2b3a6fdbc..5e3b55fbc06 100644
--- a/res/drawable/ic_folder_vd_theme_24.xml
+++ b/res/drawable/ic_folder_vd_theme_24.xml
@@ -1,25 +1,21 @@
-<!--
-    Copyright (C) 2017 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.0"
-        android:viewportHeight="24.0"
-        android:tint="@color/green_1">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M10,4H4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V8c0,-1.1 -0.9,-2 -2,-2h-8l-2,-2z"/>
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="33"
+    android:viewportHeight="33">
+    <group>
+        <clip-path android:pathData="M0.635,0h32v32h-32z M 0,0" />
+        <path
+            android:fillColor="#0088ED"
+            android:pathData="M25.8827,32H7.3873C3.6611,32 0.635,28.9739 0.635,25.2477V6.7523C0.635,3.0261 3.6611,0 7.3873,0H25.8827C29.6089,0 32.635,3.0261 32.635,6.7523V25.2477C32.635,28.9739 29.6089,32 25.8827,32Z" />
+        <group>
+            <clip-path android:pathData="M5.0127,5.9111h23.2444v20.1778h-23.2444z M 0,0" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M24.946,7.4667C25.9016,7.4667 26.7016,8.2445 26.7016,9.2222V22.7778C26.7016,23.7334 25.9238,24.5334 24.946,24.5334H8.3238C7.3682,24.5334 6.5683,23.7556 6.5683,22.7778V9.2222C6.5683,8.2445 7.346,7.4667 8.3238,7.4667H24.946ZM24.946,5.9111H8.3238C6.5016,5.9111 5.0127,7.4 5.0127,9.2222V22.7778C5.0127,24.6 6.5016,26.0889 8.3238,26.0889H24.946C26.7682,26.0889 28.2571,24.6 28.2571,22.7778V9.2222C28.2571,7.4 26.7682,5.9111 24.946,5.9111Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M12.3683,11.1334C12.7905,11.1334 13.346,11.4889 13.6127,11.9778L13.5905,11.9556C13.9016,12.5334 14.7016,13.1112 15.3016,13.1112H24.946C25.9016,13.1112 26.7016,13.8889 26.7016,14.8667V22.7778C26.7016,23.7334 25.9238,24.5334 24.946,24.5334H8.3238C7.3682,24.5334 6.5683,23.7556 6.5683,22.7778V13.1112V12.5112C6.5683,11.7556 7.1683,11.1556 7.9238,11.1556H12.3683V11.1334ZM12.3683,9.5778H7.9238C6.3238,9.5778 5.0127,10.8889 5.0127,12.4889V13.0889V22.7556C5.0127,24.5778 6.5016,26.0667 8.3238,26.0667H24.946C26.7682,26.0667 28.2571,24.5778 28.2571,22.7556V14.8445C28.2571,13.0223 26.7682,11.5334 24.946,11.5334H15.3683C15.2349,11.4889 15.0127,11.3112 14.9683,11.2C14.946,11.1778 14.946,11.1556 14.9238,11.1334C14.3683,10.2 13.3683,9.5778 12.3683,9.5778Z" />
+        </group>
+    </group>
 </vector>
diff --git a/res/drawable/ic_local_movies.xml b/res/drawable/ic_local_movies.xml
index be8fad970ed..ef1a7d84cf4 100644
--- a/res/drawable/ic_local_movies.xml
+++ b/res/drawable/ic_local_movies.xml
@@ -1,25 +1,39 @@
-<!--
-    Copyright (C) 2017 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.0"
-        android:viewportHeight="24.0"
-        android:tint="@color/blue_1">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M18,3v2h-2V3H8v2H6V3H5C4.45,3 4,3.45 4,4v16c0,0.55 0.45,1 1,1h1v-2h2v2h8v-2h2v2h1c0.55,0 1,-0.45 1,-1V4c0,-0.55 -0.45,-1 -1,-1H18zM8,17H6v-2h2V17zM8,13H6v-2h2V13zM8,9H6V7h2V9zM18,17h-2v-2h2V17zM18,13h-2v-2h2V13zM18,9h-2V7h2V9z"/>
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="33"
+    android:viewportHeight="33">
+    <group>
+        <clip-path android:pathData="M0.635,0h32v32h-32z M 0,0" />
+        <path
+            android:fillColor="#FF7301"
+            android:pathData="M25.8827,32H7.3873C3.6611,32 0.635,28.9739 0.635,25.2477V6.7523C0.635,3.0261 3.6611,0 7.3873,0H25.8827C29.6089,0 32.635,3.0261 32.635,6.7523V25.2477C32.635,28.9739 29.6089,32 25.8827,32Z" />
+        <group>
+            <clip-path android:pathData="M5.4683,7.7778h22.3333v16.4444h-22.3333z M 0,0" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M24.4016,9.3333C25.4238,9.3333 26.246,10.1555 26.246,11.1778V20.8444C26.246,21.8667 25.4238,22.6889 24.4016,22.6889H8.846C7.846,22.6667 7.0238,21.8444 7.0238,20.8222V11.1778C7.0238,10.1555 7.846,9.3333 8.8683,9.3333H24.4016ZM24.4016,7.7778H8.846C6.9794,7.7778 5.4683,9.2889 5.4683,11.1778V20.8444C5.4683,22.7111 6.9794,24.2222 8.8683,24.2222H24.4238C26.2905,24.2222 27.8238,22.7111 27.8238,20.8222V11.1778C27.8016,9.2889 26.2683,7.7778 24.4016,7.7778Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M9.1128,11.2222C9.6239,11.2222 10.0461,11.6445 10.0461,12.1556C10.0461,12.6667 9.6239,13.0889 9.1128,13.0889C8.6017,13.0889 8.1794,12.6667 8.1794,12.1556C8.1794,11.6445 8.6017,11.2222 9.1128,11.2222Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M9.1128,15C9.6239,15 10.0461,15.4222 10.0461,15.9333C10.0461,16.4444 9.6239,16.8667 9.1128,16.8667C8.6017,16.8667 8.1794,16.4444 8.1794,15.9333C8.1794,15.4222 8.6017,15 9.1128,15Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M9.1128,18.7556C9.6239,18.7556 10.0461,19.1778 10.0461,19.6889C10.0461,20.2 9.6239,20.6222 9.1128,20.6222C8.6017,20.6222 8.1794,20.2 8.1794,19.6889C8.1794,19.1778 8.6017,18.7556 9.1128,18.7556Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M24.1794,11.2222C24.6905,11.2222 25.1128,11.6445 25.1128,12.1556C25.1128,12.6667 24.6905,13.0889 24.1794,13.0889C23.6683,13.0889 23.2461,12.6667 23.2461,12.1556C23.2461,11.6445 23.6683,11.2222 24.1794,11.2222Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M24.1794,15C24.6905,15 25.1128,15.4222 25.1128,15.9333C25.1128,16.4444 24.6905,16.8667 24.1794,16.8667C23.6683,16.8667 23.2461,16.4444 23.2461,15.9333C23.2461,15.4222 23.6683,15 24.1794,15Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M24.1794,18.7556C24.6905,18.7556 25.1128,19.1778 25.1128,19.6889C25.1128,20.2 24.6905,20.6222 24.1794,20.6222C23.6683,20.6222 23.2461,20.2 23.2461,19.6889C23.2461,19.1778 23.6683,18.7556 24.1794,18.7556Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M15.5128,13.8444C15.6239,13.8444 15.7572,13.8667 15.8683,13.9333L18.5794,15.5111C19.0461,15.7778 19.0461,16.4667 18.5794,16.7555L15.8683,18.3333C15.7572,18.4 15.6239,18.4222 15.5128,18.4222C15.135,18.4222 14.8016,18.1333 14.8016,17.7111V14.5555C14.8016,14.1333 15.1572,13.8444 15.5128,13.8444ZM15.5128,12.2889C14.2683,12.2889 13.2461,13.3111 13.2461,14.5555V17.6889C13.2461,18.9333 14.2683,19.9555 15.5128,19.9555C15.9128,19.9555 16.2905,19.8444 16.6461,19.6444L19.3572,18.0667C20.0461,17.6667 20.4905,16.9111 20.4905,16.1111C20.4905,15.3111 20.0461,14.5555 19.3572,14.1555L16.6461,12.5778C16.3128,12.4 15.9128,12.2889 15.5128,12.2889Z" />
+        </group>
+    </group>
 </vector>
diff --git a/res/drawable/ic_local_phone_24_lib.xml b/res/drawable/ic_local_phone_24_lib.xml
new file mode 100644
index 00000000000..175bf205449
--- /dev/null
+++ b/res/drawable/ic_local_phone_24_lib.xml
@@ -0,0 +1,33 @@
+<?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="33"
+    android:viewportHeight="33">
+
+    <group>
+        <path
+            android:fillColor="#2CCF69"
+            android:pathData="M25.2477 32.2327H6.75229C3.02611 32.2327 0 29.2066 0 25.4804V6.98496C0 3.25878 3.02611 0.232666 6.75229 0.232666H25.2477C28.9739 0.232666 32 3.25878 32 6.98496V25.4804C32 29.2066 28.9739 32.2327 25.2477 32.2327Z" />
+        <group>
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M7.66662 11.5772C6.91106 10.0661 7.53328 8.22162 9.0444 7.46606L11.7777 12.955C10.2666 13.7105 8.42217 13.0883 7.66662 11.5772Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M10.4222 14.0661C8.99996 14.0661 7.64441 13.2883 6.97774 11.9328C6.02218 10.0217 6.79996 7.71054 8.71107 6.77721C9.08885 6.57721 9.55552 6.73277 9.75552 7.13277L12.4889 12.6217C12.6888 12.9994 12.5333 13.4661 12.1333 13.6661C11.5777 13.9328 11 14.0661 10.4222 14.0661ZM8.35552 11.2217C8.62218 11.7772 9.08885 12.1772 9.66663 12.3772C9.99996 12.4883 10.3333 12.5105 10.6666 12.4883L8.75552 8.62166C8.11107 9.31054 7.91107 10.355 8.35552 11.2217Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M20.6223 24.5327C22.1334 25.2883 23.9778 24.6661 24.7334 23.155L19.2445 20.4216C18.4889 21.9327 19.1112 23.7772 20.6223 24.5327Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M21.9778 25.6217C21.4 25.6217 20.8223 25.4884 20.2667 25.2217C18.3778 24.2884 17.6001 21.955 18.5334 20.0661C18.7334 19.6884 19.2001 19.5328 19.5778 19.7106L25.0667 22.4439C25.4445 22.6439 25.6 23.1106 25.4223 23.4884C24.7556 24.8439 23.4 25.6217 21.9778 25.6217ZM20.9556 23.8439C21.8445 24.2884 22.8889 24.0884 23.5556 23.4439L19.6889 21.5328C19.6445 21.8661 19.6889 22.1995 19.8001 22.5328C20.0001 23.0884 20.4223 23.555 20.9556 23.8439Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M21.5111 25.777C18.7111 25.777 14.5111 23.0659 11.8445 20.3993C8.44448 16.9993 4.93337 11.0437 7.22226 8.75482C7.53337 8.44371 8.02226 8.44371 8.31115 8.75482C8.62226 9.06593 8.62226 9.55482 8.31115 9.84371C7.2667 10.9104 9.22226 15.577 12.9556 19.3104C14.7111 21.0659 16.8445 22.5993 18.8 23.4882C20.5111 24.2659 21.9334 24.4437 22.4223 23.9548C22.7334 23.6437 23.2223 23.6437 23.5111 23.9548C23.8223 24.2659 23.8223 24.7548 23.5111 25.0437C23.0223 25.5548 22.3111 25.777 21.5111 25.777Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M22.2 25.0883C19.4 25.0883 15.2 22.3772 12.5333 19.7105C10.6444 17.8217 9 15.5328 8.04445 13.4217C6.93334 10.955 6.88889 9.08832 7.91111 8.0661C8.22222 7.75499 8.71111 7.75499 9 8.0661C9.31111 8.37721 9.31111 8.8661 9 9.15499C8.51111 9.64388 8.68889 11.0661 9.46667 12.7772C10.3556 14.7328 11.8667 16.8439 13.6444 18.6217C15.4 20.3772 17.5333 21.9105 19.4889 22.7994C21.2 23.5772 22.6222 23.755 23.1111 23.2661C23.4222 22.955 23.9111 22.955 24.2 23.2661C24.5111 23.5772 24.5111 24.0661 24.2 24.355C23.7111 24.8661 23.0222 25.0883 22.2 25.0883Z" />
+        </group>
+    </group>
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_menu_add.xml b/res/drawable/ic_menu_add.xml
index 9e2175b7c61..fd6ee532d8e 100644
--- a/res/drawable/ic_menu_add.xml
+++ b/res/drawable/ic_menu_add.xml
@@ -1,28 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2015 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.0"
-    android:viewportHeight="24.0"
-    android:tint="?android:attr/colorAccent">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M18,13h-5v5c0,0.55-0.45,1-1,1h0c-0.55,0-1-0.45-1-1v-5H6c-0.55,0-1-0.45-1-1v0c0-0.55,0.45-1,1-1h5V6c0-0.55,0.45-1,1-1h0
-c0.55,0,1,0.45,1,1v5h5c0.55,0,1,0.45,1,1v0C19,12.55,18.55,13,18,13z"/>
+    android:viewportWidth="33"
+    android:viewportHeight="33">
+    <group>
+        <clip-path android:pathData="M0.635,0h32v32h-32z M 0,0" />
+        <path
+            android:fillColor="#24527F"
+            android:pathData="M25.8827,32H7.3873C3.6611,32 0.635,28.9739 0.635,25.2477V6.7523C0.635,3.0261 3.6611,0 7.3873,0H25.8827C29.6089,0 32.635,3.0261 32.635,6.7523V25.2477C32.635,28.9739 29.6089,32 25.8827,32Z" />
+        <group>
+            <clip-path android:pathData="M6.6128,5.9778h20.0444v20.0444h-20.0444z M 0,0" />
+            <path
+                android:fillColor="#ffffff"
+                android:fillType="evenOdd"
+                android:pathData="M6.6128,16C6.6128,15.5705 6.961,15.2222 7.3906,15.2222H25.8795C26.309,15.2222 26.6572,15.5705 26.6572,16C26.6572,16.4296 26.309,16.7778 25.8795,16.7778H7.3906C6.961,16.7778 6.6128,16.4296 6.6128,16Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:fillType="evenOdd"
+                android:pathData="M16.635,5.9778C17.0645,5.9778 17.4127,6.326 17.4127,6.7556V25.2445C17.4127,25.674 17.0645,26.0222 16.635,26.0222C16.2054,26.0222 15.8572,25.674 15.8572,25.2445V6.7556C15.8572,6.326 16.2054,5.9778 16.635,5.9778Z" />
+        </group>
+    </group>
 </vector>
diff --git a/res/drawable/ic_menu_delete.xml b/res/drawable/ic_menu_delete.xml
index 74f63c339c7..5ddeed3b0ba 100644
--- a/res/drawable/ic_menu_delete.xml
+++ b/res/drawable/ic_menu_delete.xml
@@ -1,25 +1,31 @@
-<!--
-    Copyright (C) 2015 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="24.0dp"
-        android:height="24.0dp"
-        android:viewportWidth="48.0"
-        android:viewportHeight="48.0"
-        android:tint="?android:attr/colorAccent">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M12.0,38.0c0.0,2.21 1.79,4.0 4.0,4.0l16.0,0.0c2.21,0.0 4.0,-1.79 4.0,-4.0L36.0,14.0L12.0,14.0l0.0,24.0zM38.0,8.0l-7.0,0.0l-2.0,-2.0L19.0,6.0l-2.0,2.0l-7.0,0.0l0.0,4.0l28.0,0.0L38.0,8.0z"/>
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="33"
+    android:viewportHeight="32">
+    <group>
+        <clip-path android:pathData="M0.635,0h32v32h-32z M 0,0" />
+        <path
+            android:fillColor="#953EB4"
+            android:pathData="M25.8827,32H7.3873C3.6611,32 0.635,28.9739 0.635,25.2477V6.7523C0.635,3.0261 3.6611,0 7.3873,0H25.8827C29.6089,0 32.635,3.0261 32.635,6.7523V25.2477C32.635,28.9739 29.6089,32 25.8827,32Z" />
+        <group>
+            <clip-path android:pathData="M8.0684,4.7445h17.1333v22.5111h-17.1333z M 0,0" />
+            <path
+                android:fillColor="#ffffff"
+                android:fillType="evenOdd"
+                android:pathData="M8.0684,5.5222C8.0684,5.0927 8.4166,4.7445 8.8461,4.7445H19.2461C19.4524,4.7445 19.6502,4.8264 19.7961,4.9722L24.9739,10.15C25.1197,10.2959 25.2017,10.4937 25.2017,10.7V26.4778C25.2017,26.9073 24.8535,27.2556 24.4239,27.2556H8.8461C8.4166,27.2556 8.0684,26.9073 8.0684,26.4778V5.5222ZM9.6239,6.3V25.7H23.6461V11.0222L18.924,6.3H9.6239Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:fillType="evenOdd"
+                android:pathData="M12.0905,7.5667C12.5201,7.5667 12.8683,7.9149 12.8683,8.3444V10.4778C12.8683,10.9073 12.5201,11.2556 12.0905,11.2556C11.661,11.2556 11.3127,10.9073 11.3127,10.4778V8.3444C11.3127,7.9149 11.661,7.5667 12.0905,7.5667Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:fillType="evenOdd"
+                android:pathData="M18.0905,7.5667C18.5201,7.5667 18.8683,7.9149 18.8683,8.3444V10.4778C18.8683,10.9073 18.5201,11.2556 18.0905,11.2556C17.661,11.2556 17.3127,10.9073 17.3127,10.4778V8.3444C17.3127,7.9149 17.661,7.5667 18.0905,7.5667Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:fillType="evenOdd"
+                android:pathData="M15.0905,7.5667C15.5201,7.5667 15.8683,7.9149 15.8683,8.3444V10.4778C15.8683,10.9073 15.5201,11.2556 15.0905,11.2556C14.661,11.2556 14.3127,10.9073 14.3127,10.4778V8.3444C14.3127,7.9149 14.661,7.5667 15.0905,7.5667Z" />
+        </group>
+    </group>
 </vector>
diff --git a/res/drawable/ic_photo_library.xml b/res/drawable/ic_photo_library.xml
index abd384f3e56..a60b05a4b4b 100644
--- a/res/drawable/ic_photo_library.xml
+++ b/res/drawable/ic_photo_library.xml
@@ -1,25 +1,31 @@
-<!--
-    Copyright (C) 2017 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.0"
-        android:viewportHeight="24.0"
-        android:tint="@color/blue_1">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="33"
+    android:viewportHeight="32">
+  <group>
+    <clip-path android:pathData="M0.635,0h32v32h-32z M 0,0"/>
     <path
-        android:fillColor="#FF000000"
-        android:pathData="M22,16V4c0,-1.11 -0.9,-2 -2,-2H8C6.89,2 6,2.89 6,4v12c0,1.1 0.89,2 2,2h12C21.1,18 22,17.1 22,16zM11,12l2.03,2.71L16,11l4,5H8L11,12zM2,7v13c0,1.1 0.9,2 2,2h13c0.55,0 1,-0.45 1,-1v0c0,-0.55 -0.45,-1 -1,-1H4.5C4.22,20 4,19.78 4,19.5V7c0,-0.55 -0.45,-1 -1,-1h0C2.45,6 2,6.45 2,7z"/>
+        android:pathData="M25.8827,32H7.3873C3.6611,32 0.635,28.9739 0.635,25.2477V6.7523C0.635,3.0261 3.6611,0 7.3873,0H25.8827C29.6089,0 32.635,3.0261 32.635,6.7523V25.2477C32.635,28.9739 29.6089,32 25.8827,32Z"
+        android:fillColor="#0088ED"/>
+    <group>
+      <clip-path android:pathData="M5.7573,6.9891h21.7778v18.0444h-21.7778z M 0,0"/>
+      <path
+          android:pathData="M7.9351,8.5446C7.5869,8.5446 7.3129,8.8186 7.3129,9.1669V19.1224C7.3129,19.4706 7.5869,19.7446 7.9351,19.7446H10.2462V21.3002H7.9351C6.7278,21.3002 5.7573,20.3297 5.7573,19.1224V9.1669C5.7573,7.9595 6.7278,6.9891 7.9351,6.9891H21.624C22.8313,6.9891 23.8018,7.9595 23.8018,9.1669V11.478H22.2462V9.1669C22.2462,8.8186 21.9722,8.5446 21.624,8.5446H7.9351Z"
+          android:fillColor="#ffffff"
+          android:fillType="evenOdd"/>
+      <path
+          android:pathData="M11.6685,12.278C11.3203,12.278 11.0463,12.552 11.0463,12.9002V22.8557C11.0463,23.204 11.3203,23.478 11.6685,23.478H25.3352C25.6913,23.478 25.9796,23.1738 25.9796,22.8557V12.9002C25.9796,12.552 25.7056,12.278 25.3574,12.278H11.6685ZM9.4907,12.9002C9.4907,11.6929 10.4612,10.7224 11.6685,10.7224H25.3574C26.5647,10.7224 27.5352,11.6929 27.5352,12.9002V22.8557C27.5352,24.0488 26.5345,25.0335 25.3352,25.0335H11.6685C10.4612,25.0335 9.4907,24.0631 9.4907,22.8557V12.9002Z"
+          android:fillColor="#ffffff"
+          android:fillType="evenOdd"/>
+      <path
+          android:pathData="M17.4748,15.6642L20.9543,20.385L22.1291,18.775C22.2755,18.5744 22.509,18.4557 22.7575,18.4557C23.0059,18.4558 23.2393,18.5745 23.3858,18.7752L26.7413,23.3752L25.4846,24.2919L22.7573,20.5531L21.5857,22.1587C21.4396,22.3588 21.207,22.4774 20.9592,22.478C20.7115,22.4786 20.4783,22.3611 20.3313,22.1616L16.6133,17.1173L11.3172,24.3166L10.0642,23.3949L15.7509,15.6645C16.1724,15.0826 17.0531,15.0824 17.4748,15.6642Z"
+          android:fillColor="#ffffff"
+          android:fillType="evenOdd"/>
+      <path
+          android:pathData="M22.6684,14.4558C22.0915,14.4558 21.6239,14.9234 21.6239,15.5002C21.6239,16.077 22.0915,16.5447 22.6684,16.5447C23.2452,16.5447 23.7128,16.077 23.7128,15.5002C23.7128,14.9234 23.2452,14.4558 22.6684,14.4558ZM20.0684,15.5002C20.0684,14.0643 21.2324,12.9002 22.6684,12.9002C24.1043,12.9002 25.2684,14.0643 25.2684,15.5002C25.2684,16.9361 24.1043,18.1002 22.6684,18.1002C21.2324,18.1002 20.0684,16.9361 20.0684,15.5002Z"
+          android:fillColor="#ffffff"
+          android:fillType="evenOdd"/>
+    </group>
+  </group>
 </vector>
diff --git a/res/drawable/ic_private_dns.xml b/res/drawable/ic_private_dns.xml
new file mode 100644
index 00000000000..a94fd380f8e
--- /dev/null
+++ b/res/drawable/ic_private_dns.xml
@@ -0,0 +1,30 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="33"
+    android:viewportHeight="33">
+    <group>
+        <clip-path android:pathData="M0.635,0h32v32h-32z M 0,0" />
+        <path
+            android:fillColor="#0088ED"
+            android:pathData="M25.8827,32H7.3873C3.6611,32 0.635,28.9739 0.635,25.2477V6.7523C0.635,3.0261 3.6611,0 7.3873,0H25.8827C29.6089,0 32.635,3.0261 32.635,6.7523V25.2477C32.635,28.9739 29.6089,32 25.8827,32Z" />
+        <group>
+            <clip-path android:pathData="M5.4573,4.9889h22.3556v22.0222h-22.3556z M 0,0" />
+            <path
+                android:fillColor="#ffffff"
+                android:fillType="evenOdd"
+                android:pathData="M15.8795,6.5444C10.9757,6.5444 7.0128,10.5073 7.0128,15.4111C7.0128,20.3149 10.9757,24.2778 15.8795,24.2778C16.2212,24.2778 16.503,24.2767 16.7767,24.2402C17.2025,24.1834 17.5937,24.4825 17.6505,24.9083C17.7072,25.3341 17.4081,25.7253 16.9823,25.7821C16.5974,25.8334 16.2202,25.8334 15.8995,25.8333H15.8795C10.1166,25.8333 5.4573,21.174 5.4573,15.4111C5.4573,9.6482 10.1166,4.9889 15.8795,4.9889C20.4435,4.9889 24.3085,7.9197 25.7249,11.977C25.8665,12.3825 25.6525,12.8261 25.247,12.9677C24.8414,13.1092 24.3979,12.8952 24.2563,12.4897C23.0505,9.0358 19.7599,6.5444 15.8795,6.5444Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:fillType="evenOdd"
+                android:pathData="M14.1762,5.7011C14.237,5.2759 14.6309,4.9804 15.0562,5.0412L14.9462,5.8111C15.0562,5.0412 15.0567,5.0412 15.0573,5.0413L15.0584,5.0415L15.0608,5.0418L15.0661,5.0426C15.0699,5.0432 15.0741,5.0439 15.0788,5.0447C15.0881,5.0462 15.0992,5.0482 15.1119,5.0506C15.1373,5.0555 15.1694,5.0623 15.207,5.0718C15.2818,5.0905 15.3807,5.1199 15.4934,5.1656C15.7162,5.2559 16.0128,5.4177 16.2762,5.7032C16.8533,6.3288 17.0665,7.3064 16.6187,8.6751L16.618,8.6775C16.3652,9.442 16.0163,10.0243 15.5835,10.4629C15.1494,10.9029 14.6653,11.1635 14.1947,11.3322C13.7653,11.4861 13.3294,11.5682 12.9742,11.6351C12.952,11.6393 12.9301,11.6435 12.9085,11.6475C12.514,11.7222 12.2377,11.7811 12.0152,11.8785C11.4978,12.1076 11.2454,12.3519 11.0995,12.5769C10.9453,12.8148 10.862,13.1039 10.7981,13.5162C10.7783,13.6444 10.7613,13.7863 10.7429,13.9395C10.6505,14.7092 10.5241,15.7619 9.8356,16.7792C9.177,17.7603 8.4589,18.3353 7.8797,18.6667C7.5916,18.8316 7.3413,18.9343 7.1543,18.9972C7.0609,19.0287 6.9832,19.0502 6.9244,19.0646C6.8949,19.0719 6.8702,19.0773 6.8506,19.0813C6.8408,19.0833 6.8323,19.085 6.825,19.0863L6.8152,19.0881L6.811,19.0888L6.8092,19.0891L6.8082,19.0893C6.8078,19.0893 6.8074,19.0894 6.6795,18.3222L6.8074,19.0894C6.3837,19.16 5.9829,18.8738 5.9123,18.4501C5.8423,18.0302 6.1229,17.6328 6.5403,17.557C6.5425,17.5565 6.547,17.5555 6.5539,17.5539C6.5726,17.5493 6.6082,17.5397 6.6582,17.5229C6.758,17.4893 6.9146,17.4268 7.1071,17.3166C7.4887,17.0982 8.0258,16.6846 8.5447,15.9111L8.5467,15.9082C9.0071,15.2286 9.0867,14.6034 9.182,13.8548C9.2054,13.6709 9.2297,13.4796 9.2609,13.2782C9.336,12.7933 9.4609,12.2449 9.7942,11.7308C10.1357,11.2039 10.6497,10.7817 11.387,10.4554L11.3893,10.4544L11.3893,10.4544C11.8,10.2743 12.2513,10.1888 12.6192,10.1191L12.65,10.1133C13.0334,10.0408 13.3594,9.9791 13.6699,9.8678C13.9743,9.7587 14.2416,9.6082 14.4762,9.3704C14.712,9.1314 14.949,8.7696 15.1407,8.1904C15.4702,7.1822 15.2168,6.849 15.1328,6.7579C15.0657,6.6851 14.9831,6.6372 14.9093,6.6073C14.8738,6.5929 14.8451,6.5847 14.8294,6.5808C14.8253,6.5797 14.8222,6.5791 14.8204,6.5786C14.4037,6.5105 14.1162,6.1211 14.1762,5.7011Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:fillType="evenOdd"
+                android:pathData="M21.6516,12.3187C21.9463,12.0567 22.3904,12.0567 22.6851,12.3187L23.2815,12.8489C24.3189,13.7478 25.6702,14.2556 27.035,14.2556C27.4646,14.2556 27.8128,14.6038 27.8128,15.0333V20.2111C27.8128,22.1578 26.863,23.9535 25.2513,25.0535L22.606,26.8541C22.3419,27.0338 21.9948,27.0338 21.7307,26.8541L19.0877,25.0551C19.0875,25.0549 19.0873,25.0548 19.0871,25.0547C17.4963,23.9767 16.5239,22.1581 16.5239,20.2111V15.0333C16.5239,14.6038 16.8721,14.2556 17.3017,14.2556C18.6955,14.2556 20.0212,13.7657 21.052,12.8517C21.0521,12.8516 21.0522,12.8515 21.0523,12.8514L21.6516,12.3187ZM22.1684,13.9406L22.0844,14.0153C20.956,15.0159 19.5579,15.6149 18.0795,15.7704V20.2111C18.0795,21.6417 18.7957,22.9784 19.9601,23.7672L19.9616,23.7681L22.1684,25.2703L24.3744,23.7687C24.3745,23.7686 24.3746,23.7686 24.3747,23.7685C25.5628,22.9574 26.2573,21.6421 26.2573,20.2111V15.7684C24.7875,15.6071 23.3797,14.9938 22.2586,14.0207L22.2516,14.0147L22.1684,13.9406Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M23.3907,18.6333C23.3907,17.9667 22.8352,17.4111 22.1685,17.4111C21.5018,17.4111 20.9463,17.9667 20.9463,18.6333C20.9463,19.1 21.213,19.5222 21.613,19.7222L21.1018,22.1H23.2352L22.7241,19.7C23.1241,19.5 23.3907,19.1 23.3907,18.6333Z" />
+        </group>
+    </group>
+</vector>
diff --git a/res/drawable/ic_restore.xml b/res/drawable/ic_restore.xml
index 201b1df11d1..8312acafdd8 100644
--- a/res/drawable/ic_restore.xml
+++ b/res/drawable/ic_restore.xml
@@ -1,32 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2017 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="24.0dp"
-    android:height="24.0dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0"
-    android:tint="?android:attr/colorControlNormal">
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M13.5 7.75v4.5l3.37 2c.34 .2 .46 .65 .25 .99 s-.64 .45 -.98 .24 L12
-13V7.75c0-.41 .34 -.75 .75 -.75s.75 .34 .75 .75 zM13.05 3C8.11 3 4.1 7.02 4.1
-11.95c0 .02 .01 .03 .01 .05H2.05c-.47 0-.71 .57 -.37 .9 l2.95 2.94c.21 .21 .54
-.21 .75 0l2.95-2.94c.33-.33 .1 -.9-.37-.9H5.99c0-.02 .01 -.03 .01 -.05C6 8.06
-9.16 4.9 13.05 4.9S20.1 8.11 20.1 12s-3.16 7.1-7.05 7.1c-1.58
-0-3.08-.51-4.32-1.48a.94 .94 0 0 0-1.32 .16 l-.01 .01 a.94 .94 0 0 0 .16
-1.32l.01 .01 A8.77 8.77 0 0 0 13.05 21c4.94 0 8.95-4.07 8.95-9s-4.02-9-8.95-9z" />
-</vector>
\ No newline at end of file
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="33"
+    android:viewportHeight="33">
+    <group>
+        <clip-path android:pathData="M0.635,0h32v32h-32z M 0,0" />
+        <path
+            android:fillColor="#0088ED"
+            android:pathData="M25.8827,32H7.3873C3.6611,32 0.635,28.9739 0.635,25.2477V6.7523C0.635,3.0261 3.6611,0 7.3873,0H25.8827C29.6089,0 32.635,3.0261 32.635,6.7523V25.2477C32.635,28.9739 29.6089,32 25.8827,32Z" />
+        <group>
+            <clip-path android:pathData="M6.2129,5.5778h20.8444v20.8444h-20.8444z M 0,0" />
+            <path
+                android:fillColor="#ffffff"
+                android:fillType="evenOdd"
+                android:pathData="M16.6351,7.1333C13.7543,7.1333 11.202,8.5009 9.5878,10.626C9.328,10.9681 8.84,11.0347 8.498,10.7749C8.1559,10.5151 8.0893,10.0271 8.3491,9.6851C10.246,7.1879 13.2493,5.5778 16.6351,5.5778C22.398,5.5778 27.0573,10.2371 27.0573,16C27.0573,21.7629 22.398,26.4222 16.6351,26.4222C10.8722,26.4222 6.2129,21.7629 6.2129,16C6.2129,15.5704 6.5611,15.2222 6.9907,15.2222C7.4202,15.2222 7.7684,15.5704 7.7684,16C7.7684,20.9038 11.7313,24.8667 16.6351,24.8667C21.5389,24.8667 25.5018,20.9038 25.5018,16C25.5018,11.0962 21.5389,7.1333 16.6351,7.1333Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:fillType="evenOdd"
+                android:pathData="M8.8796,5.7333C9.3091,5.7333 9.6574,6.0816 9.6574,6.5111V9.5555H12.7018C13.1314,9.5555 13.4796,9.9038 13.4796,10.3333C13.4796,10.7629 13.1314,11.1111 12.7018,11.1111H8.8796C8.45,11.1111 8.1018,10.7629 8.1018,10.3333V6.5111C8.1018,6.0816 8.45,5.7333 8.8796,5.7333Z" />
+        </group>
+    </group>
+</vector>
diff --git a/res/drawable/ic_settings.xml b/res/drawable/ic_settings.xml
index 3d8563d3729..44a4c2ed746 100644
--- a/res/drawable/ic_settings.xml
+++ b/res/drawable/ic_settings.xml
@@ -1,34 +1,21 @@
-<!--
-     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.0"
-    android:viewportHeight="24.0"
-    android:tint="?android:attr/colorAccent">
+    android:viewportWidth="33"
+    android:viewportHeight="33">
+  <group>
+    <clip-path android:pathData="M0.635,0h32v32h-32z M 0,0"/>
     <path
-        android:fillColor="#FF000000"
-        android:pathData="M21.4 14.2l-1.94-1.45c.03-.25 .04 -.5 .04 -.76s-.01-.51-.04-.76L21.4 9.8c.42-.31
-.52 -.94 .24 -1.41l-1.6-2.76c-.28-.48-.88-.7-1.36-.5l-2.14 .91
-c-.48-.37-1.01-.68-1.57-.92l-.27-2.2c-.06-.52-.56-.92-1.11-.92h-3.18c-.55 0-1.05
-.4 -1.11 .92 l-.26 2.19c-.57 .24 -1.1 .55 -1.58 .92 l-2.14-.91c-.48-.2-1.08 .02
--1.36 .5 l-1.6 2.76c-.28 .48 -.18 1.1 .24 1.42l1.94 1.45c-.03 .24 -.04 .49 -.04
-.75 s.01 .51 .04 .76 L2.6 14.2c-.42 .31 -.52 .94 -.24 1.41l1.6 2.76c.28 .48 .88
-.7 1.36 .5 l2.14-.91c.48 .37 1.01 .68 1.57 .92 l.27 2.19c.06 .53 .56 .93 1.11
-.93 h3.18c.55 0 1.04-.4 1.11-.92l.27-2.19c.56-.24 1.09-.55 1.57-.92l2.14 .91
-c.48 .2 1.08-.02 1.36-.5l1.6-2.76c.28-.48 .18 -1.1-.24-1.42zM12 15.5c-1.93
-0-3.5-1.57-3.5-3.5s1.57-3.5 3.5-3.5 3.5 1.57 3.5 3.5-1.57 3.5-3.5 3.5z"/>
+        android:pathData="M25.8827,32H7.3873C3.6611,32 0.635,28.9739 0.635,25.2477V6.7523C0.635,3.0261 3.6611,0 7.3873,0H25.8827C29.6089,0 32.635,3.0261 32.635,6.7523V25.2477C32.635,28.9739 29.6089,32 25.8827,32Z"
+        android:fillColor="#24527F"/>
+    <group>
+      <clip-path android:pathData="M5.1462,4.5889h22.9778v22.8222h-22.9778z M 0,0"/>
+      <path
+          android:pathData="M14.9685,6.1444L18.6796,6.1666L18.9018,8.3889C20.1462,8.7444 21.3018,9.4111 22.2351,10.3444L24.2573,9.5L26.0573,12.6111L24.3018,13.9444C24.6573,15.3222 24.6351,16.7444 24.2573,18.0778L26.0351,19.4555L24.0796,22.6111L22.0129,21.7222C21.5685,22.1222 21.1018,22.5 20.5462,22.8111C19.9685,23.1444 19.3462,23.4111 18.724,23.5889L18.4796,25.8111L14.7685,25.8555L14.5018,23.6333C13.2129,23.2778 12.0351,22.6111 11.0573,21.6555L9.0351,22.5L7.2351,19.3889L8.9907,18.0555C8.6351,16.7 8.6573,15.3222 9.0129,14.0111L7.2351,12.6778L9.124,9.4778L11.2129,10.3222C11.6573,9.9 12.1685,9.5 12.7462,9.1889C13.3685,8.8333 14.0129,8.5667 14.6573,8.3889L14.9685,6.1444ZM13.6351,4.5889L13.4351,5.9L13.2351,7.1666C12.7907,7.3444 12.3462,7.5444 11.924,7.7889C11.5685,7.9889 11.2129,8.2333 10.8796,8.4778L9.6796,7.9889L8.4351,7.4778L7.7462,8.6333L5.8573,11.8778L5.1462,13.0778L6.2573,13.9222L7.2573,14.6555C7.124,15.5666 7.124,16.5 7.2573,17.4111L6.2796,18.1444L5.1907,18.9666L5.8796,20.1444L7.6796,23.2555L8.3685,24.4333L9.6351,23.9L10.7685,23.4333C11.4796,23.9889 12.2573,24.4333 13.0796,24.7666L13.2351,26.0111L13.3907,27.3889L14.7907,27.3666L18.5018,27.3222L19.8351,27.3L20.0129,25.9666L20.1907,24.7C20.5907,24.5444 20.9907,24.3444 21.3685,24.1222C21.7018,23.9444 22.0129,23.7222 22.324,23.5L23.524,24.0111L24.7462,24.5444L25.4573,23.4111L27.4129,20.2555L28.1462,19.0778L27.0351,18.2333L26.0351,17.4555C26.1907,16.5 26.1907,15.5444 26.0573,14.5889L27.0351,13.8555L28.124,13.0333L27.4351,11.8555L25.6351,8.7444L24.924,7.5444L23.6573,8.0778L22.524,8.5444C21.8573,8.0333 21.124,7.5889 20.3462,7.2555L20.2129,6.0111L20.0796,4.6333H18.6796L14.9685,4.5889H13.6351Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M16.6353,19.1C18.3535,19.1 19.7464,17.7071 19.7464,15.9889C19.7464,14.2706 18.3535,12.8777 16.6353,12.8777C14.9171,12.8777 13.5242,14.2706 13.5242,15.9889C13.5242,17.7071 14.9171,19.1 16.6353,19.1Z"
+          android:fillColor="#ffffff"/>
+    </group>
+  </group>
 </vector>
diff --git a/res/drawable/ic_settings_24dp.xml b/res/drawable/ic_settings_24dp.xml
index da343457cad..44a4c2ed746 100644
--- a/res/drawable/ic_settings_24dp.xml
+++ b/res/drawable/ic_settings_24dp.xml
@@ -1,26 +1,21 @@
-<!--
-     Copyright (C) 2015 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.0"
-        android:viewportHeight="24.0"
-        android:tint="?android:attr/colorControlNormal">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="33"
+    android:viewportHeight="33">
+  <group>
+    <clip-path android:pathData="M0.635,0h32v32h-32z M 0,0"/>
     <path
-        android:pathData="M19.4,13.0c0.0,-0.3 0.1,-0.6 0.1,-1.0s0.0,-0.7 -0.1,-1.0l2.1,-1.7c0.2,-0.2 0.2,-0.4 0.1,-0.6l-2.0,-3.5C19.5,5.1 19.3,5.0 19.0,5.1l-2.5,1.0c-0.5,-0.4 -1.1,-0.7 -1.7,-1.0l-0.4,-2.6C14.5,2.2 14.2,2.0 14.0,2.0l-4.0,0.0C9.8,2.0 9.5,2.2 9.5,2.4L9.1,5.1C8.5,5.3 8.0,5.7 7.4,6.1L5.0,5.1C4.7,5.0 4.5,5.1 4.3,5.3l-2.0,3.5C2.2,8.9 2.3,9.2 2.5,9.4L4.6,11.0c0.0,0.3 -0.1,0.6 -0.1,1.0s0.0,0.7 0.1,1.0l-2.1,1.7c-0.2,0.2 -0.2,0.4 -0.1,0.6l2.0,3.5C4.5,18.9 4.7,19.0 5.0,18.9l2.5,-1.0c0.5,0.4 1.1,0.7 1.7,1.0l0.4,2.6c0.0,0.2 0.2,0.4 0.5,0.4l4.0,0.0c0.2,0.0 0.5,-0.2 0.5,-0.4l0.4,-2.6c0.6,-0.3 1.2,-0.6 1.7,-1.0l2.5,1.0c0.2,0.1 0.5,0.0 0.6,-0.2l2.0,-3.5c0.1,-0.2 0.1,-0.5 -0.1,-0.6L19.4,13.0zM12.0,15.5c-1.9,0.0 -3.5,-1.6 -3.5,-3.5s1.6,-3.5 3.5,-3.5s3.5,1.6 3.5,3.5S13.9,15.5 12.0,15.5z"
-        android:fillColor="#ffffffff" />
+        android:pathData="M25.8827,32H7.3873C3.6611,32 0.635,28.9739 0.635,25.2477V6.7523C0.635,3.0261 3.6611,0 7.3873,0H25.8827C29.6089,0 32.635,3.0261 32.635,6.7523V25.2477C32.635,28.9739 29.6089,32 25.8827,32Z"
+        android:fillColor="#24527F"/>
+    <group>
+      <clip-path android:pathData="M5.1462,4.5889h22.9778v22.8222h-22.9778z M 0,0"/>
+      <path
+          android:pathData="M14.9685,6.1444L18.6796,6.1666L18.9018,8.3889C20.1462,8.7444 21.3018,9.4111 22.2351,10.3444L24.2573,9.5L26.0573,12.6111L24.3018,13.9444C24.6573,15.3222 24.6351,16.7444 24.2573,18.0778L26.0351,19.4555L24.0796,22.6111L22.0129,21.7222C21.5685,22.1222 21.1018,22.5 20.5462,22.8111C19.9685,23.1444 19.3462,23.4111 18.724,23.5889L18.4796,25.8111L14.7685,25.8555L14.5018,23.6333C13.2129,23.2778 12.0351,22.6111 11.0573,21.6555L9.0351,22.5L7.2351,19.3889L8.9907,18.0555C8.6351,16.7 8.6573,15.3222 9.0129,14.0111L7.2351,12.6778L9.124,9.4778L11.2129,10.3222C11.6573,9.9 12.1685,9.5 12.7462,9.1889C13.3685,8.8333 14.0129,8.5667 14.6573,8.3889L14.9685,6.1444ZM13.6351,4.5889L13.4351,5.9L13.2351,7.1666C12.7907,7.3444 12.3462,7.5444 11.924,7.7889C11.5685,7.9889 11.2129,8.2333 10.8796,8.4778L9.6796,7.9889L8.4351,7.4778L7.7462,8.6333L5.8573,11.8778L5.1462,13.0778L6.2573,13.9222L7.2573,14.6555C7.124,15.5666 7.124,16.5 7.2573,17.4111L6.2796,18.1444L5.1907,18.9666L5.8796,20.1444L7.6796,23.2555L8.3685,24.4333L9.6351,23.9L10.7685,23.4333C11.4796,23.9889 12.2573,24.4333 13.0796,24.7666L13.2351,26.0111L13.3907,27.3889L14.7907,27.3666L18.5018,27.3222L19.8351,27.3L20.0129,25.9666L20.1907,24.7C20.5907,24.5444 20.9907,24.3444 21.3685,24.1222C21.7018,23.9444 22.0129,23.7222 22.324,23.5L23.524,24.0111L24.7462,24.5444L25.4573,23.4111L27.4129,20.2555L28.1462,19.0778L27.0351,18.2333L26.0351,17.4555C26.1907,16.5 26.1907,15.5444 26.0573,14.5889L27.0351,13.8555L28.124,13.0333L27.4351,11.8555L25.6351,8.7444L24.924,7.5444L23.6573,8.0778L22.524,8.5444C21.8573,8.0333 21.124,7.5889 20.3462,7.2555L20.2129,6.0111L20.0796,4.6333H18.6796L14.9685,4.5889H13.6351Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M16.6353,19.1C18.3535,19.1 19.7464,17.7071 19.7464,15.9889C19.7464,14.2706 18.3535,12.8777 16.6353,12.8777C14.9171,12.8777 13.5242,14.2706 13.5242,15.9889C13.5242,17.7071 14.9171,19.1 16.6353,19.1Z"
+          android:fillColor="#ffffff"/>
+    </group>
+  </group>
 </vector>
diff --git a/res/drawable/ic_settings_memory.xml b/res/drawable/ic_settings_memory.xml
index 88c3c83e355..03ee95e0bc3 100644
--- a/res/drawable/ic_settings_memory.xml
+++ b/res/drawable/ic_settings_memory.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="32dp"
-    android:height="32dp"
+    android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="32"
     android:viewportHeight="32">
 
diff --git a/res/drawable/ic_usb.xml b/res/drawable/ic_usb.xml
index 838e25eb2d7..bf31e8a317d 100644
--- a/res/drawable/ic_usb.xml
+++ b/res/drawable/ic_usb.xml
@@ -1,25 +1,52 @@
-<!--
-    Copyright (C) 2017 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.0"
-        android:viewportHeight="24.0"
-        android:tint="@color/green_1">
-    <path
-        android:pathData="M15,7v4h1v2h-3V5h2l-3,-4 -3,4h2v8H8v-2.07c0.7,-0.37 1.2,-1.08 1.2,-1.93 0,-1.21 -0.99,-2.2 -2.2,-2.2 -1.21,0 -2.2,0.99 -2.2,2.2 0,0.85 0.5,1.56 1.2,1.93V13c0,1.11 0.89,2 2,2h3v3.05c-0.71,0.37 -1.2,1.1 -1.2,1.95 0,1.22 0.99,2.2 2.2,2.2 1.21,0 2.2,-0.98 2.2,-2.2 0,-0.85 -0.49,-1.58 -1.2,-1.95V15h3c1.11,0 2,-0.89 2,-2v-2h1V7h-4z"
-        android:fillColor="#FFFFFFFF"/>
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="33"
+    android:viewportHeight="33">
+    <group>
+        <clip-path android:pathData="M0.635,0h32v32h-32z M 0,0" />
+        <path
+            android:fillColor="#E83A52"
+            android:pathData="M25.8827,32H7.3873C3.6611,32 0.635,28.9739 0.635,25.2477V6.7523C0.635,3.0261 3.6611,0 7.3873,0H25.8827C29.6089,0 32.635,3.0261 32.635,6.7523V25.2477C32.635,28.9739 29.6089,32 25.8827,32Z" />
+        <group>
+            <clip-path android:pathData="M8.8462,3.7667h15.5778v24.4667h-15.5778z M 0,0" />
+            <path
+                android:fillColor="#ffffff"
+                android:fillType="evenOdd"
+                android:pathData="M16.7795,3.7667C16.9858,3.7667 17.1836,3.8486 17.3295,3.9945L19.3072,5.9722C19.611,6.276 19.611,6.7684 19.3072,7.0722C19.0035,7.3759 18.511,7.3759 18.2073,7.0722L16.7795,5.6444L15.3517,7.0722C15.0479,7.3759 14.5555,7.3759 14.2517,7.0722C13.948,6.7684 13.948,6.276 14.2517,5.9722L16.2295,3.9945C16.3754,3.8486 16.5732,3.7667 16.7795,3.7667Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:fillType="evenOdd"
+                android:pathData="M16.7795,3.7667C17.209,3.7667 17.5573,4.1149 17.5573,4.5444V25.7222C17.5573,26.1518 17.209,26.5 16.7795,26.5C16.3499,26.5 16.0017,26.1518 16.0017,25.7222V4.5444C16.0017,4.1149 16.3499,3.7667 16.7795,3.7667Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:fillType="evenOdd"
+                android:pathData="M10.8242,12.5444C11.2537,12.5444 11.6019,12.8927 11.6019,13.3222V16.4568L17.3445,22.5207C17.6398,22.8326 17.6264,23.3249 17.3145,23.6203C17.0026,23.9156 16.5103,23.9022 16.215,23.5903L10.2594,17.3015C10.1226,17.157 10.0464,16.9656 10.0464,16.7667V13.3222C10.0464,12.8927 10.3946,12.5444 10.8242,12.5444Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:fillType="evenOdd"
+                android:pathData="M22.6239,9.1C23.0535,9.1 23.4017,9.4482 23.4017,9.8778V13.3222C23.4017,13.5244 23.3229,13.7187 23.1821,13.8639L17.3376,19.8861C17.0385,20.1944 16.5461,20.2017 16.2378,19.9026C15.9296,19.6034 15.9222,19.111 16.2213,18.8028L21.8462,13.0068V9.8778C21.8462,9.4482 22.1944,9.1 22.6239,9.1Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M23.6462,8.5667H21.624V10.5889H23.6462V8.5667Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:fillType="evenOdd"
+                android:pathData="M20.8462,8.5667C20.8462,8.1371 21.1944,7.7889 21.624,7.7889H23.6462C24.0757,7.7889 24.424,8.1371 24.424,8.5667V10.5889C24.424,11.0184 24.0757,11.3667 23.6462,11.3667H21.624C21.1944,11.3667 20.8462,11.0184 20.8462,10.5889V8.5667ZM22.4017,9.3444V9.8111H22.8684V9.3444H22.4017Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M10.824,14.5223C11.4868,14.5223 12.024,13.985 12.024,13.3223C12.024,12.6595 11.4868,12.1223 10.824,12.1223C10.1613,12.1223 9.624,12.6595 9.624,13.3223C9.624,13.985 10.1613,14.5223 10.824,14.5223Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:fillType="evenOdd"
+                android:pathData="M10.824,12.9C10.5908,12.9 10.4017,13.0891 10.4017,13.3223C10.4017,13.5554 10.5908,13.7445 10.824,13.7445C11.0572,13.7445 11.2462,13.5554 11.2462,13.3223C11.2462,13.0891 11.0572,12.9 10.824,12.9ZM8.8462,13.3223C8.8462,12.23 9.7317,11.3445 10.824,11.3445C11.9163,11.3445 12.8017,12.23 12.8017,13.3223C12.8017,14.4146 11.9163,15.3 10.824,15.3C9.7317,15.3 8.8462,14.4146 8.8462,13.3223Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M16.7796,27.4555C17.4423,27.4555 17.9796,26.9183 17.9796,26.2555C17.9796,25.5928 17.4423,25.0555 16.7796,25.0555C16.1168,25.0555 15.5796,25.5928 15.5796,26.2555C15.5796,26.9183 16.1168,27.4555 16.7796,27.4555Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:fillType="evenOdd"
+                android:pathData="M16.7795,25.8333C16.5463,25.8333 16.3573,26.0224 16.3573,26.2555C16.3573,26.4887 16.5463,26.6778 16.7795,26.6778C17.0127,26.6778 17.2018,26.4887 17.2018,26.2555C17.2018,26.0224 17.0127,25.8333 16.7795,25.8333ZM14.8018,26.2555C14.8018,25.1632 15.6872,24.2778 16.7795,24.2778C17.8718,24.2778 18.7573,25.1632 18.7573,26.2555C18.7573,27.3478 17.8718,28.2333 16.7795,28.2333C15.6872,28.2333 14.8018,27.3478 14.8018,26.2555Z" />
+        </group>
+    </group>
 </vector>
diff --git a/res/drawable/ic_videogame_vd_theme_24.xml b/res/drawable/ic_videogame_vd_theme_24.xml
index d06170c1446..0f864e9d239 100644
--- a/res/drawable/ic_videogame_vd_theme_24.xml
+++ b/res/drawable/ic_videogame_vd_theme_24.xml
@@ -1,25 +1,33 @@
-<!--
-    Copyright (C) 2017 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.
--->
+<?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.0"
-        android:viewportHeight="24.0"
-        android:tint="@color/blue_1">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M21,6L3,6c-1.1,0 -2,0.9 -2,2v8c0,1.1 0.9,2 2,2h18c1.1,0 2,-0.9 2,-2L23,8c0,-1.1 -0.9,-2 -2,-2zM11,13L8,13v3L6,16v-3L3,13v-2h3L6,8h2v3h3v2zM15.5,15c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5zM19.5,12c-0.83,0 -1.5,-0.67 -1.5,-1.5S18.67,9 19.5,9s1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5z"/>
-</vector>
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+
+    <group>
+        <path
+            android:fillColor="#F2AE00"
+            android:pathData="M25.8827 32H7.3873C3.66112 32 0.63501 28.9739 0.63501 25.2477V6.75229C0.63501 3.02611 3.66112 0 7.3873 0H25.8827C29.6089 0 32.635 3.02611 32.635 6.75229V25.2477C32.635 28.9739 29.6089 32 25.8827 32Z" />
+        <group>
+            <path
+                android:fillColor="#ffffff"
+                android:fillType="evenOdd"
+                android:pathData="M22.1773 9.35051C18.5261 8.59434 14.7664 8.59416 11.0918 9.35069C11.0545 9.35838 11.0166 9.36331 10.9786 9.36545C8.47759 9.92339 6.67946 12.6818 7.10044 15.7357L8.42604 21.4578L8.42676 21.461C8.68923 22.6158 9.47947 23.1675 10.2309 23.2336C10.9772 23.2992 11.8173 22.8989 12.2311 21.8212L12.2335 21.8151L13.0544 19.7296C13.7092 18.0229 15.1482 17.1008 16.6442 17.0972C18.1408 17.0936 19.5828 18.0098 20.2384 19.7089L20.2401 19.7133L21.0389 21.8212C21.039 21.8217 21.0392 21.8221 21.0394 21.8226C21.4534 22.8993 22.2932 23.2991 23.0391 23.2336C23.7905 23.1675 24.5808 22.6158 24.8432 21.461L24.844 21.4578L26.1695 15.7356C26.5905 12.6818 24.7924 9.92339 22.2914 9.36545C22.253 9.3633 22.2149 9.35831 22.1773 9.35051ZM22.4191 7.81213C18.6066 7.03289 14.6844 7.03312 10.8515 7.8121C10.8119 7.81409 10.7725 7.8191 10.7337 7.82709C7.2348 8.54746 5.02933 12.2379 5.56503 15.9878C5.56817 16.0098 5.57226 16.0317 5.57728 16.0533L6.90989 21.8057C6.91002 21.8063 6.91014 21.8068 6.91027 21.8074C7.31492 23.5849 8.63542 24.6548 10.0946 24.7831C11.5586 24.9119 13.0287 24.0799 13.6821 22.382L14.5032 20.296L14.5058 20.2892C14.9405 19.1536 15.8228 18.6548 16.648 18.6528C17.4731 18.6508 18.3527 19.1452 18.7863 20.2668C18.7866 20.2675 18.7869 20.2682 18.7871 20.2689L19.5855 22.3756L19.5867 22.3788C20.2395 24.0788 21.7105 24.9119 23.1754 24.7831C24.6345 24.6548 25.9549 23.585 26.3597 21.8077C26.3598 21.807 26.36 21.8064 26.3601 21.8057L27.6927 16.0533C27.6977 16.0317 27.7018 16.0098 27.705 15.9878C28.2407 12.2379 26.0352 8.54746 22.5363 7.82709C22.4976 7.81914 22.4585 7.81414 22.4191 7.81213Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:fillType="evenOdd"
+                android:pathData="M8.69043 14.2333C8.69043 13.8038 9.03865 13.4556 9.46821 13.4556H13.4015C13.8311 13.4556 14.1793 13.8038 14.1793 14.2333C14.1793 14.6629 13.8311 15.0111 13.4015 15.0111H9.46821C9.03865 15.0111 8.69043 14.6629 8.69043 14.2333Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:fillType="evenOdd"
+                android:pathData="M11.4462 11.4778C11.8758 11.4778 12.224 11.826 12.224 12.2556V16.2111C12.224 16.6407 11.8758 16.9889 11.4462 16.9889C11.0167 16.9889 10.6685 16.6407 10.6685 16.2111V12.2556C10.6685 11.826 11.0167 11.4778 11.4462 11.4778Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M20.8015 17.1C21.4152 17.1 21.9126 16.6026 21.9126 15.9889C21.9126 15.3753 21.4152 14.8778 20.8015 14.8778C20.1879 14.8778 19.6904 15.3753 19.6904 15.9889C19.6904 16.6026 20.1879 17.1 20.8015 17.1Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M23.0017 14.2333C23.6154 14.2333 24.1128 13.7359 24.1128 13.1222C24.1128 12.5086 23.6154 12.0111 23.0017 12.0111C22.3881 12.0111 21.8906 12.5086 21.8906 13.1222C21.8906 13.7359 22.3881 14.2333 23.0017 14.2333Z" />
+        </group>
+    </group>
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_vpn_key.xml b/res/drawable/ic_vpn_key.xml
index db1d11f9438..0eece12e896 100644
--- a/res/drawable/ic_vpn_key.xml
+++ b/res/drawable/ic_vpn_key.xml
@@ -1,26 +1,27 @@
-<!--
-    Copyright (C) 2017 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.0"
-        android:viewportHeight="24.0"
-        android:tint="@color/gray_2">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="33"
+    android:viewportHeight="33">
+  <group>
+    <clip-path android:pathData="M0.635,0h32v32h-32z M 0,0"/>
     <path
-        android:pathData="M12.65,10C11.7,7.31,8.9,5.5,5.78,6.12C3.49,6.58,1.62,8.41,1.14,10.7C0.32,14.57,3.26,18,7,18c2.61,0,4.83-1.67,5.65-4H16
-v2c0,1.1,0.9,2,2,2h0c1.1,0,2-0.9,2-2v-2h1c1.1,0,2-0.9,2-2v0c0-1.1-0.9-2-2-2H12.65z M7,14c-1.1,0-2-0.9-2-2s0.9-2,2-2s2,0.9,2,2 S8.1,14,7,14z"
-        android:fillColor="#FFFFFFFF"/>
+        android:pathData="M25.8827,32H7.3873C3.6611,32 0.635,28.9739 0.635,25.2477V6.7523C0.635,3.0261 3.6611,0 7.3873,0H25.8827C29.6089,0 32.635,3.0261 32.635,6.7523V25.2477C32.635,28.9739 29.6089,32 25.8827,32Z"
+        android:fillColor="#E83A52"/>
+    <group>
+      <clip-path android:pathData="M5.146,5.2778h22.9556v21.4444h-22.9556z M 0,0"/>
+      <path
+          android:pathData="M10.2634,10.0028C11.0223,7.2747 13.5206,5.2778 16.4793,5.2778C19.9678,5.2778 22.8354,8.0444 22.9219,11.5197C23.7073,11.6512 24.4189,11.978 25.0192,12.4383C25.3601,12.6997 25.4246,13.1879 25.1632,13.5288C24.9019,13.8697 24.4137,13.9342 24.0728,13.6728C23.532,13.2582 22.874,13.0111 22.146,13.0111H22.1238C21.9007,13.0111 21.6883,12.9153 21.5407,12.7481C21.3931,12.5808 21.3243,12.3582 21.352,12.1369C21.3674,12.0139 21.3682,11.9047 21.3682,11.7222L21.3682,11.7167C21.3873,9.0223 19.1882,6.8333 16.4793,6.8333C14.0074,6.8333 11.9539,8.6735 11.6278,11.0715C11.594,11.3201 11.4423,11.5372 11.2204,11.6544C10.9985,11.7716 10.7337,11.7746 10.5093,11.6623C10.3592,11.5873 10.1908,11.5444 9.9682,11.5444C9.2867,11.5444 8.7238,12.1073 8.7238,12.7889C8.7238,13.0832 8.8296,13.3575 9.0163,13.5873C9.1905,13.8017 9.2379,14.0925 9.1408,14.3511C9.0437,14.6098 8.8167,14.7975 8.5444,14.8443C7.489,15.0257 6.7016,15.9297 6.7016,17.0333C6.7016,18.2704 7.7089,19.2778 8.946,19.2778H15.3682C15.7978,19.2778 16.146,19.626 16.146,20.0556C16.146,20.4851 15.7978,20.8333 15.3682,20.8333H8.946C6.8498,20.8333 5.146,19.1296 5.146,17.0333C5.146,15.5226 6.0205,14.2288 7.2967,13.6227C7.2139,13.3607 7.1682,13.0811 7.1682,12.7889C7.1682,11.2482 8.4276,9.9889 9.9682,9.9889C10.0683,9.9889 10.1667,9.9935 10.2634,10.0028Z"
+          android:fillColor="#ffffff"
+          android:fillType="evenOdd"/>
+      <path
+          android:pathData="M19.2792,20.8333V25.1667H26.5459V20.8333H19.2792ZM17.7236,20.6778C17.7236,19.9331 18.3205,19.2778 19.1236,19.2778H26.7014C27.4461,19.2778 28.1014,19.8747 28.1014,20.6778V25.3222C28.1014,26.1073 27.4865,26.7222 26.7014,26.7222H19.1236C18.379,26.7222 17.7236,26.1253 17.7236,25.3222V20.6778Z"
+          android:fillColor="#ffffff"
+          android:fillType="evenOdd"/>
+      <path
+          android:pathData="M22.9015,16.1889C21.8159,16.1889 20.9237,17.067 20.9237,18.1667V20.0778C20.9237,20.5073 20.5755,20.8556 20.1459,20.8556C19.7164,20.8556 19.3682,20.5073 19.3682,20.0778V18.1667C19.3682,16.1997 20.9649,14.6333 22.9015,14.6333C24.8685,14.6333 26.4348,16.2301 26.4348,18.1667V20.0556C26.4348,20.4851 26.0866,20.8333 25.6571,20.8333C25.2275,20.8333 24.8793,20.4851 24.8793,20.0556V18.1667C24.8793,17.081 24.0012,16.1889 22.9015,16.1889Z"
+          android:fillColor="#ffffff"
+          android:fillType="evenOdd"/>
+    </group>
+  </group>
 </vector>
diff --git a/res/drawable/ring_notif_increasing.xml b/res/drawable/ring_notif_increasing.xml
index b4cf8f10859..6ce9ef8051b 100644
--- a/res/drawable/ring_notif_increasing.xml
+++ b/res/drawable/ring_notif_increasing.xml
@@ -1,29 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The CyanogenMod Project
-     Copyright (C) 2018 The LineageOS 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:tint="@color/red_1"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M12,22c1.105,0,2-0.898,2-2h-4C10,21.102,10.896,22,12,22Z M18.5,16v-5.5c0-3.075-2.135-5.643-5-6.321V3.5 C13.5,2.67,12.828,2,12,2s-1.5,0.67-1.5,1.5v0.679c-2.865,0.678-5,3.246-5,6.321V16l-2,2v1h17v-1L18.5,16z M16.504,14.558H7.561  V13.25l8.943-3.808V14.558z" />
-</vector>
+    android:viewportWidth="33"
+    android:viewportHeight="33">
 
+    <group>
+        <path
+            android:fillColor="#FF7301"
+            android:pathData="M25.8827 32H7.3873C3.66112 32 0.63501 28.9739 0.63501 25.2477V6.75229C0.63501 3.02611 3.66112 0 7.3873 0H25.8827C29.6089 0 32.635 3.02611 32.635 6.75229V25.2477C32.635 28.9739 29.6089 32 25.8827 32Z" />
+        <group>
+            <path
+                android:fillColor="#ffffff"
+                android:fillType="evenOdd"
+                android:pathData="M14.3462 24.3555C14.3462 23.926 14.6944 23.5778 15.124 23.5778H18.1684C18.3783 23.5778 18.5793 23.6626 18.7258 23.813C18.8722 23.9635 18.9516 24.1667 18.9459 24.3766C18.9126 25.6077 17.8909 26.6444 16.6351 26.6444C15.3537 26.6444 14.3462 25.5998 14.3462 24.3555Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:fillType="evenOdd"
+                android:pathData="M16.6349 6.91115C16.1089 6.91115 15.6793 7.3407 15.6793 7.8667C15.6793 8.29626 15.3311 8.64448 14.9016 8.64448C14.472 8.64448 14.1238 8.29626 14.1238 7.8667C14.1238 6.48159 15.2498 5.35559 16.6349 5.35559C18.02 5.35559 19.146 6.48159 19.146 7.8667C19.146 8.29626 18.7978 8.64448 18.3682 8.64448C17.9387 8.64448 17.5904 8.29626 17.5904 7.8667C17.5904 7.3407 17.1609 6.91115 16.6349 6.91115Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:fillType="evenOdd"
+                android:pathData="M16.5088 8.8224C19.8783 8.74683 22.6128 11.588 22.6128 14.9111V18.1778C22.6128 18.8031 22.9002 19.3934 23.4128 19.7778C23.416 19.7802 23.4192 19.7827 23.4224 19.7852L25.0002 21.0074C25.2631 21.211 25.3674 21.5593 25.2598 21.874C25.1522 22.1886 24.8564 22.4 24.5239 22.4H8.74609C8.41354 22.4 8.11778 22.1886 8.01016 21.874C7.90254 21.5593 8.00688 21.211 8.26978 21.0074L9.84755 19.7852L9.84773 19.785C10.3401 19.4038 10.635 18.7896 10.635 18.1556V14.8C10.635 11.5311 13.2638 8.87499 16.5088 8.8224ZM21.0572 14.9111C21.0572 12.413 18.9932 10.3215 16.5417 10.3776L16.5361 10.3777C14.138 10.4155 12.1905 12.381 12.1905 14.8V18.1556C12.1905 19.1676 11.7624 20.1587 11.0038 20.8445H22.2607C21.488 20.1643 21.0572 19.1937 21.0572 18.1778V14.9111Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M21.835 18.1778V16.4889L11.4128 16.3778V18.1556C11.4128 19.0223 11.0128 19.8667 10.3239 20.4L8.74609 21.6223H24.5239L22.9461 20.4C22.235 19.8667 21.835 19.0445 21.835 18.1778Z" />
+        </group>
+    </group>
+</vector>
\ No newline at end of file
diff --git a/res/xml/network_and_internet.xml b/res/xml/network_and_internet.xml
index 617cb81cd14..38dbb8b4577 100755
--- a/res/xml/network_and_internet.xml
+++ b/res/xml/network_and_internet.xml
@@ -93,6 +93,26 @@
     <Preference
         android:fragment="com.android.settings.ProxySelector"
         android:key="proxy_settings"
-        android:title="@string/proxy_settings_title"/>
+        android:title="@string/proxy_settings_title" />
+
+    <com.android.settingslib.RestrictedPreference
+        android:fragment="com.android.settings.vpn2.VpnSettings"
+        android:key="vpn_settings"
+        android:title="@string/vpn_settings_title"
+        android:icon="@drawable/ic_vpn_key"
+        android:order="10"
+        android:summary="@string/summary_placeholder"
+        settings:userRestriction="no_config_vpn"
+        settings:useAdminDisabledSummary="true" />
+
+    <com.android.settings.network.PrivateDnsModeDialogPreference
+        android:key="private_dns_settings"
+        android:title="@string/select_private_dns_configuration_title"
+        android:icon="@drawable/ic_private_dns"
+        android:order="15"
+        android:dialogTitle="@string/select_private_dns_configuration_dialog_title"
+        android:dialogLayout="@layout/private_dns_mode_dialog"
+        android:positiveButtonText="@string/save"
+        android:negativeButtonText="@android:string/cancel" />
 
 </PreferenceScreen>
-- 
GitLab


From 644989714ed657cdc24702bcd620f0fa0056ee03 Mon Sep 17 00:00:00 2001
From: Amit Kumar <mr.doc10jl96@gmail.com>
Date: Thu, 12 Mar 2020 16:13:01 +0530
Subject: [PATCH 3/6] Fix failing build: Remove private DNS and VPN key

Change-Id: I0c36821cde76c1bf28b1afd45f12aafded13610f
---
 res/xml/network_and_internet.xml | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/res/xml/network_and_internet.xml b/res/xml/network_and_internet.xml
index 38dbb8b4577..e00376be998 100755
--- a/res/xml/network_and_internet.xml
+++ b/res/xml/network_and_internet.xml
@@ -95,24 +95,4 @@
         android:key="proxy_settings"
         android:title="@string/proxy_settings_title" />
 
-    <com.android.settingslib.RestrictedPreference
-        android:fragment="com.android.settings.vpn2.VpnSettings"
-        android:key="vpn_settings"
-        android:title="@string/vpn_settings_title"
-        android:icon="@drawable/ic_vpn_key"
-        android:order="10"
-        android:summary="@string/summary_placeholder"
-        settings:userRestriction="no_config_vpn"
-        settings:useAdminDisabledSummary="true" />
-
-    <com.android.settings.network.PrivateDnsModeDialogPreference
-        android:key="private_dns_settings"
-        android:title="@string/select_private_dns_configuration_title"
-        android:icon="@drawable/ic_private_dns"
-        android:order="15"
-        android:dialogTitle="@string/select_private_dns_configuration_dialog_title"
-        android:dialogLayout="@layout/private_dns_mode_dialog"
-        android:positiveButtonText="@string/save"
-        android:negativeButtonText="@android:string/cancel" />
-
 </PreferenceScreen>
-- 
GitLab


From fe6717715f2086b43e69633c5fbbdf04a81f012d Mon Sep 17 00:00:00 2001
From: Amit Kumar <mr.doc10jl96@gmail.com>
Date: Fri, 13 Mar 2020 17:19:55 +0530
Subject: [PATCH 4/6] Delete unnecessary resource xml file and update few icons

Change-Id: I4827730f837b61242e7708c6528a254b21eb547b
---
 res/drawable/ic_settings_about.xml         | 43 +++++-------
 res/drawable/ic_settings_accessibility.xml | 38 +++++-----
 res/drawable/ic_settings_accounts.xml      | 63 ++++++++++-------
 res/drawable/ic_settings_applications.xml  | 49 +++++++------
 res/drawable/ic_settings_battery.xml       | 64 ++++++++++++-----
 res/drawable/ic_settings_bluetooth.xml     | 36 ++++------
 res/drawable/ic_settings_display.xml       | 81 ++++++++++++++++------
 res/drawable/ic_settings_location.xml      | 39 +++++------
 res/drawable/ic_settings_print.xml         | 58 +++++++++-------
 res/drawable/ic_settings_security.xml      | 46 +++++++-----
 res/drawable/ic_settings_storage.xml       | 55 ++++++++++-----
 11 files changed, 327 insertions(+), 245 deletions(-)

diff --git a/res/drawable/ic_settings_about.xml b/res/drawable/ic_settings_about.xml
index d0bb57f7afc..1b3175c75fb 100644
--- a/res/drawable/ic_settings_about.xml
+++ b/res/drawable/ic_settings_about.xml
@@ -1,31 +1,22 @@
-<!--
-    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.
--->
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24.0dp"
-        android:height="24.0dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0"
-        android:tint="@color/green_1">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+
+    <path
+        android:fillColor="#2CCF69"
+        android:pathData="M25.2477 32H6.75229C3.02611 32 0 28.9739 0 25.2477V6.75229C0 3.02611 3.02611 0 6.75229 0H25.2477C28.9739 0 32 3.02611 32 6.75229V25.2477C32 28.9739 28.9739 32 25.2477 32Z" />
     <path
-        android:fillColor="#FF000000"
-        android:pathData="M12,17L12,17c0.55,0 1,-0.45 1,-1v-4c0,-0.55 -0.45,-1 -1,-1l0,0c-0.55,0 -1,0.45 -1,1v4C11,16.55 11.45,17 12,17z"/>
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M16.0113 7.00073C11.0349 7.00073 7.00073 11.0349 7.00073 16.0113C7.00073 20.9877 11.0349 25.0219 16.0113 25.0219C20.9877 25.0219 25.0219 20.9877 25.0219 16.0113C25.0219 11.0349 20.9877 7.00073 16.0113 7.00073ZM5.41992 16.0113C5.41992 10.1619 10.1619 5.41992 16.0113 5.41992C21.8608 5.41992 26.6027 10.1619 26.6027 16.0113C26.6027 21.8608 21.8608 26.6027 16.0113 26.6027C10.1619 26.6027 5.41992 21.8608 5.41992 16.0113Z" />
     <path
-        android:fillColor="#FF000000"
-        android:pathData="M12,2c-5.52,0 -10,4.48 -10,10s4.48,10 10,10s10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8s8,3.59 8,8S16.41,20 12,20z"/>
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M16.0114 14.0012C16.4479 14.0012 16.8018 14.3551 16.8018 14.7916V21.0019C16.8018 21.4385 16.4479 21.7923 16.0114 21.7923C15.5748 21.7923 15.2209 21.4385 15.2209 21.0019V14.7916C15.2209 14.3551 15.5748 14.0012 16.0114 14.0012Z" />
     <path
-        android:fillColor="#FF000000"
-        android:pathData="M12,9.1L12,9.1c0.61,0 1.1,-0.49 1.1,-1.1l0,0c0,-0.61 -0.49,-1.1 -1.1,-1.1l0,0c-0.61,0 -1.1,0.49 -1.1,1.1l0,0C10.9,8.61 11.39,9.1 12,9.1z"/>
+        android:fillColor="#ffffff"
+        android:pathData="M16.0113 12.7141C16.61 12.7141 17.0953 12.2288 17.0953 11.6301C17.0953 11.0315 16.61 10.5461 16.0113 10.5461C15.4127 10.5461 14.9274 11.0315 14.9274 11.6301C14.9274 12.2288 15.4127 12.7141 16.0113 12.7141Z" />
 </vector>
diff --git a/res/drawable/ic_settings_accessibility.xml b/res/drawable/ic_settings_accessibility.xml
index 8ff6fc8706f..11a9d50084a 100644
--- a/res/drawable/ic_settings_accessibility.xml
+++ b/res/drawable/ic_settings_accessibility.xml
@@ -1,25 +1,19 @@
-<!--
-    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="24.0dp"
-        android:height="24.0dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0"
-        android:tint="@color/blue_1">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+
+    <path
+        android:fillColor="#0088ED"
+        android:pathData="M25.2477 32H6.75229C3.02611 32 0 28.9739 0 25.2477V6.75229C0 3.02611 3.02611 0 6.75229 0H25.2477C28.9739 0 32 3.02611 32 6.75229V25.2477C32 28.9739 28.9739 32 25.2477 32Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M14.9047 12.4204C12.827 12.4204 11.1333 10.7267 11.1333 8.64903C11.1333 6.5714 12.827 4.87769 14.9047 4.87769C16.9823 4.87769 18.676 6.5714 18.676 8.64903C18.676 10.7267 16.9823 12.4204 14.9047 12.4204ZM14.9047 6.45849C13.7078 6.45849 12.7141 7.45214 12.7141 8.64903C12.7141 9.84593 13.7078 10.8396 14.9047 10.8396C16.1015 10.8396 17.0952 9.84593 17.0952 8.64903C17.0952 7.45214 16.1241 6.45849 14.9047 6.45849Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M13.911 27.1217C10.4784 27.1217 7.56522 24.457 7.33939 20.9792C7.15873 18.2467 8.71695 15.6496 11.2011 14.5205C11.6076 14.3398 12.0592 14.5205 12.2399 14.927C12.4205 15.3335 12.2399 15.7851 11.8334 15.9658C9.93642 16.8239 8.76211 18.7886 8.89761 20.8663C9.07827 23.6214 11.4721 25.699 14.2272 25.5184C15.808 25.4054 17.2081 24.5925 18.0889 23.2601C18.3373 22.8987 18.8115 22.7858 19.1728 23.0342C19.5342 23.2826 19.6471 23.7569 19.3987 24.1182C18.2469 25.8571 16.3951 26.9411 14.3175 27.0766C14.2272 27.1217 14.0691 27.1217 13.911 27.1217Z" />
     <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M20.75,6.99c-0.14,-0.55 -0.69,-0.87 -1.24,-0.75C17.13,6.77 14.48,7 12,7S6.87,6.77 4.49,6.24c-0.55,-0.12 -1.1,0.2 -1.24,0.75l0,0C3.11,7.55 3.45,8.12 4,8.25C5.61,8.61 7.35,8.86 9,9v12c0,0.55 0.45,1 1,1h0c0.55,0 1,-0.45 1,-1v-5h2v5c0,0.55 0.45,1 1,1h0c0.55,0 1,-0.45 1,-1V9c1.65,-0.14 3.39,-0.39 5,-0.75C20.55,8.12 20.89,7.55 20.75,6.99L20.75,6.99zM12,6c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2s-2,0.9 -2,2S10.9,6 12,6z"/>
+        android:fillColor="#ffffff"
+        android:pathData="M23.8701 24.5022C23.6668 24.5022 23.4636 24.4344 23.3055 24.2763L19.6922 20.6631H14.9047C14.4756 20.6631 14.1143 20.3017 14.1143 19.8727V14.3173C14.1143 13.8882 14.4756 13.5269 14.9047 13.5269C15.3337 13.5269 15.6951 13.8882 15.6951 14.3173V19.0823H20.0536C20.2568 19.0823 20.4601 19.1726 20.6181 19.3081L24.4572 23.1472C24.7734 23.4633 24.7734 23.9602 24.4572 24.2537C24.2766 24.4344 24.0733 24.5022 23.8701 24.5022Z" />
 </vector>
diff --git a/res/drawable/ic_settings_accounts.xml b/res/drawable/ic_settings_accounts.xml
index 0e4be5c8ebb..2f351fce50a 100644
--- a/res/drawable/ic_settings_accounts.xml
+++ b/res/drawable/ic_settings_accounts.xml
@@ -1,29 +1,40 @@
-<!--
-    Copyright (C) 2016 The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?>
 
-    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="24.0dp"
-        android:height="24.0dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0"
-        android:tint="@color/blue_2">
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M3.0,5.0
-        l0.0,14.0c0.0,1.0 0.89,2.0 2.0,2.0l14.0,0.0c1.1,0.0 2.0,-0.9 2.0,-2.0
-        L21.0,5.0c0.0,-1.1 -0.9,-2.0 -2.0,-2.0
-        L5.0,3.0c-1.11,0.0 -2.0,0.9 -2.0,2.0zm12.0,4.0c0.0,1.66 -1.34,3.0 -3.0,3.0s-3.0,-1.34 -3.0,-3.0 1.34,-3.0 3.0,-3.0 3.0,1.34 3.0,3.0zm-9.0,8.0c0.0,-2.0 4.0,-3.1 6.0,-3.1s6.0,1.1 6.0,3.1l0.0,1.0
-        l-12.0,0l0.0,-1.0z"/>
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+
+    <path
+        android:fillColor="#953EB4"
+        android:pathData="M25.2477 32H6.75229C3.02611 32 0 28.9739 0 25.2477V6.75229C0 3.02611 3.02611 0 6.75229 0H25.2477C28.9739 0 32 3.02611 32 6.75229V25.2477C32 28.9739 28.9739 32 25.2477 32Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M10.7269 15.3563C10.2904 15.3563 9.93652 15.7102 9.93652 16.1467C9.93652 16.5832 10.2904 16.9371 10.7269 16.9371C11.1634 16.9371 11.5173 16.5832 11.5173 16.1467C11.5173 15.7102 11.1634 15.3563 10.7269 15.3563ZM8.35571 16.1467C8.35571 14.8371 9.41734 13.7755 10.7269 13.7755C12.0365 13.7755 13.0981 14.8371 13.0981 16.1467C13.0981 17.4563 12.0365 18.5179 10.7269 18.5179C9.41734 18.5179 8.35571 17.4563 8.35571 16.1467Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M10.7249 17.592C10.7332 17.592 10.7414 17.592 10.7495 17.592C10.7576 17.592 10.7658 17.592 10.7741 17.592C11.0498 17.592 11.3733 17.592 11.6789 17.6319C12.0008 17.6739 12.3666 17.7667 12.7007 17.9976C13.4151 18.4914 13.6627 19.3696 13.6627 20.5052C13.6627 20.9418 13.3088 21.2956 12.8723 21.2956C12.4358 21.2956 12.0819 20.9418 12.0819 20.5052C12.0819 19.5181 11.8553 19.3349 11.8019 19.298C11.752 19.2635 11.6605 19.2237 11.4743 19.1994C11.2809 19.1741 11.0557 19.1728 10.7495 19.1728C10.4433 19.1728 10.2181 19.1741 10.0247 19.1994C9.83846 19.2237 9.74702 19.2635 9.69714 19.298C9.64372 19.3349 9.41711 19.5181 9.41711 20.5052C9.41711 20.9418 9.06323 21.2956 8.62671 21.2956C8.19018 21.2956 7.8363 20.9418 7.8363 20.5052C7.8363 19.3696 8.08394 18.4914 8.79833 17.9976C9.13236 17.7667 9.49822 17.6739 9.82008 17.6319C10.1257 17.592 10.4492 17.592 10.7249 17.592Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M5.28442 10.5914C5.28442 10.1549 5.6383 9.80103 6.07483 9.80103H25.9026C26.3392 9.80103 26.693 10.1549 26.693 10.5914V24.8412C26.693 25.2778 26.3392 25.6317 25.9026 25.6317H6.07483C5.6383 25.6317 5.28442 25.2778 5.28442 24.8412V10.5914ZM6.86523 11.3818V24.0508H25.1122V11.3818H6.86523Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M13.866 7.15881C13.866 6.72228 14.2198 6.36841 14.6564 6.36841H17.3437C17.7803 6.36841 18.1341 6.72228 18.1341 7.15881V10.5914C18.1341 11.0279 17.7803 11.3818 17.3437 11.3818H14.6564C14.2198 11.3818 13.866 11.0279 13.866 10.5914V7.15881ZM15.4468 7.94921V9.80101H16.5533V7.94921H15.4468Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M16.5532 14.5659C16.5532 14.1294 16.9071 13.7755 17.3436 13.7755H23.3507C23.7872 13.7755 24.1411 14.1294 24.1411 14.5659C24.1411 15.0024 23.7872 15.3563 23.3507 15.3563H17.3436C16.9071 15.3563 16.5532 15.0024 16.5532 14.5659Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M16.5532 17.7275C16.5532 17.291 16.9071 16.9371 17.3436 16.9371H23.3507C23.7872 16.9371 24.1411 17.291 24.1411 17.7275C24.1411 18.1641 23.7872 18.5179 23.3507 18.5179H17.3436C16.9071 18.5179 16.5532 18.1641 16.5532 17.7275Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M16.5532 20.8666C16.5532 20.43 16.9071 20.0762 17.3436 20.0762H23.3507C23.7872 20.0762 24.1411 20.43 24.1411 20.8666C24.1411 21.3031 23.7872 21.657 23.3507 21.657H17.3436C16.9071 21.657 16.5532 21.3031 16.5532 20.8666Z" />
 </vector>
diff --git a/res/drawable/ic_settings_applications.xml b/res/drawable/ic_settings_applications.xml
index a1d4a54c15d..b7fd1b6f70b 100644
--- a/res/drawable/ic_settings_applications.xml
+++ b/res/drawable/ic_settings_applications.xml
@@ -1,25 +1,30 @@
-<!--
-    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.
--->
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24.0dp"
-        android:height="24.0dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0"
-        android:tint="@color/blue_1">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+
+    <path
+        android:fillColor="#E83A52"
+        android:pathData="M25.2477 32H6.75229C3.02611 32 0 28.9739 0 25.2477V6.75229C0 3.02611 3.02611 0 6.75229 0H25.2477C28.9739 0 32 3.02611 32 6.75229V25.2477C32 28.9739 28.9739 32 25.2477 32Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M6.7749 7.5653C6.7749 7.12878 7.12878 6.7749 7.5653 6.7749H13.6401C14.0766 6.7749 14.4305 7.12878 14.4305 7.5653V13.6401C14.4305 14.0766 14.0766 14.4305 13.6401 14.4305H7.5653C7.12878 14.4305 6.7749 14.0766 6.7749 13.6401V7.5653ZM8.35571 8.35571V12.8497H12.8497V8.35571H8.35571Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M24.4348 7.56531H18.36V13.6401H24.4348V7.56531Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M17.5696 7.5653C17.5696 7.12878 17.9235 6.7749 18.36 6.7749H24.4348C24.8713 6.7749 25.2252 7.12878 25.2252 7.5653V13.6401C25.2252 14.0766 24.8713 14.4305 24.4348 14.4305H18.36C17.9235 14.4305 17.5696 14.0766 17.5696 13.6401V7.5653ZM19.1504 8.35571V12.8497H23.6444V8.35571H19.1504Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M6.7749 18.36C6.7749 17.9235 7.12878 17.5696 7.5653 17.5696H13.6401C14.0766 17.5696 14.4305 17.9235 14.4305 18.36V24.4348C14.4305 24.8713 14.0766 25.2252 13.6401 25.2252H7.5653C7.12878 25.2252 6.7749 24.8713 6.7749 24.4348V18.36ZM8.35571 19.1504V23.6444H12.8497V19.1504H8.35571Z" />
     <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M5.0,16.0c0.0,3.87 3.13,7.0 7.0,7.0s7.0,-3.13 7.0,-7.0l0.0,-4.0L5.0,12.0l0.0,4.0zM16.12,4.37l2.1,-2.1 -0.82,-0.83 -2.3,2.31C14.16,3.28 13.12,3.0 12.0,3.0s-2.1,0.28 -3.0,0.75L6.6,1.44l-0.8,0.83 2.1,2.1C6.14,5.64 5.0,7.68 5.0,10.0l0.0,1.0l14.0,0.0l0.0,-1.0c0.0,-2.32 -1.14,-4.36 -2.88,-5.63zM9.0,9.0c-0.55,0.0 -1.0,-0.45 -1.0,-1.0s0.45,-1.0 1.0,-1.0 1.0,0.45 1.0,1.0 -0.45,1.0 -1.0,1.0zm6.0,0.0c-0.55,0.0 -1.0,-0.45 -1.0,-1.0s0.45,-1.0 1.0,-1.0 1.0,0.45 1.0,1.0 -0.45,1.0 -1.0,1.0z"/>
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M17.5696 18.36C17.5696 17.9235 17.9235 17.5696 18.36 17.5696H24.4348C24.8713 17.5696 25.2252 17.9235 25.2252 18.36V24.4348C25.2252 24.8713 24.8713 25.2252 24.4348 25.2252H18.36C17.9235 25.2252 17.5696 24.8713 17.5696 24.4348V18.36ZM19.1504 19.1504V23.6444H23.6444V19.1504H19.1504Z" />
 </vector>
diff --git a/res/drawable/ic_settings_battery.xml b/res/drawable/ic_settings_battery.xml
index 6d998400b71..550649cb69f 100644
--- a/res/drawable/ic_settings_battery.xml
+++ b/res/drawable/ic_settings_battery.xml
@@ -1,25 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright (C) 2016 The Android Open Source Project
+  Copyright (C) 2018 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
+  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
+       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.
--->
+  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.0"
-        android:viewportHeight="24.0"
-        android:tint="@color/green_1">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M15.67,4H14V2h-4v2H8.33C7.6,4 7,4.6 7,5.33v15.33C7,21.4 7.6,22 8.33,22h7.33c0.74,0 1.34,-0.6 1.34,-1.33V5.33C17,4.6 16.4,4 15.67,4z"/>
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+
+    <path
+        android:fillColor="#2CCF69"
+        android:pathData="M25.2477 32H6.75229C3.02611 32 0 28.9739 0 25.2477V6.75229C0 3.02611 3.02611 0 6.75229 0H25.2477C28.9739 0 32 3.02611 32 6.75229V25.2477C32 28.9739 28.9739 32 25.2477 32Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M8.60413 7.33947C8.60413 6.90295 8.958 6.54907 9.39453 6.54907H22.6281C23.0646 6.54907 23.4185 6.90295 23.4185 7.33947V26.5124C23.4185 26.9489 23.0646 27.3028 22.6281 27.3028H9.39453C8.958 27.3028 8.60413 26.9489 8.60413 26.5124V7.33947ZM10.1849 8.12988V25.722H21.8377V8.12988H10.1849Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M18.4051 5.51019H13.6176V7.33941H18.4051V5.51019Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M12.827 5.51019C12.827 5.07366 13.1809 4.71979 13.6174 4.71979H18.405C18.8415 4.71979 19.1954 5.07366 19.1954 5.51019V7.33941C19.1954 7.77593 18.8415 8.12981 18.405 8.12981H13.6174C13.1809 8.12981 12.827 7.77593 12.827 7.33941V5.51019ZM14.4078 6.30059V6.549H17.6146V6.30059H14.4078Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M19.7374 22.9442H12.2625V23.4185H19.7374V22.9442Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M11.4722 22.1537H20.5279V24.2088H11.4722V22.1537Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M19.7374 19.3761H12.2625V19.8503H19.7374V19.3761Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M11.4722 18.5857H20.5279V20.6407H11.4722V18.5857Z" />
 </vector>
diff --git a/res/drawable/ic_settings_bluetooth.xml b/res/drawable/ic_settings_bluetooth.xml
index b77b5bf12de..f93ab968077 100644
--- a/res/drawable/ic_settings_bluetooth.xml
+++ b/res/drawable/ic_settings_bluetooth.xml
@@ -1,25 +1,15 @@
-<!--
-    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.
--->
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24.0dp"
-        android:height="24.0dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0"
-        android:tint="@color/blue_1">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+
+    <path
+        android:fillColor="#0088ED"
+        android:pathData="M25.2477 32H6.75229C3.02611 32 0 28.9739 0 25.2477V6.75229C0 3.02611 3.02611 0 6.75229 0H25.2477C28.9739 0 32 3.02611 32 6.75229V25.2477C32 28.9739 28.9739 32 25.2477 32Z" />
     <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M13.5,12l3.8,-3.7c0.4,-0.4 0.4,-1.1 0,-1.5l-4.5,-4.5c-0.4,-0.4 -1.1,-0.4 -1.5,0.1C11.1,2.5 11,2.8 11,3v6.4L6.9,5.4C6.5,5 5.9,5 5.5,5.4s-0.4,1.1 0,1.5l5.1,5.1l-5.1,5.1c-0.4,0.4 -0.4,1.1 0,1.5s1.1,0.4 1.5,0l4.1,-4V21c0,0.6 0.5,1 1,1c0.3,0 0.5,-0.1 0.7,-0.3l0.1,0l4.5,-4.5c0.4,-0.4 0.4,-1.1 0,-1.5L13.5,12zM13,9.7V5.4l2.1,2.2L13,9.7zM13,18.6v-4.3l2.1,2.2L13,18.6z"/>
-</vector>
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M16.0928 4.73483C16.3881 4.61249 16.7281 4.68011 16.9541 4.90616L22.2611 10.2132C22.5698 10.5218 22.5698 11.0223 22.2611 11.3309L17.5921 16L22.2611 20.669C22.5698 20.9777 22.5698 21.4782 22.2611 21.7868L16.9541 27.0938C16.7281 27.3199 16.3881 27.3875 16.0928 27.2652C15.7974 27.1428 15.6048 26.8546 15.6048 26.5349V17.9872L10.8567 22.7353C10.5481 23.044 10.0476 23.044 9.73895 22.7353C9.43028 22.4267 9.43028 21.9262 9.73895 21.6175L15.3565 16L9.73895 10.3825C9.43028 10.0738 9.43028 9.57334 9.73895 9.26467C10.0476 8.956 10.5481 8.956 10.8567 9.26467L15.6048 14.0128V5.46506C15.6048 5.14537 15.7974 4.85716 16.0928 4.73483ZM17.1856 17.8292L20.5844 21.2279L17.1856 24.6267V17.8292ZM17.1856 14.1708V7.37326L20.5844 10.772L17.1856 14.1708Z" />
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_settings_display.xml b/res/drawable/ic_settings_display.xml
index bd411971677..75c6e5e088b 100644
--- a/res/drawable/ic_settings_display.xml
+++ b/res/drawable/ic_settings_display.xml
@@ -1,28 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright (C) 2016 The Android Open Source Project
+  Copyright (C) 2018 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
+  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
+       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.
--->
+  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="24.0dp"
-        android:height="24.0dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0"
-        android:tint="@color/blue_1">
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M20,15.31l2.6-2.6c0.39-0.39,0.39-1.02,0-1.41L20,8.69V5c0-0.55-0.45-1-1-1h-3.69l-2.6-2.6c-0.39-0.39-1.02-0.39-1.41,0
-L8.69,4H5C4.45,4,4,4.45,4,5v3.69l-2.6,2.6c-0.39,0.39-0.39,1.02,0,1.41l2.6,2.6V19c0,0.55,0.45,1,1,1h3.69l2.6,2.6
-c0.39,0.39,1.02,0.39,1.41,0l2.6-2.6H19c0.55,0,1-0.45,1-1V15.31z
-M12,18V6c3.31,0,6,2.69,6,6S15.31,18,12,18z"/>
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+
+    <path
+        android:fillColor="#0088ED"
+        android:pathData="M25.2477 32H6.75229C3.02611 32 0 28.9739 0 25.2477V6.75229C0 3.02611 3.02611 0 6.75229 0H25.2477C28.9739 0 32 3.02611 32 6.75229V25.2477C32 28.9739 28.9739 32 25.2477 32Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M16.0112 5.03601C16.4478 5.03601 16.8016 5.38989 16.8016 5.82641V6.84264C16.8016 7.27917 16.4478 7.63305 16.0112 7.63305C15.5747 7.63305 15.2208 7.27917 15.2208 6.84264V5.82641C15.2208 5.38989 15.5747 5.03601 16.0112 5.03601Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M16.0112 24.367C16.4478 24.367 16.8016 24.7208 16.8016 25.1574V26.1736C16.8016 26.6101 16.4478 26.964 16.0112 26.964C15.5747 26.964 15.2208 26.6101 15.2208 26.1736V25.1574C15.2208 24.7208 15.5747 24.367 16.0112 24.367Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M5.03601 16.0113C5.03601 15.5748 5.38989 15.2209 5.82641 15.2209H6.84264C7.27917 15.2209 7.63305 15.5748 7.63305 16.0113C7.63305 16.4478 7.27917 16.8017 6.84264 16.8017H5.82641C5.38989 16.8017 5.03601 16.4478 5.03601 16.0113Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M24.3669 16.0113C24.3669 15.5748 24.7208 15.2209 25.1573 15.2209H26.1736C26.6101 15.2209 26.964 15.5748 26.964 16.0113C26.964 16.4478 26.6101 16.8017 26.1736 16.8017H25.1573C24.7208 16.8017 24.3669 16.4478 24.3669 16.0113Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M8.24847 8.24844C8.55714 7.93977 9.0576 7.93977 9.36627 8.24844L10.0889 8.97109C10.3976 9.27977 10.3976 9.78022 10.0889 10.0889C9.78025 10.3976 9.2798 10.3976 8.97112 10.0889L8.24847 9.36624C7.9398 9.05757 7.9398 8.55711 8.24847 8.24844Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M21.9112 21.9111C22.2199 21.6025 22.7203 21.6025 23.029 21.9111L23.7516 22.6338C24.0603 22.9425 24.0603 23.4429 23.7516 23.7516C23.443 24.0603 22.9425 24.0603 22.6338 23.7516L21.9112 23.0289C21.6025 22.7203 21.6025 22.2198 21.9112 21.9111Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M23.7516 8.24844C24.0603 8.55711 24.0603 9.05757 23.7516 9.36624L23.029 10.0889C22.7203 10.3976 22.2199 10.3976 21.9112 10.0889C21.6025 9.78022 21.6025 9.27977 21.9112 8.97109L22.6338 8.24844C22.9425 7.93977 23.443 7.93977 23.7516 8.24844Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M10.0889 21.9111C10.3976 22.2198 10.3976 22.7203 10.0889 23.0289L9.36627 23.7516C9.0576 24.0603 8.55714 24.0603 8.24847 23.7516C7.9398 23.4429 7.9398 22.9425 8.24847 22.6338L8.97113 21.9111C9.2798 21.6025 9.78025 21.6025 10.0889 21.9111Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M16.0113 10.3204C12.8683 10.3204 10.3204 12.8683 10.3204 16.0113C10.3204 19.1543 12.8683 21.7022 16.0113 21.7022C19.1543 21.7022 21.7022 19.1543 21.7022 16.0113C21.7022 12.8683 19.1543 10.3204 16.0113 10.3204ZM8.73962 16.0113C8.73962 11.9952 11.9953 8.73959 16.0113 8.73959C20.0274 8.73959 23.283 11.9952 23.283 16.0113C23.283 20.0273 20.0274 23.283 16.0113 23.283C11.9953 23.283 8.73962 20.0273 8.73962 16.0113Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M22.4699 16.0113C22.4699 12.4432 19.5793 9.53003 15.9886 9.53003V22.47C19.5793 22.47 22.4699 19.5794 22.4699 16.0113Z" />
 </vector>
diff --git a/res/drawable/ic_settings_location.xml b/res/drawable/ic_settings_location.xml
index d8f1dfa5737..4aad53af1fb 100644
--- a/res/drawable/ic_settings_location.xml
+++ b/res/drawable/ic_settings_location.xml
@@ -1,25 +1,18 @@
-<!--
-    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.
--->
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24.0dp"
-        android:height="24.0dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0"
-        android:tint="@color/blue_1">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+
+    <path
+        android:fillColor="#E83A52"
+        android:pathData="M25.2477 32H6.75229C3.02611 32 0 28.9739 0 25.2477V6.75229C0 3.02611 3.02611 0 6.75229 0H25.2477C28.9739 0 32 3.02611 32 6.75229V25.2477C32 28.9739 28.9739 32 25.2477 32Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M19.3888 7.49189C17.9614 6.6073 16.4265 6.34523 14.7625 6.66991L14.7532 6.67166C12.8778 7.01448 11.437 8.01029 10.3984 9.61808C9.50892 11.0139 9.18786 12.5373 9.43109 14.1792L9.43211 14.1862C9.53334 14.9151 9.75893 15.6425 10.0424 16.3839L10.043 16.3856C10.6927 18.0964 11.6086 19.7149 12.6323 21.295L12.6325 21.2954C13.6022 22.794 14.6851 24.232 15.8402 25.6323C15.8893 25.6861 15.9385 25.7407 15.9877 25.796L16.5303 25.1516C17.7357 23.6557 18.8849 22.1068 19.8751 20.4785L19.8791 20.4719C20.8996 18.8302 21.7629 17.182 22.2992 15.3806C22.6159 14.3032 22.7484 13.256 22.5715 12.2142L22.5713 12.213C22.2242 10.151 21.1797 8.57054 19.3974 7.49712L19.3888 7.49189ZM16.7214 27.3789L16.7213 27.3791L16.7211 27.3794L16.721 27.3797L16.7209 27.3799L16.7207 27.3802L16.7206 27.3805L16.7205 27.3807L16.7203 27.381L16.7202 27.3813L16.7201 27.3815L16.7199 27.3818L16.7198 27.3821L16.7197 27.3823L16.7195 27.3826L16.7194 27.3828L16.7193 27.3831L16.7191 27.3834L16.7187 27.3842L16.7186 27.3844L16.7185 27.3847L16.7182 27.3852C16.5998 27.6221 16.3706 27.7839 16.1078 27.8162C15.845 27.8486 15.5835 27.7472 15.4111 27.5461C15.3711 27.4994 15.3318 27.4536 15.2933 27.4085C15.0661 27.143 14.8635 26.9062 14.6608 26.6851C14.6515 26.675 14.6426 26.6647 14.6339 26.6542C13.4451 25.214 12.3193 23.7212 11.3053 22.1542C10.2516 20.5278 9.27074 18.8044 8.56552 16.9476C8.26237 16.1547 7.9916 15.3028 7.86683 14.4073C7.56917 12.3927 7.97054 10.4854 9.06677 8.76627L9.06915 8.76255C10.3331 6.80463 12.1423 5.54316 14.4644 5.11746C16.5006 4.7212 18.4404 5.04579 20.2173 6.14554C22.407 7.46592 23.7097 9.45261 24.1301 11.9507C24.3594 13.3019 24.1758 14.6025 23.8154 15.8278L23.8147 15.8303C23.2222 17.821 22.2798 19.604 21.2237 21.3032C20.1834 23.0136 18.9867 24.623 17.7558 26.1502C17.7522 26.1546 17.7486 26.159 17.745 26.1633L16.7214 27.3789Z" />
     <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M12.0,2.0C8.13,2.0 5.0,5.13 5.0,9.0c0.0,5.25 7.0,13.0 7.0,13.0s7.0,-7.75 7.0,-13.0c0.0,-3.87 -3.13,-7.0 -7.0,-7.0zm0.0,9.5c-1.38,0.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"/>
-</vector>
+        android:fillColor="#ffffff"
+        android:pathData="M18.6535 13.1659C18.6535 11.698 17.4566 10.4785 15.921 10.5237C14.4757 10.5688 13.324 11.7657 13.324 13.1885C13.3466 14.6563 14.5886 15.9436 16.1468 15.8307C17.5696 15.7403 18.6761 14.566 18.6535 13.1659Z" />
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_settings_print.xml b/res/drawable/ic_settings_print.xml
index d6f45a47657..308d09fb72f 100644
--- a/res/drawable/ic_settings_print.xml
+++ b/res/drawable/ic_settings_print.xml
@@ -1,28 +1,34 @@
-<!--
-    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.
--->
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24.0dp"
-        android:height="24.0dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0"
-        android:tint="@color/gray_2">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+
+    <path
+        android:fillColor="#0088ED"
+        android:pathData="M25.2477 32H6.75229C3.02611 32 0 28.9739 0 25.2477V6.75229C0 3.02611 3.02611 0 6.75229 0H25.2477C28.9739 0 32 3.02611 32 6.75229V25.2477C32 28.9739 28.9739 32 25.2477 32Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M8.17504 11.2463C7.34692 11.2463 6.66198 11.9313 6.66198 12.7594V20.5957C6.66198 21.4238 7.34692 22.1087 8.17504 22.1087H10.3882C10.8247 22.1087 11.1786 22.4626 11.1786 22.8991C11.1786 23.3356 10.8247 23.6895 10.3882 23.6895H8.17504C6.47387 23.6895 5.08118 22.2968 5.08118 20.5957V12.7594C5.08118 11.0582 6.47387 9.66553 8.17504 9.66553H23.8476C25.5488 9.66553 26.9414 11.0582 26.9414 12.7594V20.5957C26.9414 22.2968 25.5488 23.6895 23.8476 23.6895H21.6345C21.1979 23.6895 20.8441 23.3356 20.8441 22.8991C20.8441 22.4626 21.1979 22.1087 21.6345 22.1087H23.8476C24.6757 22.1087 25.3606 21.4238 25.3606 20.5957V12.7594C25.3606 11.9313 24.6757 11.2463 23.8476 11.2463H8.17504Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M9.59778 4.99084C9.59778 4.55431 9.95165 4.20044 10.3882 4.20044H21.6345C22.071 4.20044 22.4249 4.55431 22.4249 4.99084V7.36205C22.4249 7.79858 22.071 8.15245 21.6345 8.15245C21.198 8.15245 20.8441 7.79858 20.8441 7.36205V5.78124H11.1786V7.36205C11.1786 7.79858 10.8247 8.15245 10.3882 8.15245C9.95165 8.15245 9.59778 7.79858 9.59778 7.36205V4.99084Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M9.59778 17.3209C9.59778 16.8844 9.95165 16.5305 10.3882 16.5305H21.6345C22.071 16.5305 22.4249 16.8844 22.4249 17.3209V27.0316C22.4249 27.4681 22.071 27.822 21.6345 27.822H10.3882C9.95165 27.822 9.59778 27.4681 9.59778 27.0316V17.3209ZM11.1786 18.1113V26.2412H20.8441V18.1113H11.1786Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M12.7819 20.6632C12.7819 20.2267 13.1357 19.8728 13.5723 19.8728H18.4276C18.8641 19.8728 19.218 20.2267 19.218 20.6632C19.218 21.0997 18.8641 21.4536 18.4276 21.4536H13.5723C13.1357 21.4536 12.7819 21.0997 12.7819 20.6632Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M12.7819 23.87C12.7819 23.4335 13.1357 23.0796 13.5723 23.0796H18.4276C18.8641 23.0796 19.218 23.4335 19.218 23.87C19.218 24.3065 18.8641 24.6604 18.4276 24.6604H13.5723C13.1357 24.6604 12.7819 24.3065 12.7819 23.87Z" />
     <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M19,8H5c-1.66,0-3,1.34-3,3v5c0,0.55,0.45,1,1,1h3v3c0,0.55,0.45,1,1,1h10c0.55,0,1-0.45,1-1v-3h3c0.55,0,1-0.45,1-1v-5
-C22,9.34,20.66,8,19,8z M16,19H8v-5h8V19z
-M19,12c-0.55,0-1-0.45-1-1s0.45-1,1-1s1,0.45,1,1S19.55,12,19,12z M17,3H7
-C6.45,3,6,3.45,6,4v3h12V4C18,3.45,17.55,3,17,3z"/>
-</vector>
+        android:fillColor="#ffffff"
+        android:pathData="M22.6732 15.04C23.2469 15.04 23.712 14.5749 23.712 14.0012C23.712 13.4275 23.2469 12.9624 22.6732 12.9624C22.0995 12.9624 21.6344 13.4275 21.6344 14.0012C21.6344 14.5749 22.0995 15.04 22.6732 15.04Z" />
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_settings_security.xml b/res/drawable/ic_settings_security.xml
index ddd20bf8809..41fa591ad51 100644
--- a/res/drawable/ic_settings_security.xml
+++ b/res/drawable/ic_settings_security.xml
@@ -1,25 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright (C) 2016 The Android Open Source Project
+  Copyright (C) 2018 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
+  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
+       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.
+  -->
 
-    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="24.0dp"
-        android:height="24.0dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0"
-        android:tint="@color/gray_2">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+
+    <path
+        android:fillColor="#E83A52"
+        android:pathData="M25.2477 32H6.75229C3.02611 32 0 28.9739 0 25.2477V6.75229C0 3.02611 3.02611 0 6.75229 0H25.2477C28.9739 0 32 3.02611 32 6.75229V25.2477C32 28.9739 28.9739 32 25.2477 32Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M9.28161 15.7178C9.12022 15.7178 8.98803 15.8488 8.98803 16.0113V24.2541C8.98803 24.4155 9.11908 24.5477 9.28161 24.5477H22.7184C22.881 24.5477 23.012 24.4155 23.012 24.2541V16.0113C23.012 15.85 22.881 15.7178 22.7184 15.7178H9.28161ZM7.40723 16.0113C7.40723 14.9544 8.26869 14.137 9.28161 14.137H22.7184C23.7754 14.137 24.5928 14.9984 24.5928 16.0113V24.2541C24.5928 25.267 23.7754 26.1285 22.7184 26.1285H9.28161C8.22466 26.1285 7.40723 25.267 7.40723 24.2541V16.0113Z" />
     <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M18.0,8.0l-1.0,0.0L17.0,6.0c0.0,-2.76 -2.24,-5.0 -5.0,-5.0S7.0,3.24 7.0,6.0l0.0,2.0L6.0,8.0c-1.1,0.0 -2.0,0.9 -2.0,2.0l0.0,10.0c0.0,1.0 0.9,2.0 2.0,2.0l12.0,0.0c1.1,0.0 2.0,-0.9 2.0,-2.0L20.0,10.0c0.0,-1.1 -0.9,-2.0 -2.0,-2.0zm-6.0,9.0c-1.1,0.0 -2.0,-0.9 -2.0,-2.0s0.9,-2.0 2.0,-2.0 2.0,0.9 2.0,2.0 -0.9,2.0 -2.0,2.0zm3.1,-9.0L8.9,8.0L8.9,6.0c0.0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0.0 3.1,1.39 3.1,3.1l0.0,2.0z"/>
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M15.9887 7.47497C13.7379 7.47497 11.9012 9.31164 11.9012 11.5625V14.9048C11.9012 15.3413 11.5474 15.6952 11.1108 15.6952C10.6743 15.6952 10.3204 15.3413 10.3204 14.9048V11.5625C10.3204 8.43858 12.8649 5.89417 15.9887 5.89417C19.1126 5.89417 21.6571 8.43858 21.6571 11.5625V14.9048C21.6571 15.3413 21.3032 15.6952 20.8667 15.6952C20.4301 15.6952 20.0763 15.3413 20.0763 14.9048V11.5625C20.0763 9.31164 18.2396 7.47497 15.9887 7.47497Z" />
 </vector>
diff --git a/res/drawable/ic_settings_storage.xml b/res/drawable/ic_settings_storage.xml
index 3eb9d2da1de..5ea2754f12a 100644
--- a/res/drawable/ic_settings_storage.xml
+++ b/res/drawable/ic_settings_storage.xml
@@ -1,25 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright (C) 2017 The Android Open Source Project
+  Copyright (C) 2018 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
+  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
+       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.
--->
+  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.0"
-        android:viewportHeight="24.0"
-        android:tint="@color/orange_1">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+
+    <path
+        android:fillColor="#24527F"
+        android:pathData="M25.2477 32H6.75229C3.02611 32 0 28.9739 0 25.2477V6.75229C0 3.02611 3.02611 0 6.75229 0H25.2477C28.9739 0 32 3.02611 32 6.75229V25.2477C32 28.9739 28.9739 32 25.2477 32Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M5.578 17.5921C5.578 12.7068 9.52256 8.76221 14.4079 8.76221C14.8445 8.76221 15.1983 9.11608 15.1983 9.55261V16.8017H22.4474C22.884 16.8017 23.2378 17.1556 23.2378 17.5921C23.2378 22.4775 19.2933 26.4221 14.4079 26.4221C9.52256 26.4221 5.578 22.4775 5.578 17.5921ZM13.6175 10.3853C9.97894 10.7775 7.15881 13.847 7.15881 17.5921C7.15881 21.6044 10.3956 24.8412 14.4079 24.8412C18.1531 24.8412 21.2226 22.0211 21.6147 18.3825H14.4079C13.9714 18.3825 13.6175 18.0287 13.6175 17.5921V10.3853Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M17.592 6.36841V14.4079H25.6316C25.6541 9.95909 22.0409 6.36841 17.592 6.36841Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M16.8016 6.36841C16.8016 5.93188 17.1555 5.578 17.592 5.578C22.4737 5.578 26.4468 9.51978 26.4219 14.4119C26.4197 14.8469 26.0665 15.1983 25.6316 15.1983H17.592C17.1555 15.1983 16.8016 14.8445 16.8016 14.4079V6.36841ZM18.3824 7.20107V13.6175H24.8027C24.4532 10.2417 21.7673 7.56524 18.3824 7.20107Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M17.592 9.16864V14.4079H22.8313C22.8313 11.5173 20.5052 9.16864 17.592 9.16864Z" />
     <path
-        android:fillColor="#FF000000"
-        android:pathData="M20,16L4,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2h16c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2zM5,19.1c-0.61,0 -1.1,-0.49 -1.1,-1.1 0,-0.61 0.49,-1.1 1.1,-1.1s1.1,0.49 1.1,1.1c0,0.61 -0.49,1.1 -1.1,1.1zM4,8h16c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2L4,4c-1.1,0 -2,0.9 -2,2s0.9,2 2,2zM5,4.9c0.61,0 1.1,0.49 1.1,1.1 0,0.61 -0.49,1.1 -1.1,1.1S3.9,6.61 3.9,6c0,-0.61 0.49,-1.1 1.1,-1.1zM20,10L4,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2h16c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2zM5,13.1c-0.61,0 -1.1,-0.49 -1.1,-1.1 0,-0.61 0.49,-1.1 1.1,-1.1s1.1,0.49 1.1,1.1c0,0.61 -0.49,1.1 -1.1,1.1z"/>
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M16.8016 8.37823H17.592C20.944 8.37823 23.6217 11.083 23.6217 14.4079V15.1983H16.8016V8.37823ZM18.3824 10.0283V13.6175H21.9714C21.6466 11.7929 20.2161 10.3537 18.3824 10.0283Z" />
 </vector>
-- 
GitLab


From 184d7ba2afbc65b8c9c5aba5b015d00000305a6a Mon Sep 17 00:00:00 2001
From: Amit Kumar <mr.doc10jl96@gmail.com>
Date: Thu, 23 Apr 2020 11:26:37 +0530
Subject: [PATCH 5/6] Update audio, notification and fingerprint icons

Change-Id: Icf6c6a6a418c622894a76e534bf9c9e33b2dc423
---
 res/drawable/ic_audio_media.xml              | 53 ++++++++--------
 res/drawable/ic_audio_media_mute.xml         | 67 ++++++++++++--------
 res/drawable/ic_audio_ring_notif.xml         | 46 +++++++-------
 res/drawable/ic_audio_ring_notif_vibrate.xml | 52 ++++++++-------
 res/drawable/ic_print.xml                    | 49 +++++++++-----
 res/drawable/ic_settings_notifications.xml   | 47 +++++++-------
 res/drawable/ic_suggested_notifications.xml  | 46 +++++++-------
 res/drawable/ic_suggestion_fingerprint.xml   | 47 ++++++--------
 8 files changed, 217 insertions(+), 190 deletions(-)

diff --git a/res/drawable/ic_audio_media.xml b/res/drawable/ic_audio_media.xml
index c226329e47b..19567cbd8b6 100644
--- a/res/drawable/ic_audio_media.xml
+++ b/res/drawable/ic_audio_media.xml
@@ -1,28 +1,29 @@
-<!--
-     Copyright (C) 2015 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.
--->
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="32.0dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0"
-    android:width="32.0dp"
-    android:tint="@color/red_1">
-
-    <path
-        android:fillColor="@color/black"
-        android:pathData="M12.0,3.0l0.0,9.28c-0.47,-0.17 -0.97,-0.28 -1.5,-0.28C8.01,12.0 6.0,14.01 6.0,16.5S8.01,21.0 10.5,21.0c2.31,0.0 4.2,-1.75 4.45,-4.0L15.0,17.0L15.0,6.0l4.0,0.0L19.0,3.0l-7.0,0.0z" />
-
-</vector>
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="32"
+    android:viewportHeight="33">
 
+    <group>
+        <path
+            android:fillColor="#E83A52"
+            android:pathData="M25.2477 32.637H6.75229C3.02611 32.637 0 29.6109 0 25.8847V7.38926C0 3.66307 3.02611 0.636963 6.75229 0.636963H25.2477C28.9739 0.636963 32 3.66307 32 7.38926V25.8847C32 29.6109 28.9739 32.637 25.2477 32.637Z" />
+        <group>
+            <group>
+                <path
+                    android:fillColor="#ffffff"
+                    android:pathData="M11.6781 26.364C13.2012 25.7769 14.053 24.3076 13.5807 23.0822C13.1083 21.8569 11.4907 21.3395 9.96755 21.9266C8.44444 22.5138 7.59264 23.9831 8.065 25.2085C8.53737 26.4338 10.155 26.9512 11.6781 26.364Z" />
+                <path
+                    android:fillColor="#ffffff"
+                    android:pathData="M22.055 23.8975C23.5781 23.3103 24.4299 21.841 23.9575 20.6157C23.4851 19.3903 21.8675 18.8729 20.3444 19.4601C18.8213 20.0472 17.9695 21.5165 18.4418 22.7419C18.9142 23.9673 20.5318 24.4846 22.055 23.8975Z" />
+                <path
+                    android:fillColor="#ffffff"
+                    android:pathData="M12.8223 20.3928C12.8223 18.1039 12.8 14.5261 12.8 12.7705C12.8 11.5928 13.3556 10.8594 14.4667 10.5261C16.5334 9.88165 19.3112 8.94832 21.3778 8.30387C22.6667 7.90387 23.2445 8.32609 23.2445 9.65943V17.9483V20.6372V12.3261C23.2445 10.9928 22.6667 10.5705 21.3778 10.9705C19.3112 11.615 16.5334 12.5483 14.4667 13.1928C13.3556 13.5483 12.8 14.2816 12.8 15.4372C12.8 17.1928 12.8 20.7705 12.8223 23.0594V20.3928Z" />
+                <path
+                    android:fillColor="#ffffff"
+                    android:pathData="M12.8222 23.8372C12.4 23.8372 12.0444 23.4816 12.0444 23.0594C12.0444 20.7705 12.0222 17.1927 12.0222 15.4372C12.0222 15.3927 12.0222 15.3483 12.0222 15.2816C12.0222 14.2816 12.0222 13.3927 12.0222 12.7483C12.0222 11.2372 12.8 10.215 14.2444 9.74829C15.2444 9.43718 16.4222 9.0594 17.5556 8.68162C18.8 8.28162 20.0667 7.8594 21.1556 7.52606C22.0667 7.23718 22.7555 7.30384 23.2667 7.68162C23.7778 8.0594 24.0222 8.70384 24.0222 9.63718V12.3038V12.3261V20.615C24.0222 21.0372 23.6667 21.3927 23.2444 21.3927C22.8222 21.3927 22.4667 21.0372 22.4667 20.615V12.3038C22.4667 11.7483 22.3333 11.615 22.3333 11.615C22.3333 11.615 22.1778 11.5261 21.6 11.7038C20.5333 12.0372 19.2667 12.4594 18.0444 12.8594C16.8889 13.2372 15.7111 13.615 14.7111 13.9261C13.9556 14.1705 13.6222 14.5705 13.5778 15.3038C13.5778 16.9927 13.5778 18.9261 13.6 20.3705V23.0594C13.6 23.5038 13.2444 23.8372 12.8222 23.8372ZM22.1778 8.92607C22.0667 8.92607 21.8889 8.94829 21.6 9.03718C20.5333 9.37051 19.2667 9.77051 18.0444 10.1705C16.8889 10.5483 15.7111 10.9261 14.7111 11.2372C13.9111 11.4816 13.6 11.9038 13.5778 12.7038C13.7778 12.5927 14 12.5038 14.2444 12.4372C15.2444 12.1261 16.4222 11.7483 17.5556 11.3705C18.8 10.9705 20.0667 10.5483 21.1556 10.215C21.6667 10.0594 22.0889 10.015 22.4667 10.0594V9.63718C22.4667 9.12607 22.3778 8.97051 22.3333 8.94829C22.3333 8.94829 22.2889 8.92607 22.1778 8.92607Z" />
+            </group>
+        </group>
+    </group>
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_audio_media_mute.xml b/res/drawable/ic_audio_media_mute.xml
index 15dbd7648f5..6479a57755e 100644
--- a/res/drawable/ic_audio_media_mute.xml
+++ b/res/drawable/ic_audio_media_mute.xml
@@ -1,31 +1,42 @@
-<!--
-     Copyright (C) 2015 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.
--->
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="32.0dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0"
-    android:width="32.0dp"
-    android:tint="@color/red_1">
-
-    <path
-        android:fillColor="@color/black"
-        android:pathData="M15.0,6.0l4.0,0.0L19.0,3.0l-7.0,0.0l0.0,5.6l3.0,3.0C15.0,8.8 15.0,6.0 15.0,6.0z" />
-    <path
-        android:fillColor="@color/black"
-        android:pathData="M4.8,3.9L3.5,5.1l6.9,6.9C8.0,12.1 6.0,14.0 6.0,16.5C6.0,19.0 8.0,21.0 10.5,21.0c2.7,0.0 4.5,-2.3 4.5,-4.3c0.0,0.0 0.0,-0.1 0.0,-0.1l4.0,4.0l1.3,-1.3L4.8,3.9z" />
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="32"
+    android:viewportHeight="33">
 
+    <group>
+        <path
+            android:fillColor="#E83A52"
+            android:pathData="M25.2477 32.5593H6.75229C3.02611 32.5593 0 29.5332 0 25.807V7.31162C0 3.58544 3.02611 0.559326 6.75229 0.559326H25.2477C28.9739 0.559326 32 3.58544 32 7.31162V25.807C32 29.5332 28.9739 32.5593 25.2477 32.5593Z" />
+        <group>
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M11.7123 25.3968C13.2468 24.8052 14.1008 23.3137 13.6196 22.0655C13.1384 20.8172 11.5043 20.2848 9.96973 20.8764C8.43517 21.468 7.58124 22.9594 8.06244 24.2077C8.54363 25.4559 10.1777 25.9883 11.7123 25.3968Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M23.422 26.2702C23.222 26.2702 23.022 26.2035 22.8665 26.048L7.95538 11.1368C7.64427 10.8257 7.64427 10.3368 7.95538 10.048C8.26649 9.73684 8.75538 9.73684 9.06649 10.0257L23.9776 24.9368C24.2887 25.248 24.2887 25.7368 23.9776 26.0257C23.822 26.2035 23.622 26.2702 23.422 26.2702Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M23.2666 22.048C23.7777 21.6035 24.1555 21.0035 24.2444 20.3591C24.4444 18.9813 23.2888 17.8924 21.6888 17.9146C20.9777 17.9369 20.311 18.1591 19.7555 18.5369L23.2666 22.048Z" />
+            <path
+                android:fillColor="#0088ED"
+                android:pathData="M12.8444 18.5369C12.8444 20.1146 12.8444 21.3369 12.8666 22.7146V20.2924C12.8666 19.5813 12.8666 19.4035 12.8444 18.5369Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M12.8666 23.4924C12.4444 23.4924 12.0889 23.1368 12.0889 22.7146V21.5146C12.0889 20.5813 12.0889 19.6479 12.0889 18.5368C12.0889 18.2257 12.2666 17.959 12.5555 17.8257C12.8444 17.6924 13.1555 17.759 13.4 17.959C13.5555 18.1146 13.6666 18.3146 13.6666 18.5368C13.6666 19.0257 13.6666 19.2924 13.6666 19.559V20.2924V22.7146C13.6444 23.159 13.2889 23.4924 12.8666 23.4924Z" />
+            <path
+                android:fillColor="#0088ED"
+                android:pathData="M23.4222 11.6257C23.4222 14.3813 23.4222 17.6924 23.4445 20.0702V15.8257C23.4222 14.6035 23.4222 13.1368 23.4222 11.6257Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M23.4222 20.848C23 20.848 22.6444 20.4925 22.6444 20.0702C22.6444 17.6702 22.6222 14.3814 22.6222 11.6258C22.6222 11.2702 22.8444 10.9814 23.1777 10.8702C23.5111 10.7814 23.8666 10.9147 24.0444 11.2036C24.1333 11.3369 24.1555 11.4702 24.1555 11.6258V20.0702C24.2 20.4925 23.8666 20.848 23.4222 20.848Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M21.5332 7.78144C19.4443 8.42589 16.6443 9.38144 14.5332 10.0259C13.9109 10.2259 13.4665 10.5148 13.1998 10.9592L14.8887 12.6481C16.9332 12.0037 19.5554 11.1148 21.5332 10.5148C22.8221 10.1148 23.4221 10.537 23.4221 11.8926V9.137C23.4221 7.78144 22.8443 7.38144 21.5332 7.78144Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M14.8888 13.4036C14.6888 13.4036 14.4888 13.3147 14.3332 13.1814L12.6443 11.4925C12.3777 11.2258 12.3332 10.8258 12.5332 10.5147C12.911 9.93693 13.511 9.51471 14.2888 9.27027C15.2888 8.95915 16.4888 8.55915 17.6443 8.18138C18.8888 7.78138 20.1999 7.35915 21.2888 7.02582C22.1999 6.73693 22.8888 6.8036 23.4221 7.18138C23.9332 7.55915 24.1777 8.2036 24.1777 9.13693V11.8258V11.848C24.1777 12.2703 23.8221 12.6258 23.3999 12.6258C22.9777 12.6258 22.6221 12.2703 22.6221 11.848V11.8258C22.6221 11.248 22.4888 11.1369 22.4888 11.1369C22.4888 11.1369 22.3332 11.048 21.7555 11.2258C20.6666 11.5592 19.3777 11.9814 18.1332 12.3814C17.111 12.7147 16.0443 13.0703 15.111 13.3592C15.0443 13.3814 14.9777 13.4036 14.8888 13.4036ZM14.311 10.9592L15.0888 11.7369C15.8888 11.4703 16.7777 11.1814 17.6443 10.9147C18.8888 10.5147 20.1999 10.0925 21.2888 9.73693C21.7999 9.58138 22.2443 9.51471 22.6221 9.58138V9.13693C22.6221 8.55915 22.4888 8.42582 22.4888 8.42582C22.4888 8.42582 22.3332 8.33693 21.7555 8.51471C20.6888 8.84804 19.3999 9.27027 18.1555 9.67027C16.9999 10.048 15.7999 10.448 14.7777 10.7592C14.5999 10.8036 14.4443 10.8703 14.311 10.9592Z" />
+        </group>
+    </group>
 </vector>
-
diff --git a/res/drawable/ic_audio_ring_notif.xml b/res/drawable/ic_audio_ring_notif.xml
index bf8f2dfd5a9..e111d369dc5 100644
--- a/res/drawable/ic_audio_ring_notif.xml
+++ b/res/drawable/ic_audio_ring_notif.xml
@@ -1,26 +1,26 @@
-<!--
-Copyright (C) 2014 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.
--->
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="32dp"
-        android:height="32dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0"
-        android:tint="@color/red_1">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
 
     <path
-        android:fillColor="@color/black"
-        android:pathData="M11.5,22.0c1.1,0.0 2.0,-0.9 2.0,-2.0l-4.0,0.0C9.5,21.1 10.4,22.0 11.5,22.0zM18.0,16.0l0.0,-5.5c0.0,-3.1 -2.1,-5.6 -5.0,-6.3L13.0,3.5C13.0,2.7 12.3,2.0 11.5,2.0C10.7,2.0 10.0,2.7 10.0,3.5l0.0,0.7c-2.9,0.7 -5.0,3.2 -5.0,6.3L5.0,16.0l-2.0,2.0l0.0,1.0l17.0,0.0l0.0,-1.0L18.0,16.0z"/>
-</vector>
+        android:fillColor="#FF7301"
+        android:pathData="M25.2477 32H6.75229C3.02611 32 0 28.9739 0 25.2477V6.75229C0 3.02611 3.02611 0 6.75229 0H25.2477C28.9739 0 32 3.02611 32 6.75229V25.2477C32 28.9739 28.9739 32 25.2477 32Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M16.0113 27.0092C15.0854 27.0092 14.3176 26.2414 14.3176 25.3155H17.7051C17.7051 26.2414 16.9372 27.0092 16.0113 27.0092Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M13.5272 24.5251H18.4955V25.3155C18.4955 26.6779 17.3738 27.7996 16.0113 27.7996C14.6489 27.7996 13.5272 26.6779 13.5272 25.3155V24.5251ZM15.5814 26.1059C15.7102 26.1776 15.857 26.2188 16.0113 26.2188C16.1657 26.2188 16.3125 26.1776 16.4413 26.1059H15.5814Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M16.0113 5.78124C15.3699 5.78124 14.8596 6.30211 14.8596 6.93297C14.8596 7.3695 14.5057 7.72338 14.0692 7.72338C13.6327 7.72338 13.2788 7.3695 13.2788 6.93297C13.2788 5.44105 14.4849 4.20044 16.0113 4.20044C17.5033 4.20044 18.7439 5.40649 18.7439 6.93297C18.7439 7.3695 18.39 7.72338 17.9535 7.72338C17.5169 7.72338 17.1631 7.3695 17.1631 6.93297C17.1631 6.29149 16.6422 5.78124 16.0113 5.78124Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M15.882 8.08488C19.5982 8.00746 22.6056 11.1187 22.6056 14.7918V18.4277C22.6056 19.1517 22.9419 19.8468 23.5392 20.308C23.5395 20.3082 23.5398 20.3084 23.54 20.3086L25.3006 21.6629C25.5689 21.8692 25.676 22.2235 25.567 22.5439C25.458 22.8643 25.1571 23.0798 24.8187 23.0798H7.22661C6.88817 23.0798 6.58728 22.8643 6.4783 22.5439C6.36932 22.2235 6.47644 21.8692 6.74469 21.6629L8.501 20.3119C9.08025 19.8497 9.41715 19.152 9.41715 18.4277V14.6789C9.41715 11.0856 12.2918 8.16181 15.8815 8.08489L15.882 8.08488ZM15.9151 9.66534C18.7026 9.60737 21.0248 11.9612 21.0248 14.7918V18.4277C21.0248 19.6132 21.5618 20.7404 22.497 21.499H9.54663C10.4597 20.7415 10.998 19.6149 10.998 18.4277V14.6789C10.998 11.9492 13.1816 9.72416 15.9149 9.66534" />
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_audio_ring_notif_vibrate.xml b/res/drawable/ic_audio_ring_notif_vibrate.xml
index 0c1952c7005..2b61ab19395 100644
--- a/res/drawable/ic_audio_ring_notif_vibrate.xml
+++ b/res/drawable/ic_audio_ring_notif_vibrate.xml
@@ -1,26 +1,32 @@
-<!--
-Copyright (C) 2014 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="32dp"
-        android:height="32dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0"
-        android:tint="@color/red_1">
-
+    android:width="32dp"
+    android:height="33dp"
+    android:viewportWidth="32"
+    android:viewportHeight="33">
+  <group>
+    <clip-path
+        android:pathData="M0,0.3103h32v32h-32z"/>
     <path
-        android:fillColor="@color/black"
-        android:pathData="M0.0,15.0l2.0,0.0L2.0,9.0L0.0,9.0L0.0,15.0zM3.0,17.0l2.0,0.0L5.0,7.0L3.0,7.0L3.0,17.0zM22.0,9.0l0.0,6.0l2.0,0.0L24.0,9.0L22.0,9.0zM19.0,17.0l2.0,0.0L21.0,7.0l-2.0,0.0L19.0,17.0zM16.5,3.0l-9.0,0.0C6.7,3.0 6.0,3.7 6.0,4.5l0.0,15.0C6.0,20.3 6.7,21.0 7.5,21.0l9.0,0.0c0.8,0.0 1.5,-0.7 1.5,-1.5l0.0,-15.0C18.0,3.7 17.3,3.0 16.5,3.0zM16.0,19.0L8.0,19.0L8.0,5.0l8.0,0.0L16.0,19.0z"/>
+        android:pathData="M25.2477,32.3103H6.7523C3.0261,32.3103 0,29.2842 0,25.558V7.0626C0,3.3364 3.0261,0.3103 6.7523,0.3103H25.2477C28.9739,0.3103 32,3.3364 32,7.0626V25.558C32,29.2842 28.9739,32.3103 25.2477,32.3103Z"
+        android:fillColor="#0088ED"/>
+    <group>
+      <clip-path
+          android:pathData="M4.5222,7.4104h22.9556v17.8h-22.9556z"/>
+      <path
+          android:pathData="M20.4334,25.2104H11.5667C11.1445,25.2104 10.7889,24.8548 10.7889,24.4326V8.1882C10.7889,7.766 11.1445,7.4104 11.5667,7.4104H20.4334C20.8556,7.4104 21.2112,7.766 21.2112,8.1882V24.4326C21.2112,24.8548 20.8556,25.2104 20.4334,25.2104ZM12.3445,23.6548H19.6556V8.966H12.3445V23.6548Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M8.4111,20.2549C7.9889,20.2549 7.6333,19.8993 7.6333,19.4771V13.1437C7.6333,12.7215 7.9889,12.366 8.4111,12.366C8.8333,12.366 9.1889,12.7215 9.1889,13.1437V19.4771C9.1889,19.8993 8.8555,20.2549 8.4111,20.2549Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M5.3,18.2993C4.8778,18.2993 4.5222,17.966 4.5222,17.5215V15.0771C4.5222,14.6549 4.8778,14.2993 5.3,14.2993C5.7222,14.2993 6.0778,14.6549 6.0778,15.0993V17.5438C6.0778,17.966 5.7222,18.2993 5.3,18.2993Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M23.5888,20.2549C23.1666,20.2549 22.811,19.8993 22.811,19.4771V13.1437C22.811,12.7215 23.1666,12.366 23.5888,12.366C24.011,12.366 24.3666,12.7215 24.3666,13.1437V19.4771C24.3666,19.8993 24.011,20.2549 23.5888,20.2549Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M26.6999,18.2993C26.2777,18.2993 25.9221,17.9438 25.9221,17.5215V15.0771C25.9221,14.6549 26.2777,14.2993 26.6999,14.2993C27.1221,14.2993 27.4777,14.6549 27.4777,15.0771V17.5215C27.4777,17.966 27.1221,18.2993 26.6999,18.2993Z"
+          android:fillColor="#ffffff"/>
+    </group>
+  </group>
 </vector>
diff --git a/res/drawable/ic_print.xml b/res/drawable/ic_print.xml
index 647838d0af9..308d09fb72f 100644
--- a/res/drawable/ic_print.xml
+++ b/res/drawable/ic_print.xml
@@ -1,19 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
 
-     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.
--->
-
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@*android:drawable/ic_print"
-    android:tint="@*android:color/material_deep_teal_500" />
+    <path
+        android:fillColor="#0088ED"
+        android:pathData="M25.2477 32H6.75229C3.02611 32 0 28.9739 0 25.2477V6.75229C0 3.02611 3.02611 0 6.75229 0H25.2477C28.9739 0 32 3.02611 32 6.75229V25.2477C32 28.9739 28.9739 32 25.2477 32Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M8.17504 11.2463C7.34692 11.2463 6.66198 11.9313 6.66198 12.7594V20.5957C6.66198 21.4238 7.34692 22.1087 8.17504 22.1087H10.3882C10.8247 22.1087 11.1786 22.4626 11.1786 22.8991C11.1786 23.3356 10.8247 23.6895 10.3882 23.6895H8.17504C6.47387 23.6895 5.08118 22.2968 5.08118 20.5957V12.7594C5.08118 11.0582 6.47387 9.66553 8.17504 9.66553H23.8476C25.5488 9.66553 26.9414 11.0582 26.9414 12.7594V20.5957C26.9414 22.2968 25.5488 23.6895 23.8476 23.6895H21.6345C21.1979 23.6895 20.8441 23.3356 20.8441 22.8991C20.8441 22.4626 21.1979 22.1087 21.6345 22.1087H23.8476C24.6757 22.1087 25.3606 21.4238 25.3606 20.5957V12.7594C25.3606 11.9313 24.6757 11.2463 23.8476 11.2463H8.17504Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M9.59778 4.99084C9.59778 4.55431 9.95165 4.20044 10.3882 4.20044H21.6345C22.071 4.20044 22.4249 4.55431 22.4249 4.99084V7.36205C22.4249 7.79858 22.071 8.15245 21.6345 8.15245C21.198 8.15245 20.8441 7.79858 20.8441 7.36205V5.78124H11.1786V7.36205C11.1786 7.79858 10.8247 8.15245 10.3882 8.15245C9.95165 8.15245 9.59778 7.79858 9.59778 7.36205V4.99084Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M9.59778 17.3209C9.59778 16.8844 9.95165 16.5305 10.3882 16.5305H21.6345C22.071 16.5305 22.4249 16.8844 22.4249 17.3209V27.0316C22.4249 27.4681 22.071 27.822 21.6345 27.822H10.3882C9.95165 27.822 9.59778 27.4681 9.59778 27.0316V17.3209ZM11.1786 18.1113V26.2412H20.8441V18.1113H11.1786Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M12.7819 20.6632C12.7819 20.2267 13.1357 19.8728 13.5723 19.8728H18.4276C18.8641 19.8728 19.218 20.2267 19.218 20.6632C19.218 21.0997 18.8641 21.4536 18.4276 21.4536H13.5723C13.1357 21.4536 12.7819 21.0997 12.7819 20.6632Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M12.7819 23.87C12.7819 23.4335 13.1357 23.0796 13.5723 23.0796H18.4276C18.8641 23.0796 19.218 23.4335 19.218 23.87C19.218 24.3065 18.8641 24.6604 18.4276 24.6604H13.5723C13.1357 24.6604 12.7819 24.3065 12.7819 23.87Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M22.6732 15.04C23.2469 15.04 23.712 14.5749 23.712 14.0012C23.712 13.4275 23.2469 12.9624 22.6732 12.9624C22.0995 12.9624 21.6344 13.4275 21.6344 14.0012C21.6344 14.5749 22.0995 15.04 22.6732 15.04Z" />
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_settings_notifications.xml b/res/drawable/ic_settings_notifications.xml
index bbac9de3580..e111d369dc5 100644
--- a/res/drawable/ic_settings_notifications.xml
+++ b/res/drawable/ic_settings_notifications.xml
@@ -1,25 +1,26 @@
-<!--
-    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.
--->
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24.0dp"
-        android:height="24.0dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0"
-        android:tint="@color/green_1">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+
+    <path
+        android:fillColor="#FF7301"
+        android:pathData="M25.2477 32H6.75229C3.02611 32 0 28.9739 0 25.2477V6.75229C0 3.02611 3.02611 0 6.75229 0H25.2477C28.9739 0 32 3.02611 32 6.75229V25.2477C32 28.9739 28.9739 32 25.2477 32Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M16.0113 27.0092C15.0854 27.0092 14.3176 26.2414 14.3176 25.3155H17.7051C17.7051 26.2414 16.9372 27.0092 16.0113 27.0092Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M13.5272 24.5251H18.4955V25.3155C18.4955 26.6779 17.3738 27.7996 16.0113 27.7996C14.6489 27.7996 13.5272 26.6779 13.5272 25.3155V24.5251ZM15.5814 26.1059C15.7102 26.1776 15.857 26.2188 16.0113 26.2188C16.1657 26.2188 16.3125 26.1776 16.4413 26.1059H15.5814Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M16.0113 5.78124C15.3699 5.78124 14.8596 6.30211 14.8596 6.93297C14.8596 7.3695 14.5057 7.72338 14.0692 7.72338C13.6327 7.72338 13.2788 7.3695 13.2788 6.93297C13.2788 5.44105 14.4849 4.20044 16.0113 4.20044C17.5033 4.20044 18.7439 5.40649 18.7439 6.93297C18.7439 7.3695 18.39 7.72338 17.9535 7.72338C17.5169 7.72338 17.1631 7.3695 17.1631 6.93297C17.1631 6.29149 16.6422 5.78124 16.0113 5.78124Z" />
     <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M12.0,22.0c1.1,0.0 2.0,-0.9 2.0,-2.0l-4.0,0.0c0.0,1.0 0.89,2.0 2.0,2.0zm6.0,-6.0l0.0,-5.0c0.0,-3.07 -1.64,-5.64 -4.5,-6.32L13.5,4.0c0.0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.0,0.67 -1.5,1.5l0.0,0.68C7.63,5.36 6.0,7.92 6.0,11.0l0.0,5.0l-2.0,2.0l0.0,1.0l16.0,0.0l0.0,-1.0l-2.0,-2.0z"/>
-</vector>
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M15.882 8.08488C19.5982 8.00746 22.6056 11.1187 22.6056 14.7918V18.4277C22.6056 19.1517 22.9419 19.8468 23.5392 20.308C23.5395 20.3082 23.5398 20.3084 23.54 20.3086L25.3006 21.6629C25.5689 21.8692 25.676 22.2235 25.567 22.5439C25.458 22.8643 25.1571 23.0798 24.8187 23.0798H7.22661C6.88817 23.0798 6.58728 22.8643 6.4783 22.5439C6.36932 22.2235 6.47644 21.8692 6.74469 21.6629L8.501 20.3119C9.08025 19.8497 9.41715 19.152 9.41715 18.4277V14.6789C9.41715 11.0856 12.2918 8.16181 15.8815 8.08489L15.882 8.08488ZM15.9151 9.66534C18.7026 9.60737 21.0248 11.9612 21.0248 14.7918V18.4277C21.0248 19.6132 21.5618 20.7404 22.497 21.499H9.54663C10.4597 20.7415 10.998 19.6149 10.998 18.4277V14.6789C10.998 11.9492 13.1816 9.72416 15.9149 9.66534" />
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_suggested_notifications.xml b/res/drawable/ic_suggested_notifications.xml
index 5a8f0e94342..e111d369dc5 100644
--- a/res/drawable/ic_suggested_notifications.xml
+++ b/res/drawable/ic_suggested_notifications.xml
@@ -1,24 +1,26 @@
-<!--
-    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.
--->
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24.0dp"
-    android:height="24.0dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+
+    <path
+        android:fillColor="#FF7301"
+        android:pathData="M25.2477 32H6.75229C3.02611 32 0 28.9739 0 25.2477V6.75229C0 3.02611 3.02611 0 6.75229 0H25.2477C28.9739 0 32 3.02611 32 6.75229V25.2477C32 28.9739 28.9739 32 25.2477 32Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M16.0113 27.0092C15.0854 27.0092 14.3176 26.2414 14.3176 25.3155H17.7051C17.7051 26.2414 16.9372 27.0092 16.0113 27.0092Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M13.5272 24.5251H18.4955V25.3155C18.4955 26.6779 17.3738 27.7996 16.0113 27.7996C14.6489 27.7996 13.5272 26.6779 13.5272 25.3155V24.5251ZM15.5814 26.1059C15.7102 26.1776 15.857 26.2188 16.0113 26.2188C16.1657 26.2188 16.3125 26.1776 16.4413 26.1059H15.5814Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M16.0113 5.78124C15.3699 5.78124 14.8596 6.30211 14.8596 6.93297C14.8596 7.3695 14.5057 7.72338 14.0692 7.72338C13.6327 7.72338 13.2788 7.3695 13.2788 6.93297C13.2788 5.44105 14.4849 4.20044 16.0113 4.20044C17.5033 4.20044 18.7439 5.40649 18.7439 6.93297C18.7439 7.3695 18.39 7.72338 17.9535 7.72338C17.5169 7.72338 17.1631 7.3695 17.1631 6.93297C17.1631 6.29149 16.6422 5.78124 16.0113 5.78124Z" />
     <path
-        android:fillColor="@color/suw_color_accent_light"
-        android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4a2,2 0,0 0,2 2zM18,16v-5c0,-3.07 -1.64,-5.64 -4.5,-6.32L13.5,4c0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.5,0.67 -1.5,1.5v0.68C7.63,5.36 6,7.92 6,11v5l-2.15,2.15a0.5,0.5 0,0 0,0.35 0.85h15.6c0.45,0 0.67,-0.54 0.35,-0.85L18,16z"/>
-</vector>
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M15.882 8.08488C19.5982 8.00746 22.6056 11.1187 22.6056 14.7918V18.4277C22.6056 19.1517 22.9419 19.8468 23.5392 20.308C23.5395 20.3082 23.5398 20.3084 23.54 20.3086L25.3006 21.6629C25.5689 21.8692 25.676 22.2235 25.567 22.5439C25.458 22.8643 25.1571 23.0798 24.8187 23.0798H7.22661C6.88817 23.0798 6.58728 22.8643 6.4783 22.5439C6.36932 22.2235 6.47644 21.8692 6.74469 21.6629L8.501 20.3119C9.08025 19.8497 9.41715 19.152 9.41715 18.4277V14.6789C9.41715 11.0856 12.2918 8.16181 15.8815 8.08489L15.882 8.08488ZM15.9151 9.66534C18.7026 9.60737 21.0248 11.9612 21.0248 14.7918V18.4277C21.0248 19.6132 21.5618 20.7404 22.497 21.499H9.54663C10.4597 20.7415 10.998 19.6149 10.998 18.4277V14.6789C10.998 11.9492 13.1816 9.72416 15.9149 9.66534" />
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_suggestion_fingerprint.xml b/res/drawable/ic_suggestion_fingerprint.xml
index bf5ee2effe7..048826b88d9 100644
--- a/res/drawable/ic_suggestion_fingerprint.xml
+++ b/res/drawable/ic_suggestion_fingerprint.xml
@@ -1,40 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-     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="32dp"
-        android:height="32dp"
-        android:tint="?android:attr/colorControlNormal"
-        android:viewportWidth="32.0"
-        android:viewportHeight="32.0">
+    android:width="32dp"
+    android:height="32dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+
+    <path
+        android:fillColor="#0088ED"
+        android:pathData="M25.2477 32H6.75229C3.02611 32 0 28.9739 0 25.2477V6.75229C0 3.02611 3.02611 0 6.75229 0H25.2477C28.9739 0 32 3.02611 32 6.75229V25.2477C32 28.9739 28.9739 32 25.2477 32Z" />
     <path
         android:fillColor="#ffffff"
-        android:pathData="M23.7,5.9c-0.1,0.0 -0.2,0.0 -0.3,-0.1C21.0,4.5 18.6,3.9 16.0,3.9c-2.5,0.0 -4.6,0.6 -6.9,1.9C8.8,6.0 8.3,5.9 8.1,5.5C7.9,5.2 8.0,4.7 8.4,4.5c2.5,-1.4 4.9,-2.1 7.7,-2.1c2.8,0.0 5.4,0.7 8.0,2.1c0.4,0.2 0.5,0.6 0.3,1.0C24.2,5.7 24.0,5.9 23.7,5.9z"/>
+        android:fillType="evenOdd"
+        android:pathData="M12.4679 15.2329C13.1843 14.2754 14.3147 13.6401 15.8757 13.6401C17.5339 13.6401 18.7194 14.3627 19.4704 15.3326C20.1987 16.2734 20.5052 17.4252 20.5052 18.3373C20.5052 18.9885 20.3879 19.6171 20.0304 20.0986C19.6403 20.6239 19.0646 20.844 18.4502 20.844C18.0136 20.844 17.6598 20.4902 17.6598 20.0536C17.6598 19.6171 18.0136 19.2632 18.4502 19.2632C18.6713 19.2632 18.7279 19.2011 18.7613 19.1562C18.8271 19.0674 18.9244 18.8379 18.9244 18.3373C18.9244 17.7364 18.7115 16.9347 18.2204 16.3004C17.7519 15.6952 17.0178 15.2209 15.8757 15.2209C14.7946 15.2209 14.1408 15.6357 13.7337 16.1799C13.3018 16.7573 13.098 17.5521 13.098 18.3373C13.098 20.7474 13.7796 22.6033 14.9288 23.7928C15.9886 24.8711 17.428 25.4735 19.1502 25.4735C19.5868 25.4735 19.9406 25.8274 19.9406 26.2639C19.9406 26.7005 19.5868 27.0543 19.1502 27.0543C17.0345 27.0543 15.1776 26.3026 13.7987 24.8981L13.7966 24.896L13.7945 24.8939C12.2801 23.3282 11.5172 21.0296 11.5172 18.3373C11.5172 17.3159 11.7764 16.1573 12.4679 15.2329Z" />
     <path
         android:fillColor="#ffffff"
-        android:pathData="M5.3,13.2c-0.1,0.0 -0.3,0.0 -0.4,-0.1c-0.3,-0.2 -0.4,-0.7 -0.2,-1.0c1.3,-1.9 2.9,-3.4 4.9,-4.5c4.1,-2.2 9.3,-2.2 13.4,0.0c1.9,1.1 3.6,2.5 4.9,4.4c0.2,0.3 0.1,0.8 -0.2,1.0c-0.3,0.2 -0.8,0.1 -1.0,-0.2c-1.2,-1.7 -2.6,-3.0 -4.3,-4.0c-3.7,-2.0 -8.3,-2.0 -12.0,0.0c-1.7,0.9 -3.2,2.3 -4.3,4.0C5.7,13.1 5.5,13.2 5.3,13.2z"/>
+        android:fillType="evenOdd"
+        android:pathData="M11.8278 14.0152C10.852 15.042 10.2527 16.5272 10.2527 18.3373C10.2527 22.0095 11.4916 24.5396 13.2452 26.1301C13.5686 26.4234 13.593 26.9233 13.2997 27.2466C13.0064 27.5699 12.5066 27.5943 12.1832 27.3011C10.0526 25.3686 8.67188 22.3885 8.67188 18.3373C8.67188 16.1728 9.39366 14.2819 10.6818 12.9262C11.9727 11.5677 13.7881 10.7946 15.8758 10.7946C20.5646 10.7946 23.3508 14.6594 23.3508 18.3373C23.3508 19.8609 22.8897 21.2019 22.0156 22.172C21.1349 23.1494 19.888 23.6895 18.4503 23.6895C16.6212 23.6895 15.3816 22.1942 14.931 20.8394C14.6997 20.1436 14.627 19.361 14.8497 18.6732C15.088 17.9373 15.6592 17.3536 16.5527 17.1974C16.9828 17.1223 17.3923 17.4099 17.4674 17.8399C17.5426 18.2699 17.2549 18.6795 16.8249 18.7546C16.5555 18.8017 16.4266 18.9349 16.3536 19.1602C16.2651 19.4336 16.2701 19.8563 16.4311 20.3406C16.7653 21.3457 17.5694 22.1087 18.4503 22.1087C19.4741 22.1087 20.2823 21.7341 20.8412 21.1138C21.4068 20.4862 21.77 19.5463 21.77 18.3373C21.77 15.3759 19.5428 12.3754 15.8758 12.3754C14.1922 12.3754 12.8008 12.9912 11.8278 14.0152Z" />
     <path
         android:fillColor="#ffffff"
-        android:pathData="M13.3,29.6c-0.2,0.0 -0.4,-0.1 -0.5,-0.2c-1.1,-1.2 -1.7,-2.0 -2.6,-3.6c-0.9,-1.7 -1.4,-3.7 -1.4,-5.9c0.0,-4.1 3.3,-7.4 7.4,-7.4c4.1,0.0 7.4,3.3 7.4,7.4c0.0,0.4 -0.3,0.7 -0.7,0.7s-0.7,-0.3 -0.7,-0.7c0.0,-3.3 -2.7,-5.9 -5.9,-5.9c-3.3,0.0 -5.9,2.7 -5.9,5.9c0.0,2.0 0.4,3.8 1.2,5.2c0.8,1.6 1.4,2.2 2.4,3.3c0.3,0.3 0.3,0.8 0.0,1.0C13.7,29.5 13.5,29.6 13.3,29.6z"/>
+        android:fillType="evenOdd"
+        android:pathData="M6.4374 16.5546C6.87318 16.5803 7.20566 16.9543 7.18003 17.3901C7.15721 17.7779 7.13622 18.1386 7.13622 18.4954C7.13622 19.8531 7.24571 21.0907 7.46126 22.2331C7.5422 22.6621 7.26007 23.0754 6.83111 23.1564C6.40215 23.2373 5.9888 22.9552 5.90787 22.5262C5.67176 21.2748 5.55542 19.938 5.55542 18.4954C5.55542 18.0882 5.57915 17.6848 5.60133 17.3078L5.60195 17.2973C5.62758 16.8615 6.00163 16.529 6.4374 16.5546Z" />
     <path
         android:fillColor="#ffffff"
-        android:pathData="M22.6,27.1c-1.6,0.0 -2.9,-0.4 -4.1,-1.2c-1.9,-1.4 -3.1,-3.6 -3.1,-6.0c0.0,-0.4 0.3,-0.7 0.7,-0.7s0.7,0.3 0.7,0.7c0.0,1.9 0.9,3.7 2.5,4.8c0.9,0.6 1.9,1.0 3.2,1.0c0.3,0.0 0.8,0.0 1.3,-0.1c0.4,-0.1 0.8,0.2 0.8,0.6c0.1,0.4 -0.2,0.8 -0.6,0.8C23.4,27.1 22.8,27.1 22.6,27.1z"/>
+        android:fillType="evenOdd"
+        android:pathData="M15.808 9.37191C12.1607 9.37191 9.35645 11.2721 8.04075 14.2736C7.8655 14.6734 7.39932 14.8554 6.99952 14.6802C6.59972 14.5049 6.41769 14.0387 6.59294 13.6389C8.16786 10.0461 11.5513 7.79111 15.808 7.79111C20.3525 7.79111 23.839 10.4454 25.2717 13.7296C26.3844 16.2631 26.422 17.7068 26.422 18.518C26.422 20.6581 25.7884 22.5321 24.5694 23.8807C24.2767 24.2046 23.7769 24.2298 23.453 23.9371C23.1292 23.6444 23.104 23.1446 23.3967 22.8207C24.3005 21.8207 24.8412 20.3525 24.8412 18.518C24.8412 17.8839 24.8337 16.6632 23.8239 14.3644L23.8231 14.3625C22.6359 11.6402 19.7091 9.37191 15.808 9.37191Z" />
     <path
         android:fillColor="#ffffff"
-        android:pathData="M20.0,29.9c-0.1,0.0 -0.1,0.0 -0.2,0.0c-2.1,-0.6 -3.4,-1.4 -4.8,-2.9c-1.8,-1.9 -2.8,-4.4 -2.8,-7.1c0.0,-2.2 1.8,-4.1 4.1,-4.1c2.2,0.0 4.1,1.8 4.1,4.1c0.0,1.4 1.2,2.6 2.6,2.6c1.4,0.0 2.6,-1.2 2.6,-2.6c0.0,-5.1 -4.2,-9.3 -9.3,-9.3c-3.6,0.0 -6.9,2.1 -8.4,5.4C7.3,17.1 7.0,18.4 7.0,19.8c0.0,1.1 0.1,2.7 0.9,4.9c0.1,0.4 -0.1,0.8 -0.4,0.9c-0.4,0.1 -0.8,-0.1 -0.9,-0.4c-0.6,-1.8 -0.9,-3.6 -0.9,-5.4c0.0,-1.6 0.3,-3.1 0.9,-4.4c1.7,-3.8 5.6,-6.3 9.8,-6.3c5.9,0.0 10.7,4.8 10.7,10.7c0.0,2.2 -1.8,4.1 -4.1,4.1s-4.0,-1.8 -4.0,-4.1c0.0,-1.4 -1.2,-2.6 -2.6,-2.6c-1.4,0.0 -2.6,1.2 -2.6,2.6c0.0,2.3 0.9,4.5 2.4,6.1c1.2,1.3 2.4,2.0 4.2,2.5c0.4,0.1 0.6,0.5 0.5,0.9C20.6,29.7 20.3,29.9 20.0,29.9z"/>
-</vector>
-
+        android:fillType="evenOdd"
+        android:pathData="M15.8081 6.0748C13.9042 6.0748 12.2161 6.53994 10.858 7.34243C10.4822 7.56451 9.99753 7.43987 9.77545 7.06406C9.55338 6.68824 9.67801 6.20355 10.0538 5.98148C11.6767 5.0225 13.647 4.494 15.8081 4.494C18.1926 4.494 20.2599 5.14578 21.9465 6.22135C22.3146 6.45606 22.4227 6.9447 22.188 7.31276C21.9533 7.68082 21.4647 7.78892 21.0966 7.55422C19.6668 6.64249 17.895 6.0748 15.8081 6.0748Z" />
+</vector>
\ No newline at end of file
-- 
GitLab


From e64af4eb3d9c918ca68e11d528b7cb3b74c0d75f Mon Sep 17 00:00:00 2001
From: Amit Kumar <mr.doc10jl96@gmail.com>
Date: Thu, 23 Apr 2020 11:52:38 +0530
Subject: [PATCH 6/6] Update translate icon

Change-Id: Id29148de29083ce3b6380f7e941f9ac85e54b92b
---
 res/drawable/ic_translate_24dp.xml | 39 ++++++++++++------------------
 1 file changed, 15 insertions(+), 24 deletions(-)

diff --git a/res/drawable/ic_translate_24dp.xml b/res/drawable/ic_translate_24dp.xml
index 4df035c39be..962bfe0a9d5 100644
--- a/res/drawable/ic_translate_24dp.xml
+++ b/res/drawable/ic_translate_24dp.xml
@@ -1,26 +1,17 @@
-<!--
-  Copyright (C) 2017 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.
-  -->
-
+<?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.0"
-        android:viewportHeight="24.0"
-        android:tint="?android:attr/colorControlNormal">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+
+    <path
+        android:fillColor="#0088ED"
+        android:pathData="M25.2477 32H6.75229C3.02611 32 0 28.9739 0 25.2477V6.75229C0 3.02611 3.02611 0 6.75229 0H25.2477C28.9739 0 32 3.02611 32 6.75229V25.2477C32 28.9739 28.9739 32 25.2477 32Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M20.0311 7.13622C23.3056 7.13622 25.9704 9.82359 25.9704 13.0755V17.2534C25.9704 20.5279 23.283 23.1927 20.0311 23.1927H14.0692L11.0656 26.2188V23.1249C8.2202 22.6733 6.02966 20.2117 6.02966 17.2534V13.0981C6.02966 9.82359 8.71702 7.15881 11.969 7.15881H20.0311V7.13622ZM20.0311 5.55542H11.969C7.81371 5.55542 4.44885 8.94286 4.44885 13.0755V17.2534C4.44885 20.4601 6.54906 23.3056 9.48484 24.3444V26.1962C9.48484 26.8285 9.86875 27.4157 10.4559 27.6641C10.6592 27.7544 10.8624 27.777 11.0656 27.777C11.4721 27.777 11.8786 27.6189 12.1948 27.3028L14.7467 24.7509H20.0537C24.2089 24.7509 27.5738 21.3635 27.5738 17.2308V13.0981C27.5738 8.94286 24.1863 5.55542 20.0311 5.55542Z" />
     <path
-        android:fillColor="#FF000000"
-        android:pathData="M12.87,15.07l-2.54,-2.51 0.03,-0.03c1.74,-1.94 2.98,-4.17 3.71,-6.53L17,6L17,4h-7L10,2L8,2v2L1,4v1.99h11.17C11.5,7.92 10.44,9.75 9,11.35 8.07,10.32 7.3,9.19 6.69,8h-2c0.73,1.63 1.73,3.17 2.98,4.56l-5.09,5.02L4,19l5,-5 3.11,3.11 0.76,-2.04zM18.5,10h-2L12,22h2l1.12,-3h4.75L21,22h2l-4.5,-12zM15.88,17l1.62,-4.33L19.12,17h-3.24z"/>
-</vector>
+        android:fillColor="#ffffff"
+        android:pathData="M18.2097 17.6706L17.7826 16.5477H14.1453L13.7181 17.695C13.5513 18.1425 13.4089 18.4456 13.291 18.6043C13.173 18.7589 12.9797 18.8362 12.7112 18.8362C12.4834 18.8362 12.282 18.7528 12.107 18.586C11.9321 18.4192 11.8446 18.23 11.8446 18.0184C11.8446 17.8964 11.8649 17.7703 11.9056 17.6401C11.9463 17.5099 12.0134 17.3288 12.107 17.0969L14.3955 11.2871C14.4606 11.1203 14.5379 10.921 14.6274 10.6891C14.721 10.4531 14.8187 10.2578 14.9204 10.1032C15.0262 9.9486 15.1625 9.82451 15.3293 9.73094C15.5001 9.63329 15.7097 9.58447 15.9578 9.58447C16.2101 9.58447 16.4196 9.63329 16.5864 9.73094C16.7573 9.82451 16.8936 9.94657 16.9953 10.0971C17.1011 10.2476 17.1886 10.4104 17.2577 10.5853C17.331 10.7562 17.4225 10.9861 17.5323 11.2749L19.8697 17.0481C20.0528 17.4875 20.1443 17.8069 20.1443 18.0062C20.1443 18.2137 20.0568 18.4049 19.8819 18.5799C19.711 18.7508 19.5035 18.8362 19.2594 18.8362C19.117 18.8362 18.995 18.8098 18.8933 18.7569C18.7915 18.708 18.7061 18.6409 18.6369 18.5555C18.5678 18.466 18.4925 18.3317 18.4111 18.1527C18.3338 17.9696 18.2667 17.8089 18.2097 17.6706ZM14.6213 15.1868H17.2943L15.9456 11.4946L14.6213 15.1868Z" />
+</vector>
\ No newline at end of file
-- 
GitLab