diff --git a/app/src/main/res/drawable-hdpi/fenix_error_1.webp b/app/src/main/res/drawable-hdpi/fenix_error_1.webp
new file mode 100644
index 000000000..8fc5384a8
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/fenix_error_1.webp differ
diff --git a/app/src/main/res/drawable-hdpi/sessions_01.png b/app/src/main/res/drawable-hdpi/sessions_01.png
deleted file mode 100644
index 2f78dcc24..000000000
Binary files a/app/src/main/res/drawable-hdpi/sessions_01.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/sessions_02.png b/app/src/main/res/drawable-hdpi/sessions_02.png
deleted file mode 100644
index a401c9df3..000000000
Binary files a/app/src/main/res/drawable-hdpi/sessions_02.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/sessions_03.png b/app/src/main/res/drawable-hdpi/sessions_03.png
deleted file mode 100644
index dc613690b..000000000
Binary files a/app/src/main/res/drawable-hdpi/sessions_03.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/sessions_06.png b/app/src/main/res/drawable-hdpi/sessions_06.png
deleted file mode 100644
index 5e1c596ea..000000000
Binary files a/app/src/main/res/drawable-hdpi/sessions_06.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/sessions_07.png b/app/src/main/res/drawable-hdpi/sessions_07.png
deleted file mode 100644
index d40776906..000000000
Binary files a/app/src/main/res/drawable-hdpi/sessions_07.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/sessions_08.png b/app/src/main/res/drawable-hdpi/sessions_08.png
deleted file mode 100644
index 4247f1981..000000000
Binary files a/app/src/main/res/drawable-hdpi/sessions_08.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/fenix_error_1.webp b/app/src/main/res/drawable-mdpi/fenix_error_1.webp
new file mode 100644
index 000000000..be9037919
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/fenix_error_1.webp differ
diff --git a/app/src/main/res/drawable-mdpi/sessions_01.png b/app/src/main/res/drawable-mdpi/sessions_01.png
deleted file mode 100644
index 136f353d6..000000000
Binary files a/app/src/main/res/drawable-mdpi/sessions_01.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/sessions_02.png b/app/src/main/res/drawable-mdpi/sessions_02.png
deleted file mode 100644
index a9e522312..000000000
Binary files a/app/src/main/res/drawable-mdpi/sessions_02.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/sessions_03.png b/app/src/main/res/drawable-mdpi/sessions_03.png
deleted file mode 100644
index e0df09795..000000000
Binary files a/app/src/main/res/drawable-mdpi/sessions_03.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/sessions_06.png b/app/src/main/res/drawable-mdpi/sessions_06.png
deleted file mode 100644
index 9830b286a..000000000
Binary files a/app/src/main/res/drawable-mdpi/sessions_06.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/sessions_07.png b/app/src/main/res/drawable-mdpi/sessions_07.png
deleted file mode 100644
index 609dbbada..000000000
Binary files a/app/src/main/res/drawable-mdpi/sessions_07.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/sessions_08.png b/app/src/main/res/drawable-mdpi/sessions_08.png
deleted file mode 100644
index 63dde7778..000000000
Binary files a/app/src/main/res/drawable-mdpi/sessions_08.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/fenix_error_1.webp b/app/src/main/res/drawable-xhdpi/fenix_error_1.webp
new file mode 100644
index 000000000..6207ed3fd
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/fenix_error_1.webp differ
diff --git a/app/src/main/res/drawable-xhdpi/sessions_01.png b/app/src/main/res/drawable-xhdpi/sessions_01.png
deleted file mode 100644
index bcbd7fcd6..000000000
Binary files a/app/src/main/res/drawable-xhdpi/sessions_01.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/sessions_02.png b/app/src/main/res/drawable-xhdpi/sessions_02.png
deleted file mode 100644
index 4f92b7785..000000000
Binary files a/app/src/main/res/drawable-xhdpi/sessions_02.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/sessions_03.png b/app/src/main/res/drawable-xhdpi/sessions_03.png
deleted file mode 100644
index be69d1c71..000000000
Binary files a/app/src/main/res/drawable-xhdpi/sessions_03.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/sessions_06.png b/app/src/main/res/drawable-xhdpi/sessions_06.png
deleted file mode 100644
index 1ed0bcab0..000000000
Binary files a/app/src/main/res/drawable-xhdpi/sessions_06.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/sessions_07.png b/app/src/main/res/drawable-xhdpi/sessions_07.png
deleted file mode 100644
index 370cab386..000000000
Binary files a/app/src/main/res/drawable-xhdpi/sessions_07.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/sessions_08.png b/app/src/main/res/drawable-xhdpi/sessions_08.png
deleted file mode 100644
index eb071d90f..000000000
Binary files a/app/src/main/res/drawable-xhdpi/sessions_08.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/fenix_error_1.webp b/app/src/main/res/drawable-xxhdpi/fenix_error_1.webp
new file mode 100644
index 000000000..2d9b5b84e
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/fenix_error_1.webp differ
diff --git a/app/src/main/res/drawable-xxhdpi/sessions_01.png b/app/src/main/res/drawable-xxhdpi/sessions_01.png
deleted file mode 100644
index 21fb5ae77..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/sessions_01.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/sessions_02.png b/app/src/main/res/drawable-xxhdpi/sessions_02.png
deleted file mode 100644
index 9063ac2ad..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/sessions_02.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/sessions_03.png b/app/src/main/res/drawable-xxhdpi/sessions_03.png
deleted file mode 100644
index d1b193fc8..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/sessions_03.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/sessions_06.png b/app/src/main/res/drawable-xxhdpi/sessions_06.png
deleted file mode 100644
index adb94abd2..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/sessions_06.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/sessions_07.png b/app/src/main/res/drawable-xxhdpi/sessions_07.png
deleted file mode 100644
index ba5d662bc..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/sessions_07.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/sessions_08.png b/app/src/main/res/drawable-xxhdpi/sessions_08.png
deleted file mode 100644
index 00157f765..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/sessions_08.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/fenix_error_1.webp b/app/src/main/res/drawable-xxxhdpi/fenix_error_1.webp
new file mode 100644
index 000000000..cca99c5b1
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/fenix_error_1.webp differ
diff --git a/app/src/main/res/drawable-xxxhdpi/sessions_01.png b/app/src/main/res/drawable-xxxhdpi/sessions_01.png
deleted file mode 100644
index 31bc454dd..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/sessions_01.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/sessions_02.png b/app/src/main/res/drawable-xxxhdpi/sessions_02.png
deleted file mode 100644
index ee21f79e8..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/sessions_02.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/sessions_03.png b/app/src/main/res/drawable-xxxhdpi/sessions_03.png
deleted file mode 100644
index 317887cbe..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/sessions_03.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/sessions_06.png b/app/src/main/res/drawable-xxxhdpi/sessions_06.png
deleted file mode 100644
index 06fbe4b66..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/sessions_06.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/sessions_07.png b/app/src/main/res/drawable-xxxhdpi/sessions_07.png
deleted file mode 100644
index fd46f29ce..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/sessions_07.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/sessions_08.png b/app/src/main/res/drawable-xxxhdpi/sessions_08.png
deleted file mode 100644
index f0a1ad9ea..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/sessions_08.png and /dev/null differ
diff --git a/app/src/main/res/drawable/crash_reporter_button.xml b/app/src/main/res/drawable/crash_reporter_button.xml
index 2e10eed67..6a7dcaaf2 100644
--- a/app/src/main/res/drawable/crash_reporter_button.xml
+++ b/app/src/main/res/drawable/crash_reporter_button.xml
@@ -6,5 +6,5 @@
 <shape android:shape="rectangle" xmlns:android="http://schemas.android.com/apk/res/android">
     <corners android:radius="4dp" />
     <size android:height="36dp" android:width="158dp" />
