diff --git a/app/src/main/res/drawable/ic_about.xml b/app/src/main/res/drawable/ic_about.xml
deleted file mode 100644
index 68d28237b..000000000
--- a/app/src/main/res/drawable/ic_about.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="16"
-    android:viewportHeight="16">
-    <path
-        android:fillColor="?attr/iconColor"
-        android:pathData="M8,15a7,7 0,1 1,7 -7,7 7,0 0,1 -7,7zM8,2a6,6 0,1 0,6 6,6 6,0 0,0 -6,-6zM8,12a1,1 0,0 1,-1 -1L7,8a1,1 0,0 1,2 0v3a1,1 0,0 1,-1 1zM8,6a1,1 0,1 1,1 -1,1 1,0 0,1 -1,1z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_archive.xml b/app/src/main/res/drawable/ic_archive.xml
index 658cfe185..8d08925b2 100644
--- a/app/src/main/res/drawable/ic_archive.xml
+++ b/app/src/main/res/drawable/ic_archive.xml
@@ -7,7 +7,8 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="?attr/iconColor"
-        android:pathData="M13,14.623l1.277,-1.318c0.382,-0.394 1.015,-0.408 1.414,-0.032 0.4,0.377 0.413,1.002 0.032,1.396l-2.933,3.026c-0.387,0.4 -1.033,0.407 -1.43,0.016l-3.067,-3.027c-0.39,-0.385 -0.39,-1.01 0,-1.395s1.024,-0.385 1.414,0L11,14.565v-3.638c0,-0.512 0.448,-0.927 1,-0.927s1,0.415 1,0.927v3.696zM20,8L4,8v11c0,0.552 0.448,1 1,1h14c0.552,0 1,-0.448 1,-1L20,8zM18.79,6l-1.457,-1.66c-0.19,-0.216 -0.464,-0.34 -0.751,-0.34L7.828,4c-0.265,0 -0.52,0.105 -0.707,0.293L5.414,6h13.377zM2,19L2,7.828c0,-0.795 0.316,-1.558 0.879,-2.12l2.828,-2.83C6.27,2.317 7.033,2 7.828,2h8.754c0.863,0 1.684,0.372 2.254,1.02l2.418,2.754c0.48,0.547 0.746,1.251 0.746,1.98L22,19c0,1.657 -1.343,3 -3,3L5,22c-1.657,0 -3,-1.343 -3,-3z" />
+  <path
+      android:pathData="M13,14.6449L14.2772,13.309C14.6588,12.9098 15.2918,12.8955 15.691,13.2772C16.0902,13.6588 16.1045,14.2918 15.7228,14.691L12.7903,17.7585C12.4026,18.1641 11.7571,18.1713 11.3604,17.7746L8.2929,14.7071C7.9024,14.3166 7.9024,13.6834 8.2929,13.2929C8.6834,12.9024 9.3166,12.9024 9.7071,13.2929L11,14.5858L11,11C11,10.4477 11.4477,10 12,10C12.5523,10 13,10.4477 13,11L13,14.6449ZM20,8L4,8L4,19C4,19.5523 4.4477,20 5,20L19,20C19.5523,20 20,19.5523 20,19L20,8ZM18.7908,6L17.333,4.3401C17.1432,4.1239 16.8694,4 16.5817,4L7.8284,4C7.5632,4 7.3089,4.1054 7.1213,4.2929L5.4142,6L18.7908,6ZM2,19L2,7.8284C2,7.0328 2.3161,6.2697 2.8787,5.7071L5.7071,2.8787C6.2697,2.3161 7.0328,2 7.8284,2L16.5817,2C17.4448,2 18.2662,2.3718 18.8358,3.0203L21.2541,5.7739C21.7349,6.3213 22,7.025 22,7.7536L22,19C22,20.6569 20.6569,22 19,22L5,22C3.3431,22 2,20.6569 2,19Z"
+      android:fillColor="?attr/iconColor"
+      android:fillType="evenOdd" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_close.xml b/app/src/main/res/drawable/ic_close.xml
index 57218f9f0..b199f8841 100644
--- a/app/src/main/res/drawable/ic_close.xml
+++ b/app/src/main/res/drawable/ic_close.xml
@@ -5,9 +5,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="?attr/iconColor"
-        android:pathData="M13.326,12l4.337,-4.337a0.938,0.938 0,0 0,-1.326 -1.326L12,10.674 7.663,6.337A0.938,0.938 0,0 0,6.337 7.663L10.674,12 6.337,16.337a0.938,0.938 0,0 0,1.326 1.326L12,13.326l4.337,4.337a0.938,0.938 0,0 0,1.326 -1.326Z" />
+    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:fillColor="?attr/iconColor"
+      android:fillType="evenOdd" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_delete.xml b/app/src/main/res/drawable/ic_delete.xml
index b2ddf70fa..3b9fd43b2 100644
--- a/app/src/main/res/drawable/ic_delete.xml
+++ b/app/src/main/res/drawable/ic_delete.xml
@@ -7,7 +7,8 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#202340"
-        android:pathData="M12.531,17.5c-0.276,0 -0.5,-0.223 -0.5,-0.5L12,9c0,-0.275 0.224,-0.5 0.5,-0.5s0.5,0.225 0.5,0.5l0.031,8c0,0.277 -0.224,0.5 -0.5,0.5zM15,17.5c-0.276,0 -0.5,-0.223 -0.5,-0.5L14.5,9c0,-0.275 0.224,-0.5 0.5,-0.5s0.5,0.225 0.5,0.5v8c0,0.277 -0.224,0.5 -0.5,0.5zM10,17.5c-0.276,0 -0.5,-0.223 -0.5,-0.5L9.5,9c0,-0.275 0.224,-0.5 0.5,-0.5s0.5,0.225 0.5,0.5v8c0,0.277 -0.224,0.5 -0.5,0.5zM19,4h-3.684c-0.417,-1.197 -1.547,-2 -2.816,-2s-2.399,0.803 -2.816,2L6,4c-0.552,0 -1,0.449 -1,1 0,0.553 0.448,1 1,1v13c0,1.658 1.343,3 3,3h7c1.657,0 3,-1.342 3,-3L19,6c0.552,0 1,-0.447 1,-1 0,-0.551 -0.448,-1 -1,-1zM12.5,3c0.711,0.003 1.368,0.384 1.722,1h-3.444c0.354,-0.616 1.01,-0.997 1.722,-1zM17,19c0,0.553 -0.448,1 -1,1L9,20c-0.552,0 -1,-0.447 -1,-1L8,6h9v13z" />
+  <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:fillColor="?attr/deleteColor"
+      android:fillType="evenOdd" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_feedback.xml b/app/src/main/res/drawable/ic_feedback.xml
deleted file mode 100644
index ed52f59e9..000000000
--- a/app/src/main/res/drawable/ic_feedback.xml
+++ /dev/null
@@ -1,15 +0,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/. -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="16"
-    android:viewportHeight="16">
-    <path
-        android:fillColor="?attr/iconColor"
-        android:pathData="M13.577,1H2.423A2.426,2.426 0,0 0,0 3.423v6.154A2.426,2.426 0,0 0,2.423 12H8.26l2.966,3.633A1,1 0,0 0,13 15v-3h0.577A2.426,2.426 0,0 0,16 9.577V3.423A2.426,2.426 0,0 0,13.577 1zM14,9.577a0.423,0.423 0,0 1,-0.423 0.423H12a1,1 0,0 0,-1 1v1.194l-1.491,-1.827A1,1 0,0 0,8.734 10H2.423A0.423,0.423 0,0 1,2 9.577V3.423A0.423,0.423 0,0 1,2.423 3h11.154a0.423,0.423 0,0 1,0.423 0.423z" />
-    <path
-        android:fillColor="?attr/iconColor"
-        android:pathData="M11.5,5h-7a0.5,0.5 0,0 0,0 1h7a0.5,0.5 0,0 0,0 -1zM11.5,7h-7a0.5,0.5 0,0 0,0 1h7a0.5,0.5 0,0 0,0 -1z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_formfill.xml b/app/src/main/res/drawable/ic_formfill.xml
index f0b2a3ff8..1d685a7f8 100644
--- a/app/src/main/res/drawable/ic_formfill.xml
+++ b/app/src/main/res/drawable/ic_formfill.xml
@@ -1,11 +1,14 @@
+<?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 android:height="24dp" android:viewportHeight="16"
-    android:viewportWidth="16" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="?attr/iconColor" android:pathData="M7.281,5H8.75A0.25,0.25 0,0 0,9 4.75V0.984a0.984,0.984 0,0 0,-1.969 0V4.75a0.25,0.25 0,0 0,0.25 0.25z"/>
-    <path android:fillColor="?attr/iconColor" android:pathData="M13.5,2H11a1,1 0,0 0,0 2h2.5a0.5,0.5 0,0 1,0.5 0.5v7a0.5,0.5 0,0 1,-0.5 0.5h-11a0.5,0.5 0,0 1,-0.5 -0.5v-7a0.5,0.5 0,0 1,0.5 -0.5H5a1,1 0,0 0,0 -2H2.5A2.5,2.5 0,0 0,0 4.5v7A2.5,2.5 0,0 0,2.5 14h11a2.5,2.5 0,0 0,2.5 -2.5v-7A2.5,2.5 0,0 0,13.5 2z"/>
-    <path android:fillColor="?attr/iconColor" android:pathData="M3.577,6L6.423,6A0.577,0.577 0,0 1,7 6.577L7,9.423A0.577,0.577 0,0 1,6.423 10L3.577,10A0.577,0.577 0,0 1,3 9.423L3,6.577A0.577,0.577 0,0 1,3.577 6z"/>
-    <path android:fillColor="?attr/iconColor" android:pathData="M9.5,7h3a0.5,0.5 0,0 0,0 -1h-3a0.5,0.5 0,0 0,0 1zM9.5,8a0.5,0.5 0,0 0,0 1h2a0.5,0.5 0,0 0,0 -1z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="?attr/iconColor"
+        android:fillType="evenOdd"
+        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" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_help.xml b/app/src/main/res/drawable/ic_help.xml
index b796388a9..f64a0c6c3 100644
--- a/app/src/main/res/drawable/ic_help.xml
+++ b/app/src/main/res/drawable/ic_help.xml
@@ -9,6 +9,6 @@
     android:viewportHeight="24">
     <path
         android:fillColor="?attr/iconColor"
