diff --git a/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt b/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt
index ec7728127..65891c22e 100644
--- a/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt
+++ b/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt
@@ -27,7 +27,6 @@ import android.widget.TextView
 import android.widget.Toast
 import androidx.constraintlayout.motion.widget.MotionLayout
 import androidx.constraintlayout.widget.ConstraintLayout
-import androidx.core.content.ContentProviderCompat.requireContext
 import androidx.core.net.toUri
 import androidx.core.os.bundleOf
 import androidx.core.view.isVisible
@@ -87,8 +86,6 @@ import com.squareup.picasso.Picasso
 import java.io.IOException
 import java.util.concurrent.Executors
 import kotlin.math.abs
-import kotlinx.coroutines.NonCancellable.isActive
-import org.chromium.base.ThreadUtils.runOnUiThread
 import org.chromium.net.CronetEngine
 import retrofit2.HttpException
 
diff --git a/app/src/main/res/drawable/ic_history.xml b/app/src/main/res/drawable/ic_history.xml
index 8523a3ace..be5660627 100644
--- a/app/src/main/res/drawable/ic_history.xml
+++ b/app/src/main/res/drawable/ic_history.xml
@@ -1,10 +1,11 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?android:attr/colorControlNormal">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M12,2c5.523,0 10,4.477 10,10s-4.477,10 -10,10c-1.702,0 -3.305,-0.425 -4.708,-1.175L2,22l1.176,-5.29C2.426,15.306 2,13.703 2,12 2,6.477 6.477,2 12,2zM13,7h-2v7h6v-2h-4L13,7z"/>
-</vector>
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M13,3c-4.97,0 -9,4.03 -9,9L1,12l3.89,3.89 0.07,0.14L9,12L6,12c0,-3.87 3.13,-7 7,-7s7,3.13 7,7 -3.13,7 -7,7c-1.93,0 -3.68,-0.79 -4.94,-2.06l-1.42,1.42C8.27,19.99 10.51,21 13,21c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9zM12,8v5l4.25,2.52 0.77,-1.28 -3.52,-2.09L13.5,8z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_history_filled.xml b/app/src/main/res/drawable/ic_history_filled.xml
new file mode 100644
index 000000000..b191e731a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_history_filled.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?android:attr/colorControlNormal">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,2c5.523,0 10,4.477 10,10s-4.477,10 -10,10c-1.702,0 -3.305,-0.425 -4.708,-1.175L2,22l1.176,-5.29C2.426,15.306 2,13.703 2,12 2,6.477 6.477,2 12,2zM13,7h-2v7h6v-2h-4L13,7z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_login.xml b/app/src/main/res/drawable/ic_login.xml
index 94b8099d1..aff40998d 100644
--- a/app/src/main/res/drawable/ic_login.xml
+++ b/app/src/main/res/drawable/ic_login.xml
@@ -4,11 +4,11 @@
     android:viewportWidth="24"
     android:viewportHeight="24"
     android:tint="?android:attr/colorControlNormal">
-  <path
-      android:pathData="M9,3h8a2,2 0,0 1,2 2v14a2,2 0,0 1,-2 2H9m6,-9 l-4,-4m4,4 l-4,4m4,-4H5"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="@android:color/black"
-      android:strokeLineCap="round"/>
+    <path
+        android:pathData="M9,3h8a2,2 0,0 1,2 2v14a2,2 0,0 1,-2 2H9m6,-9 l-4,-4m4,4 l-4,4m4,-4H5"
+        android:strokeLineJoin="round"
+        android:strokeWidth="2"
+        android:fillColor="#00000000"
+        android:strokeColor="@android:color/black"
+        android:strokeLineCap="round" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_login_filled.xml b/app/src/main/res/drawable/ic_login_filled.xml
index a680b6bb5..3446db2fd 100644
--- a/app/src/main/res/drawable/ic_login_filled.xml
+++ b/app/src/main/res/drawable/ic_login_filled.xml
@@ -4,7 +4,7 @@
     android:viewportWidth="24"
     android:viewportHeight="24"
     android:tint="?android:attr/colorControlNormal">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M10,11H4V3a1,1 0,0 1,1 -1h14a1,1 0,0 1,1 1v18a1,1 0,0 1,-1 1H5a1,1 0,0 1,-1 -1v-8h6v3l5,-4 -5,-4v3z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M10,11H4V3a1,1 0,0 1,1 -1h14a1,1 0,0 1,1 1v18a1,1 0,0 1,-1 1H5a1,1 0,0 1,-1 -1v-8h6v3l5,-4 -5,-4v3z" />
 </vector>
