diff --git a/WordPress/src/main/java/org/wordpress/android/designsystem/DesignSystemColorsScreen.kt b/WordPress/src/main/java/org/wordpress/android/designsystem/DesignSystemColorsScreen.kt
index 1541bccd1d9b..8f6f11e5ca30 100644
--- a/WordPress/src/main/java/org/wordpress/android/designsystem/DesignSystemColorsScreen.kt
+++ b/WordPress/src/main/java/org/wordpress/android/designsystem/DesignSystemColorsScreen.kt
@@ -11,7 +11,7 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material3.Divider
+import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -64,7 +64,9 @@ fun DesignSystemColorsScreen(
 @OptIn(ExperimentalStdlibApi::class)
 @Composable
 fun ColorCard (colorName: String, color: Color) {
-    Row (modifier = Modifier.padding(10.dp, 3.dp).fillMaxWidth()) {
+    Row (modifier = Modifier
+        .padding(10.dp, 3.dp)
+        .fillMaxWidth()) {
         Column {
             Box(
                 modifier = Modifier
@@ -86,7 +88,7 @@ fun ColorCard (colorName: String, color: Color) {
             )
         }
     }
-    Divider(modifier = Modifier.padding(start = 10.dp, end = 10.dp))
+    HorizontalDivider(modifier = Modifier.padding(start = 10.dp, end = 10.dp))
 }
 @Composable
 fun ColorCardList(colorOptions: List<ColorOption>) {
diff --git a/WordPress/src/main/java/org/wordpress/android/designsystem/DesignSystemFontsScreen.kt b/WordPress/src/main/java/org/wordpress/android/designsystem/DesignSystemFontsScreen.kt
index aacdc40e3f56..d1f7f42d975a 100644
--- a/WordPress/src/main/java/org/wordpress/android/designsystem/DesignSystemFontsScreen.kt
+++ b/WordPress/src/main/java/org/wordpress/android/designsystem/DesignSystemFontsScreen.kt
@@ -8,7 +8,7 @@ import androidx.compose.foundation.layout.defaultMinSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.material3.Divider
+import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -68,7 +68,7 @@ fun FontCard (text: String, font: TextStyle) {
             )
         }
     }
-    Divider(modifier = Modifier.padding(start = 10.dp, end = 10.dp))
+    HorizontalDivider(modifier = Modifier.padding(start = 10.dp, end = 10.dp))
 }
 @Composable
 fun FontsTitle(title: String) {
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/compose/components/MainTopAppBar.kt b/WordPress/src/main/java/org/wordpress/android/ui/compose/components/MainTopAppBar.kt
index efe28fa04419..38469dbe669b 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/compose/components/MainTopAppBar.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/compose/components/MainTopAppBar.kt
@@ -9,6 +9,7 @@ import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
 import androidx.compose.material.TopAppBar
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material.icons.filled.ArrowBack
 import androidx.compose.material.icons.filled.Close
 import androidx.compose.runtime.Composable
@@ -33,7 +34,7 @@ typealias NavigationIcon = @Composable () -> Unit
 object NavigationIcons {
     val BackIcon: NavigationIcon = {
         Icon(
-            Icons.Default.ArrowBack,
+            Icons.AutoMirrored.Filled.ArrowBack,
             contentDescription = stringResource(R.string.navigate_up_desc),
             modifier = Modifier.graphicsLayer(
                 scaleX = if (LocalLayoutDirection.current == LayoutDirection.Rtl) -1f else 1f,
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitemonitor/SiteMonitorParentActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitemonitor/SiteMonitorParentActivity.kt
index fa171c6ade04..93b008ac16a4 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitemonitor/SiteMonitorParentActivity.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitemonitor/SiteMonitorParentActivity.kt
@@ -186,7 +186,7 @@ class SiteMonitorParentActivity : AppCompatActivity(), SiteMonitorWebViewClient.
                 contentColor = MaterialTheme.colors.onSurface,
                 indicator = { tabPositions ->
                     // Customizing the indicator color and style
-                    TabRowDefaults.Indicator(
+                    TabRowDefaults.SecondaryIndicator(
                         Modifier.tabIndicatorOffset(tabPositions[tabIndex]),
                         color = MaterialTheme.colors.onSurface,
                         height = 2.0.dp
diff --git a/build.gradle b/build.gradle
index fcd4b14c117a..9e67d3b0e187 100644
--- a/build.gradle
+++ b/build.gradle
@@ -62,8 +62,8 @@ ext {
     androidxSwipeToRefreshVersion = '1.1.0'
     androidxViewpager2Version = '1.0.0'
     androidxWorkManagerVersion = "2.9.0"
+    androidxComposeMaterial3Version = '1.2.1'
     androidxWebkitVersion =  '1.11.0'
-    androidxComposeMaterial3Version = '1.1.1'
     apacheCommonsTextVersion = '1.10.0'
     coilComposeVersion = '2.4.0'
     chrisbanesPhotoviewVersion = '2.3.0'
diff --git a/config/lint/lint.xml b/config/lint/lint.xml
index 3985b167379f..ef455b41a278 100644
--- a/config/lint/lint.xml
+++ b/config/lint/lint.xml
@@ -69,4 +69,10 @@
     <issue id="UnknownNullness" severity="informational">
         <ignore path="**/generated/**" />
     </issue>
+
+    <!-- TODO: https://github.com/wordpress-mobile/WordPress-Android/issues/21065 -->
+    <issue id="UsingMaterialAndMaterial3Libraries" severity="warning" />
+
+    <!-- TODO: remove this when we upgrade to AGP 8.5.0 -->
+    <issue id="ObsoleteLintCustomCheck" severity="warning" />
 </lint>