diff --git a/app/src/main/res/drawable/avd_bookshelf_enter.xml b/app/src/main/res/drawable/avd_bookshelf_enter.xml
deleted file mode 100644
index e229eba7a..000000000
--- a/app/src/main/res/drawable/avd_bookshelf_enter.xml
+++ /dev/null
@@ -1,34 +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:fillColor="#000"
-				android:pathData="M 5 5 L 8 5 L 8 18 L 5 18 Z M 9 3 L 12 3 L 12 18 L 9 18 Z M 3 19 L 21 19 L 21 21 L 3 21 Z"
-				android:strokeWidth="1" />
-			<path
-				android:name="path_1"
-				android:fillColor="#000"
-				android:pathData="M 11.967 4.974 L 15.025 4.031 L 19.034 17.027 L 15.976 17.971 Z"
-				android:strokeWidth="1" />
-		</vector>
-	</aapt:attr>
-	<target android:name="path_1">
-		<aapt:attr name="android:animation">
-			<objectAnimator
-				android:duration="@integer/config_defaultAnimTime"
-				android:interpolator="@android:interpolator/fast_out_slow_in"
-				android:propertyName="pathData"
-				android:valueFrom="M 15.025 4.031 L 11.967 4.974 L 15.976 17.971 L 19.034 17.027 L 15.025 4.031 M 6.5 11.5 L 6.5 11.5 L 6.5 11.5 L 6.5 11.5 L 6.5 11.5 M 10.5 10.5 L 10.5 10.5 L 10.5 10.5 L 10.5 10.5 L 10.5 10.5 M 12 20 L 12 20 L 12 20 L 12 20 L 12 20"
-				android:valueTo="M 19.2 4.4 L 16 4.4 L 16 18 L 19.2 18 L 19.2 4.4 M 5 5 L 8 5 L 8 18 L 5 18 L 5 5 M 9 3 L 12 3 L 12 18 L 9 18 L 9 3 M 3 19 L 21 19 L 21 21 L 3 21 L 3 19"
-				android:valueType="pathType" />
-		</aapt:attr>
-	</target>
-</animated-vector>
diff --git a/app/src/main/res/drawable/avd_bookshelf_leave.xml b/app/src/main/res/drawable/avd_bookshelf_leave.xml
deleted file mode 100644
index 7b06237b6..000000000
--- a/app/src/main/res/drawable/avd_bookshelf_leave.xml
+++ /dev/null
@@ -1,29 +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 5 5 L 8 5 L 8 18 L 5 18 Z M 9 3 L 12 3 L 12 18 L 9 18 Z M 3 19 L 21 19 L 21 21 L 3 21 Z M 16 4.4 L 19.2 4.4 L 19.2 18 L 16 18 Z"
-                android:fillColor="#000"
-                android:strokeWidth="1"/>
-        </vector>
-    </aapt:attr>
-    <target android:name="path">
-        <aapt:attr name="android:animation">
-            <objectAnimator
-                android:propertyName="pathData"
-                android:duration="@integer/config_defaultAnimTime"
-                android:valueFrom="M 16 4.4 L 19.2 4.4 L 19.2 18 L 16 18 L 16 4.4 M 9 3 L 9 18 L 12 18 L 12 3 L 9 3 M 5 5 L 5 18 L 8 18 L 8 5 L 5 5 M 3 19 L 21 19 L 21 21 L 3 21 L 3 20 L 3 19"
-                android:valueTo="M 12 5 L 15 4 L 19 17 L 16 18 L 12 5 M 9 3 L 9 18 L 12 18 L 12 3 L 9 3 M 5 5 L 5 18 L 8 18 L 8 5 L 5 5 M 3 19 L 21 19 L 21 21 L 3 21 L 3 19 L 3 19"
-                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_favourites_enter.xml b/app/src/main/res/drawable/avd_favourites_enter.xml
new file mode 100644
index 000000000..89deddcb6
--- /dev/null
+++ b/app/src/main/res/drawable/avd_favourites_enter.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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 16.5 3 C 14.76 3 13.09 3.81 12 5.09 C 10.91 3.81 9.24 3 7.5 3 C 4.42 3 2 5.42 2 8.5 C 2 12.28 5.4 15.36 10.55 20.04 L 12 21.35 L 13.45 20.03 C 18.6 15.36 22 12.28 22 8.5 C 22 5.42 19.58 3 16.5 3 Z M 12.1 18.55 L 12 18.65 L 11.9 18.55 C 7.14 14.24 4 11.39 4 8.5 C 4 6.5 5.5 5 7.5 5 C 9.04 5 10.54 5.99 11.07 7.36 L 12.94 7.36 C 13.46 5.99 14.96 5 16.5 5 C 18.5 5 20 6.5 20 8.5 C 20 11.39 16.86 14.24 12.1 18.55 Z"
+				android:fillColor="#000000"/>
+		</vector>
+	</aapt:attr>
+	<target android:name="path">
+		<aapt:attr name="android:animation">
+			<objectAnimator
+				android:propertyName="pathData"
+				android:duration="300"
+				android:valueFrom="M 12 21.35 L 10.55 20.04 C 5.4 15.36 2 12.28 2 8.5 C 2 5.42 4.42 3 7.5 3 C 9.24 3 10.91 3.81 12 5.09 C 13.09 3.81 14.76 3 16.5 3 L 16.5 3 C 19.58 3 22 5.42 22 8.5 C 22 12.28 18.6 15.36 13.45 20.03 L 12.725 20.69 L 12 21.35 M 11.07 7.36 C 10.54 5.99 9.04 5 7.5 5 C 5.5 5 4 6.5 4 8.5 C 4 11.39 7.14 14.24 11.9 18.55 L 12 18.65 L 12.1 18.55 L 12.1 18.55 C 16.86 14.24 20 11.39 20 8.5 C 20 6.5 18.5 5 16.5 5 C 14.96 5 13.46 5.99 12.94 7.36 L 11.07 7.36"
+				android:valueTo="M 12 21.35 L 10.55 20.03 C 5.4 15.36 2 12.28 2 8.5 C 2 5.42 4.42 3 7.5 3 C 9.24 3 10.91 3.81 12 5.09 C 13.09 3.81 14.76 3 16.5 3 L 16.5 3 C 19.58 3 22 5.42 22 8.5 C 22 12.28 18.6 15.36 13.45 20.04 L 12 21.35 L 12 21.35 M 12 11.825 C 12 11.825 12 11.825 12 11.825 C 12 11.825 12 11.825 12 11.825 C 12 11.825 12 11.825 12 11.825 L 12 11.825 L 12 11.825 L 12 11.825 C 12 11.825 12 11.825 12 11.825 C 12 11.825 12 11.825 12 11.825 C 12 11.825 12 11.825 12 11.825 L 12 11.825"
+				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_favourites_leave.xml b/app/src/main/res/drawable/avd_favourites_leave.xml
new file mode 100644
index 000000000..d15328702
--- /dev/null
+++ b/app/src/main/res/drawable/avd_favourites_leave.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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 16.5 3 C 14.76 3 13.09 3.81 12 5.09 C 10.91 3.81 9.24 3 7.5 3 C 4.42 3 2 5.42 2 8.5 C 2 12.28 5.4 15.36 10.55 20.04 L 12 21.35 L 13.45 20.03 C 18.6 15.36 22 12.28 22 8.5 C 22 5.42 19.58 3 16.5 3 Z M 12.1 18.55 L 12 18.65 L 11.9 18.55 C 7.14 14.24 4 11.39 4 8.5 C 4 6.5 5.5 5 7.5 5 C 9.04 5 10.54 5.99 11.07 7.36 L 12.94 7.36 C 13.46 5.99 14.96 5 16.5 5 C 18.5 5 20 6.5 20 8.5 C 20 11.39 16.86 14.24 12.1 18.55 Z"
+				android:fillColor="#000000"/>
+		</vector>
+	</aapt:attr>
+	<target android:name="path">
+		<aapt:attr name="android:animation">
+			<objectAnimator
+				android:propertyName="pathData"
+				android:duration="300"
+				android:valueFrom="M 16.5 3 C 14.76 3 13.09 3.81 12 5.09 C 10.91 3.81 9.24 3 7.5 3 C 4.42 3 2 5.42 2 8.5 C 2 12.28 5.4 15.36 10.55 20.03 L 12 21.35 L 12 21.35 L 13.45 20.04 C 18.6 15.36 22 12.28 22 8.5 C 22 5.42 19.58 3 16.5 3 L 16.5 3 M 12 11.825 C 12 11.825 12 11.825 12 11.825 C 12 11.825 12 11.825 12 11.825 C 12 11.825 12 11.825 12 11.825 C 12 11.825 12 11.825 12 11.825 C 12 11.825 12 11.825 12 11.825 L 12 11.825 C 12 11.825 12 11.825 12 11.825 C 12 11.825 12 11.825 12 11.825 C 12 11.825 12 11.825 12 11.825 L 12 11.825"
+				android:valueTo="M 16.5 3 C 14.76 3 13.09 3.81 12 5.09 C 10.91 3.81 9.24 3 7.5 3 C 4.42 3 2 5.42 2 8.5 C 2 12.28 5.4 15.36 10.55 20.04 L 11.275 20.695 L 12 21.35 L 13.45 20.03 C 18.6 15.36 22 12.28 22 8.5 C 22 5.42 19.58 3 16.5 3 L 16.5 3 M 12.1 18.55 C 12.067 18.583 12.033 18.617 12 18.65 C 11.967 18.617 11.933 18.583 11.9 18.55 C 7.14 14.24 4 11.39 4 8.5 C 4 6.5 5.5 5 7.5 5 C 9.04 5 10.54 5.99 11.07 7.36 L 12.94 7.36 C 13.46 5.99 14.96 5 16.5 5 C 18.5 5 20 6.5 20 8.5 C 20 11.39 16.86 14.24 12.1 18.55 L 12.1 18.55"
+				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_history_enter.xml b/app/src/main/res/drawable/avd_history_enter.xml
new file mode 100644
index 000000000..fcca925e3
--- /dev/null
+++ b/app/src/main/res/drawable/avd_history_enter.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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="history_enter"
+			android:width="24dp"
+			android:height="24dp"
+			android:viewportWidth="24"
+			android:viewportHeight="24">
+			<path
+				android:name="clock"
+				android:fillColor="#000000"
+				android:pathData="M 12 8 L 12 13 L 16.28 15.54 L 17 14.33 L 13.5 12.25 L 13.5 8 L 12 8 Z" />
+			<group
+				android:name="arrow_head"
+				android:pivotX="13"
+				android:pivotY="12">
+				<path
+					android:name="arrow"
+					android:fillColor="#000000"
+					android:pathData="M 13 3 C 8.03 3 4 7.03 4 12 L 1 12 L 4.89 15.89 L 4.96 16.03 L 9 12 L 6 12 C 6 8.13 9.13 5 13 5 C 16.87 5 20 8.13 20 12 C 20 15.87 16.87 19 13 19 C 11.07 19 9.32 18.21 8.06 16.94 L 6.64 18.36 C 8.27 19.99 10.51 21 13 21 C 17.97 21 22 16.97 22 12 C 22 7.03 17.97 3 13 3 Z M 13 3 Z" />
+			</group>
+		</vector>
+	</aapt:attr>
+	<target android:name="arrow_head">
+		<aapt:attr name="android:animation">
+			<objectAnimator
+				android:duration="500"
+				android:interpolator="@android:interpolator/fast_out_slow_in"
+				android:propertyName="rotation"
+				android:valueFrom="360"
+				android:valueTo="0"
+				android:valueType="floatType" />
+		</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
deleted file mode 100644
index 5d17a7cbd..000000000
--- a/app/src/main/res/drawable/avd_tools_enter.xml
+++ /dev/null
@@ -1,63 +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 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">
-        <aapt:attr name="android:animation">
-            <set>
-                <objectAnimator
-                    android:propertyName="pathData"
-                    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="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_bookshelf_checked.xml b/app/src/main/res/drawable/ic_bookshelf_checked.xml
deleted file mode 100644
index 5f881c4fc..000000000
--- a/app/src/main/res/drawable/ic_bookshelf_checked.xml
+++ /dev/null
@@ -1,18 +0,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="#FF000000"
-      android:pathData="M5,5h3v13h-3z"/>
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M9,3h3v15h-3z"/>
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M3,19h18v2h-18z"/>
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M16,4.4h3.2v13.6h-3.2z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_bookshelf_normal.xml b/app/src/main/res/drawable/ic_bookshelf_normal.xml
deleted file mode 100644
index c344ae0bd..000000000
--- a/app/src/main/res/drawable/ic_bookshelf_normal.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:width="24dp"
-	android:height="24dp"
-	android:autoMirrored="true"
-	android:tint="#000000"
-	android:viewportWidth="24"
-	android:viewportHeight="24">
-	<path
-		android:fillColor="@android:color/white"
-		android:pathData="M9 3V18H12V3H9M12 5L16 18L19 17L15 4L12 5M5 5V18H8V5H5M3 19V21H21V19H3Z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_bookshelf_selector.xml b/app/src/main/res/drawable/ic_bookshelf_selector.xml
deleted file mode 100644
index 07464b289..000000000
--- a/app/src/main/res/drawable/ic_bookshelf_selector.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<animated-selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-	<item
-		android:id="@+id/normal"
-		android:drawable="@drawable/ic_bookshelf_normal"
-		android:state_checked="false" />
-
-	<item
-		android:id="@+id/checked"
-		android:drawable="@drawable/ic_bookshelf_checked"
-		android:state_checked="true" />
-
-	<transition
-		android:drawable="@drawable/avd_bookshelf_enter"
-		android:fromId="@id/normal"
-		android:toId="@id/checked" />
-
-	<transition
-		android:drawable="@drawable/avd_bookshelf_leave"
-		android:fromId="@id/checked"
-		android:toId="@id/normal" />
-
-</animated-selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_favourites_selector.xml b/app/src/main/res/drawable/ic_favourites_selector.xml
index d9dbf21a9..d2e01350b 100644
--- a/app/src/main/res/drawable/ic_favourites_selector.xml
+++ b/app/src/main/res/drawable/ic_favourites_selector.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<animated-selector
-	xmlns:android="http://schemas.android.com/apk/res/android">
+<animated-selector xmlns:android="http://schemas.android.com/apk/res/android">
 
 	<item
 		android:id="@+id/normal"