-    <solid android:color="#FF312A65" />
-</shape>
\ No newline at end of file
+    <solid android:color="#312A65" />
+</shape>
diff --git a/app/src/main/res/drawable/fenix_error_1.png b/app/src/main/res/drawable/fenix_error_1.png
deleted file mode 100644
index bc44f4535..000000000
Binary files a/app/src/main/res/drawable/fenix_error_1.png and /dev/null differ
diff --git a/app/src/main/res/drawable/ic_chevron_down.xml b/app/src/main/res/drawable/ic_chevron_down.xml
index 66ed12300..25492d45d 100644
--- a/app/src/main/res/drawable/ic_chevron_down.xml
+++ b/app/src/main/res/drawable/ic_chevron_down.xml
@@ -2,9 +2,11 @@
    - 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="6dp" android:viewportHeight="6"
-    android:viewportWidth="10" android:width="10dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="?primaryText" android:fillType="nonZero"
-        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:strokeColor="#00000000" android:strokeWidth="1"/>
+<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"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_chevron_up.xml b/app/src/main/res/drawable/ic_chevron_up.xml
index a2593ea30..736394d65 100644
--- a/app/src/main/res/drawable/ic_chevron_up.xml
+++ b/app/src/main/res/drawable/ic_chevron_up.xml
@@ -2,9 +2,11 @@
    - 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="6dp" android:viewportHeight="6"
