diff --git a/app/src/main/java/io/heckel/ntfy/ui/Colors.kt b/app/src/main/java/io/heckel/ntfy/ui/Colors.kt
index 46d0d19e..5e96ac8e 100644
--- a/app/src/main/java/io/heckel/ntfy/ui/Colors.kt
+++ b/app/src/main/java/io/heckel/ntfy/ui/Colors.kt
@@ -30,7 +30,7 @@ class Colors {
         }
 
         fun cardBackgroundColor(context: Context): Int {
-            return onPrimary(context) // SurfaceColors.getColorForElevation(context, 5f)
+            return MaterialColors.getColor(context, R.attr.colorSurface, Color.WHITE)
         }
 
         fun cardSelectedBackgroundColor(context: Context): Int {
@@ -39,7 +39,7 @@ class Colors {
 
         fun statusBarNormal(context: Context, dynamicColors: Boolean, darkMode: Boolean): Int {
             val default = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                context.resources.getColor(R.color.action_bar)
+                context.resources.getColor(R.color.action_bar, null)
             } else {
                 @Suppress("DEPRECATION")
                 context.resources.getColor(R.color.action_bar)
@@ -48,7 +48,7 @@ class Colors {
                 if (darkMode) {
                     MaterialColors.getColor(context, R.attr.colorSurface, default)
                 } else {
-                    MaterialColors.getColor(context, R.attr.colorOnPrimaryContainer, default)
+                    MaterialColors.getColor(context, R.attr.colorPrimary, default)
                 }
             } else {
                 default
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index a391d370..1bf20371 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -22,7 +22,7 @@
         <com.google.android.material.card.MaterialCardView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                app:shapeAppearance="?shapeAppearanceLargeComponent"
+                style="@style/BannerCardStyle"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
@@ -99,7 +99,8 @@
         <com.google.android.material.card.MaterialCardView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                app:shapeAppearance="?shapeAppearanceLargeComponent" app:layout_constraintStart_toStartOf="parent"
+                style="@style/BannerCardStyle"
+                app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@+id/main_banner_battery"
                 android:id="@+id/main_banner_websocket" android:visibility="visible">
 
@@ -166,7 +167,8 @@
         <com.google.android.material.card.MaterialCardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:shapeAppearance="?shapeAppearanceLargeComponent" app:layout_constraintStart_toStartOf="parent"
+            style="@style/BannerCardStyle"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@+id/main_banner_websocket"
             android:id="@+id/main_banner_websocket_reconnect" android:visibility="visible">
 
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 32343f1d..0103cc5e 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -16,16 +16,16 @@
     <color name="md_theme_onError">#690005</color>
     <color name="md_theme_errorContainer">#93000A</color>
     <color name="md_theme_onErrorContainer">#FFDAD6</color>
-    <color name="md_theme_background">#0E1513</color>
-    <color name="md_theme_onBackground">#DEE4E0</color>
-    <color name="md_theme_surface">#0E1513</color>
-    <color name="md_theme_onSurface">#DEE4E0</color>
+    <color name="md_theme_background">#121212</color>
+    <color name="md_theme_onBackground">#E0E0E0</color>
+    <color name="md_theme_surface">#121212</color>
+    <color name="md_theme_onSurface">#E0E0E0</color>
     <color name="md_theme_surfaceVariant">#3F4946</color>
-    <color name="md_theme_onSurfaceVariant">#BFC9C4</color>
+    <color name="md_theme_onSurfaceVariant">#C0C0C0</color>
     <color name="md_theme_outline">#89938F</color>
     <color name="md_theme_outlineVariant">#3F4946</color>
     <color name="md_theme_scrim">#000000</color>
-    <color name="md_theme_inverseSurface">#DEE4E0</color>
+    <color name="md_theme_inverseSurface">#E0E0E0</color>
     <color name="md_theme_inverseOnSurface">#2B3230</color>
     <color name="md_theme_inversePrimary">#076B5B</color>
     <color name="md_theme_primaryFixed">#A0F2DD</color>
@@ -40,13 +40,16 @@
     <color name="md_theme_onTertiaryFixed">#001E2E</color>
     <color name="md_theme_tertiaryFixedDim">#AACBE4</color>
     <color name="md_theme_onTertiaryFixedVariant">#2A4A5F</color>
-    <color name="md_theme_surfaceDim">#0E1513</color>
-    <color name="md_theme_surfaceBright">#343B38</color>
-    <color name="md_theme_surfaceContainerLowest">#090F0E</color>
-    <color name="md_theme_surfaceContainerLow">#171D1B</color>
-    <color name="md_theme_surfaceContainer">#1B211F</color>
-    <color name="md_theme_surfaceContainerHigh">#252B29</color>
-    <color name="md_theme_surfaceContainerHighest">#303634</color>
+    <color name="md_theme_surfaceDim">#121212</color>
+    <color name="md_theme_surfaceBright">#383838</color>
+    <color name="md_theme_surfaceContainerLowest">#0D0D0D</color>
+    <color name="md_theme_surfaceContainerLow">#1B1B1B</color>
+    <color name="md_theme_surfaceContainer">#1B2023</color>
+    <color name="md_theme_surfaceContainerHigh">#282F33</color>
+    <color name="md_theme_surfaceContainerHighest">#333333</color>
+
+    <color name="action_bar">#121212</color> <!-- md_theme_surface (dark) -->
+
     <color name="md_theme_primary_mediumContrast">#9AECD7</color>
     <color name="md_theme_onPrimary_mediumContrast">#002C24</color>
     <color name="md_theme_primaryContainer_mediumContrast">#4D9F8C</color>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index facde9f1..94b87ae8 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -16,17 +16,17 @@
     <color name="md_theme_onError">#FFFFFF</color>
     <color name="md_theme_errorContainer">#FFDAD6</color>
     <color name="md_theme_onErrorContainer">#93000A</color>
-    <color name="md_theme_background">#F5FBF7</color>
+    <color name="md_theme_background">#FFFFFF</color>
     <color name="md_theme_onBackground">#171D1B</color>
-    <color name="md_theme_surface">#F5FBF7</color>
+    <color name="md_theme_surface">#FFFFFF</color>
     <color name="md_theme_onSurface">#171D1B</color>
-    <color name="md_theme_surfaceVariant">#DBE5E0</color>
+    <color name="md_theme_surfaceVariant">#E0E0E0</color>
     <color name="md_theme_onSurfaceVariant">#3F4946</color>
     <color name="md_theme_outline">#6F7976</color>
-    <color name="md_theme_outlineVariant">#BFC9C4</color>
+    <color name="md_theme_outlineVariant">#C0C0C0</color>
     <color name="md_theme_scrim">#000000</color>
     <color name="md_theme_inverseSurface">#2B3230</color>
-    <color name="md_theme_inverseOnSurface">#ECF2EF</color>
+    <color name="md_theme_inverseOnSurface">#F0F0F0</color>
     <color name="md_theme_inversePrimary">#84D6C2</color>
     <color name="md_theme_primaryFixed">#A0F2DD</color>
     <color name="md_theme_onPrimaryFixed">#00201A</color>
@@ -40,13 +40,13 @@
     <color name="md_theme_onTertiaryFixed">#001E2E</color>
     <color name="md_theme_tertiaryFixedDim">#AACBE4</color>
     <color name="md_theme_onTertiaryFixedVariant">#2A4A5F</color>
-    <color name="md_theme_surfaceDim">#D5DBD8</color>
-    <color name="md_theme_surfaceBright">#F5FBF7</color>
+    <color name="md_theme_surfaceDim">#E0E0E0</color>
+    <color name="md_theme_surfaceBright">#FFFFFF</color>
     <color name="md_theme_surfaceContainerLowest">#FFFFFF</color>
-    <color name="md_theme_surfaceContainerLow">#EFF5F1</color>
-    <color name="md_theme_surfaceContainer">#E9EFEC</color>
-    <color name="md_theme_surfaceContainerHigh">#E3EAE6</color>
-    <color name="md_theme_surfaceContainerHighest">#DEE4E0</color>
+    <color name="md_theme_surfaceContainerLow">#F5F5F5</color>
+    <color name="md_theme_surfaceContainer">#F0F0F0</color>
+    <color name="md_theme_surfaceContainerHigh">#EEEEEE</color>
+    <color name="md_theme_surfaceContainerHighest">#E0E0E0</color>
     <color name="md_theme_primary_mediumContrast">#003E34</color>
     <color name="md_theme_onPrimary_mediumContrast">#FFFFFF</color>
     <color name="md_theme_primaryContainer_mediumContrast">#237A69</color>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index c2df478e..304c77f1 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -82,11 +82,21 @@
 
 
     <style name="MyActionMode" parent="@style/Widget.AppCompat.ActionMode">
-        <item name="background">?attr/colorPrimary</item>
+        <item name="background">?attr/colorSurfaceContainer</item>
         <item name="titleTextStyle">@style/MyActionModeTitle</item>
     </style>
 
     <style name="MyActionModeTitle" parent="@style/TextAppearance.AppCompat.Widget.ActionMode.Title">
-        <item name="android:textColor">?attr/colorOnPrimary</item>
+        <item name="android:textColor">?attr/colorOnSurface</item>
+    </style>
+
+    <!-- Banner style with reduced corner radius -->
+    <style name="BannerCardStyle" parent="Widget.Material3.CardView.Elevated">
+        <item name="shapeAppearanceOverlay">@style/BannerShapeAppearance</item>
+    </style>
+
+    <style name="BannerShapeAppearance">
+        <item name="cornerFamily">rounded</item>
+        <item name="cornerSize">8dp</item>
     </style>
 </resources>