diff --git a/app/src/main/res/layout/exo_styled_player_control_view.xml b/app/src/main/res/layout/exo_styled_player_control_view.xml
index 39fb1b584..5cb5f3347 100644
--- a/app/src/main/res/layout/exo_styled_player_control_view.xml
+++ b/app/src/main/res/layout/exo_styled_player_control_view.xml
@@ -225,19 +225,21 @@
         android:padding="@dimen/exo_styled_controls_padding"
         android:clipToPadding="false">
 
-        <Button android:id="@id/exo_rew_with_amount"
+        <Button
+            android:id="@id/exo_rew_with_amount"
             android:paddingLeft="4dp"
             android:paddingRight="4dp"
-            style="@style/ExoStyledControls.Button.Center.RewWithAmount"/>
+            style="@style/ExoStyledControls.Button.Center.RewWithAmount" />
 
         <ImageButton
             android:id="@id/exo_play_pause"
             style="@style/ExoStyledControls.Button.Center.PlayPause" />
 
-        <Button android:id="@id/exo_ffwd_with_amount"
+        <Button
+            android:id="@id/exo_ffwd_with_amount"
             android:paddingLeft="4dp"
             android:paddingRight="4dp"
-            style="@style/ExoStyledControls.Button.Center.FfwdWithAmount"/>
+            style="@style/ExoStyledControls.Button.Center.FfwdWithAmount" />
 
     </LinearLayout>
 
diff --git a/app/src/main/res/xml/advanced_settings.xml b/app/src/main/res/xml/advanced_settings.xml
index 876626442..cbbd525b6 100644
--- a/app/src/main/res/xml/advanced_settings.xml
+++ b/app/src/main/res/xml/advanced_settings.xml
@@ -35,7 +35,7 @@
 
         <SwitchPreference
             android:defaultValue="true"
-            android:icon="@drawable/ic_history"
+            android:icon="@drawable/ic_history_filled"
             app:key="search_history_toggle"
             app:title="@string/search_history" />
 
diff --git a/app/src/main/res/xml/settings.xml b/app/src/main/res/xml/settings.xml
index ac8704459..dcf7248aa 100644
--- a/app/src/main/res/xml/settings.xml
+++ b/app/src/main/res/xml/settings.xml
@@ -64,7 +64,7 @@
             android:icon="@drawable/ic_update"
             app:key="update"
             app:summary="@string/update_summary"
-            app:title="App version" />        
+            app:title="App version" />
 
         <Preference
             android:icon="@drawable/ic_info"
diff --git a/app/src/main/res/xml/sponsorblock_settings.xml b/app/src/main/res/xml/sponsorblock_settings.xml
index 23fecf235..c22cce27a 100644
--- a/app/src/main/res/xml/sponsorblock_settings.xml
+++ b/app/src/main/res/xml/sponsorblock_settings.xml
@@ -6,23 +6,23 @@
         app:key="sb_enabled_key"
         app:title="@string/sponsorblock"
         android:summaryOff="@string/disabled"
-        android:summaryOn="@string/enabled" 
-        defaultValue="true"/>
+        android:summaryOn="@string/enabled"
+        app:defaultValue="true" />
 
     <SwitchPreferenceCompat
         app:key="sb_notifications_key"
         app:title="@string/sponsorblock_notifications"
         android:summaryOff="@string/disabled"
-        android:summaryOn="@string/enabled" 
-        defaultValue="true"/>
+        android:summaryOn="@string/enabled"
+        app:defaultValue="true" />
 
     <PreferenceCategory app:title="@string/category_segments">
 
         <SwitchPreferenceCompat
             app:key="sponsors_category_key"
             app:title="@string/category_sponsor"
-            app:summary="@string/category_sponsor_description" 
-            defaultValue="true"/>
+            app:summary="@string/category_sponsor_description"
+            app:defaultValue="true" />
 
         <SwitchPreferenceCompat
             app:key="selfpromo_category_key"