diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt
index fc8fc48b1c..a4b4737b89 100644
--- a/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt
@@ -151,7 +151,7 @@ open class DefaultToolbarMenu(
         }
 
         val share = BrowserMenuItemToolbar.Button(
-            imageResource = R.drawable.ic_share_filled,
+            imageResource = R.drawable.ic_share,
             contentDescription = context.getString(R.string.browser_menu_share),
             iconTintColorResource = primaryTextColor(),
             listener = {
diff --git a/app/src/main/res/animator/fill_disable.xml b/app/src/main/res/animator/fill_disable.xml
deleted file mode 100644
index c0887a6ac5..0000000000
--- a/app/src/main/res/animator/fill_disable.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/. -->
-<objectAnimator
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:propertyName="fillColor"
-        android:startOffset="@integer/strike_thru_start_offset"
-        android:duration="@integer/strike_thru_duration"
-        android:valueFrom="?primaryText"
-        android:valueTo="@color/disabled_text"
-        android:valueType="colorType"
-        android:interpolator="@android:interpolator/fast_out_slow_in" />
diff --git a/app/src/main/res/animator/fill_enable.xml b/app/src/main/res/animator/fill_enable.xml
deleted file mode 100644
index 52d745f775..0000000000
--- a/app/src/main/res/animator/fill_enable.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/. -->
-<objectAnimator
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:propertyName="fillColor"
-        android:startOffset="@integer/strike_thru_start_offset"
-        android:duration="@integer/strike_thru_duration"
-        android:valueFrom="@color/disabled_text"
-        android:valueTo="?primaryText"
-        android:valueType="colorType"
-        android:interpolator="@android:interpolator/fast_out_slow_in" />
diff --git a/app/src/main/res/animator/strike_thru_mask_disable.xml b/app/src/main/res/animator/strike_thru_mask_disable.xml
deleted file mode 100644
index 09049a7b6b..0000000000
--- a/app/src/main/res/animator/strike_thru_mask_disable.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/. -->
-<objectAnimator
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:propertyName="pathData"
-        android:startOffset="@integer/strike_thru_start_offset"
-        android:duration="@integer/strike_thru_duration"
-        android:valueFrom="M 0 0 L 0 24 L 24 24 L 24 0 L 0 0 Z M 21 2 L 23 4 L 23 4 L 21 2 L 21 2 Z"
-        android:valueTo="M 0 0 L 0 24 L 24 24 L 24 0 L 0 0 Z M 21 2 L 23 4 L 6 21 L 4 19 L 21 2 Z"
-        android:valueType="pathType"
-        android:interpolator="@android:interpolator/fast_out_slow_in" />
diff --git a/app/src/main/res/animator/strike_thru_mask_enable.xml b/app/src/main/res/animator/strike_thru_mask_enable.xml
deleted file mode 100644
index e45b8c6763..0000000000
--- a/app/src/main/res/animator/strike_thru_mask_enable.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/. -->
-<objectAnimator
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:propertyName="pathData"
-        android:startOffset="@integer/strike_thru_start_offset"
-        android:duration="@integer/strike_thru_duration"
-        android:valueFrom="M 0 0 L 0 24 L 24 24 L 24 0 L 0 0 Z M 21 2 L 23 4 L 6 21 L 4 19 L 21 2 Z"
-        android:valueTo="M 0 0 L 0 24 L 24 24 L 24 0 L 0 0 Z M 21 2 L 23 4 L 23 4 L 21 2 L 21 2 Z"
-        android:valueType="pathType"
-        android:interpolator="@android:interpolator/fast_out_slow_in" />
diff --git a/app/src/main/res/animator/strike_thru_path_disable.xml b/app/src/main/res/animator/strike_thru_path_disable.xml
deleted file mode 100644
index b56cca0e2b..0000000000
--- a/app/src/main/res/animator/strike_thru_path_disable.xml
+++ /dev/null
@@ -1,22 +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/. -->
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-    <objectAnimator
-            android:propertyName="pathData"
-            android:startOffset="@integer/strike_thru_start_offset"
-            android:duration="@integer/strike_thru_duration"
-            android:valueFrom="M 20 1.6 L 21.4 3 L 21.9 2.5 C 20.9 3.5 19.5 2 20.5 1.1 L 20 1.6 Z"
-            android:valueTo="M 20 1.6 L 21.4 3 L 5.2 19.2 C 4.2 20.2 2.8 18.8 3.8 17.8 L 20 1.6 Z"
-            android:valueType="pathType"
-            android:interpolator="@android:interpolator/fast_out_slow_in" />
-    <objectAnimator
-            android:propertyName="fillColor"
-            android:startOffset="@integer/strike_thru_start_offset"
-            android:duration="@integer/strike_thru_duration"
-            android:valueFrom="?primaryText"
-            android:valueTo="@color/disabled_text"
-            android:valueType="colorType"
-            android:interpolator="@android:interpolator/fast_out_slow_in" />
-</set>
diff --git a/app/src/main/res/animator/strike_thru_path_enable.xml b/app/src/main/res/animator/strike_thru_path_enable.xml
deleted file mode 100644
index 8ea41146c1..0000000000
--- a/app/src/main/res/animator/strike_thru_path_enable.xml
+++ /dev/null
@@ -1,22 +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/. -->
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-    <objectAnimator
-            android:propertyName="pathData"
-            android:startOffset="@integer/strike_thru_start_offset"
-            android:duration="@integer/strike_thru_duration"
-            android:valueFrom="M 20 1.6 L 21.4 3 L 5.2 19.2 C 4.2 20.2 2.8 18.8 3.8 17.8 L 20 1.6 Z"
-            android:valueTo="M 20 1.6 L 21.4 3 L 21.9 2.5 C 20.9 3.5 19.5 2 20.5 1.1 L 20 1.6 Z"
-            android:valueType="pathType"
-            android:interpolator="@android:interpolator/fast_out_slow_in" />
-    <objectAnimator
-            android:propertyName="fillColor"
-            android:startOffset="@integer/strike_thru_start_offset"
-            android:duration="@integer/strike_thru_duration"
-            android:valueFrom="@color/disabled_text"
-            android:valueTo="?primaryText"
-            android:valueType="colorType"
-            android:interpolator="@android:interpolator/fast_out_slow_in" />
-</set>
diff --git a/app/src/main/res/drawable/ic_add_to_homescreen.xml b/app/src/main/res/drawable/ic_add_to_homescreen.xml
index 282453f17d..2d07502bf4 100644
--- a/app/src/main/res/drawable/ic_add_to_homescreen.xml
+++ b/app/src/main/res/drawable/ic_add_to_homescreen.xml
@@ -8,6 +8,9 @@
         android:viewportWidth="24"
         android:viewportHeight="24">
     <path
-            android:pathData="M20.3 4.3L15 9.59V8a1 1 0 0 0-2 0v4a1 1 0 0 0 1 1h4a1 1 0 0 0 0-2h-1.6l5.3-5.3a1 1 0 1 0-1.42-1.42zM16 18a1 1 0 1 0-2 0 1 1 0 0 0 2 0zm1 2H7V4h11.44a0.5 0.5 0 0 0 0.5-0.6A3 3 0 0 0 16 1H8a3 3 0 0 0-3 3v16a3 3 0 0 0 3 3h8a3 3 0 0 0 3-3v-5a1 1 0 0 0-2 0v5zm-3.5 2h-3a0.5 0.5 0 1 1 0-1h3a0.5 0.5 0 1 1 0 1zm-0.5-4a1 1 0 1 0-2 0 1 1 0 0 0 2 0zm-4-1a1 1 0 1 0 0 2 1 1 0 0 0 0-2zm3-3a1 1 0 1 0 0 2 1 1 0 0 0 0-2z"
-            android:fillColor="?primaryText"/>
+        android:pathData="m15.535,10.526 l1.6,1.6a0.5,0.5 0,0 1,-0.351 0.854l-4.233,0.02 -0.551,-0.551 0.021,-4.232a0.5,0.5 0,0 1,0.854 -0.351l1.596,1.596L19.72,4.22a0.75,0.75 0,1 1,1.061 1.061l-5.246,5.245zM7.6,14H6.4l-0.4,0.4v1.2l0.4,0.4h1.2l0.4,-0.4v-1.2l-0.4,-0.4zM10.6,14H9.4l-0.4,0.4v1.2l0.4,0.4h1.2l0.4,-0.4v-1.2l-0.4,-0.4zM13.6,14h-1.2l-0.4,0.4v1.2l0.4,0.4h1.2l0.4,-0.4v-1.2l-0.4,-0.4zM10.6,11H9.4l-0.4,0.4v1.2l0.4,0.4h1.2l0.4,-0.4v-1.2l-0.4,-0.4z"
+        android:fillColor="?primaryText"/>
+    <path
+        android:pathData="M14.5,2h-9A2.5,2.5 0,0 0,3 4.5v15A2.5,2.5 0,0 0,5.5 22h9a2.5,2.5 0,0 0,2.5 -2.5v-4.275a0.75,0.75 0,0 0,-1.5 0V17h-11V4.3l0.8,-0.8h9.4l0.8,0.8V5A0.75,0.75 0,0 0,17 5v-0.5A2.5,2.5 0,0 0,14.5 2zM8.75,19h2.5a0.75,0.75 0,0 1,0 1.5h-2.5a0.75,0.75 0,0 1,0 -1.5z"
+        android:fillColor="?primaryText"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_autoplay_disabled.xml b/app/src/main/res/drawable/ic_autoplay_disabled.xml
index d4416eefb5..4d069cf50e 100644
--- a/app/src/main/res/drawable/ic_autoplay_disabled.xml
+++ b/app/src/main/res/drawable/ic_autoplay_disabled.xml
@@ -9,11 +9,8 @@
     android:viewportHeight="24">
     <path
         android:fillColor="@color/disabled_text"
-        android:pathData="M19.168,8.458A7.985,7.985 0,0 1,8.462 19.164L6.987,20.639A9.986,9.986 0,0 0,20.643 6.984Z" />
+        android:pathData="M3.326 4.265A0.83 0.83 0 0 1 3.225 4h-0.36C2.842 4 2.822 4.008 2.8 4.01a0.737 0.737 0 0 0-0.58 0.21 0.75 0.75 0 0 0 0 1.061l1.847 1.847A9.441 9.441 0 0 0 2.7 12c0 5.238 4.262 9.5 9.5 9.5a9.42 9.42 0 0 0 4.879-1.36l1.64 1.64a0.748 0.748 0 0 0 1.06 0 0.75 0.75 0 0 0 0-1.061L3.326 4.265zM12.2 20c-4.411 0-8-3.589-8-8 0-1.328 0.352-2.609 0.975-3.764l4.301 4.301v3.026a0.89 0.89 0 0 0 1.333 0.773l1.569-0.897 3.601 3.601A7.918 7.918 0 0 1 12.2 20zM8 4.364L7.636 4H5.14L8 6.86V4.364zM12.2 4c2.137 0 4.146 0.832 5.657 2.343A7.948 7.948 0 0 1 20.2 12a7.964 7.964 0 0 1-1.898 5.162l1.06 1.06A9.45 9.45 0 0 0 21.7 12a9.442 9.442 0 0 0-2.782-6.718A9.442 9.442 0 0 0 12.2 2.5a0.75 0.75 0 0 0 0 1.5z" />
     <path
         android:fillColor="@color/disabled_text"
-        android:pathData="M21.707,2.293a1,1 0,0 0,-1.414 0l-1.97,1.97a9.915,9.915 0,0 0,-2.991 -1.694,1 1,0 1,0 -0.666,1.885 7.88,7.88 0,0 1,2.227 1.239L13.311,9.275 10.5,7.643A1,1 0,0 0,9 8.508v5.078l-3.3,3.3A7.922,7.922 0,0 1,4 12,8 8,0 0,1 7,5.773V9.5a0.5,0.5 0,0 0,1 0v-6A0.5,0.5 0,0 0,7.5 3h-5a0.5,0.5 0,0 0,0 1H6.024A9.939,9.939 0,0 0,4.273 18.313l-1.98,1.98a1,1 0,1 0,1.414 1.414l18,-18A1,1 0,0 0,21.707 2.293Z" />
-    <path
-        android:fillColor="@color/disabled_text"
-        android:pathData="M16.5,11.128l-4.166,4.165 4.179,-2.428a1,1 0,0 0,0 -1.73Z" />
+        android:pathData="M17.046 12.773a0.89 0.89 0 0 0 0-1.547L10.81 7.664a0.887 0.887 0 0 0-1.322 0.685l5.564 5.564 1.994-1.14z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_autoplay_enabled.xml b/app/src/main/res/drawable/ic_autoplay_enabled.xml
index 4241182099..fa534a57c5 100644
--- a/app/src/main/res/drawable/ic_autoplay_enabled.xml
+++ b/app/src/main/res/drawable/ic_autoplay_enabled.xml
@@ -5,5 +5,10 @@
 <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="?primaryText" android:pathData="M10.5,16.357l6.01,-3.492a1,1 0,0 0,0 -1.73L10.5,7.643A1,1 0,0 0,9 8.508v6.984a1,1 0,0 0,1.5 0.865zM15.33,2.569a1,1 0,1 0,-0.666 1.885A8.023,8.023 0,1 1,7 5.773L7,9.5a0.5,0.5 0,0 0,1 0v-6A0.5,0.5 0,0 0,7.5 3h-5a0.5,0.5 0,0 0,0 1h3.524a9.984,9.984 0,1 0,9.308 -1.431z"/>
+    <path
+        android:fillColor="?primaryText"
+        android:pathData="M18.918 5.282A9.442 9.442 0 0 0 12.2 2.5a0.75 0.75 0 0 0 0 1.5c2.137 0 4.146 0.832 5.657 2.343A7.948 7.948 0 0 1 20.2 12c0 4.411-3.589 8-8 8s-8-3.589-8-8c0-1.427 0.393-2.806 1.107-4.026l1.61 1.61A0.635 0.635 0 0 0 8 9.135V4.364L7.636 4H2.865a0.635 0.635 0 0 0-0.449 1.083l1.789 1.789A9.472 9.472 0 0 0 2.7 12c0 5.238 4.262 9.5 9.5 9.5s9.5-4.262 9.5-9.5a9.442 9.442 0 0 0-2.782-6.718z" />
+    <path
+        android:fillColor="?primaryText"
+        android:pathData="M9.5 15.554V8.446a0.89 0.89 0 0 1 1.33-0.772l6.222 3.554a0.889 0.889 0 0 1 0 1.543l-6.222 3.554a0.888 0.888 0 0 1-1.33-0.771z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml
index 00ef35e6ad..9c5bca788a 100644
--- a/app/src/main/res/drawable/ic_camera.xml
+++ b/app/src/main/res/drawable/ic_camera.xml
@@ -10,13 +10,4 @@
     <item
             android:id="@+id/disabled"
             android:drawable="@drawable/ic_camera_disabled" />
-
-    <transition
-            android:drawable="@drawable/ic_camera_anim_enable"
-            android:fromId="@id/disabled"
-            android:toId="@id/enabled" />
-    <transition
-            android:drawable="@drawable/ic_camera_anim_disable"
-            android:fromId="@+id/enabled"
-            android:toId="@+id/disabled" />
 </animated-selector>
diff --git a/app/src/main/res/drawable/ic_camera_anim_disable.xml b/app/src/main/res/drawable/ic_camera_anim_disable.xml
deleted file mode 100644
index 8cf218a7dd..0000000000
--- a/app/src/main/res/drawable/ic_camera_anim_disable.xml
+++ /dev/null
@@ -1,11 +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/. -->
-<animated-vector
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:drawable="@drawable/ic_camera_enabled">
-    <target android:name="strike_thru_path" android:animation="@animator/strike_thru_path_disable" />
-    <target android:name="strike_thru_mask" android:animation="@animator/strike_thru_mask_disable" />
-    <target android:name="icon" android:animation="@animator/fill_disable" />
-</animated-vector>
diff --git a/app/src/main/res/drawable/ic_camera_anim_enable.xml b/app/src/main/res/drawable/ic_camera_anim_enable.xml
deleted file mode 100644
index 4cf33171aa..0000000000
--- a/app/src/main/res/drawable/ic_camera_anim_enable.xml
+++ /dev/null
@@ -1,11 +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/. -->
-<animated-vector
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:drawable="@drawable/ic_camera_disabled">
-    <target android:name="strike_thru_path" android:animation="@animator/strike_thru_path_enable" />
-    <target android:name="strike_thru_mask" android:animation="@animator/strike_thru_mask_enable" />
-    <target android:name="icon" android:animation="@animator/fill_enable" />
-</animated-vector>
diff --git a/app/src/main/res/drawable/ic_camera_disabled.xml b/app/src/main/res/drawable/ic_camera_disabled.xml
index ce49afbc2f..6802c51fa4 100644
--- a/app/src/main/res/drawable/ic_camera_disabled.xml
+++ b/app/src/main/res/drawable/ic_camera_disabled.xml
@@ -3,25 +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">
-    <group>
-        <clip-path android:pathData="M 18.8 2.8 C 19.8 1.8 21.1 3.3 20.2 4.2 L 3.4 21 L 2 19.6 L 18.8 2.8 Z"/>
-        <path
-                android:name="strike_thru_path"
-                android:pathData="M 20 1.6 L 21.4 3 L 5.2 19.2 C 4.2 20.2 2.8 18.8 3.8 17.8 L 20 1.6 Z"
-                android:fillColor="@color/disabled_text"
-                android:strokeWidth="1"/>
-    </group>
-    <group>
-        <clip-path
-                android:name="strike_thru_mask"
-                android:pathData="M 0 0 L 0 24 L 24 24 L 24 0 L 0 0 Z M 21 2 L 23 4 L 6 21 L 4 19 L 21 2 Z"/>
-        <path
-                android:name="icon"
-                android:fillColor="@color/disabled_text"
-                android:pathData="M17 16a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V8c0-1.1 0.9-2 2-2h10a2 2 0 0 1 2 2v2l2.9-2.8c0.4-0.4 1.07 0 1.07 0.62v8.4c0 0.6-0.6 1.06-1.07 0.6L17 14v2z" />
-    </group>
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:name="icon"
+        android:fillColor="@color/disabled_text"
+        android:pathData="M17.28 19.72l-14-14a0.75 0.75 0 1 0-1.061 1.061L3 7.561V17a2.5 2.5 0 0 0 2.5 2.5h9.44l1.28 1.28a0.748 0.748 0 0 0 1.06 0 0.749 0.749 0 0 0 0-1.06zM5.3 18l-0.8-0.8V9.061L13.439 18H5.3zM15.5 6.8v3.025h0.796l2.496-2.497a0.949 0.949 0 0 1 0.689-0.298c0.423 0 1.018 0.312 1.018 1.005v7.929c0 0.693-0.595 1.005-1.018 1.005-0.26 0-0.491-0.1-0.689-0.298l-2.496-2.497H15.5v1.349l1.498 1.498L17 17l0.732 0.732a2.448 2.448 0 0 0 1.75 0.737c1.285 0 2.518-0.998 2.518-2.505V8.036c0-1.507-1.233-2.505-2.518-2.505-0.614 0-1.24 0.228-1.75 0.737L17 7a2.5 2.5 0 0 0-2.5-2.5h-9c-0.396 0-0.766 0.101-1.099 0.265L5.636 6H14.7l0.8 0.8z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_camera_enabled.xml b/app/src/main/res/drawable/ic_camera_enabled.xml
index 7eead7c05a..3818f98e49 100644
--- a/app/src/main/res/drawable/ic_camera_enabled.xml
+++ b/app/src/main/res/drawable/ic_camera_enabled.xml
@@ -7,21 +7,8 @@
         android:height="24dp"
         android:viewportWidth="24"
         android:viewportHeight="24">
-    <group>
-        <clip-path android:pathData="M 18.8 2.8 C 19.8 1.8 21.1 3.3 20.2 4.2 L 3.4 21 L 2 19.6 L 18.8 2.8 Z"/>
-        <path
-                android:name="strike_thru_path"
-                android:pathData="M 20 1.6 L 21.4 3 L 21.9 2.5 C 20.9 3.5 19.5 2 20.5 1.1 L 20 1.6 Z"
-                android:fillColor="?primaryText"
-                android:strokeWidth="1"/>
-    </group>
-    <group>
-        <clip-path
-                android:name="strike_thru_mask"
-                android:pathData="M 0 0 L 0 24 L 24 24 L 24 0 L 0 0 Z M 21 2 L 23 4 L 23 4 L 21 2 L 21 2 Z"/>
-        <path
-                android:name="icon"
-                android:fillColor="?primaryText"
-                android:pathData="M17 16a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V8c0-1.1 0.9-2 2-2h10a2 2 0 0 1 2 2v2l2.9-2.8c0.4-0.4 1.07 0 1.07 0.62v8.4c0 0.6-0.6 1.06-1.07 0.6L17 14v2z" />
-    </group>
+    <path
+        android:name="icon"
+        android:fillColor="?primaryText"
+        android:pathData="M19.482 5.531c-0.614 0-1.24 0.228-1.75 0.737L17 7a2.5 2.5 0 0 0-2.5-2.5h-9A2.5 2.5 0 0 0 3 7v10a2.5 2.5 0 0 0 2.5 2.5h9A2.5 2.5 0 0 0 17 17l0.732 0.732a2.448 2.448 0 0 0 1.75 0.737c1.285 0 2.518-0.998 2.518-2.505V8.036c0-1.507-1.233-2.505-2.518-2.505zM20.5 15.964c0 0.693-0.595 1.005-1.018 1.005-0.26 0-0.491-0.1-0.689-0.298l-2.496-2.497H15.5V17.2L14.7 18H5.3l-0.8-0.8V6.8L5.3 6h9.4l0.8 0.8v3.025h0.796l2.496-2.497a0.949 0.949 0 0 1 0.689-0.298c0.423 0 1.018 0.312 1.018 1.005v7.929H20.5z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_cookies.xml b/app/src/main/res/drawable/ic_cookies.xml
index 553f165180..5c2e0c053d 100644
--- a/app/src/main/res/drawable/ic_cookies.xml
+++ b/app/src/main/res/drawable/ic_cookies.xml
@@ -9,5 +9,5 @@
     android:viewportHeight="24">
     <path
         android:fillColor="?primaryText"
-        android:pathData="M21.3,12c-0.8,0 -1.6,-0.1 -2.4,-0.5l0.1,0.5c0,0.5 -0.5,1 -1,1a1,1 0,0 1,-1 -1c0,-0.5 0.3,-0.7 0.4,-0.8l0.3,-0.2C14,10 12,5 12,2.7c0,-1.4 -4,-0.6 -3.6,0.7 -0.5,-1.3 -4,1 -3,2 -1,-1 -3.3,2.5 -2,3 -1.3,-0.5 -2,3.6 -0.7,3.6 -1.4,0 -0.6,4 0.7,3.6 -1.3,0.5 1,4 2,3 -1,1 2.5,3.3 3,2 -0.5,1.3 3.6,2 3.6,0.7 0,1.4 4,0.6 3.5,-0.7 0.6,1.3 4,-1 3,-2 1,1 3.4,-2.5 2,-3 1.4,0.5 2.2,-3.6 0.8,-3.6zM7,12c0,0.5 -0.5,1 -1,1a1,1 0,0 1,-1 -1c0,-0.5 0.5,-1 1,-1s1,0.5 1,1zM9,18a1,1 0,0 1,-1 -1c0,-0.5 0.5,-1 1,-1s1,0.5 1,1 -0.5,1 -1,1zM9,8a1,1 0,0 1,-1 -1c0,-0.6 0.4,-1 1,-1s1,0.4 1,1 -0.4,1 -1,1zM12,13a1,1 0,0 1,-1 -1c0,-0.5 0.5,-1 1,-1s1,0.5 1,1 -0.5,1 -1,1zM15,18a1,1 0,0 1,-1 -1c0,-0.5 0.5,-1 1,-1s1,0.5 1,1 -0.5,1 -1,1z" />
+        android:pathData="M20.862,11.69a7.886,7.886 0,0 1,-1.856 0.244L19,11.934v0.817l-0.5,0.5L17,13.251l-0.5,-0.5L16.5,11.53c-3.193,-1.052 -5.501,-4.055 -5.501,-7.6 0,-0.296 0.023,-0.585 0.055,-0.87l-0.565,-0.499c-4.531,0.725 -7.997,4.64 -7.997,9.375A9.508,9.508 0,0 0,12 21.443c5.146,0 9.327,-4.09 9.492,-9.198l-0.63,-0.556zM5,12.75v-1.5l0.5,-0.5L7,10.75l0.5,0.5v1.5l-0.5,0.5L5.5,13.25l-0.5,-0.5zM9.5,18l-0.5,0.5L7.5,18.5L7,18v-1.5l0.5,-0.5L9,16l0.5,0.5L9.5,18zM9.5,7.5L9,8L7.5,8L7,7.5L7,6l0.5,-0.5L9,5.5l0.5,0.5v1.5zM13.25,12.75 L12.75,13.25h-1.5l-0.5,-0.5v-1.5l0.5,-0.5h1.5l0.5,0.5v1.5zM17,18l-0.5,0.5L15,18.5l-0.5,-0.5v-1.5l0.5,-0.5h1.5l0.5,0.5L17,18z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_cryptominers.xml b/app/src/main/res/drawable/ic_cryptominers.xml
index 9d0aba3812..9764b05a12 100644
--- a/app/src/main/res/drawable/ic_cryptominers.xml
+++ b/app/src/main/res/drawable/ic_cryptominers.xml
@@ -9,6 +9,5 @@
     android:viewportHeight="24">
     <path
         android:fillColor="?primaryText"
-        android:pathData="M11,4V3a1,1 0,0 1,2 0v1h6v5h-6v12a1,1 0,0 1,-2 0V9H5.4C4.2,9 3.6,7.8 4.3,7l1.6,-2c0.5,-0.6 1.3,-1 2.2,-1H11z"
-        android:strokeLineJoin="round" />
+        android:pathData="M16.5 4h-3V2.75a0.75 0.75 0 0 0-1.5 0V4H9.039C8.631 4 8.24 4.167 7.957 4.461L6.418 6.065A1.499 1.499 0 0 0 6 7.103V7.5A1.5 1.5 0 0 0 7.5 9H12v11.25a0.75 0.75 0 0 0 1.5 0V9h3A1.5 1.5 0 0 0 18 7.5v-2A1.5 1.5 0 0 0 16.5 4z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_fab_sync.xml b/app/src/main/res/drawable/ic_fab_sync.xml
index 59fbc439f6..52ac21e978 100644
--- a/app/src/main/res/drawable/ic_fab_sync.xml
+++ b/app/src/main/res/drawable/ic_fab_sync.xml
@@ -8,6 +8,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:pathData="M12 4.675V2.501a0.5 0.5 0 0 0-0.852-0.355L8.295 4.97v0.926l2.853 2.825A0.5 0.5 0 0 0 12 8.366V6.175a5.823 5.823 0 0 1 4.434 9.602 0.75 0.75 0 0 0 1.14 0.974 7.327 7.327 0 0 0 1.75-4.75c0-4.04-3.285-7.326-7.324-7.326zm0 10.959v2.191A5.832 5.832 0 0 1 6.175 12c0-1.372 0.486-2.704 1.369-3.751a0.75 0.75 0 0 0-1.147-0.967A7.328 7.328 0 0 0 4.675 12c0 4.039 3.286 7.325 7.325 7.325v2.174a0.5 0.5 0 0 0 0.852 0.355l2.853-2.825v-0.926l-2.853-2.824A0.5 0.5 0 0 0 12 15.634z"
+        android:pathData="M12 4.675V2.501a0.5 0.5 0 0 1 0.852-0.355l2.853 2.824v0.926l-2.853 2.825A0.5 0.5 0 0 1 12 8.366V6.175a5.823 5.823 0 0 0-4.434 9.602 0.75 0.75 0 0 1-1.14 0.974 7.327 7.327 0 0 1-1.75-4.75c0-4.04 3.285-7.326 7.324-7.326zm0 10.959v2.191A5.832 5.832 0 0 0 17.825 12a5.825 5.825 0 0 0-1.369-3.751 0.75 0.75 0 0 1 1.147-0.967A7.328 7.328 0 0 1 19.325 12c0 4.039-3.286 7.325-7.325 7.325v2.174a0.5 0.5 0 0 1-0.852 0.355l-2.853-2.825v-0.926l2.853-2.824A0.5 0.5 0 0 1 12 15.634z"
         android:fillColor="@color/mozac_ui_icons_fill" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_fingerprinters.xml b/app/src/main/res/drawable/ic_fingerprinters.xml
index 9a4652791d..14dd24df19 100644
--- a/app/src/main/res/drawable/ic_fingerprinters.xml
+++ b/app/src/main/res/drawable/ic_fingerprinters.xml
@@ -9,5 +9,11 @@
     android:viewportHeight="24">
     <path
         android:fillColor="?primaryText"
-        android:pathData="M12.4,2c5.1,0 9.3,4.2 9.3,9.3 0,3.5 -1,5.5 -1.8,7 -0.5,1 -0.8,1.6 -0.8,2.4a1.3,1.3 0,0 1,-2.7 0c0,-1.5 0.6,-2.6 1.1,-3.7a11,11 0,0 0,1.6 -5.7,6.7 6.7,0 0,0 -13.4,0 1.3,1.3 0,1 1,-2.6 0C3,6.2 7.2,2 12.4,2zM12.4,6c3,0 5.3,2.4 5.3,5.3 0,4.3 -1.6,6.4 -2.8,8 -0.5,0.7 -1,1.3 -1.3,2a1.3,1.3 0,0 1,-2.4 -1.2c0.4,-1 1,-1.7 1.5,-2.4 1.2,-1.5 2.4,-3 2.4,-6.4a2.7,2.7 0,0 0,-5.4 0c0,2.6 -2,5.4 -5.3,5.4a1.3,1.3 0,1 1,0 -2.7c2,0 2.7,-1.8 2.7,-2.7C7,8.3 9.5,6 12.4,6zM12.4,10c0.7,0 1.3,0.6 1.3,1.3 0,7.6 -8.5,10.5 -8.9,10.6l-0.4,0.1a1.3,1.3 0,0 1,-0.4 -2.6s7,-2.5 7,-8c0,-0.8 0.7,-1.4 1.4,-1.4z" />
-</vector>
+        android:pathData="M6.688 18H2.75a0.75 0.75 0 0 1 0-1.5h3.938c3.392 0 6.15-2.76 6.15-6.151V9.722a0.75 0.75 0 0 1 1.5 0v0.627C14.339 14.567 10.907 18 6.688 18z" />
+    <path
+        android:fillColor="?primaryText"
+        android:pathData="M9.16 21.722a0.752 0.752 0 0 1-0.199-1.474c7.415-2.031 7.729-9.538 7.739-9.856 0.254-1.618-0.972-3.084-2.722-3.365-1.739-0.277-3.374 0.726-3.618 2.247l-0.271 1.515a4.51 4.51 0 0 1-4.444 3.719H2.75a0.75 0.75 0 0 1 0-1.5h2.896a3.012 3.012 0 0 0 2.968-2.482l0.269-1.502c0.374-2.323 2.766-3.895 5.335-3.477 2.566 0.412 4.35 2.649 3.974 4.986 0.007 0-0.335 8.835-8.833 11.163a0.806 0.806 0 0 1-0.199 0.026z" />
+    <path
+        android:fillColor="?primaryText"
+        android:pathData="M17.134 21.065a0.752 0.752 0 0 1-0.589-1.214c5.386-6.85 4.099-11.091 2.853-13.009-1.696-2.61-5.254-3.922-8.456-3.106C7.88 4.511 5.96 6.989 5.674 10.538c-0.034 0.413-0.409 0.7-0.809 0.688a0.752 0.752 0 0 1-0.688-0.809c0.337-4.166 2.728-7.207 6.396-8.135 3.806-0.965 8.048 0.61 10.082 3.743 1.465 2.254 3.032 7.169-2.931 14.754a0.746 0.746 0 0 1-0.59 0.286z" />
+ </vector>
diff --git a/app/src/main/res/drawable/ic_folder_icon.xml b/app/src/main/res/drawable/ic_folder_icon.xml
index 437fe48e06..ea7cea353c 100644
--- a/app/src/main/res/drawable/ic_folder_icon.xml
+++ b/app/src/main/res/drawable/ic_folder_icon.xml
@@ -6,8 +6,8 @@
         android:autoMirrored="true"
         android:width="24dp"
         android:height="24dp"
-        android:viewportWidth="20"
-        android:viewportHeight="17">
+        android:viewportWidth="24"
+        android:viewportHeight="24">
     <path android:fillColor="?primaryText"
-          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" />
+          android:pathData="M18.5 6h-6.354l-2.039-2.199A2.503 2.503 0 0 0 8.274 3H4.5A2.502 2.502 0 0 0 2 5.5v12C2 18.879 3.121 20 4.5 20h14c1.379 0 2.5-1.121 2.5-2.5v-9C21 7.121 19.879 6 18.5 6zm1 11.7l-0.8 0.8H4.3l-0.8-0.8V5.3l0.8-0.8h3.974c0.277 0 0.545 0.117 0.733 0.32l2.146 2.315 0.869 0.365H18.7l0.8 0.8v9.4z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_folder_new.xml b/app/src/main/res/drawable/ic_folder_new.xml
index a8de113322..fc41e1d894 100644
--- a/app/src/main/res/drawable/ic_folder_new.xml
+++ b/app/src/main/res/drawable/ic_folder_new.xml
@@ -9,5 +9,9 @@
     android:viewportHeight="24">
   <path
       android:fillColor="?primaryText"
-      android:pathData="M19.5,6h-6.76l-2.53,-2.34A2.53,2.53 0,0 0,8.51 3h-4A2.5,2.5 0,0 0,2 5.5v12A2.5,2.5 0,0 0,4.5 20L13,20a1,1 0,0 0,0 -2L4.5,18a0.5,0.5 0,0 1,-0.5 -0.5L4,8h15.5a0.5,0.5 0,0 1,0.5 0.5L20,15a1,1 0,1 0,2 0L22,8.5A2.5,2.5 0,0 0,19.5 6zM4,7L4,5.5a0.5,0.5 0,0 1,0.5 -0.5h4a0.51,0.51 0,0 1,0.34 0.13l2,1.87zM21.5,18L19,18v-2.5a0.5,0.5 0,0 0,-1 0L18,18h-2.5a0.5,0.5 0,0 0,0 1L18,19v2.5a0.5,0.5 0,0 0,1 0L19,19h2.5a0.5,0.5 0,0 0,0 -1z"/>
+      android:pathData="M21 18.5a0.745 0.745 0 0 0 0.53-0.22A0.75 0.75 0 0 0 21 17h-1.7l-0.8-0.8v-1.7a0.75 0.75 0 0 0-1.5 0v1.7L16.2 17h-1.7a0.75 0.75 0 0 0 0 1.5h1.7l0.8 0.8V21a0.75 0.75 0 0 0 1.5 0v-1.7l0.8-0.8H21z" />
+  <path
+      android:fillColor="?primaryText"
+      android:pathData="M18.5 6h-6.354l-2.039-2.199A2.503 2.503 0 0 0 8.274 3H4.5A2.502 2.502 0 0 0 2 5.5v12C2 18.879 3.121 20 4.5 20H12a0.75 0.75 0 0 0 0-1.5H4.3l-0.8-0.8V5.3l0.8-0.8h3.974c0.277 0 0.545 0.117 0.733 0.32l2.146 2.315 0.869 0.365H18.7l0.8 0.8v4.2a0.75 0.75 0 0 0 1.5 0v-4C21 7.121 19.879 6 18.5 6z" />
+
 </vector>
diff --git a/app/src/main/res/drawable/ic_help.xml b/app/src/main/res/drawable/ic_help.xml
index ca731897c6..e15b9ed935 100644
--- a/app/src/main/res/drawable/ic_help.xml
+++ b/app/src/main/res/drawable/ic_help.xml
@@ -9,5 +9,8 @@
     android:viewportHeight="24">
     <path
         android:fillColor="?primaryText"
-        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" />
+        android:pathData="M11.75 14A0.75 0.75 0 0 1 11 13.25v-0.959c0-0.645 0.452-1.206 1.074-1.336a1.6 1.6 0 0 0 1.27-1.561 1.596 1.596 0 0 0-3.101-0.522 0.75 0.75 0 1 1-1.418-0.49A3.097 3.097 0 0 1 11.75 6.3a3.098 3.098 0 0 1 3.094 3.094c0 1.418-0.979 2.661-2.344 3.002v0.854A0.75 0.75 0 0 1 11.75 14zm0.45 3h-0.9L11 16.7v-0.9l0.3-0.3h0.9l0.3 0.3v0.9L12.2 17z" />
+    <path
+        android:fillColor="?primaryText"
+        android:pathData="M11.75 4c4.411 0 8 3.589 8 8s-3.589 8-8 8-8-3.589-8-8 3.589-8 8-8zm0-1.5a9.5 9.5 0 0 0-9.5 9.5 9.5 9.5 0 0 0 9.5 9.5 9.5 9.5 0 0 0 9.5-9.5 9.5 9.5 0 0 0-9.5-9.5z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_internet.xml b/app/src/main/res/drawable/ic_internet.xml
index 7aea694477..f6276035e5 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 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" />
+        android:pathData="M12 2.5A9.5 9.5 0 0 0 2.5 12a9.5 9.5 0 0 0 9.5 9.5 9.5 9.5 0 0 0 9.5-9.5A9.5 9.5 0 0 0 12 2.5zm7.962 8.75h-3.008a11.503 11.503 0 0 0-2.666-6.65h0.742a8.014 8.014 0 0 1 4.932 6.65zm-7.749 8.15h-0.429a9.988 9.988 0 0 1-3.238-6.65h6.908a9.978 9.978 0 0 1-3.241 6.65zm-3.667-8.15a10.007 10.007 0 0 1 3.232-6.65h0.446a10.015 10.015 0 0 1 3.231 6.65H8.546zM8.97 4.6h0.743a11.499 11.499 0 0 0-2.667 6.65H4.038A8.014 8.014 0 0 1 8.97 4.6zm-4.932 8.15h3.008a11.476 11.476 0 0 0 2.67 6.65H8.97a8.014 8.014 0 0 1-4.932-6.65zM15.03 19.4h-0.733a11.465 11.465 0 0 0 2.658-6.65h3.007a8.014 8.014 0 0 1-4.932 6.65z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_link_disabled.xml b/app/src/main/res/drawable/ic_link_disabled.xml
index 083c07dc6c..b0084eee82 100644
--- a/app/src/main/res/drawable/ic_link_disabled.xml
+++ b/app/src/main/res/drawable/ic_link_disabled.xml
@@ -7,7 +7,14 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
+
     <path
         android:fillColor="@color/disabled_text"
-        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" />
+        android:pathData="M10.08 15.526l4.324 4.324h1.13l3.815-3.815v-1.13l-4.324-4.324a1.5 1.5 0 0 1 2.12 0l3.123 3.123a2.498 2.498 0 0 1 0 3.533l-3.533 3.533a2.498 2.498 0 0 1-3.533 0l-3.123-3.123a1.5 1.5 0 0 1 0.001-2.121z" />
+    <path
+        android:fillColor="@color/disabled_text"
+        android:pathData="M7.791 8.997l6.712 6.712a0.749 0.749 0 1 0 1.06-1.06L8.85 7.937a0.749 0.749 0 1 0-1.059 1.06z" />
+    <path
+        android:fillColor="@color/disabled_text"
+        android:pathData="M7.974 13.42L3.65 9.096v-1.13L7.466 4.15h1.13l4.324 4.324a1.5 1.5 0 0 0 0-2.12L9.797 3.232a2.498 2.498 0 0 0-3.533 0L2.732 6.764a2.498 2.498 0 0 0 0 3.533l3.123 3.123a1.497 1.497 0 0 0 2.119 0z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_location.xml b/app/src/main/res/drawable/ic_location.xml
index a6fbc4b6db..13454f7f24 100644
--- a/app/src/main/res/drawable/ic_location.xml
+++ b/app/src/main/res/drawable/ic_location.xml
@@ -10,13 +10,4 @@
     <item
             android:id="@+id/disabled"
             android:drawable="@drawable/ic_location_disabled" />
-  
-    <transition
-            android:drawable="@drawable/ic_location_anim_enable"
-            android:fromId="@id/disabled"
-            android:toId="@id/enabled" />
-    <transition
-            android:drawable="@drawable/ic_location_anim_disable"
-            android:fromId="@+id/enabled"
-            android:toId="@+id/disabled" />
 </animated-selector>
diff --git a/app/src/main/res/drawable/ic_location_anim_disable.xml b/app/src/main/res/drawable/ic_location_anim_disable.xml
deleted file mode 100644
index 4664906a7e..0000000000
--- a/app/src/main/res/drawable/ic_location_anim_disable.xml
+++ /dev/null
@@ -1,11 +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/. -->
-<animated-vector
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:drawable="@drawable/ic_location_enabled">
-    <target android:name="strike_thru_path" android:animation="@animator/strike_thru_path_disable" />
-    <target android:name="strike_thru_mask" android:animation="@animator/strike_thru_mask_disable" />
-    <target android:name="icon" android:animation="@animator/fill_disable" />
-</animated-vector>
diff --git a/app/src/main/res/drawable/ic_location_anim_enable.xml b/app/src/main/res/drawable/ic_location_anim_enable.xml
deleted file mode 100644
index 89b92fd4a2..0000000000
--- a/app/src/main/res/drawable/ic_location_anim_enable.xml
+++ /dev/null
@@ -1,11 +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/. -->
-<animated-vector
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:drawable="@drawable/ic_location_disabled">
-    <target android:name="strike_thru_path" android:animation="@animator/strike_thru_path_enable" />
-    <target android:name="strike_thru_mask" android:animation="@animator/strike_thru_mask_enable" />
-    <target android:name="icon" android:animation="@animator/fill_enable" />
-</animated-vector>
diff --git a/app/src/main/res/drawable/ic_location_disabled.xml b/app/src/main/res/drawable/ic_location_disabled.xml
index b7f85fa0a7..9b0e5fb956 100644
--- a/app/src/main/res/drawable/ic_location_disabled.xml
+++ b/app/src/main/res/drawable/ic_location_disabled.xml
@@ -3,25 +3,14 @@
    - 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">
-    <group>
-        <clip-path android:pathData="M 18.8 2.8 C 19.8 1.8 21.1 3.3 20.2 4.2 L 3.4 21 L 2 19.6 L 18.8 2.8 Z"/>
-        <path
-                android:name="strike_thru_path"
-                android:pathData="M 20 1.6 L 21.4 3 L 5.2 19.2 C 4.2 20.2 2.8 18.8 3.8 17.8 L 20 1.6 Z"
-                android:fillColor="@color/disabled_text"
-                android:strokeWidth="1"/>
-    </group>
-    <group>
-        <clip-path
-                android:name="strike_thru_mask"
-                android:pathData="M 0 0 L 0 24 L 24 24 L 24 0 L 0 0 Z M 21 2 L 23 4 L 6 21 L 4 19 L 21 2 Z"/>
-        <path
-                android:name="icon"
-                android:fillColor="@color/disabled_text"
-                android:pathData="M12,9a3,3 0,1 0,3 3,3 3,0 0,0 -3,-3zM21,11h-1.07A8,8 0,0 0,13 4.07L13,3a1,1 0,0 0,-2 0v1.07A8,8 0,0 0,4.07 11L3,11a1,1 0,0 0,0 2h1.07A8,8 0,0 0,11 19.93L11,21a1,1 0,0 0,2 0v-1.07A8,8 0,0 0,19.93 13L21,13a1,1 0,0 0,0 -2zM12,18a6,6 0,1 1,6 -6,6 6,0 0,1 -6,6z" />
-    </group>
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/disabled_text"
+        android:pathData="M3.78 5.22a0.75 0.75 0 1 0-1.061 1.061l1.318 1.318a8.367 8.367 0 0 0-0.535 3.105c0.081 3.397 4.401 8.09 6.968 10.585a2.487 2.487 0 0 0 1.806 0.71 2.485 2.485 0 0 0 1.77-0.796 51.854 51.854 0 0 0 1.692-1.905l2.482 2.482a0.748 0.748 0 0 0 1.06 0 0.75 0.75 0 0 0 0-1.061L3.78 5.22zm9.171 14.959a0.968 0.968 0 0 1-0.281 0.196h-0.897a0.957 0.957 0 0 1-0.257-0.161c-4.029-3.916-6.464-7.484-6.513-9.545a6.917 6.917 0 0 1 0.219-1.886l9.447 9.447a48.709 48.709 0 0 1-1.718 1.949zM11.833 3.502c3.859-0.092 7.074 2.971 7.166 6.83 0.031 1.298-0.856 3.238-2.473 5.521l1.076 1.076c1.608-2.227 2.944-4.678 2.897-6.633-0.112-4.686-4.016-8.406-8.702-8.294A8.472 8.472 0 0 0 5.6 4.928L6.662 5.99a6.976 6.976 0 0 1 5.171-2.488z" />
+    <path
+        android:fillColor="@color/disabled_text"
+        android:pathData="M10.152 9.48a2.245 2.245 0 0 1 1.794-0.978 2.246 2.246 0 0 1 1.327 4.099l1.062 1.062a3.734 3.734 0 0 0 1.413-3.003 3.754 3.754 0 0 0-3.839-3.659 3.728 3.728 0 0 0-2.821 1.415l1.064 1.064z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_location_enabled.xml b/app/src/main/res/drawable/ic_location_enabled.xml
index 41270ef01c..785b356ab7 100644
--- a/app/src/main/res/drawable/ic_location_enabled.xml
+++ b/app/src/main/res/drawable/ic_location_enabled.xml
@@ -3,25 +3,14 @@
    - 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">
-    <group>
-        <clip-path android:pathData="M 18.8 2.8 C 19.8 1.8 21.1 3.3 20.2 4.2 L 3.4 21 L 2 19.6 L 18.8 2.8 Z"/>
-        <path
-                android:name="strike_thru_path"
-                android:pathData="M 20 1.6 L 21.4 3 L 21.9 2.5 C 20.9 3.5 19.5 2 20.5 1.1 L 20 1.6 Z"
-                android:fillColor="?primaryText"
-                android:strokeWidth="1"/>
-    </group>
-    <group>
-        <clip-path
-                android:name="strike_thru_mask"
-                android:pathData="M 0 0 L 0 24 L 24 24 L 24 0 L 0 0 Z M 21 2 L 23 4 L 23 4 L 21 2 L 21 2 Z"/>
-        <path
-                android:name="icon"
-                android:fillColor="?primaryText"
-                android:pathData="M12,9a3,3 0,1 0,3 3,3 3,0 0,0 -3,-3zM21,11h-1.07A8,8 0,0 0,13 4.07L13,3a1,1 0,0 0,-2 0v1.07A8,8 0,0 0,4.07 11L3,11a1,1 0,0 0,0 2h1.07A8,8 0,0 0,11 19.93L11,21a1,1 0,0 0,2 0v-1.07A8,8 0,0 0,19.93 13L21,13a1,1 0,0 0,0 -2zM12,18a6,6 0,1 1,6 -6,6 6,0 0,1 -6,6z" />
-    </group>
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="?primaryText"
+        android:pathData="M12.09 14.5a3.755 3.755 0 0 1-3.839-3.659 3.755 3.755 0 0 1 3.659-3.839 3.755 3.755 0 0 1 3.839 3.659A3.755 3.755 0 0 1 12.09 14.5zm-0.144-5.998a2.252 2.252 0 0 0-2.195 2.303A2.252 2.252 0 0 0 12.054 13a2.252 2.252 0 0 0 2.195-2.303 2.252 2.252 0 0 0-2.303-2.195z" />
+    <path
+        android:fillColor="?primaryText"
+        android:pathData="M11.797 2.002C7.111 2.115 3.39 6.018 3.502 10.704c0.081 3.397 4.4 8.09 6.968 10.585a2.487 2.487 0 0 0 1.806 0.71 2.485 2.485 0 0 0 1.77-0.796c2.445-2.615 6.534-7.51 6.453-10.907-0.113-4.685-4.017-8.406-8.702-8.294zm1.154 18.177a0.968 0.968 0 0 1-0.281 0.196h-0.897a0.957 0.957 0 0 1-0.257-0.161c-4.029-3.916-6.464-7.484-6.513-9.545a7.008 7.008 0 0 1 6.83-7.167c3.858-0.092 7.074 2.971 7.166 6.83 0.05 2.062-2.212 5.742-6.048 9.847z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_login.xml b/app/src/main/res/drawable/ic_login.xml
index e95281678f..a61455db09 100644
--- a/app/src/main/res/drawable/ic_login.xml
+++ b/app/src/main/res/drawable/ic_login.xml
@@ -3,11 +3,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 xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="20dp"
-    android:height="10dp"
-    android:viewportWidth="20"
-    android:viewportHeight="10">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
   <path
-      android:pathData="M15,-0C12.7241,0.0054 10.7404,1.5503 10.1778,3.7556L1.2889,3.7556C0.6016,3.7556 0.0444,4.3127 0.0444,5C0.0444,5.6873 0.6016,6.2444 1.2889,6.2444L1.2889,7.5C1.2889,8.1934 1.851,8.7556 2.5444,8.7556C3.2379,8.7556 3.8,8.1934 3.8,7.5L3.8,6.2444L5,6.2444L5,7.5C4.9552,7.9747 5.1832,8.4339 5.5884,8.6851C5.9937,8.9363 6.5063,8.9363 6.9116,8.6851C7.3168,8.4339 7.5448,7.9747 7.5,7.5L7.5,6.2444L10.1778,6.2444C10.8302,8.7533 13.2953,10.3444 15.8502,9.9058C18.4051,9.4673 20.1984,7.145 19.9767,4.5623C19.755,1.9795 17.5923,-0.0032 15,-0ZM15,7.5C13.9888,7.5 13.0773,6.8909 12.6903,5.9567C12.3033,5.0225 12.5172,3.9472 13.2322,3.2322C13.9472,2.5172 15.0225,2.3033 15.9567,2.6903C16.8909,3.0773 17.5,3.9888 17.5,5C17.5,6.3807 16.3807,7.5 15,7.5Z"
+      android:pathData="M21.25 11h-9.351A5.01 5.01 0 0 0 7 7c-2.757 0-5 2.243-5 5s2.243 5 5 5c2.586 0 4.694-1.98 4.949-4.5H18.5v2.75a0.75 0.75 0 0 0 1.5 0V12.5h1.25a0.75 0.75 0 0 0 0-1.5zM7 15.5c-1.93 0-3.5-1.57-3.5-3.5S5.07 8.5 7 8.5s3.5 1.57 3.5 3.5-1.57 3.5-3.5 3.5z"
       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 e3d9712f56..69a5db52ea 100644
--- a/app/src/main/res/drawable/ic_microphone.xml
+++ b/app/src/main/res/drawable/ic_microphone.xml
@@ -11,12 +11,4 @@
             android:id="@+id/disabled"
             android:drawable="@drawable/ic_microphone_disabled" />
 
-    <transition
-            android:drawable="@drawable/ic_microphone_anim_enable"
-            android:fromId="@id/disabled"
-            android:toId="@id/enabled" />
-    <transition
-            android:drawable="@drawable/ic_microphone_anim_disable"
-            android:fromId="@+id/enabled"
-            android:toId="@+id/disabled" />
-</animated-selector>
+  </animated-selector>
diff --git a/app/src/main/res/drawable/ic_microphone_anim_disable.xml b/app/src/main/res/drawable/ic_microphone_anim_disable.xml
deleted file mode 100644
index 556580d5b6..0000000000
--- a/app/src/main/res/drawable/ic_microphone_anim_disable.xml
+++ /dev/null
@@ -1,11 +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/. -->
-<animated-vector
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:drawable="@drawable/ic_microphone_enabled">
-    <target android:name="strike_thru_path" android:animation="@animator/strike_thru_path_disable" />
-    <target android:name="strike_thru_mask" android:animation="@animator/strike_thru_mask_disable" />
-    <target android:name="icon" android:animation="@animator/fill_disable" />
-</animated-vector>
diff --git a/app/src/main/res/drawable/ic_microphone_anim_enable.xml b/app/src/main/res/drawable/ic_microphone_anim_enable.xml
deleted file mode 100644
index bccb4de819..0000000000
--- a/app/src/main/res/drawable/ic_microphone_anim_enable.xml
+++ /dev/null
@@ -1,11 +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/. -->
-<animated-vector
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:drawable="@drawable/ic_microphone_disabled">
-    <target android:name="strike_thru_path" android:animation="@animator/strike_thru_path_enable" />
-    <target android:name="strike_thru_mask" android:animation="@animator/strike_thru_mask_enable" />
-    <target android:name="icon" android:animation="@animator/fill_enable" />
-</animated-vector>
diff --git a/app/src/main/res/drawable/ic_microphone_disabled.xml b/app/src/main/res/drawable/ic_microphone_disabled.xml
index ffe797fc9c..929cb80a09 100644
--- a/app/src/main/res/drawable/ic_microphone_disabled.xml
+++ b/app/src/main/res/drawable/ic_microphone_disabled.xml
@@ -3,25 +3,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 xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24"
-        android:viewportHeight="24">
-    <group>
-        <clip-path android:pathData="M 18.8 2.8 C 19.8 1.8 21.1 3.3 20.2 4.2 L 3.4 21 L 2 19.6 L 18.8 2.8 Z"/>
-        <path
-                android:name="strike_thru_path"
-                android:pathData="M 20 1.6 L 21.4 3 L 5.2 19.2 C 4.2 20.2 2.8 18.8 3.8 17.8 L 20 1.6 Z"
-                android:fillColor="@color/disabled_text"
-                android:strokeWidth="1"/>
-    </group>
-    <group>
-        <clip-path
-                android:name="strike_thru_mask"
-                android:pathData="M 0 0 L 0 24 L 24 24 L 24 0 L 0 0 Z M 21 2 L 23 4 L 6 21 L 4 19 L 21 2 Z"/>
-        <path
-                android:name="icon"
-                android:fillColor="@color/disabled_text"
-                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" />
-    </group>
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/disabled_text"
+        android:pathData="M20.78 19.72L4.28 3.22a0.75 0.75 0 1 0-1.061 1.061l5.787 5.787a2.992 2.992 0 0 0 2.926 2.926l1.312 1.312A4.32 4.32 0 0 1 12 14.5c-2.225 0-4.14-1.658-4.455-3.856a0.742 0.742 0 0 0-0.849-0.636 0.75 0.75 0 0 0-0.636 0.849c0.355 2.478 2.244 4.404 4.608 4.95l0.582 0.485V19.5h-2.5a0.75 0.75 0 0 0 0 1.5h6.5a0.75 0.75 0 0 0 0-1.5h-2.5v-3.227l0.491-0.447a6.09 6.09 0 0 0 1.147-0.377l5.331 5.331a0.748 0.748 0 0 0 1.06 0 0.748 0.748 0 0 0 0.001-1.06zM10.5 6c0-0.827 0.673-1.5 1.5-1.5s1.5 0.673 1.5 1.5v4c0 0.107-0.012 0.211-0.034 0.312l1.142 1.142C14.851 11.022 15 10.531 15 10V6a3 3 0 0 0-3-3 2.993 2.993 0 0 0-2.986 2.859L10.5 7.345V6zm7.439 4.856a0.75 0.75 0 0 0-0.636-0.849 0.745 0.745 0 0 0-0.849 0.636 4.43 4.43 0 0 1-0.763 1.894l1.066 1.066a5.808 5.808 0 0 0 1.182-2.747z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_microphone_enabled.xml b/app/src/main/res/drawable/ic_microphone_enabled.xml
index 148a6695d8..e639d9faaa 100644
--- a/app/src/main/res/drawable/ic_microphone_enabled.xml
+++ b/app/src/main/res/drawable/ic_microphone_enabled.xml
@@ -7,21 +7,10 @@
         android:height="24dp"
         android:viewportWidth="24"
         android:viewportHeight="24">
-    <group>
-        <clip-path android:pathData="M 18.8 2.8 C 19.8 1.8 21.1 3.3 20.2 4.2 L 3.4 21 L 2 19.6 L 18.8 2.8 Z"/>
-        <path
-                android:name="strike_thru_path"
-                android:pathData="M 20 1.6 L 21.4 3 L 21.9 2.5 C 20.9 3.5 19.5 2 20.5 1.1 L 20 1.6 Z"
-                android:fillColor="?primaryText"
-                android:strokeWidth="1"/>
-    </group>
-    <group>
-        <clip-path
-                android:name="strike_thru_mask"
-                android:pathData="M 0 0 L 0 24 L 24 24 L 24 0 L 0 0 Z M 21 2 L 23 4 L 23 4 L 21 2 L 21 2 Z"/>
-        <path
-                android:name="icon"
-                android:fillColor="?primaryText"
-                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" />
-    </group>
+    <path
+        android:fillColor="?primaryText"
+        android:pathData="M12 4.5c0.827 0 1.5 0.673 1.5 1.5v4c0 0.827-0.673 1.5-1.5 1.5s-1.5-0.673-1.5-1.5V6c0-0.827 0.673-1.5 1.5-1.5zM12 3a3 3 0 0 0-3 3v4a3 3 0 1 0 6 0V6a3 3 0 0 0-3-3z" />
+    <path
+        android:fillColor="?primaryText"
+        android:pathData="M13.241 15.827c2.406-0.517 4.338-2.46 4.698-4.969a0.75 0.75 0 0 0-0.636-0.849 0.745 0.745 0 0 0-0.849 0.636c-0.315 2.198-2.23 3.856-4.454 3.856-2.224 0-4.139-1.658-4.454-3.856a0.742 0.742 0 0 0-0.849-0.636 0.75 0.75 0 0 0-0.636 0.849c0.355 2.478 2.244 4.403 4.607 4.95l0.582 0.485V19.5h-2.5a0.75 0.75 0 0 0 0 1.5h6.499a0.75 0.75 0 0 0 0-1.5h-2.5v-3.227l0.492-0.446z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_notifications.xml b/app/src/main/res/drawable/ic_notifications.xml
index 23fd8c1d06..813693ef54 100644
--- a/app/src/main/res/drawable/ic_notifications.xml
+++ b/app/src/main/res/drawable/ic_notifications.xml
@@ -10,13 +10,4 @@
     <item
             android:id="@+id/disabled"
             android:drawable="@drawable/ic_notifications_disabled" />
-
-    <transition
-            android:drawable="@drawable/ic_notifications_anim_enable"
-            android:fromId="@id/disabled"
-            android:toId="@id/enabled" />
-    <transition
-            android:drawable="@drawable/ic_notifications_anim_disable"
-            android:fromId="@+id/enabled"
-            android:toId="@+id/disabled" />
 </animated-selector>
diff --git a/app/src/main/res/drawable/ic_notifications_anim_disable.xml b/app/src/main/res/drawable/ic_notifications_anim_disable.xml
deleted file mode 100644
index b54382c081..0000000000
--- a/app/src/main/res/drawable/ic_notifications_anim_disable.xml
+++ /dev/null
@@ -1,11 +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/. -->
-<animated-vector
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:drawable="@drawable/ic_notifications_enabled">
-    <target android:name="strike_thru_path" android:animation="@animator/strike_thru_path_disable" />
-    <target android:name="strike_thru_mask" android:animation="@animator/strike_thru_mask_disable" />
-    <target android:name="icon" android:animation="@animator/fill_disable" />
-</animated-vector>
diff --git a/app/src/main/res/drawable/ic_notifications_anim_enable.xml b/app/src/main/res/drawable/ic_notifications_anim_enable.xml
deleted file mode 100644
index 8f4aa3bdad..0000000000
--- a/app/src/main/res/drawable/ic_notifications_anim_enable.xml
+++ /dev/null
@@ -1,11 +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/. -->
-<animated-vector
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:drawable="@drawable/ic_notifications_disabled">
-    <target android:name="strike_thru_path" android:animation="@animator/strike_thru_path_enable" />
-    <target android:name="strike_thru_mask" android:animation="@animator/strike_thru_mask_enable" />
-    <target android:name="icon" android:animation="@animator/fill_enable" />
-</animated-vector>
diff --git a/app/src/main/res/drawable/ic_notifications_disabled.xml b/app/src/main/res/drawable/ic_notifications_disabled.xml
index 9c30ac7bdc..dcce0b521e 100644
--- a/app/src/main/res/drawable/ic_notifications_disabled.xml
+++ b/app/src/main/res/drawable/ic_notifications_disabled.xml
@@ -7,21 +7,10 @@
         android:height="24dp"
         android:viewportWidth="24"
         android:viewportHeight="24">
-    <group>
-        <clip-path android:pathData="M 18.8 2.8 C 19.8 1.8 21.1 3.3 20.2 4.2 L 3.4 21 L 2 19.6 L 18.8 2.8 Z"/>
-        <path
-                android:name="strike_thru_path"
-                android:pathData="M 20 1.6 L 21.4 3 L 5.2 19.2 C 4.2 20.2 2.8 18.8 3.8 17.8 L 20 1.6 Z"
-                android:fillColor="@color/disabled_text"
-                android:strokeWidth="1"/>
-    </group>
-    <group>
-        <clip-path
-                android:name="strike_thru_mask"
-                android:pathData="M 0 0 L 0 24 L 24 24 L 24 0 L 0 0 Z M 21 2 L 23 4 L 6 21 L 4 19 L 21 2 Z"/>
-        <path
-                android:name="icon"
-                android:fillColor="@color/disabled_text"
-                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" />
-    </group>
-</vector>
+    <path
+        android:pathData="M11.732,8.5h4.518a0.75,0.75 0,0 0,0 -1.5h-6.018l1.5,1.5zM3.28,2.22a0.75,0.75 0,1 0,-1.061 1.061L3.3,4.361c-0.18,0.343 -0.3,0.723 -0.3,1.139v9A2.5,2.5 0,0 0,5.5 17h5.036l5,4h1.607v-2.797l2.577,2.577a0.748,0.748 0,0 0,1.06 0,0.75 0.75,0 0,0 0,-1.061L3.28,2.22zM15.643,19.165 L11.063,15.501L5.301,15.501l-0.8,-0.8v-9.14L9.939,11L7.75,11a0.75,0.75 0,0 0,0 1.5h3.689l4.203,4.203v2.462h0.001z"
+        android:fillColor="@color/disabled_text"/>
+    <path
+        android:pathData="M18.5,3H6.232l1.5,1.5H18.7l0.8,0.8v9.4l-0.784,0.784 1.122,1.122A2.494,2.494 0,0 0,21 14.5v-9A2.5,2.5 0,0 0,18.5 3z"
+        android:fillColor="@color/disabled_text"/>
+ </vector>
diff --git a/app/src/main/res/drawable/ic_notifications_enabled.xml b/app/src/main/res/drawable/ic_notifications_enabled.xml
index 86447ec03f..8fcc4d39d5 100644
--- a/app/src/main/res/drawable/ic_notifications_enabled.xml
+++ b/app/src/main/res/drawable/ic_notifications_enabled.xml
@@ -7,21 +7,10 @@
         android:height="24dp"
         android:viewportWidth="24"
         android:viewportHeight="24">
-    <group>
-        <clip-path android:pathData="M 18.8 2.8 C 19.8 1.8 21.1 3.3 20.2 4.2 L 3.4 21 L 2 19.6 L 18.8 2.8 Z"/>
-        <path
-                android:name="strike_thru_path"
-                android:pathData="M 20 1.6 L 21.4 3 L 21.9 2.5 C 20.9 3.5 19.5 2 20.5 1.1 L 20 1.6 Z"
-                android:fillColor="?primaryText"
-                android:strokeWidth="1"/>
-    </group>
-    <group>
-        <clip-path
-                android:name="strike_thru_mask"
-                android:pathData="M 0 0 L 0 24 L 24 24 L 24 0 L 0 0 Z M 21 2 L 23 4 L 23 4 L 21 2 L 21 2 Z"/>
-        <path
-                android:name="icon"
-                android:fillColor="?primaryText"
-                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" />
-    </group>
+    <path
+        android:fillColor="?primaryText"
+        android:pathData="M21 5.5A2.5 2.5 0 0 0 18.5 3h-13A2.5 2.5 0 0 0 3 5.5v9A2.5 2.5 0 0 0 5.5 17h5.036l5 4h1.607v-4H18.5a2.5 2.5 0 0 0 2.5-2.5v-9zM4.5 5.3l0.8-0.8h13.4l0.8 0.8v9.4l-0.8 0.8h-2.307a0.75 0.75 0 0 0-0.75 0.75v2.915l-4.17-3.336a1.498 1.498 0 0 0-0.937-0.329H5.3l-0.8-0.8" />
+    <path
+        android:fillColor="?primaryText"
+        android:pathData="M13.25 12.5h-5.5a0.75 0.75 0 0 1 0-1.5h5.5a0.75 0.75 0 0 1 0 1.5zm3-4h-8.5a0.75 0.75 0 0 1 0-1.5h8.5a0.75 0.75 0 0 1 0 1.5z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_share.xml b/app/src/main/res/drawable/ic_share.xml
new file mode 100644
index 0000000000..c36e1839d4
--- /dev/null
+++ b/app/src/main/res/drawable/ic_share.xml
@@ -0,0 +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:fillColor="?primaryText"
+        android:pathData="M18.4 14.1a3.5 3.5 0 0 0-3.6 1.2l-5-2.4a3.6 3.6 0 0 0 0-1.7l5-2.5a3.5 3.5 0 0 0 3.6 1.2 3.5 3.5 0 0 0 2.5-4.3 3.5 3.5 0 0 0-1.7-2.1 3.5 3.5 0 0 0-2.6-0.4A3.5 3.5 0 0 0 14 7.4L9.2 9.8 9 9.5a3.5 3.5 0 0 0-5 0 3.5 3.5 0 0 0 0 5 3.5 3.5 0 0 0 2.5 1c0.9 0 1.8-0.3 2.5-1l0.2-0.3 5 2.4a3.5 3.5 0 0 0 3.3 4.4c0.6 0 1.2-0.2 1.7-0.5a3.5 3.5 0 0 0 1.7-2 3.5 3.5 0 0 0-2.5-4.4zM17 4.6a2 2 0 0 1 1.5 0.2A2 2 0 0 1 18 8.4 2 2 0 0 1 15.6 7 2 2 0 0 1 17 4.6zm-9 8.8a2 2 0 0 1-3 0 2 2 0 0 1 0-2.8 2 2 0 0 1 3 0c0.7 0.8 0.7 2 0 2.8zM19.3 18a2 2 0 0 1-0.9 1.2 2 2 0 0 1-1.5 0.2 2 2 0 0 1-1.4-2.4 2 2 0 0 1 2.4-1.4 2 2 0 0 1 1.4 2.4z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_share_filled.xml b/app/src/main/res/drawable/ic_share_filled.xml
deleted file mode 100644
index d8b6ccbf86..0000000000
--- a/app/src/main/res/drawable/ic_share_filled.xml
+++ /dev/null
@@ -1,12 +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="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_social_media_trackers.xml b/app/src/main/res/drawable/ic_social_media_trackers.xml
index fe473248a1..a1c78bd68b 100644
--- a/app/src/main/res/drawable/ic_social_media_trackers.xml
+++ b/app/src/main/res/drawable/ic_social_media_trackers.xml
@@ -9,5 +9,5 @@
     android:viewportHeight="24">
     <path
         android:fillColor="?attr/primaryText"
-        android:pathData="M20.9,8.4c0.6,-1.3 0.1,-2.4 -0.8,-3.3 0.3,-1.8 -0.9,-2.5 -2.8,-3 -0.5,-0.2 -2.5,0 -3.3,0l-6,0.3C6,2.4 3.8,2 1.7,2v8.6h4.3c0.3,0.1 1,0.8 1.1,1 0.2,0.1 0.2,0.3 0.2,0.3s0.4,1 0.8,1.3c1.6,1.6 2.9,4.5 3.5,6.8 0.5,0.7 -1,1.8 0.9,2 1.7,0.2 2.4,-3 1.8,-4.3 -0.6,-1.3 -1.2,-3.8 0,-3.5l1,0.2c1.6,0.5 4,0.7 5.3,-0.1 1.2,-0.9 0.6,-1.6 0.4,-2.6 1,-1 0.8,-2.2 0,-3.3" />
+        android:pathData="M4.5,15h-1A1.5,1.5 0,0 1,2 13.5v-8A1.5,1.5 0,0 1,3.5 4h1A1.5,1.5 0,0 1,6 5.5v8A1.5,1.5 0,0 1,4.5 15zM18.767,16.077a2.461,2.461 0,0 0,2.335 -3.24l-2.051,-6.154A2.46,2.46 0,0 0,16.716 5H8v9.023l2.154,3.285 1.037,3.112a0.85,0.85 0,0 0,0.806 0.58H12c1.02,0 1.846,-0.827 1.846,-1.846v-2.708l0.369,-0.369h4.552z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_storage_disabled.xml b/app/src/main/res/drawable/ic_storage_disabled.xml
index 6efaaac625..e9608e8623 100644
--- a/app/src/main/res/drawable/ic_storage_disabled.xml
+++ b/app/src/main/res/drawable/ic_storage_disabled.xml
@@ -8,6 +8,9 @@
     android:viewportHeight="24"
     android:autoMirrored="true">
   <path
-      android:fillColor="@color/disabled_text"
-      android:pathData="M2,20h20v-4L2,16v4zM4,17h2v2L4,19v-2zM2,4v4h20L22,4L2,4zM6,7L4,7L4,5h2v2zM2,14h20v-4L2,10v4zM4,11h2v2L4,13v-2z"/>
-</vector>
+      android:pathData="M7.2,11h-0.9l-0.3,0.3v0.9l0.3,0.3h0.9l0.3,-0.3v-0.9l-0.3,-0.3z"
+      android:fillColor="@color/disabled_text"/>
+  <path
+      android:pathData="M3.78,2.22a0.75,0.75 0,1 0,-1.061 1.061L5.439,6H4.5A2.5,2.5 0,0 0,2 8.5v6A2.5,2.5 0,0 0,4.5 17h11.939l3.78,3.78a0.748,0.748 0,0 0,1.06 0,0.75 0.75,0 0,0 0,-1.061L3.78,2.22zM4.3,15.5l-0.8,-0.8V8.3l0.8,-0.8h2.639l8,8H4.3zM19.5,6H9.691l1.5,1.5H19.7l0.8,0.8v6.4l-0.8,0.8h-0.509l1.296,1.296A2.499,2.499 0,0 0,22 14.5v-6A2.5,2.5 0,0 0,19.5 6z"
+      android:fillColor="@color/disabled_text"/>
+ </vector>
diff --git a/app/src/main/res/drawable/ic_storage_enabled.xml b/app/src/main/res/drawable/ic_storage_enabled.xml
index dc941e6197..b5d2f7b4a2 100644
--- a/app/src/main/res/drawable/ic_storage_enabled.xml
+++ b/app/src/main/res/drawable/ic_storage_enabled.xml
@@ -11,5 +11,8 @@
     android:autoMirrored="true">
   <path
       android:fillColor="?primaryText"
-      android:pathData="M2,20h20v-4L2,16v4zM4,17h2v2L4,19v-2zM2,4v4h20L22,4L2,4zM6,7L4,7L4,5h2v2zM2,14h20v-4L2,10v4zM4,11h2v2L4,13v-2z"/>
-</vector>
+      android:pathData="M7.2 11H6.3L6 11.3v0.9l0.3 0.3h0.9l0.3-0.3v-0.9L7.2 11z" />
+  <path
+      android:fillColor="?primaryText"
+      android:pathData="M19.7 7.5l0.8 0.8v6.4l-0.8 0.8H4.3l-0.8-0.8V8.3l0.8-0.8h15.4zM19.5 6h-15A2.5 2.5 0 0 0 2 8.5v6A2.5 2.5 0 0 0 4.5 17h15a2.5 2.5 0 0 0 2.5-2.5v-6A2.5 2.5 0 0 0 19.5 6z" />
+ </vector>
diff --git a/app/src/main/res/drawable/ic_tab_collection.xml b/app/src/main/res/drawable/ic_tab_collection.xml
index b78a92c357..df421740c1 100644
--- a/app/src/main/res/drawable/ic_tab_collection.xml
+++ b/app/src/main/res/drawable/ic_tab_collection.xml
@@ -9,8 +9,8 @@
     android:viewportHeight="24">
     <path
         android:fillColor="?primaryText"
-        android:pathData="M19 9H5v9c0 0.5 0.5 1 1 1h12c0.5 0 1-0.5 1-1V9zm-1-2l-2-2H8L6 7h12zM3 18V8c0-0.7 0.5-1.5 1-2l2-2c0.5-0.5 1.3-1 2-1h8c0.8 0 1.5 0.4 2 1l2 2c0.4 0.5 1 1.3 1 2v10c0 1.5-1.5 3-3 3H6c-1.5 0-3-1.5-3-3z" />
+        android:pathData="M8.75 12.5h6.5a0.75 0.75 0 0 0 0-1.5h-6.5a0.75 0.75 0 0 0 0 1.5zm0 4h6.5a0.75 0.75 0 0 0 0-1.5h-6.5a0.75 0.75 0 0 0 0 1.5z" />
     <path
         android:fillColor="?primaryText"
-        android:pathData="M16.5 11h-9a0.5 0.5 0 0 0 0 1h9a0.5 0.5 0 0 0 0-1zM16.5 16h-9a0.5 0.5 0 0 0 0 1h9a0.5 0.5 0 0 0 0-1zM16.5 13.5h-9a0.5 0.5 0 0 0 0 1h9a0.5 0.5 0 0 0 0-1z" />
-</vector>
+        android:pathData="M19.962 7.811l0.018-0.005-0.788-2.951A2.504 2.504 0 0 0 16.776 3H7.22a2.502 2.502 0 0 0-2.419 1.868L4.088 7.596C4.072 7.632 4.07 7.673 4.058 7.711L4.041 7.777l0.004 0.001C4.028 7.852 4 7.921 4 8v10.5A2.5 2.5 0 0 0 6.5 21h11a2.5 2.5 0 0 0 2.5-2.5V8c0-0.067-0.026-0.125-0.038-0.189zM7.12 4.5h9.756l0.858 0.713L18.212 7H5.794l0.484-1.787L7.12 4.5zM18.5 18.7l-0.8 0.8H6.3l-0.8-0.8V8.5h13v10.2z" />
+   </vector>
diff --git a/app/src/main/res/layout/collection_home_list_row.xml b/app/src/main/res/layout/collection_home_list_row.xml
index 46ce31c8a9..d37675e476 100644
--- a/app/src/main/res/layout/collection_home_list_row.xml
+++ b/app/src/main/res/layout/collection_home_list_row.xml
@@ -68,7 +68,7 @@
         app:layout_constraintBottom_toBottomOf="@id/collection_icon"
         app:layout_constraintEnd_toStartOf="@id/collection_overflow_button"
         app:layout_constraintTop_toTopOf="@id/collection_icon"
-        app:srcCompat="@drawable/ic_share_filled"
+        app:srcCompat="@drawable/ic_share"
         tools:visibility="visible" />
 
     <ImageButton
diff --git a/app/src/main/res/layout/onboarding_privacy_notice.xml b/app/src/main/res/layout/onboarding_privacy_notice.xml
index 302af0c13c..6a51e82434 100644
--- a/app/src/main/res/layout/onboarding_privacy_notice.xml
+++ b/app/src/main/res/layout/onboarding_privacy_notice.xml
@@ -15,7 +15,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:text="@string/onboarding_privacy_notice_header"
-            tools:drawableStart="@drawable/ic_onboarding_privacy_notice"
+            tools:drawableStart="@drawable/ic_info"
             android:drawablePadding="12dp"
             android:textAppearance="@style/HeaderTextStyle"
             android:gravity="center_vertical"
diff --git a/app/src/main/res/layout/tab_header.xml b/app/src/main/res/layout/tab_header.xml
index eb61ecf5a3..16432a4459 100644
--- a/app/src/main/res/layout/tab_header.xml
+++ b/app/src/main/res/layout/tab_header.xml
@@ -27,7 +27,7 @@
         android:layout_height="48dp"
         android:background="?android:attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/tabs_menu_share_tabs"
-        app:srcCompat="@drawable/ic_share_filled"
+        app:srcCompat="@drawable/ic_share"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/close_tabs_button"
         app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/layout/tabstray_multiselect_items.xml b/app/src/main/res/layout/tabstray_multiselect_items.xml
index 795753f94e..22d325a1ac 100644
--- a/app/src/main/res/layout/tabstray_multiselect_items.xml
+++ b/app/src/main/res/layout/tabstray_multiselect_items.xml
@@ -32,7 +32,7 @@
         app:layout_constraintBottom_toBottomOf="@id/topBar"
         app:layout_constraintEnd_toStartOf="@id/menu_multi_select"
         app:layout_constraintTop_toTopOf="@id/topBar"
-        app:srcCompat="@drawable/ic_share_filled"
+        app:srcCompat="@drawable/ic_share"
         app:tint="@color/contrast_text_normal_theme" />
 
     <ImageButton
diff --git a/app/src/main/res/menu/bookmarks_select_multi.xml b/app/src/main/res/menu/bookmarks_select_multi.xml
index faa422caa3..7190328cef 100644
--- a/app/src/main/res/menu/bookmarks_select_multi.xml
+++ b/app/src/main/res/menu/bookmarks_select_multi.xml
@@ -6,7 +6,7 @@
         xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/share_bookmark_multi_select"
-        android:icon="@drawable/ic_share_filled"
+        android:icon="@drawable/ic_share"
         app:iconTint="@color/white_color"
         android:title="@string/browser_menu_share"
         app:showAsAction="ifRoom" />
diff --git a/app/src/main/res/menu/history_select_multi.xml b/app/src/main/res/menu/history_select_multi.xml
index 52f7aed440..344b19c444 100644
--- a/app/src/main/res/menu/history_select_multi.xml
+++ b/app/src/main/res/menu/history_select_multi.xml
@@ -6,7 +6,7 @@
       xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
             android:id="@+id/share_history_multi_select"
-            android:icon="@drawable/ic_share_filled"
+            android:icon="@drawable/ic_share"
             app:iconTint="@color/white_color"
             android:title="@string/browser_menu_share"
             app:showAsAction="ifRoom" />