From f0f5374a57aee7016162ca444183a31c767b3f4b Mon Sep 17 00:00:00 2001
From: Tiger Oakes <contact@tigeroakes.com>
Date: Tue, 11 Jun 2019 20:18:18 -0700
Subject: [PATCH] Minify vector drawables

---
 .../main/res/drawable/ic_accessibility.xml    | 15 +++--
 .../main/res/drawable/ic_account_warning.xml  | 15 +++--
 app/src/main/res/drawable/ic_alert.xml        |  4 +-
 app/src/main/res/drawable/ic_camera.xml       |  5 +-
 app/src/main/res/drawable/ic_chevron_down.xml |  4 +-
 app/src/main/res/drawable/ic_chevron_up.xml   |  4 +-
 app/src/main/res/drawable/ic_close.xml        |  2 +-
 app/src/main/res/drawable/ic_customize.xml    |  2 +-
 .../main/res/drawable/ic_data_collection.xml  |  2 +-
 app/src/main/res/drawable/ic_delete.xml       |  2 +-
 app/src/main/res/drawable/ic_download.xml     |  3 +-
 app/src/main/res/drawable/ic_edit.xml         |  5 +-
 app/src/main/res/drawable/ic_energy.xml       |  2 +-
 app/src/main/res/drawable/ic_folder_icon.xml  |  2 +-
 app/src/main/res/drawable/ic_formfill.xml     |  2 +-
 app/src/main/res/drawable/ic_help.xml         |  2 +-
 app/src/main/res/drawable/ic_history.xml      |  2 +-
 app/src/main/res/drawable/ic_hollow_share.xml | 12 ++--
 app/src/main/res/drawable/ic_home.xml         |  2 +-
 app/src/main/res/drawable/ic_info.xml         |  2 +-
 app/src/main/res/drawable/ic_internet.xml     |  2 +-
 app/src/main/res/drawable/ic_language.xml     |  2 +-
 app/src/main/res/drawable/ic_link.xml         |  2 +-
 app/src/main/res/drawable/ic_login.xml        |  2 +-
 app/src/main/res/drawable/ic_microphone.xml   |  2 +-
 app/src/main/res/drawable/ic_notification.xml |  2 +-
 .../ic_onboarding_avatar_anonymous.xml        | 16 +++---
 .../drawable/ic_onboarding_privacy_notice.xml |  2 +-
 .../ic_onboarding_private_browsing.xml        |  2 +-
 .../ic_onboarding_tracking_protection.xml     | 26 +++++----
 app/src/main/res/drawable/ic_permission.xml   |  4 +-
 .../main/res/drawable/ic_private_browsing.xml |  2 +-
 app/src/main/res/drawable/ic_qr.xml           |  2 +-
 app/src/main/res/drawable/ic_readermode.xml   |  2 +-
 .../main/res/drawable/ic_report_issues.xml    |  1 +
 app/src/main/res/drawable/ic_screenshots.xml  |  2 +-
 app/src/main/res/drawable/ic_search.xml       |  2 +-
 app/src/main/res/drawable/ic_send.xml         |  2 +-
 .../main/res/drawable/ic_session_restore.xml  | 13 -----
 ...ession_thumbnail_placeholder_greyscale.xml |  1 +
 app/src/main/res/drawable/ic_settings.xml     |  2 +-
 app/src/main/res/drawable/ic_shortcuts.xml    |  2 +-
 .../res/drawable/ic_tab_circle_background.xml |  2 +-
 .../main/res/drawable/ic_tab_collection.xml   |  1 -
 app/src/main/res/drawable/ic_tabs.xml         |  2 +-
 .../res/drawable/ic_tracking_protection.xml   |  2 +-
 ...brary_icon_downloads_circle_background.xml |  2 +-
 ...library_icon_history_circle_background.xml |  2 +-
 ...ry_icon_reading_list_circle_background.xml |  2 +-
 ...ary_icon_screenshots_circle_background.xml |  2 +-
 ...ibrary_icon_sessions_circle_background.xml | 29 ----------
 .../res/drawable/mozac_ui_tabcounter_box.xml  | 13 -----
 .../res/drawable/private_browsing_button.xml  |  2 +-
 .../res/drawable/quick_action_icon_close.xml  |  2 +-
 .../res/drawable/quick_action_icon_read.xml   | 20 +++----
 ...ick_action_icon_read_with_notification.xml | 55 ++++++-------------
 .../res/drawable/quick_action_icon_share.xml  | 48 ++++++++--------
 .../res/layout/mozac_ui_tabcounter_layout.xml |  2 +-
 58 files changed, 145 insertions(+), 223 deletions(-)
 delete mode 100644 app/src/main/res/drawable/ic_session_restore.xml
 delete mode 100644 app/src/main/res/drawable/library_icon_sessions_circle_background.xml
 delete mode 100644 app/src/main/res/drawable/mozac_ui_tabcounter_box.xml

diff --git a/app/src/main/res/drawable/ic_accessibility.xml b/app/src/main/res/drawable/ic_accessibility.xml
index b8598ae0d..1c9bbe248 100644
--- a/app/src/main/res/drawable/ic_accessibility.xml
+++ b/app/src/main/res/drawable/ic_accessibility.xml
@@ -1,13 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="m12,7c1.3807,0 2.5,-1.1193 2.5,-2.5s-1.1193,-2.5 -2.5,-2.5 -2.5,1.1193 -2.5,2.5 1.1193,2.5 2.5,2.5zM4,9c0,-0.5523 0.4477,-1 1,-1h14c0.5523,0 1,0.4477 1,1s-0.4477,1 -1,1h-4v6,5c0,0.5523 -0.4477,1 -1,1s-1,-0.4477 -1,-1v-5h-2v5c0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1v-5,-6h-4c-0.5523,0 -1,-0.4477 -1,-1z"
-      android:fillColor="?primaryText" />
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24"
+        android:viewportHeight="24">
+  <path android:pathData="M12 7a2.5 2.5 0 1 0 0-5 2.5 2.5 0 0 0 0 5zM4 9c0-0.6 0.4-1 1-1h14a1 1 0 0 1 0 2h-4v11a1 1 0 0 1-2 0v-5h-2v5a1 1 0 0 1-2 0V10H5a1 1 0 0 1-1-1z"
+        android:fillColor="?primaryText" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_account_warning.xml b/app/src/main/res/drawable/ic_account_warning.xml
index be0f92d29..2dda9b20a 100644
--- a/app/src/main/res/drawable/ic_account_warning.xml
+++ b/app/src/main/res/drawable/ic_account_warning.xml
@@ -1,13 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M15.853,11.045c0.255,-0.545 0.397,-1.153 0.397,-1.795C16.25,6.903 14.347,5 12,5S7.75,6.903 7.75,9.25 9.653,13.5 12,13.5c1.418,0 2.674,-0.694 3.446,-1.762l-1.24,2.48c-0.71,0.296 -1.453,0.582 -2.206,0.582 -2.132,0 -4.185,-2.3 -5.666,-0.59 -0.42,0.484 -0.454,1.19 -0.094,1.718 1.224,1.801 3.25,3.01 5.576,3.07l-0.531,1.063c-0.296,0.597 -0.36,1.271 -0.197,1.898C5.992,21.499 2,17.215 2,12 2,6.477 6.477,2 12,2s10,4.477 10,10c0,0.735 -0.08,1.452 -0.232,2.142l-1.331,-2.635C19.98,10.587 19.034,10 17.999,10c-0.848,0 -1.635,0.393 -2.146,1.045zM23.864,20.508c0.273,0.549 0.234,1.201 -0.103,1.714 -0.336,0.512 -0.92,0.808 -1.532,0.776h-8.55c-0.588,-0.016 -1.128,-0.33 -1.432,-0.834 -0.303,-0.505 -0.329,-1.129 -0.068,-1.656l4.275,-8.55c0.292,-0.587 0.89,-0.958 1.545,-0.958 0.655,0 1.254,0.371 1.545,0.958l4.32,8.55zM17.189,14.838v2.595c0.057,0.432 0.426,0.756 0.863,0.756 0.436,0 0.805,-0.324 0.862,-0.756v-2.595c0.045,-0.336 -0.11,-0.666 -0.395,-0.848 -0.285,-0.182 -0.65,-0.182 -0.935,0 -0.285,0.182 -0.44,0.512 -0.395,0.848zM19.064,20.013c0,-0.413 -0.248,-0.785 -0.63,-0.943 -0.38,-0.157 -0.82,-0.07 -1.111,0.222 -0.292,0.291 -0.379,0.73 -0.221,1.111s0.53,0.63 0.942,0.63c0.564,0 1.02,-0.457 1.02,-1.02z"
-      android:fillColor="@color/sync_error_text_color"/>
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24"
+        android:viewportHeight="24">
+  <path android:pathData="M15.85 11a4.25 4.25 0 1 0-0.4 0.7l-1.24 2.5a5.9 5.9 0 0 1-2.21 0.6c-2.13 0-4.2-2.3-5.7-0.6a1.4 1.4 0 0 0-0.1 1.7A6.95 6.95 0 0 0 11.82 19l-0.54 1.06c-0.3 0.6-0.35 1.27-0.2 1.9a10 10 0 1 1 10.7-7.82l-1.3-2.6a2.72 2.72 0 0 0-4.59-0.5zm8.01 9.47A1.72 1.72 0 0 1 22.23 23h-8.55a1.73 1.73 0 0 1-1.5-2.5l4.27-8.5a1.7 1.7 0 0 1 3.1 0l4.31 8.55zm-6.7-5.7v2.6a0.87 0.87 0 0 0 1.7 0v-2.6a0.87 0.87 0 1 0-1.72 0zM19.1 20a1 1 0 1 0-2.04 0 1 1 0 0 0 2.04 0z"
+        android:fillColor="@color/sync_error_text_color"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_alert.xml b/app/src/main/res/drawable/ic_alert.xml
index 345ec9564..1546d32e6 100644
--- a/app/src/main/res/drawable/ic_alert.xml
+++ b/app/src/main/res/drawable/ic_alert.xml
@@ -1,13 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:pathData="M12,2C6.477,2 2,6.477 2,12s4.477,10 10,10 10,-4.477 10,-10c-0.006,-5.52 -4.48,-9.994 -10,-10zM12,20c-4.418,0 -8,-3.582 -8,-8s3.582,-8 8,-8 8,3.582 8,8c-0.005,4.416 -3.584,7.995 -8,8zM12,13c0.552,0 1,-0.448 1,-1L13,8c0,-0.552 -0.448,-1 -1,-1s-1,0.448 -1,1v4c0,0.552 0.448,1 1,1zM12,17c0.552,0 1,-0.448 1,-1s-0.448,-1 -1,-1 -1,0.448 -1,1 0.448,1 1,1z"
+      android:pathData="M12 2a10 10 0 1 0 0 20 10 10 0 0 0 0-20zm0 18a8 8 0 1 1 0-16 8 8 0 0 1 0 16zm0-7c0.6 0 1-0.4 1-1V8a1 1 0 0 0-2 0v4c0 0.6 0.4 1 1 1zm0 4a1 1 0 1 0 0-2 1 1 0 0 0 0 2z"
       android:fillColor="@color/sync_error_text_color"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml
index 7a62f37de..e21aa8435 100644
--- a/app/src/main/res/drawable/ic_camera.xml
+++ b/app/src/main/res/drawable/ic_camera.xml
@@ -7,7 +7,6 @@
         android:height="24dp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
-    <path
-            android:fillColor="?primaryText"
-            android:pathData="M17,10.5V7c0,-0.55 -0.45,-1 -1,-1H4c-0.55,0 -1,0.45 -1,1v10c0,0.55 0.45,1 1,1h12c0.55,0 1,-0.45 1,-1v-3.5l4,4v-11l-4,4z"/>
+    <path android:fillColor="?primaryText"
+          android:pathData="M17,10.5V7c0,-0.55 -0.45,-1 -1,-1H4c-0.55,0 -1,0.45 -1,1v10c0,0.55 0.45,1 1,1h12c0.55,0 1,-0.45 1,-1v-3.5l4,4v-11l-4,4z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_chevron_down.xml b/app/src/main/res/drawable/ic_chevron_down.xml
index 25492d45d..aef6a00b1 100644
--- a/app/src/main/res/drawable/ic_chevron_down.xml
+++ b/app/src/main/res/drawable/ic_chevron_down.xml
@@ -1,12 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="10dp"
         android:height="6dp"
         android:viewportWidth="10"
         android:viewportHeight="6">
     <path android:fillColor="?primaryText"
-        android:pathData="M5,5.6667C4.8232,5.6666 4.6537,5.5964 4.5287,5.4713L0.5287,1.4713C0.276,1.2097 0.2796,0.7939 0.5368,0.5368C0.7939,0.2796 1.2097,0.276 1.4713,0.5287L5,4.0573L8.5287,0.5287C8.7903,0.276 9.2061,0.2796 9.4632,0.5368C9.7204,0.7939 9.724,1.2097 9.4713,1.4713L5.4713,5.4713C5.3463,5.5964 5.1768,5.6666 5,5.6667Z"/>
+          android:pathData="M5 5.67a0.67 0.67 0 0 1-0.47-0.2l-4-4a0.67 0.67 0 0 1 0.94-0.94L5 4.06 8.53 0.53a0.67 0.67 0 0 1 0.94 0.94l-4 4c-0.12 0.13-0.3 0.2-0.47 0.2z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_chevron_up.xml b/app/src/main/res/drawable/ic_chevron_up.xml
index 736394d65..9148fa55d 100644
--- a/app/src/main/res/drawable/ic_chevron_up.xml
+++ b/app/src/main/res/drawable/ic_chevron_up.xml
@@ -1,12 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="10dp"
         android:height="6dp"
         android:viewportWidth="10"
         android:viewportHeight="6">
     <path android:fillColor="?primaryText"
-        android:pathData="M5,0.3333C4.8232,0.3334 4.6537,0.4036 4.5287,0.5287L0.5287,4.5287C0.276,4.7903 0.2796,5.2061 0.5368,5.4632C0.7939,5.7204 1.2097,5.724 1.4713,5.4713L5,1.9427L8.5287,5.4713C8.7903,5.724 9.2061,5.7204 9.4632,5.4632C9.7204,5.2061 9.724,4.7903 9.4713,4.5287L5.4713,0.5287C5.3463,0.4036 5.1768,0.3334 5,0.3333Z"/>
+          android:pathData="M5 0.33a0.67 0.67 0 0 0-0.47 0.2l-4 4a0.67 0.67 0 0 0 0.94 0.94L5 1.94l3.53 3.53a0.67 0.67 0 0 0 0.94-0.94l-4-4A0.67 0.67 0 0 0 5 0.33z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_close.xml b/app/src/main/res/drawable/ic_close.xml
index 0e5a5561c..614f3204a 100644
--- a/app/src/main/res/drawable/ic_close.xml
+++ b/app/src/main/res/drawable/ic_close.xml
@@ -8,6 +8,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:pathData="M13.3588,11.981L17.7411,7.5987C18.0934,7.2259 18.0851,6.6403 17.7224,6.2776C17.3597,5.9149 16.7741,5.9066 16.4013,6.2589L12.019,10.6412L7.6367,6.2589C7.2638,5.9066 6.6783,5.9149 6.3156,6.2776C5.9529,6.6403 5.9446,7.2259 6.2969,7.5987L10.6792,11.981L6.2969,16.3633C6.0461,16.6002 5.9439,16.9547 6.03,17.2888C6.1162,17.6229 6.3771,17.8838 6.7112,17.97C7.0453,18.0561 7.3998,17.9539 7.6367,17.7031L12.019,13.3208L16.4013,17.7031C16.7741,18.0554 17.3597,18.0471 17.7224,17.6844C18.0851,17.3217 18.0934,16.7362 17.7411,16.3633L13.3588,11.981Z"
+      android:pathData="M13.36 11.98l4.38-4.38a0.95 0.95 0 0 0-1.34-1.34l-4.38 4.38-4.38-4.38A0.95 0.95 0 0 0 6.3 7.6l4.38 4.38-4.38 4.38a0.95 0.95 0 1 0 1.34 1.34l4.38-4.38 4.38 4.38a0.95 0.95 0 0 0 1.34-1.34l-4.38-4.38z"
       android:fillColor="?primaryText" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_customize.xml b/app/src/main/res/drawable/ic_customize.xml
index dc4b5deb5..6389021b8 100644
--- a/app/src/main/res/drawable/ic_customize.xml
+++ b/app/src/main/res/drawable/ic_customize.xml
@@ -9,5 +9,5 @@
     android:viewportHeight="24">
     <path
         android:fillColor="?primaryText"