-    android:viewportWidth="10" android:width="10dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="?primaryText" android:fillType="nonZero"
-        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:strokeColor="#00000000" android:strokeWidth="1"/>
+<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"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_collections_circle_background.xml b/app/src/main/res/drawable/ic_collections_circle_background.xml
index 7036de4b1..19ce983b2 100644
--- a/app/src/main/res/drawable/ic_collections_circle_background.xml
+++ b/app/src/main/res/drawable/ic_collections_circle_background.xml
@@ -23,10 +23,7 @@
             android:viewportHeight="24">
             <path
                 android:fillColor="@color/collection_circle_icon_foreground"
-                android:fillType="evenOdd"
-                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:strokeWidth="1"
-                android:strokeColor="#00000000" />
+                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"/>
         </vector>
     </item>
 </layer-list>
diff --git a/app/src/main/res/drawable/ic_edit.xml b/app/src/main/res/drawable/ic_edit.xml
index dbd0ba7da..b2e7358a3 100644
--- a/app/src/main/res/drawable/ic_edit.xml
+++ b/app/src/main/res/drawable/ic_edit.xml
@@ -2,8 +2,13 @@
 <!-- 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:autoMirrored="true" android:height="24dp"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" 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"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:autoMirrored="true"
+        android:width="24dp"
+        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"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_error_session_crashed.png b/app/src/main/res/drawable/ic_error_session_crashed.png
deleted file mode 100644
index 776cc05e1..000000000
Binary files a/app/src/main/res/drawable/ic_error_session_crashed.png and /dev/null differ
diff --git a/app/src/main/res/drawable/ic_fenix.xml b/app/src/main/res/drawable/ic_fenix.xml
deleted file mode 100644
index 70ebf6eba..000000000
--- a/app/src/main/res/drawable/ic_fenix.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M78.12,44.4c-1.23,-2.69 -3.79,-6.09 -5.71,-6.77 -0.56,-0.2 -1.17,0.48 -1.05,1.06 -2.75,-3.43 -5.87,-6.37 -8.1,-10.31 -0.2,-0.38 -0.41,-1.11 -0.56,-1.32 -0.3,-0.43 -0.91,-0.53 -1.7,-0.06 -4.26,2.54 -8.36,9 -8.6,13.57 -0.5,0.16 -3.27,0.38 -2.87,1.83 0.63,1.3 1.74,0.1 3.19,0 4.36,-0.32 6.95,0.74 9.42,3.1 -1.62,-0.27 -4.04,-0.56 -4.04,0.87 0,0.57 1.28,1.1 1.8,1.51a9.08,9.08 0,0 1,3.45 9.3c-1.18,5.67 -5.69,7.9 -9.94,7.65 -8.76,-0.52 -9.73,-8.35 -9.73,-8.35 1.35,-2.94 5.64,-3.53 6.6,-3.49 1.4,0.05 1.86,-0.24 2.84,-1.09 1.87,-1.63 2.44,-2.85 1.2,-3.5 -1.03,-0.54 -2.9,-1.37 -4.35,-2.35 -2.89,-1.94 -2.34,-2.46 -3.57,-3.11 -0.3,-1.57 -0.41,-2.23 -0.21,-3.92 0.12,-1.1 0.54,-1.78 0.08,-2.14 -0.63,-0.5 -0.75,-0.27 -1.24,-0.1 -2.35,0.81 -4.36,3.01 -5.16,3.73a17.13,17.13 0,0 1,-0.33 -3.98c0.2,-1.28 -0.55,-1.9 -1.8,-1.14 -2.83,1.7 -10.17,8.6 -9.68,19.56 0.59,13.37 10.16,24.88 25.03,25.62 14.87,0.73 25.6,-11.4 26.82,-22.97 0.44,-4.25 -0.22,-9.77 -1.8,-13.2zM59.29,41.5c-1.64,-0.52 -3.26,-1 -5,-0.94 0.17,-2.9 2.58,-7.63 4.43,-9.22 -0.67,2.02 -1.33,6.91 0.57,10.16zM59.78,36.05c0,-3.6 0.76,-4.93 1.5,-6.74a29.71,29.71 0,0 0,2.54 3.6c3.68,4.36 7.84,7.85 10,13.28 0.94,2.34 -0.13,8.45 -3.94,12.16 0.47,-2.87 -0.37,-6.66 -1.33,-7.94 -0.82,-1.08 -1.54,-2.3 -2.6,-3.07 -2.23,-3.48 -2.43,-2.6 -3.94,-4.76a11.17,11.17 0,0 1,-2.23 -6.53zM61.38,64.05c5.04,-3.94 5.41,-12.11 0.7,-16.64 7.82,2.59 6.19,12.1 5.2,13.28 -1.1,1.33 -3.75,2.45 -5.9,3.37zM51.6,50.49c0,1.16 -1.76,0.34 -4.94,1.19 -3.14,0.83 -4.29,3.33 -4.29,3.33 -0.05,-0.79 0.2,-2.4 -0.25,-2.82 -0.37,-0.35 -0.94,-0.18 -1.73,-0.34a5.43,5.43 0,0 1,-3.62 -2.37c2.84,-1.47 5.7,-0.86 8.54,0.47 1.82,0.85 4.27,0.41 6.3,0.54zM44.33,39.18s-0.21,1.32 -0.02,2.76c0,0 -1.62,-0.58 -2.67,-0.57 0.9,-0.97 2.69,-2.2 2.69,-2.2zM30.06,54.53c-0.84,-5.4 2.49,-13 7.63,-16.98 0.12,1.81 0.15,4.26 1.28,5.32 0.3,0.28 1.13,0.1 1.86,0.14 1.37,0.08 3.04,0.43 4.21,1.24 1.7,1.17 2.2,2.76 6.44,4.64 0,0 -4.06,0.11 -5.17,-0.25 -2,-0.65 -3.33,-1.78 -7.28,-1.52 -1.72,0.11 -4.78,1.4 -4.54,2.28 0.7,2.6 3.64,4.31 5.87,4.5 -0.71,6.87 7.33,13.37 14.55,13.17 13.09,-0.38 18.75,-9.5 20.22,-14.27 0.24,4.83 -1.15,10.06 -4.01,13.63 -5.26,6.54 -13.16,8.82 -21.82,7.32 -9.65,-1.68 -17.78,-9.9 -19.23,-19.22zM78.06,57.29C76.55,69.45 65.25,79.3 51.55,78.04c-8.6,-0.79 -16.35,-6.89 -19.22,-13.36 5.41,7.23 11.98,10.77 20.53,11.15 11.55,0.52 20.79,-6.02 23.56,-16.87 1.52,-5.95 -0.15,-11.3 -1.62,-16.7a22.66,22.66 0,0 1,3.27 15.03z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_folder_icon.xml b/app/src/main/res/drawable/ic_folder_icon.xml
index bf3aef801..bf3399579 100644
--- a/app/src/main/res/drawable/ic_folder_icon.xml
+++ b/app/src/main/res/drawable/ic_folder_icon.xml
@@ -1,6 +1,13 @@
-<vector android:autoMirrored="true" android:height="24dp"
-    android:viewportHeight="17" android:viewportWidth="20"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@color/primary_text_light_theme"
+<?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:autoMirrored="true"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="20"
+        android:viewportHeight="17">
+    <path android:fillColor="?primaryText"
         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" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_history.xml b/app/src/main/res/drawable/ic_history.xml
