diff --git a/app/src/main/res/layout/fragment_top_chart.xml b/app/src/main/res/layout/fragment_top_chart.xml
index b23743fe9..22bc4327c 100644
--- a/app/src/main/res/layout/fragment_top_chart.xml
+++ b/app/src/main/res/layout/fragment_top_chart.xml
@@ -42,14 +42,14 @@
 
             <com.google.android.material.chip.Chip
                 android:id="@+id/tab_top_free"
-                style="@style/Widget.MaterialComponents.Chip.Choice"
+                style="@style/Chip.TopChart"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/tab_top_free" />
 
             <com.google.android.material.chip.Chip
                 android:id="@+id/tab_top_grossing"
-                style="@style/Widget.MaterialComponents.Chip.Choice"
+                style="@style/Chip.TopChart"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/tab_top_grossing" />
@@ -57,14 +57,14 @@
 
             <com.google.android.material.chip.Chip
                 android:id="@+id/tab_trending"
-                style="@style/Widget.MaterialComponents.Chip.Choice"
+                style="@style/Chip.TopChart"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/tab_trending" />
 
             <com.google.android.material.chip.Chip
                 android:id="@+id/tab_top_paid"
-                style="@style/Widget.MaterialComponents.Chip.Choice"
+                style="@style/Chip.TopChart"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/tab_top_paid" />
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index fcebd0b0f..b6ed8cd79 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -49,10 +49,15 @@
 
     <style name="Chip.Filter" parent="@style/Widget.Material3.Chip.Filter" />
 
-    <style name="Chip.Tag" parent="@style/Widget.Material3.Chip.Assist.Elevated">
-        <item name="chipBackgroundColor">?colorControlHighlight</item>
+    <style name="Chip.TopChart" parent="@style/Widget.Material3.Chip.Filter">
         <item name="android:textAppearance">@style/TextAppearance.Aurora.Line2</item>
-        <item name="chipStrokeWidth">0dp</item>
+        <item name="chipStrokeColor">?colorControlHighlight</item>
+    </style>
+
+    <style name="Chip.Tag" parent="@style/Widget.Material3.Chip.Assist.Elevated">
         <item name="android:clickable">false</item>
+        <item name="android:textAppearance">@style/TextAppearance.Aurora.Line2</item>
+        <item name="chipBackgroundColor">?colorControlHighlight</item>
+        <item name="chipStrokeWidth">0dp</item>
     </style>
 </resources>