-        android:pathData="M21.568,3.557C21.9357,3.9222 21.9558,4.5105 21.614,4.9L12.864,14.935C12.6852,15.1396 12.4296,15.2609 12.158,15.27L12.125,15.27C11.8649,15.2698 11.6156,15.1661 11.432,14.982L10.143,13.693C9.9508,13.5011 9.8468,13.238 9.8559,12.9666C9.865,12.6951 9.9863,12.4396 10.191,12.261L20.23,3.511C20.6191,3.1733 21.203,3.1934 21.568,3.557ZM7.125,15.5C8.1561,15.5002 9.0805,16.1355 9.4505,17.0979C9.8204,18.0603 9.5595,19.1512 8.794,19.842C8.787,19.849 8.786,19.858 8.778,19.865C7.528,21.115 5.247,21.745 2.747,21.745C2.4018,21.745 2.122,21.4652 2.122,21.12C2.1242,20.8914 2.2522,20.6826 2.455,20.577L2.485,20.561C2.495,20.557 2.504,20.546 2.515,20.546C3.833,19.968 4.263,18.747 4.715,17.331C4.719,17.318 4.731,17.312 4.737,17.3C5.0446,16.236 6.0174,15.5027 7.125,15.5Z" />
+        android:pathData="M21.6 3.6c0.4 0.4 0.4 1 0.05 1.343l-8.75 10.035a1 1 0 0 1-0.7 0.4h-0c-0.3 0-0.5-0.1-0.7-0.3l-1.3-1.3a1 1 0 0 1-0.3-0.7 1 1 0 0 1 0.3-0.7l10-8.75a1 1 0 0 1 1.3 0zM7.1 15.5c1 0 2 0.6 2.3 1.6 0.4 1 0 2-0.7 2.7-0 0-0 0-0 0-1.25 1.25-3.5 2-6 1.9-0.3 0-0.625-0.3-0.625-0.625 0-0.2 0.1-0.4 0.3-0.54l 0 0c0 0 0-0 0 0 1.3-0.6 1.7-1.8 2.2-3.2 0-0 0-0 0-0a2.5 2.5 0 0 1 2.4-1.8z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_data_collection.xml b/app/src/main/res/drawable/ic_data_collection.xml
index ee5ba829c..e1afddef9 100644
--- a/app/src/main/res/drawable/ic_data_collection.xml
+++ b/app/src/main/res/drawable/ic_data_collection.xml
@@ -9,5 +9,5 @@
     android:viewportHeight="24">
     <path
         android:fillColor="?primaryText"
-        android:pathData="M22,6a2,2 0,0 1,-2.07 1.999l-3.164,5.062a2,2 0,1 1,-3.762 0.81l-3.117,-2.078A1.992,1.992 0,0 1,8.93 12l-3.164,5.06A2,2 0,1 1,4.07 16l3.164,-5.062a2,2 0,1 1,3.762 -0.81l3.117,2.078A1.992,1.992 0,0 1,15.07 12l3.164,-5.062A2,2 0,1 1,22 6z" />
+        android:pathData="M22,6a2,2 0,0 1,-2.07 2l-3.2,5a2,2 0,1 1,-3.8 0.8l-3.2,-2.1A2,2 0,0 1,8.9 12l-3.2,5A2,2 0,1 1,4.07 16l3.164,-5.1a2,2 0,1 1,3.8 -0.8l3.2,2.1A2,2 0,0 1,15.1 12l3.2,-5A2,2 0,1 1,22 6z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_delete.xml b/app/src/main/res/drawable/ic_delete.xml
index 0458e46cb..c8f283867 100644
--- a/app/src/main/res/drawable/ic_delete.xml
+++ b/app/src/main/res/drawable/ic_delete.xml
@@ -8,6 +8,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:pathData="M12.531,17.5009C12.2549,17.5009 12.031,17.2771 12.031,17.0009L12,9.0009C12,8.7248 12.2239,8.5009 12.5,8.5009C12.7761,8.5009 13,8.7248 13,9.0009L13.031,17.0009C13.031,17.2771 12.8071,17.5009 12.531,17.5009ZM15,17.5009C14.7239,17.5009 14.5,17.2771 14.5,17.0009L14.5,9.0009C14.5,8.7248 14.7239,8.5009 15,8.5009C15.2761,8.5009 15.5,8.7248 15.5,9.0009L15.5,17.0009C15.5,17.2771 15.2761,17.5009 15,17.5009ZM10,17.5009C9.7239,17.5009 9.5,17.2771 9.5,17.0009L9.5,9.0009C9.5,8.7248 9.7239,8.5009 10,8.5009C10.2761,8.5009 10.5,8.7248 10.5,9.0009L10.5,17.0009C10.5,17.2771 10.2761,17.5009 10,17.5009ZM19,4.0009L15.316,4.0009C14.8986,2.8028 13.7688,2 12.5,2C11.2312,2 10.1014,2.8028 9.684,4.0009L6,4.0009C5.4477,4.0009 5,4.4487 5,5.0009C5,5.5532 5.4477,6.0009 6,6.0009L6,19.0009C6,20.6578 7.3431,22.0009 9,22.0009L16,22.0009C17.6569,22.0009 19,20.6578 19,19.0009L19,6.0009C19.5523,6.0009 20,5.5532 20,5.0009C20,4.4487 19.5523,4.0009 19,4.0009ZM12.5,3.0009C13.2113,3.0031 13.8676,3.3842 14.222,4.0009L10.778,4.0009C11.1324,3.3842 11.7887,3.0031 12.5,3.0009L12.5,3.0009ZM17,19.0009C17,19.5532 16.5523,20.0009 16,20.0009L9,20.0009C8.4477,20.0009 8,19.5532 8,19.0009L8,6.0009L17,6.0009L17,19.0009Z"
+      android:pathData="M12.5 17.5a0.5 0.5 0 0 1-0.5-0.5V9a0.5 0.5 0 0 1 1 0v8c0 0.3-0.2 0.5-0.5 0.5zm2.5 0a0.5 0.5 0 0 1-0.5-0.5V9a0.5 0.5 0 0 1 1 0v8c0 0.3-0.2 0.5-0.5 0.5zm-5 0a0.5 0.5 0 0 1-0.5-0.5V9a0.5 0.5 0 0 1 1 0v8c0 0.3-0.2 0.5-0.5 0.5zM19 4h-3.7a3 3 0 0 0-5.6 0H6a1 1 0 0 0 0 2v13a3 3 0 0 0 3 3h7a3 3 0 0 0 3-3V6a1 1 0 0 0 0-2zm-6.5-1a2 2 0 0 1 1.7 1h-3.4c0.3-0.6 1-1 1.7-1zM17 19c0 0.6-0.4 1-1 1H9a1 1 0 0 1-1-1V6h9v13z"
       android:fillColor="?primaryText" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_download.xml b/app/src/main/res/drawable/ic_download.xml
index 4a8c5fa4d..144122018 100644
--- a/app/src/main/res/drawable/ic_download.xml
+++ b/app/src/main/res/drawable/ic_download.xml
@@ -9,6 +9,5 @@
     android:viewportHeight="24">
     <path
         android:fillColor="?primaryText"
-        android:pathData="M11.293,17.707L5.293,11.707C4.914,11.3146 4.9194,10.6909 5.3052,10.3052C5.6909,9.9194 6.3146,9.914 6.707,10.293L11,14.586L11,3C11,2.4477 11.4477,2 12,2C12.5523,2 13,2.4477 13,3L13,14.586L17.293,10.293C17.6854,9.914 18.3091,9.9194 18.6948,10.3052C19.0806,10.6909 19.086,11.3146 18.707,11.707L12.707,17.707C12.3165,18.0974 11.6835,18.0974 11.293,17.707ZM18,20C18.5523,20 19,20.4477 19,21C19,21.5523 18.5523,22 18,22L6,22C5.4477,22 5,21.5523 5,21C5,20.4477 5.4477,20 6,20L18,20Z"
-        android:strokeWidth="1" />
+        android:pathData="M11.3 17.7l-6-6a1 1 0 0 1 1.4-1.4l4.3 4.3V3a1 1 0 0 1 2 0v11.6l4.3-4.3a1 1 0 0 1 1.4 1.4l-6 6a1 1 0 0 1-1.4 0zM18 20a1 1 0 0 1 0 2H6a1 1 0 0 1 0-2h12z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_edit.xml b/app/src/main/res/drawable/ic_edit.xml
index b2e7358a3..e92193503 100644
--- a/app/src/main/res/drawable/ic_edit.xml
+++ b/app/src/main/res/drawable/ic_edit.xml
@@ -8,7 +8,6 @@
         android:height="24dp"
         android:viewportWidth="24"
         android:viewportHeight="24">
-    <path
-            android:fillColor="?primaryText"
-            android:pathData="M3.88,20.12l3.774,-1.62a0.768,0.768 0,0 0,0.235 -0.159l-2.233,-2.23a0.744,0.744 0,0 0,-0.158 0.234zM19.12,8.891L8.772,19.228a2.009,2.009 0,0 1,-0.626 0.424l-5.5,2.356a0.5,0.5 0,0 1,-0.657 -0.657l2.357,-5.5a2.018,2.018 0,0 1,0.422 -0.624L15.1,4.869a0.5,0.5 0,0 1,0.707 0l3.313,3.315a0.5,0.5 0,0 1,0 0.707zM16.861,3.1l0.5,-0.506a2,2 0,0 1,2.828 0l1.2,1.2a2,2 0,0 1,0 2.828l-0.509,0.507a0.5,0.5 0,0 1,-0.706 0l-3.32,-3.319a0.5,0.5 0,0 1,0.007 -0.71z"/>
+    <path android:fillColor="?primaryText"
+          android:pathData="M3.9 20.1l3.8-1.6 0.2-0.2-2.2-2.2-0.2 0.2zM19 9L8.8 19.2a2 2 0 0 1-0.7 0.5L2.6 22a0.5 0.5 0 0 1-0.5-0.1 0.5 0.5 0 0 1-0.1-0.5l2.3-5.5 0.5-0.7L15 5a0.5 0.5 0 0 1 0.7 0l3.3 3.3a0.5 0.5 0 0 1 0 0.7zM17 3l0.5-0.5a2 2 0 0 1 2.8 0l1.2 1.2a2 2 0 0 1 0 2.8l-0.5 0.5a0.5 0.5 0 0 1-0.7 0l-3.3-3.3a0.5 0.5 0 0 1 0-0.7z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_energy.xml b/app/src/main/res/drawable/ic_energy.xml
index 50d893a12..263068094 100644
--- a/app/src/main/res/drawable/ic_energy.xml
+++ b/app/src/main/res/drawable/ic_energy.xml
@@ -8,6 +8,6 @@
         android:viewportWidth="24"
         android:viewportHeight="24">
     <path
-            android:pathData="M11.026,22.133l7.282,-11.994c0.215,-0.354 0.102,-0.815 -0.252,-1.03 -0.117,-0.071 -0.252,-0.109 -0.389,-0.109H13l0.436,-6.987c0.01,-0.138 -0.096,-0.257 -0.233,-0.266 -0.093,-0.005 -0.181,0.04 -0.23,0.12L5.691,13.861c-0.215,0.354 -0.102,0.815 0.252,1.03 0.118,0.071 0.252,0.109 0.39,0.109H11l-0.437,6.987c-0.009,0.138 0.096,0.257 0.234,0.266 0.093,0.005 0.181,-0.04 0.23,-0.12z"
+            android:pathData="M11 22.1l7.3-12a0.7 0.7 0 0 0-0.6-1.1H13l0.4-7A0.2 0.2 0 0 0 13 2l-7.3 12a0.7 0.7 0 0 0 0.6 1.1H11l-0.4 7a0.3 0.3 0 0 0 0.4 0.1z"
             android:fillColor="?primaryText"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_folder_icon.xml b/app/src/main/res/drawable/ic_folder_icon.xml
index 8a5367392..3fb30bca9 100644
--- a/app/src/main/res/drawable/ic_folder_icon.xml
+++ b/app/src/main/res/drawable/ic_folder_icon.xml
@@ -9,5 +9,5 @@
         android:viewportWidth="20"
         android:viewportHeight="17">
     <path android:fillColor="@color/primary_text_light_theme"
-        android:pathData="M17.5,3L10.719,3L8.23,0.674C7.7673,0.2413 7.1575,0.0004 6.524,0L2.5,0C1.8361,0 1.1994,0.2641 0.7305,0.734C0.2615,1.2039 -0.0013,1.8411 0,2.505L0,14.5C0,15.8807 1.1193,17 2.5,17L17.5,17C18.8807,17 20,15.8807 20,14.5L20,5.505C20.0013,4.8411 19.7385,4.2039 19.2695,3.734C18.8006,3.2641 18.1639,3 17.5,3ZM2.5,2L6.524,2C6.6503,2.0004 6.7718,2.0487 6.864,2.135L8.86,4L2,4L2,2.505C1.9987,2.3715 2.0508,2.2431 2.1447,2.1482C2.2386,2.0534 2.3665,2 2.5,2ZM18,14.5C18,14.7761 17.7761,15 17.5,15L2.5,15C2.2239,15 2,14.7761 2,14.5L2,5L17.5,5C17.6335,5 17.7614,5.0534 17.8553,5.1482C17.9492,5.2431 18.0013,5.3715 18,5.505L18,14.5Z" />
+          android:pathData="M17.5 3h-6.8L8.2 0.7C7.8 0.2 7.2 0 6.5 0h-4A2.5 2.5 0 0 0 0 2.5v12C0 15.9 1.1 17 2.5 17h15c1.4 0 2.5-1.1 2.5-2.5v-9A2.5 2.5 0 0 0 17.5 3zm-15-1h4l0.4 0.1 2 1.9H2V2.5a0.5 0.5 0 0 1 0.5-0.5zM18 14.5c0 0.3-0.2 0.5-0.5 0.5h-15a0.5 0.5 0 0 1-0.5-0.5V5h15.5a0.5 0.5 0 0 1 0.5 0.5v9z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_formfill.xml b/app/src/main/res/drawable/ic_formfill.xml
index 07d6a0bf4..77ec0404d 100644
--- a/app/src/main/res/drawable/ic_formfill.xml
+++ b/app/src/main/res/drawable/ic_formfill.xml
@@ -9,5 +9,5 @@
     android:viewportHeight="24">
     <path
         android:fillColor="?primaryText"
-        android:pathData="M11.269,9C11.1976,9.0003 11.129,8.972 11.0785,8.9215C11.028,8.871 10.9997,8.8024 11,8.731L11,4C11,3.4477 11.4477,3 12,3C12.5523,3 13,3.4477 13,4L13,8.731C13.0003,8.8024 12.972,8.871 12.9215,8.9215C12.871,8.972 12.8024,9.0003 12.731,9L11.269,9ZM19,6C20.6393,6.0415 21.9585,7.3607 22,9L22,18C21.9585,19.6393 20.6393,20.9585 19,21L5,21C3.3607,20.9585 2.0415,19.6393 2,18L2,9C2.0415,7.3607 3.3607,6.0415 5,6L8,6C8.5523,6 9,6.4477 9,7C9,7.5523 8.5523,8 8,8L5,8C4.4682,8.0465 4.0465,8.4682 4,9L4,18C4.0465,18.5318 4.4682,18.9535 5,19L19,19C19.5318,18.9535 19.9535,18.5318 20,18L20,9C19.9535,8.4682 19.5318,8.0465 19,8L16,8C15.4477,8 15,7.5523 15,7C15,6.4477 15.4477,6 16,6L19,6ZM6.722,11L10.278,11C10.6767,11 11,11.3233 11,11.722L11,15.278C11,15.6767 10.6767,16 10.278,16L6.722,16C6.3233,16 6,15.6767 6,15.278L6,11.722C6,11.3233 6.3233,11 6.722,11ZM13.488,11L17.512,11C17.7815,11 18,11.2185 18,11.488L18,11.512C18,11.7815 17.7815,12 17.512,12L13.488,12C13.2185,12 13,11.7815 13,11.512L13,11.488C13,11.2185 13.2185,11 13.488,11ZM13.408,14L16.592,14C16.8173,14 17,14.1827 17,14.408L17,14.592C17,14.8173 16.8173,15 16.592,15L13.408,15C13.1827,15 13,14.8173 13,14.592L13,14.408C13,14.1827 13.1827,14 13.408,14Z" />
+        android:pathData="M11.27 9a0.3 0.3 0 0 1-0.2-0.1 0.27 0.27 0 0 1-0.1-0.2V4a1 1 0 0 1 2 0v4.73c0 0.1-0 0.1-0.1 0.2a0.27 0.27 0 0 1-0.2 0.1h-1.46zM19 6a3.1 3.1 0 0 1 3 3v9a3.1 3.1 0 0 1-3 3H5a3.1 3.1 0 0 1-3-3V9a3.1 3.1 0 0 1 3-3h3a1 1 0 0 1 0 2H5a1.1 1.1 0 0 0-1 1v9c0 0.5 0.5 1 1 1h14a1.1 1.1 0 0 0 1-1V9a1.1 1.1 0 0 0-1-1h-3a1 1 0 0 1 0-2h3zM6.7 11h3.56c0.4 0 0.7 0.3 0.7 0.7v3.6c0 0.4-0.3 0.7-0.7 0.7H6.72a0.7 0.7 0 0 1-0.7-0.7v-3.6c0-0.4 0.3-0.72 0.7-0.7zm6.8 0h4c0.3 0 0.5 0.2 0.5 0.5v0c0 0.3-0.2 0.5-0.5 0.5H13.5a0.5 0.5 0 0 1-0.5-0.5v-0c0-0.3 0.2-0.5 0.5-0.5zm-0.1 3h3.18c0.2 0 0.4 0.2 0.4 0.4v0.2a0.4 0.4 0 0 1-0.4 0.4h-3.2a0.4 0.4 0 0 1-0.4-0.4v-0.2c0-0.2 0.2-0.4 0.4-0.4z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_help.xml b/app/src/main/res/drawable/ic_help.xml
index 8506ff8ef..ca731897c 100644
--- a/app/src/main/res/drawable/ic_help.xml
+++ b/app/src/main/res/drawable/ic_help.xml
@@ -9,5 +9,5 @@
     android:viewportHeight="24">
     <path
         android:fillColor="?primaryText"
