From af901baff345fc3e16b780d3447f52e95c59ff1c Mon Sep 17 00:00:00 2001
From: Zakhar Timoshenko <vp1984tanki@gmail.com>
Date: Thu, 21 Jul 2022 21:11:15 +0300
Subject: [PATCH] Update animated icons

---
 app/src/main/res/drawable/avd_feed_enter.xml  | 53 ++++++++++++++++
 .../res/drawable/avd_feed_enter_leave.xml     | 32 ----------
 app/src/main/res/drawable/avd_tools_enter.xml | 60 ++++++++++++-------
 .../main/res/drawable/ic_feed_selector.xml    |  7 +--
 app/src/main/res/drawable/ic_tools.xml        | 21 +++----
 5 files changed, 103 insertions(+), 70 deletions(-)
 create mode 100644 app/src/main/res/drawable/avd_feed_enter.xml
 delete mode 100644 app/src/main/res/drawable/avd_feed_enter_leave.xml

diff --git a/app/src/main/res/drawable/avd_feed_enter.xml b/app/src/main/res/drawable/avd_feed_enter.xml
new file mode 100644
index 000000000..dc08f558e
--- /dev/null
+++ b/app/src/main/res/drawable/avd_feed_enter.xml
@@ -0,0 +1,53 @@
+<animated-vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt">
+    <aapt:attr name="android:drawable">
+        <vector
+            android:name="vector"
+            android:width="24dp"
+            android:height="24dp"
+            android:viewportWidth="24"
+            android:viewportHeight="24">
+            <path
+                android:name="path"
+                android:pathData="M 4 17.8 C 4 17.3 4.1 16.9 4.4 16.5 C 4.7 16.1 5.1 15.9 5.5 15.7 C 5.9 15.6 6.4 15.6 6.8 15.7 C 7.2 15.8 7.6 16.1 7.9 16.5 C 8.2 16.9 8.3 17.3 8.3 17.8 C 8.3 18.4 8.1 18.9 7.7 19.3 C 7.3 19.7 6.7 19.9 6.2 19.9 C 5.7 19.9 5 19.8 4.6 19.4 C 4.2 19 4 18.4 4 17.8"
+                android:fillColor="#000"
+                android:strokeWidth="1"/>
+            <path
+                android:name="path_1"
+                android:pathData="M 4 10.1 L 4 12.9 C 7.9 12.9 11.1 16.1 11.1 20 L 13.9 20 C 13.9 14.5 9.5 10.1 4 10.1 Z"
+                android:fillColor="#000"
+                android:strokeWidth="1"/>
+            <path
+                android:name="path_3"
+                android:pathData="M 4.9 16.5 L 4.9 17.2 C 5.9 17.2 6.7 18 6.7 19 L 7.4 19 C 7.5 17.7 6.3 16.5 4.9 16.5 Z"
+                android:fillColor="#000000"/>
+            <path
+                android:name="path_2"
+                android:pathData="M 4 4.4 L 4 7.2 C 11 7.2 16.7 12.9 16.7 19.9 L 19.5 19.9 C 19.6 11.4 12.6 4.4 4 4.4 Z"
+                android:fillColor="#000000"/>
+        </vector>
+    </aapt:attr>
+    <target android:name="path_1">
+        <aapt:attr name="android:animation">
+            <objectAnimator
+                android:propertyName="pathData"
+                android:duration="@integer/config_defaultAnimTime"
+                android:valueFrom="M 4 10.1 L 4 12.9 C 7.9 12.9 11.1 16.1 11.1 20 L 13.9 20 C 13.9 14.5 9.5 10.1 4 10.1 Z"
+                android:valueTo="M 4 4.4 L 4 7.2 C 11 7.2 16.7 12.9 16.7 19.9 L 19.5 19.9 C 19.6 11.4 12.6 4.4 4 4.4 Z"
+                android:valueType="pathType"
+                android:interpolator="@android:interpolator/fast_out_slow_in"/>
+        </aapt:attr>
+    </target>
+    <target android:name="path_3">
+        <aapt:attr name="android:animation">
+            <objectAnimator
+                android:propertyName="pathData"
+                android:duration="@integer/config_defaultAnimTime"
+                android:valueFrom="M 4.9 16.5 L 4.9 17.2 C 5.9 17.2 6.7 18 6.7 19 L 7.4 19 C 7.5 17.7 6.3 16.5 4.9 16.5 Z"
+                android:valueTo="M 4 10.1 L 4 12.9 C 7.9 12.9 11.1 16.1 11.1 20 L 13.9 20 C 13.9 14.5 9.5 10.1 4 10.1 Z"
+                android:valueType="pathType"
+                android:interpolator="@android:interpolator/fast_out_slow_in"/>
+        </aapt:attr>
+    </target>
+</animated-vector>
diff --git a/app/src/main/res/drawable/avd_feed_enter_leave.xml b/app/src/main/res/drawable/avd_feed_enter_leave.xml
deleted file mode 100644
index c6e759150..000000000
--- a/app/src/main/res/drawable/avd_feed_enter_leave.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<animated-vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt">
-    <aapt:attr name="android:drawable">
-        <vector
-            android:name="vector"
-            android:width="24dp"
-            android:height="24dp"
-            android:viewportWidth="24"
-            android:viewportHeight="24">
-            <path
-                android:name="path"
-                android:pathData="M 4 17.82 C 4 17.36 4.146 16.911 4.416 16.539 C 4.687 16.166 5.069 15.889 5.506 15.747 C 5.944 15.604 6.416 15.604 6.854 15.747 C 7.291 15.889 7.673 16.166 7.944 16.539 C 8.214 16.911 8.36 17.36 8.36 17.82 C 8.36 18.398 8.13 18.953 7.721 19.361 C 7.313 19.77 6.758 20 6.18 20 C 5.602 20 5.047 19.77 4.639 19.361 C 4.23 18.953 4 18.398 4 17.82"
-                android:fillColor="#000000"/>
-            <path
-                android:name="path_1"
-                android:pathData="M 4 4.44 L 4 7.27 C 11.03 7.27 16.73 12.97 16.73 20 L 19.56 20 C 19.56 11.41 12.59 4.44 4 4.44 Z M 4 10.1 L 4 12.93 C 7.9 12.93 11.07 16.1 11.07 20 L 13.9 20 C 13.9 14.53 9.47 10.1 4 10.1 Z"
-                android:fillColor="#000000"/>
-        </vector>
-    </aapt:attr>
-    <target android:name="path_1">
-        <aapt:attr name="android:animation">
-            <objectAnimator
-                android:propertyName="pathData"
-                android:duration="@integer/config_defaultAnimTime"
-                android:valueFrom="M 4 10.1 L 4 12.93 C 7.9 12.93 11.07 16.1 11.07 20 L 13.9 20 C 13.9 14.53 9.47 10.1 4 10.1 Z M 4 4.44 L 4 7.27 C 11.03 7.27 16.73 12.97 16.73 20 L 19.56 20 C 19.56 11.41 12.59 4.44 4 4.44 Z"
-                android:valueTo="M 4 4.44 L 4 7.27 C 11.03 7.27 16.73 12.97 16.73 20 L 19.56 20 C 19.56 11.41 12.59 4.44 4 4.44 Z M 4 10.1 L 4 12.93 C 7.9 12.93 11.07 16.1 11.07 20 L 13.9 20 C 13.9 14.53 9.47 10.1 4 10.1 Z"
-                android:valueType="pathType"
-                android:interpolator="@android:anim/anticipate_overshoot_interpolator"/>
-        </aapt:attr>
-    </target>
-</animated-vector>
diff --git a/app/src/main/res/drawable/avd_tools_enter.xml b/app/src/main/res/drawable/avd_tools_enter.xml
index 02afdd10a..5d17a7cbd 100644
--- a/app/src/main/res/drawable/avd_tools_enter.xml
+++ b/app/src/main/res/drawable/avd_tools_enter.xml
@@ -4,15 +4,18 @@
     <aapt:attr name="android:drawable">
         <vector
             android:name="vector"