-        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:strokeWidth="1" />
+        android:fillType="evenOdd"
+        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" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_info.xml b/app/src/main/res/drawable/ic_info.xml
new file mode 100644
index 000000000..815d71e07
--- /dev/null
+++ b/app/src/main/res/drawable/ic_info.xml
@@ -0,0 +1,14 @@
+<?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,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:fillColor="?attr/iconColor"
+      android:fillType="evenOdd" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_internet.xml b/app/src/main/res/drawable/ic_internet.xml
index b0c06c0be..1a3158d13 100644
--- a/app/src/main/res/drawable/ic_internet.xml
+++ b/app/src/main/res/drawable/ic_internet.xml
@@ -3,11 +3,12 @@
    - 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">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <path
-            android:fillColor="?attr/iconColor"
-            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,-10zM19.931,11h-3.95c-0.026,-2.22 -0.437,-4.42 -1.217,-6.5 2.798,1.036 4.79,3.54 5.167,6.5zM12,20c-0.48,0 -1.808,-2.4 -1.981,-7h3.962c-0.173,4.6 -1.501,7 -1.981,7zM10.019,11c0.173,-4.6 1.5,-7 1.981,-7 0.481,0 1.808,2.4 1.981,7h-3.962zM9.236,4.5c-0.78,2.08 -1.191,4.28 -1.217,6.5h-3.95c0.378,-2.96 2.369,-5.464 5.167,-6.5zM4.069,13h3.95c0.026,2.22 0.437,4.42 1.217,6.5 -2.798,-1.036 -4.79,-3.54 -5.167,-6.5zM14.769,19.5c0.778,-2.08 1.188,-4.28 1.212,-6.5h3.95c-0.378,2.96 -2.369,5.464 -5.167,6.5h0.005z"/>
+        android:fillColor="?attr/iconColor"
+        android:fillType="evenOdd"
+        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" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_link.xml b/app/src/main/res/drawable/ic_link.xml
index 41ca6720c..c8d85d3bc 100644
--- a/app/src/main/res/drawable/ic_link.xml
+++ b/app/src/main/res/drawable/ic_link.xml
@@ -1,16 +1,14 @@
+<?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="20"
-    android:viewportHeight="20">
-  <path
-      android:pathData="M2.47,5.53L5.515,2.485C5.7829,2.2172 6.2171,2.2172 6.485,2.485L10.685,6.685C11.4609,5.7001 11.3815,4.2915 10.5,3.4L7.837,0.734C6.863,-0.2399 5.284,-0.2399 4.31,0.734L0.766,4.279C0.2984,4.7465 0.0356,5.3807 0.0356,6.042C0.0356,6.7033 0.2984,7.3375 0.766,7.805L3.426,10.466C4.3,11.3366 5.68,11.4354 6.669,10.698L2.47,6.5C2.3409,6.3716 2.2683,6.1971 2.2683,6.015C2.2683,5.8329 2.3409,5.6584 2.47,5.53ZM19.27,12.163L19.266,12.163C20.2383,13.137 20.2379,14.7145 19.265,15.688L15.72,19.232C15.2525,19.6996 14.6183,19.9624 13.957,19.9624C13.2957,19.9624 12.6615,19.6996 12.194,19.232L9.533,16.572C8.6621,15.6985 8.5633,14.3186 9.301,13.33L13.501,17.53C13.6293,17.6588 13.8037,17.7312 13.9855,17.7312C14.1673,17.7312 14.3417,17.6588 14.47,17.53L17.512,14.479C17.7798,14.2111 17.7798,13.7769 17.512,13.509L13.312,9.309C14.2998,8.53 15.7139,8.612 16.605,9.5L19.27,12.163ZM14.163,12.718C14.542,13.1104 14.5366,13.7341 14.1508,14.1198C13.7651,14.5056 13.1414,14.511 12.749,14.132L5.829,7.212C5.559,6.9632 5.4471,6.5864 5.5375,6.2306C5.6279,5.8747 5.906,5.597 6.262,5.5071C6.6179,5.4172 6.9946,5.5297 7.243,5.8L14.163,12.718Z"
-      android:strokeWidth="1"
-      android:fillColor="?pillWrapperSelectedBackground"
-      android:fillType="evenOdd"
-      android:strokeColor="#00000000"/>
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="?attr/pillWrapperSelectedBackground"
+        android:fillType="evenOdd"
+        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" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_login.xml b/app/src/main/res/drawable/ic_login.xml
index f40790a3e..16baaecfd 100644
--- a/app/src/main/res/drawable/ic_login.xml
+++ b/app/src/main/res/drawable/ic_login.xml
@@ -7,7 +7,8 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="?attr/iconColor"
-        android:pathData="M11.377,4.842c-1.045,1.18 -1.531,2.752 -1.334,4.315L9,10.2c-0.144,0.174 -0.144,0.426 0,0.6 0.115,0.206 0.26,0.393 0.429,0.557 0.216,0.19 0.408,0.406 0.571,0.643l-7,7v1.7c-0.002,0.08 0.03,0.157 0.086,0.214 0.057,0.057 0.134,0.088 0.214,0.086H7v-1h1v-1.5h1V18h1v-2h1l1.6,-1.6h0.3l0.6,0.6c0.3,0.3 0.3,0.3 0.469,0.3 0.134,-0.01 0.26,-0.068 0.354,-0.163l0.9,-1.151c0.093,0 0.185,0.014 0.279,0.014 3.038,0 5.5,-2.462 5.5,-5.5S18.54,3 15.502,3c-1.578,-0.008 -3.08,0.663 -4.125,1.842zM17.5,8c-0.828,0 -1.5,-0.672 -1.5,-1.5S16.672,5 17.5,5s1.5,0.672 1.5,1.5S18.328,8 17.5,8z" />
+  <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:fillColor="?attr/iconColor"
+      android:fillType="evenOdd" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_notification.xml b/app/src/main/res/drawable/ic_notification.xml
index 77691cf3e..cf83dd755 100644
--- a/app/src/main/res/drawable/ic_notification.xml
+++ b/app/src/main/res/drawable/ic_notification.xml
@@ -3,11 +3,12 @@
    - 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.0"