-        android:pathData="M12,2C6.4772,2 2,6.4772 2,12C2,17.5228 6.4772,22 12,22C17.5228,22 22,17.5228 22,12C21.9939,6.4797 17.5203,2.0061 12,2ZM12,20C7.5817,20 4,16.4183 4,12C4,7.5817 7.5817,4 12,4C16.4183,4 20,7.5817 20,12C19.995,16.4162 16.4162,19.995 12,20ZM12,15.536C11.1125,15.536 10.393,16.2555 10.393,17.143C10.393,18.0305 11.1125,18.75 12,18.75C12.8875,18.75 13.607,18.0305 13.607,17.143C13.6073,16.7167 13.438,16.3078 13.1366,16.0064C12.8352,15.705 12.4263,15.5357 12,15.536ZM12,5.732C10.9986,5.6611 10.0158,6.0281 9.3059,6.7379C8.5961,7.4478 8.2291,8.4306 8.3,9.432C8.3,10.0533 8.8037,10.557 9.425,10.557C10.0463,10.557 10.55,10.0533 10.55,9.432C10.55,8.15 11.323,7.985 11.996,7.985C12.6417,7.9359 13.2391,8.3294 13.449,8.942C13.5665,9.486 13.2775,10.036 12.763,10.248C11.6251,10.8409 10.9001,12.0062 10.871,13.289L10.871,13.722C10.871,14.3433 11.3747,14.847 11.996,14.847C12.6173,14.847 13.121,14.3433 13.121,13.722L13.121,13.246C13.1776,12.7796 13.4749,12.3772 13.904,12.186C15.2962,11.4597 16.0072,9.8723 15.622,8.35C15.1528,6.7536 13.663,5.6768 12,5.732Z" />
+        android:pathData="M12 2a10 10 0 1 0 0 20 10 10 0 0 0 0-20zm0 18a8 8 0 1 1 0-16 8 8 0 0 1 0 16zm0-4.5a1.6 1.6 0 1 0 0 3.3 1.6 1.6 0 0 0 0-3.3zm0-9.8a3.5 3.5 0 0 0-3.7 3.7 1.1 1.1 0 0 0 2.3 0c0-1.3 0.7-1.4 1.4-1.4 0.6 0 1.2 0.3 1.4 1 0.2 0.5-0.1 1-0.6 1.2a3.5 3.5 0 0 0-2 3v0.5a1.1 1.1 0 0 0 2.3 0v-0.5c0-0.4 0.4-0.8 0.8-1a3.4 3.4 0 0 0 1.7-3.8c-0.4-1.6-2-2.7-3.6-2.7z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_history.xml b/app/src/main/res/drawable/ic_history.xml
index c076ab149..aa49fa9ec 100644
--- a/app/src/main/res/drawable/ic_history.xml
+++ b/app/src/main/res/drawable/ic_history.xml
@@ -9,5 +9,5 @@
     android:viewportHeight="24">
     <path
         android:fillColor="?primaryText"
-        android:pathData="M12,22C6.4772,22 2,17.5228 2,12C2,6.4772 6.4772,2 12,2C17.5228,2 22,6.4772 22,12C21.9939,17.5203 17.5203,21.9939 12,22L12,22ZM12,4C7.5817,4 4,7.5817 4,12C4,16.4183 7.5817,20 12,20C16.4183,20 20,16.4183 20,12C19.995,7.5838 16.4162,4.005 12,4ZM16.5,13L11.5,13C11.2239,13 11,12.7761 11,12.5L11,7.5C11,7.2239 11.2239,7 11.5,7C11.7761,7 12,7.2239 12,7.5L12,12L16.5,12C16.7761,12 17,12.2239 17,12.5C17,12.7761 16.7761,13 16.5,13Z"/>
+        android:pathData="M12 22a10 10 0 1 1 0-20 10 10 0 0 1 0 20zm0-18a8 8 0 1 0 0 16 8 8 0 0 0 0-16zm4.5 9h-5a0.5 0.5 0 0 1-0.5-0.5v-5a0.5 0.5 0 0 1 1 0V12h4.5a0.5 0.5 0 0 1 0 1z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_hollow_share.xml b/app/src/main/res/drawable/ic_hollow_share.xml
index 375da4e57..502537dae 100644
--- a/app/src/main/res/drawable/ic_hollow_share.xml
+++ b/app/src/main/res/drawable/ic_hollow_share.xml
@@ -1,12 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="20dp"
-        android:height="20dp"
-        android:viewportWidth="19"
-        android:viewportHeight="20">
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24"
+        android:viewportHeight="24">
     <path android:fillColor="?primaryText"
-        android:pathData="M6.92,12.7338C6.1902,13.5131 5.1519,14 4,14C1.7909,14 0,12.2091 0,10C0,7.7909 1.7909,6 4,6C5.0609,6 6.0783,6.4214 6.8284,7.1716C6.86,7.2031 6.8909,7.2351 6.9213,7.2676L11.1206,4.9785C11.0418,4.6654 11,4.3376 11,4C11,1.7909 12.7909,0 15,0C17.2091,0 19,1.7909 19,4C19,6.2091 17.2091,8 15,8C13.8481,8 12.8098,7.5131 12.08,6.7338L7.879,9.0237C7.9587,9.3403 8,9.668 8,10C8,10.3376 7.9582,10.6654 7.8794,10.9785L12.0787,13.2675C12.8087,12.4875 13.8474,12 15,12C17.2091,12 19,13.7909 19,16C19,18.2091 17.2091,20 15,20C12.7909,20 11,18.2091 11,16C11,15.6631 11.0417,15.3358 11.1201,15.0232L6.92,12.7338ZM15,2C13.8954,2 13,2.8954 13,4C13,5.1046 13.8954,6 15,6C16.1046,6 17,5.1046 17,4C17,2.8954 16.1046,2 15,2ZM4,8C2.8954,8 2,8.8954 2,10C2,11.1046 2.8954,12 4,12C5.1046,12 6,11.1046 6,10C6,8.8954 5.1046,8 4,8ZM15,14C13.8954,14 13,14.8954 13,16C13,17.1046 13.8954,18 15,18C16.1046,18 17,17.1046 17,16C17,14.8954 16.1046,14 15,14Z"/>
+          android:pathData="M17 14a3.99 3.99 0 0 0-2.91 1.27L9.87 13c0.17-0.63 0.17-1.3 0-1.94l4.22-2.3A4 4 0 1 0 13.13 7L8.91 9.27a4 4 0 1 0 0 5.46L13.13 17A4 4 0 1 0 17 14zm0-10a2 2 0 1 1 0 4 2 2 0 0 1 0-4zM6 14a2 2 0 1 1 0-4 2 2 0 0 1 0 4zm11 6a2 2 0 1 1 0-4 2 2 0 0 1 0 4z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_home.xml b/app/src/main/res/drawable/ic_home.xml
index 3db8a10e9..966dc6d7e 100644
--- a/app/src/main/res/drawable/ic_home.xml
+++ b/app/src/main/res/drawable/ic_home.xml
@@ -8,6 +8,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:pathData="m21.457,11.1228 l-8.75,-8.0208c-0.3905,-0.3579 -1.0235,-0.3579 -1.414,0l-8.75,8.0208c-0.379,0.3597 -0.3736,0.9314 0.0122,1.285 0.3857,0.3536 1.0094,0.3586 1.4018,0.0112l1.043,-0.9561v6.9538c0,1.5188 1.3431,2.75 3,2.75h8c1.6569,0 3,-1.2312 3,-2.75v-6.9538l1.043,0.9561c0.3924,0.3474 1.0161,0.3424 1.4018,-0.0112 0.3857,-0.3536 0.3912,-0.9253 0.0122,-1.285zM17,18.4167c0,0.5063 -0.4477,0.9167 -1,0.9167 0.6667,0 0.1667,0 -1.5,0s-3.3333,0 -5,0h-1.5c-0.5523,0 -1,-0.4104 -1,-0.9167v-8.7872l5,-4.5833 5,4.5833z"
+      android:pathData="M21.5 11.1l-8.8-8a1 1 0 0 0-1.4 0l-8.8 8c-0.3 0.4-0.3 1 0 1.3 0.4 0.4 1 0.4 1.5 0l1-1v7c0 1.5 1.3 2.8 3 2.8h8c1.7 0 3-1.3 3-2.8v-7l1 1c0.4 0.4 1 0.4 1.4 0 0.4-0.3 0.4-1 0-1.3zM17 18.4c0 0.5-0.4 1-1 1H8c-0.6 0-1-0.5-1-1V9.6L12 5l5 4.6z"
       android:fillColor="?primaryText"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_info.xml b/app/src/main/res/drawable/ic_info.xml
index d4c6bc63f..c938961a2 100644
--- a/app/src/main/res/drawable/ic_info.xml
+++ b/app/src/main/res/drawable/ic_info.xml
@@ -8,6 +8,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:pathData="M12,22C6.4772,22 2,17.5228 2,12C2,6.4772 6.4772,2 12,2C17.5228,2 22,6.4772 22,12C21.9939,17.5203 17.5203,21.9939 12,22ZM12,4C7.5817,4 4,7.5817 4,12C4,16.4183 7.5817,20 12,20C16.4183,20 20,16.4183 20,12C19.995,7.5838 16.4162,4.005 12,4ZM12,11C12.5523,11 13,11.4477 13,12L13,16C13,16.5523 12.5523,17 12,17C11.4477,17 11,16.5523 11,16L11,12C11,11.4477 11.4477,11 12,11ZM12,7C12.5523,7 13,7.4477 13,8C13,8.5523 12.5523,9 12,9C11.4477,9 11,8.5523 11,8C11,7.4477 11.4477,7 12,7Z"
+      android:pathData="M12 22a10 10 0 1 1 0-20 10 10 0 0 1 0 20zm0-18a8 8 0 1 0 0 16 8 8 0 0 0 0-16zm0 7c0.6 0 1 0.4 1 1v4a1 1 0 0 1-2 0v-4c0-0.6 0.4-1 1-1zm0-4a1 1 0 1 1 0 2 1 1 0 0 1 0-2z"
       android:fillColor="?primaryText" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_internet.xml b/app/src/main/res/drawable/ic_internet.xml
index 53e288eb9..7aea69447 100644
--- a/app/src/main/res/drawable/ic_internet.xml
+++ b/app/src/main/res/drawable/ic_internet.xml
@@ -9,5 +9,5 @@
     android:viewportHeight="24">
     <path
         android:fillColor="?primaryText"
-        android:pathData="M12,2C6.4772,2 2,6.4772 2,12C2,17.5228 6.4772,22 12,22C17.5228,22 22,17.5228 22,12C21.9939,6.4797 17.5203,2.0061 12,2ZM19.931,11L15.981,11C15.9554,8.7791 15.5436,6.5797 14.764,4.5C17.5622,5.5357 19.5532,8.0403 19.931,11L19.931,11ZM12,20C11.52,20 10.192,17.6 10.019,13L13.981,13C13.808,17.6 12.48,20 12,20ZM10.019,11C10.192,6.4 11.519,4 12,4C12.481,4 13.808,6.4 13.981,11L10.019,11ZM9.236,4.5C8.4564,6.5797 8.0446,8.7791 8.019,11L4.069,11C4.4468,8.0403 6.4378,5.5357 9.236,4.5ZM4.069,13L8.019,13C8.0446,15.2209 8.4564,17.4203 9.236,19.5C6.4378,18.4643 4.4468,15.9597 4.069,13L4.069,13ZM14.769,19.5C15.5469,17.42 15.957,15.2206 15.981,13L19.931,13C19.5532,15.9597 17.5622,18.4643 14.764,19.5L14.769,19.5Z" />
+        android:pathData="M12 2a10 10 0 1 0 0 20 10 10 0 0 0 0-20zm8 9h-4c0-2.2-0.5-4.4-1.2-6.5a8 8 0 0 1 5.1 6.5zm-8 9c-0.5 0-1.8-2.4-2-7h4c-0.2 4.6-1.5 7-2 7zm-2-9c0.2-4.6 1.5-7 2-7s1.8 2.4 2 7h-4zm-0.8-6.5C8.5 6.5 8 8.8 8 11H4a8 8 0 0 1 5.2-6.5zM4.1 13h4c0 2.2 0.4 4.4 1.1 6.5A8 8 0 0 1 4.1 13zm10.7 6.5c0.7-2 1.2-4.3 1.2-6.5h4a8 8 0 0 1-5.2 6.5z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_language.xml b/app/src/main/res/drawable/ic_language.xml
index 7696b268a..d9ea0b27c 100644
--- a/app/src/main/res/drawable/ic_language.xml
+++ b/app/src/main/res/drawable/ic_language.xml
@@ -9,5 +9,5 @@
     android:viewportHeight="24">
     <path
         android:fillColor="?primaryText"
-        android:pathData="m9.8944,3.5528c-0.247,-0.494 -0.8477,-0.6942 -1.3416,-0.4472 -0.494,0.247 -0.6942,0.8477 -0.4472,1.3416l0.2764,0.5528h-5.382c-0.5523,0 -1,0.4477 -1,1 0,0.5523 0.4477,1 1,1h6.9797c0.0141,0.0003 0.0281,0.0003 0.0423,0h1.6451c-0.7152,2.1364 -1.7998,3.9404 -2.9531,5.4106 -0.6679,-0.6568 -1.3242,-1.5526 -1.7777,-2.7617 -0.1939,-0.5171 -0.7703,-0.7791 -1.2874,-0.5852 -0.5171,0.1939 -0.7791,0.7703 -0.5852,1.2874 0.5893,1.5715 1.4593,2.7316 2.3389,3.5735 -0.1204,0.1263 -0.2404,0.2491 -0.3596,0.3683 -0.9566,0.9566 -1.8526,1.6731 -2.5061,2.1484 -0.3264,0.2373 -0.5911,0.4137 -0.7712,0.5289 -0.09,0.0576 -0.1588,0.0999 -0.2034,0.1269l-0.0371,0.0221 -0.0114,0.0068 -0.0099,0.0058 -0.0012,0.0006c-0.4786,0.2744 -0.6447,0.8846 -0.3709,1.3637 0.274,0.4796 0.8849,0.6462 1.3644,0.3721l0.06,-0.0351 -0.0584,0.0343 0.0022,-0.0013 0.0063,-0.0037 0.0202,-0.0118c0.0168,-0.0098 0.0695,-0.0414 0.0695,-0.0414 0.0589,-0.0356 0.1425,-0.087 0.2478,-0.1544 0.2105,-0.1348 0.5083,-0.3334 0.8694,-0.5961 0.7216,-0.5248 1.7005,-1.3082 2.7439,-2.3516 0.1773,-0.1773 0.3567,-0.3624 0.5373,-0.5552 0.3924,0.2405 0.7462,0.4174 1.0292,0.5432 0.2008,0.0892 0.367,0.1532 0.4874,0.1961 0.0602,0.0214 0.1091,0.0377 0.1453,0.0492 0.0181,0.0058 0.033,0.0104 0.0446,0.0139l0.0148,0.0044 0.0055,0.0016 0.0023,0.0007 0.0019,0.0005c0.531,0.1518 1.0845,-0.1557 1.2362,-0.6868 0.1514,-0.5299 -0.1537,-1.082 -0.6827,-1.235l-0.0025,-0.0007 -0.0119,-0.0038c-0.0159,-0.0051 -0.0436,-0.0142 -0.082,-0.0279 -0.0769,-0.0274 -0.1958,-0.0728 -0.3466,-0.1399 -0.147,-0.0653 -0.3232,-0.1507 -0.5194,-0.2593 1.3691,-1.7529 2.6634,-3.955 3.4472,-6.6081h2.2364c0.5523,0 1,-0.4477 1,-1 0,-0.5523 -0.4477,-1 -1,-1h-2.9786c-0.0148,-0.0003 -0.0296,-0.0003 -0.0443,0h-2.3591zM18.6261,16h-3.2522l1.6261,-4.4025zM19.3649,18 L20.2558,20.4119c0.1722,0.4662 0.6898,0.7046 1.156,0.5324 0.4663,-0.1723 0.7047,-0.6898 0.5324,-1.1561l-3.6309,-9.8302c-0.4506,-1.2199 -2.176,-1.2199 -2.6266,0l-3.6309,9.8302c-0.1723,0.4663 0.0661,0.9838 0.5324,1.1561 0.4662,0.1722 0.9838,-0.0662 1.156,-0.5324l0.8909,-2.4119z" />
+        android:pathData="M9.9 3.55a1 1 0 1 0-1.8 0.9l0.3 0.6H3a1 1 0 0 0 0 2h8.67a18.11 18.11 0 0 1-2.96 5.4 8 8 0 0 1-1.77-2.76 1 1 0 1 0-2 0.7 9.5 9.5 0 0 0 2.3 3.6l-0.4 0.4a21.4 21.4 0 0 1-3.48 2.8l-0 0 0 0a1 1 0 0 0 1 1.74l0-0-0 0 0-0 0-0 0.24-0.15 0.9-0.6A23.3 23.3 0 0 0 9 15.16a9.04 9.04 0 0 0 1.67 0.8l0 0h0v0a1 1 0 0 0 0.56-1.92h-0l-0-0a5.04 5.04 0 0 1-0.9-0.4A19.9 19.9 0 0 0 13.76 7H16a1 1 0 0 0 0-2h-5.38zM18.62 16h-3.26L17 11.6zm0.7 2l0.9 2.41a0.9 0.9 0 0 0 1.68-0.6l-3.63-9.8a1.4 1.4 0 0 0-2.62 0l-3.63 9.83a0.9 0.9 0 1 0 1.68 0.62l1-2.41z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_link.xml b/app/src/main/res/drawable/ic_link.xml
index 8bc6cefd1..f5be9216d 100644
--- a/app/src/main/res/drawable/ic_link.xml
+++ b/app/src/main/res/drawable/ic_link.xml
@@ -9,5 +9,5 @@
     android:viewportHeight="24">
     <path
         android:fillColor="?attr/accent"