-            android:width="32dp"
-            android:height="32dp"
-            android:viewportWidth="32"
-            android:viewportHeight="32">
+            android:width="24dp"
+            android:height="24dp"
+            android:viewportWidth="24"
+            android:viewportHeight="24">
             <path
                 android:name="path"
-                android:pathData="M 27 23.2 L 17.7 14.3 C 18.6 11.9 18.1 9.2 16.1 7.3 C 13.8 5 10.2 4.9 7.7 6.8 L 11.6 10.6 L 10.2 12 L 6.3 8.3 C 4.5 10.9 4.8 14.5 7.1 16.7 C 9 18.5 11.7 19 14.1 18 L 23.4 26.9 C 23.8 27.3 24.4 27.3 24.8 26.9 L 27.1 24.6 C 27.4 24.2 27.4 23.6 27 23.2 M 24 24.8 L 14.3 15.5 C 13.7 16 13 16.2 12.3 16.4 C 10.9 16.6 9.5 16.2 8.4 15.2 C 7.4 14.3 7 13 7 11.8 L 10.2 14.8 L 14.4 10.5 L 11.2 7.5 C 12.5 7.4 13.7 7.8 14.7 8.8 C 15.8 9.9 16.2 11.3 16 12.7 C 15.9 13.4 15.6 14.1 15.2 14.7 L 24.9 24 L 24 24.8 Z"
-                android:fillColor="#000"
-                android:strokeWidth="1"/>
+                android:pathData="M 20.9 17.9 C 20.9 17.7 20.9 17.6 20.9 17.5 C 20.9 17.4 20.9 17.2 20.9 17 L 21.9 16.3 C 22 16.3 22 16.1 22 16 L 21 14.5 C 21 14.4 20.8 14.4 20.7 14.4 L 19.5 14.9 C 19.3 14.7 19 14.6 18.7 14.5 L 18.5 13.3 C 18.5 13.2 18.4 13.1 18.3 13.1 L 16.5 13.1 C 16.4 13.1 16.3 13.2 16.3 13.3 L 16.1 14.5 C 15.8 14.6 15.6 14.8 15.3 14.9 L 14.1 14.4 C 14 14.4 13.9 14.4 13.8 14.5 L 13 16 C 12.9 16.1 13 16.2 13.1 16.3 L 14.1 17 C 14.1 17.2 14.1 17.3 14.1 17.5 C 14.1 17.7 14.1 17.8 14.1 17.9 L 13.1 18.6 C 13 18.8 13 18.9 13 19 L 13.9 20.6 C 13.9 20.7 14.1 20.7 14.2 20.7 L 15.4 20.2 C 15.6 20.4 15.9 20.5 16.2 20.7 L 16.4 21.9 C 16.4 22 16.5 22.1 16.6 22.1 L 18.4 22.1 C 18.5 22.1 18.6 22 18.6 21.9 L 18.8 20.7 C 19.1 20.6 19.3 20.4 19.6 20.2 L 20.8 20.7 C 20.9 20.7 21 20.7 21.1 20.6 L 22 19 C 22.1 18.9 22 18.8 21.9 18.7 L 20.9 17.9 Z M 17.5 19 C 16.7 19 16 18.3 16 17.5 C 16 16.7 16.7 16 17.5 16 C 18.3 16 19 16.7 19 17.5 C 19 18.3 18.3 19 17.5 19 Z"
+                android:fillColor="#FF000000"/>
+            <path
+                android:name="path_1"
+                android:pathData="M 9 1.1 L 9 6 L 7 6 L 7 1.1 C 4.2 1.6 2 4 2 7 C 2 9.2 3.2 11.1 5 12.2 L 5 21 C 5 21.5 5.4 22 6 22 L 10 22 C 10.6 22 11 21.5 11 21 L 11 12.2 C 12.8 11.2 14 9.2 14 7 C 14 4 11.8 1.6 9 1.1 M 10 10.5 L 9 11 L 9 20 L 7 20 L 7 11 L 6 10.4 C 4.8 9.7 4 8.4 4 7 C 4 6 4.4 5.1 5 4.3 L 5 8 L 11 8 L 11 4.3 C 11.6 5.1 12 6 12 7 C 12 8.4 11.2 9.7 10 10.5"
+                android:fillColor="#FF000000"/>
         </vector>
     </aapt:attr>
     <target android:name="path">
