diff --git a/common/src/main/kotlin/dev/msfjarvis/claw/common/ui/Color.ext.kt b/common/src/main/kotlin/dev/msfjarvis/claw/common/ui/Color.ext.kt
deleted file mode 100644
index e82d3ea3..00000000
--- a/common/src/main/kotlin/dev/msfjarvis/claw/common/ui/Color.ext.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright © 2022-2023 Harsh Shandilya.
- * Use of this source code is governed by an MIT-style
- * license that can be found in the LICENSE file or at
- * https://opensource.org/licenses/MIT.
- */
-package dev.msfjarvis.claw.common.ui
-
-import androidx.compose.material3.ColorScheme
-import androidx.compose.material3.LocalAbsoluteTonalElevation
-import androidx.compose.material3.NavigationBarDefaults
-import androidx.compose.material3.surfaceColorAtElevation
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.graphics.Color
-
-@Composable
-fun ColorScheme.surfaceColorAtNavigationBarElevation(): Color {
-  val elevation = LocalAbsoluteTonalElevation.current + NavigationBarDefaults.Elevation
-  return surfaceColorAtElevation(elevation)
-}
diff --git a/common/src/main/kotlin/dev/msfjarvis/claw/common/ui/decorations/ClawAppBar.kt b/common/src/main/kotlin/dev/msfjarvis/claw/common/ui/decorations/ClawAppBar.kt
index d27ee07f..aa3bc2ac 100644
--- a/common/src/main/kotlin/dev/msfjarvis/claw/common/ui/decorations/ClawAppBar.kt
+++ b/common/src/main/kotlin/dev/msfjarvis/claw/common/ui/decorations/ClawAppBar.kt
@@ -8,10 +8,8 @@ package dev.msfjarvis.claw.common.ui.decorations
 
 import androidx.compose.foundation.layout.RowScope
 import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBar
-import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.shadow
@@ -20,7 +18,6 @@ import androidx.compose.ui.unit.dp
 import dev.msfjarvis.claw.common.theme.LobstersTheme
 import dev.msfjarvis.claw.common.ui.preview.DevicePreviews
 import dev.msfjarvis.claw.common.ui.preview.ThemePreviews
-import dev.msfjarvis.claw.common.ui.surfaceColorAtNavigationBarElevation
 
 @Composable
 @OptIn(ExperimentalMaterial3Api::class)
@@ -33,10 +30,6 @@ fun ClawAppBar(
   TopAppBar(
     title = title,
     modifier = modifier.shadow(8.dp),
-    colors =
-      TopAppBarDefaults.topAppBarColors(
-        containerColor = MaterialTheme.colorScheme.surfaceColorAtNavigationBarElevation()
-      ),
     navigationIcon = navigationIcon,
     actions = actions,
   )
diff --git a/common/src/main/kotlin/dev/msfjarvis/claw/common/ui/decorations/MonthHeader.kt b/common/src/main/kotlin/dev/msfjarvis/claw/common/ui/decorations/MonthHeader.kt
index bf03a831..a1c72df7 100644
--- a/common/src/main/kotlin/dev/msfjarvis/claw/common/ui/decorations/MonthHeader.kt
+++ b/common/src/main/kotlin/dev/msfjarvis/claw/common/ui/decorations/MonthHeader.kt
@@ -19,7 +19,6 @@ import androidx.compose.ui.unit.dp
 import dev.msfjarvis.claw.common.theme.LobstersTheme
 import dev.msfjarvis.claw.common.ui.preview.DevicePreviews
 import dev.msfjarvis.claw.common.ui.preview.ThemePreviews
-import dev.msfjarvis.claw.common.ui.surfaceColorAtNavigationBarElevation
 
 @Composable
 fun MonthHeader(label: String, modifier: Modifier = Modifier) {
@@ -27,7 +26,7 @@ fun MonthHeader(label: String, modifier: Modifier = Modifier) {
     modifier
       .fillMaxWidth()
       .wrapContentHeight()
-      .background(MaterialTheme.colorScheme.surfaceColorAtNavigationBarElevation())
+      .background(MaterialTheme.colorScheme.surfaceContainerHighest)
   ) {
     Text(
       text = label,