-        android:pathData="M4.47,7.53L7.515,4.485C7.7829,4.2172 8.2171,4.2172 8.485,4.485L12.685,8.685C13.4609,7.7001 13.3815,6.2915 12.5,5.4L9.837,2.734C8.863,1.7601 7.284,1.7601 6.31,2.734L2.766,6.279C2.2984,6.7465 2.0356,7.3807 2.0356,8.042C2.0356,8.7033 2.2984,9.3375 2.766,9.805L5.426,12.466C6.3,13.3366 7.68,13.4354 8.669,12.698L4.47,8.5C4.3409,8.3716 4.2683,8.1971 4.2683,8.015C4.2683,7.8329 4.3409,7.6584 4.47,7.53ZM21.27,14.163L21.266,14.163C22.2383,15.137 22.2379,16.7145 21.265,17.688L17.72,21.232C17.2525,21.6996 16.6183,21.9624 15.957,21.9624C15.2957,21.9624 14.6615,21.6996 14.194,21.232L11.533,18.572C10.6621,17.6985 10.5633,16.3186 11.301,15.33L15.501,19.53C15.6293,19.6588 15.8037,19.7312 15.9855,19.7312C16.1673,19.7312 16.3417,19.6588 16.47,19.53L19.512,16.479C19.7798,16.2111 19.7798,15.7769 19.512,15.509L15.312,11.309C16.2998,10.53 17.7139,10.612 18.605,11.5L21.27,14.163ZM16.163,14.718C16.542,15.1104 16.5366,15.7341 16.1508,16.1198C15.7651,16.5056 15.1414,16.511 14.749,16.132L7.829,9.212C7.559,8.9632 7.4471,8.5864 7.5375,8.2306C7.6279,7.8747 7.906,7.597 8.262,7.5071C8.6179,7.4172 8.9946,7.5297 9.243,7.8L16.163,14.718Z" />
+        android:pathData="M4.47 7.5l3-3c0.3-0.3 0.7-0.3 1 0l4.2 4.2c0.8-1 0.7-2.4-0.2-3.3L9.84 2.7a2.5 2.5 0 0 0-3.53 0L2.77 6.28a2.5 2.5 0 0 0 0 3.52l2.66 2.67c0.9 0.9 2.25 1 3.2 0.2l-4.2-4.2a0.7 0.7 0 0 1 0-1zm16.8 6.63a2.5 2.5 0 0 1 0 3.53l-3.55 3.54a2.5 2.5 0 0 1-3.53 0l-2.7-2.7a2.49 2.49 0 0 1-0.2-3.24l4.2 4.2a0.7 0.7 0 0 0 1 0l3.04-3.05a0.7 0.7 0 0 0 0-1l-4.2-4.2c1-0.8 2.4-0.7 3.3 0.2l2.66 2.66zm-5.1 0.56a1 1 0 0 1-1.42 1.41L7.8 9.2A1 1 0 1 1 9.24 7.8l6.9 6.9z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_login.xml b/app/src/main/res/drawable/ic_login.xml
index 99632870c..008f6f413 100644
--- a/app/src/main/res/drawable/ic_login.xml
+++ b/app/src/main/res/drawable/ic_login.xml
@@ -8,6 +8,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:pathData="M11.3769,4.8424C10.3318,6.0215 9.8457,7.5938 10.043,9.157L9,10.2C8.8561,10.3741 8.8561,10.6259 9,10.8C9.1152,11.0055 9.2597,11.1932 9.429,11.357C9.6452,11.5468 9.837,11.7628 10,12L3,19L3,20.7C2.9983,20.7801 3.0294,20.8573 3.086,20.914C3.1427,20.9706 3.2199,21.0017 3.3,21L7,21L7,20L8,20L8,18.5L9,18.5L9,18L10,18L10,16L11,16L12.6,14.4L12.9,14.4L13.5,15C13.8,15.3 13.8,15.3 13.969,15.3C14.1027,15.2898 14.2283,15.232 14.323,15.137L15.223,13.986C15.316,13.986 15.408,14 15.502,14C18.5396,14 21.002,11.5376 21.002,8.5C21.002,5.4624 18.5396,3 15.502,3C13.9245,2.9919 12.4219,3.6633 11.3769,4.8424ZM17.5,8C16.6716,8 16,7.3284 16,6.5C16,5.6716 16.6716,5 17.5,5C18.3284,5 19,5.6716 19,6.5C19,7.3284 18.3284,8 17.5,8Z"
+      android:pathData="M11.38 4.84a5.47 5.47 0 0 0-1.34 4.32L9 10.2a0.47 0.47 0 0 0 0 0.6c0.12 0.2 0.26 0.4 0.43 0.56 0.21 0.19 0.4 0.4 0.57 0.64l-7 7v1.7a0.3 0.3 0 0 0 0.3 0.3H7v-1h1v-1.5h1V18h1v-2h1l1.6-1.6h0.3l0.6 0.6c0.3 0.3 0.3 0.3 0.47 0.3a0.56 0.56 0 0 0 0.35-0.16l0.9-1.15 0.28 0a5.5 5.5 0 1 0-4.12-9.16zM17.5 8a1.5 1.5 0 1 1 0-3 1.5 1.5 0 0 1 0 3z"
       android:fillColor="?primaryText" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_microphone.xml b/app/src/main/res/drawable/ic_microphone.xml
index 0b5550d90..261a61dec 100644
--- a/app/src/main/res/drawable/ic_microphone.xml
+++ b/app/src/main/res/drawable/ic_microphone.xml
@@ -8,6 +8,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:pathData="M17,11v-1c0,-0.552 0.448,-1 1,-1s1,0.448 1,1v1c0,3.526 -2.608,6.444 -6,6.93L13,21c0,0.552 -0.448,1 -1,1s-1,-0.448 -1,-1v-3.07c-3.392,-0.486 -6,-3.404 -6,-6.93v-1c0,-0.552 0.448,-1 1,-1s1,0.448 1,1v1c0,2.761 2.239,5 5,5s5,-2.239 5,-5zM12,2c1.657,0 3,1.343 3,3v6c0,1.657 -1.343,3 -3,3s-3,-1.343 -3,-3L9,5c0,-1.657 1.343,-3 3,-3z"
+      android:pathData="M17,11v-1c0,-0.552 0.448,-1 1,-1s1,0.5 1,1v1c0,3.5 -2.6,6.4 -6,6.9L13,21c0,0.6 -0.5,1 -1,1s-1,-0.5 -1,-1v-3c-3.4,-0.5 -6,-3.4 -6,-7v-1c0,-0.6 0.5,-1 1,-1s1,0.5 1,1v1c0,2.8 2.2,5 5,5s5,-2.2 5,-5zM12,2c1.7,0 3,1.3 3,3v6c0,1.7 -1.3,3 -3,3s-3,-1.343 -3,-3L9,5c0,-1.657 1.343,-3 3,-3z"
       android:fillColor="?primaryText"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_notification.xml b/app/src/main/res/drawable/ic_notification.xml
index f65501f36..7532157ee 100644
--- a/app/src/main/res/drawable/ic_notification.xml
+++ b/app/src/main/res/drawable/ic_notification.xml
@@ -9,5 +9,5 @@
     android:viewportHeight="24">
     <path
         android:fillColor="?primaryText"
-        android:pathData="M19,3L5,3C3.3431,3 2,4.3431 2,6L2,14C2,15.6569 3.3431,17 5,17L12.586,17L16.293,20.707C16.4805,20.8946 16.7348,20.9999 17,21C17.1315,21.0004 17.2617,20.9746 17.383,20.924C17.7566,20.7691 18.0001,20.4044 18,20L18,17L19,17C20.6569,17 22,15.6569 22,14L22,6C22,4.3431 20.6569,3 19,3ZM20,14C20,14.5523 19.5523,15 19,15L17,15C16.4477,15 16,15.4477 16,16L16,17.586L13.707,15.293C13.5195,15.1055 13.2652,15.0001 13,15L5,15C4.4477,15 4,14.5523 4,14L4,6C4,5.4477 4.4477,5 5,5L19,5C19.5523,5 20,5.4477 20,6L20,14ZM16.5,8L7.5,8C7.2239,8 7,8.2239 7,8.5C7,8.7761 7.2239,9 7.5,9L16.5,9C16.7761,9 17,8.7761 17,8.5C17,8.2239 16.7761,8 16.5,8ZM16.5,11L7.5,11C7.2239,11 7,11.2239 7,11.5C7,11.7761 7.2239,12 7.5,12L16.5,12C16.7761,12 17,11.7761 17,11.5C17,11.2239 16.7761,11 16.5,11Z" />
+        android:pathData="M19 3H5a3 3 0 0 0-3 3v8a3 3 0 0 0 3 3h7.6l3.7 3.7A1 1 0 0 0 18 20v-3h1a3 3 0 0 0 3-3V6a3 3 0 0 0-3-3zm1 11c0 0.6-0.4 1-1 1h-2a1 1 0 0 0-1 1v1.6l-2.3-2.3a1 1 0 0 0-0.7-0.3H5a1 1 0 0 1-1-1V6c0-0.6 0.4-1 1-1h14c0.6 0 1 0.4 1 1v8zm-3.5-6h-9a0.5 0.5 0 0 0 0 1h9a0.5 0.5 0 0 0 0-1zm0 3h-9a0.5 0.5 0 0 0 0 1h9a0.5 0.5 0 0 0 0-1z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_onboarding_avatar_anonymous.xml b/app/src/main/res/drawable/ic_onboarding_avatar_anonymous.xml
index 1c9d76a10..56e804fb8 100644
--- a/app/src/main/res/drawable/ic_onboarding_avatar_anonymous.xml
+++ b/app/src/main/res/drawable/ic_onboarding_avatar_anonymous.xml
@@ -1,3 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:aapt="http://schemas.android.com/aapt"
     android:width="24dp"
@@ -5,10 +9,7 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:pathData="M17.6655,14.2092C16.1843,12.4998 14.1333,14.8 11.9997,14.8C9.8675,14.8 7.8151,12.4998 6.3339,14.2092C5.9139,14.6936 5.8803,15.3992 6.2401,15.9284C7.4959,17.7764 9.5959,19 11.9997,19C14.4035,19 16.5035,17.7764 17.7593,15.9284C18.1205,15.3992 18.0855,14.6936 17.6655,14.2092M16.25,9.25C16.25,6.9026 14.3474,5 12,5C9.6526,5 7.75,6.9026 7.75,9.25C7.75,11.5974 9.6526,13.5 12,13.5C14.3474,13.5 16.25,11.5974 16.25,9.25Z"
-      android:strokeWidth="1"
-      android:fillType="nonZero"
-      android:strokeColor="#00000000">
+      android:pathData="M17.6655,14.2092C16.1843,12.4998 14.1333,14.8 11.9997,14.8C9.8675,14.8 7.8151,12.4998 6.3339,14.2092C5.9139,14.6936 5.8803,15.3992 6.2401,15.9284C7.4959,17.7764 9.5959,19 11.9997,19C14.4035,19 16.5035,17.7764 17.7593,15.9284C18.1205,15.3992 18.0855,14.6936 17.6655,14.2092M16.25,9.25C16.25,6.9026 14.3474,5 12,5C9.6526,5 7.75,6.9026 7.75,9.25C7.75,11.5974 9.6526,13.5 12,13.5C14.3474,13.5 16.25,11.5974 16.25,9.25Z">
     <aapt:attr name="android:fillColor">
       <gradient 
           android:startY="21.265238"
@@ -25,12 +26,9 @@
     </aapt:attr>
   </path>
   <path
-      android:pathData="M12,22C6.4772,22 2,17.5228 2,12C2,6.4772 6.4772,2 12,2C17.5228,2 22,6.4772 22,12C21.9939,17.5203 17.5203,21.9939 12,22L12,22ZM12,4C7.5817,4 4,7.5817 4,12C4,16.4183 7.5817,20 12,20C16.4183,20 20,16.4183 20,12C19.995,7.5838 16.4162,4.005 12,4Z"
-      android:strokeWidth="1"
-      android:fillType="nonZero"
-      android:strokeColor="#00000000">
+      android:pathData="M12,22C6.4772,22 2,17.5228 2,12C2,6.4772 6.4772,2 12,2C17.5228,2 22,6.4772 22,12C21.9939,17.5203 17.5203,21.9939 12,22L12,22ZM12,4C7.5817,4 4,7.5817 4,12C4,16.4183 7.5817,20 12,20C16.4183,20 20,16.4183 20,12C19.995,7.5838 16.4162,4.005 12,4Z">
     <aapt:attr name="android:fillColor">
-      <gradient 
+      <gradient
           android:startY="25.236055"
           android:startX="7.735972"
           android:endY="-13.936461"
diff --git a/app/src/main/res/drawable/ic_onboarding_privacy_notice.xml b/app/src/main/res/drawable/ic_onboarding_privacy_notice.xml
index f9f7e5615..236f06f97 100644
--- a/app/src/main/res/drawable/ic_onboarding_privacy_notice.xml
+++ b/app/src/main/res/drawable/ic_onboarding_privacy_notice.xml
@@ -9,7 +9,7 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:pathData="M12,22C6.4772,22 2,17.5228 2,12C2,6.4772 6.4772,2 12,2C17.5228,2 22,6.4772 22,12C21.9939,17.5203 17.5203,21.9939 12,22ZM12,4C7.5817,4 4,7.5817 4,12C4,16.4183 7.5817,20 12,20C16.4183,20 20,16.4183 20,12C19.995,7.5838 16.4162,4.005 12,4ZM12,11C12.5523,11 13,11.4477 13,12L13,16C13,16.5523 12.5523,17 12,17C11.4477,17 11,16.5523 11,16L11,12C11,11.4477 11.4477,11 12,11ZM12,7C12.5523,7 13,7.4477 13,8C13,8.5523 12.5523,9 12,9C11.4477,9 11,8.5523 11,8C11,7.4477 11.4477,7 12,7Z"
+      android:pathData="M12 22a10 10 0 1 1 0-20 10 10 0 0 1 0 20zm0-18a8 8 0 1 0 0 16 8 8 0 0 0 0-16zm0 7c0.6 0 1 0.4 1 1v4a1 1 0 0 1-2 0v-4c0-0.6 0.4-1 1-1zm0-4a1 1 0 1 1 0 2 1 1 0 0 1 0-2z"
       android:strokeWidth="1"
       android:fillType="evenOdd"
       android:strokeColor="#00000000">