-        android:viewportHeight="24.0">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <path
-            android:fillColor="?attr/iconColor"
-            android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4c0,1.1 0.89,2 2,2zM18,16v-5c0,-3.07 -1.64,-5.64 -4.5,-6.32L13.5,4c0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.5,0.67 -1.5,1.5v0.68C7.63,5.36 6,7.92 6,11v5l-2,2v1h16v-1l-2,-2z"/>
+        android:fillColor="?attr/iconColor"
+        android:fillType="evenOdd"
+        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" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_qr.xml b/app/src/main/res/drawable/ic_qr.xml
index 7061d64a8..4e64c4a74 100644
--- a/app/src/main/res/drawable/ic_qr.xml
+++ b/app/src/main/res/drawable/ic_qr.xml
@@ -3,12 +3,12 @@
    - 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="18dp"
-    android:height="18dp"
-    android:viewportWidth="18"
-    android:viewportHeight="18">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <path
         android:fillColor="?attr/iconColor"
-        android:pathData="M14.5,0C16.433,0 18,1.567 18,3.5L18,6C18,6.5523 17.5523,7 17,7C16.4477,7 16,6.5523 16,6L16,3.5C16,2.6716 15.3284,2 14.5,2L12,2C11.4477,2 11,1.5523 11,1C11,0.4477 11.4477,0 12,0L14.5,0ZM17,11C17.5523,11 18,11.4477 18,12L18,14.5C18,16.433 16.433,18 14.5,18L12,18C11.4477,18 11,17.5523 11,17C11,16.4477 11.4477,16 12,16L14.5,16C15.3284,16 16,15.3284 16,14.5L16,12C16,11.4477 16.4477,11 17,11ZM6,16C6.5523,16 7,16.4477 7,17C7,17.5523 6.5523,18 6,18L3.5,18C1.567,18 0,16.433 0,14.5L0,12C0,11.4477 0.4477,11 1,11C1.5523,11 2,11.4477 2,12L2,14.5C2,15.3284 2.6716,16 3.5,16L6,16ZM1,7C0.4477,7 0,6.5523 0,6L0,3.5C0,1.567 1.567,0 3.5,0L6,0C6.5523,0 7,0.4477 7,1C7,1.5523 6.5523,2 6,2L3.5,2C2.6716,2 2,2.6716 2,3.5L2,6C2,6.5523 1.5523,7 1,7ZM12,4L14,4L14,6L12,6L12,4ZM4,6L4,4L8,4L8,6L8,8L6,8L4,8L4,6ZM12,8L14,8L14,10L12,10L12,8ZM6,10L8,10L8,12L6,12L6,10ZM12,12L14,12L14,14L12,14L12,12ZM8,12L10,12L10,14L8,14L8,12ZM4,12L6,12L6,14L4,14L4,12ZM10,10L12,10L12,12L10,12L10,10ZM10,6L12,6L12,8L10,8L10,6Z"
-        android:strokeWidth="1" />
+        android:fillType="evenOdd"
+        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" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_screenshots.xml b/app/src/main/res/drawable/ic_screenshots.xml
index ac181a06a..518c05fe9 100644
--- a/app/src/main/res/drawable/ic_screenshots.xml
+++ b/app/src/main/res/drawable/ic_screenshots.xml
@@ -9,6 +9,6 @@
     android:viewportHeight="24">
     <path
         android:fillColor="?attr/iconColor"
