diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/source/BrowseController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/source/BrowseController.kt
index cadcf3fb9a..1212897b5d 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/source/BrowseController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/source/BrowseController.kt
@@ -12,7 +12,6 @@ import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.widget.SearchView
-import androidx.core.content.ContextCompat
 import androidx.core.graphics.ColorUtils
 import androidx.recyclerview.widget.RecyclerView
 import com.bluelinelabs.conductor.ControllerChangeHandler
@@ -251,11 +250,11 @@ class BrowseController :
         }
         binding.bottomSheet.pill.alpha = (1 - progress) * 0.25f
         val selectedColor = ColorUtils.setAlphaComponent(
-            ContextCompat.getColor(binding.bottomSheet.tabs.context, R.color.colorAccent),
+            bottomSheet.context.getResourceColor(R.attr.tabBarIconColor),
             (progress * 255).toInt()
         )
         val unselectedColor = ColorUtils.setAlphaComponent(
-            bottomSheet.context.getResourceColor(R.attr.colorOnBackground),
+            bottomSheet.context.getResourceColor(R.attr.actionBarTintColor),
             153
         )
         binding.bottomSheet.sheetLayout.elevation = progress * 5
@@ -293,7 +292,7 @@ class BrowseController :
             }
         )
         binding.shadow2.translationY = pad
-        binding.bottomSheet.root.sheetBehavior?.peekHeight = 58.spToPx + padding
+        binding.bottomSheet.root.sheetBehavior?.peekHeight = 56.spToPx + padding
         binding.bottomSheet.root.extensionFrameLayout?.binding?.fastScroller?.updateLayoutParams<ViewGroup.MarginLayoutParams> {
             bottomMargin = -pad.toInt()
         }
diff --git a/app/src/main/res/color/accent_alpha.xml b/app/src/main/res/color/accent_alpha.xml
index 865d0c13c2..848a1163c9 100644
--- a/app/src/main/res/color/accent_alpha.xml
+++ b/app/src/main/res/color/accent_alpha.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:alpha="0.26667" android:color="?attr/colorAccent" />
+    <item android:alpha="0.4" android:color="?attr/colorAccent" />
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/color/tabs_selector_alt.xml b/app/src/main/res/color/tabs_selector_alt.xml
index b68801941d..2c58c7ee23 100644
--- a/app/src/main/res/color/tabs_selector_alt.xml
+++ b/app/src/main/res/color/tabs_selector_alt.xml
@@ -7,5 +7,5 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:color="@color/colorAccentText" android:state_selected="true"/>
     <item android:color="@color/colorAccent" android:state_pressed="true"/>
-    <item android:alpha="0.60" android:color="?attr/colorOnBackground"/>
+    <item android:alpha="0.60" android:color="?attr/actionBarTintColor"/>
 </selector>
diff --git a/app/src/main/res/drawable/tab_highlight_indicator.xml b/app/src/main/res/drawable/tab_highlight_indicator.xml
index 2a6e7d0e42..e4cda3a296 100644
--- a/app/src/main/res/drawable/tab_highlight_indicator.xml
+++ b/app/src/main/res/drawable/tab_highlight_indicator.xml
@@ -5,7 +5,7 @@
         android:start="2dp" >
         <shape>
             <corners android:radius="4dp" />
-            <solid android:color="@color/accent_alpha" />
+            <solid android:color="?tabHighlightBackground" />
             <size android:height="28sp"/>
         </shape>
     </item>
diff --git a/app/src/main/res/layout/main_activity.xml b/app/src/main/res/layout/main_activity.xml
index 5fe8809bab..8febb40794 100644
--- a/app/src/main/res/layout/main_activity.xml
+++ b/app/src/main/res/layout/main_activity.xml
@@ -79,7 +79,6 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:tabIndicatorColor="?attr/colorAccent"
                 app:tabGravity="fill"/>
         </FrameLayout>
     </com.google.android.material.appbar.AppBarLayout>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 45365fe024..41c31a5a73 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -15,6 +15,7 @@
     <attr name="readerBackground" format="color"/>
     <attr name="tabBarIconColor" format="reference|integer"/>
     <attr name="tabBarIconInactive" format="reference|integer"/>
+    <attr name="tabHighlightBackground" format="reference|integer"/>
 
     <declare-styleable name="ReaderSpinnerView">
         <attr name="title" format="reference|string"/>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 508897cf8f..b924147580 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -226,6 +226,7 @@
         <item name="tabTextColor">@color/tabs_selector_alt</item>
         <item name="tabRippleColor">@android:color/transparent</item>
         <item name="tabIndicator">@drawable/tab_highlight_indicator</item>
+        <item name="tabIndicatorColor">?tabHighlightBackground</item>
         <item name="tabMaxWidth">0dp</item>
         <item name="tabMode">fixed</item>
         <item name="tabIndicatorAnimationMode">elastic</item>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index b88f91e46e..87825feec3 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -41,6 +41,7 @@
         <item name="android:statusBarColor">@color/status_bar</item>
         <item name="android:navigationBarColor">#B3000000</item>
         <item name="android:colorEdgeEffect">@color/colorAccent</item>
+        <item name="tabHighlightBackground">@color/accent_alpha</item>
 
         <!-- Material Dialog colors -->
         <item name="md_color_title">@color/textColorPrimary</item>
@@ -60,6 +61,7 @@
         <item name="colorSecondary">@color/app_color_primary</item>
         <item name="tabBarIconColor">@color/md_white_1000</item>
         <item name="tabBarIconInactive">@color/md_white_1000_50</item>
+        <item name="tabHighlightBackground">@color/md_white_1000_50</item>
         <item name="actionBarTintColor">@color/md_white_1000</item>
         <item name="actionBarTheme">@style/Theme.ActionBar.Dark.DayNight</item>
         <item name="android:windowLightStatusBar">false</item>