diff --git a/app/src/main/res/drawable/ic_onboarding_private_browsing.xml b/app/src/main/res/drawable/ic_onboarding_private_browsing.xml
index 0235f70b0..7f5915082 100644
--- a/app/src/main/res/drawable/ic_onboarding_private_browsing.xml
+++ b/app/src/main/res/drawable/ic_onboarding_private_browsing.xml
@@ -10,7 +10,7 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:pathData="M17.5,17c-2.1,0 -3.5,-2.5 -5.5,-2.5S8.4,17 6.5,17C3.9,17 2,14.6 2,10.4 2,7.8 2.8,7 6.1,7s4.3,1.4 5.9,1.4c1.6,0 2.6,-1.4 5.9,-1.4 3.3,0 4.1,0.8 4.1,3.4 0,4.2 -1.9,6.6 -4.5,6.6zM7.7,10.2c-2,0.1 -2.9,1.3 -2.9,1.6 0,0.3 1.3,1.1 2.7,1.1 1.3,0 2.9,-0.5 2.9,-0.9 0,-0.5 -0.8,-1.9 -2.7,-1.8zM16.3,10.2c-1.9,-0.1 -2.7,1.3 -2.7,1.8 0,0.4 1.5,0.9 2.9,0.9s2.7,-0.8 2.7,-1.1c-0.1,-0.3 -0.9,-1.5 -2.9,-1.6z">
+        android:pathData="M17.5 17c-2.1 0-3.5-2.5-5.5-2.5S8.4 17 6.5 17C3.9 17 2 14.6 2 10.4 2 7.8 2.8 7 6.1 7s4.3 1.4 5.9 1.4c1.6 0 2.6-1.4 5.9-1.4 3.3 0 4.1 0.8 4.1 3.4 0 4.2-1.9 6.6-4.5 6.6zm-9.8-6.8c-2 0.1-2.9 1.3-2.9 1.6 0 0.3 1.3 1.1 2.7 1.1 1.3 0 2.9-0.5 2.9-0.9 0-0.5-0.8-1.9-2.7-1.8zm8.6 0c-1.9-0.1-2.7 1.3-2.7 1.8 0 0.4 1.5 0.9 2.9 0.9s2.7-0.8 2.7-1.1c-0.1-0.3-0.9-1.5-2.9-1.6z">
         <aapt:attr name="android:fillColor">
             <gradient
                 android:type="linear"
diff --git a/app/src/main/res/drawable/ic_onboarding_tracking_protection.xml b/app/src/main/res/drawable/ic_onboarding_tracking_protection.xml
index 0b4841cc5..6ec758a14 100644
--- a/app/src/main/res/drawable/ic_onboarding_tracking_protection.xml
+++ b/app/src/main/res/drawable/ic_onboarding_tracking_protection.xml
@@ -2,17 +2,23 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<vector android:height="24dp" android:viewportHeight="64"
-    android:viewportWidth="64" android:width="24dp"
-    xmlns:aapt="http://schemas.android.com/aapt" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillType="evenOdd"
-        android:pathData="M59,11.6997C58.9881,8.1013 56.3932,5.0447 52.8778,4.4881L32,1L11.129,4.4846C7.6125,5.0438 5.0164,8.1 5,11.6997C5,17.4403 5.0405,25.0341 5.3746,28.6212C6.3871,39.5427 8.4864,45.5324 13.64,52.3379C18.081,58.0678 24.5178,61.8669 31.6355,62.959L32,63L32.3611,62.959C39.4788,61.8669 45.9156,58.0678 50.3566,52.3379C55.5136,45.5324 57.596,39.5461 58.622,28.6212L58.622,28.6212C58.9764,24.8191 59,16.3891 59,11.6997ZM51.9125,27.9727C51.0013,37.6792 49.388,42.4027 45.0106,48.1911C41.7528,52.3239 37.1358,55.1362 32,56.116C26.8673,55.1354 22.2537,52.323 18.9995,48.1911C14.612,42.3891 13.0055,37.6792 12.0976,27.9761C11.8546,25.3925 11.75,19.6177 11.75,11.7235C11.762,11.4601 11.963,11.2452 12.2225,11.2184L32,7.9181L51.7809,11.2218C52.0393,11.2441 52.2407,11.458 52.25,11.7201C52.2669,19.4846 52.142,25.4096 51.9125,27.9727ZM18.5,17.0887C18.5506,23.802 18.7227,26.4369 18.8071,27.3276C19.6711,36.5427 21.1494,39.8055 24.3489,44.0512C26.3036,46.5166 28.9832,48.2892 32,49.1126L32,14.8396L18.5,17.0887Z"
-        android:strokeColor="#00000000" android:strokeWidth="1">
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:aapt="http://schemas.android.com/aapt"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24"
+        android:viewportHeight="24">
+    <path
+        android:pathData="M20 6c0-1-0.8-1.9-1.8-2L12 3 5.8 4C4.8 4 4 5 4 6l0.1 5c0.3 3.2 1 5 2.5 7a8.4 8.4 0 0 0 5.3 3h0.2c2.1-0.3 4-1.4 5.3-3 1.6-2 2.2-3.8 2.5-7l0.1-5zm-2.1 4.8a10 10 0 0 1-2 6c-1 1.1-2.4 2-3.9 2.3a6.5 6.5 0 0 1-3.9-2.4 9.9 9.9 0 0 1-2-5.9 67.3 67.3 0 0 1 0-4.9L12 5l5.9 1 0.1 0.2-0.1 4.7zM8 7.6v3c0.3 2.7 0.8 3.7 1.7 5 0.6 0.6 1.4 1.2 2.3 1.4V7l-4 0.6z">
         <aapt:attr name="android:fillColor">
-            <gradient android:endX="21.592728" android:endY="43.40673"
-                android:startX="53.66253" android:startY="4.9456143" android:type="linear">
-                <item android:color="#FF6A11CB" android:offset="0"/>
-                <item android:color="#FF2575FC" android:offset="1"/>
+            <gradient
+                    android:endX="21.592728"
+                    android:endY="43.40673"
+                    android:startX="53.66253"
+                    android:startY="4.9456143"
+                    android:type="linear">
+                <item android:color="#6A11CB" android:offset="0"/>
+                <item android:color="#2575FC" android:offset="1"/>
             </gradient>
         </aapt:attr>
     </path>
diff --git a/app/src/main/res/drawable/ic_permission.xml b/app/src/main/res/drawable/ic_permission.xml
index 89052137d..2087357a5 100644
--- a/app/src/main/res/drawable/ic_permission.xml
+++ b/app/src/main/res/drawable/ic_permission.xml
@@ -1,13 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:pathData="m12,20h5c1.6569,0 3,-1.3431 3,-3v-10c0,-1.6568 -1.3431,-3 -3,-3h-5zM7,2h10c2.7614,0 5,2.2386 5,5v10c0,2.7614 -2.2386,5 -5,5h-10c-2.7614,0 -5,-2.2386 -5,-5v-10c0,-2.7614 2.2386,-5 5,-5zM6.2143,15c0.0152,0.0001 0.0304,-0.0006 0.0455,-0.0021 0.154,-0.0135 0.2941,-0.0945 0.3827,-0.2212l3.0064,-4.9671c0.155,-0.2364 0.094,-0.5531 -0.1375,-0.7151s-0.55,-0.1107 -0.7189,0.1159l-2.6493,4.4563 -0.9971,-0.9971c-0.2052,-0.1981 -0.5313,-0.1953 -0.733,0.0064 -0.2017,0.2017 -0.2045,0.5278 -0.0064,0.7329l1.4379,1.4379c0.098,0.0981 0.231,0.1532 0.3697,0.1532zM13.1464,9.8535c-0.1952,-0.1953 -0.1952,-0.5118 0,-0.7071 0.1953,-0.1953 0.5119,-0.1953 0.7072,0l2.1464,2.1465 2.1464,-2.1465c0.1953,-0.1953 0.5119,-0.1953 0.7072,0 0.1952,0.1953 0.1952,0.5118 0,0.7071l-2.1465,2.1465 2.1465,2.1465c0.1952,0.1952 0.1952,0.5118 0,0.7071 -0.1953,0.1952 -0.5119,0.1952 -0.7072,0l-2.1464,-2.1465 -2.1464,2.1465c-0.1953,0.1952 -0.5119,0.1952 -0.7072,0 -0.1952,-0.1953 -0.1952,-0.5119 0,-0.7071l2.1465,-2.1465z"
+      android:pathData="M12 20h5a3 3 0 0 0 3-3V7a3 3 0 0 0-3-3h-5zM7 2h10a5 5 0 0 1 5 5v10a5 5 0 0 1-5 5H7a5 5 0 0 1-5-5V7a5 5 0 0 1 5-5zm-0.8 13l0.4-0.2 3-5a0.5 0.5 0 0 0-0.8-0.6L6 13.7l-1-1a0.5 0.5 0 0 0-0.7 0.7l1.4 1.4 0.4 0.2zm7-5.1a0.5 0.5 0 0 1 0.7-0.8l2.1 2.2L18.1 9a0.5 0.5 0 0 1 0.8 0.8L16.7 12l2.2 2.1a0.5 0.5 0 0 1-0.8 0.8L16 12.7 13.9 15a0.5 0.5 0 0 1-0.8-0.8l2.2-2.1z"
       android:fillColor="?primaryText" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_private_browsing.xml b/app/src/main/res/drawable/ic_private_browsing.xml
index 4ee2bc80c..9bef32e8a 100644
--- a/app/src/main/res/drawable/ic_private_browsing.xml
+++ b/app/src/main/res/drawable/ic_private_browsing.xml
@@ -9,5 +9,5 @@
     android:viewportHeight="24">
     <path
         android:fillColor="?attr/primaryText"
-        android:pathData="M17.5,17c-2.1,0 -3.5,-2.5 -5.5,-2.5S8.4,17 6.5,17C3.9,17 2,14.6 2,10.4 2,7.8 2.8,7 6.1,7s4.3,1.4 5.9,1.4c1.6,0 2.6,-1.4 5.9,-1.4 3.3,0 4.1,0.8 4.1,3.4 0,4.2 -1.9,6.6 -4.5,6.6zM7.7,10.2c-2,0.1 -2.9,1.3 -2.9,1.6 0,0.3 1.3,1.1 2.7,1.1 1.3,0 2.9,-0.5 2.9,-0.9 0,-0.5 -0.8,-1.9 -2.7,-1.8zM16.3,10.2c-1.9,-0.1 -2.7,1.3 -2.7,1.8 0,0.4 1.5,0.9 2.9,0.9s2.7,-0.8 2.7,-1.1c-0.1,-0.3 -0.9,-1.5 -2.9,-1.6z" />
+        android:pathData="M17.5 17c-2.1 0-3.5-2.5-5.5-2.5S8.4 17 6.5 17C3.9 17 2 14.6 2 10.4 2 7.8 2.8 7 6.1 7s4.3 1.4 5.9 1.4c1.6 0 2.6-1.4 5.9-1.4 3.3 0 4.1 0.8 4.1 3.4 0 4.2-1.9 6.6-4.5 6.6zm-9.8-6.8c-2 0.1-2.9 1.3-2.9 1.6 0 0.3 1.3 1.1 2.7 1.1 1.3 0 2.9-0.5 2.9-0.9 0-0.5-0.8-1.9-2.7-1.8zm8.6 0c-1.9-0.1-2.7 1.3-2.7 1.8 0 0.4 1.5 0.9 2.9 0.9s2.7-0.8 2.7-1.1c-0.1-0.3-0.9-1.5-2.9-1.6z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_qr.xml b/app/src/main/res/drawable/ic_qr.xml
index 99ee9fb19..aa81e7c49 100644
--- a/app/src/main/res/drawable/ic_qr.xml
+++ b/app/src/main/res/drawable/ic_qr.xml
@@ -9,5 +9,5 @@
     android:viewportHeight="24">
     <path
         android:fillColor="?primaryText"
-        android:pathData="M17.5,3C19.433,3 21,4.567 21,6.5L21,9C21,9.5523 20.5523,10 20,10C19.4477,10 19,9.5523 19,9L19,6.5C19,5.6716 18.3284,5 17.5,5L15,5C14.4477,5 14,4.5523 14,4C14,3.4477 14.4477,3 15,3L17.5,3ZM20,14C20.5523,14 21,14.4477 21,15L21,17.5C21,19.433 19.433,21 17.5,21L15,21C14.4477,21 14,20.5523 14,20C14,19.4477 14.4477,19 15,19L17.5,19C18.3284,19 19,18.3284 19,17.5L19,15C19,14.4477 19.4477,14 20,14ZM9,19C9.5523,19 10,19.4477 10,20C10,20.5523 9.5523,21 9,21L6.5,21C4.567,21 3,19.433 3,17.5L3,15C3,14.4477 3.4477,14 4,14C4.5523,14 5,14.4477 5,15L5,17.5C5,18.3284 5.6716,19 6.5,19L9,19ZM4,10C3.4477,10 3,9.5523 3,9L3,6.5C3,4.567 4.567,3 6.5,3L9,3C9.5523,3 10,3.4477 10,4C10,4.5523 9.5523,5 9,5L6.5,5C5.6716,5 5,5.6716 5,6.5L5,9C5,9.5523 4.5523,10 4,10ZM15,7L17,7L17,9L15,9L15,7ZM7,9L7,7L11,7L11,9L11,11L9,11L7,11L7,9ZM15,11L17,11L17,13L15,13L15,11ZM9,13L11,13L11,15L9,15L9,13ZM15,15L17,15L17,17L15,17L15,15ZM11,15L13,15L13,17L11,17L11,15ZM7,15L9,15L9,17L7,17L7,15ZM13,13L15,13L15,15L13,15L13,13ZM13,9L15,9L15,11L13,11L13,9Z" />
+        android:pathData="M17.5 3c2 0 3.5 1.6 3.5 3.5V9a1 1 0 0 1-2 0V6.5c0-0.8-0.7-1.5-1.5-1.5H15a1 1 0 0 1 0-2h2.5zM20 14c0.6 0 1 0.4 1 1v2.5c0 2-1.6 3.5-3.5 3.5H15a1 1 0 0 1 0-2h2.5c0.8 0 1.5-0.7 1.5-1.5V15c0-0.6 0.4-1 1-1zM9 19a1 1 0 0 1 0 2H6.5c-2 0-3.5-1.6-3.5-3.5V15a1 1 0 0 1 2 0v2.5c0 0.8 0.7 1.5 1.5 1.5H9zm-5-9a1 1 0 0 1-1-1V6.5C3 4.5 4.6 3 6.5 3H9a1 1 0 0 1 0 2H6.5C5.7 5 5 5.7 5 6.5V9c0 0.6-0.4 1-1 1zm11-3h2v2h-2V7zM7 9V7h4v4H7V9zm8 2h2v2h-2v-2zm-6 2h2v2H9v-2zm6 2h2v2h-2v-2zm-4 0h2v2h-2v-2zm-4 0h2v2H7v-2zm6-2h2v2h-2v-2zm0-4h2v2h-2V9z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_readermode.xml b/app/src/main/res/drawable/ic_readermode.xml
index 05d8503dc..d5aac5b81 100644
--- a/app/src/main/res/drawable/ic_readermode.xml
+++ b/app/src/main/res/drawable/ic_readermode.xml
@@ -9,5 +9,5 @@
     android:viewportHeight="24">
     <path
         android:fillColor="?primaryText"
-        android:pathData="M16.69,21L7.31,21C5.4826,20.9983 4.0017,19.5174 4,17.69L4,6.31C4.0017,4.4826 5.4826,3.0017 7.31,3L16.69,3C18.5174,3.0017 19.9983,4.4826 20,6.31L20,17.69C19.9983,19.5174 18.5174,20.9983 16.69,21ZM7.31,5C6.5867,5.0006 6.0006,5.5867 6,6.31L6,17.69C6.0006,18.4133 6.5867,18.9994 7.31,19L16.69,19C17.4133,18.9994 17.9994,18.4133 18,17.69L18,6.31C17.9994,5.5867 17.4133,5.0006 16.69,5L7.31,5ZM15,8L9,8C8.7239,8 8.5,7.7761 8.5,7.5C8.5,7.2239 8.7239,7 9,7L15,7C15.2761,7 15.5,7.2239 15.5,7.5C15.5,7.7761 15.2761,8 15,8ZM15,11L9,11C8.7239,11 8.5,10.7761 8.5,10.5C8.5,10.2239 8.7239,10 9,10L15,10C15.2761,10 15.5,10.2239 15.5,10.5C15.5,10.7761 15.2761,11 15,11ZM15,14L9,14C8.7239,14 8.5,13.7761 8.5,13.5C8.5,13.2239 8.7239,13 9,13L15,13C15.2761,13 15.5,13.2239 15.5,13.5C15.5,13.7761 15.2761,14 15,14ZM11.571,17L9,17C8.7239,17 8.5,16.7761 8.5,16.5C8.5,16.2239 8.7239,16 9,16L11.571,16C11.8471,16 12.071,16.2239 12.071,16.5C12.071,16.7761 11.8471,17 11.571,17Z" />
+        android:pathData="M16.7 21H7.3A3.3 3.3 0 0 1 4 17.7V6.3C4 4.5 5.5 3 7.3 3h9.4C18.5 3 20 4.5 20 6.3v11.4c0 1.8-1.5 3.3-3.3 3.3zM7.3 5C6.6 5 6 5.6 6 6.3v11.4c0 0.7 0.6 1.3 1.3 1.3h9.4c0.7 0 1.3-0.6 1.3-1.3V6.3c0-0.7-0.6-1.3-1.3-1.3H7.3zM15 8H9a0.5 0.5 0 0 1 0-1h6a0.5 0.5 0 0 1 0 1zm0 3H9a0.5 0.5 0 0 1 0-1h6a0.5 0.5 0 0 1 0 1zm0 3H9a0.5 0.5 0 0 1 0-1h6a0.5 0.5 0 0 1 0 1zm-3.4 3H9a0.5 0.5 0 0 1 0-1h2.6a0.5 0.5 0 0 1 0 1z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_report_issues.xml b/app/src/main/res/drawable/ic_report_issues.xml
index 3b146413f..4c5019058 100644
--- a/app/src/main/res/drawable/ic_report_issues.xml
+++ b/app/src/main/res/drawable/ic_report_issues.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
diff --git a/app/src/main/res/drawable/ic_screenshots.xml b/app/src/main/res/drawable/ic_screenshots.xml
index ae7c1facf..c122cfa92 100644
--- a/app/src/main/res/drawable/ic_screenshots.xml
+++ b/app/src/main/res/drawable/ic_screenshots.xml
@@ -9,5 +9,5 @@
     android:viewportHeight="24">
     <path
         android:fillColor="?primaryText"