@@ -20,28 +23,41 @@
             <set>
                 <objectAnimator
                     android:propertyName="pathData"
-                    android:duration="@integer/config_defaultAnimTime"
-                    android:valueFrom="M 30 25.2 L 18 13.2 C 19.2 10.1 18.6 6.5 16.1 4 C 13.1 1 8.4 0.7 5 3.1 L 10.1 8.2 L 8.2 10 L 3.1 5 C 0.7 8.4 1 13.1 4 16.1 C 6.5 18.6 10 19.2 13.1 18.1 L 25.1 30.1 C 25.6 30.6 26.4 30.6 27 30.1 L 30 27.1 C 30.5 26.6 30.5 25.8 30 25.2 M 26.1 27.3 L 13.6 14.9 C 12.8 15.5 11.9 15.9 11 16 C 9.2 16.3 7.3 15.7 5.9 14.4 C 4.6 13 4 11.4 4.1 9.7 L 8.2 13.8 L 13.8 8.2 L 9.7 4.1 C 11.4 4 13 4.6 14.2 5.9 C 15.6 7.3 16.2 9.3 15.8 11.1 C 15.6 12 15.2 12.9 14.6 13.7 L 27.1 26.2 L 26.1 27.3 Z"
-                    android:valueTo="M 27.7 0.5 L 16.1 6 C 14.2 4.3 11.5 3.9 9 5 C 6.1 6.4 4.7 9.7 5.6 12.7 L 10.5 10.4 L 11.3 12.2 L 6.4 14.5 C 8.2 17.1 11.6 18.1 14.6 16.7 C 17 15.6 18.3 13.2 18.3 10.7 L 30 5.2 C 30.5 5 30.7 4.4 30.5 3.9 L 29 1 C 28.8 0.5 28.2 0.3 27.7 0.5 M 28.2 3.8 L 16.1 9.6 C 16.3 10.3 16.3 11.1 16.2 11.8 C 15.9 13.1 15.1 14.4 13.7 15 C 12.5 15.6 11.2 15.6 10 15.1 L 13.9 13.2 L 11.3 7.8 L 7.3 9.7 C 7.7 8.5 8.5 7.5 9.7 6.9 C 11.3 6.2 12.8 6.3 14 7 C 14.6 7.4 15.2 7.9 15.6 8.5 L 27.7 2.7 L 28.2 3.8 Z"
+                    android:duration="150"
+                    android:valueFrom="M 20.9 17.9 C 20.9 17.7 20.9 17.6 20.9 17.5 C 20.9 17.4 20.9 17.2 20.9 17 C 21.233 16.767 21.567 16.533 21.9 16.3 C 22 16.3 22 16.1 22 16 C 21.667 15.5 21.333 15 21 14.5 C 21 14.4 20.8 14.4 20.7 14.4 L 19.5 14.9 C 19.397 14.797 19.267 14.72 19.125 14.657 C 18.991 14.597 18.845 14.548 18.7 14.5 L 18.5 13.3 C 18.5 13.2 18.4 13.1 18.3 13.1 L 16.5 13.1 C 16.4 13.1 16.3 13.2 16.3 13.3 L 16.1 14.5 C 15.963 14.546 15.847 14.612 15.733 14.68 C 15.597 14.761 15.463 14.846 15.3 14.9 L 14.1 14.4 C 14 14.4 13.9 14.4 13.8 14.5 L 13 16 C 12.9 16.1 13 16.2 13.1 16.3 L 14.1 17 C 14.1 17.2 14.1 17.3 14.1 17.5 C 14.1 17.7 14.1 17.8 14.1 17.9 L 13.1 18.6 C 13 18.8 13 18.9 13 19 L 13.9 20.6 C 13.9 20.7 14.1 20.7 14.2 20.7 L 15.4 20.2 C 15.505 20.305 15.637 20.382 15.783 20.461 C 15.915 20.532 16.057 20.605 16.2 20.7 L 16.4 21.9 C 16.4 22 16.5 22.1 16.6 22.1 L 18.4 22.1 C 18.5 22.1 18.6 22 18.6 21.9 L 18.8 20.7 C 18.96 20.647 19.091 20.565 19.224 20.47 C 19.341 20.387 19.46 20.294 19.6 20.2 L 20.8 20.7 C 20.9 20.7 21 20.7 21.1 20.6 L 22 19 C 22.1 18.9 22 18.8 21.9 18.7 L 20.9 17.9 C 20.9 17.9 20.9 17.9 20.9 17.9 M 17.5 19 C 16.7 19 16 18.3 16 17.5 C 16 16.7 16.7 16 17.5 16 C 18.3 16 19 16.7 19 17.5 C 19 18.3 18.3 19 17.5 19 Z"
+                    android:valueTo="M 19.24 20.459 C 19.352 20.379 19.466 20.289 19.6 20.2 C 20 20.367 20.4 20.533 20.8 20.7 C 20.9 20.7 21 20.7 21.1 20.6 C 21.4 20.067 21.7 19.533 22 19 C 22.1 18.9 22 18.8 21.9 18.7 C 21.567 18.433 21.233 18.167 20.9 17.9 L 20.9 17.9 C 20.9 17.7 20.9 17.6 20.9 17.5 C 20.9 17.4 20.9 17.2 20.9 17 L 21.9 16.3 C 22 16.3 22 16.1 22 16 L 21 14.5 C 21 14.4 20.8 14.4 20.7 14.4 L 19.5 14.9 C 19.403 14.803 19.282 14.729 19.148 14.667 C 19.008 14.603 18.854 14.551 18.7 14.5 L 18.5 13.3 C 18.5 13.2 18.4 13.1 18.3 13.1 L 16.5 13.1 C 16.4 13.1 16.3 13.2 16.3 13.3 L 16.1 14.5 C 15.961 14.546 15.843 14.614 15.727 14.684 C 15.593 14.764 15.461 14.846 15.3 14.9 L 14.1 14.4 C 14 14.4 13.9 14.4 13.8 14.5 L 13 16 C 12.9 16.1 13 16.2 13.1 16.3 L 14.1 17 C 14.1 17.2 14.1 17.3 14.1 17.5 C 14.1 17.7 14.1 17.8 14.1 17.9 L 13.1 18.6 C 13 18.8 13 18.9 13 19 L 13.9 20.6 C 13.9 20.7 14.1 20.7 14.2 20.7 L 15.4 20.2 C 15.51 20.31 15.649 20.389 15.803 20.472 C 15.929 20.54 16.065 20.61 16.2 20.7 L 16.4 21.9 C 16.4 22 16.5 22.1 16.6 22.1 L 18.4 22.1 C 18.5 22.1 18.6 22 18.6 21.9 L 18.8 20.7 C 18.966 20.645 19.101 20.559 19.24 20.459 M 17.5 19 C 16.7 19 16 18.3 16 17.5 C 16 16.7 16.7 16 17.5 16 C 18.3 16 19 16.7 19 17.5 C 19 18.3 18.3 19 17.5 19 Z"
                     android:valueType="pathType"
                     android:interpolator="@android:interpolator/fast_out_slow_in"/>
                 <objectAnimator
                     android:propertyName="pathData"