@@ -9,7 +8,17 @@
 
 	<item
 		android:id="@+id/checked"
-		android:drawable="@drawable/ic_heart"
+		android:drawable="@drawable/ic_heart_outline"
 		android:state_checked="true" />
 
+	<transition
+		android:drawable="@drawable/avd_favourites_enter"
+		android:fromId="@id/normal"
+		android:toId="@id/checked" />
+
+	<transition
+		android:drawable="@drawable/avd_favourites_leave"
+		android:fromId="@id/checked"
+		android:toId="@id/normal" />
+
 </animated-selector>
diff --git a/app/src/main/res/drawable/ic_history_selector.xml b/app/src/main/res/drawable/ic_history_selector.xml
index 514215028..9b91bb31c 100644
--- a/app/src/main/res/drawable/ic_history_selector.xml
+++ b/app/src/main/res/drawable/ic_history_selector.xml
@@ -7,4 +7,14 @@
 		android:drawable="@drawable/ic_history"
 		android:state_checked="false" />
 
+	<item
+		android:id="@+id/checked"
+		android:drawable="@drawable/ic_history"
+		android:state_checked="true" />
+
+	<transition
+		android:drawable="@drawable/avd_history_enter"
+		android:fromId="@id/normal"
+		android:toId="@id/checked" />
+
 </animated-selector>
diff --git a/app/src/main/res/drawable/ic_tools.xml b/app/src/main/res/drawable/ic_tools.xml
deleted file mode 100644
index 884f4943e..000000000
--- a/app/src/main/res/drawable/ic_tools.xml
+++ /dev/null
@@ -1,12 +0,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="#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>
diff --git a/app/src/main/res/drawable/ic_tools_selector.xml b/app/src/main/res/drawable/ic_tools_selector.xml
deleted file mode 100644
index d4f3dd57a..000000000
--- a/app/src/main/res/drawable/ic_tools_selector.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<animated-selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-	<item
-		android:id="@+id/normal"
-		android:drawable="@drawable/ic_tools"
-		android:state_checked="false" />
-
-	<item
-		android:id="@+id/checked"
-		android:drawable="@drawable/ic_tools"
-		android:state_checked="true" />
-
-	<transition
-		android:drawable="@drawable/avd_tools_enter"
-		android:fromId="@id/normal"
-		android:toId="@id/checked" />
-
-</animated-selector>