-        android:pathData="M10.4097,13.5843L14.9445,10.4447C16.0797,9.6588 17.6371,9.942 18.423,11.0772L7.9279,18.3431C7.9751,18.5545 8,18.7743 8,19C8,20.6569 6.6569,22 5,22C3.3431,22 2,20.6569 2,19C2,17.3431 3.3431,16 5,16C5.5103,16 5.9909,16.1274 6.4116,16.3522L8.2516,15.0783L6.4,13.654C5.9821,13.8749 5.5056,14 5,14C3.3431,14 2,12.6569 2,11C2,9.3431 3.3431,8 5,8C6.6569,8 8,9.3431 8,11C8,11.2312 7.9738,11.4563 7.9243,11.6725L10.4097,13.5843ZM13.648,16.0753L18.7621,20.0092C17.9203,21.1036 16.3507,21.3083 15.2563,20.4665L11.49,17.5693L13.648,16.0753ZM5,12C5.5523,12 6,11.5523 6,11C6,10.4477 5.5523,10 5,10C4.4477,10 4,10.4477 4,11C4,11.5523 4.4477,12 5,12ZM5,20C5.5523,20 6,19.5523 6,19C6,18.4477 5.5523,18 5,18C4.4477,18 4,18.4477 4,19C4,19.5523 4.4477,20 5,20ZM5,7C4.4477,7 4,6.5523 4,6L4,5C4,3.3431 5.3431,2 7,2L11,2C11.5523,2 12,2.4477 12,3C12,3.5523 11.5523,4 11,4L7,4C6.4477,4 6,4.4477 6,5L6,6C6,6.5523 5.5523,7 5,7ZM15,4C14.4477,4 14,3.5523 14,3C14,2.4477 14.4477,2 15,2L19,2C20.6569,2 22,3.3431 22,5L22,7C22,7.5523 21.5523,8 21,8C20.4477,8 20,7.5523 20,7L20,5C20,4.4477 19.5523,4 19,4L15,4ZM17,14L19,14C19.5523,14 20,13.5523 20,13L20,11C20,10.4477 20.4477,10 21,10C21.5523,10 22,10.4477 22,11L22,13C22,14.6569 20.6569,16 19,16L17,16C16.4477,16 16,15.5523 16,15C16,14.4477 16.4477,14 17,14Z" />
+        android:pathData="M10.4 13.6l4.5-3.2c1.2-0.7 2.7-0.5 3.5 0.7L8 18.3l0.1 0.7a3 3 0 1 1-1.6-2.6L8.3 15l-1.9-1.4a3 3 0 1 1 1.5-2l2.5 1.9zm3.2 2.5l5.2 4c-0.9 1-2.4 1.2-3.5 0.4l-3.8-3 2.1-1.4zM5 12a1 1 0 1 0 0-2 1 1 0 0 0 0 2zm0 8a1 1 0 1 0 0-2 1 1 0 0 0 0 2zM5 7a1 1 0 0 1-1-1V5a3 3 0 0 1 3-3h4a1 1 0 0 1 0 2H7a1 1 0 0 0-1 1v1c0 0.6-0.4 1-1 1zm10-3a1 1 0 0 1 0-2h4a3 3 0 0 1 3 3v2a1 1 0 0 1-2 0V5c0-0.6-0.4-1-1-1h-4zm2 10h2c0.6 0 1-0.4 1-1v-2a1 1 0 0 1 2 0v2a3 3 0 0 1-3 3h-2a1 1 0 0 1 0-2z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml
index 8a7d9ec5d..4cb6a8c00 100644
--- a/app/src/main/res/drawable/ic_search.xml
+++ b/app/src/main/res/drawable/ic_search.xml
@@ -9,5 +9,5 @@
     android:viewportHeight="24">
     <path
         android:fillColor="?primaryText"
-        android:pathData="M21.457,20.043L15.457,14.043C17.8623,10.8933 17.4137,6.4181 14.4311,3.8085C11.4484,1.1989 6.9533,1.3486 4.151,4.151C1.3486,6.9533 1.1989,11.4484 3.8085,14.4311C6.4181,17.4137 10.8933,17.8623 14.043,15.457L20.043,21.457C20.4354,21.836 21.0591,21.8306 21.4448,21.4448C21.8306,21.0591 21.836,20.4354 21.457,20.043L21.457,20.043ZM9.5,15C6.4624,15 4,12.5376 4,9.5C4,6.4624 6.4624,4 9.5,4C12.5376,4 15,6.4624 15,9.5C14.9967,12.5362 12.5362,14.9967 9.5,15Z" />
+        android:pathData="M21.5 20l-6-6a7.5 7.5 0 1 0-1.5 1.5l6 6a1 1 0 0 0 1.5-1.5zm-12-5a5.5 5.5 0 1 1 0-11 5.5 5.5 0 0 1 0 11z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_send.xml b/app/src/main/res/drawable/ic_send.xml
index 9a5d7d0ab..dd760ca0d 100644
--- a/app/src/main/res/drawable/ic_send.xml
+++ b/app/src/main/res/drawable/ic_send.xml
@@ -9,5 +9,5 @@
     android:viewportHeight="24">
     <path
         android:fillColor="?primaryText"
-        android:pathData="M11.293,2.293c0.39,-0.39 1.024,-0.39 1.414,0l6,6c0.379,0.392 0.374,1.016 -0.012,1.402 -0.386,0.385 -1.01,0.39 -1.402,0.012L13,5.414V17c0,0.552 -0.448,1 -1,1s-1,-0.448 -1,-1V5.414L6.707,9.707c-0.392,0.379 -1.016,0.373 -1.402,-0.012 -0.386,-0.386 -0.391,-1.01 -0.012,-1.402l6,-6zM3,17c0,-0.552 0.448,-1 1,-1s1,0.448 1,1v2c0,0.552 0.448,1 1,1h13c0.552,0 1,-0.448 1,-1v-2c0,-0.552 0.448,-1 1,-1s1,0.448 1,1v2c0,1.657 -1.343,3 -3,3H6c-1.657,0 -3,-1.343 -3,-3v-2z" />
+        android:pathData="M11.3 2.3a1 1 0 0 1 1.4 0l6 6a1 1 0 0 1-1.4 1.4L13 5.4V17a1 1 0 0 1-2 0V5.4L6.7 9.7a1 1 0 0 1-1.4-1.4l6-6zM3 17a1 1 0 0 1 2 0v2c0 0.6 0.4 1 1 1h13c0.6 0 1-0.4 1-1v-2a1 1 0 0 1 2 0v2a3 3 0 0 1-3 3H6a3 3 0 0 1-3-3v-2z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_session_restore.xml b/app/src/main/res/drawable/ic_session_restore.xml
deleted file mode 100644
index 9af5e6f5a..000000000
--- a/app/src/main/res/drawable/ic_session_restore.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#202340"
-        android:pathData="M10.5859,21L7,21C5.3431,21 4,19.6569 4,18L4,5C4,3.3431 5.3431,2 7,2L17,2C18.6569,2 20,3.3431 20,5L20,18C20,19.6569 18.6569,21 17,21C16.4477,21 16,20.5523 16,20C16,19.4477 16.4477,19 17,19C17.5523,19 18,18.5523 18,18L18,5C18,4.4477 17.5523,4 17,4L7,4C6.4477,4 6,4.4477 6,5L6,18C6,18.5523 6.4477,19 7,19L10.5858,19L9.2929,17.7071C8.9024,17.3166 8.9024,16.6834 9.2929,16.2929C9.6834,15.9024 10.3166,15.9024 10.7071,16.2929L13.7071,19.2929C14.0976,19.6834 14.0976,20.3165 13.7071,20.7071L10.7074,23.7071C10.3169,24.0976 9.6837,24.0976 9.2932,23.7071C8.9026,23.3166 8.9026,22.6835 9.2931,22.2929L10.5859,21Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_session_thumbnail_placeholder_greyscale.xml b/app/src/main/res/drawable/ic_session_thumbnail_placeholder_greyscale.xml
index 6938298e2..a8abc6705 100644
--- a/app/src/main/res/drawable/ic_session_thumbnail_placeholder_greyscale.xml
+++ b/app/src/main/res/drawable/ic_session_thumbnail_placeholder_greyscale.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
diff --git a/app/src/main/res/drawable/ic_settings.xml b/app/src/main/res/drawable/ic_settings.xml
index a251f28a1..051a9abb9 100644
--- a/app/src/main/res/drawable/ic_settings.xml
+++ b/app/src/main/res/drawable/ic_settings.xml
@@ -8,6 +8,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:pathData="M20.75,11L17.91,11C17.7599,10.1093 17.4094,9.2644 16.885,8.529L18.894,6.52C19.273,6.1276 19.2676,5.5039 18.8818,5.1182C18.4961,4.7324 17.8724,4.727 17.48,5.106L15.471,7.115C14.7356,6.5906 13.8907,6.2401 13,6.09L13,3.25C13,2.6977 12.5523,2.25 12,2.25C11.4477,2.25 11,2.6977 11,3.25L11,6.09C10.1093,6.2401 9.2644,6.5906 8.529,7.115L6.52,5.106C6.1276,4.727 5.5039,4.7324 5.1182,5.1182C4.7324,5.5039 4.727,6.1276 5.106,6.52L7.115,8.529C6.5906,9.2644 6.2401,10.1093 6.09,11L3.25,11C2.6977,11 2.25,11.4477 2.25,12C2.25,12.5523 2.6977,13 3.25,13L6.09,13C6.2436,13.9088 6.6057,14.7697 7.148,15.515C7.0646,15.555 6.9871,15.6065 6.918,15.668L5.106,17.48C4.846,17.7311 4.7418,18.1029 4.8333,18.4525C4.9248,18.8021 5.1979,19.0752 5.5475,19.1667C5.8971,19.2582 6.2689,19.154 6.52,18.894L8.332,17.082C8.3935,17.0129 8.445,16.9354 8.485,16.852C9.2303,17.3943 10.0912,17.7564 11,17.91L11,20.75C11,21.3023 11.4477,21.75 12,21.75C12.5523,21.75 13,21.3023 13,20.75L13,17.91C13.8907,17.7599 14.7356,17.4094 15.471,16.885L17.48,18.894C17.8724,19.273 18.4961,19.2676 18.8818,18.8818C19.2676,18.4961 19.273,17.8724 18.894,17.48L16.885,15.471C17.4094,14.7356 17.7599,13.8907 17.91,13L20.75,13C21.3023,13 21.75,12.5523 21.75,12C21.75,11.4477 21.3023,11 20.75,11ZM8,12C8,9.7909 9.7909,8 12,8C14.2091,8 16,9.7909 16,12C16,14.2091 14.2091,16 12,16C10.9391,16 9.9217,15.5786 9.1716,14.8284C8.4214,14.0783 8,13.0609 8,12Z"
+      android:pathData="M20.8 11h-2.9a6 6 0 0 0-1-2.5l2-2a1 1 0 0 0-1.4-1.4l-2 2a6 6 0 0 0-2.5-1V3.3a1 1 0 0 0-2 0V6a6 6 0 0 0-2.5 1l-2-2a1 1 0 0 0-1.4 1.4l2 2a6 6 0 0 0-1 2.5H3.3a1 1 0 0 0 0 2H6a6 6 0 0 0 1 2.5l-0.2 0.2-1.8 1.8a1 1 0 1 0 1.4 1.4L8.3 17l0.2-0.2a6 6 0 0 0 2.5 1v2.9a1 1 0 0 0 2 0v-2.9a6 6 0 0 0 2.5-1l2 2a1 1 0 0 0 1.4-1.4l-2-2a6 6 0 0 0 1-2.5h2.9a1 1 0 0 0 0-2zM8 12a4 4 0 1 1 8 0 4 4 0 0 1-8 0z"
       android:fillColor="?primaryText" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_shortcuts.xml b/app/src/main/res/drawable/ic_shortcuts.xml
index 30206504f..670d3e94c 100644
--- a/app/src/main/res/drawable/ic_shortcuts.xml
+++ b/app/src/main/res/drawable/ic_shortcuts.xml
@@ -8,6 +8,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:pathData="M10.0127,12.1576C10.0127,13.7366 10.6987,14.6946 11.8427,14.6946C13.0177,14.6946 13.7477,13.7256 13.7477,12.1576C13.7477,10.5906 13.0177,9.6206 11.8527,9.6206C10.6987,9.6206 10.0127,10.5676 10.0127,12.1576M20.9997,11.0916C20.9997,14.5206 19.3777,16.7316 16.7207,16.7316C15.3697,16.7316 14.3357,16.0786 14.0957,15.0216L13.9437,15.0216C13.4967,16.1106 12.5827,16.6986 11.3197,16.6986C9.0547,16.6986 7.5407,14.8586 7.5407,12.0926C7.5407,9.4466 9.0327,7.6386 11.2107,7.6386C12.3867,7.6386 13.3667,8.2266 13.7917,9.1846L13.9437,9.1846L13.9437,7.8786L16.1547,7.8786L16.1547,13.7046C16.1547,14.4556 16.5027,14.9346 17.1887,14.9346C18.2557,14.9346 18.9967,13.5736 18.9967,11.2546C18.9967,7.2906 16.2627,4.7316 12.1367,4.7316C7.9437,4.7316 5.0037,7.7586 5.0037,12.1366C5.0037,16.7196 8.0637,19.3986 12.5497,19.3986C13.7147,19.3986 14.9017,19.2466 15.5227,19.0176L15.5227,20.7606C14.6737,21.0116 13.5627,21.1636 12.3867,21.1636C6.8767,21.1636 2.9997,17.7116 2.9997,12.0816C2.9997,6.6806 6.7787,3.0006 12.2127,3.0006C17.3737,3.0006 20.9997,6.2446 20.9997,11.0916"
+      android:pathData="M10 12.2c0 1.5 0.7 2.5 1.8 2.5 1.2 0 2-1 2-2.5 0-1.6-0.8-2.6-2-2.6-1.1 0-1.8 1-1.8 2.6M21 11c0 3.4-1.6 5.6-4.3 5.6-1.3 0-2.4-0.6-2.6-1.7h-0.2c-0.4 1.1-1.3 1.7-2.6 1.7-2.2 0-3.8-1.8-3.8-4.6 0-2.7 1.5-4.5 3.7-4.5 1.2 0 2.2 0.6 2.6 1.6h0.1V7.9h2.3v5.8c0 0.8 0.3 1.2 1 1.2 1 0 1.8-1.3 1.8-3.6 0-4-2.7-6.6-6.9-6.6S5 7.7 5 12.1c0 4.6 3 7.3 7.6 7.3a10 10 0 0 0 3-0.4v1.8c-1 0.2-2 0.4-3.2 0.4C6.9 21.2 3 17.7 3 12 3 6.7 6.8 3 12.2 3c5.2 0 8.8 3.2 8.8 8"
       android:fillColor="?primaryText" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_tab_circle_background.xml b/app/src/main/res/drawable/ic_tab_circle_background.xml
index 02fcffc15..5ccc2e5e9 100644
--- a/app/src/main/res/drawable/ic_tab_circle_background.xml
+++ b/app/src/main/res/drawable/ic_tab_circle_background.xml
@@ -23,7 +23,7 @@
             android:viewportHeight="24">
             <path
                 android:fillColor="@color/tab_circle_icon_foreground"