-                    android:startOffset="300"
-                    android:duration="@integer/config_defaultAnimTime"
-                    android:valueFrom="M 27.7 0.5 L 16.1 6 C 14.2 4.3 11.5 3.9 9 5 C 6.1 6.4 4.7 9.7 5.6 12.7 L 10.5 10.4 L 11.3 12.2 L 6.4 14.5 C 8.2 17.1 11.6 18.1 14.6 16.7 C 17 15.6 18.3 13.2 18.3 10.7 L 30 5.2 C 30.5 5 30.7 4.4 30.5 3.9 L 29 1 C 28.8 0.5 28.2 0.3 27.7 0.5 M 28.2 3.8 L 16.1 9.6 C 16.3 10.3 16.3 11.1 16.2 11.8 C 15.9 13.1 15.1 14.4 13.7 15 C 12.5 15.6 11.2 15.6 10 15.1 L 13.9 13.2 L 11.3 7.8 L 7.3 9.7 C 7.7 8.5 8.5 7.5 9.7 6.9 C 11.3 6.2 12.8 6.3 14 7 C 14.6 7.4 15.2 7.9 15.6 8.5 L 27.7 2.7 L 28.2 3.8 Z"
-                    android:valueTo="M 30.7 8.4 L 17.8 8.6 C 16.8 6.3 14.4 4.7 11.8 4.8 C 8.5 4.9 5.9 7.3 5.5 10.4 L 10.9 10.3 L 10.9 12.3 L 5.5 12.4 C 6 15.5 8.8 17.8 12 17.8 C 14.6 17.7 16.9 16.1 17.8 13.9 L 30.7 13.6 C 31.3 13.6 31.7 13.1 31.7 12.6 L 31.6 9.3 C 31.7 8.8 31.2 8.3 30.7 8.4 M 29.7 11.6 L 16.3 11.9 C 16.2 12.7 15.9 13.3 15.5 13.9 C 14.7 15 13.4 15.8 11.9 15.8 C 10.6 15.8 9.4 15.3 8.5 14.4 L 12.9 14.3 L 12.8 8.3 L 8.5 8.4 C 9.3 7.5 10.5 6.9 11.8 6.8 C 13.3 6.8 14.7 7.5 15.5 8.6 C 15.9 9.2 16.2 9.9 16.3 10.6 L 29.7 10.3 L 29.7 11.6 Z"
-                    android:valueType="pathType"
-                    android:interpolator="@android:interpolator/fast_out_slow_in"/>
-                <objectAnimator
-                    android:propertyName="pathData"
-                    android:startOffset="600"
-                    android:duration="@integer/config_defaultAnimTime"
-                    android:valueFrom="M 30.7 8.4 L 17.8 8.6 C 16.8 6.3 14.4 4.7 11.8 4.8 C 8.5 4.9 5.9 7.3 5.5 10.4 L 10.9 10.3 L 10.9 12.3 L 5.5 12.4 C 6 15.5 8.8 17.8 12 17.8 C 14.6 17.7 16.9 16.1 17.8 13.9 L 30.7 13.6 C 31.3 13.6 31.7 13.1 31.7 12.6 L 31.6 9.3 C 31.7 8.8 31.2 8.3 30.7 8.4 M 29.7 11.6 L 16.3 11.9 C 16.2 12.7 15.9 13.3 15.5 13.9 C 14.7 15 13.4 15.8 11.9 15.8 C 10.6 15.8 9.4 15.3 8.5 14.4 L 12.9 14.3 L 12.8 8.3 L 8.5 8.4 C 9.3 7.5 10.5 6.9 11.8 6.8 C 13.3 6.8 14.7 7.5 15.5 8.6 C 15.9 9.2 16.2 9.9 16.3 10.6 L 29.7 10.3 L 29.7 11.6 Z"
-                    android:valueTo="M 30 25.2 L 18 13.2 C 19.2 10.1 18.6 6.5 16.1 4 C 13.1 1 8.4 0.7 5 3.1 L 10.1 8.2 L 8.2 10 L 3.1 5 C 0.7 8.4 1 13.1 4 16.1 C 6.5 18.6 10 19.2 13.1 18.1 L 25.1 30.1 C 25.6 30.6 26.4 30.6 27 30.1 L 30 27.1 C 30.5 26.6 30.5 25.8 30 25.2 M 26.1 27.3 L 13.6 14.9 C 12.8 15.5 11.9 15.9 11 16 C 9.2 16.3 7.3 15.7 5.9 14.4 C 4.6 13 4 11.4 4.1 9.7 L 8.2 13.8 L 13.8 8.2 L 9.7 4.1 C 11.4 4 13 4.6 14.2 5.9 C 15.6 7.3 16.2 9.3 15.8 11.1 C 15.6 12 15.2 12.9 14.6 13.7 L 27.1 26.2 L 26.1 27.3 Z"
+                    android:startOffset="150"
+                    android:duration="150"
+                    android:valueFrom="M 20.9 17.9 C 20.9 17.7 20.9 17.6 20.9 17.5 C 20.9 17.4 20.9 17.2 20.9 17 C 21.233 16.767 21.567 16.533 21.9 16.3 C 22 16.3 22 16.1 22 16 C 21.667 15.5 21.333 15 21 14.5 C 21 14.4 20.8 14.4 20.7 14.4 L 19.5 14.9 C 19.397 14.797 19.267 14.72 19.125 14.657 C 18.991 14.597 18.845 14.548 18.7 14.5 L 18.5 13.3 C 18.5 13.2 18.4 13.1 18.3 13.1 L 16.5 13.1 C 16.4 13.1 16.3 13.2 16.3 13.3 L 16.1 14.5 C 15.963 14.546 15.847 14.612 15.733 14.68 C 15.597 14.761 15.463 14.846 15.3 14.9 L 14.1 14.4 C 14 14.4 13.9 14.4 13.8 14.5 L 13 16 C 12.9 16.1 13 16.2 13.1 16.3 L 14.1 17 C 14.1 17.2 14.1 17.3 14.1 17.5 C 14.1 17.7 14.1 17.8 14.1 17.9 L 13.1 18.6 C 13 18.8 13 18.9 13 19 L 13.9 20.6 C 13.9 20.7 14.1 20.7 14.2 20.7 L 15.4 20.2 C 15.505 20.305 15.637 20.382 15.783 20.461 C 15.915 20.532 16.057 20.605 16.2 20.7 L 16.4 21.9 C 16.4 22 16.5 22.1 16.6 22.1 L 18.4 22.1 C 18.5 22.1 18.6 22 18.6 21.9 L 18.8 20.7 C 18.96 20.647 19.091 20.565 19.224 20.47 C 19.341 20.387 19.46 20.294 19.6 20.2 L 20.8 20.7 C 20.9 20.7 21 20.7 21.1 20.6 L 22 19 C 22.1 18.9 22 18.8 21.9 18.7 L 20.9 17.9 C 20.9 17.9 20.9 17.9 20.9 17.9 M 17.5 19 C 16.7 19 16 18.3 16 17.5 C 16 16.7 16.7 16 17.5 16 C 18.3 16 19 16.7 19 17.5 C 19 18.3 18.3 19 17.5 19 Z"
+                    android:valueTo="M 19.24 20.459 C 19.352 20.379 19.466 20.289 19.6 20.2 C 20 20.367 20.4 20.533 20.8 20.7 C 20.9 20.7 21 20.7 21.1 20.6 C 21.4 20.067 21.7 19.533 22 19 C 22.1 18.9 22 18.8 21.9 18.7 C 21.567 18.433 21.233 18.167 20.9 17.9 L 20.9 17.9 C 20.9 17.7 20.9 17.6 20.9 17.5 C 20.9 17.4 20.9 17.2 20.9 17 L 21.9 16.3 C 22 16.3 22 16.1 22 16 L 21 14.5 C 21 14.4 20.8 14.4 20.7 14.4 L 19.5 14.9 C 19.403 14.803 19.282 14.729 19.148 14.667 C 19.008 14.603 18.854 14.551 18.7 14.5 L 18.5 13.3 C 18.5 13.2 18.4 13.1 18.3 13.1 L 16.5 13.1 C 16.4 13.1 16.3 13.2 16.3 13.3 L 16.1 14.5 C 15.961 14.546 15.843 14.614 15.727 14.684 C 15.593 14.764 15.461 14.846 15.3 14.9 L 14.1 14.4 C 14 14.4 13.9 14.4 13.8 14.5 L 13 16 C 12.9 16.1 13 16.2 13.1 16.3 L 14.1 17 C 14.1 17.2 14.1 17.3 14.1 17.5 C 14.1 17.7 14.1 17.8 14.1 17.9 L 13.1 18.6 C 13 18.8 13 18.9 13 19 L 13.9 20.6 C 13.9 20.7 14.1 20.7 14.2 20.7 L 15.4 20.2 C 15.51 20.31 15.649 20.389 15.803 20.472 C 15.929 20.54 16.065 20.61 16.2 20.7 L 16.4 21.9 C 16.4 22 16.5 22.1 16.6 22.1 L 18.4 22.1 C 18.5 22.1 18.6 22 18.6 21.9 L 18.8 20.7 C 18.966 20.645 19.101 20.559 19.24 20.459 M 17.5 19 C 16.7 19 16 18.3 16 17.5 C 16 16.7 16.7 16 17.5 16 C 18.3 16 19 16.7 19 17.5 C 19 18.3 18.3 19 17.5 19 Z"
                     android:valueType="pathType"
                     android:interpolator="@android:interpolator/fast_out_slow_in"/>
             </set>
         </aapt:attr>
     </target>