index 0a0d3a01f..c076ab149 100644
--- a/app/src/main/res/drawable/ic_history.xml
+++ b/app/src/main/res/drawable/ic_history.xml
@@ -9,6 +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:strokeWidth="1" />
+        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"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_hollow_share.xml b/app/src/main/res/drawable/ic_hollow_share.xml
index 3e4a19d03..375da4e57 100644
--- a/app/src/main/res/drawable/ic_hollow_share.xml
+++ b/app/src/main/res/drawable/ic_hollow_share.xml
@@ -2,9 +2,11 @@
    - 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="20dp" android:viewportHeight="20"
-    android:viewportWidth="19" android:width="20dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="?primaryText" android:fillType="nonZero"
-        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:strokeColor="#00000000" android:strokeWidth="1"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="20dp"
+        android:height="20dp"
+        android:viewportWidth="19"
+        android:viewportHeight="20">
+    <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"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_session_restore.xml b/app/src/main/res/drawable/ic_session_restore.xml
index a5bdeb99d..9af5e6f5a 100644
--- a/app/src/main/res/drawable/ic_session_restore.xml
+++ b/app/src/main/res/drawable/ic_session_restore.xml
@@ -9,6 +9,5 @@
     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"
-        android:strokeWidth="1" />
+        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_tab_circle_background.xml b/app/src/main/res/drawable/ic_tab_circle_background.xml
index 177b76f87..02fcffc15 100644
--- a/app/src/main/res/drawable/ic_tab_circle_background.xml
+++ b/app/src/main/res/drawable/ic_tab_circle_background.xml
@@ -23,10 +23,7 @@
             android:viewportHeight="24">
             <path
                 android:fillColor="@color/tab_circle_icon_foreground"