-                android:pathData="M15.2222,22L5.7778,22C3.6914,22 2,20.3086 2,18.2222L2,8.7778C2,6.6914 3.6914,5 5.7778,5L15.2222,5C17.3086,5 19,6.6914 19,8.7778L19,18.2222C19,20.3086 17.3086,22 15.2222,22ZM5.8571,7C4.8315,7 4,7.8315 4,8.8571L4,18.1429C4,19.1685 4.8315,20 5.8571,20L15.1429,20C16.1685,20 17,19.1685 17,18.1429L17,8.8571C17,7.8315 16.1685,7 15.1429,7L5.8571,7ZM6,4C6,2.8954 6.8954,2 8,2L15.9866,2C19.3004,2 21.9866,4.6863 21.9866,8C21.9866,8.008 21.9866,8.008 21.9866,8.016L21.9632,16.0027C21.96,17.1073 21.062,18.0003 19.9573,17.9973L19.9866,8.0107L19.9866,8C19.9866,5.7909 18.1958,4 15.9866,4L6,4Z"/>
+                android:pathData="M15.22 22H5.78A3.78 3.78 0 0 1 2 18.22V8.78C2 6.69 3.7 5 5.78 5h9.44C17.31 5 19 6.7 19 8.78v9.44c0 2.09-1.7 3.78-3.78 3.78zM5.86 7C4.83 7 4 7.83 4 8.86v9.28C4 19.17 4.83 20 5.86 20h9.28c1.03 0 1.86-.83 1.86-1.86V8.86C17 7.83 16.17 7 15.14 7H5.86zM6 4c0-1.1.9-2 2-2h7.99a6 6 0 0 1 6 6v.02L21.96 16a2 2 0 0 1-2 2L19.99 8V8a4 4 0 0 0-4-4H6z"/>
         </vector>
     </item>
 </layer-list>
diff --git a/app/src/main/res/drawable/ic_tab_collection.xml b/app/src/main/res/drawable/ic_tab_collection.xml
index 8d70fa51e..b78a92c35 100644
--- a/app/src/main/res/drawable/ic_tab_collection.xml
+++ b/app/src/main/res/drawable/ic_tab_collection.xml
@@ -2,7 +2,6 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
diff --git a/app/src/main/res/drawable/ic_tabs.xml b/app/src/main/res/drawable/ic_tabs.xml
index 07e99077d..3fc7883d5 100644
--- a/app/src/main/res/drawable/ic_tabs.xml
+++ b/app/src/main/res/drawable/ic_tabs.xml
@@ -8,6 +8,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:pathData="M15.2222,22L5.7778,22C3.6914,22 2,20.3086 2,18.2222L2,8.7778C2,6.6914 3.6914,5 5.7778,5L15.2222,5C17.3086,5 19,6.6914 19,8.7778L19,18.2222C19,20.3086 17.3086,22 15.2222,22ZM5.8571,7C4.8315,7 4,7.8315 4,8.8571L4,18.1429C4,19.1685 4.8315,20 5.8571,20L15.1429,20C16.1685,20 17,19.1685 17,18.1429L17,8.8571C17,7.8315 16.1685,7 15.1429,7L5.8571,7ZM6,4C6,2.8954 6.8954,2 8,2L15.9866,2C19.3004,2 21.9866,4.6863 21.9866,8C21.9866,8.008 21.9866,8.008 21.9866,8.016L21.9632,16.0027C21.96,17.1073 21.062,18.0003 19.9573,17.9973L19.9866,8.0107L19.9866,8C19.9866,5.7909 18.1958,4 15.9866,4L6,4Z"
+      android:pathData="M15.22 22H5.78A3.78 3.78 0 0 1 2 18.22V8.78C2 6.69 3.7 5 5.78 5h9.44C17.31 5 19 6.7 19 8.78v9.44c0 2.09-1.7 3.78-3.78 3.78zM5.86 7C4.83 7 4 7.83 4 8.86v9.28C4 19.17 4.83 20 5.86 20h9.28c1.03 0 1.86-.83 1.86-1.86V8.86C17 7.83 16.17 7 15.14 7H5.86zM6 4c0-1.1.9-2 2-2h7.99a6 6 0 0 1 6 6v.02L21.96 16a2 2 0 0 1-2 2L19.99 8V8a4 4 0 0 0-4-4H6z"
       android:fillColor="?primaryText" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_tracking_protection.xml b/app/src/main/res/drawable/ic_tracking_protection.xml
index bef318ec1..8cfd085b7 100644
--- a/app/src/main/res/drawable/ic_tracking_protection.xml
+++ b/app/src/main/res/drawable/ic_tracking_protection.xml
@@ -9,5 +9,5 @@
     android:viewportHeight="24">
     <path
         android:fillColor="?primaryText"
-        android:pathData="M20,6.047C19.9965,4.9927 19.2276,4.0971 18.186,3.934L12,2.912L5.816,3.933C4.7741,4.0968 4.0049,4.9923 4,6.047C4,7.729 4.012,9.954 4.111,11.005C4.411,14.205 5.033,15.96 6.56,17.954C7.8759,19.6329 9.7831,20.746 11.892,21.066L12,21.078L12.107,21.066C14.2159,20.746 16.1231,19.6329 17.439,17.954C18.967,15.96 19.584,14.206 19.888,11.005L19.888,11.005C19.993,9.891 20,7.421 20,6.047ZM17.9,10.815C17.63,13.659 17.152,15.043 15.855,16.739C14.8897,17.9499 13.5217,18.7739 12,19.061C10.4792,18.7737 9.1122,17.9496 8.148,16.739C6.848,15.039 6.372,13.659 6.103,10.816C6.031,10.059 6,8.367 6,6.054C6.0036,5.9768 6.0631,5.9138 6.14,5.906L12,4.939L17.861,5.907C17.9376,5.9135 17.9972,5.9762 18,6.053C18.005,8.328 17.968,10.064 17.9,10.815ZM8,7.626C8.015,9.593 8.066,10.365 8.091,10.626C8.347,13.326 8.785,14.282 9.733,15.526C10.3122,16.2484 11.1061,16.7677 12,17.009L12,6.967L8,7.626Z" />
+        android:pathData="M20 6c0-1-0.8-1.9-1.8-2L12 3 5.8 4C4.8 4 4 5 4 6l0.1 5c0.3 3.2 1 5 2.5 7a8.4 8.4 0 0 0 5.3 3h0.2c2.1-0.3 4-1.4 5.3-3 1.6-2 2.2-3.8 2.5-7l0.1-5zm-2.1 4.8a10 10 0 0 1-2 6c-1 1.1-2.4 2-3.9 2.3a6.5 6.5 0 0 1-3.9-2.4 9.9 9.9 0 0 1-2-5.9 67.3 67.3 0 0 1 0-4.9L12 5l5.9 1 0.1 0.2-0.1 4.7zM8 7.6v3c0.3 2.7 0.8 3.7 1.7 5 0.6 0.6 1.4 1.2 2.3 1.4V7l-4 0.6z" />
 </vector>
diff --git a/app/src/main/res/drawable/library_icon_downloads_circle_background.xml b/app/src/main/res/drawable/library_icon_downloads_circle_background.xml
index 3025ce1e3..6ca85d50b 100644
--- a/app/src/main/res/drawable/library_icon_downloads_circle_background.xml
+++ b/app/src/main/res/drawable/library_icon_downloads_circle_background.xml
@@ -23,7 +23,7 @@
             android:viewportHeight="24">
             <path
                 android:fillColor="@color/library_downloads_icon"
-                android:pathData="M11.293,17.707L5.293,11.707C4.914,11.3146 4.9194,10.6909 5.3052,10.3052C5.6909,9.9194 6.3146,9.914 6.707,10.293L11,14.586L11,3C11,2.4477 11.4477,2 12,2C12.5523,2 13,2.4477 13,3L13,14.586L17.293,10.293C17.6854,9.914 18.3091,9.9194 18.6948,10.3052C19.0806,10.6909 19.086,11.3146 18.707,11.707L12.707,17.707C12.3165,18.0974 11.6835,18.0974 11.293,17.707ZM18,20C18.5523,20 19,20.4477 19,21C19,21.5523 18.5523,22 18,22L6,22C5.4477,22 5,21.5523 5,21C5,20.4477 5.4477,20 6,20L18,20Z"/>
+                android:pathData="M11.3 17.7l-6-6a1 1 0 0 1 1.4-1.4l4.3 4.3V3a1 1 0 0 1 2 0v11.6l4.3-4.3a1 1 0 0 1 1.4 1.4l-6 6a1 1 0 0 1-1.4 0zM18 20a1 1 0 0 1 0 2H6a1 1 0 0 1 0-2h12z"/>
         </vector>
     </item>
 </layer-list>
diff --git a/app/src/main/res/drawable/library_icon_history_circle_background.xml b/app/src/main/res/drawable/library_icon_history_circle_background.xml
index a21200e43..714342ab0 100644
--- a/app/src/main/res/drawable/library_icon_history_circle_background.xml
+++ b/app/src/main/res/drawable/library_icon_history_circle_background.xml
@@ -23,7 +23,7 @@
             android:viewportHeight="24">
             <path
                 android:fillColor="@color/library_history_icon"
-                android:pathData="M12,22C6.4772,22 2,17.5228 2,12C2,6.4772 6.4772,2 12,2C17.5228,2 22,6.4772 22,12C21.9939,17.5203 17.5203,21.9939 12,22L12,22ZM12,4C7.5817,4 4,7.5817 4,12C4,16.4183 7.5817,20 12,20C16.4183,20 20,16.4183 20,12C19.995,7.5838 16.4162,4.005 12,4ZM16.5,13L11.5,13C11.2239,13 11,12.7761 11,12.5L11,7.5C11,7.2239 11.2239,7 11.5,7C11.7761,7 12,7.2239 12,7.5L12,12L16.5,12C16.7761,12 17,12.2239 17,12.5C17,12.7761 16.7761,13 16.5,13Z"/>
+                android:pathData="M12 22a10 10 0 1 1 0-20 10 10 0 0 1 0 20zm0-18a8 8 0 1 0 0 16 8 8 0 0 0 0-16zm4.5 9h-5a0.5 0.5 0 0 1-0.5-0.5v-5a0.5 0.5 0 0 1 1 0V12h4.5a0.5 0.5 0 0 1 0 1z"/>
         </vector>
     </item>
 </layer-list>
diff --git a/app/src/main/res/drawable/library_icon_reading_list_circle_background.xml b/app/src/main/res/drawable/library_icon_reading_list_circle_background.xml
index f562f606e..e0ecf99a1 100644
--- a/app/src/main/res/drawable/library_icon_reading_list_circle_background.xml
+++ b/app/src/main/res/drawable/library_icon_reading_list_circle_background.xml
@@ -23,7 +23,7 @@
             android:viewportHeight="24">
             <path
                 android:fillColor="@color/library_reading_list_icon"
-                android:pathData="M16.69,21L7.31,21C5.4826,20.9983 4.0017,19.5174 4,17.69L4,6.31C4.0017,4.4826 5.4826,3.0017 7.31,3L16.69,3C18.5174,3.0017 19.9983,4.4826 20,6.31L20,17.69C19.9983,19.5174 18.5174,20.9983 16.69,21ZM7.31,5C6.5867,5.0006 6.0006,5.5867 6,6.31L6,17.69C6.0006,18.4133 6.5867,18.9994 7.31,19L16.69,19C17.4133,18.9994 17.9994,18.4133 18,17.69L18,6.31C17.9994,5.5867 17.4133,5.0006 16.69,5L7.31,5ZM15,8L9,8C8.7239,8 8.5,7.7761 8.5,7.5C8.5,7.2239 8.7239,7 9,7L15,7C15.2761,7 15.5,7.2239 15.5,7.5C15.5,7.7761 15.2761,8 15,8ZM15,11L9,11C8.7239,11 8.5,10.7761 8.5,10.5C8.5,10.2239 8.7239,10 9,10L15,10C15.2761,10 15.5,10.2239 15.5,10.5C15.5,10.7761 15.2761,11 15,11ZM15,14L9,14C8.7239,14 8.5,13.7761 8.5,13.5C8.5,13.2239 8.7239,13 9,13L15,13C15.2761,13 15.5,13.2239 15.5,13.5C15.5,13.7761 15.2761,14 15,14ZM11.571,17L9,17C8.7239,17 8.5,16.7761 8.5,16.5C8.5,16.2239 8.7239,16 9,16L11.571,16C11.8471,16 12.071,16.2239 12.071,16.5C12.071,16.7761 11.8471,17 11.571,17Z" />
+                android:pathData="M16.7 21H7.3A3.3 3.3 0 0 1 4 17.7V6.3C4 4.5 5.5 3 7.3 3h9.4C18.5 3 20 4.5 20 6.3v11.4c0 1.8-1.5 3.3-3.3 3.3zM7.3 5C6.6 5 6 5.6 6 6.3v11.4c0 0.7 0.6 1.3 1.3 1.3h9.4c0.7 0 1.3-0.6 1.3-1.3V6.3c0-0.7-0.6-1.3-1.3-1.3H7.3zM15 8H9a0.5 0.5 0 0 1 0-1h6a0.5 0.5 0 0 1 0 1zm0 3H9a0.5 0.5 0 0 1 0-1h6a0.5 0.5 0 0 1 0 1zm0 3H9a0.5 0.5 0 0 1 0-1h6a0.5 0.5 0 0 1 0 1zm-3.4 3H9a0.5 0.5 0 0 1 0-1h2.6a0.5 0.5 0 0 1 0 1z" />
         </vector>
     </item>
 </layer-list>
diff --git a/app/src/main/res/drawable/library_icon_screenshots_circle_background.xml b/app/src/main/res/drawable/library_icon_screenshots_circle_background.xml
index c76f74028..47487182b 100644
--- a/app/src/main/res/drawable/library_icon_screenshots_circle_background.xml
+++ b/app/src/main/res/drawable/library_icon_screenshots_circle_background.xml
@@ -23,7 +23,7 @@
             android:viewportHeight="24">
             <path
                 android:fillColor="@color/library_screenshots_icon"
-                android:pathData="M6,7.1707C7.1652,7.5825 8,8.6938 8,10C8,10.2312 7.9738,10.4563 7.9243,10.6725L10.4097,12.5843L14.9445,9.4447C16.0797,8.6588 17.6371,8.942 18.423,10.0772L7.9279,17.3431C7.9751,17.5545 8,17.7743 8,18C8,19.6569 6.6569,21 5,21C3.3431,21 2,19.6569 2,18C2,16.3431 3.3431,15 5,15C5.5103,15 5.9909,15.1274 6.4116,15.3522L8.2516,14.0783L6.4,12.654C5.9821,12.8749 5.5056,13 5,13C3.3431,13 2,11.6569 2,10C2,8.6938 2.8348,7.5825 4,7.1707L4,6L6,6L6,7.1707ZM6,2L6,4L4,4C4,2.8954 4.8954,2 6,2ZM8,2L10,2L10,4L8,4L8,2ZM12,2L14,2L14,4L12,4L12,2ZM16,2L18,2L18,4L16,4L16,2ZM20,2C21.1046,2 22,2.8954 22,4L20,4L20,2ZM20,6L22,6L22,8L20,8L20,6ZM20,10L22,10L22,12L20,12L20,10ZM20,14L22,14C22,15.1046 21.1046,16 20,16L20,14ZM13.648,15.0753L18.7621,19.0092C17.9203,20.1036 16.3507,20.3083 15.2563,19.4665L11.49,16.5693L13.648,15.0753ZM5,11C5.5523,11 6,10.5523 6,10C6,9.4477 5.5523,9 5,9C4.4477,9 4,9.4477 4,10C4,10.5523 4.4477,11 5,11ZM5,19C5.5523,19 6,18.5523 6,18C6,17.4477 5.5523,17 5,17C4.4477,17 4,17.4477 4,18C4,18.5523 4.4477,19 5,19Z"/>
+                android:pathData="M10.4 13.6l4.5-3.2c1.2-0.7 2.7-0.5 3.5 0.7L8 18.3l0.1 0.7a3 3 0 1 1-1.6-2.6L8.3 15l-1.9-1.4a3 3 0 1 1 1.5-2l2.5 1.9zm3.2 2.5l5.2 4c-0.9 1-2.4 1.2-3.5 0.4l-3.8-3 2.1-1.4zM5 12a1 1 0 1 0 0-2 1 1 0 0 0 0 2zm0 8a1 1 0 1 0 0-2 1 1 0 0 0 0 2zM5 7a1 1 0 0 1-1-1V5a3 3 0 0 1 3-3h4a1 1 0 0 1 0 2H7a1 1 0 0 0-1 1v1c0 0.6-0.4 1-1 1zm10-3a1 1 0 0 1 0-2h4a3 3 0 0 1 3 3v2a1 1 0 0 1-2 0V5c0-0.6-0.4-1-1-1h-4zm2 10h2c0.6 0 1-0.4 1-1v-2a1 1 0 0 1 2 0v2a3 3 0 0 1-3 3h-2a1 1 0 0 1 0-2z"/>
         </vector>
     </item>
 </layer-list>