+    <target android:name="path_1">
+        <aapt:attr name="android:animation">
+            <set>
+                <objectAnimator
+                    android:propertyName="pathData"
+                    android:duration="200"
+                    android:valueFrom="M 9 1.1 L 9 6 L 7 6 L 7 1.1 C 4.2 1.6 2 4 2 7 C 2 9.2 3.2 11.1 5 12.2 L 5 21 C 5 21.5 5.4 22 6 22 L 10 22 C 10.6 22 11 21.5 11 21 L 11 12.2 C 12.8 11.2 14 9.2 14 7 C 14 4 11.8 1.6 9 1.1 M 10 10.5 L 9 11 L 9 20 L 7 20 L 7 11 L 6 10.4 C 4.8 9.7 4 8.4 4 7 C 4 6 4.4 5.1 5 4.3 L 5 8 L 11 8 L 11 4.3 C 11.6 5.1 12 6 12 7 C 12 8.4 11.2 9.7 10 10.5"
+                    android:valueTo="M 9 0 L 9 4.9 L 7 4.9 L 7 0 C 4.2 0.5 2 2.9 2 5.9 C 2 8.1 3.2 10 5 11.1 L 5 19.9 C 5 20.4 5.4 20.9 6 20.9 L 10 20.9 C 10.6 20.9 11 20.4 11 19.9 L 11 11.1 C 12.8 10.1 14 8.1 14 5.9 C 14 2.9 11.8 0.5 9 0 M 10 9.4 L 9 9.9 L 9 18.9 L 7 18.9 L 7 9.9 L 6 9.4 C 4.8 8.7 4 7.4 4 5.9 C 4 4.9 4.4 4 5 3.2 L 5 6.9 L 11 6.9 L 11 3.3 C 11.6 4 12 5 12 6 C 12 7.3 11.2 8.6 10 9.4"
+                    android:valueType="pathType"
+                    android:interpolator="@android:interpolator/fast_out_slow_in"/>
+                <objectAnimator
+                    android:propertyName="pathData"
+                    android:startOffset="200"
+                    android:duration="100"
+                    android:valueFrom="M 9 0 L 9 4.9 L 7 4.9 L 7 0 C 4.2 0.5 2 2.9 2 5.9 C 2 8.1 3.2 10 5 11.1 L 5 19.9 C 5 20.4 5.4 20.9 6 20.9 L 10 20.9 C 10.6 20.9 11 20.4 11 19.9 L 11 11.1 C 12.8 10.1 14 8.1 14 5.9 C 14 2.9 11.8 0.5 9 0 M 10 9.4 L 9 9.9 L 9 18.9 L 7 18.9 L 7 9.9 L 6 9.4 C 4.8 8.7 4 7.4 4 5.9 C 4 4.9 4.4 4 5 3.2 L 5 6.9 L 11 6.9 L 11 3.3 C 11.6 4 12 5 12 6 C 12 7.3 11.2 8.6 10 9.4"
+                    android:valueTo="M 9 1.1 L 9 6 L 7 6 L 7 1.1 C 4.2 1.6 2 4 2 7 C 2 9.2 3.2 11.1 5 12.2 L 5 21 C 5 21.5 5.4 22 6 22 L 10 22 C 10.6 22 11 21.5 11 21 L 11 12.2 C 12.8 11.2 14 9.2 14 7 C 14 4 11.8 1.6 9 1.1 M 10 10.5 L 9 11 L 9 20 L 7 20 L 7 11 L 6 10.4 C 4.8 9.7 4 8.4 4 7 C 4 6 4.4 5.1 5 4.3 L 5 8 L 11 8 L 11 4.3 C 11.6 5.1 12 6 12 7 C 12 8.4 11.2 9.7 10 10.5"
+                    android:valueType="pathType"
+                    android:interpolator="@android:anim/anticipate_overshoot_interpolator"/>
+            </set>
+        </aapt:attr>
+    </target>
 </animated-vector>