-                android:fillType="evenOdd"
-                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:strokeWidth="1"
-                android:strokeColor="#00000000" />
+                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>
     </item>
 </layer-list>
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 96ab514d0..3025ce1e3 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,10 +23,7 @@
             android:viewportHeight="24">
             <path
                 android:fillColor="@color/library_downloads_icon"
-                android:fillType="evenOdd"
-                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:strokeColor="#00000000" />
+                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"/>
         </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 2ed3f1bac..a21200e43 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,10 +23,7 @@
             android:viewportHeight="24">
             <path
                 android:fillColor="@color/library_history_icon"
-                android:fillType="evenOdd"
-                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:strokeWidth="1"
-                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,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"/>
         </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 bdfeac558..f562f606e 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,8 +23,7 @@
             android:viewportHeight="24">
             <path
                 android:fillColor="@color/library_reading_list_icon"
-                android:fillType="nonZero"
                 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" />
         </vector>
     </item>
-</layer-list>
\ No newline at end of file
+</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 b7c85d780..c76f74028 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,10 +23,7 @@
             android:viewportHeight="24">
             <path
                 android:fillColor="@color/library_screenshots_icon"
-                android:fillType="evenOdd"
-                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:strokeColor="#00000000" />
+                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"/>
         </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
index a9765af93..2655074f0 100644
--- a/app/src/main/res/drawable/library_icon_sessions_circle_background.xml
+++ b/app/src/main/res/drawable/library_icon_sessions_circle_background.xml
@@ -23,11 +23,7 @@
             android:viewportHeight="24">
             <path
                 android:fillColor="@color/library_sessions_icon"
-                android:fillType="evenOdd"
-                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"
-                android:strokeWidth="1"
-                android:strokeColor="#00000000" />
+                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/layout/fragment_crash_reporter.xml b/app/src/main/res/layout/fragment_crash_reporter.xml
index 80fb1aeed..7e50bacba 100644
--- a/app/src/main/res/layout/fragment_crash_reporter.xml
+++ b/app/src/main/res/layout/fragment_crash_reporter.xml
@@ -5,6 +5,7 @@
 <androidx.constraintlayout.widget.ConstraintLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto"
+        xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="?above">
@@ -15,10 +16,11 @@
         android:layout_height="120dp"
         android:layout_marginTop="40dp"
         android:src="@drawable/fenix_error_1"
+        android:importantForAccessibility="no"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintWidth_percent="0.8"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"/>
+        app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
             android:id="@+id/title"
@@ -32,7 +34,8 @@
             android:textStyle="bold"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/crash_tab_image" />
+            app:layout_constraintTop_toBottomOf="@id/crash_tab_image"
+            tools:text="@string/tab_crash_title_2"/>
 
     <CheckBox
             android:id="@+id/send_crash_checkbox"
@@ -86,4 +89,4 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintWidth_percent="0.4" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>