diff --git a/.idea/misc.xml b/.idea/misc.xml
index 69b17eb0d..40f7aef8a 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -6,9 +6,12 @@
         <entry key="../../../../../../layout/custom_preview.xml" value="0.1" />
         <entry key="../../../../../../opt/usr/android-sdk/platforms/android-30/data/res/drawable/list_divider_material.xml" value="0.28512820512820514" />
         <entry key="../../../../../../opt/usr/android-sdk/platforms/android-30/data/res/layout/simple_dropdown_item_1line.xml" value="0.24739583333333334" />
+        <entry key="app/src/main/res/drawable/tab_indicator.xml" value="0.28512820512820514" />
+        <entry key="app/src/main/res/drawable/tabs_background.xml" value="0.28512820512820514" />
         <entry key="app/src/main/res/layout-w600dp/fragment_details.xml" value="0.14583333333333334" />
         <entry key="app/src/main/res/layout/fragment_chapters.xml" value="0.24739583333333334" />
         <entry key="app/src/main/res/layout/fragment_details.xml" value="0.26145833333333335" />
+        <entry key="app/src/main/res/layout/fragment_favourites.xml" value="0.26296296296296295" />
         <entry key="app/src/main/res/layout/item_branch.xml" value="0.24739583333333334" />
         <entry key="app/src/main/res/layout/item_branch_dropdown.xml" value="0.25743589743589745" />
       </map>
diff --git a/app/src/main/res/color/tab_text.xml b/app/src/main/res/color/tab_text.xml
new file mode 100644
index 000000000..61fef0f02
--- /dev/null
+++ b/app/src/main/res/color/tab_text.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:color="?colorPrimary" android:state_selected="true" />
+	<item android:alpha="0.6" android:color="?colorOnSurface" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/tab_indicator.xml b/app/src/main/res/drawable/tab_indicator.xml
new file mode 100644
index 000000000..85211f67c
--- /dev/null
+++ b/app/src/main/res/drawable/tab_indicator.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:shape="rectangle">
+	<corners
+		android:topLeftRadius="3dp"
+		android:topRightRadius="3dp" />
+	<size android:height="3dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/tabs_background.xml b/app/src/main/res/drawable/tabs_background.xml
new file mode 100644
index 000000000..6c1544f5f
--- /dev/null
+++ b/app/src/main/res/drawable/tabs_background.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list
+	xmlns:android="http://schemas.android.com/apk/res/android">
+	<item>
+		<shape android:shape="rectangle">
+			<solid android:color="?colorSurface" />
+		</shape>
+	</item>
+	<item
+		android:left="-2dp"
+		android:right="-2dp"
+		android:top="-2dp">
+		<shape>
+			<solid android:color="@android:color/transparent" />
+			<stroke
+				android:width="1dp"
+				android:color="@color/tabs_line" />
+		</shape>
+	</item>
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_favourites.xml b/app/src/main/res/layout/fragment_favourites.xml
index de7e65e7b..47b8c515d 100644
--- a/app/src/main/res/layout/fragment_favourites.xml
+++ b/app/src/main/res/layout/fragment_favourites.xml
@@ -10,7 +10,6 @@
 		android:id="@+id/tabs"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:elevation="4dp"
 		app:tabGravity="center"
 		app:tabMode="scrollable" />
 
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index cd02d0e75..7a2753729 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -6,4 +6,5 @@
 	<color name="red_accent">#FF8A65</color>
 	<color name="dim">#99000000</color>
 	<color name="error">#E57373</color>
+	<color name="tabs_line">#5E636A</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-v29/themes.xml b/app/src/main/res/values-v29/themes.xml
index 876667222..b8b075c5d 100644
--- a/app/src/main/res/values-v29/themes.xml
+++ b/app/src/main/res/values-v29/themes.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+
 	<style name="BaseAppTheme" parent="Theme.MaterialComponents.DayNight.NoActionBar">
 		<item name="windowActionModeOverlay">true</item>
 		<item name="actionModeCloseDrawable">@drawable/ic_cross</item>
@@ -9,5 +10,6 @@
 		<item name="android:statusBarColor">@color/status_bar</item>
 		<item name="android:navigationBarColor">@android:color/transparent</item>
 		<item name="colorOnPrimary">@android:color/white</item>
+		<item name="tabStyle">@style/Widget.MaterialComponents.TabLayout.New</item>
 	</style>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 221e38bef..5d1c1d8ba 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -9,4 +9,5 @@
 	<color name="dim">#99000000</color>
 	<color name="error">#D32F2F</color>
 	<color name="status_bar">#33000000</color>
+	<color name="tabs_line">#C3CFDD</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index c67cfeafb..161614112 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -25,4 +25,19 @@
 		<item name="background">@color/grey</item>
 	</style>
 
+	<style name="Widget.MaterialComponents.TabLayout.New">
+		<item name="tabIndicatorFullWidth">false</item>
+		<item name="android:background">@drawable/tabs_background</item>
+		<item name="tabIndicator">@drawable/tab_indicator</item>
+		<item name="tabIconTint">@color/tab_text</item>
+		<item name="tabSelectedTextColor">?colorPrimary</item>
+		<item name="tabTextColor">@color/tab_text</item>
+		<item name="tabTextAppearance">@style/TextAppearance.Design.Tab.New</item>
+	</style>
+
+	<style name="TextAppearance.Design.Tab.New">
+		<item name="textAllCaps">false</item>
+		<item name="android:textAllCaps">false</item>
+	</style>
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 71d8872b6..ec569d9c4 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+
 	<style name="BaseAppTheme" parent="Theme.MaterialComponents.DayNight.NoActionBar">
 		<item name="android:windowActionModeOverlay">true</item>
 		<item name="windowActionModeOverlay">true</item>
@@ -9,6 +10,7 @@
 		<item name="badgeStyle">@style/Widget.MaterialComponents.Badge</item>
 		<item name="android:statusBarColor">@color/status_bar</item>
 		<item name="colorOnPrimary">@android:color/white</item>
+		<item name="tabStyle">@style/Widget.MaterialComponents.TabLayout.New</item>
 	</style>
 
 	<style name="AppTheme" parent="BaseAppTheme">