diff --git a/src/main/res/layout/product_item.xml b/src/main/res/layout/product_item.xml
index beddc3c2..d5009618 100644
--- a/src/main/res/layout/product_item.xml
+++ b/src/main/res/layout/product_item.xml
@@ -4,10 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="72dp"
-    app:cardBackgroundColor="?android:attr/colorBackground"
-    app:cardCornerRadius="@dimen/shape_large_corner"
-    app:cardElevation="0dp"
-    app:strokeWidth="0dp">
+    style="?attr/materialCardViewFilledStyle">
 
     <androidx.appcompat.widget.LinearLayoutCompat
         android:layout_width="match_parent"
diff --git a/src/main/res/layout/release_info.xml b/src/main/res/layout/release_info.xml
index 1f308026..fa22fd3d 100644
--- a/src/main/res/layout/release_info.xml
+++ b/src/main/res/layout/release_info.xml
@@ -111,10 +111,7 @@
         android:layout_height="match_parent"
         android:layout_margin="4dp"
         android:layout_weight="1"
-        app:cardBackgroundColor="?attr/colorSurface"
-        app:cardCornerRadius="@dimen/shape_medium_corner"
-        app:cardElevation="2dp"
-        app:strokeWidth="0dp">
+        style="?attr/materialCardViewElevatedStyle">
 
         <androidx.appcompat.widget.LinearLayoutCompat
             android:layout_width="match_parent"
diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml
index 8c1356d7..44781016 100644
--- a/src/main/res/values/styles.xml
+++ b/src/main/res/values/styles.xml
@@ -31,6 +31,7 @@
         <item name="appBarLayoutStyle">@style/Theme.AppBarLayout</item>
         <item name="collapsingToolbarLayoutLargeStyle">@style/Theme.CollapsingToolbar</item>
         <item name="toolbarStyle">@style/Theme.Toolbar</item>
+        <item name="materialCardViewFilledStyle">@style/Theme.Card</item>
     </style>
 
     <style name="Theme.Main.Dark" parent="Theme.Material3.Dark.NoActionBar">
@@ -140,6 +141,11 @@
         <item name="thumbTint">@color/switch_thumb_tint</item>
     </style>
 
+    <style name="Theme.Card" parent="Widget.Material3.CardView.Filled">
+        <item name="cardBackgroundColor">?android:attr/colorBackground</item>
+        <item name="cardCornerRadius">@dimen/shape_large_corner</item>
+    </style>
+
     <style name="Shape.Small" parent="ShapeAppearance.Material3.SmallComponent">
         <item name="cornerSize">@dimen/shape_small_corner</item>
     </style>