diff --git a/app/src/main/res/layout/device_itemv2.xml b/app/src/main/res/layout/device_itemv2.xml
index 82aa34aa0..50ec6552a 100644
--- a/app/src/main/res/layout/device_itemv2.xml
+++ b/app/src/main/res/layout/device_itemv2.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:card_view="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -14,7 +16,7 @@
         android:layout_marginTop="8dp"
         android:layout_marginBottom="8dp"
         android:foreground="?android:attr/selectableItemBackground"
-        card_view:cardCornerRadius="3dp"
+        app:cardBackgroundColor="?attr/cardview_background_color"
         card_view:cardElevation="3dp"
         card_view:contentPadding="8dp">
 
diff --git a/app/src/main/res/layout/item_alarm.xml b/app/src/main/res/layout/item_alarm.xml
index b5dfb84e5..0f72d6647 100644
--- a/app/src/main/res/layout/item_alarm.xml
+++ b/app/src/main/res/layout/item_alarm.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
@@ -8,7 +10,10 @@
         android:id="@+id/card_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="8dp">
+        android:layout_margin="8dp"
+        android:foreground="?android:attr/selectableItemBackground"
+        app:cardBackgroundColor="?attr/cardview_background_color"
+        app:cardElevation="3dp">
 
         <RelativeLayout
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/item_appmanager_watchapp.xml b/app/src/main/res/layout/item_appmanager_watchapp.xml
index 584bc2e5e..1d3e03b1e 100644
--- a/app/src/main/res/layout/item_appmanager_watchapp.xml
+++ b/app/src/main/res/layout/item_appmanager_watchapp.xml
@@ -7,7 +7,7 @@
     android:layout_height="wrap_content"
     android:layout_margin="8dp"
     android:foreground="?android:attr/selectableItemBackground"
-    app:cardCornerRadius="3dp"
+    app:cardBackgroundColor="?attr/cardview_background_color"
     app:cardElevation="3dp"
     app:contentPadding="8dp">
 
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index c6c6cf02a..a43eb799b 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -5,6 +5,7 @@
     <attr name="textColorTertiary" format="color" />
 
     <attr name="drawer_header_color" format="color" />
+    <attr name="cardview_background_color" format="color" />
 
     <attr name="chart_deep_sleep" format="color" />
     <attr name="chart_light_sleep" format="color" />
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 59c44994d..c6768e368 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -17,6 +17,7 @@
         <item name="toolbarNavigationButtonStyle">@style/GadgetbridgeTheme.NavigationButtonStyle</item>
 
         <item name="drawer_header_color">?attr/colorPrimaryDark</item>
+        <item name="cardview_background_color">@color/cardview_light_background</item>
         <item name="chart_deep_sleep">@color/chart_deep_sleep_light</item>
         <item name="chart_light_sleep">@color/chart_light_sleep_light</item>
         <item name="chart_rem_sleep">@color/chart_rem_sleep_light</item>
@@ -42,6 +43,7 @@
         <item name="actionBarStyle">@style/GadgetbridgeTheme.RedActionBar</item>
 
         <item name="drawer_header_color">?attr/colorPrimaryDark</item>
+        <item name="cardview_background_color">@color/cardview_dark_background</item>
         <item name="chart_deep_sleep">@color/chart_deep_sleep_dark</item>
         <item name="chart_light_sleep">@color/chart_light_sleep_dark</item>
         <item name="chart_rem_sleep">@color/chart_rem_sleep_dark</item>
@@ -63,6 +65,7 @@
         <item name="android:statusBarColor">?attr/colorSurface</item>
         <item name="android:windowLightStatusBar" tools:targetApi="23">true</item>
         <item name="drawer_header_color">?attr/colorSurface</item>
+        <item name="cardview_background_color">?attr/colorSurface</item>
         <item name="alternate_row_background">?attr/colorSecondaryContainer</item>
     </style>
     <style name="GadgetbridgeThemeDynamicDark" parent="Theme.Material3.DynamicColors.Dark">
@@ -70,6 +73,7 @@
         <item name="android:statusBarColor">?attr/colorSurface</item>
         <item name="android:windowLightStatusBar" tools:targetApi="23">false</item>
         <item name="drawer_header_color">?attr/colorSurface</item>
+        <item name="cardview_background_color">?attr/colorSurface</item>
         <item name="alternate_row_background">?attr/colorSecondaryContainer</item>
     </style>
     <style name="GadgetbridgeThemeDynamicDarkAmoled" parent="GadgetbridgeThemeDynamicDark">