diff --git a/app/src/main/res/drawable/ic_feed_selector.xml b/app/src/main/res/drawable/ic_feed_selector.xml
index fb487d4ed..537064084 100644
--- a/app/src/main/res/drawable/ic_feed_selector.xml
+++ b/app/src/main/res/drawable/ic_feed_selector.xml
@@ -12,13 +12,8 @@
 		android:state_checked="true" />
 
 	<transition
-		android:drawable="@drawable/avd_feed_enter_leave"
+		android:drawable="@drawable/avd_feed_enter"
 		android:fromId="@id/normal"
 		android:toId="@id/checked" />
 
-	<transition
-		android:drawable="@drawable/avd_feed_enter_leave"
-		android:fromId="@id/checked"
-		android:toId="@id/normal" />
-
 </animated-selector>
diff --git a/app/src/main/res/drawable/ic_tools.xml b/app/src/main/res/drawable/ic_tools.xml
index f37c63d7e..884f4943e 100644
--- a/app/src/main/res/drawable/ic_tools.xml
+++ b/app/src/main/res/drawable/ic_tools.xml
@@ -1,11 +1,12 @@
-<vector
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:width="24dp"
-	android:height="24dp"
-	android:tint="#000000"
-	android:viewportWidth="24"
-	android:viewportHeight="24">
-	<path
-		android:fillColor="@android:color/white"
-		android:pathData="M22.61,19L13.53,9.91C14.46,7.57 14,4.81 12.09,2.91C9.79,0.61 6.21,0.4 3.66,2.26L7.5,6.11L6.08,7.5L2.25,3.69C0.39,6.23 0.6,9.82 2.9,12.11C4.76,13.97 7.47,14.46 9.79,13.59L18.9,22.7C19.29,23.09 19.92,23.09 20.31,22.7L22.61,20.4C23,20 23,19.39 22.61,19M19.61,20.59L10.15,11.13C9.54,11.58 8.86,11.85 8.15,11.95C6.79,12.15 5.36,11.74 4.32,10.7C3.37,9.76 2.93,8.5 3,7.26L6.09,10.35L10.33,6.11L7.24,3C8.5,2.95 9.73,3.39 10.68,4.33C11.76,5.41 12.17,6.9 11.92,8.29C11.8,9 11.5,9.66 11.04,10.25L20.5,19.7L19.61,20.59Z" />
+<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="#FF000000"
+      android:pathData="M20.9,17.9c0,-0.2 0,-0.3 0,-0.4s0,-0.3 0,-0.5l1,-0.7C22,16.3 22,16.1 22,16L21,14.5c0,-0.1 -0.2,-0.1 -0.3,-0.1l-1.2,0.5c-0.2,-0.2 -0.5,-0.3 -0.8,-0.4l-0.2,-1.2c0,-0.1 -0.1,-0.2 -0.2,-0.2h-1.8c-0.1,0 -0.2,0.1 -0.2,0.2l-0.2,1.2c-0.3,0.1 -0.5,0.3 -0.8,0.4l-1.2,-0.5c-0.1,0 -0.2,0 -0.3,0.1L13,16c-0.1,0.1 0,0.2 0.1,0.3l1,0.7c0,0.2 0,0.3 0,0.5s0,0.3 0,0.4l-1,0.7C13,18.8 13,18.9 13,19l0.9,1.6c0,0.1 0.2,0.1 0.3,0.1l1.2,-0.5c0.2,0.2 0.5,0.3 0.8,0.5l0.2,1.2c0,0.1 0.1,0.2 0.2,0.2h1.8c0.1,0 0.2,-0.1 0.2,-0.2l0.2,-1.2c0.3,-0.1 0.5,-0.3 0.8,-0.5l1.2,0.5c0.1,0 0.2,0 0.3,-0.1L22,19c0.1,-0.1 0,-0.2 -0.1,-0.3L20.9,17.9zM17.5,19c-0.8,0 -1.5,-0.7 -1.5,-1.5s0.7,-1.5 1.5,-1.5s1.5,0.7 1.5,1.5S18.3,19 17.5,19z"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M9,1.1V6H7V1.1C4.2,1.6 2,4 2,7c0,2.2 1.2,4.1 3,5.2V21c0,0.5 0.4,1 1,1h4c0.6,0 1,-0.5 1,-1v-8.8c1.8,-1 3,-3 3,-5.2C14,4 11.8,1.6 9,1.1M10,10.5L9,11v9H7v-9l-1,-0.6C4.8,9.7 4,8.4 4,7c0,-1 0.4,-1.9 1,-2.7V8h6V4.3C11.6,5.1 12,6 12,7C12,8.4 11.2,9.7 10,10.5"/>
 </vector>