-        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:strokeWidth="1" />
+        android:fillType="evenOdd"
+        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" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml
index 3838005b9..a0c6fb9a0 100644
--- a/app/src/main/res/drawable/ic_search.xml
+++ b/app/src/main/res/drawable/ic_search.xml
@@ -5,9 +5,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <path
         android:fillColor="?attr/iconColor"
-        android:pathData="M21.457,20.043l-6,-6a7.528,7.528 0,1 0,-1.414 1.414l6,6a1,1 0,0 0,1.414 -1.414ZM9.5,15A5.5,5.5 0,1 1,15 9.5,5.507 5.507,0 0,1 9.5,15Z" />
+        android:fillType="evenOdd"
+        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" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_settings.xml b/app/src/main/res/drawable/ic_settings.xml
index f84287b39..57f111417 100644
--- a/app/src/main/res/drawable/ic_settings.xml
+++ b/app/src/main/res/drawable/ic_settings.xml
@@ -7,7 +7,8 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="?attr/iconColor"
-        android:pathData="M20.75,11C21.3023,11 21.75,11.4477 21.75,12C21.75,12.5523 21.3023,13 20.75,13L17.91,13C17.7599,13.8907 17.4094,14.7356 16.885,15.471L18.894,17.48C19.273,17.8724 19.2676,18.4961 18.8818,18.8818C18.4961,19.2676 17.8724,19.273 17.48,18.894L15.471,16.885C14.7356,17.4094 13.8907,17.7599 13,17.91L13,20.75C13,21.3023 12.5523,21.75 12,21.75C11.4477,21.75 11,21.3023 11,20.75L11,17.91C10.0912,17.7564 9.2303,17.3943 8.485,16.852C8.445,16.9354 8.3935,17.0129 8.332,17.082L6.52,18.894C6.2689,19.154 5.8971,19.2582 5.5475,19.1667C5.1979,19.0752 4.9248,18.8021 4.8333,18.4525C4.7418,18.1029 4.846,17.7311 5.106,17.48L6.918,15.668C6.9871,15.6065 7.0646,15.555 7.148,15.515C6.6057,14.7697 6.2436,13.9088 6.09,13L3.25,13C2.6977,13 2.25,12.5523 2.25,12C2.25,11.4477 2.6977,11 3.25,11L6.09,11C6.2401,10.1093 6.5906,9.2644 7.115,8.529L5.106,6.52C4.727,6.1276 4.7324,5.5039 5.1182,5.1182C5.5039,4.7324 6.1276,4.727 6.52,5.106L8.529,7.115C9.2644,6.5906 10.1093,6.2401 11,6.09L11,3.25C11,2.6977 11.4477,2.25 12,2.25C12.5523,2.25 13,2.6977 13,3.25L13,6.09C13.8907,6.2401 14.7356,6.5906 15.471,7.115L17.48,5.106C17.8724,4.727 18.4961,4.7324 18.8818,5.1182C19.2676,5.5039 19.273,6.1276 18.894,6.52L16.885,8.529C17.4094,9.2644 17.7599,10.1093 17.91,11L20.75,11ZM8,12C8,13.0609 8.4214,14.0783 9.1716,14.8284C9.9217,15.5786 10.9391,16 12,16C14.2091,16 16,14.2091 16,12C16,9.7909 14.2091,8 12,8C9.7909,8 8,9.7909 8,12Z" />
+  <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:fillColor="?attr/iconColor"
+      android:fillType="evenOdd" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_shortcuts.xml b/app/src/main/res/drawable/ic_shortcuts.xml
index c8ab5131d..2c213532a 100644
--- a/app/src/main/res/drawable/ic_shortcuts.xml
+++ b/app/src/main/res/drawable/ic_shortcuts.xml
@@ -3,12 +3,12 @@
    - 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="18dp"