diff --git a/app/src/main/res/drawable/library_icon_sessions_circle_background.xml b/app/src/main/res/drawable/library_icon_sessions_circle_background.xml
deleted file mode 100644
index 2655074f0..000000000
--- a/app/src/main/res/drawable/library_icon_sessions_circle_background.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="oval">
-            <size
-                android:width="40dp"
-                android:height="40dp" />
-            <solid android:color="@color/library_sessions_icon_background" />
-        </shape>
-    </item>
-    <item
-        android:bottom="8dp"
-        android:left="8dp"
-        android:right="8dp"
-        android:top="8dp">
-        <vector
-            android:width="24dp"
-            android:height="24dp"
-            android:viewportWidth="24"
-            android:viewportHeight="24">
-            <path
-                android:fillColor="@color/library_sessions_icon"
-                android:pathData="M10.5859,21L7,21C5.3431,21 4,19.6569 4,18L4,5C4,3.3431 5.3431,2 7,2L17,2C18.6569,2 20,3.3431 20,5L20,18C20,19.6569 18.6569,21 17,21C16.4477,21 16,20.5523 16,20C16,19.4477 16.4477,19 17,19C17.5523,19 18,18.5523 18,18L18,5C18,4.4477 17.5523,4 17,4L7,4C6.4477,4 6,4.4477 6,5L6,18C6,18.5523 6.4477,19 7,19L10.5858,19L9.2929,17.7071C8.9024,17.3166 8.9024,16.6834 9.2929,16.2929C9.6834,15.9024 10.3166,15.9024 10.7071,16.2929L13.7071,19.2929C14.0976,19.6834 14.0976,20.3165 13.7071,20.7071L10.7074,23.7071C10.3169,24.0976 9.6837,24.0976 9.2932,23.7071C8.9026,23.3166 8.9026,22.6835 9.2931,22.2929L10.5859,21Z" />
-        </vector>
-    </item>
-</layer-list>
diff --git a/app/src/main/res/drawable/mozac_ui_tabcounter_box.xml b/app/src/main/res/drawable/mozac_ui_tabcounter_box.xml
deleted file mode 100644
index efb343f09..000000000
--- a/app/src/main/res/drawable/mozac_ui_tabcounter_box.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="?primaryText"
-        android:pathData="M15.2222,22L5.7778,22C3.6914,22 2,20.3086 2,18.2222L2,8.7778C2,6.6914 3.6914,5 5.7778,5L15.2222,5C17.3086,5 19,6.6914 19,8.7778L19,18.2222C19,20.3086 17.3086,22 15.2222,22ZM5.8571,7C4.8315,7 4,7.8315 4,8.8571L4,18.1429C4,19.1685 4.8315,20 5.8571,20L15.1429,20C16.1685,20 17,19.1685 17,18.1429L17,8.8571C17,7.8315 16.1685,7 15.1429,7L5.8571,7ZM6,4C6,2.8954 6.8954,2 8,2L15.9866,2C19.3004,2 21.9866,4.6863 21.9866,8C21.9866,8.008 21.9866,8.008 21.9866,8.016L21.9632,16.0027C21.96,17.1073 21.062,18.0003 19.9573,17.9973L19.9866,8.0107L19.9866,8C19.9866,5.7909 18.1958,4 15.9866,4L6,4Z" />
-</vector>
diff --git a/app/src/main/res/drawable/private_browsing_button.xml b/app/src/main/res/drawable/private_browsing_button.xml
index e55d21ef2..344500088 100644
--- a/app/src/main/res/drawable/private_browsing_button.xml
+++ b/app/src/main/res/drawable/private_browsing_button.xml
@@ -23,7 +23,7 @@
             android:viewportHeight="24">
             <path
                 android:fillColor="?attr/privateBrowsingButtonAccent"
-                android:pathData="M17.5,17c-2.1,0 -3.5,-2.5 -5.5,-2.5S8.4,17 6.5,17C3.9,17 2,14.6 2,10.4 2,7.8 2.8,7 6.1,7s4.3,1.4 5.9,1.4c1.6,0 2.6,-1.4 5.9,-1.4 3.3,0 4.1,0.8 4.1,3.4 0,4.2 -1.9,6.6 -4.5,6.6zM7.7,10.2c-2,0.1 -2.9,1.3 -2.9,1.6 0,0.3 1.3,1.1 2.7,1.1 1.3,0 2.9,-0.5 2.9,-0.9 0,-0.5 -0.8,-1.9 -2.7,-1.8zM16.3,10.2c-1.9,-0.1 -2.7,1.3 -2.7,1.8 0,0.4 1.5,0.9 2.9,0.9s2.7,-0.8 2.7,-1.1c-0.1,-0.3 -0.9,-1.5 -2.9,-1.6z" />
+                android:pathData="M17.5 17c-2.1 0-3.5-2.5-5.5-2.5S8.4 17 6.5 17C3.9 17 2 14.6 2 10.4 2 7.8 2.8 7 6.1 7s4.3 1.4 5.9 1.4c1.6 0 2.6-1.4 5.9-1.4 3.3 0 4.1 0.8 4.1 3.4 0 4.2-1.9 6.6-4.5 6.6zm-9.8-6.8c-2 0.1-2.9 1.3-2.9 1.6 0 0.3 1.3 1.1 2.7 1.1 1.3 0 2.9-0.5 2.9-0.9 0-0.5-0.8-1.9-2.7-1.8zm8.6 0c-1.9-0.1-2.7 1.3-2.7 1.8 0 0.4 1.5 0.9 2.9 0.9s2.7-0.8 2.7-1.1c-0.1-0.3-0.9-1.5-2.9-1.6z" />
         </vector>
     </item>
 </layer-list>
diff --git a/app/src/main/res/drawable/quick_action_icon_close.xml b/app/src/main/res/drawable/quick_action_icon_close.xml
index 0249c6880..6ac688814 100644
--- a/app/src/main/res/drawable/quick_action_icon_close.xml
+++ b/app/src/main/res/drawable/quick_action_icon_close.xml
@@ -22,7 +22,7 @@
           android:viewportWidth="24"
           android:viewportHeight="24">
     <path
-        android:pathData="M13.3588,11.981L17.7411,7.5987C18.0934,7.2259 18.0851,6.6403 17.7224,6.2776C17.3597,5.9149 16.7741,5.9066 16.4013,6.2589L12.019,10.6412L7.6367,6.2589C7.2638,5.9066 6.6783,5.9149 6.3156,6.2776C5.9529,6.6403 5.9446,7.2259 6.2969,7.5987L10.6792,11.981L6.2969,16.3633C6.0461,16.6002 5.9439,16.9547 6.03,17.2888C6.1162,17.6229 6.3771,17.8838 6.7112,17.97C7.0453,18.0561 7.3998,17.9539 7.6367,17.7031L12.019,13.3208L16.4013,17.7031C16.7741,18.0554 17.3597,18.0471 17.7224,17.6844C18.0851,17.3217 18.0934,16.7362 17.7411,16.3633L13.3588,11.981Z"
+        android:pathData="M13.36 11.98l4.38-4.38a0.95 0.95 0 0 0-1.34-1.34l-4.38 4.38-4.38-4.38A0.95 0.95 0 0 0 6.3 7.6l4.38 4.38-4.38 4.38a0.95 0.95 0 1 0 1.34 1.34l4.38-4.38 4.38 4.38a0.95 0.95 0 0 0 1.34-1.34l-4.38-4.38z"
         android:fillColor="@color/quick_action_reader_close_icon"/>
   </vector>
 </item>
diff --git a/app/src/main/res/drawable/quick_action_icon_read.xml b/app/src/main/res/drawable/quick_action_icon_read.xml
index 8002b4340..831d1539a 100644
--- a/app/src/main/res/drawable/quick_action_icon_read.xml
+++ b/app/src/main/res/drawable/quick_action_icon_read.xml
@@ -12,18 +12,18 @@
         </shape>
     </item>
     <item
-        android:bottom="8dp"
-        android:left="8dp"
-        android:right="8dp"
-        android:top="8dp">
+            android:bottom="8dp"
+            android:left="8dp"
+            android:right="8dp"
+            android:top="8dp">
         <vector
-            android:width="24dp"
-            android:height="24dp"
-            android:viewportWidth="24"
-            android:viewportHeight="24">
+                android:width="24dp"
+                android:height="24dp"
+                android:viewportWidth="24"
+                android:viewportHeight="24">
             <path
-                android:fillColor="@color/quick_action_read_icon"
-                android:pathData="M15,7L9,7a0.5,0.5 0,0 0,-0.5 0.5,0.5 0.5,0 0,0 0.5,0.5h6a0.5,0.5 0,0 0,0 -1zM15,10L9,10a0.5,0.5 0,0 0,0 1h6a0.5,0.5 0,0 0,0 -1zM15,13L9,13a0.5,0.5 0,0 0,0 1h6a0.5,0.5 0,0 0,0 -1zM11.57,16L9,16a0.5,0.5 0,0 0,0 1h2.57a0.5,0.5 0,0 0,0 -1zM16.69,3L7.31,3A3.31,3.31 0,0 0,4 6.31v11.38A3.31,3.31 0,0 0,7.31 21h9.38A3.31,3.31 0,0 0,20 17.69L20,6.31A3.31,3.31 0,0 0,16.69 3zM18,17.69A1.31,1.31 0,0 1,16.69 19L7.31,19A1.31,1.31 0,0 1,6 17.69L6,6.31A1.31,1.31 0,0 1,7.31 5h9.38A1.31,1.31 0,0 1,18 6.31z"/>
+                    android:fillColor="@color/quick_action_read_icon"
+                    android:pathData="M16.7 21H7.3A3.3 3.3 0 0 1 4 17.7V6.3C4 4.5 5.5 3 7.3 3h9.4C18.5 3 20 4.5 20 6.3v11.4c0 1.8-1.5 3.3-3.3 3.3zM7.3 5C6.6 5 6 5.6 6 6.3v11.4c0 0.7 0.6 1.3 1.3 1.3h9.4c0.7 0 1.3-0.6 1.3-1.3V6.3c0-0.7-0.6-1.3-1.3-1.3H7.3zM15 8H9a0.5 0.5 0 0 1 0-1h6a0.5 0.5 0 0 1 0 1zm0 3H9a0.5 0.5 0 0 1 0-1h6a0.5 0.5 0 0 1 0 1zm0 3H9a0.5 0.5 0 0 1 0-1h6a0.5 0.5 0 0 1 0 1zm-3.4 3H9a0.5 0.5 0 0 1 0-1h2.6a0.5 0.5 0 0 1 0 1z"/>
         </vector>
     </item>
 </layer-list>
diff --git a/app/src/main/res/drawable/quick_action_icon_read_with_notification.xml b/app/src/main/res/drawable/quick_action_icon_read_with_notification.xml
index b3f703140..09560761b 100644
--- a/app/src/main/res/drawable/quick_action_icon_read_with_notification.xml
+++ b/app/src/main/res/drawable/quick_action_icon_read_with_notification.xml
@@ -1,40 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-    <!-- This Source Code Form is subject to the terms of the Mozilla Public
-       - License, v. 2.0. If a copy of the MPL was not distributed with this
-       - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-<item>
-  <shape android:shape="oval">
-    <size
-        android:width="40dp"
-        android:height="40dp" />
-    <solid android:color="@color/quick_action_read_icon_background" />
-  </shape>
-</item>
-<item
-    android:bottom="8dp"
-    android:left="8dp"
-    android:right="8dp"
-    android:top="8dp">
-  <vector
-          android:width="24dp"
-          android:height="24dp"
-          android:viewportWidth="24"
-          android:viewportHeight="24">
-    <path
-        android:fillColor="@color/quick_action_read_icon"
-        android:pathData="M15,7L9,7a0.5,0.5 0,0 0,-0.5 0.5,0.5 0.5,0 0,0 0.5,0.5h6a0.5,0.5 0,0 0,0 -1zM15,10L9,10a0.5,0.5 0,0 0,0 1h6a0.5,0.5 0,0 0,0 -1zM15,13L9,13a0.5,0.5 0,0 0,0 1h6a0.5,0.5 0,0 0,0 -1zM11.57,16L9,16a0.5,0.5 0,0 0,0 1h2.57a0.5,0.5 0,0 0,0 -1zM16.69,3L7.31,3A3.31,3.31 0,0 0,4 6.31v11.38A3.31,3.31 0,0 0,7.31 21h9.38A3.31,3.31 0,0 0,20 17.69L20,6.31A3.31,3.31 0,0 0,16.69 3zM18,17.69A1.31,1.31 0,0 1,16.69 19L7.31,19A1.31,1.31 0,0 1,6 17.69L6,6.31A1.31,1.31 0,0 1,7.31 5h9.38A1.31,1.31 0,0 1,18 6.31z"/>
-  </vector>
-</item>
-
-  <item android:left="32dp"
-        android:bottom="32dp">
-    <shape
-        android:shape="oval">
-      <stroke android:width="1dp" android:color="@color/light_grey_05" />
-      <solid android:color="?accentBright" />
-      <size android:width="14dp"
-            android:height="14dp"/>
-    </shape>
-  </item>
+    <item android:drawable="@drawable/quick_action_icon_read" />
+    <item
+            android:left="32dp"
+            android:bottom="32dp">
+        <shape
+                android:shape="oval">
+            <stroke
+                    android:width="1dp"
+                    android:color="@color/light_grey_05" />
+            <solid android:color="?accentBright" />
+            <size
+                    android:width="14dp"
+                    android:height="14dp"/>
+        </shape>
+    </item>
 </layer-list>
diff --git a/app/src/main/res/drawable/quick_action_icon_share.xml b/app/src/main/res/drawable/quick_action_icon_share.xml
index bee6382be..9adf47ea6 100644
--- a/app/src/main/res/drawable/quick_action_icon_share.xml
+++ b/app/src/main/res/drawable/quick_action_icon_share.xml
@@ -1,29 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
-    <!-- This Source Code Form is subject to the terms of the Mozilla Public
-       - License, v. 2.0. If a copy of the MPL was not distributed with this
-       - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-<item>
-  <shape android:shape="oval">
-    <size
-        android:width="40dp"
-        android:height="40dp" />
-    <solid android:color="@color/quick_action_share_icon_background"/>
-  </shape>
-</item>
-<item
-    android:bottom="8dp"
-    android:left="8dp"
-    android:right="8dp"
-    android:top="8dp">
-  <vector
-          android:width="24dp"
-          android:height="24dp"
-          android:viewportWidth="24"
-          android:viewportHeight="24">
-    <path
-        android:fillColor="@color/quick_action_share_icon"
-        android:pathData="M17,14a4,4 0,0 0,-2.91 1.27L9.87,13a3.68,3.68 0,0 0,0 -1.94l4.22,-2.3A4,4 0,1 0,13 6a3.85,3.85 0,0 0,0.13 1L8.91,9.27a4,4 0,1 0,0 5.46L13.13,17a3.85,3.85 0,0 0,-0.13 1,4 4,0 1,0 4,-4zM17,4a2,2 0,1 1,-2 2,2 2,0 0,1 2,-2zM6,14a2,2 0,1 1,2 -2,2 2,0 0,1 -2,2zM17,20a2,2 0,1 1,2 -2,2 2,0 0,1 -2,2z"/>
-  </vector>
-</item>
+    <item>
+        <shape android:shape="oval">
+            <size android:width="40dp"
+                  android:height="40dp" />
+            <solid android:color="@color/quick_action_share_icon_background"/>
+        </shape>
+    </item>
+    <item android:bottom="8dp"
+          android:left="8dp"
+          android:right="8dp"
+          android:top="8dp">
+      <vector android:width="24dp"
+              android:height="24dp"
+              android:viewportWidth="24"
+              android:viewportHeight="24">
+        <path android:fillColor="@color/quick_action_share_icon"
+              android:pathData="M17 14a3.99 3.99 0 0 0-2.91 1.27L9.87 13c0.17-0.63 0.17-1.3 0-1.94l4.22-2.3A4 4 0 1 0 13.13 7L8.91 9.27a4 4 0 1 0 0 5.46L13.13 17A4 4 0 1 0 17 14zm0-10a2 2 0 1 1 0 4 2 2 0 0 1 0-4zM6 14a2 2 0 1 1 0-4 2 2 0 0 1 0 4zm11 6a2 2 0 1 1 0-4 2 2 0 0 1 0 4z"/>
+      </vector>
+    </item>
 </layer-list>
diff --git a/app/src/main/res/layout/mozac_ui_tabcounter_layout.xml b/app/src/main/res/layout/mozac_ui_tabcounter_layout.xml
index a25b30d61..96777e30e 100644
--- a/app/src/main/res/layout/mozac_ui_tabcounter_layout.xml
+++ b/app/src/main/res/layout/mozac_ui_tabcounter_layout.xml
@@ -20,7 +20,7 @@
             android:layout_width="24dp"
             android:layout_height="24dp"
             android:importantForAccessibility="no"
-            android:src="@drawable/mozac_ui_tabcounter_box"/>
+            android:src="@drawable/ic_tabs"/>
 
         <!-- This text size auto adjusts based on num digits in `TabCounter` -->
         <TextView