-    android:height="18dp"
-    android:viewportWidth="18"
-    android:viewportHeight="18">
-    <path
-        android:fillColor="?attr/iconColor"
-        android:pathData="M7.0127,9.1576C7.0127,10.7366 7.6987,11.6946 8.8427,11.6946C10.0177,11.6946 10.7477,10.7256 10.7477,9.1576C10.7477,7.5906 10.0177,6.6206 8.8527,6.6206C7.6987,6.6206 7.0127,7.5676 7.0127,9.1576M17.9997,8.0916C17.9997,11.5206 16.3777,13.7316 13.7207,13.7316C12.3697,13.7316 11.3357,13.0786 11.0957,12.0216L10.9437,12.0216C10.4967,13.1106 9.5827,13.6986 8.3197,13.6986C6.0547,13.6986 4.5407,11.8586 4.5407,9.0926C4.5407,6.4466 6.0327,4.6386 8.2107,4.6386C9.3867,4.6386 10.3667,5.2266 10.7917,6.1846L10.9437,6.1846L10.9437,4.8786L13.1547,4.8786L13.1547,10.7046C13.1547,11.4556 13.5027,11.9346 14.1887,11.9346C15.2557,11.9346 15.9967,10.5736 15.9967,8.2546C15.9967,4.2906 13.2627,1.7316 9.1367,1.7316C4.9437,1.7316 2.0037,4.7586 2.0037,9.1366C2.0037,13.7196 5.0637,16.3986 9.5497,16.3986C10.7147,16.3986 11.9017,16.2466 12.5227,16.0176L12.5227,17.7606C11.6737,18.0116 10.5627,18.1636 9.3867,18.1636C3.8767,18.1636 -0.0003,14.7116 -0.0003,9.0816C-0.0003,3.6806 3.7787,0.0006 9.2127,0.0006C14.3737,0.0006 17.9997,3.2446 17.9997,8.0916"
-        android:strokeWidth="1" />
+    android:width="24dp"
+    android:height="24dp"
+    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:fillColor="?attr/iconColor"
+      android:fillType="evenOdd" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_tabs.xml b/app/src/main/res/drawable/ic_tabs.xml
index f9dfecc8b..676d003d7 100644
--- a/app/src/main/res/drawable/ic_tabs.xml
+++ b/app/src/main/res/drawable/ic_tabs.xml
@@ -7,7 +7,8 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#202340"
-        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" />
+  <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:fillColor="?attr/browserToolbarIcons"
+      android:fillType="evenOdd" />
 </vector>
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index da86cec88..50c166e25 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -72,7 +72,7 @@
             android:key="@string/pref_key_data_choices"
             android:title="@string/preferences_data_choices" />
         <androidx.preference.SwitchPreference
-            android:icon="@drawable/ic_about"
+            android:icon="@drawable/ic_info"
             android:key="@string/pref_key_leakcanary"
             android:title="@string/preference_leakcanary"
             android:defaultValue="false" />
@@ -100,11 +100,11 @@
             android:key="@string/pref_key_rate"
             android:title="@string/preferences_rate" />
         <androidx.preference.Preference
-            android:icon="@drawable/ic_feedback"
+            android:icon="@drawable/ic_notification"
             android:key="@string/pref_key_feedback"
             android:title="@string/preferences_feedback" />
         <androidx.preference.Preference
-            android:icon="@drawable/ic_about"
+            android:icon="@drawable/ic_info"
             android:key="@string/pref_key_about"
             android:title="@string/preferences_about" />
     </androidx.preference.PreferenceCategory>