From 4e726a725ab4ce3cb03d2860bb9a41083aada2d4 Mon Sep 17 00:00:00 2001
From: PavloNetrebchuk <pavlo.netrebchuk@raccoongang.com>
Date: Thu, 29 Jan 2026 12:36:06 +0200
Subject: [PATCH 1/4] chore: migration to material3

---
 .../logistration/LogistrationFragment.kt      |  13 +-
 .../restore/RestorePasswordFragment.kt        |  26 +-
 .../presentation/signin/compose/SignInView.kt |  36 +-
 .../presentation/signup/compose/SignUpView.kt | 115 ++-
 .../signup/compose/SocialSignedView.kt        |   8 +-
 .../openedx/auth/presentation/ui/AuthUI.kt    |  34 +-
 .../auth/presentation/ui/CheckboxField.kt     |   8 +-
 .../auth/presentation/ui/SocialAuthView.kt    |   6 +-
 build.gradle                                  |   2 +-
 .../openedx/core/domain/model/DatesSection.kt |   2 +-
 .../core/presentation/dates/DatesUI.kt        |   6 +-
 .../core/presentation/dialog/DialogUI.kt      |   4 +-
 .../dialog/alert/ActionDialogFragment.kt      |   4 +-
 .../dialog/alert/InfoDialogFragment.kt        |   4 +-
 .../dialog/appreview/AppReviewUI.kt           |  26 +-
 .../DownloadConfirmDialogFragment.kt          |   4 +-
 .../DownloadErrorDialogFragment.kt            |   4 +-
 .../DownloadStorageErrorDialogFragment.kt     |   4 +-
 .../dialog/downloaddialog/DownloadView.kt     |   6 +-
 .../SelectBottomDialogFragment.kt             |   4 +-
 .../global/appupgrade/AppUpdateUI.kt          |  21 +-
 .../calendarsync/CalendarSyncDialog.kt        |  14 +-
 .../calendarsync/CalendarSyncState.kt         |   2 +-
 .../settings/video/VideoQualityFragment.kt    |  15 +-
 .../java/org/openedx/core/ui/ComposeCommon.kt |  75 +-
 .../java/org/openedx/core/ui/HTMLRenderer.kt  |   4 +-
 .../java/org/openedx/core/ui/PageIndicator.kt |   2 +-
 .../org/openedx/core/ui/WebContentScreen.kt   |  11 +-
 .../org/openedx/core/ui/theme/AppColors.kt    |  64 +-
 .../org/openedx/core/ui/theme/AppShapes.kt    |   6 +-
 .../openedx/core/ui/theme/AppTypography.kt    |   2 +-
 .../java/org/openedx/core/ui/theme/Theme.kt   |  67 +-
 core/src/main/res/values/themes.xml           |   2 +-
 .../org/openedx/core/ui/theme/LocalShapes.kt  |  12 +-
 .../ui/theme/compose/LogistrationLogoView.kt  |   2 +-
 .../presentation/ChapterEndFragmentDialog.kt  |  19 +-
 .../CourseContentAssignmentScreen.kt          |  43 +-
 .../container/CollapsingLayout.kt             |   9 +-
 .../container/CourseContainerFragment.kt      | 182 +++--
 .../presentation/container/HeaderContent.kt   |   4 +-
 .../NoAccessCourseContainerFragment.kt        |  15 +-
 .../contenttab/ContentTabEmptyState.kt        |   6 +-
 .../contenttab/ContentTabScreen.kt            |  14 +-
 .../presentation/dates/CourseDatesScreen.kt   |  19 +-
 .../presentation/handouts/HandoutsScreen.kt   |  19 +-
 .../handouts/HandoutsWebViewFragment.kt       |  11 +-
 .../home/AssignmentsHomePagerCardContent.kt   |  25 +-
 .../CourseCompletionHomePagerCardContent.kt   |   4 +-
 .../presentation/home/CourseHomeScreen.kt     |  30 +-
 .../home/GradesHomePagerCardContent.kt        |  15 +-
 .../home/VideosHomePagerCardContent.kt        |  71 +-
 .../offline/CourseOfflineScreen.kt            |  30 +-
 .../outline/CourseContentAllScreen.kt         |  15 +-
 .../progress/CourseProgressScreen.kt          |  29 +-
 .../section/CourseSectionFragment.kt          |  25 +-
 .../course/presentation/ui/CourseUI.kt        |  89 +--
 .../unit/NotAvailableUnitFragment.kt          |  19 +-
 .../container/CourseUnitContainerFragment.kt  |   8 +-
 .../unit/html/HtmlUnitFragment.kt             |   8 +-
 .../videos/CourseContentVideoScreen.kt        |  19 +-
 .../download/DownloadQueueFragment.kt         |  20 +-
 .../src/main/java/org/openedx/DashboardUI.kt  |   4 +-
 .../presentation/AllEnrolledCoursesView.kt    |  68 +-
 .../presentation/DashboardGalleryView.kt      | 203 +++---
 .../presentation/DashboardListFragment.kt     |  51 +-
 .../learn/presentation/LearnFragment.kt       |  72 +-
 .../dates/presentation/dates/DatesScreen.kt   | 182 +++--
 .../presentation/NativeDiscoveryFragment.kt   |  51 +-
 .../presentation/WebViewDiscoveryFragment.kt  |  13 +-
 .../detail/AuthorizationDialogFragment.kt     |  15 +-
 .../detail/CourseDetailsFragment.kt           |  25 +-
 .../presentation/info/CourseInfoFragment.kt   |  19 +-
 .../presentation/program/ProgramFragment.kt   |  19 +-
 .../search/CourseSearchFragment.kt            |  71 +-
 .../discovery/presentation/ui/DiscoveryUI.kt  |  14 +-
 .../comments/DiscussionCommentsFragment.kt    |  62 +-
 .../responses/DiscussionResponsesFragment.kt  |  62 +-
 .../search/DiscussionSearchThreadFragment.kt  |  50 +-
 .../threads/DiscussionAddThreadFragment.kt    | 452 ++++++------
 .../threads/DiscussionThreadsFragment.kt      | 670 ++++++++----------
 .../topics/DiscussionTopicsScreen.kt          |  23 +-
 .../presentation/ui/DiscussionUI.kt           |  23 +-
 .../presentation/download/DownloadsScreen.kt  | 216 +++---
 .../AnothersProfileFragment.kt                |  17 +-
 .../calendar/CalendarAccessDialogFragment.kt  |   4 +-
 .../calendar/CalendarSetUpView.kt             |  20 +-
 .../calendar/CalendarSettingsView.kt          |  36 +-
 .../presentation/calendar/CalendarView.kt     |  17 +-
 .../calendar/CoursesToSyncFragment.kt         |  41 +-
 .../DisableCalendarSyncDialogFragment.kt      |   6 +-
 .../calendar/NewCalendarDialogFragment.kt     | 197 +++--
 .../delete/DeleteProfileFragment.kt           |  15 +-
 .../presentation/edit/EditProfileFragment.kt  | 603 ++++++++--------
 .../compose/ManageAccountView.kt              |  46 +-
 .../profile/compose/ProfileView.kt            |  45 +-
 .../presentation/settings/SettingsScreenUI.kt |  31 +-
 .../profile/presentation/ui/ProfileUI.kt      |  11 +-
 .../profile/presentation/ui/SettingsUI.kt     |  10 +-
 .../video/VideoSettingsFragment.kt            |  28 +-
 settings.gradle                               |   1 +
 .../whatsnew/presentation/ui/WhatsNewUI.kt    |  18 +-
 .../presentation/whatsnew/WhatsNewFragment.kt |  13 +-
 102 files changed, 2418 insertions(+), 2469 deletions(-)

diff --git a/auth/src/main/java/org/openedx/auth/presentation/logistration/LogistrationFragment.kt b/auth/src/main/java/org/openedx/auth/presentation/logistration/LogistrationFragment.kt
index f8dbba635..523240f50 100644
--- a/auth/src/main/java/org/openedx/auth/presentation/logistration/LogistrationFragment.kt
+++ b/auth/src/main/java/org/openedx/auth/presentation/logistration/LogistrationFragment.kt
@@ -13,11 +13,10 @@ import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Scaffold
-import androidx.compose.material.Surface
-import androidx.compose.material.Text
-import androidx.compose.material.rememberScaffoldState
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -118,17 +117,15 @@ private fun LogistrationScreen(
     var textFieldValue by rememberSaveable(stateSaver = TextFieldValue.Saver) {
         mutableStateOf(TextFieldValue(""))
     }
-    val scaffoldState = rememberScaffoldState()
     val scrollState = rememberScrollState()
     Scaffold(
-        scaffoldState = scaffoldState,
         modifier = Modifier
             .semantics {
                 testTagsAsResourceId = true
             }
             .fillMaxSize()
             .navigationBarsPadding(),
-        backgroundColor = MaterialTheme.appColors.background
+        containerColor = MaterialTheme.appColors.background
     ) {
         Surface(
             modifier = Modifier
diff --git a/auth/src/main/java/org/openedx/auth/presentation/restore/RestorePasswordFragment.kt b/auth/src/main/java/org/openedx/auth/presentation/restore/RestorePasswordFragment.kt
index adb8da725..c1bb6461e 100644
--- a/auth/src/main/java/org/openedx/auth/presentation/restore/RestorePasswordFragment.kt
+++ b/auth/src/main/java/org/openedx/auth/presentation/restore/RestorePasswordFragment.kt
@@ -20,13 +20,14 @@ import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.widthIn
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.CircularProgressIndicator
-import androidx.compose.material.Icon
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Scaffold
-import androidx.compose.material.Surface
-import androidx.compose.material.Text
-import androidx.compose.material.rememberScaffoldState
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.SnackbarHost
+import androidx.compose.material3.SnackbarHostState
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
@@ -127,21 +128,21 @@ private fun RestorePasswordScreen(
     onBackClick: () -> Unit,
     onRestoreButtonClick: (String) -> Unit,
 ) {
-    val scaffoldState = rememberScaffoldState()
     val scrollState = rememberScrollState()
     var email by rememberSaveable { mutableStateOf("") }
     var isEmailError by rememberSaveable { mutableStateOf(false) }
     val keyboardController = LocalSoftwareKeyboardController.current
+    val snackbarHostState = remember { SnackbarHostState() }
 
     Scaffold(
-        scaffoldState = scaffoldState,
         modifier = Modifier
             .semantics {
                 testTagsAsResourceId = true
             }
             .fillMaxSize()
             .navigationBarsPadding(),
-        backgroundColor = MaterialTheme.appColors.background
+        containerColor = MaterialTheme.appColors.background,
+        snackbarHost = { SnackbarHost(snackbarHostState) }
     ) { paddingValues ->
 
         val contentPaddings by remember {
@@ -192,10 +193,7 @@ private fun RestorePasswordScreen(
             contentDescription = null
         )
 
-        HandleUIMessage(
-            uiMessage = uiMessage,
-            scaffoldState = scaffoldState
-        )
+        HandleUIMessage(uiMessage = uiMessage, snackbarHostState = snackbarHostState)
 
         Column(
             modifier = Modifier
diff --git a/auth/src/main/java/org/openedx/auth/presentation/signin/compose/SignInView.kt b/auth/src/main/java/org/openedx/auth/presentation/signin/compose/SignInView.kt
index e182f51d7..831000b67 100644
--- a/auth/src/main/java/org/openedx/auth/presentation/signin/compose/SignInView.kt
+++ b/auth/src/main/java/org/openedx/auth/presentation/signin/compose/SignInView.kt
@@ -20,14 +20,15 @@ import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.CircularProgressIndicator
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.OutlinedTextField
-import androidx.compose.material.Scaffold
-import androidx.compose.material.Surface
-import androidx.compose.material.Text
-import androidx.compose.material.TextFieldDefaults
-import androidx.compose.material.rememberScaffoldState
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedTextField
+import androidx.compose.material3.OutlinedTextFieldDefaults
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.SnackbarHost
+import androidx.compose.material3.SnackbarHostState
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -88,18 +89,18 @@ internal fun LoginScreen(
     uiMessage: UIMessage?,
     onEvent: (AuthEvent) -> Unit,
 ) {
-    val scaffoldState = rememberScaffoldState()
     val scrollState = rememberScrollState()
+    val snackbarHostState = remember { SnackbarHostState() }
 
     Scaffold(
-        scaffoldState = scaffoldState,
         modifier = Modifier
             .semantics {
                 testTagsAsResourceId = true
             }
             .fillMaxSize()
             .navigationBarsPadding(),
-        backgroundColor = MaterialTheme.appColors.background
+        containerColor = MaterialTheme.appColors.background,
+        snackbarHost = { SnackbarHost(snackbarHostState) }
     ) {
         val contentPaddings by remember {
             mutableStateOf(
@@ -133,10 +134,7 @@ internal fun LoginScreen(
             contentScale = ContentScale.FillBounds,
             contentDescription = null
         )
-        HandleUIMessage(
-            uiMessage = uiMessage,
-            scaffoldState = scaffoldState
-        )
+        HandleUIMessage(uiMessage = uiMessage, snackbarHostState = snackbarHostState)
         if (state.isLogistrationEnabled) {
             Box(
                 modifier = Modifier
@@ -364,9 +362,11 @@ private fun PasswordTextField(
             passwordTextFieldValue = it
             onValueChanged(it.text.trim())
         },
-        colors = TextFieldDefaults.outlinedTextFieldColors(
-            textColor = MaterialTheme.appColors.textFieldText,
-            backgroundColor = MaterialTheme.appColors.textFieldBackground,
+        colors = OutlinedTextFieldDefaults.colors(
+            focusedTextColor = MaterialTheme.appColors.textFieldText,
+            unfocusedTextColor = MaterialTheme.appColors.textFieldText,
+            focusedContainerColor = MaterialTheme.appColors.textFieldBackground,
+            unfocusedContainerColor = MaterialTheme.appColors.textFieldBackground,
             unfocusedBorderColor = MaterialTheme.appColors.textFieldBorder,
             cursorColor = MaterialTheme.appColors.textFieldText,
         ),
diff --git a/auth/src/main/java/org/openedx/auth/presentation/signup/compose/SignUpView.kt b/auth/src/main/java/org/openedx/auth/presentation/signup/compose/SignUpView.kt
index 8b917ebaa..14b1226bb 100644
--- a/auth/src/main/java/org/openedx/auth/presentation/signup/compose/SignUpView.kt
+++ b/auth/src/main/java/org/openedx/auth/presentation/signup/compose/SignUpView.kt
@@ -20,15 +20,16 @@ import androidx.compose.foundation.layout.widthIn
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.CircularProgressIndicator
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.ModalBottomSheetLayout
-import androidx.compose.material.ModalBottomSheetValue
-import androidx.compose.material.Scaffold
-import androidx.compose.material.Surface
-import androidx.compose.material.Text
-import androidx.compose.material.rememberModalBottomSheetState
-import androidx.compose.material.rememberScaffoldState
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.ModalBottomSheet
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.SnackbarHost
+import androidx.compose.material3.SnackbarHostState
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.material3.rememberModalBottomSheetState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
@@ -74,8 +75,6 @@ import org.openedx.core.ui.HandleUIMessage
 import org.openedx.core.ui.OpenEdXButton
 import org.openedx.core.ui.SheetContent
 import org.openedx.core.ui.displayCutoutForLandscape
-import org.openedx.core.ui.isImeVisibleState
-import org.openedx.core.ui.noRippleClickable
 import org.openedx.core.ui.rememberSaveableMap
 import org.openedx.core.ui.statusBarsInset
 import org.openedx.core.ui.theme.OpenEdXTheme
@@ -88,7 +87,7 @@ import org.openedx.foundation.presentation.WindowType
 import org.openedx.foundation.presentation.windowSizeValue
 import org.openedx.core.R as coreR
 
-@OptIn(ExperimentalComposeUiApi::class)
+@OptIn(ExperimentalComposeUiApi::class, ExperimentalMaterial3Api::class)
 @Composable
 internal fun SignUpView(
     windowSize: WindowSize,
@@ -99,12 +98,9 @@ internal fun SignUpView(
     onRegisterClick: (authType: AuthType) -> Unit,
     onHyperLinkClick: (Map<String, String>, String) -> Unit,
 ) {
-    val scaffoldState = rememberScaffoldState()
     val focusManager = LocalFocusManager.current
-    val bottomSheetScaffoldState = rememberModalBottomSheetState(
-        initialValue = ModalBottomSheetValue.Hidden,
-        skipHalfExpanded = true
-    )
+    val bottomSheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true)
+    var showBottomSheet by rememberSaveable { mutableStateOf(false) }
     val coroutine = rememberCoroutineScope()
     val keyboardController = LocalSoftwareKeyboardController.current
     var expandedList by rememberSaveable {
@@ -123,6 +119,7 @@ internal fun SignUpView(
         mutableStateMapOf<String, Boolean?>()
     }
     val scrollState = rememberScrollState()
+    val snackbarHostState = remember { SnackbarHostState() }
 
     val haptic = LocalHapticFeedback.current
 
@@ -136,8 +133,6 @@ internal fun SignUpView(
         mutableStateOf(TextFieldValue())
     }
 
-    val isImeVisible by isImeVisibleState()
-
     LaunchedEffect(uiState.validationError) {
         if (uiState.validationError) {
             coroutine.launch {
@@ -156,22 +151,22 @@ internal fun SignUpView(
         }
     }
 
-    LaunchedEffect(bottomSheetScaffoldState.isVisible) {
-        if (!bottomSheetScaffoldState.isVisible) {
+    LaunchedEffect(showBottomSheet) {
+        if (!showBottomSheet) {
             focusManager.clearFocus()
             searchValue = TextFieldValue("")
         }
     }
 
     Scaffold(
-        scaffoldState = scaffoldState,
         modifier = Modifier
             .semantics {
                 testTagsAsResourceId = true
             }
             .fillMaxSize()
             .navigationBarsPadding(),
-        backgroundColor = MaterialTheme.appColors.background
+        containerColor = MaterialTheme.appColors.background,
+        snackbarHost = { SnackbarHost(snackbarHostState) }
     ) {
         val topBarPadding by remember {
             mutableStateOf(
@@ -209,21 +204,14 @@ internal fun SignUpView(
             )
         }
 
-        ModalBottomSheetLayout(
-            modifier = Modifier
-                .padding(bottom = if (isImeVisible && bottomSheetScaffoldState.isVisible) 120.dp else 0.dp)
-                .noRippleClickable {
-                    if (bottomSheetScaffoldState.isVisible) {
-                        coroutine.launch {
-                            bottomSheetScaffoldState.hide()
-                        }
-                    }
-                },
-            sheetState = bottomSheetScaffoldState,
-            sheetShape = MaterialTheme.appShapes.screenBackgroundShape,
-            scrimColor = Color.Black.copy(alpha = 0.4f),
-            sheetBackgroundColor = MaterialTheme.appColors.background,
-            sheetContent = {
+        if (showBottomSheet) {
+            ModalBottomSheet(
+                onDismissRequest = { showBottomSheet = false },
+                sheetState = bottomSheetState,
+                shape = MaterialTheme.appShapes.screenBackgroundShape,
+                scrimColor = Color.Black.copy(alpha = 0.4f),
+                containerColor = MaterialTheme.appColors.background,
+            ) {
                 SheetContent(
                     title = bottomDialogTitle,
                     searchValue = searchValue,
@@ -233,7 +221,8 @@ internal fun SignUpView(
                         onFieldUpdated(serverFieldName.value, item.value)
                         selectableNamesMap[serverFieldName.value] = item.name
                         coroutine.launch {
-                            bottomSheetScaffoldState.hide()
+                            bottomSheetState.hide()
+                            showBottomSheet = false
                         }
                     },
                     searchValueChanged = {
@@ -241,20 +230,18 @@ internal fun SignUpView(
                     }
                 )
             }
-        ) {
-            Image(
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .fillMaxHeight(fraction = 0.3f),
-                painter = painterResource(id = coreR.drawable.core_top_header),
-                contentScale = ContentScale.FillBounds,
-                contentDescription = null
-            )
-            HandleUIMessage(
-                uiMessage = uiMessage,
-                scaffoldState = scaffoldState
-            )
-            Column(
+        }
+
+        Image(
+            modifier = Modifier
+                .fillMaxWidth()
+                .fillMaxHeight(fraction = 0.3f),
+            painter = painterResource(id = coreR.drawable.core_top_header),
+            contentScale = ContentScale.FillBounds,
+            contentDescription = null
+        )
+        HandleUIMessage(uiMessage = uiMessage, snackbarHostState = snackbarHostState)
+        Column(
                 Modifier
                     .fillMaxWidth()
                     .padding(it)
@@ -355,12 +342,13 @@ internal fun SignUpView(
                                         serverFieldName.value = serverName
                                         expandedList = list
                                         coroutine.launch {
-                                            if (bottomSheetScaffoldState.isVisible) {
-                                                bottomSheetScaffoldState.hide()
+                                            if (showBottomSheet) {
+                                                bottomSheetState.hide()
+                                                showBottomSheet = false
                                             } else {
                                                 bottomDialogTitle = field.label
                                                 showErrorMap[field.name] = false
-                                                bottomSheetScaffoldState.show()
+                                                showBottomSheet = true
                                             }
                                         }
                                     },
@@ -385,12 +373,13 @@ internal fun SignUpView(
                                                     serverName
                                                 expandedList = list
                                                 coroutine.launch {
-                                                    if (bottomSheetScaffoldState.isVisible) {
-                                                        bottomSheetScaffoldState.hide()
+                                                    if (showBottomSheet) {
+                                                        bottomSheetState.hide()
+                                                        showBottomSheet = false
                                                     } else {
                                                         bottomDialogTitle = field.label
                                                         showErrorMap[field.name] = false
-                                                        bottomSheetScaffoldState.show()
+                                                        showBottomSheet = true
                                                     }
                                                 }
                                             },
@@ -408,12 +397,13 @@ internal fun SignUpView(
                                             serverFieldName.value = serverName
                                             expandedList = list
                                             coroutine.launch {
-                                                if (bottomSheetScaffoldState.isVisible) {
-                                                    bottomSheetScaffoldState.hide()
+                                                if (showBottomSheet) {
+                                                    bottomSheetState.hide()
+                                                    showBottomSheet = false
                                                 } else {
                                                     bottomDialogTitle = field.label
                                                     showErrorMap[field.name] = false
-                                                    bottomSheetScaffoldState.show()
+                                                    showBottomSheet = true
                                                 }
                                             }
                                         },
@@ -463,7 +453,6 @@ internal fun SignUpView(
                         }
                     }
                 }
-            }
         }
     }
 }
diff --git a/auth/src/main/java/org/openedx/auth/presentation/signup/compose/SocialSignedView.kt b/auth/src/main/java/org/openedx/auth/presentation/signup/compose/SocialSignedView.kt
index 2045297a5..30cdf50e4 100644
--- a/auth/src/main/java/org/openedx/auth/presentation/signup/compose/SocialSignedView.kt
+++ b/auth/src/main/java/org/openedx/auth/presentation/signup/compose/SocialSignedView.kt
@@ -6,9 +6,9 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
-import androidx.compose.material.Icon
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Text
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.painterResource
@@ -48,7 +48,7 @@ internal fun SocialSignedView(authType: AuthType) {
             Text(
                 fontSize = 18.sp,
                 fontWeight = FontWeight.Bold,
-                color = MaterialTheme.colors.primary,
+                color = MaterialTheme.appColors.primary,
                 text = stringResource(
                     id = R.string.auth_social_signed_title,
                     authType.methodName
diff --git a/auth/src/main/java/org/openedx/auth/presentation/ui/AuthUI.kt b/auth/src/main/java/org/openedx/auth/presentation/ui/AuthUI.kt
index 61d8f7450..726f14e1b 100644
--- a/auth/src/main/java/org/openedx/auth/presentation/ui/AuthUI.kt
+++ b/auth/src/main/java/org/openedx/auth/presentation/ui/AuthUI.kt
@@ -16,17 +16,17 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
-import androidx.compose.material.Icon
-import androidx.compose.material.IconButton
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.OutlinedTextField
-import androidx.compose.material.Text
-import androidx.compose.material.TextFieldDefaults
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.KeyboardArrowRight
 import androidx.compose.material.icons.filled.ExpandMore
 import androidx.compose.material.icons.filled.Visibility
 import androidx.compose.material.icons.filled.VisibilityOff
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedTextField
+import androidx.compose.material3.OutlinedTextFieldDefaults
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -261,9 +261,11 @@ fun LoginTextField(
             loginTextFieldValue = it
             onValueChanged(it.text.trim())
         },
-        colors = TextFieldDefaults.outlinedTextFieldColors(
-            textColor = MaterialTheme.appColors.textFieldText,
-            backgroundColor = MaterialTheme.appColors.textFieldBackground,
+        colors = OutlinedTextFieldDefaults.colors(
+            focusedTextColor = MaterialTheme.appColors.textFieldText,
+            unfocusedTextColor = MaterialTheme.appColors.textFieldText,
+            focusedContainerColor = MaterialTheme.appColors.textFieldBackground,
+            unfocusedContainerColor = MaterialTheme.appColors.textFieldBackground,
             unfocusedBorderColor = MaterialTheme.appColors.textFieldBorder,
             cursorColor = MaterialTheme.appColors.textFieldText,
         ),
@@ -373,9 +375,11 @@ fun InputRegistrationField(
                     onValueChanged(registrationField.name, it.trim(), true)
                 }
             },
-            colors = TextFieldDefaults.outlinedTextFieldColors(
-                textColor = MaterialTheme.appColors.textFieldText,
-                backgroundColor = MaterialTheme.appColors.textFieldBackground,
+            colors = OutlinedTextFieldDefaults.colors(
+                focusedTextColor = MaterialTheme.appColors.textFieldText,
+                unfocusedTextColor = MaterialTheme.appColors.textFieldText,
+                focusedContainerColor = MaterialTheme.appColors.textFieldBackground,
+                unfocusedContainerColor = MaterialTheme.appColors.textFieldBackground,
                 focusedBorderColor = MaterialTheme.appColors.textFieldBorder,
                 unfocusedBorderColor = MaterialTheme.appColors.textFieldBorder,
                 cursorColor = MaterialTheme.appColors.textFieldText,
@@ -459,11 +463,13 @@ fun SelectableRegisterField(
             enabled = false,
             singleLine = true,
             value = initialValue,
-            colors = TextFieldDefaults.outlinedTextFieldColors(
+            colors = OutlinedTextFieldDefaults.colors(
                 unfocusedBorderColor = MaterialTheme.appColors.textFieldBorder,
                 disabledBorderColor = MaterialTheme.appColors.textFieldBorder,
                 disabledTextColor = MaterialTheme.appColors.textPrimary,
-                backgroundColor = MaterialTheme.appColors.textFieldBackground,
+                focusedContainerColor = MaterialTheme.appColors.textFieldBackground,
+                unfocusedContainerColor = MaterialTheme.appColors.textFieldBackground,
+                disabledContainerColor = MaterialTheme.appColors.textFieldBackground,
                 disabledPlaceholderColor = MaterialTheme.appColors.textFieldHint
             ),
             shape = MaterialTheme.appShapes.textFieldShape,
diff --git a/auth/src/main/java/org/openedx/auth/presentation/ui/CheckboxField.kt b/auth/src/main/java/org/openedx/auth/presentation/ui/CheckboxField.kt
index b134cb59a..ffc46caca 100644
--- a/auth/src/main/java/org/openedx/auth/presentation/ui/CheckboxField.kt
+++ b/auth/src/main/java/org/openedx/auth/presentation/ui/CheckboxField.kt
@@ -2,10 +2,10 @@ package org.openedx.auth.presentation.ui
 
 import android.content.res.Configuration
 import androidx.compose.foundation.layout.Row
-import androidx.compose.material.Checkbox
-import androidx.compose.material.CheckboxDefaults
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Text
+import androidx.compose.material3.Checkbox
+import androidx.compose.material3.CheckboxDefaults
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
diff --git a/auth/src/main/java/org/openedx/auth/presentation/ui/SocialAuthView.kt b/auth/src/main/java/org/openedx/auth/presentation/ui/SocialAuthView.kt
index e4962d072..ceb52dfb4 100644
--- a/auth/src/main/java/org/openedx/auth/presentation/ui/SocialAuthView.kt
+++ b/auth/src/main/java/org/openedx/auth/presentation/ui/SocialAuthView.kt
@@ -5,9 +5,9 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
-import androidx.compose.material.Icon
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Text
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
diff --git a/build.gradle b/build.gradle
index 8570eb77d..4e0b4d12e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -32,7 +32,7 @@ buildscript {
         play_services_ads_identifier_version = '18.2.0'
         install_referrer_version = '2.2'
         snakeyaml_version = '2.4'
-        openedx_foundation_version = '1.1.0'
+        openedx_foundation_version = '1.1.1'
         openedx_firebase_analytics_version = '1.0.1'
         braze_sdk_version = '37.0.0'
 
diff --git a/core/src/main/java/org/openedx/core/domain/model/DatesSection.kt b/core/src/main/java/org/openedx/core/domain/model/DatesSection.kt
index 33d884bed..01a769819 100644
--- a/core/src/main/java/org/openedx/core/domain/model/DatesSection.kt
+++ b/core/src/main/java/org/openedx/core/domain/model/DatesSection.kt
@@ -1,6 +1,6 @@
 package org.openedx.core.domain.model
 
-import androidx.compose.material.MaterialTheme
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.Color
 import org.openedx.core.R
diff --git a/core/src/main/java/org/openedx/core/presentation/dates/DatesUI.kt b/core/src/main/java/org/openedx/core/presentation/dates/DatesUI.kt
index 2833998f9..98b4bb892 100644
--- a/core/src/main/java/org/openedx/core/presentation/dates/DatesUI.kt
+++ b/core/src/main/java/org/openedx/core/presentation/dates/DatesUI.kt
@@ -14,11 +14,11 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.layout.wrapContentHeight
-import androidx.compose.material.Icon
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Text
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.KeyboardArrowRight
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
diff --git a/core/src/main/java/org/openedx/core/presentation/dialog/DialogUI.kt b/core/src/main/java/org/openedx/core/presentation/dialog/DialogUI.kt
index 17b1d2874..9b49b2ae8 100644
--- a/core/src/main/java/org/openedx/core/presentation/dialog/DialogUI.kt
+++ b/core/src/main/java/org/openedx/core/presentation/dialog/DialogUI.kt
@@ -7,8 +7,8 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.widthIn
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Surface
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
diff --git a/core/src/main/java/org/openedx/core/presentation/dialog/alert/ActionDialogFragment.kt b/core/src/main/java/org/openedx/core/presentation/dialog/alert/ActionDialogFragment.kt
index 28f357896..9f0b00c24 100644
--- a/core/src/main/java/org/openedx/core/presentation/dialog/alert/ActionDialogFragment.kt
+++ b/core/src/main/java/org/openedx/core/presentation/dialog/alert/ActionDialogFragment.kt
@@ -14,8 +14,8 @@ import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.widthIn
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Text
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
diff --git a/core/src/main/java/org/openedx/core/presentation/dialog/alert/InfoDialogFragment.kt b/core/src/main/java/org/openedx/core/presentation/dialog/alert/InfoDialogFragment.kt
index 77c413924..de172374e 100644
--- a/core/src/main/java/org/openedx/core/presentation/dialog/alert/InfoDialogFragment.kt
+++ b/core/src/main/java/org/openedx/core/presentation/dialog/alert/InfoDialogFragment.kt
@@ -12,8 +12,8 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.widthIn
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Text
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
diff --git a/core/src/main/java/org/openedx/core/presentation/dialog/appreview/AppReviewUI.kt b/core/src/main/java/org/openedx/core/presentation/dialog/appreview/AppReviewUI.kt
index 632669c11..e7645b0af 100644
--- a/core/src/main/java/org/openedx/core/presentation/dialog/appreview/AppReviewUI.kt
+++ b/core/src/main/java/org/openedx/core/presentation/dialog/appreview/AppReviewUI.kt
@@ -13,16 +13,16 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
-import androidx.compose.material.Button
-import androidx.compose.material.ButtonDefaults
-import androidx.compose.material.Icon
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.OutlinedTextField
-import androidx.compose.material.Text
-import androidx.compose.material.TextFieldDefaults
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.Star
 import androidx.compose.material.icons.outlined.StarOutline
+import androidx.compose.material3.Button
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedTextField
+import androidx.compose.material3.OutlinedTextFieldDefaults
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.MutableIntState
 import androidx.compose.runtime.MutableState
@@ -170,10 +170,12 @@ fun FeedbackDialog(
                         style = MaterialTheme.appTypography.labelLarge,
                     )
                 },
-                colors = TextFieldDefaults.outlinedTextFieldColors(
-                    backgroundColor = MaterialTheme.appColors.cardViewBackground,
+                colors = OutlinedTextFieldDefaults.colors(
+                    focusedContainerColor = MaterialTheme.appColors.cardViewBackground,
+                    unfocusedContainerColor = MaterialTheme.appColors.cardViewBackground,
                     unfocusedBorderColor = MaterialTheme.appColors.textFieldBorder,
-                    textColor = MaterialTheme.appColors.textFieldText
+                    focusedTextColor = MaterialTheme.appColors.textFieldText,
+                    unfocusedTextColor = MaterialTheme.appColors.textFieldText
                 ),
             )
 
@@ -254,7 +256,7 @@ fun TransparentTextButton(
         modifier = Modifier
             .height(42.dp),
         colors = ButtonDefaults.buttonColors(
-            backgroundColor = Color.Transparent
+            containerColor = Color.Transparent
         ),
         elevation = null,
         shape = MaterialTheme.appShapes.navigationButtonShape,
@@ -288,7 +290,7 @@ fun DefaultTextButton(
         modifier = Modifier
             .height(42.dp),
         colors = ButtonDefaults.buttonColors(
-            backgroundColor = backgroundColor,
+            containerColor = backgroundColor,
             contentColor = textColor
         ),
         elevation = null,
diff --git a/core/src/main/java/org/openedx/core/presentation/dialog/downloaddialog/DownloadConfirmDialogFragment.kt b/core/src/main/java/org/openedx/core/presentation/dialog/downloaddialog/DownloadConfirmDialogFragment.kt
index 5ab8db529..7881b054a 100644
--- a/core/src/main/java/org/openedx/core/presentation/dialog/downloaddialog/DownloadConfirmDialogFragment.kt
+++ b/core/src/main/java/org/openedx/core/presentation/dialog/downloaddialog/DownloadConfirmDialogFragment.kt
@@ -16,11 +16,11 @@ import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Text
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.CloudDownload
 import androidx.compose.material.icons.rounded.Delete
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
diff --git a/core/src/main/java/org/openedx/core/presentation/dialog/downloaddialog/DownloadErrorDialogFragment.kt b/core/src/main/java/org/openedx/core/presentation/dialog/downloaddialog/DownloadErrorDialogFragment.kt
index f7bbe6ea5..e6bdf8e64 100644
--- a/core/src/main/java/org/openedx/core/presentation/dialog/downloaddialog/DownloadErrorDialogFragment.kt
+++ b/core/src/main/java/org/openedx/core/presentation/dialog/downloaddialog/DownloadErrorDialogFragment.kt
@@ -16,8 +16,8 @@ import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Text
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
diff --git a/core/src/main/java/org/openedx/core/presentation/dialog/downloaddialog/DownloadStorageErrorDialogFragment.kt b/core/src/main/java/org/openedx/core/presentation/dialog/downloaddialog/DownloadStorageErrorDialogFragment.kt
index 8c026bdf2..67c556043 100644
--- a/core/src/main/java/org/openedx/core/presentation/dialog/downloaddialog/DownloadStorageErrorDialogFragment.kt
+++ b/core/src/main/java/org/openedx/core/presentation/dialog/downloaddialog/DownloadStorageErrorDialogFragment.kt
@@ -25,8 +25,8 @@ import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Text
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.remember
diff --git a/core/src/main/java/org/openedx/core/presentation/dialog/downloaddialog/DownloadView.kt b/core/src/main/java/org/openedx/core/presentation/dialog/downloaddialog/DownloadView.kt
index 58a5f9d22..14ab4e66c 100644
--- a/core/src/main/java/org/openedx/core/presentation/dialog/downloaddialog/DownloadView.kt
+++ b/core/src/main/java/org/openedx/core/presentation/dialog/downloaddialog/DownloadView.kt
@@ -4,9 +4,9 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
-import androidx.compose.material.Icon
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Text
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
diff --git a/core/src/main/java/org/openedx/core/presentation/dialog/selectorbottomsheet/SelectBottomDialogFragment.kt b/core/src/main/java/org/openedx/core/presentation/dialog/selectorbottomsheet/SelectBottomDialogFragment.kt
index 3890aa360..11e007e51 100644
--- a/core/src/main/java/org/openedx/core/presentation/dialog/selectorbottomsheet/SelectBottomDialogFragment.kt
+++ b/core/src/main/java/org/openedx/core/presentation/dialog/selectorbottomsheet/SelectBottomDialogFragment.kt
@@ -12,8 +12,8 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.widthIn
 import androidx.compose.foundation.lazy.rememberLazyListState
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Surface
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.saveable.rememberSaveable
diff --git a/core/src/main/java/org/openedx/core/presentation/global/appupgrade/AppUpdateUI.kt b/core/src/main/java/org/openedx/core/presentation/global/appupgrade/AppUpdateUI.kt
index e0cbae480..e755e0aa5 100644
--- a/core/src/main/java/org/openedx/core/presentation/global/appupgrade/AppUpdateUI.kt
+++ b/core/src/main/java/org/openedx/core/presentation/global/appupgrade/AppUpdateUI.kt
@@ -16,13 +16,14 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.widthIn
-import androidx.compose.material.Button
-import androidx.compose.material.ButtonDefaults
-import androidx.compose.material.Card
-import androidx.compose.material.Icon
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Surface
-import androidx.compose.material.Text
+import androidx.compose.material3.Button
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.Card
+import androidx.compose.material3.CardDefaults
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.ExperimentalComposeUiApi
@@ -267,7 +268,7 @@ fun TransparentTextButton(
             .testTag("btn_secondary")
             .height(42.dp),
         colors = ButtonDefaults.buttonColors(
-            backgroundColor = Color.Transparent
+            containerColor = Color.Transparent
         ),
         elevation = null,
         shape = MaterialTheme.appShapes.navigationButtonShape,
@@ -292,7 +293,7 @@ fun DefaultTextButton(
             .testTag("btn_primary")
             .height(42.dp),
         colors = ButtonDefaults.buttonColors(
-            backgroundColor = MaterialTheme.appColors.primaryButtonBackground
+            containerColor = MaterialTheme.appColors.primaryButtonBackground
         ),
         elevation = null,
         shape = MaterialTheme.appShapes.navigationButtonShape,
@@ -326,7 +327,7 @@ fun AppUpgradeRecommendedBox(
                 onClick()
             },
         shape = MaterialTheme.appShapes.cardShape,
-        backgroundColor = MaterialTheme.appColors.primary
+        colors = CardDefaults.cardColors(containerColor = MaterialTheme.appColors.primary)
     ) {
         Row(
             modifier = Modifier.padding(horizontal = 20.dp, vertical = 8.dp),
diff --git a/core/src/main/java/org/openedx/core/presentation/settings/calendarsync/CalendarSyncDialog.kt b/core/src/main/java/org/openedx/core/presentation/settings/calendarsync/CalendarSyncDialog.kt
index 15f94d338..10c4cf73a 100644
--- a/core/src/main/java/org/openedx/core/presentation/settings/calendarsync/CalendarSyncDialog.kt
+++ b/core/src/main/java/org/openedx/core/presentation/settings/calendarsync/CalendarSyncDialog.kt
@@ -7,11 +7,11 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
-import androidx.compose.material.AlertDialog
-import androidx.compose.material.CircularProgressIndicator
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Surface
-import androidx.compose.material.Text
+import androidx.compose.material3.AlertDialog
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -124,7 +124,7 @@ private fun CalendarAlertDialog(dialogProperties: DialogProperties, onDismiss: (
             shape = MaterialTheme.appShapes.cardShape
         ),
         shape = MaterialTheme.appShapes.cardShape,
-        backgroundColor = MaterialTheme.appColors.background,
+        containerColor = MaterialTheme.appColors.background,
 
         properties = AlertDialogProperties(
             dismissOnBackPress = false,
@@ -133,7 +133,7 @@ private fun CalendarAlertDialog(dialogProperties: DialogProperties, onDismiss: (
         onDismissRequest = onDismiss,
 
         title = dialogProperties.title.takeIfNotEmpty()?.let {
-            @Composable {
+            {
                 Text(
                     text = dialogProperties.title,
                     color = MaterialTheme.appColors.textPrimary,
diff --git a/core/src/main/java/org/openedx/core/presentation/settings/calendarsync/CalendarSyncState.kt b/core/src/main/java/org/openedx/core/presentation/settings/calendarsync/CalendarSyncState.kt
index 95a851442..5ad386dee 100644
--- a/core/src/main/java/org/openedx/core/presentation/settings/calendarsync/CalendarSyncState.kt
+++ b/core/src/main/java/org/openedx/core/presentation/settings/calendarsync/CalendarSyncState.kt
@@ -1,12 +1,12 @@
 package org.openedx.core.presentation.settings.calendarsync
 
 import androidx.annotation.StringRes
-import androidx.compose.material.MaterialTheme
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.CloudSync
 import androidx.compose.material.icons.filled.SyncDisabled
 import androidx.compose.material.icons.rounded.EventRepeat
 import androidx.compose.material.icons.rounded.FreeCancellation
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.ReadOnlyComposable
 import androidx.compose.ui.graphics.Color
diff --git a/core/src/main/java/org/openedx/core/presentation/settings/video/VideoQualityFragment.kt b/core/src/main/java/org/openedx/core/presentation/settings/video/VideoQualityFragment.kt
index b370cd56d..6f72776ec 100644
--- a/core/src/main/java/org/openedx/core/presentation/settings/video/VideoQualityFragment.kt
+++ b/core/src/main/java/org/openedx/core/presentation/settings/video/VideoQualityFragment.kt
@@ -18,14 +18,13 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.widthIn
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.Divider
-import androidx.compose.material.Icon
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Scaffold
-import androidx.compose.material.Text
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Done
-import androidx.compose.material.rememberScaffoldState
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
@@ -129,7 +128,6 @@ private fun VideoQualityScreen(
     onQualityChanged: (VideoQuality) -> Unit,
     onBackClick: () -> Unit
 ) {
-    val scaffoldState = rememberScaffoldState()
     Scaffold(
         modifier = Modifier
             .fillMaxSize()
@@ -137,7 +135,6 @@ private fun VideoQualityScreen(
             .semantics {
                 testTagsAsResourceId = true
             },
-        scaffoldState = scaffoldState,
     ) { paddingValues ->
 
         val topBarWidth by remember(key1 = windowSize) {
@@ -249,7 +246,7 @@ private fun QualityOption(
             )
         }
     }
-    Divider()
+    HorizontalDivider()
 }
 
 @Preview(uiMode = Configuration.UI_MODE_NIGHT_NO)
diff --git a/core/src/main/java/org/openedx/core/ui/ComposeCommon.kt b/core/src/main/java/org/openedx/core/ui/ComposeCommon.kt
index 4230980be..a63e130f3 100644
--- a/core/src/main/java/org/openedx/core/ui/ComposeCommon.kt
+++ b/core/src/main/java/org/openedx/core/ui/ComposeCommon.kt
@@ -37,18 +37,6 @@ import androidx.compose.foundation.text.BasicText
 import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.Button
-import androidx.compose.material.ButtonDefaults
-import androidx.compose.material.CircularProgressIndicator
-import androidx.compose.material.Divider
-import androidx.compose.material.Icon
-import androidx.compose.material.IconButton
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.OutlinedButton
-import androidx.compose.material.OutlinedTextField
-import androidx.compose.material.ScaffoldState
-import androidx.compose.material.Text
-import androidx.compose.material.TextFieldDefaults
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material.icons.filled.AccountCircle
@@ -56,6 +44,18 @@ import androidx.compose.material.icons.filled.Close
 import androidx.compose.material.icons.filled.Info
 import androidx.compose.material.icons.filled.ManageAccounts
 import androidx.compose.material.icons.filled.Search
+import androidx.compose.material3.Button
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedButton
+import androidx.compose.material3.OutlinedTextField
+import androidx.compose.material3.OutlinedTextFieldDefaults
+import androidx.compose.material3.SnackbarHostState
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.NonRestartableComposable
@@ -258,17 +258,16 @@ fun SearchBar(
                 textFieldValue = it
             }
         },
-        colors = TextFieldDefaults.outlinedTextFieldColors(
-            textColor = MaterialTheme.appColors.textPrimary,
-            backgroundColor = if (isFocused) {
-                MaterialTheme.appColors.background
-            } else {
-                MaterialTheme.appColors.textFieldBackground
-            },
+        colors = OutlinedTextFieldDefaults.colors(
+            focusedTextColor = MaterialTheme.appColors.textPrimary,
+            unfocusedTextColor = MaterialTheme.appColors.textPrimary,
+            focusedContainerColor = MaterialTheme.appColors.background,
+            unfocusedContainerColor = MaterialTheme.appColors.textFieldBackground,
             focusedBorderColor = MaterialTheme.appColors.primary,
             unfocusedBorderColor = MaterialTheme.appColors.textFieldBorder,
             cursorColor = MaterialTheme.appColors.primary,
-            leadingIconColor = MaterialTheme.appColors.textPrimary
+            focusedLeadingIconColor = MaterialTheme.appColors.textPrimary,
+            unfocusedLeadingIconColor = MaterialTheme.appColors.textPrimary
         ),
         placeholder = {
             Text(
@@ -353,17 +352,16 @@ fun SearchBarStateless(
                 onValueChanged(it)
             }
         },
-        colors = TextFieldDefaults.outlinedTextFieldColors(
-            textColor = MaterialTheme.appColors.textPrimary,
-            backgroundColor = if (isFocused) {
-                MaterialTheme.appColors.background
-            } else {
-                MaterialTheme.appColors.textFieldBackground
-            },
+        colors = OutlinedTextFieldDefaults.colors(
+            focusedTextColor = MaterialTheme.appColors.textPrimary,
+            unfocusedTextColor = MaterialTheme.appColors.textPrimary,
+            focusedContainerColor = MaterialTheme.appColors.background,
+            unfocusedContainerColor = MaterialTheme.appColors.textFieldBackground,
             focusedBorderColor = MaterialTheme.appColors.primary,
             unfocusedBorderColor = MaterialTheme.appColors.textFieldBorder,
             cursorColor = MaterialTheme.appColors.primary,
-            leadingIconColor = MaterialTheme.appColors.textPrimary
+            focusedLeadingIconColor = MaterialTheme.appColors.textPrimary,
+            unfocusedLeadingIconColor = MaterialTheme.appColors.textPrimary
         ),
         placeholder = {
             Text(
@@ -409,13 +407,13 @@ fun SearchBarStateless(
 @NonRestartableComposable
 fun HandleUIMessage(
     uiMessage: UIMessage?,
-    scaffoldState: ScaffoldState,
+    snackbarHostState: SnackbarHostState,
 ) {
     val context = LocalContext.current
     LaunchedEffect(uiMessage) {
         when (uiMessage) {
             is UIMessage.SnackBarMessage -> {
-                scaffoldState.snackbarHostState.showSnackbar(
+                snackbarHostState.showSnackbar(
                     message = uiMessage.message,
                     duration = uiMessage.duration
                 )
@@ -567,7 +565,7 @@ fun SheetContent(
                     style = MaterialTheme.appTypography.bodyLarge,
                     textAlign = TextAlign.Center
                 )
-                Divider(modifier = Modifier.padding(horizontal = 16.dp))
+                HorizontalDivider(modifier = Modifier.padding(horizontal = 16.dp))
             }
         }
     }
@@ -633,7 +631,7 @@ fun SheetContent(
                     style = MaterialTheme.appTypography.bodyLarge,
                     textAlign = TextAlign.Center
                 )
-                Divider(modifier = Modifier.padding(horizontal = 16.dp))
+                HorizontalDivider(modifier = Modifier.padding(horizontal = 16.dp))
             }
         }
     }
@@ -684,10 +682,13 @@ fun OpenEdXOutlinedTextField(
                 inputFieldValue = it
                 onValueChanged(it.text)
             },
-            colors = TextFieldDefaults.outlinedTextFieldColors(
+            colors = OutlinedTextFieldDefaults.colors(
+                focusedTextColor = MaterialTheme.appColors.textFieldText,
+                unfocusedTextColor = MaterialTheme.appColors.textFieldText,
+                focusedContainerColor = MaterialTheme.appColors.textFieldBackground,
+                unfocusedContainerColor = MaterialTheme.appColors.textFieldBackground,
+                focusedBorderColor = MaterialTheme.appColors.primary,
                 unfocusedBorderColor = MaterialTheme.appColors.textFieldBorder,
-                textColor = MaterialTheme.appColors.textFieldText,
-                backgroundColor = MaterialTheme.appColors.textFieldBackground,
                 errorBorderColor = MaterialTheme.appColors.error,
             ),
             shape = MaterialTheme.appShapes.textFieldShape,
@@ -966,7 +967,7 @@ fun OpenEdXButton(
             .then(modifier),
         shape = MaterialTheme.appShapes.buttonShape,
         colors = ButtonDefaults.buttonColors(
-            backgroundColor = backgroundColor
+            containerColor = backgroundColor
         ),
         enabled = enabled,
         onClick = onClick
@@ -1004,7 +1005,7 @@ fun OpenEdXOutlinedButton(
         enabled = enabled,
         border = BorderStroke(1.dp, borderColor),
         shape = MaterialTheme.appShapes.buttonShape,
-        colors = ButtonDefaults.outlinedButtonColors(backgroundColor = backgroundColor)
+        colors = ButtonDefaults.outlinedButtonColors(containerColor = backgroundColor)
     ) {
         if (content == null) {
             Text(
diff --git a/core/src/main/java/org/openedx/core/ui/HTMLRenderer.kt b/core/src/main/java/org/openedx/core/ui/HTMLRenderer.kt
index 0105e2cff..34980354c 100644
--- a/core/src/main/java/org/openedx/core/ui/HTMLRenderer.kt
+++ b/core/src/main/java/org/openedx/core/ui/HTMLRenderer.kt
@@ -14,8 +14,8 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Text
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
diff --git a/core/src/main/java/org/openedx/core/ui/PageIndicator.kt b/core/src/main/java/org/openedx/core/ui/PageIndicator.kt
index 8e9f4f40b..411de5736 100644
--- a/core/src/main/java/org/openedx/core/ui/PageIndicator.kt
+++ b/core/src/main/java/org/openedx/core/ui/PageIndicator.kt
@@ -7,7 +7,7 @@ import androidx.compose.foundation.Canvas
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.size
-import androidx.compose.material.MaterialTheme
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
diff --git a/core/src/main/java/org/openedx/core/ui/WebContentScreen.kt b/core/src/main/java/org/openedx/core/ui/WebContentScreen.kt
index 70f320368..dead1913a 100644
--- a/core/src/main/java/org/openedx/core/ui/WebContentScreen.kt
+++ b/core/src/main/java/org/openedx/core/ui/WebContentScreen.kt
@@ -13,10 +13,9 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.widthIn
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Scaffold
-import androidx.compose.material.Surface
-import androidx.compose.material.rememberScaffoldState
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Surface
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableFloatStateOf
@@ -54,7 +53,6 @@ fun WebContentScreen(
     htmlBody: String? = null,
     contentUrl: String? = null,
 ) {
-    val scaffoldState = rememberScaffoldState()
     Scaffold(
         modifier = Modifier
             .fillMaxSize()
@@ -62,8 +60,7 @@ fun WebContentScreen(
             .semantics {
                 testTagsAsResourceId = true
             },
-        scaffoldState = scaffoldState,
-        backgroundColor = MaterialTheme.appColors.background
+        containerColor = MaterialTheme.appColors.background
     ) {
         val screenWidth by remember(key1 = windowSize) {
             mutableStateOf(
diff --git a/core/src/main/java/org/openedx/core/ui/theme/AppColors.kt b/core/src/main/java/org/openedx/core/ui/theme/AppColors.kt
index bf20366d9..58da9beac 100644
--- a/core/src/main/java/org/openedx/core/ui/theme/AppColors.kt
+++ b/core/src/main/java/org/openedx/core/ui/theme/AppColors.kt
@@ -1,10 +1,10 @@
 package org.openedx.core.ui.theme
 
-import androidx.compose.material.Colors
+import androidx.compose.material3.ColorScheme
 import androidx.compose.ui.graphics.Color
 
 data class AppColors(
-    val material: Colors,
+    val material3: ColorScheme,
 
     val textPrimary: Color,
     val textPrimaryVariant: Color,
@@ -83,17 +83,51 @@ data class AppColors(
     val gradeProgressBarBackground: Color,
     val assignmentCardBorder: Color,
 ) {
-    val primary: Color get() = material.primary
-    val primaryVariant: Color get() = material.primaryVariant
-    val secondary: Color get() = material.secondary
-    val secondaryVariant: Color get() = material.secondaryVariant
-    val background: Color get() = material.background
-    val surface: Color get() = material.surface
-    val error: Color get() = material.error
-    val onPrimary: Color get() = material.onPrimary
-    val onSecondary: Color get() = material.onSecondary
-    val onBackground: Color get() = material.onBackground
-    val onSurface: Color get() = material.onSurface
-    val onError: Color get() = material.onError
-    val isLight: Boolean get() = material.isLight
+    // Material 3 ColorScheme accessors
+    val primary: Color get() = material3.primary
+    val onPrimary: Color get() = material3.onPrimary
+    val primaryContainer: Color get() = material3.primaryContainer
+    val onPrimaryContainer: Color get() = material3.onPrimaryContainer
+    val secondary: Color get() = material3.secondary
+    val onSecondary: Color get() = material3.onSecondary
+    val secondaryContainer: Color get() = material3.secondaryContainer
+    val onSecondaryContainer: Color get() = material3.onSecondaryContainer
+    val tertiary: Color get() = material3.tertiary
+    val onTertiary: Color get() = material3.onTertiary
+    val tertiaryContainer: Color get() = material3.tertiaryContainer
+    val onTertiaryContainer: Color get() = material3.onTertiaryContainer
+    val background: Color get() = material3.background
+    val onBackground: Color get() = material3.onBackground
+    val surface: Color get() = material3.surface
+    val onSurface: Color get() = material3.onSurface
+    val surfaceVariant: Color get() = material3.surfaceVariant
+    val onSurfaceVariant: Color get() = material3.onSurfaceVariant
+    val error: Color get() = material3.error
+    val onError: Color get() = material3.onError
+    val errorContainer: Color get() = material3.errorContainer
+    val onErrorContainer: Color get() = material3.onErrorContainer
+    val outline: Color get() = material3.outline
+    val outlineVariant: Color get() = material3.outlineVariant
+    val inverseSurface: Color get() = material3.inverseSurface
+    val inverseOnSurface: Color get() = material3.inverseOnSurface
+    val inversePrimary: Color get() = material3.inversePrimary
+    val surfaceTint: Color get() = material3.surfaceTint
+    val scrim: Color get() = material3.scrim
+
+    // Backward compatibility accessors for M1 color names
+    @Deprecated("Use primary instead", ReplaceWith("primary"))
+    val primaryVariant: Color get() = material3.primaryContainer
+
+    @Deprecated("Use secondary instead", ReplaceWith("secondary"))
+    val secondaryVariant: Color get() = material3.secondaryContainer
+
+    // Helper to determine if this is a light theme
+    val isLight: Boolean get() = material3.background.luminance() > 0.5f
+
+    private fun Color.luminance(): Float {
+        val r = red
+        val g = green
+        val b = blue
+        return 0.299f * r + 0.587f * g + 0.114f * b
+    }
 }
diff --git a/core/src/main/java/org/openedx/core/ui/theme/AppShapes.kt b/core/src/main/java/org/openedx/core/ui/theme/AppShapes.kt
index 1a45681f9..214ebdf5b 100644
--- a/core/src/main/java/org/openedx/core/ui/theme/AppShapes.kt
+++ b/core/src/main/java/org/openedx/core/ui/theme/AppShapes.kt
@@ -1,13 +1,13 @@
 package org.openedx.core.ui.theme
 
 import androidx.compose.foundation.shape.CornerBasedShape
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Shapes
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Shapes
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.ReadOnlyComposable
 
 data class AppShapes(
-    val material: Shapes,
+    val material3: Shapes,
     val buttonShape: CornerBasedShape,
     val navigationButtonShape: CornerBasedShape,
     val textFieldShape: CornerBasedShape,
diff --git a/core/src/main/java/org/openedx/core/ui/theme/AppTypography.kt b/core/src/main/java/org/openedx/core/ui/theme/AppTypography.kt
index 52d9adebb..5fc36d480 100644
--- a/core/src/main/java/org/openedx/core/ui/theme/AppTypography.kt
+++ b/core/src/main/java/org/openedx/core/ui/theme/AppTypography.kt
@@ -1,6 +1,6 @@
 package org.openedx.core.ui.theme
 
-import androidx.compose.material.MaterialTheme
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.ReadOnlyComposable
 import androidx.compose.runtime.staticCompositionLocalOf
diff --git a/core/src/main/java/org/openedx/core/ui/theme/Theme.kt b/core/src/main/java/org/openedx/core/ui/theme/Theme.kt
index 9b42c90ac..ec7997c72 100644
--- a/core/src/main/java/org/openedx/core/ui/theme/Theme.kt
+++ b/core/src/main/java/org/openedx/core/ui/theme/Theme.kt
@@ -3,27 +3,40 @@ package org.openedx.core.ui.theme
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.LocalOverscrollFactory
 import androidx.compose.foundation.isSystemInDarkTheme
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.darkColors
-import androidx.compose.material.lightColors
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.darkColorScheme
+import androidx.compose.material3.lightColorScheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.ReadOnlyComposable
+import androidx.compose.runtime.staticCompositionLocalOf
+
+internal val LocalAppColors = staticCompositionLocalOf<AppColors> {
+    error("No AppColors provided")
+}
 
 private val DarkColorPalette = AppColors(
-    material = darkColors(
+    material3 = darkColorScheme(
         primary = dark_primary,
-        primaryVariant = dark_primary_variant,
-        secondary = dark_secondary,
-        secondaryVariant = dark_secondary_variant,
-        background = dark_background,
-        surface = dark_surface,
-        error = dark_error,
         onPrimary = dark_onPrimary,
+        primaryContainer = dark_primary_variant,
+        onPrimaryContainer = dark_onPrimary,
+        secondary = dark_secondary,
         onSecondary = dark_onSecondary,
+        secondaryContainer = dark_secondary_variant,
+        onSecondaryContainer = dark_onSecondary,
+        tertiary = dark_secondary,
+        onTertiary = dark_onSecondary,
+        background = dark_background,
         onBackground = dark_onBackground,
+        surface = dark_surface,
         onSurface = dark_onSurface,
-        onError = dark_onError
+        surfaceVariant = dark_surface,
+        onSurfaceVariant = dark_onSurface,
+        error = dark_error,
+        onError = dark_onError,
+        outline = dark_text_field_border,
+        outlineVariant = dark_divider,
     ),
     textPrimary = dark_text_primary,
     textPrimaryVariant = dark_text_primary_variant,
@@ -103,19 +116,27 @@ private val DarkColorPalette = AppColors(
 )
 
 private val LightColorPalette = AppColors(
-    material = lightColors(
+    material3 = lightColorScheme(
         primary = light_primary,
-        primaryVariant = light_primary_variant,
-        secondary = light_secondary,
-        secondaryVariant = light_secondary_variant,
-        background = light_background,
-        surface = light_surface,
-        error = light_error,
         onPrimary = light_onPrimary,
+        primaryContainer = light_primary_variant,
+        onPrimaryContainer = light_onPrimary,
+        secondary = light_secondary,
         onSecondary = light_onSecondary,
+        secondaryContainer = light_secondary_variant,
+        onSecondaryContainer = light_onSecondary,
+        tertiary = light_secondary,
+        onTertiary = light_onSecondary,
+        background = light_background,
         onBackground = light_onBackground,
+        surface = light_surface,
         onSurface = light_onSurface,
-        onError = light_onError
+        surfaceVariant = light_surface,
+        onSurfaceVariant = light_onSurface,
+        error = light_error,
+        onError = light_onError,
+        outline = light_text_field_border,
+        outlineVariant = light_divider,
     ),
     textPrimary = light_text_primary,
     textPrimaryVariant = light_text_primary_variant,
@@ -197,7 +218,7 @@ private val LightColorPalette = AppColors(
 val MaterialTheme.appColors: AppColors
     @Composable
     @ReadOnlyComposable
-    get() = if (colors.isLight) LightColorPalette else DarkColorPalette
+    get() = LocalAppColors.current
 
 @OptIn(ExperimentalFoundationApi::class)
 @Composable
@@ -209,11 +230,11 @@ fun OpenEdXTheme(darkTheme: Boolean = isSystemInDarkTheme(), content: @Composabl
     }
 
     MaterialTheme(
-        colors = colors.material,
-        // typography = LocalTypography.current.material,
-        shapes = LocalShapes.current.material,
+        colorScheme = colors.material3,
+        shapes = LocalShapes.current.material3,
     ) {
         CompositionLocalProvider(
+            LocalAppColors provides colors,
             LocalOverscrollFactory provides null,
             content = content
         )
diff --git a/core/src/main/res/values/themes.xml b/core/src/main/res/values/themes.xml
index e43010475..a55cddceb 100644
--- a/core/src/main/res/values/themes.xml
+++ b/core/src/main/res/values/themes.xml
@@ -1,6 +1,6 @@
 <resources>
     <!-- Base application theme. -->
-    <style name="Theme.OpenEdX" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+    <style name="Theme.OpenEdX" parent="Theme.Material3.DayNight">
         <!-- Primary brand color. -->
         <item name="colorPrimary">@color/primary</item>
 <!--        <item name="colorPrimaryVariant">@color/primaryVariant</item>-->
diff --git a/core/src/openedx/org/openedx/core/ui/theme/LocalShapes.kt b/core/src/openedx/org/openedx/core/ui/theme/LocalShapes.kt
index f126b44e3..063a8ca1b 100644
--- a/core/src/openedx/org/openedx/core/ui/theme/LocalShapes.kt
+++ b/core/src/openedx/org/openedx/core/ui/theme/LocalShapes.kt
@@ -2,16 +2,18 @@ package org.openedx.core.ui.theme
 
 import androidx.compose.foundation.shape.CornerSize
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.Shapes
+import androidx.compose.material3.Shapes
 import androidx.compose.runtime.staticCompositionLocalOf
 import androidx.compose.ui.unit.dp
 
 internal val LocalShapes = staticCompositionLocalOf {
     AppShapes(
-        material = Shapes(
-            small = RoundedCornerShape(4.dp),
-            medium = RoundedCornerShape(8.dp),
-            large = RoundedCornerShape(0.dp)
+        material3 = Shapes(
+            extraSmall = RoundedCornerShape(4.dp),
+            small = RoundedCornerShape(8.dp),
+            medium = RoundedCornerShape(12.dp),
+            large = RoundedCornerShape(16.dp),
+            extraLarge = RoundedCornerShape(24.dp)
         ),
         buttonShape = RoundedCornerShape(8.dp),
         navigationButtonShape = RoundedCornerShape(8.dp),
diff --git a/core/src/openedx/org/openedx/core/ui/theme/compose/LogistrationLogoView.kt b/core/src/openedx/org/openedx/core/ui/theme/compose/LogistrationLogoView.kt
index a0a5b339c..539b40a53 100644
--- a/core/src/openedx/org/openedx/core/ui/theme/compose/LogistrationLogoView.kt
+++ b/core/src/openedx/org/openedx/core/ui/theme/compose/LogistrationLogoView.kt
@@ -3,7 +3,7 @@ package org.openedx.core.ui.theme.compose
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.wrapContentWidth
-import androidx.compose.material.MaterialTheme
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.ColorFilter
diff --git a/course/src/main/java/org/openedx/course/presentation/ChapterEndFragmentDialog.kt b/course/src/main/java/org/openedx/course/presentation/ChapterEndFragmentDialog.kt
index 8f574cdb8..90be45c5f 100644
--- a/course/src/main/java/org/openedx/course/presentation/ChapterEndFragmentDialog.kt
+++ b/course/src/main/java/org/openedx/course/presentation/ChapterEndFragmentDialog.kt
@@ -18,15 +18,16 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
-import androidx.compose.material.Card
-import androidx.compose.material.Icon
-import androidx.compose.material.IconButton
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Text
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowForward
 import androidx.compose.material.icons.filled.ArrowDownward
 import androidx.compose.material.icons.filled.Close
+import androidx.compose.material3.Card
+import androidx.compose.material3.CardDefaults
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -163,7 +164,9 @@ private fun ChapterEndDialogScreen(
         modifier = Modifier
             .fillMaxWidth(fraction = 0.95f)
             .clip(MaterialTheme.appShapes.courseImageShape),
-        backgroundColor = MaterialTheme.appColors.background,
+        colors = CardDefaults.cardColors(
+            containerColor = MaterialTheme.appColors.background
+        ),
         shape = MaterialTheme.appShapes.courseImageShape
     ) {
         Column(
@@ -262,7 +265,9 @@ private fun ChapterEndDialogScreenLandscape(
         modifier = Modifier
             .fillMaxWidth()
             .clip(MaterialTheme.appShapes.courseImageShape),
-        backgroundColor = MaterialTheme.appColors.background,
+        colors = CardDefaults.cardColors(
+            containerColor = MaterialTheme.appColors.background
+        ),
         shape = MaterialTheme.appShapes.courseImageShape
     ) {
         Column(
diff --git a/course/src/main/java/org/openedx/course/presentation/assignments/CourseContentAssignmentScreen.kt b/course/src/main/java/org/openedx/course/presentation/assignments/CourseContentAssignmentScreen.kt
index 12c500f8f..636853d43 100644
--- a/course/src/main/java/org/openedx/course/presentation/assignments/CourseContentAssignmentScreen.kt
+++ b/course/src/main/java/org/openedx/course/presentation/assignments/CourseContentAssignmentScreen.kt
@@ -23,16 +23,17 @@ import androidx.compose.foundation.lazy.LazyRow
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.Card
-import androidx.compose.material.CircularProgressIndicator
-import androidx.compose.material.Divider
-import androidx.compose.material.Icon
-import androidx.compose.material.LinearProgressIndicator
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Surface
-import androidx.compose.material.Text
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowForward
+import androidx.compose.material3.Card
+import androidx.compose.material3.CardDefaults
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.Icon
+import androidx.compose.material3.LinearProgressIndicator
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
@@ -43,6 +44,7 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.StrokeCap
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
@@ -159,7 +161,7 @@ private fun CourseContentAssignmentScreen(
                                 description = description
                             )
                             Spacer(modifier = Modifier.padding(vertical = 6.dp))
-                            Divider(
+                            HorizontalDivider(
                                 color = MaterialTheme.appColors.divider
                             )
                             Spacer(modifier = Modifier.padding(vertical = 4.dp))
@@ -236,7 +238,7 @@ private fun AssignmentGroupSection(
                 modifier = Modifier.padding(start = 8.dp),
                 color = gradeColor.copy(alpha = 0.1f),
                 border = BorderStroke(1.dp, gradeColor),
-                shape = MaterialTheme.appShapes.material.small
+                shape = MaterialTheme.appShapes.material3.small
             ) {
                 Text(
                     modifier = Modifier.padding(4.dp),
@@ -301,7 +303,7 @@ private fun AssignmentGroupSection(
                 )
             }
         }
-        Divider(
+        HorizontalDivider(
             modifier = Modifier.padding(vertical = 12.dp),
             color = MaterialTheme.appColors.divider
         )
@@ -352,13 +354,13 @@ private fun AssignmentButton(assignment: Block, isSelected: Boolean, onClick: ()
                     .clickable {
                         onClick()
                     },
-                backgroundColor = cardBackground,
-                shape = MaterialTheme.appShapes.material.small,
+                colors = CardDefaults.cardColors(containerColor = cardBackground),
+                shape = MaterialTheme.appShapes.material3.small,
                 border = BorderStroke(
                     width = borderWidth,
                     color = cardBorderColor
                 ),
-                elevation = 0.dp,
+                elevation = CardDefaults.cardElevation(defaultElevation = 0.dp),
             ) {
                 Box(
                     modifier = Modifier
@@ -455,22 +457,25 @@ private fun AssignmentDetails(
             .clickable {
                 onAssignmentClick(assignment)
             },
-        backgroundColor = MaterialTheme.appColors.cardViewBackground,
-        shape = MaterialTheme.appShapes.material.small,
+        colors = CardDefaults.cardColors(containerColor = MaterialTheme.appColors.cardViewBackground),
+        shape = MaterialTheme.appShapes.material3.small,
         border = BorderStroke(
             width = 1.dp,
             color = color
         ),
-        elevation = 0.dp,
+        elevation = CardDefaults.cardElevation(defaultElevation = 0.dp),
     ) {
         Column {
             LinearProgressIndicator(
                 modifier = Modifier
                     .fillMaxWidth()
                     .height(PROGRESS_HEIGHT_DP.dp),
-                progress = progress,
+                progress = { progress },
                 color = MaterialTheme.appColors.progressBarColor,
-                backgroundColor = color
+                trackColor = color,
+                strokeCap = StrokeCap.Square,
+                gapSize = 0.dp,
+                drawStopIndicator = { }
             )
             Row(
                 modifier = Modifier
diff --git a/course/src/main/java/org/openedx/course/presentation/container/CollapsingLayout.kt b/course/src/main/java/org/openedx/course/presentation/container/CollapsingLayout.kt
index 1e60b1680..ca08e2ee6 100644
--- a/course/src/main/java/org/openedx/course/presentation/container/CollapsingLayout.kt
+++ b/course/src/main/java/org/openedx/course/presentation/container/CollapsingLayout.kt
@@ -22,10 +22,10 @@ import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.foundation.pager.rememberPagerState
 import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.material.Icon
-import androidx.compose.material.MaterialTheme
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.MutableState
@@ -192,8 +192,9 @@ internal fun CollapsingLayout(
                             val yEnd = change.position.y
                             val yDelta = yEnd - yStart
                             val scrollDown = yDelta > 0
-                            val collapsedOffset = -expandedTopHeight.floatValue - backgroundImageHeight.floatValue +
-                                    collapsedTopHeight.floatValue
+                            val collapsedOffset =
+                                -expandedTopHeight.floatValue - backgroundImageHeight.floatValue +
+                                        collapsedTopHeight.floatValue
                             val expandedOffset = 0f
 
                             launch {
diff --git a/course/src/main/java/org/openedx/course/presentation/container/CourseContainerFragment.kt b/course/src/main/java/org/openedx/course/presentation/container/CourseContainerFragment.kt
index 80bbe2091..ece0f29cc 100644
--- a/course/src/main/java/org/openedx/course/presentation/container/CourseContainerFragment.kt
+++ b/course/src/main/java/org/openedx/course/presentation/container/CourseContainerFragment.kt
@@ -25,25 +25,23 @@ import androidx.compose.foundation.pager.PagerState
 import androidx.compose.foundation.pager.rememberPagerState
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.Divider
-import androidx.compose.material.ExperimentalMaterialApi
-import androidx.compose.material.Icon
-import androidx.compose.material.IconButton
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Scaffold
-import androidx.compose.material.SnackbarData
-import androidx.compose.material.SnackbarDuration
-import androidx.compose.material.SnackbarHost
-import androidx.compose.material.SnackbarHostState
-import androidx.compose.material.Text
-import androidx.compose.material.TextButton
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBackIos
 import androidx.compose.material.icons.automirrored.filled.ArrowForwardIos
-import androidx.compose.material.pullrefresh.PullRefreshIndicator
-import androidx.compose.material.pullrefresh.pullRefresh
-import androidx.compose.material.pullrefresh.rememberPullRefreshState
-import androidx.compose.material.rememberScaffoldState
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.SnackbarData
+import androidx.compose.material3.SnackbarDuration
+import androidx.compose.material3.SnackbarHost
+import androidx.compose.material3.SnackbarHostState
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.material3.pulltorefresh.PullToRefreshBox
+import androidx.compose.material3.pulltorefresh.rememberPullToRefreshState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
@@ -251,7 +249,7 @@ class CourseContainerFragment : Fragment(R.layout.fragment_course_container) {
     }
 }
 
-@OptIn(ExperimentalFoundationApi::class, ExperimentalMaterialApi::class)
+@OptIn(ExperimentalFoundationApi::class, ExperimentalMaterial3Api::class)
 @Composable
 fun CourseDashboard(
     viewModel: CourseContainerViewModel,
@@ -289,21 +287,16 @@ fun CourseDashboard(
     val tabState = rememberLazyListState()
     val snackState = remember { SnackbarHostState() }
     var selectedContentTab by remember { mutableStateOf(CourseContentTab.ALL) }
-    val pullRefreshState = rememberPullRefreshState(
-        refreshing = refreshing,
-        onRefresh = { onRefresh(pagerState.currentPage) }
-    )
+    val pullToRefreshState = rememberPullToRefreshState()
 
     OpenEdXTheme {
         val windowSize = rememberWindowSize()
         val scope = rememberCoroutineScope()
-        val scaffoldState = rememberScaffoldState()
         Scaffold(
             modifier = Modifier
                 .fillMaxSize()
                 .navigationBarsPadding(),
-            scaffoldState = scaffoldState,
-            backgroundColor = MaterialTheme.appColors.background,
+            containerColor = MaterialTheme.appColors.background,
             bottomBar = {
                 val currentPage = CourseContainerTab.entries[pagerState.currentPage]
                 Box {
@@ -343,7 +336,7 @@ fun CourseDashboard(
                     )
                 }
             }
-            HandleUIMessage(uiMessage = uiMessage, scaffoldState = scaffoldState)
+            HandleUIMessage(uiMessage = uiMessage, snackbarHostState = snackState)
 
             LaunchedEffect(pagerState.currentPage) {
                 tabState.animateScrollToItem(pagerState.currentPage)
@@ -355,79 +348,80 @@ fun CourseDashboard(
                 Box(
                     modifier = Modifier.weight(1f)
                 ) {
-                    CollapsingLayout(
-                        modifier = Modifier
-                            .fillMaxWidth()
-                            .padding(paddingValues)
-                            .pullRefresh(pullRefreshState),
-                        courseImage = courseImage,
-                        imageHeight = 200,
-                        expandedTop = {
-                            ExpandedHeaderContent(
-                                courseTitle = viewModel.courseName,
-                                org = viewModel.courseDetails?.courseInfoOverview?.org ?: ""
-                            )
-                        },
-                        collapsedTop = {
-                            CollapsedHeaderContent(
-                                courseTitle = viewModel.courseName
-                            )
-                        },
-                        navigation = {
-                            if (isNavigationEnabled) {
-                                RoundTabsBar(
-                                    items = CourseContainerTab.entries,
-                                    contentPadding = PaddingValues(
-                                        horizontal = 12.dp,
-                                        vertical = 16.dp
-                                    ),
-                                    rowState = tabState,
-                                    pagerState = pagerState,
-                                    withPager = true,
-                                    onTabClicked = viewModel::courseContainerTabClickedEvent
+                    PullToRefreshBox(
+                        isRefreshing = refreshing,
+                        onRefresh = { onRefresh(pagerState.currentPage) },
+                        state = pullToRefreshState,
+                        modifier = Modifier.fillMaxSize()
+                    ) {
+                        CollapsingLayout(
+                            modifier = Modifier
+                                .fillMaxWidth()
+                                .padding(paddingValues),
+                            courseImage = courseImage,
+                            imageHeight = 200,
+                            expandedTop = {
+                                ExpandedHeaderContent(
+                                    courseTitle = viewModel.courseName,
+                                    org = viewModel.courseDetails?.courseInfoOverview?.org ?: ""
                                 )
-                            }
-                        },
-                        isEnabled = CourseAccessError.NONE == accessStatus.value,
-                        onBackClick = {
-                            fragmentManager.popBackStack()
-                        },
-                        bodyContent = {
-                            when (accessStatus.value) {
-                                CourseAccessError.AUDIT_EXPIRED_NOT_UPGRADABLE,
-                                CourseAccessError.NOT_YET_STARTED,
-                                CourseAccessError.UNKNOWN -> {
-                                    CourseAccessErrorView(
-                                        viewModel = viewModel,
-                                        accessError = accessStatus.value,
-                                        fragmentManager = fragmentManager,
-                                    )
-                                }
-
-                                CourseAccessError.NONE -> {
-                                    DashboardPager(
-                                        windowSize = windowSize,
-                                        viewModel = viewModel,
+                            },
+                            collapsedTop = {
+                                CollapsedHeaderContent(
+                                    courseTitle = viewModel.courseName
+                                )
+                            },
+                            navigation = {
+                                if (isNavigationEnabled) {
+                                    RoundTabsBar(
+                                        items = CourseContainerTab.entries,
+                                        contentPadding = PaddingValues(
+                                            horizontal = 12.dp,
+                                            vertical = 16.dp
+                                        ),
+                                        rowState = tabState,
                                         pagerState = pagerState,
-                                        contentTabPagerState = contentTabPagerState,
-                                        homePagerState = homePagerState,
-                                        isResumed = isResumed,
-                                        fragmentManager = fragmentManager,
-                                        onContentTabSelected = { tab ->
-                                            selectedContentTab = tab
-                                        }
+                                        withPager = true,
+                                        onTabClicked = viewModel::courseContainerTabClickedEvent
                                     )
                                 }
-
-                                else -> {}
+                            },
+                            isEnabled = CourseAccessError.NONE == accessStatus.value,
+                            onBackClick = {
+                                fragmentManager.popBackStack()
+                            },
+                            bodyContent = {
+                                when (accessStatus.value) {
+                                    CourseAccessError.AUDIT_EXPIRED_NOT_UPGRADABLE,
+                                    CourseAccessError.NOT_YET_STARTED,
+                                    CourseAccessError.UNKNOWN -> {
+                                        CourseAccessErrorView(
+                                            viewModel = viewModel,
+                                            accessError = accessStatus.value,
+                                            fragmentManager = fragmentManager,
+                                        )
+                                    }
+
+                                    CourseAccessError.NONE -> {
+                                        DashboardPager(
+                                            windowSize = windowSize,
+                                            viewModel = viewModel,
+                                            pagerState = pagerState,
+                                            contentTabPagerState = contentTabPagerState,
+                                            homePagerState = homePagerState,
+                                            isResumed = isResumed,
+                                            fragmentManager = fragmentManager,
+                                            onContentTabSelected = { tab ->
+                                                selectedContentTab = tab
+                                            }
+                                        )
+                                    }
+
+                                    else -> {}
+                                }
                             }
-                        }
-                    )
-                    PullRefreshIndicator(
-                        refreshing,
-                        pullRefreshState,
-                        Modifier.align(Alignment.TopCenter)
-                    )
+                        )
+                    }
 
                     SnackbarHost(
                         modifier = Modifier.align(Alignment.BottomStart),
@@ -791,7 +785,7 @@ private fun AssignmentsBottomBar(
         modifier = Modifier.background(MaterialTheme.appColors.background),
         horizontalAlignment = Alignment.CenterHorizontally
     ) {
-        Divider(modifier = Modifier.fillMaxWidth())
+        HorizontalDivider(modifier = Modifier.fillMaxWidth())
         TextButton(
             onClick = {
                 scrollToProgress(scope, pagerState)
diff --git a/course/src/main/java/org/openedx/course/presentation/container/HeaderContent.kt b/course/src/main/java/org/openedx/course/presentation/container/HeaderContent.kt
index 5b1625d49..f78337f39 100644
--- a/course/src/main/java/org/openedx/course/presentation/container/HeaderContent.kt
+++ b/course/src/main/java/org/openedx/course/presentation/container/HeaderContent.kt
@@ -3,8 +3,8 @@ package org.openedx.course.presentation.container
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Text
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.style.TextOverflow
diff --git a/course/src/main/java/org/openedx/course/presentation/container/NoAccessCourseContainerFragment.kt b/course/src/main/java/org/openedx/course/presentation/container/NoAccessCourseContainerFragment.kt
index d0bcb819c..bc998861b 100644
--- a/course/src/main/java/org/openedx/course/presentation/container/NoAccessCourseContainerFragment.kt
+++ b/course/src/main/java/org/openedx/course/presentation/container/NoAccessCourseContainerFragment.kt
@@ -14,14 +14,13 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.widthIn
-import androidx.compose.material.Icon
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Scaffold
-import androidx.compose.material.Surface
-import androidx.compose.material.Text
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Error
-import androidx.compose.material.rememberScaffoldState
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -93,12 +92,10 @@ private fun NoAccessCourseContainerScreen(
     title: String,
     onBackClick: () -> Unit
 ) {
-    val scaffoldState = rememberScaffoldState()
     Scaffold(
         modifier = Modifier
             .fillMaxSize(),
-        scaffoldState = scaffoldState,
-        backgroundColor = MaterialTheme.appColors.background
+        containerColor = MaterialTheme.appColors.background
     ) {
         val screenWidth by remember(key1 = windowSize) {
             mutableStateOf(
diff --git a/course/src/main/java/org/openedx/course/presentation/contenttab/ContentTabEmptyState.kt b/course/src/main/java/org/openedx/course/presentation/contenttab/ContentTabEmptyState.kt
index 315b817ad..6f98c0663 100644
--- a/course/src/main/java/org/openedx/course/presentation/contenttab/ContentTabEmptyState.kt
+++ b/course/src/main/java/org/openedx/course/presentation/contenttab/ContentTabEmptyState.kt
@@ -8,11 +8,11 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
-import androidx.compose.material.Icon
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Text
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
diff --git a/course/src/main/java/org/openedx/course/presentation/contenttab/ContentTabScreen.kt b/course/src/main/java/org/openedx/course/presentation/contenttab/ContentTabScreen.kt
index ad648da36..efb16dedb 100644
--- a/course/src/main/java/org/openedx/course/presentation/contenttab/ContentTabScreen.kt
+++ b/course/src/main/java/org/openedx/course/presentation/contenttab/ContentTabScreen.kt
@@ -16,10 +16,10 @@ import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.layout.widthIn
 import androidx.compose.foundation.pager.HorizontalPager
 import androidx.compose.foundation.pager.PagerState
-import androidx.compose.material.Divider
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Scaffold
-import androidx.compose.material.Text
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
+import androidx.compose.material3.VerticalDivider
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
@@ -116,7 +116,7 @@ fun ContentTabScreen(
                         contentAlignment = Alignment.Center
                     ) {
                         if (!isEdgeItem) {
-                            Divider(
+                            VerticalDivider(
                                 modifier = Modifier
                                     .fillMaxHeight()
                                     .width(1.dp)
@@ -131,10 +131,10 @@ fun ContentTabScreen(
                             } else {
                                 MaterialTheme.appColors.primary
                             },
-                            style = MaterialTheme.typography.button
+                            style = MaterialTheme.typography.labelLarge
                         )
                         if (!isEdgeItem) {
-                            Divider(
+                            VerticalDivider(
                                 modifier = Modifier
                                     .fillMaxHeight()
                                     .width(1.dp)
diff --git a/course/src/main/java/org/openedx/course/presentation/dates/CourseDatesScreen.kt b/course/src/main/java/org/openedx/course/presentation/dates/CourseDatesScreen.kt
index 80dca9c03..f909ef58e 100644
--- a/course/src/main/java/org/openedx/course/presentation/dates/CourseDatesScreen.kt
+++ b/course/src/main/java/org/openedx/course/presentation/dates/CourseDatesScreen.kt
@@ -29,15 +29,15 @@ import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.layout.widthIn
 import androidx.compose.foundation.layout.wrapContentHeight
 import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.material.Icon
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Scaffold
-import androidx.compose.material.Surface
-import androidx.compose.material.Text
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.KeyboardArrowRight
 import androidx.compose.material.icons.filled.KeyboardArrowUp
-import androidx.compose.material.rememberScaffoldState
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.SnackbarHostState
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
@@ -179,12 +179,11 @@ private fun CourseDatesUI(
     onSyncDates: () -> Unit,
     onCalendarSyncStateClick: () -> Unit,
 ) {
-    val scaffoldState = rememberScaffoldState()
+    val snackbarHostState = remember { SnackbarHostState() }
 
     Scaffold(
         modifier = Modifier.fillMaxSize(),
-        scaffoldState = scaffoldState,
-        backgroundColor = MaterialTheme.appColors.background
+        containerColor = MaterialTheme.appColors.background
     ) {
         val modifierScreenWidth by remember(key1 = windowSize) {
             mutableStateOf(
@@ -204,7 +203,7 @@ private fun CourseDatesUI(
             )
         }
 
-        HandleUIMessage(uiMessage = uiMessage, scaffoldState = scaffoldState)
+        HandleUIMessage(uiMessage = uiMessage, snackbarHostState = snackbarHostState)
 
         val isPLSBannerAvailable = (uiState as? CourseDatesUIState.CourseDates)
             ?.courseDatesResult
diff --git a/course/src/main/java/org/openedx/course/presentation/handouts/HandoutsScreen.kt b/course/src/main/java/org/openedx/course/presentation/handouts/HandoutsScreen.kt
index 435b84444..7d947ab21 100644
--- a/course/src/main/java/org/openedx/course/presentation/handouts/HandoutsScreen.kt
+++ b/course/src/main/java/org/openedx/course/presentation/handouts/HandoutsScreen.kt
@@ -14,13 +14,12 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.layout.widthIn
 import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.material.Divider
-import androidx.compose.material.Icon
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Scaffold
-import androidx.compose.material.Surface
-import androidx.compose.material.Text
-import androidx.compose.material.rememberScaffoldState
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -50,12 +49,10 @@ fun HandoutsScreen(
     onHandoutsClick: () -> Unit,
     onAnnouncementsClick: () -> Unit,
 ) {
-    val scaffoldState = rememberScaffoldState()
     Scaffold(
         modifier = Modifier
             .fillMaxSize(),
-        scaffoldState = scaffoldState,
-        backgroundColor = MaterialTheme.appColors.background
+        containerColor = MaterialTheme.appColors.background
     ) {
         val screenWidth by remember(key1 = windowSize) {
             mutableStateOf(
@@ -142,7 +139,7 @@ private fun HandoutsItem(
         }
         CardArrow(degrees = 0f)
     }
-    Divider()
+    HorizontalDivider()
 }
 
 @Preview(uiMode = Configuration.UI_MODE_NIGHT_NO)
diff --git a/course/src/main/java/org/openedx/course/presentation/handouts/HandoutsWebViewFragment.kt b/course/src/main/java/org/openedx/course/presentation/handouts/HandoutsWebViewFragment.kt
index 744af0d03..a01235bc5 100644
--- a/course/src/main/java/org/openedx/course/presentation/handouts/HandoutsWebViewFragment.kt
+++ b/course/src/main/java/org/openedx/course/presentation/handouts/HandoutsWebViewFragment.kt
@@ -10,10 +10,9 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.widthIn
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Scaffold
-import androidx.compose.material.Surface
-import androidx.compose.material.rememberScaffoldState
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Surface
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
@@ -168,7 +167,6 @@ fun HandoutsEmptyScreen(
             NoContentScreenType.COURSE_ANNOUNCEMENTS
         }
 
-    val scaffoldState = rememberScaffoldState()
     Scaffold(
         modifier = Modifier
             .fillMaxSize()
@@ -176,8 +174,7 @@ fun HandoutsEmptyScreen(
             .semantics {
                 testTagsAsResourceId = true
             },
-        scaffoldState = scaffoldState,
-        backgroundColor = MaterialTheme.appColors.background
+        containerColor = MaterialTheme.appColors.background
     ) {
         val screenWidth by remember(key1 = windowSize) {
             mutableStateOf(
diff --git a/course/src/main/java/org/openedx/course/presentation/home/AssignmentsHomePagerCardContent.kt b/course/src/main/java/org/openedx/course/presentation/home/AssignmentsHomePagerCardContent.kt
index 3c0afb1e1..70e96c0fa 100644
--- a/course/src/main/java/org/openedx/course/presentation/home/AssignmentsHomePagerCardContent.kt
+++ b/course/src/main/java/org/openedx/course/presentation/home/AssignmentsHomePagerCardContent.kt
@@ -12,20 +12,22 @@ import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.Card
-import androidx.compose.material.Icon
-import androidx.compose.material.LinearProgressIndicator
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Text
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.Assignment
 import androidx.compose.material.icons.automirrored.filled.KeyboardArrowRight
 import androidx.compose.material.icons.filled.Timer
+import androidx.compose.material3.Card
+import androidx.compose.material3.CardDefaults
+import androidx.compose.material3.Icon
+import androidx.compose.material3.LinearProgressIndicator
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.StrokeCap
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.text.font.FontWeight
@@ -117,9 +119,12 @@ fun AssignmentsHomePagerCardContent(
                 .fillMaxWidth()
                 .height(4.dp)
                 .clip(CircleShape),
-            progress = if (totalAssignments > 0) completedAssignments.toFloat() / totalAssignments else 0f,
+            progress = { if (totalAssignments > 0) completedAssignments.toFloat() / totalAssignments else 0f },
             color = MaterialTheme.appColors.progressBarColor,
-            backgroundColor = MaterialTheme.appColors.progressBarBackgroundColor
+            trackColor = MaterialTheme.appColors.progressBarBackgroundColor,
+            strokeCap = StrokeCap.Square,
+            gapSize = 0.dp,
+            drawStopIndicator = { }
         )
 
         Spacer(modifier = Modifier.height(20.dp))
@@ -202,10 +207,12 @@ private fun AssignmentCard(
         modifier = Modifier
             .fillMaxWidth()
             .clickable { onAssignmentClick(assignment) },
-        backgroundColor = background,
+        colors = CardDefaults.cardColors(
+            containerColor = background
+        ),
         border = BorderStroke(1.dp, MaterialTheme.appColors.cardViewBorder),
         shape = RoundedCornerShape(8.dp),
-        elevation = 0.dp
+        elevation = CardDefaults.cardElevation(defaultElevation = 0.dp)
     ) {
         Column(
             modifier = Modifier
diff --git a/course/src/main/java/org/openedx/course/presentation/home/CourseCompletionHomePagerCardContent.kt b/course/src/main/java/org/openedx/course/presentation/home/CourseCompletionHomePagerCardContent.kt
index bb247ee16..f5609ebd4 100644
--- a/course/src/main/java/org/openedx/course/presentation/home/CourseCompletionHomePagerCardContent.kt
+++ b/course/src/main/java/org/openedx/course/presentation/home/CourseCompletionHomePagerCardContent.kt
@@ -7,8 +7,8 @@ import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Text
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
diff --git a/course/src/main/java/org/openedx/course/presentation/home/CourseHomeScreen.kt b/course/src/main/java/org/openedx/course/presentation/home/CourseHomeScreen.kt
index 4e89ac1b4..dd78a676f 100644
--- a/course/src/main/java/org/openedx/course/presentation/home/CourseHomeScreen.kt
+++ b/course/src/main/java/org/openedx/course/presentation/home/CourseHomeScreen.kt
@@ -20,16 +20,17 @@ import androidx.compose.foundation.pager.PagerState
 import androidx.compose.foundation.pager.rememberPagerState
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.Card
-import androidx.compose.material.Icon
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Scaffold
-import androidx.compose.material.Surface
-import androidx.compose.material.Text
-import androidx.compose.material.TextButton
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.List
-import androidx.compose.material.rememberScaffoldState
+import androidx.compose.material3.Card
+import androidx.compose.material3.CardDefaults
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.SnackbarHostState
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
@@ -186,13 +187,12 @@ private fun CourseHomeUI(
     onViewAllAssignmentsClick: () -> Unit,
     onViewProgressClick: () -> Unit,
 ) {
-    val scaffoldState = rememberScaffoldState()
+    val snackbarHostState = remember { SnackbarHostState() }
 
     Scaffold(
         modifier = Modifier
             .fillMaxSize(),
-        scaffoldState = scaffoldState,
-        backgroundColor = MaterialTheme.appColors.background
+        containerColor = MaterialTheme.appColors.background
     ) {
         val screenWidth by remember(key1 = windowSize) {
             mutableStateOf(
@@ -203,7 +203,7 @@ private fun CourseHomeUI(
             )
         }
 
-        HandleUIMessage(uiMessage = uiMessage, scaffoldState = scaffoldState)
+        HandleUIMessage(uiMessage = uiMessage, snackbarHostState = snackbarHostState)
 
         Box(
             modifier = Modifier
@@ -263,13 +263,15 @@ private fun CourseHomeUI(
                             ) { tab ->
                                 Card(
                                     modifier = Modifier.fillMaxWidth(),
-                                    backgroundColor = MaterialTheme.appColors.cardViewBackground,
+                                    colors = CardDefaults.cardColors(
+                                        containerColor = MaterialTheme.appColors.cardViewBackground
+                                    ),
                                     border = BorderStroke(
                                         1.dp,
                                         MaterialTheme.appColors.cardViewBorder
                                     ),
                                     shape = MaterialTheme.appShapes.cardShape,
-                                    elevation = 0.dp,
+                                    elevation = CardDefaults.cardElevation(defaultElevation = 0.dp),
                                 ) {
                                     when (tab) {
                                         CourseHomePagerTab.COURSE_COMPLETION -> {
diff --git a/course/src/main/java/org/openedx/course/presentation/home/GradesHomePagerCardContent.kt b/course/src/main/java/org/openedx/course/presentation/home/GradesHomePagerCardContent.kt
index 962732203..41889021c 100644
--- a/course/src/main/java/org/openedx/course/presentation/home/GradesHomePagerCardContent.kt
+++ b/course/src/main/java/org/openedx/course/presentation/home/GradesHomePagerCardContent.kt
@@ -13,9 +13,10 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.material.Card
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Text
+import androidx.compose.material3.Card
+import androidx.compose.material3.CardDefaults
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -120,9 +121,11 @@ private fun GradeCard(
         modifier = modifier
             .fillMaxWidth()
             .semantics(mergeDescendants = true) {},
-        backgroundColor = color.copy(alpha = 0.1f),
-        shape = MaterialTheme.appShapes.material.small,
-        elevation = 0.dp,
+        colors = CardDefaults.cardColors(
+            containerColor = color.copy(alpha = 0.1f)
+        ),
+        shape = MaterialTheme.appShapes.material3.small,
+        elevation = CardDefaults.cardElevation(defaultElevation = 0.dp),
     ) {
         Column(
             modifier = Modifier
diff --git a/course/src/main/java/org/openedx/course/presentation/home/VideosHomePagerCardContent.kt b/course/src/main/java/org/openedx/course/presentation/home/VideosHomePagerCardContent.kt
index 50c15500c..4773df595 100644
--- a/course/src/main/java/org/openedx/course/presentation/home/VideosHomePagerCardContent.kt
+++ b/course/src/main/java/org/openedx/course/presentation/home/VideosHomePagerCardContent.kt
@@ -9,21 +9,25 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.material.Icon
-import androidx.compose.material.LinearProgressIndicator
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Text
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Videocam
+import androidx.compose.material3.Icon
+import androidx.compose.material3.LinearProgressIndicator
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.StrokeCap
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import org.openedx.core.CoreMocks
 import org.openedx.core.domain.model.Block
+import org.openedx.core.ui.theme.OpenEdXTheme
 import org.openedx.core.ui.theme.appColors
 import org.openedx.core.ui.theme.appTypography
 import org.openedx.course.R
@@ -103,9 +107,12 @@ fun VideosHomePagerCardContent(
                 .fillMaxWidth()
                 .height(4.dp)
                 .clip(CircleShape),
-            progress = if (totalVideos > 0) completedVideos.toFloat() / totalVideos else 0f,
+            progress = { if (totalVideos > 0) completedVideos.toFloat() / totalVideos else 0f },
             color = MaterialTheme.appColors.progressBarColor,
-            backgroundColor = MaterialTheme.appColors.progressBarBackgroundColor
+            trackColor = MaterialTheme.appColors.progressBarBackgroundColor,
+            strokeCap = StrokeCap.Square,
+            gapSize = 0.dp,
+            drawStopIndicator = {}
         )
 
         Spacer(modifier = Modifier.height(20.dp))
@@ -157,3 +164,55 @@ fun VideosHomePagerCardContent(
         )
     }
 }
+
+@Preview
+@Composable
+private fun VideosHomePagerCardContentPreview() {
+    OpenEdXTheme {
+        VideosHomePagerCardContent(
+            uiState = CourseHomeUIState.CourseData(
+                courseStructure = CoreMocks.mockCourseStructure,
+                courseProgress = null,
+                next = null,
+                downloadedState = mapOf(),
+                resumeComponent = null,
+                resumeUnitTitle = "",
+                courseSubSections = mapOf(),
+                subSectionsDownloadsCount = mapOf(),
+                useRelativeDates = true,
+                courseVideos = mapOf("section1" to listOf(CoreMocks.mockVideoBlock)),
+                courseAssignments = emptyList(),
+                videoPreview = null,
+                videoProgress = 0.5f
+            ),
+            onVideoClick = {},
+            onViewAllVideosClick = {}
+        )
+    }
+}
+
+@Preview
+@Composable
+private fun VideosHomePagerCardContentEmptyPreview() {
+    OpenEdXTheme {
+        VideosHomePagerCardContent(
+            uiState = CourseHomeUIState.CourseData(
+                courseStructure = CoreMocks.mockCourseStructure,
+                courseProgress = null,
+                next = null,
+                downloadedState = mapOf(),
+                resumeComponent = null,
+                resumeUnitTitle = "",
+                courseSubSections = mapOf(),
+                subSectionsDownloadsCount = mapOf(),
+                useRelativeDates = true,
+                courseVideos = emptyMap(),
+                courseAssignments = emptyList(),
+                videoPreview = null,
+                videoProgress = null
+            ),
+            onVideoClick = {},
+            onViewAllVideosClick = {}
+        )
+    }
+}
diff --git a/course/src/main/java/org/openedx/course/presentation/offline/CourseOfflineScreen.kt b/course/src/main/java/org/openedx/course/presentation/offline/CourseOfflineScreen.kt
index b913e979f..b79cacd23 100644
--- a/course/src/main/java/org/openedx/course/presentation/offline/CourseOfflineScreen.kt
+++ b/course/src/main/java/org/openedx/course/presentation/offline/CourseOfflineScreen.kt
@@ -15,13 +15,6 @@ import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.layout.widthIn
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.material.Divider
-import androidx.compose.material.Icon
-import androidx.compose.material.LinearProgressIndicator
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Scaffold
-import androidx.compose.material.Surface
-import androidx.compose.material.Text
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.outlined.InsertDriveFile
 import androidx.compose.material.icons.filled.CloudDone
@@ -29,7 +22,13 @@ import androidx.compose.material.icons.outlined.CloudDownload
 import androidx.compose.material.icons.outlined.SmartDisplay
 import androidx.compose.material.icons.rounded.Close
 import androidx.compose.material.icons.rounded.Delete
-import androidx.compose.material.rememberScaffoldState
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.Icon
+import androidx.compose.material3.LinearProgressIndicator
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
@@ -105,12 +104,9 @@ private fun CourseOfflineUI(
     onDeleteClick: (downloadModel: DownloadModel) -> Unit,
     onDeleteAllClick: () -> Unit
 ) {
-    val scaffoldState = rememberScaffoldState()
-
     Scaffold(
         modifier = Modifier.fillMaxSize(),
-        scaffoldState = scaffoldState,
-        backgroundColor = MaterialTheme.appColors.background
+        containerColor = MaterialTheme.appColors.background
     ) {
         val modifierScreenWidth by remember(key1 = windowSize) {
             mutableStateOf(
@@ -351,7 +347,7 @@ private fun DownloadItem(
             )
         }
         Spacer(modifier = Modifier.height(12.dp))
-        Divider()
+        HorizontalDivider()
         Spacer(modifier = Modifier.height(12.dp))
     }
 }
@@ -418,10 +414,12 @@ private fun DownloadProgress(
                     .fillMaxWidth()
                     .height(6.dp)
                     .clip(CircleShape),
-                progress = uiState.progressBarValue,
-                strokeCap = StrokeCap.Round,
+                progress = { uiState.progressBarValue },
                 color = MaterialTheme.appColors.successGreen,
-                backgroundColor = MaterialTheme.appColors.progressBarBackgroundColor
+                trackColor = MaterialTheme.appColors.progressBarBackgroundColor,
+                strokeCap = StrokeCap.Square,
+                gapSize = 0.dp,
+                drawStopIndicator = { }
             )
         } else {
             Text(
diff --git a/course/src/main/java/org/openedx/course/presentation/outline/CourseContentAllScreen.kt b/course/src/main/java/org/openedx/course/presentation/outline/CourseContentAllScreen.kt
index ea86e5060..cc10e50b5 100644
--- a/course/src/main/java/org/openedx/course/presentation/outline/CourseContentAllScreen.kt
+++ b/course/src/main/java/org/openedx/course/presentation/outline/CourseContentAllScreen.kt
@@ -13,10 +13,10 @@ import androidx.compose.foundation.layout.widthIn
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Scaffold
-import androidx.compose.material.Surface
-import androidx.compose.material.rememberScaffoldState
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.SnackbarHostState
+import androidx.compose.material3.Surface
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
@@ -148,13 +148,12 @@ private fun CourseContentAllUI(
     onDownloadClick: (blockIds: List<String>) -> Unit,
     onCertificateClick: (String) -> Unit,
 ) {
-    val scaffoldState = rememberScaffoldState()
+    val snackbarHostState = remember { SnackbarHostState() }
 
     Scaffold(
         modifier = Modifier
             .fillMaxSize(),
-        scaffoldState = scaffoldState,
-        backgroundColor = MaterialTheme.appColors.background
+        containerColor = MaterialTheme.appColors.background
     ) {
         val screenWidth by remember(key1 = windowSize) {
             mutableStateOf(
@@ -183,7 +182,7 @@ private fun CourseContentAllUI(
             )
         }
 
-        HandleUIMessage(uiMessage = uiMessage, scaffoldState = scaffoldState)
+        HandleUIMessage(uiMessage = uiMessage, snackbarHostState = snackbarHostState)
 
         Box(
             modifier = Modifier
diff --git a/course/src/main/java/org/openedx/course/presentation/progress/CourseProgressScreen.kt b/course/src/main/java/org/openedx/course/presentation/progress/CourseProgressScreen.kt
index 2c3f8ca76..1a32024ea 100644
--- a/course/src/main/java/org/openedx/course/presentation/progress/CourseProgressScreen.kt
+++ b/course/src/main/java/org/openedx/course/presentation/progress/CourseProgressScreen.kt
@@ -23,16 +23,16 @@ import androidx.compose.foundation.layout.widthIn
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.material.CircularProgressIndicator
-import androidx.compose.material.Divider
-import androidx.compose.material.Icon
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Scaffold
-import androidx.compose.material.Surface
-import androidx.compose.material.Text
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.outlined.InsertDriveFile
-import androidx.compose.material.rememberScaffoldState
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.SnackbarHostState
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
@@ -98,14 +98,13 @@ private fun CourseProgressContent(
     uiMessage: UIMessage?,
     windowSize: WindowSize
 ) {
-    val scaffoldState = rememberScaffoldState()
+    val snackbarHostState = remember { SnackbarHostState() }
     val gradingPolicy = uiState.progress.gradingPolicy
 
     Scaffold(
         modifier = Modifier
             .fillMaxSize(),
-        scaffoldState = scaffoldState,
-        backgroundColor = MaterialTheme.appColors.background
+        containerColor = MaterialTheme.appColors.background
     ) {
         val screenWidth by remember(key1 = windowSize) {
             mutableStateOf(
@@ -160,7 +159,7 @@ private fun CourseProgressContent(
                                     MaterialTheme.appColors.primary
                                 }
                             )
-                            Divider(
+                            HorizontalDivider(
                                 modifier = Modifier
                                     .fillMaxWidth()
                                     .padding(top = 8.dp)
@@ -186,7 +185,7 @@ private fun CourseProgressContent(
                 }
             }
 
-            HandleUIMessage(uiMessage = uiMessage, scaffoldState = scaffoldState)
+            HandleUIMessage(uiMessage = uiMessage, snackbarHostState = snackbarHostState)
         }
     }
 }
@@ -449,9 +448,9 @@ fun CourseCompletionCircularProgress(
                     shape = CircleShape
                 )
                 .padding(3.dp),
-            progress = progress,
+            progress = { progress },
             color = MaterialTheme.appColors.primary,
-            backgroundColor = MaterialTheme.appColors.progressBarBackgroundColor,
+            trackColor = MaterialTheme.appColors.progressBarBackgroundColor,
             strokeWidth = 10.dp,
             strokeCap = StrokeCap.Round
         )
diff --git a/course/src/main/java/org/openedx/course/presentation/section/CourseSectionFragment.kt b/course/src/main/java/org/openedx/course/presentation/section/CourseSectionFragment.kt
index f5c7daec4..8e06ee10c 100644
--- a/course/src/main/java/org/openedx/course/presentation/section/CourseSectionFragment.kt
+++ b/course/src/main/java/org/openedx/course/presentation/section/CourseSectionFragment.kt
@@ -21,14 +21,14 @@ import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.layout.widthIn
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
-import androidx.compose.material.CircularProgressIndicator
-import androidx.compose.material.Divider
-import androidx.compose.material.Icon
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Scaffold
-import androidx.compose.material.Surface
-import androidx.compose.material.Text
-import androidx.compose.material.rememberScaffoldState
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.SnackbarHostState
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
@@ -175,7 +175,7 @@ private fun CourseSectionScreen(
     onBackClick: () -> Unit,
     onItemClick: (Block) -> Unit,
 ) {
-    val scaffoldState = rememberScaffoldState()
+    val snackbarHostState = remember { SnackbarHostState() }
     val title = when (uiState) {
         is CourseSectionUIState.Blocks -> uiState.sectionName
         else -> ""
@@ -185,8 +185,7 @@ private fun CourseSectionScreen(
         modifier = Modifier
             .fillMaxSize()
             .navigationBarsPadding(),
-        scaffoldState = scaffoldState,
-        backgroundColor = MaterialTheme.appColors.background
+        containerColor = MaterialTheme.appColors.background
     ) { paddingValues ->
 
         val contentWidth by remember(key1 = windowSize) {
@@ -207,7 +206,7 @@ private fun CourseSectionScreen(
             )
         }
 
-        HandleUIMessage(uiMessage = uiMessage, scaffoldState = scaffoldState)
+        HandleUIMessage(uiMessage = uiMessage, snackbarHostState = snackbarHostState)
 
         Box(
             modifier = Modifier
@@ -266,7 +265,7 @@ private fun CourseSectionScreen(
                                                 onItemClick(it)
                                             },
                                         )
-                                        Divider()
+                                        HorizontalDivider()
                                     }
                                 }
                             }
diff --git a/course/src/main/java/org/openedx/course/presentation/ui/CourseUI.kt b/course/src/main/java/org/openedx/course/presentation/ui/CourseUI.kt
index 68e6c887a..5375d0019 100644
--- a/course/src/main/java/org/openedx/course/presentation/ui/CourseUI.kt
+++ b/course/src/main/java/org/openedx/course/presentation/ui/CourseUI.kt
@@ -36,20 +36,6 @@ import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.material.Button
-import androidx.compose.material.ButtonDefaults
-import androidx.compose.material.Card
-import androidx.compose.material.CircularProgressIndicator
-import androidx.compose.material.Divider
-import androidx.compose.material.Icon
-import androidx.compose.material.IconButton
-import androidx.compose.material.LinearProgressIndicator
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.OutlinedButton
-import androidx.compose.material.Scaffold
-import androidx.compose.material.Snackbar
-import androidx.compose.material.Surface
-import androidx.compose.material.Text
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material.icons.automirrored.filled.ArrowForward
@@ -57,7 +43,20 @@ import androidx.compose.material.icons.automirrored.filled.KeyboardArrowRight
 import androidx.compose.material.icons.filled.Close
 import androidx.compose.material.icons.filled.CloudDone
 import androidx.compose.material.icons.outlined.CloudDownload
-import androidx.compose.material.rememberScaffoldState
+import androidx.compose.material3.Button
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.Card
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.LinearProgressIndicator
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedButton
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Snackbar
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
@@ -73,6 +72,7 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.draw.rotate
 import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.StrokeCap
 import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalConfiguration
@@ -206,7 +206,7 @@ fun CourseSectionCard(
                         ) {
                             CircularProgressIndicator(
                                 modifier = Modifier.size(34.dp),
-                                backgroundColor = Color.LightGray,
+                                trackColor = Color.LightGray,
                                 strokeWidth = 2.dp,
                                 color = MaterialTheme.appColors.primary
                             )
@@ -273,7 +273,10 @@ fun OfflineQueueCard(
                 modifier = Modifier
                     .fillMaxWidth()
                     .padding(top = 8.dp),
-                progress = progress
+                progress = { progress },
+                strokeCap = StrokeCap.Square,
+                gapSize = 0.dp,
+                drawStopIndicator = { }
             )
         }
         Spacer(modifier = Modifier.width(16.dp))
@@ -284,7 +287,7 @@ fun OfflineQueueCard(
         ) {
             CircularProgressIndicator(
                 modifier = Modifier.size(28.dp),
-                backgroundColor = Color.LightGray,
+                trackColor = Color.LightGray,
                 strokeWidth = 2.dp,
                 color = MaterialTheme.appColors.primary
             )
@@ -373,10 +376,9 @@ fun NavigationUnitsButtons(
                 modifier = Modifier
                     .height(42.dp),
                 colors = ButtonDefaults.outlinedButtonColors(
-                    backgroundColor = MaterialTheme.appColors.background
+                    containerColor = MaterialTheme.appColors.background
                 ),
                 border = BorderStroke(1.dp, MaterialTheme.appColors.textAccent),
-                elevation = null,
                 shape = MaterialTheme.appShapes.navigationButtonShape,
                 onClick = onPrevClick,
             ) {
@@ -414,9 +416,8 @@ fun NavigationUnitsButtons(
                 modifier = Modifier
                     .height(42.dp),
                 colors = ButtonDefaults.buttonColors(
-                    backgroundColor = MaterialTheme.appColors.primaryButtonBackground
+                    containerColor = MaterialTheme.appColors.primaryButtonBackground
                 ),
-                elevation = null,
                 shape = MaterialTheme.appShapes.navigationButtonShape,
                 onClick = onNextClick
             ) {
@@ -566,9 +567,8 @@ fun VideoSubtitles(
                 listState.animateScrollToItem(currentIndex - 1)
             }
         }
-        val scaffoldState = rememberScaffoldState()
         val subtitles = timedTextObject.captions.values.toList()
-        Scaffold(scaffoldState = scaffoldState) {
+        Scaffold {
             Column(
                 modifier = Modifier
                     .padding(it)
@@ -704,7 +704,7 @@ fun CourseVideoSection(
                 )
             }
         }
-        Divider(modifier = Modifier.fillMaxWidth())
+        HorizontalDivider(modifier = Modifier.fillMaxWidth())
     }
 }
 
@@ -798,13 +798,16 @@ fun CourseVideoItem(
                         modifier = progressModifier
                             .fillMaxWidth()
                             .clip(CircleShape),
-                        progress = progress,
+                        progress = { progress },
                         color = if (videoBlock.isCompleted() && progress > 0.95f) {
                             MaterialTheme.appColors.progressBarColor
                         } else {
                             MaterialTheme.appColors.info
                         },
-                        backgroundColor = MaterialTheme.appColors.progressBarBackgroundColor
+                        trackColor = MaterialTheme.appColors.progressBarBackgroundColor,
+                        strokeCap = StrokeCap.Square,
+                        gapSize = 0.dp,
+                        drawStopIndicator = {},
                     )
                 }
                 if (videoBlock.isCompleted()) {
@@ -912,7 +915,7 @@ fun DownloadIcon(
                 if (downloadedState == DownloadedState.DOWNLOADING) {
                     CircularProgressIndicator(
                         modifier = Modifier.size(28.dp),
-                        backgroundColor = Color.LightGray,
+                        trackColor = Color.LightGray,
                         strokeWidth = 2.dp,
                         color = MaterialTheme.appColors.primary
                     )
@@ -995,9 +998,12 @@ fun CourseSection(
             modifier = Modifier
                 .fillMaxWidth()
                 .height(6.dp),
-            progress = progress,
+            progress = { progress },
             color = MaterialTheme.appColors.progressBarColor,
-            backgroundColor = MaterialTheme.appColors.progressBarBackgroundColor
+            trackColor = MaterialTheme.appColors.progressBarBackgroundColor,
+            strokeCap = StrokeCap.Square,
+            gapSize = 0.dp,
+            drawStopIndicator = { }
         )
         CourseExpandableChapterCard(
             block = section,
@@ -1245,7 +1251,7 @@ fun SubSectionUnitsList(
             .fillMaxWidth()
             .wrapContentHeight(align = Alignment.Top)
             .displayCutoutForLandscape(),
-        border = BorderStroke(1.dp, MaterialTheme.colors.onSurface.copy(alpha = 0.12f))
+        border = BorderStroke(1.dp, MaterialTheme.colorScheme.onSurface.copy(alpha = 0.12f))
     ) {
         LazyColumn(Modifier.fillMaxWidth()) {
             itemsIndexed(unitBlocks) { index, unit ->
@@ -1321,7 +1327,7 @@ fun SubSectionUnitsList(
                             )
                         }
                     }
-                    Divider()
+                    HorizontalDivider()
                 }
             }
         }
@@ -1337,12 +1343,12 @@ fun CourseDatesBanner(
     val cardModifier = modifier
         .background(
             MaterialTheme.appColors.cardViewBackground,
-            MaterialTheme.appShapes.material.medium
+            MaterialTheme.appShapes.material3.medium
         )
         .border(
             1.dp,
             MaterialTheme.appColors.cardViewBorder,
-            MaterialTheme.appShapes.material.medium
+            MaterialTheme.appShapes.material3.medium
         )
         .padding(16.dp)
 
@@ -1383,12 +1389,12 @@ fun CourseDatesBannerTablet(
     val cardModifier = modifier
         .background(
             MaterialTheme.appColors.cardViewBackground,
-            MaterialTheme.appShapes.material.medium
+            MaterialTheme.appShapes.material3.medium
         )
         .border(
             1.dp,
             MaterialTheme.appColors.cardViewBorder,
-            MaterialTheme.appShapes.material.medium
+            MaterialTheme.appShapes.material3.medium
         )
         .padding(16.dp)
 
@@ -1437,7 +1443,7 @@ fun DatesShiftedSnackBar(
 ) {
     Snackbar(
         modifier = Modifier.padding(16.dp),
-        backgroundColor = MaterialTheme.appColors.background
+        containerColor = MaterialTheme.appColors.background
     ) {
         Column(modifier = Modifier.padding(4.dp)) {
             Box {
@@ -1519,7 +1525,7 @@ fun CourseMessage(
                 }
             }
         }
-        Divider(
+        HorizontalDivider(
             color = MaterialTheme.appColors.divider
         )
     }
@@ -1554,9 +1560,12 @@ fun CourseProgress(
                 .fillMaxWidth()
                 .height(4.dp)
                 .clip(CircleShape),
-            progress = progress.value,
+            progress = { progress.value },
             color = MaterialTheme.appColors.progressBarColor,
-            backgroundColor = MaterialTheme.appColors.progressBarBackgroundColor
+            trackColor = MaterialTheme.appColors.progressBarBackgroundColor,
+            strokeCap = StrokeCap.Square,
+            gapSize = 0.dp,
+            drawStopIndicator = { }
         )
         Row(
             modifier = Modifier
diff --git a/course/src/main/java/org/openedx/course/presentation/unit/NotAvailableUnitFragment.kt b/course/src/main/java/org/openedx/course/presentation/unit/NotAvailableUnitFragment.kt
index 9e4dbde3e..f1ab20cee 100644
--- a/course/src/main/java/org/openedx/course/presentation/unit/NotAvailableUnitFragment.kt
+++ b/course/src/main/java/org/openedx/course/presentation/unit/NotAvailableUnitFragment.kt
@@ -15,13 +15,12 @@ import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.Button
-import androidx.compose.material.ButtonDefaults
-import androidx.compose.material.Icon
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Scaffold
-import androidx.compose.material.Text
-import androidx.compose.material.rememberScaffoldState
+import androidx.compose.material3.Button
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -133,11 +132,9 @@ private fun NotAvailableUnitScreen(
     description: String,
     buttonAction: (() -> Unit)? = null,
 ) {
-    val scaffoldState = rememberScaffoldState()
     val scrollState = rememberScrollState()
     Scaffold(
-        modifier = Modifier.fillMaxSize(),
-        scaffoldState = scaffoldState
+        modifier = Modifier.fillMaxSize()
     ) {
         val contentWidth by remember(key1 = windowSize) {
             mutableStateOf(
@@ -192,7 +189,7 @@ private fun NotAvailableUnitScreen(
                             .height(42.dp),
                         shape = MaterialTheme.appShapes.buttonShape,
                         colors = ButtonDefaults.buttonColors(
-                            backgroundColor = MaterialTheme.appColors.primaryButtonBackground
+                            containerColor = MaterialTheme.appColors.primaryButtonBackground
                         ),
                         onClick = buttonAction
                     ) {
diff --git a/course/src/main/java/org/openedx/course/presentation/unit/container/CourseUnitContainerFragment.kt b/course/src/main/java/org/openedx/course/presentation/unit/container/CourseUnitContainerFragment.kt
index b7131b993..a45d9013b 100644
--- a/course/src/main/java/org/openedx/course/presentation/unit/container/CourseUnitContainerFragment.kt
+++ b/course/src/main/java/org/openedx/course/presentation/unit/container/CourseUnitContainerFragment.kt
@@ -17,9 +17,9 @@ import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.lazy.LazyRow
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.lazy.rememberLazyListState
-import androidx.compose.material.Divider
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Text
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
@@ -345,7 +345,7 @@ class CourseUnitContainerFragment : Fragment(R.layout.fragment_course_unit_conta
                         }
                     )
                     Spacer(modifier = Modifier.height(8.dp))
-                    Divider()
+                    HorizontalDivider()
                     if (viewModel.mode == CourseViewMode.VIDEOS) {
                         Spacer(modifier = Modifier.height(16.dp))
                         HierarchyPathText()
diff --git a/course/src/main/java/org/openedx/course/presentation/unit/html/HtmlUnitFragment.kt b/course/src/main/java/org/openedx/course/presentation/unit/html/HtmlUnitFragment.kt
index bb16f7ed6..7bddf166d 100644
--- a/course/src/main/java/org/openedx/course/presentation/unit/html/HtmlUnitFragment.kt
+++ b/course/src/main/java/org/openedx/course/presentation/unit/html/HtmlUnitFragment.kt
@@ -30,9 +30,9 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.widthIn
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.CircularProgressIndicator
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Surface
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
@@ -267,7 +267,7 @@ fun HtmlUnitView(
         Surface(
             modifier = Modifier
                 .clip(RoundedCornerShape(topStart = 24.dp, topEnd = 24.dp)),
-            color = MaterialTheme.colors.background
+            color = MaterialTheme.appColors.background
         ) {
             Box(
                 modifier = Modifier
diff --git a/course/src/main/java/org/openedx/course/presentation/videos/CourseContentVideoScreen.kt b/course/src/main/java/org/openedx/course/presentation/videos/CourseContentVideoScreen.kt
index 7da1bb59b..d9375b524 100644
--- a/course/src/main/java/org/openedx/course/presentation/videos/CourseContentVideoScreen.kt
+++ b/course/src/main/java/org/openedx/course/presentation/videos/CourseContentVideoScreen.kt
@@ -11,11 +11,11 @@ import androidx.compose.foundation.layout.widthIn
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.Divider
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Scaffold
-import androidx.compose.material.Surface
-import androidx.compose.material.rememberScaffoldState
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.SnackbarHostState
+import androidx.compose.material3.Surface
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
@@ -93,12 +93,11 @@ private fun CourseVideosUI(
     onDownloadClick: (blocksIds: List<String>) -> Unit,
     onCompletedSectionVisibilityChange: () -> Unit,
 ) {
-    val scaffoldState = rememberScaffoldState()
+    val snackbarHostState = remember { SnackbarHostState() }
 
     Scaffold(
         modifier = Modifier.fillMaxSize(),
-        scaffoldState = scaffoldState,
-        backgroundColor = MaterialTheme.appColors.background
+        containerColor = MaterialTheme.appColors.background
     ) {
         val screenWidth by remember(key1 = windowSize) {
             mutableStateOf(
@@ -118,7 +117,7 @@ private fun CourseVideosUI(
             )
         }
 
-        HandleUIMessage(uiMessage = uiMessage, scaffoldState = scaffoldState)
+        HandleUIMessage(uiMessage = uiMessage, snackbarHostState = snackbarHostState)
 
         Box(
             modifier = Modifier
@@ -183,7 +182,7 @@ private fun CourseVideosUI(
                                         )
                                     }
                                     item {
-                                        Divider(modifier = Modifier.fillMaxWidth())
+                                        HorizontalDivider(modifier = Modifier.fillMaxWidth())
                                     }
 
                                     uiState.courseStructure.blockData
diff --git a/course/src/main/java/org/openedx/course/settings/download/DownloadQueueFragment.kt b/course/src/main/java/org/openedx/course/settings/download/DownloadQueueFragment.kt
index d2ab1b354..08b6d6072 100644
--- a/course/src/main/java/org/openedx/course/settings/download/DownloadQueueFragment.kt
+++ b/course/src/main/java/org/openedx/course/settings/download/DownloadQueueFragment.kt
@@ -15,13 +15,12 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.widthIn
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
-import androidx.compose.material.CircularProgressIndicator
-import androidx.compose.material.Divider
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Scaffold
-import androidx.compose.material.Surface
-import androidx.compose.material.Text
-import androidx.compose.material.rememberScaffoldState
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -114,14 +113,11 @@ private fun DownloadQueueScreen(
     onBackClick: () -> Unit,
     onDownloadClick: (DownloadModel) -> Unit
 ) {
-    val scaffoldState = rememberScaffoldState()
-
     Scaffold(
         modifier = Modifier
             .fillMaxSize()
             .navigationBarsPadding(),
-        scaffoldState = scaffoldState,
-        backgroundColor = MaterialTheme.appColors.background
+        containerColor = MaterialTheme.appColors.background
     ) { paddingValues ->
 
         val contentWidth by remember(key1 = windowSize) {
@@ -201,7 +197,7 @@ private fun DownloadQueueScreen(
                                             progressSize = progressSize,
                                             onDownloadClick = onDownloadClick
                                         )
-                                        Divider()
+                                        HorizontalDivider()
                                     }
                                 }
                             }
diff --git a/dashboard/src/main/java/org/openedx/DashboardUI.kt b/dashboard/src/main/java/org/openedx/DashboardUI.kt
index 9e8d35305..d23f166a9 100644
--- a/dashboard/src/main/java/org/openedx/DashboardUI.kt
+++ b/dashboard/src/main/java/org/openedx/DashboardUI.kt
@@ -6,10 +6,10 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.material.Icon
-import androidx.compose.material.MaterialTheme
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Lock
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
diff --git a/dashboard/src/main/java/org/openedx/courses/presentation/AllEnrolledCoursesView.kt b/dashboard/src/main/java/org/openedx/courses/presentation/AllEnrolledCoursesView.kt
index 7fd50fa79..38d4506c3 100644
--- a/dashboard/src/main/java/org/openedx/courses/presentation/AllEnrolledCoursesView.kt
+++ b/dashboard/src/main/java/org/openedx/courses/presentation/AllEnrolledCoursesView.kt
@@ -25,22 +25,22 @@ import androidx.compose.foundation.lazy.grid.items
 import androidx.compose.foundation.lazy.grid.rememberLazyGridState
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.foundation.pager.rememberPagerState
-import androidx.compose.material.Card
-import androidx.compose.material.CircularProgressIndicator
-import androidx.compose.material.ExperimentalMaterialApi
-import androidx.compose.material.Icon
-import androidx.compose.material.IconButton
-import androidx.compose.material.LinearProgressIndicator
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Scaffold
-import androidx.compose.material.Surface
-import androidx.compose.material.Text
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Search
-import androidx.compose.material.pullrefresh.PullRefreshIndicator
-import androidx.compose.material.pullrefresh.pullRefresh
-import androidx.compose.material.pullrefresh.rememberPullRefreshState
-import androidx.compose.material.rememberScaffoldState
+import androidx.compose.material3.Card
+import androidx.compose.material3.CardDefaults
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.LinearProgressIndicator
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.SnackbarHostState
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.material3.pulltorefresh.PullToRefreshBox
+import androidx.compose.material3.pulltorefresh.rememberPullToRefreshState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
@@ -52,6 +52,7 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.StrokeCap
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalLayoutDirection
@@ -150,7 +151,7 @@ fun AllEnrolledCoursesView(
 }
 
 @Suppress("MaximumLineLength")
-@OptIn(ExperimentalMaterialApi::class, ExperimentalComposeUiApi::class)
+@OptIn(ExperimentalMaterial3Api::class, ExperimentalComposeUiApi::class)
 @Composable
 private fun AllEnrolledCoursesView(
     apiHostUrl: String,
@@ -161,13 +162,10 @@ private fun AllEnrolledCoursesView(
 ) {
     val windowSize = rememberWindowSize()
     val layoutDirection = LocalLayoutDirection.current
-    val scaffoldState = rememberScaffoldState()
+    val snackbarHostState = remember { SnackbarHostState() }
     val scrollState = rememberLazyGridState()
     val columns = if (windowSize.isTablet) TABLET_GRID_COLUMNS else MOBILE_GRID_COLUMNS
-    val pullRefreshState = rememberPullRefreshState(
-        refreshing = state.refreshing,
-        onRefresh = { onAction(AllEnrolledCoursesAction.SwipeRefresh) }
-    )
+    val pullToRefreshState = rememberPullToRefreshState()
     val tabPagerState = rememberPagerState(pageCount = {
         CourseStatusFilter.entries.size
     })
@@ -179,14 +177,13 @@ private fun AllEnrolledCoursesView(
     }
 
     Scaffold(
-        scaffoldState = scaffoldState,
         modifier = Modifier
             .fillMaxSize()
             .navigationBarsPadding()
             .semantics {
                 testTagsAsResourceId = true
             },
-        backgroundColor = MaterialTheme.appColors.background
+        containerColor = MaterialTheme.appColors.background
     ) { paddingValues ->
         val contentPaddings by remember(key1 = windowSize) {
             mutableStateOf(
@@ -230,7 +227,7 @@ private fun AllEnrolledCoursesView(
             )
         }
 
-        HandleUIMessage(uiMessage = uiMessage, scaffoldState = scaffoldState)
+        HandleUIMessage(uiMessage = uiMessage, snackbarHostState = snackbarHostState)
         Box(
             modifier = Modifier
                 .fillMaxSize()
@@ -255,10 +252,11 @@ private fun AllEnrolledCoursesView(
                     color = MaterialTheme.appColors.background,
                     shape = MaterialTheme.appShapes.screenBackgroundShape
                 ) {
-                    Box(
-                        modifier = Modifier
-                            .fillMaxWidth()
-                            .pullRefresh(pullRefreshState),
+                    PullToRefreshBox(
+                        isRefreshing = state.refreshing,
+                        onRefresh = { onAction(AllEnrolledCoursesAction.SwipeRefresh) },
+                        state = pullToRefreshState,
+                        modifier = Modifier.fillMaxWidth(),
                     ) {
                         Column(
                             modifier = Modifier
@@ -370,11 +368,6 @@ private fun AllEnrolledCoursesView(
                                 }
                             }
                         }
-                        PullRefreshIndicator(
-                            state.refreshing,
-                            pullRefreshState,
-                            Modifier.align(Alignment.TopCenter)
-                        )
 
                         if (!isInternetConnectionShown && !hasInternetConnection) {
                             OfflineModeDialog(
@@ -411,9 +404,9 @@ fun CourseItem(
             .clickable {
                 onClick(course)
             },
-        backgroundColor = MaterialTheme.appColors.background,
+        colors = CardDefaults.cardColors(containerColor = MaterialTheme.appColors.background),
         shape = MaterialTheme.appShapes.courseImageShape,
-        elevation = 4.dp
+        elevation = CardDefaults.cardElevation(defaultElevation = 4.dp)
     ) {
         Box {
             Column {
@@ -433,9 +426,12 @@ fun CourseItem(
                     modifier = Modifier
                         .fillMaxWidth()
                         .height(8.dp),
-                    progress = course.progress.value,
+                    progress = { course.progress.value },
                     color = MaterialTheme.appColors.primary,
-                    backgroundColor = MaterialTheme.appColors.divider
+                    trackColor = MaterialTheme.appColors.divider,
+                    strokeCap = StrokeCap.Square,
+                    gapSize = 0.dp,
+                    drawStopIndicator = { }
                 )
 
                 Text(
diff --git a/dashboard/src/main/java/org/openedx/courses/presentation/DashboardGalleryView.kt b/dashboard/src/main/java/org/openedx/courses/presentation/DashboardGalleryView.kt
index 78019e8fa..3a807c837 100644
--- a/dashboard/src/main/java/org/openedx/courses/presentation/DashboardGalleryView.kt
+++ b/dashboard/src/main/java/org/openedx/courses/presentation/DashboardGalleryView.kt
@@ -24,24 +24,24 @@ import androidx.compose.foundation.lazy.grid.LazyHorizontalGrid
 import androidx.compose.foundation.lazy.grid.items
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.Card
-import androidx.compose.material.CircularProgressIndicator
-import androidx.compose.material.Divider
-import androidx.compose.material.ExperimentalMaterialApi
-import androidx.compose.material.Icon
-import androidx.compose.material.LinearProgressIndicator
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Scaffold
-import androidx.compose.material.Surface
-import androidx.compose.material.Text
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.KeyboardArrowRight
 import androidx.compose.material.icons.filled.School
 import androidx.compose.material.icons.filled.Warning
-import androidx.compose.material.pullrefresh.PullRefreshIndicator
-import androidx.compose.material.pullrefresh.pullRefresh
-import androidx.compose.material.pullrefresh.rememberPullRefreshState
-import androidx.compose.material.rememberScaffoldState
+import androidx.compose.material3.Card
+import androidx.compose.material3.CardDefaults
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.Icon
+import androidx.compose.material3.LinearProgressIndicator
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.SnackbarHostState
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.material3.pulltorefresh.PullToRefreshBox
+import androidx.compose.material3.pulltorefresh.rememberPullToRefreshState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
@@ -52,6 +52,7 @@ import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.StrokeCap
 import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.graphics.vector.rememberVectorPainter
 import androidx.compose.ui.layout.ContentScale
@@ -166,7 +167,7 @@ fun DashboardGalleryView(
     )
 }
 
-@OptIn(ExperimentalMaterialApi::class)
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 private fun DashboardGalleryView(
     uiMessage: UIMessage?,
@@ -177,11 +178,8 @@ private fun DashboardGalleryView(
     hasInternetConnection: Boolean
 ) {
     val windowSize = rememberWindowSize()
-    val scaffoldState = rememberScaffoldState()
-    val pullRefreshState = rememberPullRefreshState(
-        refreshing = updating,
-        onRefresh = { onAction(DashboardGalleryScreenAction.SwipeRefresh) }
-    )
+    val snackbarHostState = remember { SnackbarHostState() }
+    val pullToRefreshState = rememberPullToRefreshState()
     var isInternetConnectionShown by rememberSaveable {
         mutableStateOf(false)
     }
@@ -205,12 +203,11 @@ private fun DashboardGalleryView(
     }
 
     Scaffold(
-        scaffoldState = scaffoldState,
         modifier = Modifier.fillMaxSize(),
-        backgroundColor = MaterialTheme.appColors.background
+        containerColor = MaterialTheme.appColors.background
     ) { paddingValues ->
 
-        HandleUIMessage(uiMessage = uiMessage, scaffoldState = scaffoldState)
+        HandleUIMessage(uiMessage = uiMessage, snackbarHostState = snackbarHostState)
 
         Surface(
             modifier = Modifier
@@ -219,81 +216,86 @@ private fun DashboardGalleryView(
                 .padding(paddingValues),
             color = MaterialTheme.appColors.background
         ) {
-            Box(
-                Modifier
-                    .fillMaxSize()
-                    .pullRefresh(pullRefreshState)
-                    .verticalScroll(rememberScrollState()),
+            PullToRefreshBox(
+                isRefreshing = updating,
+                onRefresh = { onAction(DashboardGalleryScreenAction.SwipeRefresh) },
+                state = pullToRefreshState,
+                modifier = Modifier.fillMaxSize(),
             ) {
-                when (uiState) {
-                    is DashboardGalleryUIState.Loading -> {
-                        CircularProgressIndicator(
-                            modifier = Modifier.align(Alignment.Center),
-                            color = MaterialTheme.appColors.primary
-                        )
-                    }
+                Box(
+                    Modifier
+                        .fillMaxSize()
+                        .verticalScroll(rememberScrollState()),
+                ) {
+                    when (uiState) {
+                        is DashboardGalleryUIState.Loading -> {
+                            CircularProgressIndicator(
+                                modifier = Modifier.align(Alignment.Center),
+                                color = MaterialTheme.appColors.primary
+                            )
+                        }
 
-                    is DashboardGalleryUIState.Courses -> {
-                        UserCourses(
-                            modifier = contentWidth
-                                .fillMaxHeight()
-                                .padding(vertical = 12.dp)
-                                .displayCutoutForLandscape()
-                                .align(Alignment.TopCenter),
-                            contentPadding = contentPadding,
-                            userCourses = uiState.userCourses,
-                            useRelativeDates = uiState.useRelativeDates,
-                            apiHostUrl = apiHostUrl,
-                            openCourse = {
-                                onAction(DashboardGalleryScreenAction.OpenCourse(it))
-                            },
-                            onViewAllClick = {
-                                onAction(DashboardGalleryScreenAction.ViewAll)
-                            },
-                            navigateToDates = {
-                                onAction(DashboardGalleryScreenAction.NavigateToDates(it))
-                            },
-                            resumeBlockId = { course, blockId ->
-                                onAction(DashboardGalleryScreenAction.OpenBlock(course, blockId))
-                            }
-                        )
+                        is DashboardGalleryUIState.Courses -> {
+                            UserCourses(
+                                modifier = contentWidth
+                                    .fillMaxHeight()
+                                    .padding(vertical = 12.dp)
+                                    .displayCutoutForLandscape()
+                                    .align(Alignment.TopCenter),
+                                contentPadding = contentPadding,
+                                userCourses = uiState.userCourses,
+                                useRelativeDates = uiState.useRelativeDates,
+                                apiHostUrl = apiHostUrl,
+                                openCourse = {
+                                    onAction(DashboardGalleryScreenAction.OpenCourse(it))
+                                },
+                                onViewAllClick = {
+                                    onAction(DashboardGalleryScreenAction.ViewAll)
+                                },
+                                navigateToDates = {
+                                    onAction(DashboardGalleryScreenAction.NavigateToDates(it))
+                                },
+                                resumeBlockId = { course, blockId ->
+                                    onAction(
+                                        DashboardGalleryScreenAction.OpenBlock(
+                                            course,
+                                            blockId
+                                        )
+                                    )
+                                }
+                            )
+                        }
+
+                        is DashboardGalleryUIState.Empty -> {
+                            NoCoursesInfo(
+                                modifier = Modifier
+                                    .align(Alignment.Center)
+                            )
+                            FindACourseButton(
+                                modifier = Modifier
+                                    .align(Alignment.BottomCenter),
+                                findACourseClick = {
+                                    onAction(DashboardGalleryScreenAction.NavigateToDiscovery)
+                                }
+                            )
+                        }
                     }
 
-                    is DashboardGalleryUIState.Empty -> {
-                        NoCoursesInfo(
-                            modifier = Modifier
-                                .align(Alignment.Center)
-                        )
-                        FindACourseButton(
-                            modifier = Modifier
+                    if (!isInternetConnectionShown && !hasInternetConnection) {
+                        OfflineModeDialog(
+                            Modifier
+                                .fillMaxWidth()
                                 .align(Alignment.BottomCenter),
-                            findACourseClick = {
-                                onAction(DashboardGalleryScreenAction.NavigateToDiscovery)
+                            onDismissCLick = {
+                                isInternetConnectionShown = true
+                            },
+                            onReloadClick = {
+                                isInternetConnectionShown = true
+                                onAction(DashboardGalleryScreenAction.SwipeRefresh)
                             }
                         )
                     }
                 }
-
-                PullRefreshIndicator(
-                    updating,
-                    pullRefreshState,
-                    Modifier.align(Alignment.TopCenter)
-                )
-
-                if (!isInternetConnectionShown && !hasInternetConnection) {
-                    OfflineModeDialog(
-                        Modifier
-                            .fillMaxWidth()
-                            .align(Alignment.BottomCenter),
-                        onDismissCLick = {
-                            isInternetConnectionShown = true
-                        },
-                        onReloadClick = {
-                            isInternetConnectionShown = true
-                            onAction(DashboardGalleryScreenAction.SwipeRefresh)
-                        }
-                    )
-                }
             }
         }
     }
@@ -413,9 +415,9 @@ private fun ViewAllItem(
                     onViewAllClick()
                 }
             ),
-        backgroundColor = MaterialTheme.appColors.cardViewBackground,
+        colors = CardDefaults.cardColors(containerColor = MaterialTheme.appColors.cardViewBackground),
         shape = MaterialTheme.appShapes.courseImageShape,
-        elevation = 4.dp,
+        elevation = CardDefaults.cardElevation(defaultElevation = 4.dp),
     ) {
         Column(
             modifier = Modifier.fillMaxSize(),
@@ -452,9 +454,9 @@ private fun CourseListItem(
             .clickable {
                 onCourseClick(course)
             },
-        backgroundColor = MaterialTheme.appColors.background,
+        colors = CardDefaults.cardColors(containerColor = MaterialTheme.appColors.background),
         shape = MaterialTheme.appShapes.courseImageShape,
-        elevation = 4.dp
+        elevation = CardDefaults.cardElevation(defaultElevation = 4.dp)
     ) {
         Box {
             Column {
@@ -555,9 +557,9 @@ private fun PrimaryCourseCard(
         modifier = modifier
             .fillMaxWidth()
             .padding(2.dp),
-        backgroundColor = MaterialTheme.appColors.background,
+        colors = CardDefaults.cardColors(containerColor = MaterialTheme.appColors.background),
         shape = MaterialTheme.appShapes.courseImageShape,
-        elevation = 4.dp
+        elevation = CardDefaults.cardElevation(defaultElevation = 4.dp)
     ) {
         when (orientation) {
             Configuration.ORIENTATION_LANDSCAPE -> {
@@ -633,7 +635,7 @@ private fun PrimaryCourseButtons(
             modifier = titleModifier,
             primaryCourse = primaryCourse,
         )
-        Divider()
+        HorizontalDivider()
         if (!pastAssignments.isNullOrEmpty()) {
             val nearestAssignment = pastAssignments.maxBy { it.date }
             val title = if (pastAssignments.size == 1) nearestAssignment.title else null
@@ -658,7 +660,7 @@ private fun PrimaryCourseButtons(
         if (!futureAssignments.isNullOrEmpty()) {
             val nearestAssignment = futureAssignments.minBy { it.date }
             val title = if (futureAssignments.size == 1) nearestAssignment.title else null
-            Divider()
+            HorizontalDivider()
             AssignmentItem(
                 modifier = Modifier.clickable {
                     if (futureAssignments.size == 1) {
@@ -727,9 +729,12 @@ private fun PrimaryCourseCaption(
             modifier = Modifier
                 .fillMaxWidth()
                 .height(8.dp),
-            progress = primaryCourse.progress.value,
+            progress = { primaryCourse.progress.value },
             color = MaterialTheme.appColors.primary,
-            backgroundColor = MaterialTheme.appColors.divider
+            trackColor = MaterialTheme.appColors.divider,
+            strokeCap = StrokeCap.Square,
+            gapSize = 0.dp,
+            drawStopIndicator = { }
         )
     }
 }
diff --git a/dashboard/src/main/java/org/openedx/dashboard/presentation/DashboardListFragment.kt b/dashboard/src/main/java/org/openedx/dashboard/presentation/DashboardListFragment.kt
index 6eea1d9bf..402fc81ad 100644
--- a/dashboard/src/main/java/org/openedx/dashboard/presentation/DashboardListFragment.kt
+++ b/dashboard/src/main/java/org/openedx/dashboard/presentation/DashboardListFragment.kt
@@ -27,20 +27,19 @@ import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.CircularProgressIndicator
-import androidx.compose.material.Divider
-import androidx.compose.material.ExperimentalMaterialApi
-import androidx.compose.material.Icon
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Scaffold
-import androidx.compose.material.Surface
-import androidx.compose.material.Text
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowForward
-import androidx.compose.material.pullrefresh.PullRefreshIndicator
-import androidx.compose.material.pullrefresh.pullRefresh
-import androidx.compose.material.pullrefresh.rememberPullRefreshState
-import androidx.compose.material.rememberScaffoldState
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.SnackbarHostState
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.material3.pulltorefresh.PullToRefreshBox
+import androidx.compose.material3.pulltorefresh.rememberPullToRefreshState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
@@ -157,7 +156,7 @@ class DashboardListFragment : Fragment() {
     }
 }
 
-@OptIn(ExperimentalMaterialApi::class, ExperimentalComposeUiApi::class)
+@OptIn(ExperimentalMaterial3Api::class, ExperimentalComposeUiApi::class)
 @Composable
 internal fun DashboardListView(
     windowSize: WindowSize,
@@ -172,9 +171,8 @@ internal fun DashboardListView(
     paginationCallback: () -> Unit,
     onItemClick: (EnrolledCourse) -> Unit,
 ) {
-    val scaffoldState = rememberScaffoldState()
-    val pullRefreshState =
-        rememberPullRefreshState(refreshing = refreshing, onRefresh = { onSwipeRefresh() })
+    val snackbarHostState = remember { SnackbarHostState() }
+    val pullToRefreshState = rememberPullToRefreshState()
 
     var isInternetConnectionShown by rememberSaveable {
         mutableStateOf(false)
@@ -185,13 +183,12 @@ internal fun DashboardListView(
     }
 
     Scaffold(
-        scaffoldState = scaffoldState,
         modifier = Modifier
             .fillMaxSize()
             .semantics {
                 testTagsAsResourceId = true
             },
-        backgroundColor = MaterialTheme.appColors.background
+        containerColor = MaterialTheme.appColors.background
     ) { paddingValues ->
 
         val contentPaddings by remember(key1 = windowSize) {
@@ -227,7 +224,7 @@ internal fun DashboardListView(
             )
         }
 
-        HandleUIMessage(uiMessage = uiMessage, scaffoldState = scaffoldState)
+        HandleUIMessage(uiMessage = uiMessage, snackbarHostState = snackbarHostState)
 
         Column(
             modifier = Modifier
@@ -239,10 +236,11 @@ internal fun DashboardListView(
                 color = MaterialTheme.appColors.background,
                 shape = MaterialTheme.appShapes.screenBackgroundShape
             ) {
-                Box(
-                    Modifier
-                        .fillMaxWidth()
-                        .pullRefresh(pullRefreshState),
+                PullToRefreshBox(
+                    isRefreshing = refreshing,
+                    onRefresh = { onSwipeRefresh() },
+                    state = pullToRefreshState,
+                    modifier = Modifier.fillMaxWidth(),
                 ) {
                     when (state) {
                         is DashboardUIState.Loading -> {
@@ -276,7 +274,7 @@ internal fun DashboardListView(
                                                     onItemClick(it)
                                                 }
                                             )
-                                            Divider()
+                                            HorizontalDivider()
                                         }
                                         item {
                                             if (canLoadMore) {
@@ -318,11 +316,6 @@ internal fun DashboardListView(
                             }
                         }
                     }
-                    PullRefreshIndicator(
-                        refreshing,
-                        pullRefreshState,
-                        Modifier.align(Alignment.TopCenter)
-                    )
                     Column(
                         modifier = Modifier
                             .fillMaxWidth()
diff --git a/dashboard/src/main/java/org/openedx/learn/presentation/LearnFragment.kt b/dashboard/src/main/java/org/openedx/learn/presentation/LearnFragment.kt
index 1c77ffa72..20b812491 100644
--- a/dashboard/src/main/java/org/openedx/learn/presentation/LearnFragment.kt
+++ b/dashboard/src/main/java/org/openedx/learn/presentation/LearnFragment.kt
@@ -11,13 +11,13 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.widthIn
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.DropdownMenu
-import androidx.compose.material.DropdownMenuItem
-import androidx.compose.material.Icon
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Text
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.ExpandMore
+import androidx.compose.material3.DropdownMenu
+import androidx.compose.material3.DropdownMenuItem
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
@@ -190,47 +190,43 @@ private fun LearnDropdownMenu(
             )
         }
 
-        MaterialTheme(
-            colors = MaterialTheme.colors.copy(surface = MaterialTheme.appColors.background),
-            shapes = MaterialTheme.shapes.copy(
-                medium = RoundedCornerShape(
-                    bottomStart = 8.dp,
-                    bottomEnd = 8.dp
-                )
+        DropdownMenu(
+            modifier = Modifier
+                .crop(vertical = 8.dp)
+                .widthIn(min = 182.dp)
+                .background(MaterialTheme.appColors.background),
+            expanded = expanded,
+            onDismissRequest = { expanded = false },
+            shape = RoundedCornerShape(
+                bottomStart = 8.dp,
+                bottomEnd = 8.dp
             )
         ) {
-            DropdownMenu(
-                modifier = Modifier
-                    .crop(vertical = 8.dp)
-                    .widthIn(min = 182.dp),
-                expanded = expanded,
-                onDismissRequest = { expanded = false }
-            ) {
-                for (learnType in LearnType.entries) {
-                    val background: Color
-                    val textColor: Color
-                    if (selectedLearnType == learnType) {
-                        background = MaterialTheme.appColors.primary
-                        textColor = MaterialTheme.appColors.primaryButtonText
-                    } else {
-                        background = Color.Transparent
-                        textColor = MaterialTheme.appColors.textDark
-                    }
-                    DropdownMenuItem(
-                        modifier = Modifier
-                            .background(background),
-                        onClick = {
-                            onUpdateLearnType(learnType)
-                            expanded = false
-                        }
-                    ) {
+            for (learnType in LearnType.entries) {
+                val background: Color
+                val textColor: Color
+                if (selectedLearnType == learnType) {
+                    background = MaterialTheme.appColors.primary
+                    textColor = MaterialTheme.appColors.primaryButtonText
+                } else {
+                    background = Color.Transparent
+                    textColor = MaterialTheme.appColors.textDark
+                }
+                DropdownMenuItem(
+                    modifier = Modifier
+                        .background(background),
+                    onClick = {
+                        onUpdateLearnType(learnType)
+                        expanded = false
+                    },
+                    text = {
                         Text(
                             text = stringResource(id = learnType.title),
                             style = MaterialTheme.appTypography.titleSmall,
                             color = textColor
                         )
                     }
-                }
+                )
             }
         }
     }
diff --git a/dates/src/main/java/org/openedx/dates/presentation/dates/DatesScreen.kt b/dates/src/main/java/org/openedx/dates/presentation/dates/DatesScreen.kt
index 21406f700..c8bf3faa8 100644
--- a/dates/src/main/java/org/openedx/dates/presentation/dates/DatesScreen.kt
+++ b/dates/src/main/java/org/openedx/dates/presentation/dates/DatesScreen.kt
@@ -16,19 +16,20 @@ import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.Card
-import androidx.compose.material.CircularProgressIndicator
-import androidx.compose.material.ExperimentalMaterialApi
-import androidx.compose.material.Icon
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Scaffold
-import androidx.compose.material.Text
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.CalendarMonth
-import androidx.compose.material.pullrefresh.PullRefreshIndicator
-import androidx.compose.material.pullrefresh.pullRefresh
-import androidx.compose.material.pullrefresh.rememberPullRefreshState
-import androidx.compose.material.rememberScaffoldState
+import androidx.compose.material3.Card
+import androidx.compose.material3.CardDefaults
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.SnackbarHost
+import androidx.compose.material3.SnackbarHostState
+import androidx.compose.material3.Text
+import androidx.compose.material3.pulltorefresh.PullToRefreshBox
+import androidx.compose.material3.pulltorefresh.rememberPullToRefreshState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.derivedStateOf
@@ -64,7 +65,7 @@ import org.openedx.foundation.presentation.UIMessage
 import org.openedx.foundation.presentation.rememberWindowSize
 import org.openedx.foundation.presentation.windowSizeValue
 
-@OptIn(ExperimentalMaterialApi::class)
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun DatesScreen(
     uiState: DatesUIState,
@@ -73,7 +74,7 @@ fun DatesScreen(
     useRelativeDates: Boolean,
     onAction: (DatesViewActions) -> Unit,
 ) {
-    val scaffoldState = rememberScaffoldState()
+    val snackbarHostState = remember { SnackbarHostState() }
     val windowSize = rememberWindowSize()
     val contentWidth by remember(key1 = windowSize) {
         mutableStateOf(
@@ -83,10 +84,7 @@ fun DatesScreen(
             )
         )
     }
-    val pullRefreshState = rememberPullRefreshState(
-        refreshing = uiState.isRefreshing,
-        onRefresh = { onAction(DatesViewActions.SwipeRefresh) }
-    )
+    val pullToRefreshState = rememberPullToRefreshState()
     var isInternetConnectionShown by rememberSaveable {
         mutableStateOf(false)
     }
@@ -94,10 +92,10 @@ fun DatesScreen(
     val layoutInfo by remember { derivedStateOf { scrollState.layoutInfo } }
 
     Scaffold(
-        scaffoldState = scaffoldState,
         modifier = Modifier
             .fillMaxSize(),
-        backgroundColor = MaterialTheme.appColors.background,
+        containerColor = MaterialTheme.appColors.background,
+        snackbarHost = { SnackbarHost(snackbarHostState) },
         topBar = {
             MainScreenToolbar(
                 modifier = Modifier
@@ -113,94 +111,94 @@ fun DatesScreen(
             Box(
                 modifier = Modifier
                     .fillMaxSize()
-                    .pullRefresh(pullRefreshState)
             ) {
-                if (uiState.isLoading && uiState.dates.isEmpty()) {
-                    Box(
-                        modifier = Modifier
-                            .fillMaxSize(),
-                        contentAlignment = Alignment.Center
-                    ) {
-                        CircularProgressIndicator(color = MaterialTheme.appColors.primary)
-                    }
-                } else if (uiState.dates.isEmpty()) {
-                    EmptyState()
-                } else {
-                    Box(
-                        modifier = Modifier
-                            .fillMaxSize()
-                            .displayCutoutForLandscape()
-                            .padding(paddingValues)
-                            .padding(horizontal = 16.dp),
-                        contentAlignment = Alignment.TopCenter
-                    ) {
-                        LazyColumn(
-                            modifier = contentWidth.fillMaxSize(),
-                            state = scrollState,
-                            contentPadding = PaddingValues(bottom = 48.dp, top = 24.dp),
-                            verticalArrangement = Arrangement.spacedBy(16.dp)
+                PullToRefreshBox(
+                    isRefreshing = uiState.isRefreshing,
+                    onRefresh = { onAction(DatesViewActions.SwipeRefresh) },
+                    state = pullToRefreshState,
+                    modifier = Modifier.fillMaxSize()
+                ) {
+                    if (uiState.isLoading && uiState.dates.isEmpty()) {
+                        Box(
+                            modifier = Modifier
+                                .fillMaxSize(),
+                            contentAlignment = Alignment.Center
+                        ) {
+                            CircularProgressIndicator(color = MaterialTheme.appColors.primary)
+                        }
+                    } else if (uiState.dates.isEmpty()) {
+                        EmptyState()
+                    } else {
+                        Box(
+                            modifier = Modifier
+                                .fillMaxSize()
+                                .displayCutoutForLandscape()
+                                .padding(paddingValues)
+                                .padding(horizontal = 16.dp),
+                            contentAlignment = Alignment.TopCenter
                         ) {
-                            uiState.dates.keys.forEach { sectionKey ->
-                                val dates = uiState.dates[sectionKey].orEmpty()
-                                dates.isNotEmptyThenLet { sectionDates ->
-                                    val isHavePastRelatedDates =
-                                        sectionKey == DatesSection.PAST_DUE && dates.any { it.relative }
-                                    if (isHavePastRelatedDates) {
+                            LazyColumn(
+                                modifier = contentWidth.fillMaxSize(),
+                                state = scrollState,
+                                contentPadding = PaddingValues(bottom = 48.dp, top = 24.dp),
+                                verticalArrangement = Arrangement.spacedBy(16.dp)
+                            ) {
+                                uiState.dates.keys.forEach { sectionKey ->
+                                    val dates = uiState.dates[sectionKey].orEmpty()
+                                    dates.isNotEmptyThenLet { sectionDates ->
+                                        val isHavePastRelatedDates =
+                                            sectionKey == DatesSection.PAST_DUE && dates.any { it.relative }
+                                        if (isHavePastRelatedDates) {
+                                            item {
+                                                ShiftDueDatesCard(
+                                                    isButtonEnabled = !uiState.isShiftDueDatesPressed,
+                                                    onClick = {
+                                                        onAction(DatesViewActions.ShiftDueDate)
+                                                    }
+                                                )
+                                            }
+                                        }
                                         item {
-                                            ShiftDueDatesCard(
-                                                isButtonEnabled = !uiState.isShiftDueDatesPressed,
-                                                onClick = {
-                                                    onAction(DatesViewActions.ShiftDueDate)
-                                                }
+                                            CourseDateBlockSection(
+                                                sectionKey = sectionKey,
+                                                sectionDates = sectionDates,
+                                                onItemClick = {
+                                                    onAction(DatesViewActions.OpenEvent(it))
+                                                },
+                                                useRelativeDates = useRelativeDates
                                             )
                                         }
                                     }
+                                }
+                                if (uiState.canLoadMore) {
                                     item {
-                                        CourseDateBlockSection(
-                                            sectionKey = sectionKey,
-                                            sectionDates = sectionDates,
-                                            onItemClick = {
-                                                onAction(DatesViewActions.OpenEvent(it))
-                                            },
-                                            useRelativeDates = useRelativeDates
-                                        )
+                                        Box(
+                                            Modifier
+                                                .fillMaxWidth()
+                                                .height(42.dp)
+                                                .padding(16.dp),
+                                            contentAlignment = Alignment.Center
+                                        ) {
+                                            CircularProgressIndicator(color = MaterialTheme.appColors.primary)
+                                        }
                                     }
                                 }
                             }
-                            if (uiState.canLoadMore) {
-                                item {
-                                    Box(
-                                        Modifier
-                                            .fillMaxWidth()
-                                            .height(42.dp)
-                                            .padding(16.dp),
-                                        contentAlignment = Alignment.Center
-                                    ) {
-                                        CircularProgressIndicator(color = MaterialTheme.appColors.primary)
-                                    }
+                            val lastVisibleItemIndex =
+                                layoutInfo.visibleItemsInfo.lastOrNull()?.index ?: 0
+                            val totalItemsCount = layoutInfo.totalItemsCount
+                            val shouldLoadMore = totalItemsCount > 0 &&
+                                    lastVisibleItemIndex >= (totalItemsCount * LOAD_MORE_THRESHOLD).toInt()
+                            LaunchedEffect(shouldLoadMore) {
+                                if (shouldLoadMore) {
+                                    onAction(DatesViewActions.LoadMore)
                                 }
                             }
                         }
-                        val lastVisibleItemIndex =
-                            layoutInfo.visibleItemsInfo.lastOrNull()?.index ?: 0
-                        val totalItemsCount = layoutInfo.totalItemsCount
-                        val shouldLoadMore = totalItemsCount > 0 &&
-                            lastVisibleItemIndex >= (totalItemsCount * LOAD_MORE_THRESHOLD).toInt()
-                        LaunchedEffect(shouldLoadMore) {
-                            if (shouldLoadMore) {
-                                onAction(DatesViewActions.LoadMore)
-                            }
-                        }
                     }
                 }
 
-                HandleUIMessage(uiMessage = uiMessage, scaffoldState = scaffoldState)
-
-                PullRefreshIndicator(
-                    uiState.isRefreshing,
-                    pullRefreshState,
-                    Modifier.align(Alignment.TopCenter)
-                )
+                HandleUIMessage(uiMessage = uiMessage, snackbarHostState = snackbarHostState)
 
                 if (!isInternetConnectionShown && !hasInternetConnection) {
                     OfflineModeDialog(
@@ -230,7 +228,7 @@ private fun ShiftDueDatesCard(
     Card(
         modifier = modifier
             .fillMaxWidth(),
-        backgroundColor = MaterialTheme.appColors.cardViewBackground,
+        colors = CardDefaults.cardColors(containerColor = MaterialTheme.appColors.cardViewBackground),
         shape = MaterialTheme.appShapes.cardShape,
     ) {
         Column(
diff --git a/discovery/src/main/java/org/openedx/discovery/presentation/NativeDiscoveryFragment.kt b/discovery/src/main/java/org/openedx/discovery/presentation/NativeDiscoveryFragment.kt
index 720971ff4..e147f8293 100644
--- a/discovery/src/main/java/org/openedx/discovery/presentation/NativeDiscoveryFragment.kt
+++ b/discovery/src/main/java/org/openedx/discovery/presentation/NativeDiscoveryFragment.kt
@@ -20,17 +20,17 @@ import androidx.compose.foundation.layout.widthIn
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.lazy.rememberLazyListState
-import androidx.compose.material.CircularProgressIndicator
-import androidx.compose.material.Divider
-import androidx.compose.material.ExperimentalMaterialApi
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Scaffold
-import androidx.compose.material.Surface
-import androidx.compose.material.Text
-import androidx.compose.material.pullrefresh.PullRefreshIndicator
-import androidx.compose.material.pullrefresh.pullRefresh
-import androidx.compose.material.pullrefresh.rememberPullRefreshState
-import androidx.compose.material.rememberScaffoldState
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.SnackbarHost
+import androidx.compose.material3.SnackbarHostState
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.material3.pulltorefresh.PullToRefreshBox
+import androidx.compose.material3.pulltorefresh.rememberPullToRefreshState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
@@ -176,7 +176,7 @@ class NativeDiscoveryFragment : Fragment() {
     }
 }
 
-@OptIn(ExperimentalMaterialApi::class, ExperimentalComposeUiApi::class)
+@OptIn(ExperimentalMaterial3Api::class, ExperimentalComposeUiApi::class)
 @Composable
 internal fun DiscoveryScreen(
     windowSize: WindowSize,
@@ -199,26 +199,25 @@ internal fun DiscoveryScreen(
     onBackClick: () -> Unit,
     onSettingsClick: () -> Unit,
 ) {
-    val scaffoldState = rememberScaffoldState()
     val scrollState = rememberLazyListState()
     val firstVisibleIndex = remember {
         mutableIntStateOf(scrollState.firstVisibleItemIndex)
     }
-    val pullRefreshState =
-        rememberPullRefreshState(refreshing = refreshing, onRefresh = { onSwipeRefresh() })
+    val pullToRefreshState = rememberPullToRefreshState()
+    val snackbarHostState = remember { SnackbarHostState() }
 
     var isInternetConnectionShown by rememberSaveable {
         mutableStateOf(false)
     }
 
     Scaffold(
-        scaffoldState = scaffoldState,
         modifier = Modifier
             .fillMaxSize()
             .semantics {
                 testTagsAsResourceId = true
             },
-        backgroundColor = MaterialTheme.appColors.background,
+        containerColor = MaterialTheme.appColors.background,
+        snackbarHost = { SnackbarHost(snackbarHostState) },
         bottomBar = {
             if (!isUserLoggedIn) {
                 Box(
@@ -268,7 +267,7 @@ internal fun DiscoveryScreen(
             )
         }
 
-        HandleUIMessage(uiMessage = uiMessage, scaffoldState = scaffoldState)
+        HandleUIMessage(uiMessage = uiMessage, snackbarHostState = snackbarHostState)
 
         if (canShowBackButton) {
             Box(
@@ -322,10 +321,11 @@ internal fun DiscoveryScreen(
             Surface(
                 color = MaterialTheme.appColors.background
             ) {
-                Box(
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .pullRefresh(pullRefreshState)
+                PullToRefreshBox(
+                    modifier = Modifier.fillMaxWidth(),
+                    state = pullToRefreshState,
+                    isRefreshing = refreshing,
+                    onRefresh = { onSwipeRefresh() }
                 ) {
                     when (state) {
                         is DiscoveryUIState.Loading -> {
@@ -378,7 +378,7 @@ internal fun DiscoveryScreen(
                                                 onItemClick(course)
                                             }
                                         )
-                                        Divider()
+                                        HorizontalDivider()
                                     }
                                     item {
                                         if (canLoadMore) {
@@ -403,11 +403,6 @@ internal fun DiscoveryScreen(
                             }
                         }
                     }
-                    PullRefreshIndicator(
-                        refreshing,
-                        pullRefreshState,
-                        Modifier.align(Alignment.TopCenter)
-                    )
 
                     Column(
                         modifier = Modifier
diff --git a/discovery/src/main/java/org/openedx/discovery/presentation/WebViewDiscoveryFragment.kt b/discovery/src/main/java/org/openedx/discovery/presentation/WebViewDiscoveryFragment.kt
index d41a491a3..35f90f11f 100644
--- a/discovery/src/main/java/org/openedx/discovery/presentation/WebViewDiscoveryFragment.kt
+++ b/discovery/src/main/java/org/openedx/discovery/presentation/WebViewDiscoveryFragment.kt
@@ -17,11 +17,10 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.widthIn
-import androidx.compose.material.CircularProgressIndicator
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Scaffold
-import androidx.compose.material.Surface
-import androidx.compose.material.rememberScaffoldState
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Surface
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.collectAsState
@@ -206,17 +205,15 @@ private fun WebViewDiscoveryScreen(
     onSettingsClick: () -> Unit,
     onBackClick: () -> Unit
 ) {
-    val scaffoldState = rememberScaffoldState()
     val configuration = LocalConfiguration.current
 
     Scaffold(
-        scaffoldState = scaffoldState,
         modifier = Modifier
             .fillMaxSize()
             .semantics {
                 testTagsAsResourceId = true
             },
-        backgroundColor = MaterialTheme.appColors.background,
+        containerColor = MaterialTheme.appColors.background,
         bottomBar = {
             if (isPreLogin) {
                 Box(
diff --git a/discovery/src/main/java/org/openedx/discovery/presentation/detail/AuthorizationDialogFragment.kt b/discovery/src/main/java/org/openedx/discovery/presentation/detail/AuthorizationDialogFragment.kt
index b6c7e18a8..c08f89d8b 100644
--- a/discovery/src/main/java/org/openedx/discovery/presentation/detail/AuthorizationDialogFragment.kt
+++ b/discovery/src/main/java/org/openedx/discovery/presentation/detail/AuthorizationDialogFragment.kt
@@ -18,14 +18,15 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
-import androidx.compose.material.Card
-import androidx.compose.material.Icon
-import androidx.compose.material.IconButton
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Text
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.Login
 import androidx.compose.material.icons.filled.Close
+import androidx.compose.material3.Card
+import androidx.compose.material3.CardDefaults
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -139,7 +140,7 @@ private fun AuthorizationDialogPortraitView(
         modifier = Modifier
             .fillMaxWidth(fraction = 0.95f)
             .clip(MaterialTheme.appShapes.courseImageShape),
-        backgroundColor = MaterialTheme.appColors.background,
+        colors = CardDefaults.cardColors(containerColor = MaterialTheme.appColors.background),
         shape = MaterialTheme.appShapes.courseImageShape
     ) {
         Column(
@@ -213,7 +214,7 @@ private fun AuthorizationDialogLandscapeView(
         modifier = Modifier
             .fillMaxWidth()
             .clip(MaterialTheme.appShapes.courseImageShape),
-        backgroundColor = MaterialTheme.appColors.background,
+        colors = CardDefaults.cardColors(containerColor = MaterialTheme.appColors.background),
         shape = MaterialTheme.appShapes.courseImageShape
     ) {
         Column(
diff --git a/discovery/src/main/java/org/openedx/discovery/presentation/detail/CourseDetailsFragment.kt b/discovery/src/main/java/org/openedx/discovery/presentation/detail/CourseDetailsFragment.kt
index e04e00739..7e84a9167 100644
--- a/discovery/src/main/java/org/openedx/discovery/presentation/detail/CourseDetailsFragment.kt
+++ b/discovery/src/main/java/org/openedx/discovery/presentation/detail/CourseDetailsFragment.kt
@@ -33,16 +33,17 @@ import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.layout.widthIn
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.CircularProgressIndicator
-import androidx.compose.material.Icon
-import androidx.compose.material.IconButton
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Scaffold
-import androidx.compose.material.Surface
-import androidx.compose.material.Text
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.Report
-import androidx.compose.material.rememberScaffoldState
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.SnackbarHost
+import androidx.compose.material3.SnackbarHostState
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.collectAsState
@@ -221,8 +222,8 @@ internal fun CourseDetailsScreen(
     onRegisterClick: () -> Unit,
     onSignInClick: () -> Unit,
 ) {
-    val scaffoldState = rememberScaffoldState()
     val configuration = LocalConfiguration.current
+    val snackbarHostState = remember { SnackbarHostState() }
 
     val isInternetConnectionShown = rememberSaveable {
         mutableStateOf(false)
@@ -235,8 +236,8 @@ internal fun CourseDetailsScreen(
             .semantics {
                 testTagsAsResourceId = true
             },
-        scaffoldState = scaffoldState,
-        backgroundColor = MaterialTheme.appColors.background,
+        containerColor = MaterialTheme.appColors.background,
+        snackbarHost = { SnackbarHost(snackbarHostState) },
         bottomBar = {
             if (!isUserLoggedIn) {
                 Box(modifier = Modifier.padding(horizontal = 16.dp, vertical = 32.dp)) {
@@ -271,7 +272,7 @@ internal fun CourseDetailsScreen(
             )
         }
 
-        HandleUIMessage(uiMessage = uiMessage, scaffoldState = scaffoldState)
+        HandleUIMessage(uiMessage = uiMessage, snackbarHostState = snackbarHostState)
 
         Box(
             modifier = Modifier
diff --git a/discovery/src/main/java/org/openedx/discovery/presentation/info/CourseInfoFragment.kt b/discovery/src/main/java/org/openedx/discovery/presentation/info/CourseInfoFragment.kt
index 7c397f206..45c82c6d5 100644
--- a/discovery/src/main/java/org/openedx/discovery/presentation/info/CourseInfoFragment.kt
+++ b/discovery/src/main/java/org/openedx/discovery/presentation/info/CourseInfoFragment.kt
@@ -14,11 +14,12 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.widthIn
-import androidx.compose.material.CircularProgressIndicator
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Scaffold
-import androidx.compose.material.Surface
-import androidx.compose.material.rememberScaffoldState
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.SnackbarHost
+import androidx.compose.material3.SnackbarHostState
+import androidx.compose.material3.Surface
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
@@ -252,15 +253,15 @@ private fun CourseInfoScreen(
     onBackClick: () -> Unit,
     onUriClick: (String, linkAuthority) -> Unit,
 ) {
-    val scaffoldState = rememberScaffoldState()
     val configuration = LocalConfiguration.current
+    val snackbarHostState = remember { SnackbarHostState() }
 
-    HandleUIMessage(uiMessage = uiMessage, scaffoldState = scaffoldState)
+    HandleUIMessage(uiMessage = uiMessage, snackbarHostState = snackbarHostState)
 
     Scaffold(
-        scaffoldState = scaffoldState,
         modifier = Modifier.fillMaxSize(),
-        backgroundColor = MaterialTheme.appColors.background,
+        containerColor = MaterialTheme.appColors.background,
+        snackbarHost = { SnackbarHost(snackbarHostState) },
         bottomBar = {
             if ((uiState as CourseInfoUIState.CourseInfo).isPreLogin) {
                 Box(
diff --git a/discovery/src/main/java/org/openedx/discovery/presentation/program/ProgramFragment.kt b/discovery/src/main/java/org/openedx/discovery/presentation/program/ProgramFragment.kt
index 1c78faf23..a72d9e6a5 100644
--- a/discovery/src/main/java/org/openedx/discovery/presentation/program/ProgramFragment.kt
+++ b/discovery/src/main/java/org/openedx/discovery/presentation/program/ProgramFragment.kt
@@ -12,11 +12,12 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.widthIn
-import androidx.compose.material.CircularProgressIndicator
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Scaffold
-import androidx.compose.material.Surface
-import androidx.compose.material.rememberScaffoldState
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.SnackbarHost
+import androidx.compose.material3.SnackbarHostState
+import androidx.compose.material3.Surface
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.collectAsState
@@ -251,24 +252,24 @@ private fun ProgramInfoScreen(
     onBackClick: () -> Unit,
     onUriClick: (String, linkAuthority) -> Unit,
 ) {
-    val scaffoldState = rememberScaffoldState()
     val configuration = LocalConfiguration.current
     val coroutineScope = rememberCoroutineScope()
+    val snackbarHostState = remember { SnackbarHostState() }
 
     when (uiState) {
         is ProgramUIState.UiMessage -> {
-            HandleUIMessage(uiMessage = uiState.uiMessage, scaffoldState = scaffoldState)
+            HandleUIMessage(uiMessage = uiState.uiMessage, snackbarHostState = snackbarHostState)
         }
 
         else -> {}
     }
 
     Scaffold(
-        scaffoldState = scaffoldState,
         modifier = Modifier
             .fillMaxSize()
             .semantics { testTagsAsResourceId = true },
-        backgroundColor = MaterialTheme.appColors.background
+        containerColor = MaterialTheme.appColors.background,
+        snackbarHost = { SnackbarHost(snackbarHostState) }
     ) { paddingValues ->
         val modifierScreenWidth by remember(key1 = windowSize) {
             mutableStateOf(
diff --git a/discovery/src/main/java/org/openedx/discovery/presentation/search/CourseSearchFragment.kt b/discovery/src/main/java/org/openedx/discovery/presentation/search/CourseSearchFragment.kt
index 06290673a..3b1e243ec 100644
--- a/discovery/src/main/java/org/openedx/discovery/presentation/search/CourseSearchFragment.kt
+++ b/discovery/src/main/java/org/openedx/discovery/presentation/search/CourseSearchFragment.kt
@@ -19,17 +19,17 @@ import androidx.compose.foundation.layout.widthIn
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.lazy.rememberLazyListState
-import androidx.compose.material.CircularProgressIndicator
-import androidx.compose.material.Divider
-import androidx.compose.material.ExperimentalMaterialApi
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Scaffold
-import androidx.compose.material.Surface
-import androidx.compose.material.Text
-import androidx.compose.material.pullrefresh.PullRefreshIndicator
-import androidx.compose.material.pullrefresh.pullRefresh
-import androidx.compose.material.pullrefresh.rememberPullRefreshState
-import androidx.compose.material.rememberScaffoldState
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.SnackbarHost
+import androidx.compose.material3.SnackbarHostState
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.material3.pulltorefresh.PullToRefreshBox
+import androidx.compose.material3.pulltorefresh.rememberPullToRefreshState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
@@ -163,7 +163,7 @@ class CourseSearchFragment : Fragment() {
     }
 }
 
-@OptIn(ExperimentalMaterialApi::class, ExperimentalComposeUiApi::class)
+@OptIn(ExperimentalMaterial3Api::class, ExperimentalComposeUiApi::class)
 @Composable
 private fun CourseSearchScreen(
     windowSize: WindowSize,
@@ -183,13 +183,12 @@ private fun CourseSearchScreen(
     onRegisterClick: () -> Unit,
     onSignInClick: () -> Unit,
 ) {
-    val scaffoldState = rememberScaffoldState()
     val scrollState = rememberLazyListState()
     val firstVisibleIndex = remember {
         mutableStateOf(scrollState.firstVisibleItemIndex)
     }
-    val pullRefreshState =
-        rememberPullRefreshState(refreshing = refreshing, onRefresh = { onSwipeRefresh() })
+    val pullToRefreshState = rememberPullToRefreshState()
+    val snackbarHostState = remember { SnackbarHostState() }
 
     var textFieldValue by rememberSaveable(stateSaver = TextFieldValue.Saver) {
         mutableStateOf(
@@ -208,12 +207,12 @@ private fun CourseSearchScreen(
     }
 
     Scaffold(
-        scaffoldState = scaffoldState,
         modifier = Modifier
             .fillMaxSize()
             .navigationBarsPadding()
             .semantics { testTagsAsResourceId = true },
-        backgroundColor = MaterialTheme.appColors.background,
+        containerColor = MaterialTheme.appColors.background,
+        snackbarHost = { SnackbarHost(snackbarHostState) },
         bottomBar = {
             if (!isUserLoggedIn) {
                 Box(
@@ -262,7 +261,7 @@ private fun CourseSearchScreen(
             )
         }
 
-        HandleUIMessage(uiMessage = uiMessage, scaffoldState = scaffoldState)
+        HandleUIMessage(uiMessage = uiMessage, snackbarHostState = snackbarHostState)
 
         Box(
             modifier = Modifier
@@ -325,21 +324,22 @@ private fun CourseSearchScreen(
                 Surface(
                     color = MaterialTheme.appColors.background
                 ) {
-                    Box(
-                        modifier = Modifier
-                            .fillMaxWidth()
-                            .pullRefresh(pullRefreshState)
+                    val typingText =
+                        if (textFieldValue.text.isEmpty()) {
+                            stringResource(id = discoveryR.string.discovery_start_typing_to_find)
+                        } else {
+                            pluralStringResource(
+                                id = discoveryR.plurals.discovery_found_courses,
+                                (state as? CourseSearchUIState.Courses)?.numCourses ?: 0,
+                                (state as? CourseSearchUIState.Courses)?.numCourses ?: 0
+                            )
+                        }
+                    PullToRefreshBox(
+                        modifier = Modifier.fillMaxWidth(),
+                        state = pullToRefreshState,
+                        isRefreshing = refreshing,
+                        onRefresh = { onSwipeRefresh() }
                     ) {
-                        val typingText =
-                            if (textFieldValue.text.isEmpty()) {
-                                stringResource(id = discoveryR.string.discovery_start_typing_to_find)
-                            } else {
-                                pluralStringResource(
-                                    id = discoveryR.plurals.discovery_found_courses,
-                                    (state as? CourseSearchUIState.Courses)?.numCourses ?: 0,
-                                    (state as? CourseSearchUIState.Courses)?.numCourses ?: 0
-                                )
-                            }
                         LazyColumn(
                             Modifier.fillMaxSize(),
                             contentPadding = contentPaddings,
@@ -388,7 +388,7 @@ private fun CourseSearchScreen(
                                                 onItemClick(courseId)
                                             }
                                         )
-                                        Divider()
+                                        HorizontalDivider()
                                     }
                                     item {
                                         if (canLoadMore) {
@@ -408,11 +408,6 @@ private fun CourseSearchScreen(
                                 }
                             }
                         }
-                        PullRefreshIndicator(
-                            refreshing,
-                            pullRefreshState,
-                            Modifier.align(Alignment.TopCenter)
-                        )
                     }
                 }
             }
diff --git a/discovery/src/main/java/org/openedx/discovery/presentation/ui/DiscoveryUI.kt b/discovery/src/main/java/org/openedx/discovery/presentation/ui/DiscoveryUI.kt
index eeb497f56..19c9910be 100644
--- a/discovery/src/main/java/org/openedx/discovery/presentation/ui/DiscoveryUI.kt
+++ b/discovery/src/main/java/org/openedx/discovery/presentation/ui/DiscoveryUI.kt
@@ -15,10 +15,10 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
-import androidx.compose.material.Icon
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Surface
-import androidx.compose.material.Text
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -173,16 +173,16 @@ fun WarningLabel(
             .fillMaxWidth()
             .shadow(
                 0.dp,
-                MaterialTheme.appShapes.material.medium
+                MaterialTheme.appShapes.material3.medium
             )
             .background(
                 MaterialTheme.appColors.surface,
-                MaterialTheme.appShapes.material.medium
+                MaterialTheme.appShapes.material3.medium
             )
             .border(
                 1.dp,
                 borderColor,
-                MaterialTheme.appShapes.material.medium
+                MaterialTheme.appShapes.material3.medium
             )
     ) {
         Row(
diff --git a/discussion/src/main/java/org/openedx/discussion/presentation/comments/DiscussionCommentsFragment.kt b/discussion/src/main/java/org/openedx/discussion/presentation/comments/DiscussionCommentsFragment.kt
index 36c430340..2ac05b85c 100644
--- a/discussion/src/main/java/org/openedx/discussion/presentation/comments/DiscussionCommentsFragment.kt
+++ b/discussion/src/main/java/org/openedx/discussion/presentation/comments/DiscussionCommentsFragment.kt
@@ -27,20 +27,20 @@ import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.material.CircularProgressIndicator
-import androidx.compose.material.Divider
-import androidx.compose.material.ExperimentalMaterialApi
-import androidx.compose.material.Icon
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.OutlinedTextField
-import androidx.compose.material.Scaffold
-import androidx.compose.material.Surface
-import androidx.compose.material.Text
-import androidx.compose.material.TextFieldDefaults
-import androidx.compose.material.pullrefresh.PullRefreshIndicator
-import androidx.compose.material.pullrefresh.pullRefresh
-import androidx.compose.material.pullrefresh.rememberPullRefreshState
-import androidx.compose.material.rememberScaffoldState
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedTextField
+import androidx.compose.material3.OutlinedTextFieldDefaults
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.SnackbarHost
+import androidx.compose.material3.SnackbarHostState
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.material3.pulltorefresh.PullToRefreshBox
+import androidx.compose.material3.pulltorefresh.rememberPullToRefreshState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
@@ -195,7 +195,7 @@ class DiscussionCommentsFragment : Fragment() {
     }
 }
 
-@OptIn(ExperimentalMaterialApi::class)
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 private fun DiscussionCommentsScreen(
     windowSize: WindowSize,
@@ -212,13 +212,12 @@ private fun DiscussionCommentsScreen(
     onBackClick: () -> Unit,
     onUserPhotoClick: (String) -> Unit
 ) {
-    val scaffoldState = rememberScaffoldState()
     val scrollState = rememberLazyListState()
     val firstVisibleIndex = remember {
         mutableStateOf(scrollState.firstVisibleItemIndex)
     }
-    val pullRefreshState =
-        rememberPullRefreshState(refreshing = refreshing, onRefresh = { onSwipeRefresh() })
+    val pullToRefreshState = rememberPullToRefreshState()
+    val snackbarHostState = remember { SnackbarHostState() }
 
     var responseValue by rememberSaveable {
         mutableStateOf("")
@@ -237,11 +236,11 @@ private fun DiscussionCommentsScreen(
     }
 
     Scaffold(
-        scaffoldState = scaffoldState,
         modifier = Modifier
             .fillMaxSize()
             .navigationBarsPadding(),
-        backgroundColor = MaterialTheme.appColors.background
+        containerColor = MaterialTheme.appColors.background,
+        snackbarHost = { SnackbarHost(snackbarHostState) }
     ) {
         val keyboardController = LocalSoftwareKeyboardController.current
         val focusManager = LocalFocusManager.current
@@ -264,7 +263,7 @@ private fun DiscussionCommentsScreen(
             )
         }
 
-        HandleUIMessage(uiMessage = uiMessage, scaffoldState = scaffoldState)
+        HandleUIMessage(uiMessage = uiMessage, snackbarHostState = snackbarHostState)
 
         Column(
             Modifier
@@ -306,7 +305,11 @@ private fun DiscussionCommentsScreen(
                 modifier = Modifier.fillMaxWidth(),
                 color = MaterialTheme.appColors.background
             ) {
-                Box(Modifier.pullRefresh(pullRefreshState)) {
+                PullToRefreshBox(
+                    isRefreshing = refreshing,
+                    onRefresh = { onSwipeRefresh() },
+                    state = pullToRefreshState
+                ) {
                     when (uiState) {
                         is DiscussionCommentsUIState.Success -> {
                             Column(
@@ -396,7 +399,7 @@ private fun DiscussionCommentsScreen(
                                     paginationCallBack()
                                 }
                                 if (!isSystemInDarkTheme()) {
-                                    Divider(color = MaterialTheme.appColors.cardViewBorder)
+                                    HorizontalDivider(color = MaterialTheme.appColors.cardViewBorder)
                                 }
                                 Box(
                                     Modifier
@@ -432,10 +435,12 @@ private fun DiscussionCommentsScreen(
                                                     style = MaterialTheme.appTypography.labelLarge,
                                                 )
                                             },
-                                            colors = TextFieldDefaults.outlinedTextFieldColors(
-                                                backgroundColor = MaterialTheme.appColors.textFieldBackgroundVariant,
+                                            colors = OutlinedTextFieldDefaults.colors(
+                                                unfocusedContainerColor = MaterialTheme.appColors.textFieldBackgroundVariant,
+                                                focusedContainerColor = MaterialTheme.appColors.textFieldBackgroundVariant,
                                                 unfocusedBorderColor = MaterialTheme.appColors.textFieldBorder,
-                                                textColor = MaterialTheme.appColors.textFieldText
+                                                unfocusedTextColor = MaterialTheme.appColors.textFieldText,
+                                                focusedTextColor = MaterialTheme.appColors.textFieldText
                                             ),
                                             enabled = !uiState.thread.closed
                                         )
@@ -478,11 +483,6 @@ private fun DiscussionCommentsScreen(
                             }
                         }
                     }
-                    PullRefreshIndicator(
-                        refreshing,
-                        pullRefreshState,
-                        Modifier.align(Alignment.TopCenter)
-                    )
                 }
             }
         }
diff --git a/discussion/src/main/java/org/openedx/discussion/presentation/responses/DiscussionResponsesFragment.kt b/discussion/src/main/java/org/openedx/discussion/presentation/responses/DiscussionResponsesFragment.kt
index ecb7c5fa8..4b8fb4b72 100644
--- a/discussion/src/main/java/org/openedx/discussion/presentation/responses/DiscussionResponsesFragment.kt
+++ b/discussion/src/main/java/org/openedx/discussion/presentation/responses/DiscussionResponsesFragment.kt
@@ -28,20 +28,20 @@ import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.material.CircularProgressIndicator
-import androidx.compose.material.Divider
-import androidx.compose.material.ExperimentalMaterialApi
-import androidx.compose.material.Icon
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.OutlinedTextField
-import androidx.compose.material.Scaffold
-import androidx.compose.material.Surface
-import androidx.compose.material.Text
-import androidx.compose.material.TextFieldDefaults
-import androidx.compose.material.pullrefresh.PullRefreshIndicator
-import androidx.compose.material.pullrefresh.pullRefresh
-import androidx.compose.material.pullrefresh.rememberPullRefreshState
-import androidx.compose.material.rememberScaffoldState
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedTextField
+import androidx.compose.material3.OutlinedTextFieldDefaults
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.SnackbarHost
+import androidx.compose.material3.SnackbarHostState
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.material3.pulltorefresh.PullToRefreshBox
+import androidx.compose.material3.pulltorefresh.rememberPullToRefreshState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
@@ -197,7 +197,7 @@ class DiscussionResponsesFragment : Fragment() {
     }
 }
 
-@OptIn(ExperimentalMaterialApi::class)
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 private fun DiscussionResponsesScreen(
     windowSize: WindowSize,
@@ -213,7 +213,6 @@ private fun DiscussionResponsesScreen(
     onBackClick: () -> Unit,
     onUserPhotoClick: (String) -> Unit
 ) {
-    val scaffoldState = rememberScaffoldState()
     val scrollState = rememberLazyListState()
     val keyboardController = LocalSoftwareKeyboardController.current
     val focusManager = LocalFocusManager.current
@@ -222,8 +221,8 @@ private fun DiscussionResponsesScreen(
         mutableIntStateOf(scrollState.firstVisibleItemIndex)
     }
     val isShouldLoadMore = scrollState.shouldLoadMore(firstVisibleIndex, LOAD_MORE_THRESHOLD)
-    val pullRefreshState =
-        rememberPullRefreshState(refreshing = refreshing, onRefresh = { onSwipeRefresh() })
+    val pullToRefreshState = rememberPullToRefreshState()
+    val snackbarHostState = remember { SnackbarHostState() }
 
     var commentValue by rememberSaveable {
         mutableStateOf("")
@@ -241,11 +240,11 @@ private fun DiscussionResponsesScreen(
     }
 
     Scaffold(
-        scaffoldState = scaffoldState,
         modifier = Modifier
             .fillMaxSize()
             .navigationBarsPadding(),
-        backgroundColor = MaterialTheme.appColors.background
+        containerColor = MaterialTheme.appColors.background,
+        snackbarHost = { SnackbarHost(snackbarHostState) }
     ) {
         val screenWidth by remember(key1 = windowSize) {
             mutableStateOf(
@@ -274,7 +273,7 @@ private fun DiscussionResponsesScreen(
             )
         }
 
-        HandleUIMessage(uiMessage = uiMessage, scaffoldState = scaffoldState)
+        HandleUIMessage(uiMessage = uiMessage, snackbarHostState = snackbarHostState)
 
         Column(
             Modifier
@@ -316,7 +315,11 @@ private fun DiscussionResponsesScreen(
                 modifier = Modifier.fillMaxWidth(),
                 color = MaterialTheme.appColors.background
             ) {
-                Box(Modifier.pullRefresh(pullRefreshState)) {
+                PullToRefreshBox(
+                    isRefreshing = refreshing,
+                    onRefresh = { onSwipeRefresh() },
+                    state = pullToRefreshState
+                ) {
                     when (uiState) {
                         is DiscussionResponsesUIState.Success -> {
                             Column(
@@ -428,7 +431,7 @@ private fun DiscussionResponsesScreen(
                                     }
                                 }
                                 if (!isSystemInDarkTheme()) {
-                                    Divider(color = MaterialTheme.appColors.cardViewBorder)
+                                    HorizontalDivider(color = MaterialTheme.appColors.cardViewBorder)
                                 }
                                 Box(
                                     Modifier
@@ -466,10 +469,12 @@ private fun DiscussionResponsesScreen(
                                                     style = MaterialTheme.appTypography.labelLarge,
                                                 )
                                             },
-                                            colors = TextFieldDefaults.outlinedTextFieldColors(
-                                                backgroundColor = MaterialTheme.appColors.textFieldBackgroundVariant,
+                                            colors = OutlinedTextFieldDefaults.colors(
+                                                unfocusedContainerColor = MaterialTheme.appColors.textFieldBackgroundVariant,
+                                                focusedContainerColor = MaterialTheme.appColors.textFieldBackgroundVariant,
                                                 unfocusedBorderColor = MaterialTheme.appColors.textFieldBorder,
-                                                textColor = MaterialTheme.appColors.textFieldText
+                                                unfocusedTextColor = MaterialTheme.appColors.textFieldText,
+                                                focusedTextColor = MaterialTheme.appColors.textFieldText
                                             ),
                                             enabled = !isClosed
                                         )
@@ -512,11 +517,6 @@ private fun DiscussionResponsesScreen(
                             }
                         }
                     }
-                    PullRefreshIndicator(
-                        refreshing,
-                        pullRefreshState,
-                        Modifier.align(Alignment.TopCenter)
-                    )
                 }
             }
         }
diff --git a/discussion/src/main/java/org/openedx/discussion/presentation/search/DiscussionSearchThreadFragment.kt b/discussion/src/main/java/org/openedx/discussion/presentation/search/DiscussionSearchThreadFragment.kt
index eee3115fa..ba431e348 100644
--- a/discussion/src/main/java/org/openedx/discussion/presentation/search/DiscussionSearchThreadFragment.kt
+++ b/discussion/src/main/java/org/openedx/discussion/presentation/search/DiscussionSearchThreadFragment.kt
@@ -19,17 +19,17 @@ import androidx.compose.foundation.layout.widthIn
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.lazy.rememberLazyListState
-import androidx.compose.material.CircularProgressIndicator
-import androidx.compose.material.Divider
-import androidx.compose.material.ExperimentalMaterialApi
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Scaffold
-import androidx.compose.material.Surface
-import androidx.compose.material.Text
-import androidx.compose.material.pullrefresh.PullRefreshIndicator
-import androidx.compose.material.pullrefresh.pullRefresh
-import androidx.compose.material.pullrefresh.rememberPullRefreshState
-import androidx.compose.material.rememberScaffoldState
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.SnackbarHost
+import androidx.compose.material3.SnackbarHostState
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.material3.pulltorefresh.PullToRefreshBox
+import androidx.compose.material3.pulltorefresh.rememberPullToRefreshState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
@@ -151,7 +151,7 @@ class DiscussionSearchThreadFragment : Fragment() {
     }
 }
 
-@OptIn(ExperimentalMaterialApi::class)
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 private fun DiscussionSearchThreadScreen(
     windowSize: WindowSize,
@@ -165,13 +165,12 @@ private fun DiscussionSearchThreadScreen(
     paginationCallback: () -> Unit,
     onBackClick: () -> Unit
 ) {
-    val scaffoldState = rememberScaffoldState()
     val scrollState = rememberLazyListState()
     val firstVisibleIndex = remember {
         mutableStateOf(scrollState.firstVisibleItemIndex)
     }
-    val pullRefreshState =
-        rememberPullRefreshState(refreshing = refreshing, onRefresh = { onSwipeRefresh() })
+    val pullToRefreshState = rememberPullToRefreshState()
+    val snackbarHostState = remember { SnackbarHostState() }
 
     var textFieldValue by rememberSaveable(stateSaver = TextFieldValue.Saver) {
         mutableStateOf(TextFieldValue(""))
@@ -184,11 +183,11 @@ private fun DiscussionSearchThreadScreen(
         focusManager.clearFocus()
     }
     Scaffold(
-        scaffoldState = scaffoldState,
         modifier = Modifier
             .fillMaxSize()
             .navigationBarsPadding(),
-        backgroundColor = MaterialTheme.appColors.background
+        containerColor = MaterialTheme.appColors.background,
+        snackbarHost = { SnackbarHost(snackbarHostState) }
     ) {
         val screenWidth by remember(key1 = windowSize) {
             mutableStateOf(
@@ -220,7 +219,7 @@ private fun DiscussionSearchThreadScreen(
             )
         }
 
-        HandleUIMessage(uiMessage = uiMessage, scaffoldState = scaffoldState)
+        HandleUIMessage(uiMessage = uiMessage, snackbarHostState = snackbarHostState)
 
         Box(
             modifier = Modifier
@@ -282,10 +281,12 @@ private fun DiscussionSearchThreadScreen(
                 Surface(
                     color = MaterialTheme.appColors.background
                 ) {
-                    Box(
+                    PullToRefreshBox(
                         modifier = Modifier
-                            .fillMaxWidth()
-                            .pullRefresh(pullRefreshState)
+                            .fillMaxWidth(),
+                        isRefreshing = refreshing,
+                        onRefresh = { onSwipeRefresh() },
+                        state = pullToRefreshState
                     ) {
                         val typingText =
                             if (textFieldValue.text.isEmpty()) {
@@ -335,7 +336,7 @@ private fun DiscussionSearchThreadScreen(
                                 is DiscussionSearchThreadUIState.Threads -> {
                                     items(uiState.data) { thread ->
                                         ThreadItem(thread = thread, onClick = onItemClick)
-                                        Divider()
+                                        HorizontalDivider()
                                     }
                                     item {
                                         if (canLoadMore) {
@@ -359,11 +360,6 @@ private fun DiscussionSearchThreadScreen(
                                 }
                             }
                         }
-                        PullRefreshIndicator(
-                            refreshing,
-                            pullRefreshState,
-                            Modifier.align(Alignment.TopCenter)
-                        )
                     }
                 }
             }
diff --git a/discussion/src/main/java/org/openedx/discussion/presentation/threads/DiscussionAddThreadFragment.kt b/discussion/src/main/java/org/openedx/discussion/presentation/threads/DiscussionAddThreadFragment.kt
index 7c7215e35..8cfa2fa59 100644
--- a/discussion/src/main/java/org/openedx/discussion/presentation/threads/DiscussionAddThreadFragment.kt
+++ b/discussion/src/main/java/org/openedx/discussion/presentation/threads/DiscussionAddThreadFragment.kt
@@ -23,24 +23,25 @@ import androidx.compose.foundation.layout.widthIn
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.Checkbox
-import androidx.compose.material.CheckboxDefaults
-import androidx.compose.material.CircularProgressIndicator
-import androidx.compose.material.Icon
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.ModalBottomSheetLayout
-import androidx.compose.material.ModalBottomSheetValue
-import androidx.compose.material.OutlinedTextField
-import androidx.compose.material.Scaffold
-import androidx.compose.material.Surface
-import androidx.compose.material.Tab
-import androidx.compose.material.TabRow
-import androidx.compose.material.Text
-import androidx.compose.material.TextFieldDefaults
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.ExpandMore
-import androidx.compose.material.rememberModalBottomSheetState
-import androidx.compose.material.rememberScaffoldState
+import androidx.compose.material3.Checkbox
+import androidx.compose.material3.CheckboxDefaults
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.ModalBottomSheet
+import androidx.compose.material3.OutlinedTextField
+import androidx.compose.material3.OutlinedTextFieldDefaults
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.SnackbarHost
+import androidx.compose.material3.SnackbarHostState
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Tab
+import androidx.compose.material3.TabRow
+import androidx.compose.material3.Text
+import androidx.compose.material3.rememberModalBottomSheetState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
@@ -79,7 +80,6 @@ import org.openedx.core.ui.OpenEdXButton
 import org.openedx.core.ui.OpenEdXOutlinedTextField
 import org.openedx.core.ui.SheetContent
 import org.openedx.core.ui.displayCutoutForLandscape
-import org.openedx.core.ui.isImeVisibleState
 import org.openedx.core.ui.noRippleClickable
 import org.openedx.core.ui.statusBarsInset
 import org.openedx.core.ui.theme.OpenEdXTheme
@@ -159,6 +159,7 @@ class DiscussionAddThreadFragment : Fragment() {
     }
 }
 
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 private fun DiscussionAddThreadScreen(
     windowSize: WindowSize,
@@ -169,53 +170,37 @@ private fun DiscussionAddThreadScreen(
     onPostDiscussionClick: (String, String, String, String, Boolean) -> Unit,
     onBackClick: () -> Unit,
 ) {
-    val scaffoldState = rememberScaffoldState()
     val focusManager = LocalFocusManager.current
     val keyboardController = LocalSoftwareKeyboardController.current
-    val bottomSheetScaffoldState = rememberModalBottomSheetState(
-        initialValue = ModalBottomSheetValue.Hidden,
-        skipHalfExpanded = true
-    )
+    val sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true)
     val coroutine = rememberCoroutineScope()
-    var currentPage by rememberSaveable {
-        mutableStateOf(0)
-    }
-    var titleValue by rememberSaveable {
-        mutableStateOf("")
-    }
-    var discussionValue by rememberSaveable {
-        mutableStateOf("")
-    }
-    var discussionType by rememberSaveable {
-        mutableStateOf(DiscussionType.DISCUSSION.value)
-    }
-    var postToTopic by rememberSaveable {
-        mutableStateOf(topicData)
-    }
-    var followPost by rememberSaveable {
-        mutableStateOf(false)
-    }
-    val expandedList by rememberSaveable {
-        mutableStateOf(topics)
-    }
+    var showBottomSheet by rememberSaveable { mutableStateOf(false) }
+    var currentPage by rememberSaveable { mutableStateOf(0) }
+    var titleValue by rememberSaveable { mutableStateOf("") }
+    var discussionValue by rememberSaveable { mutableStateOf("") }
+    var discussionType by rememberSaveable { mutableStateOf(DiscussionType.DISCUSSION.value) }
+    var postToTopic by rememberSaveable { mutableStateOf(topicData) }
+    var followPost by rememberSaveable { mutableStateOf(false) }
+    val expandedList by rememberSaveable { mutableStateOf(topics) }
     var searchValue by rememberSaveable(stateSaver = TextFieldValue.Saver) {
         mutableStateOf(TextFieldValue())
     }
-    val isImeVisible by isImeVisibleState()
+    val snackbarHostState = remember { SnackbarHostState() }
 
-    LaunchedEffect(bottomSheetScaffoldState.isVisible) {
-        if (!bottomSheetScaffoldState.isVisible) {
+    LaunchedEffect(showBottomSheet) {
+        if (!showBottomSheet) {
             focusManager.clearFocus()
             searchValue = TextFieldValue()
         }
     }
+
     Scaffold(
-        scaffoldState = scaffoldState,
         modifier = Modifier
             .fillMaxSize()
             .navigationBarsPadding(),
-        backgroundColor = MaterialTheme.appColors.background
-    ) {
+        containerColor = MaterialTheme.appColors.background,
+        snackbarHost = { SnackbarHost(snackbarHostState) }
+    ) { paddingValues ->
         val screenWidth by remember(key1 = windowSize) {
             mutableStateOf(
                 windowSize.windowSizeValue(
@@ -243,229 +228,196 @@ private fun DiscussionAddThreadScreen(
             )
         }
 
-        ModalBottomSheetLayout(
+        HandleUIMessage(uiMessage = uiMessage, snackbarHostState = snackbarHostState)
+
+        Box(
             modifier = Modifier
-                .padding(bottom = if (isImeVisible && bottomSheetScaffoldState.isVisible) 120.dp else 0.dp)
-                .noRippleClickable {
-                    if (bottomSheetScaffoldState.isVisible) {
-                        coroutine.launch {
-                            bottomSheetScaffoldState.hide()
-                        }
-                    }
-                },
-            sheetState = bottomSheetScaffoldState,
-            sheetShape = MaterialTheme.appShapes.screenBackgroundShape,
-            scrimColor = Color.Black.copy(alpha = 0.4f),
-            sheetBackgroundColor = MaterialTheme.appColors.background,
-            sheetContent = {
-                SheetContent(
-                    title = stringResource(id = discussionR.string.discussion_topic),
-                    searchValue = searchValue,
-                    expandedList = expandedList,
-                    onItemClick = { item ->
-                        postToTopic = item
-                        coroutine.launch {
-                            bottomSheetScaffoldState.hide()
-                        }
-                    },
-                    searchValueChanged = {
-                        searchValue = TextFieldValue(it)
-                    }
-                )
-            }
+                .fillMaxSize()
+                .padding(paddingValues)
+                .statusBarsInset()
+                .displayCutoutForLandscape(),
+            contentAlignment = Alignment.TopCenter
         ) {
-            HandleUIMessage(uiMessage = uiMessage, scaffoldState = scaffoldState)
-
-            Box(
-                modifier = Modifier
-                    .fillMaxSize()
-                    .padding(it)
-                    .statusBarsInset()
-                    .displayCutoutForLandscape(),
-                contentAlignment = Alignment.TopCenter
-            ) {
+            Column(screenWidth) {
                 Column(
-                    screenWidth
+                    modifier = Modifier.fillMaxWidth(),
+                    horizontalAlignment = Alignment.CenterHorizontally,
+                    verticalArrangement = Arrangement.Center
                 ) {
-                    Column(
-                        modifier = Modifier
-                            .fillMaxWidth(),
-                        horizontalAlignment = Alignment.CenterHorizontally,
-                        verticalArrangement = Arrangement.Center
+                    Box(
+                        modifier = Modifier.fillMaxWidth(),
+                        contentAlignment = Alignment.CenterStart,
                     ) {
-                        Box(
+                        BackBtn { onBackClick() }
+                        Text(
                             modifier = Modifier
-                                .fillMaxWidth(),
-                            contentAlignment = Alignment.CenterStart,
+                                .fillMaxWidth()
+                                .padding(horizontal = 48.dp),
+                            text = if (currentPage == 0) {
+                                stringResource(id = discussionR.string.discussion_create_post)
+                            } else {
+                                stringResource(id = discussionR.string.discussion_create_question)
+                            },
+                            color = MaterialTheme.appColors.textPrimary,
+                            textAlign = TextAlign.Center,
+                            style = MaterialTheme.appTypography.titleMedium,
+                            maxLines = 1,
+                            overflow = TextOverflow.Ellipsis
+                        )
+                    }
+                }
+                Surface(
+                    modifier = Modifier.padding(top = 6.dp),
+                    color = MaterialTheme.appColors.background,
+                    shape = MaterialTheme.appShapes.screenBackgroundShape
+                ) {
+                    Column(
+                        Modifier
+                            .fillMaxSize()
+                            .background(MaterialTheme.appColors.background)
+                            .verticalScroll(rememberScrollState())
+                    ) {
+                        Column(
+                            Modifier.padding(horizontal = contentPadding, vertical = 32.dp),
+                            horizontalAlignment = Alignment.CenterHorizontally
                         ) {
-                            BackBtn {
-                                onBackClick()
-                            }
                             Text(
+                                modifier = Modifier.fillMaxWidth(),
+                                text = stringResource(id = discussionR.string.discussion_select_post_type),
+                                style = MaterialTheme.appTypography.titleMedium,
+                                color = MaterialTheme.appColors.textPrimary
+                            )
+                            Spacer(Modifier.height(16.dp))
+                            Tabs(
+                                tabs = listOf(
+                                    stringResource(id = discussionR.string.discussion_discussion),
+                                    stringResource(id = discussionR.string.discussion_question)
+                                ),
+                                currentPage = currentPage,
+                                onItemClick = { bool ->
+                                    if (bool) {
+                                        discussionType = DiscussionType.QUESTION.value
+                                        currentPage = 1
+                                    } else {
+                                        discussionType = DiscussionType.DISCUSSION.value
+                                        currentPage = 0
+                                    }
+                                }
+                            )
+                            Spacer(Modifier.height(24.dp))
+                            SelectableField(
+                                text = postToTopic.first,
+                                onClick = { showBottomSheet = true }
+                            )
+                            Spacer(Modifier.height(24.dp))
+                            OpenEdXOutlinedTextField(
+                                modifier = Modifier.fillMaxWidth(),
+                                stringResource(id = discussionR.string.discussion_title),
+                                isSingleLine = true,
+                                withRequiredMark = true,
+                                imeAction = ImeAction.Next,
+                                keyboardActions = { fm -> fm.clearFocus() },
+                                onValueChanged = { value -> titleValue = value }
+                            )
+                            Spacer(Modifier.height(24.dp))
+                            OpenEdXOutlinedTextField(
                                 modifier = Modifier
                                     .fillMaxWidth()
-                                    .padding(horizontal = 48.dp),
-                                text = if (currentPage == 0) {
-                                    stringResource(id = discussionR.string.discussion_create_post)
+                                    .height(150.dp),
+                                title = if (currentPage == 0) {
+                                    stringResource(id = discussionR.string.discussion_discussion)
                                 } else {
-                                    stringResource(id = discussionR.string.discussion_create_question)
+                                    stringResource(id = discussionR.string.discussion_question)
                                 },
-                                color = MaterialTheme.appColors.textPrimary,
-                                textAlign = TextAlign.Center,
-                                style = MaterialTheme.appTypography.titleMedium,
-                                maxLines = 1,
-                                overflow = TextOverflow.Ellipsis
+                                isSingleLine = false,
+                                withRequiredMark = true,
+                                imeAction = ImeAction.Default,
+                                keyboardActions = { fm ->
+                                    fm.clearFocus()
+                                    keyboardController?.hide()
+                                },
+                                onValueChanged = { value -> discussionValue = value }
                             )
-                        }
-                    }
-                    Surface(
-                        modifier = Modifier.padding(top = 6.dp),
-                        color = MaterialTheme.appColors.background,
-                        shape = MaterialTheme.appShapes.screenBackgroundShape
-                    ) {
-                        Column(
-                            Modifier
-                                .fillMaxSize()
-                                .background(MaterialTheme.appColors.background)
-                                .verticalScroll(rememberScrollState())
-                        ) {
-                            Column(
-                                Modifier.padding(horizontal = contentPadding, vertical = 32.dp),
-                                horizontalAlignment = Alignment.CenterHorizontally
+                            Spacer(Modifier.height(16.dp))
+                            Row(
+                                Modifier.fillMaxWidth(),
+                                verticalAlignment = Alignment.CenterVertically
                             ) {
-                                Text(
-                                    modifier = Modifier.fillMaxWidth(),
-                                    text = stringResource(id = discussionR.string.discussion_select_post_type),
-                                    style = MaterialTheme.appTypography.titleMedium,
-                                    color = MaterialTheme.appColors.textPrimary
-                                )
-                                Spacer(Modifier.height(16.dp))
-                                Tabs(
-                                    tabs = listOf(
-                                        stringResource(id = discussionR.string.discussion_discussion),
-                                        stringResource(id = discussionR.string.discussion_question)
+                                Checkbox(
+                                    modifier = Modifier.size(24.dp),
+                                    colors = CheckboxDefaults.colors(
+                                        checkedColor = MaterialTheme.appColors.primary,
+                                        uncheckedColor = MaterialTheme.appColors.textFieldText
                                     ),
-                                    currentPage = currentPage,
-                                    onItemClick = { bool ->
-                                        if (bool) {
-                                            discussionType = DiscussionType.QUESTION.value
-                                            currentPage = 1
-                                        } else {
-                                            discussionType = DiscussionType.DISCUSSION.value
-                                            currentPage = 0
-                                        }
-                                    }
-                                )
-                                Spacer(Modifier.height(24.dp))
-                                SelectableField(
-                                    text = postToTopic.first,
-                                    onClick = {
-                                        coroutine.launch {
-                                            if (bottomSheetScaffoldState.isVisible) {
-                                                bottomSheetScaffoldState.hide()
-                                            } else {
-                                                bottomSheetScaffoldState.show()
-                                            }
-                                        }
-                                    }
+                                    checked = followPost,
+                                    onCheckedChange = { followPost = it }
                                 )
-                                Spacer(Modifier.height(24.dp))
-                                OpenEdXOutlinedTextField(
-                                    modifier = Modifier
-                                        .fillMaxWidth(),
-                                    stringResource(id = discussionR.string.discussion_title),
-                                    isSingleLine = true,
-                                    withRequiredMark = true,
-                                    imeAction = ImeAction.Next,
-                                    keyboardActions = { focusManager ->
-                                        focusManager.clearFocus()
+                                Spacer(Modifier.width(6.dp))
+                                Text(
+                                    text = if (currentPage == 0) {
+                                        stringResource(id = discussionR.string.discussion_follow_discussion)
+                                    } else {
+                                        stringResource(id = discussionR.string.discussion_follow_question)
                                     },
-                                    onValueChanged = { value ->
-                                        titleValue = value
+                                    color = MaterialTheme.appColors.textFieldText,
+                                    style = MaterialTheme.appTypography.labelLarge,
+                                    modifier = Modifier.noRippleClickable {
+                                        followPost = !followPost
                                     }
                                 )
-                                Spacer(Modifier.height(24.dp))
-                                OpenEdXOutlinedTextField(
-                                    modifier = Modifier
-                                        .fillMaxWidth()
-                                        .height(150.dp),
-                                    title = if (currentPage == 0) {
-                                        stringResource(id = discussionR.string.discussion_discussion)
+                            }
+                            Spacer(Modifier.height(44.dp))
+                            if (isLoading) {
+                                CircularProgressIndicator(color = MaterialTheme.appColors.primary)
+                            } else {
+                                OpenEdXButton(
+                                    modifier = buttonWidth,
+                                    text = if (currentPage == 0) {
+                                        stringResource(id = discussionR.string.discussion_create_post)
                                     } else {
-                                        stringResource(
-                                            id = discussionR.string.discussion_question
-                                        )
+                                        stringResource(id = discussionR.string.discussion_create_question)
                                     },
-                                    isSingleLine = false,
-                                    withRequiredMark = true,
-                                    imeAction = ImeAction.Default,
-                                    keyboardActions = { focusManager ->
-                                        focusManager.clearFocus()
-                                        keyboardController?.hide()
-                                    },
-                                    onValueChanged = { value ->
-                                        discussionValue = value
+                                    onClick = {
+                                        onPostDiscussionClick(
+                                            discussionType,
+                                            postToTopic.second,
+                                            titleValue,
+                                            discussionValue,
+                                            followPost
+                                        )
                                     }
                                 )
-                                Spacer(Modifier.height(16.dp))
-                                Row(
-                                    Modifier.fillMaxWidth(),
-                                    verticalAlignment = Alignment.CenterVertically
-                                ) {
-                                    Checkbox(
-                                        modifier = Modifier.size(24.dp),
-                                        colors = CheckboxDefaults.colors(
-                                            checkedColor = MaterialTheme.appColors.primary,
-                                            uncheckedColor = MaterialTheme.appColors.textFieldText
-                                        ),
-                                        checked = followPost,
-                                        onCheckedChange = {
-                                            followPost = it
-                                        }
-                                    )
-                                    Spacer(Modifier.width(6.dp))
-                                    Text(
-                                        text = if (currentPage == 0) {
-                                            stringResource(id = discussionR.string.discussion_follow_discussion)
-                                        } else {
-                                            stringResource(id = discussionR.string.discussion_follow_question)
-                                        },
-                                        color = MaterialTheme.appColors.textFieldText,
-                                        style = MaterialTheme.appTypography.labelLarge,
-                                        modifier = Modifier.noRippleClickable {
-                                            followPost = !followPost
-                                        }
-                                    )
-                                }
-                                Spacer(Modifier.height(44.dp))
-                                if (isLoading) {
-                                    CircularProgressIndicator(color = MaterialTheme.appColors.primary)
-                                } else {
-                                    OpenEdXButton(
-                                        modifier = buttonWidth,
-                                        text = if (currentPage == 0) {
-                                            stringResource(id = discussionR.string.discussion_create_post)
-                                        } else {
-                                            stringResource(id = discussionR.string.discussion_create_question)
-                                        },
-                                        onClick = {
-                                            onPostDiscussionClick(
-                                                discussionType,
-                                                postToTopic.second,
-                                                titleValue,
-                                                discussionValue,
-                                                followPost
-                                            )
-                                        }
-                                    )
-                                }
-                                Spacer(Modifier.height(40.dp))
                             }
+                            Spacer(Modifier.height(40.dp))
                         }
                     }
                 }
             }
         }
+
+        if (showBottomSheet) {
+            ModalBottomSheet(
+                onDismissRequest = { showBottomSheet = false },
+                sheetState = sheetState,
+                shape = MaterialTheme.appShapes.screenBackgroundShape,
+                containerColor = MaterialTheme.appColors.background,
+                scrimColor = Color.Black.copy(alpha = 0.4f),
+            ) {
+                SheetContent(
+                    title = stringResource(id = discussionR.string.discussion_topic),
+                    searchValue = searchValue,
+                    expandedList = expandedList,
+                    onItemClick = { item ->
+                        postToTopic = item
+                        coroutine.launch {
+                            sheetState.hide()
+                            showBottomSheet = false
+                        }
+                    },
+                    searchValueChanged = { searchValue = TextFieldValue(it) }
+                )
+            }
+        }
     }
 }
 
@@ -479,7 +431,7 @@ private fun Tabs(
     val isFirstPage = currentPage == 0
     TabRow(
         selectedTabIndex = currentPage,
-        backgroundColor = MaterialTheme.appColors.surface,
+        containerColor = MaterialTheme.appColors.surface,
         modifier = Modifier
             .fillMaxWidth()
             .padding(vertical = 4.dp)
@@ -491,7 +443,8 @@ private fun Tabs(
             ),
         indicator = { _ ->
             Box {}
-        }
+        },
+        divider = {}
     ) {
         tabs.forEachIndexed { index, text ->
             val selected = currentPage == index
@@ -543,12 +496,11 @@ private fun SelectableField(
             readOnly = true,
             enabled = false,
             value = text,
-            colors = TextFieldDefaults.outlinedTextFieldColors(
+            colors = OutlinedTextFieldDefaults.colors(
                 disabledBorderColor = MaterialTheme.appColors.textFieldBorder,
-                backgroundColor = MaterialTheme.appColors.surface,
-                textColor = MaterialTheme.appColors.textFieldText,
-                unfocusedLabelColor = MaterialTheme.appColors.textFieldText,
-                disabledTextColor = MaterialTheme.appColors.textFieldText
+                disabledContainerColor = MaterialTheme.appColors.surface,
+                disabledTextColor = MaterialTheme.appColors.textFieldText,
+                unfocusedLabelColor = MaterialTheme.appColors.textFieldText
             ),
             shape = MaterialTheme.appShapes.textFieldShape,
             textStyle = MaterialTheme.appTypography.bodyMedium,
diff --git a/discussion/src/main/java/org/openedx/discussion/presentation/threads/DiscussionThreadsFragment.kt b/discussion/src/main/java/org/openedx/discussion/presentation/threads/DiscussionThreadsFragment.kt
index 7e7af161e..a5685f457 100644
--- a/discussion/src/main/java/org/openedx/discussion/presentation/threads/DiscussionThreadsFragment.kt
+++ b/discussion/src/main/java/org/openedx/discussion/presentation/threads/DiscussionThreadsFragment.kt
@@ -26,21 +26,20 @@ import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.CircularProgressIndicator
-import androidx.compose.material.Divider
-import androidx.compose.material.ExperimentalMaterialApi
-import androidx.compose.material.Icon
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.ModalBottomSheetLayout
-import androidx.compose.material.ModalBottomSheetValue
-import androidx.compose.material.Scaffold
-import androidx.compose.material.Surface
-import androidx.compose.material.Text
-import androidx.compose.material.pullrefresh.PullRefreshIndicator
-import androidx.compose.material.pullrefresh.pullRefresh
-import androidx.compose.material.pullrefresh.rememberPullRefreshState
-import androidx.compose.material.rememberModalBottomSheetState
-import androidx.compose.material.rememberScaffoldState
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.ModalBottomSheet
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.SnackbarHost
+import androidx.compose.material3.SnackbarHostState
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.material3.pulltorefresh.PullToRefreshBox
+import androidx.compose.material3.pulltorefresh.rememberPullToRefreshState
+import androidx.compose.material3.rememberModalBottomSheetState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
@@ -70,7 +69,6 @@ import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.core.os.bundleOf
 import androidx.fragment.app.Fragment
-import kotlinx.coroutines.launch
 import org.koin.android.ext.android.inject
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koin.core.parameter.parametersOf
@@ -81,8 +79,6 @@ import org.openedx.core.ui.IconText
 import org.openedx.core.ui.OpenEdXOutlinedButton
 import org.openedx.core.ui.SheetContent
 import org.openedx.core.ui.displayCutoutForLandscape
-import org.openedx.core.ui.isImeVisibleState
-import org.openedx.core.ui.noRippleClickable
 import org.openedx.core.ui.shouldLoadMore
 import org.openedx.core.ui.statusBarsInset
 import org.openedx.core.ui.theme.OpenEdXTheme
@@ -211,7 +207,7 @@ class DiscussionThreadsFragment : Fragment() {
 }
 
 @Suppress("MaximumLineLength", "MaxLineLength")
-@OptIn(ExperimentalMaterialApi::class)
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 private fun DiscussionThreadsScreen(
     windowSize: WindowSize,
@@ -229,20 +225,15 @@ private fun DiscussionThreadsScreen(
     paginationCallback: () -> Unit,
     onBackClick: () -> Unit
 ) {
-    val scaffoldState = rememberScaffoldState()
-    val bottomSheetScaffoldState = rememberModalBottomSheetState(
-        initialValue = ModalBottomSheetValue.Hidden,
-        skipHalfExpanded = true
-    )
+    val sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true)
     val focusManager = LocalFocusManager.current
-    val pullRefreshState =
-        rememberPullRefreshState(refreshing = refreshing, onRefresh = { onSwipeRefresh() })
+    val pullToRefreshState = rememberPullToRefreshState()
+    val snackbarHostState = remember { SnackbarHostState() }
     val coroutine = rememberCoroutineScope()
     val scrollState = rememberLazyListState()
-    val firstVisibleIndex = remember {
-        mutableStateOf(scrollState.firstVisibleItemIndex)
-    }
+    val firstVisibleIndex = remember { mutableStateOf(scrollState.firstVisibleItemIndex) }
     val context = LocalContext.current
+    var showBottomSheet by rememberSaveable { mutableStateOf(false) }
     var sortType by rememberSaveable {
         mutableStateOf(
             Pair(
@@ -259,19 +250,12 @@ private fun DiscussionThreadsScreen(
             )
         )
     }
-    var expandedList by rememberSaveable {
-        mutableStateOf(emptyList<Pair<String, String>>())
-    }
-    var currentSelectedList by rememberSaveable {
-        mutableStateOf("")
-    }
-
+    var expandedList by rememberSaveable { mutableStateOf(emptyList<Pair<String, String>>()) }
+    var currentSelectedList by rememberSaveable { mutableStateOf("") }
     var searchValue by rememberSaveable(stateSaver = TextFieldValue.Saver) {
         mutableStateOf(TextFieldValue())
     }
 
-    val isImeVisible by isImeVisibleState()
-
     val scaffoldModifier = if (viewType == FragmentViewType.FULL_CONTENT) {
         Modifier
             .fillMaxSize()
@@ -285,21 +269,20 @@ private fun DiscussionThreadsScreen(
             .fillMaxSize()
             .statusBarsInset()
     } else {
-        Modifier
-            .fillMaxSize()
+        Modifier.fillMaxSize()
     }
 
-    LaunchedEffect(bottomSheetScaffoldState.isVisible) {
-        if (!bottomSheetScaffoldState.isVisible) {
+    LaunchedEffect(showBottomSheet) {
+        if (!showBottomSheet) {
             focusManager.clearFocus()
             searchValue = TextFieldValue()
         }
     }
 
     Scaffold(
-        scaffoldState = scaffoldState,
         modifier = scaffoldModifier,
-        backgroundColor = MaterialTheme.appColors.background
+        containerColor = MaterialTheme.appColors.background,
+        snackbarHost = { SnackbarHost(snackbarHostState) }
     ) {
         val contentWidth by remember(key1 = windowSize) {
             mutableStateOf(
@@ -333,355 +316,330 @@ private fun DiscussionThreadsScreen(
             )
         }
 
-        HandleUIMessage(uiMessage = uiMessage, scaffoldState = scaffoldState)
+        HandleUIMessage(uiMessage = uiMessage, snackbarHostState = snackbarHostState)
 
-        ModalBottomSheetLayout(
+        Box(
             modifier = Modifier
-                .padding(bottom = if (isImeVisible && bottomSheetScaffoldState.isVisible) 120.dp else 0.dp)
-                .noRippleClickable {
-                    if (bottomSheetScaffoldState.isVisible) {
-                        coroutine.launch {
-                            bottomSheetScaffoldState.hide()
-                        }
-                    }
-                },
-            sheetShape = MaterialTheme.appShapes.screenBackgroundShape,
-            sheetState = bottomSheetScaffoldState,
-            scrimColor = Color.Black.copy(alpha = 0.4f),
-            sheetBackgroundColor = MaterialTheme.appColors.background,
-            sheetContent = {
-                SheetContent(
-                    searchValue = searchValue,
-                    expandedList = expandedList,
-                    onItemClick = { item ->
-                        when (currentSelectedList) {
-                            FilterType.type -> {
-                                filterType = item
-                                updatedFilter(filterType.second)
-                            }
-
-                            SortType.type -> {
-                                sortType = item
-                                updatedOrder(sortType.second)
-                            }
-                        }
-                        coroutine.launch {
-                            bottomSheetScaffoldState.hide()
-                        }
-                    },
-                    searchValueChanged = {
-                        searchValue = TextFieldValue(it)
-                    }
-                )
-            }
+                .fillMaxSize()
+                .padding(it)
+                .displayCutoutForLandscape()
+                .then(statusBarInsets),
+            contentAlignment = Alignment.TopCenter
         ) {
-            Box(
-                modifier = Modifier
-                    .fillMaxSize()
-                    .padding(it)
-                    .displayCutoutForLandscape()
-                    .then(statusBarInsets),
-                contentAlignment = Alignment.TopCenter
-            ) {
-                Column(contentWidth) {
-                    if (viewType == FragmentViewType.FULL_CONTENT) {
-                        Column(
+            Column(contentWidth) {
+                if (viewType == FragmentViewType.FULL_CONTENT) {
+                    Column(
+                        modifier = Modifier
+                            .fillMaxWidth(),
+                        horizontalAlignment = Alignment.CenterHorizontally,
+                        verticalArrangement = Arrangement.Center
+                    ) {
+                        Box(
                             modifier = Modifier
                                 .fillMaxWidth(),
-                            horizontalAlignment = Alignment.CenterHorizontally,
-                            verticalArrangement = Arrangement.Center
+                            contentAlignment = Alignment.CenterStart
                         ) {
-                            Box(
-                                modifier = Modifier
-                                    .fillMaxWidth(),
-                                contentAlignment = Alignment.CenterStart
-                            ) {
-                                BackBtn {
-                                    onBackClick()
-                                }
-                                Text(
-                                    modifier = Modifier
-                                        .fillMaxWidth()
-                                        .padding(horizontal = 48.dp),
-                                    text = title,
-                                    color = MaterialTheme.appColors.textPrimary,
-                                    textAlign = TextAlign.Center,
-                                    style = MaterialTheme.appTypography.titleMedium,
-                                    maxLines = 1,
-                                    overflow = TextOverflow.Ellipsis
-                                )
+                            BackBtn {
+                                onBackClick()
                             }
+                            Text(
+                                modifier = Modifier
+                                    .fillMaxWidth()
+                                    .padding(horizontal = 48.dp),
+                                text = title,
+                                color = MaterialTheme.appColors.textPrimary,
+                                textAlign = TextAlign.Center,
+                                style = MaterialTheme.appTypography.titleMedium,
+                                maxLines = 1,
+                                overflow = TextOverflow.Ellipsis
+                            )
                         }
                     }
-                    Surface(
-                        modifier = Modifier.padding(
-                            top = if (viewType == FragmentViewType.FULL_CONTENT) {
-                                6.dp
-                            } else {
-                                0.dp
-                            }
-                        ),
-                        color = MaterialTheme.appColors.background
+                }
+                Surface(
+                    modifier = Modifier.padding(
+                        top = if (viewType == FragmentViewType.FULL_CONTENT) {
+                            6.dp
+                        } else {
+                            0.dp
+                        }
+                    ),
+                    color = MaterialTheme.appColors.background
+                ) {
+                    PullToRefreshBox(
+                        isRefreshing = refreshing,
+                        onRefresh = { onSwipeRefresh() },
+                        state = pullToRefreshState
                     ) {
-                        Box(Modifier.pullRefresh(pullRefreshState)) {
-                            when (uiState) {
-                                is DiscussionThreadsUIState.Threads -> {
-                                    Box(
-                                        Modifier.fillMaxSize(),
-                                        contentAlignment = Alignment.BottomCenter
-                                    ) {
-                                        Column(Modifier.fillMaxSize()) {
-                                            Row(
-                                                Modifier
-                                                    .fillMaxWidth()
-                                                    .background(MaterialTheme.appColors.background)
-                                                    .padding(
-                                                        horizontal = sortButtonsPadding,
-                                                        vertical = 16.dp
-                                                    ),
-                                                verticalAlignment = Alignment.CenterVertically,
-                                                horizontalArrangement = Arrangement.SpaceBetween
+                        when (uiState) {
+                            is DiscussionThreadsUIState.Threads -> {
+                                Box(
+                                    Modifier.fillMaxSize(),
+                                    contentAlignment = Alignment.BottomCenter
+                                ) {
+                                    Column(Modifier.fillMaxSize()) {
+                                        Row(
+                                            Modifier
+                                                .fillMaxWidth()
+                                                .background(MaterialTheme.appColors.background)
+                                                .padding(
+                                                    horizontal = sortButtonsPadding,
+                                                    vertical = 16.dp
+                                                ),
+                                            verticalAlignment = Alignment.CenterVertically,
+                                            horizontalArrangement = Arrangement.SpaceBetween
+                                        ) {
+                                            IconText(
+                                                text = filterType.first,
+                                                painter = painterResource(
+                                                    id = discussionR.drawable.discussion_ic_filter
+                                                ),
+                                                textStyle = MaterialTheme.appTypography.labelMedium,
+                                                color = MaterialTheme.appColors.textPrimary,
+                                                onClick = {
+                                                    currentSelectedList = FilterType.type
+                                                    expandedList = listOf(
+                                                        Pair(
+                                                            context.getString(FilterType.ALL_POSTS.textRes),
+                                                            FilterType.ALL_POSTS.value
+                                                        ),
+                                                        Pair(
+                                                            context.getString(FilterType.UNREAD.textRes),
+                                                            FilterType.UNREAD.value
+                                                        ),
+                                                        Pair(
+                                                            context.getString(FilterType.UNANSWERED.textRes),
+                                                            FilterType.UNANSWERED.value
+                                                        )
+                                                    )
+                                                    showBottomSheet = true
+                                                }
+                                            )
+                                            IconText(
+                                                text = sortType.first,
+                                                painter = painterResource(
+                                                    id = discussionR.drawable.discussion_ic_sort
+                                                ),
+                                                textStyle = MaterialTheme.appTypography.labelMedium,
+                                                color = MaterialTheme.appColors.textPrimary,
+                                                onClick = {
+                                                    currentSelectedList = SortType.type
+                                                    expandedList = listOf(
+                                                        Pair(
+                                                            context.getString(SortType.LAST_ACTIVITY_AT.textRes),
+                                                            SortType.LAST_ACTIVITY_AT.queryParam
+                                                        ),
+                                                        Pair(
+                                                            context.getString(SortType.COMMENT_COUNT.textRes),
+                                                            SortType.COMMENT_COUNT.queryParam
+                                                        ),
+                                                        Pair(
+                                                            context.getString(SortType.VOTE_COUNT.textRes),
+                                                            SortType.VOTE_COUNT.queryParam
+                                                        )
+                                                    )
+                                                    showBottomSheet = true
+                                                }
+                                            )
+                                        }
+                                        HorizontalDivider()
+                                        if (uiState.data.isNotEmpty()) {
+                                            LazyColumn(
+                                                modifier = Modifier.fillMaxSize(),
+                                                contentPadding = listPadding,
+                                                state = scrollState
                                             ) {
-                                                IconText(
-                                                    text = filterType.first,
-                                                    painter = painterResource(
-                                                        id = discussionR.drawable.discussion_ic_filter
-                                                    ),
-                                                    textStyle = MaterialTheme.appTypography.labelMedium,
-                                                    color = MaterialTheme.appColors.textPrimary,
-                                                    onClick = {
-                                                        currentSelectedList = FilterType.type
-                                                        expandedList = listOf(
-                                                            Pair(
-                                                                context.getString(FilterType.ALL_POSTS.textRes),
-                                                                FilterType.ALL_POSTS.value
-                                                            ),
-                                                            Pair(
-                                                                context.getString(FilterType.UNREAD.textRes),
-                                                                FilterType.UNREAD.value
-                                                            ),
-                                                            Pair(
-                                                                context.getString(FilterType.UNANSWERED.textRes),
-                                                                FilterType.UNANSWERED.value
-                                                            )
+                                                item {
+                                                    Row(
+                                                        modifier = Modifier
+                                                            .fillMaxWidth()
+                                                            .padding(vertical = 8.dp),
+                                                        horizontalArrangement = Arrangement.SpaceBetween,
+                                                        verticalAlignment = Alignment.CenterVertically
+                                                    ) {
+                                                        Text(
+                                                            modifier = Modifier.weight(1f),
+                                                            text = title,
+                                                            color = MaterialTheme.appColors.textPrimary,
+                                                            style = MaterialTheme.appTypography.titleLarge
                                                         )
-                                                        coroutine.launch {
-                                                            if (bottomSheetScaffoldState.isVisible) {
-                                                                bottomSheetScaffoldState.hide()
-                                                            } else {
-                                                                bottomSheetScaffoldState.show()
-                                                            }
-                                                        }
-                                                    }
-                                                )
-                                                IconText(
-                                                    text = sortType.first,
-                                                    painter = painterResource(
-                                                        id = discussionR.drawable.discussion_ic_sort
-                                                    ),
-                                                    textStyle = MaterialTheme.appTypography.labelMedium,
-                                                    color = MaterialTheme.appColors.textPrimary,
-                                                    onClick = {
-                                                        currentSelectedList = SortType.type
-                                                        expandedList = listOf(
-                                                            Pair(
-                                                                context.getString(SortType.LAST_ACTIVITY_AT.textRes),
-                                                                SortType.LAST_ACTIVITY_AT.queryParam
-                                                            ),
-                                                            Pair(
-                                                                context.getString(SortType.COMMENT_COUNT.textRes),
-                                                                SortType.COMMENT_COUNT.queryParam
-                                                            ),
-                                                            Pair(
-                                                                context.getString(SortType.VOTE_COUNT.textRes),
-                                                                SortType.VOTE_COUNT.queryParam
+                                                        Box(
+                                                            Modifier
+                                                                .size(40.dp)
+                                                                .clip(CircleShape)
+                                                                .background(
+                                                                    MaterialTheme.appColors.secondaryButtonBackground
+                                                                )
+                                                                .clickable {
+                                                                    onCreatePostClick()
+                                                                },
+                                                            contentAlignment = Alignment.Center
+                                                        ) {
+                                                            Icon(
+                                                                modifier = Modifier.size(16.dp),
+                                                                painter = painterResource(
+                                                                    discussionR.drawable.discussion_ic_add_comment
+                                                                ),
+                                                                contentDescription = stringResource(
+                                                                    discussionR.string.discussion_add_comment
+                                                                ),
+                                                                tint = MaterialTheme.appColors.primaryButtonText
                                                             )
-                                                        )
-                                                        coroutine.launch {
-                                                            if (bottomSheetScaffoldState.isVisible) {
-                                                                bottomSheetScaffoldState.hide()
-                                                            } else {
-                                                                bottomSheetScaffoldState.show()
-                                                            }
                                                         }
                                                     }
-                                                )
-                                            }
-                                            Divider()
-                                            if (uiState.data.isNotEmpty()) {
-                                                LazyColumn(
-                                                    modifier = Modifier.fillMaxSize(),
-                                                    contentPadding = listPadding,
-                                                    state = scrollState
-                                                ) {
-                                                    item {
-                                                        Row(
+                                                }
+                                                items(uiState.data) { threadItem ->
+                                                    ThreadItem(thread = threadItem, onClick = {
+                                                        onItemClick(it)
+                                                    })
+                                                    HorizontalDivider()
+                                                }
+                                                item {
+                                                    if (canLoadMore) {
+                                                        Box(
                                                             modifier = Modifier
                                                                 .fillMaxWidth()
-                                                                .padding(vertical = 8.dp),
-                                                            horizontalArrangement = Arrangement.SpaceBetween,
-                                                            verticalAlignment = Alignment.CenterVertically
+                                                                .padding(vertical = 16.dp),
+                                                            contentAlignment = Alignment.Center
                                                         ) {
-                                                            Text(
-                                                                modifier = Modifier.weight(1f),
-                                                                text = title,
-                                                                color = MaterialTheme.appColors.textPrimary,
-                                                                style = MaterialTheme.appTypography.titleLarge
+                                                            CircularProgressIndicator(
+                                                                color = MaterialTheme.appColors.primary
                                                             )
-                                                            Box(
-                                                                Modifier
-                                                                    .size(40.dp)
-                                                                    .clip(CircleShape)
-                                                                    .background(
-                                                                        MaterialTheme.appColors.secondaryButtonBackground
-                                                                    )
-                                                                    .clickable {
-                                                                        onCreatePostClick()
-                                                                    },
-                                                                contentAlignment = Alignment.Center
-                                                            ) {
-                                                                Icon(
-                                                                    modifier = Modifier.size(16.dp),
-                                                                    painter = painterResource(
-                                                                        discussionR.drawable.discussion_ic_add_comment
-                                                                    ),
-                                                                    contentDescription = stringResource(
-                                                                        discussionR.string.discussion_add_comment
-                                                                    ),
-                                                                    tint = MaterialTheme.appColors.primaryButtonText
-                                                                )
-                                                            }
                                                         }
                                                     }
-                                                    items(uiState.data) { threadItem ->
-                                                        ThreadItem(thread = threadItem, onClick = {
-                                                            onItemClick(it)
-                                                        })
-                                                        Divider()
-                                                    }
-                                                    item {
-                                                        if (canLoadMore) {
-                                                            Box(
-                                                                modifier = Modifier
-                                                                    .fillMaxWidth()
-                                                                    .padding(vertical = 16.dp),
-                                                                contentAlignment = Alignment.Center
-                                                            ) {
-                                                                CircularProgressIndicator(
-                                                                    color = MaterialTheme.appColors.primary
-                                                                )
-                                                            }
-                                                        }
-                                                    }
-                                                    if (scrollState.shouldLoadMore(
-                                                            firstVisibleIndex,
-                                                            LOAD_MORE_THRESHOLD
-                                                        )
-                                                    ) {
-                                                        paginationCallback()
-                                                    }
                                                 }
-                                            } else {
-                                                val noDiscussionsScrollState = rememberScrollState()
-                                                Column(
-                                                    modifier = Modifier
-                                                        .align(Alignment.CenterHorizontally)
-                                                        .verticalScroll(noDiscussionsScrollState)
-                                                        .padding(24.dp),
-                                                    horizontalAlignment = Alignment.CenterHorizontally,
-                                                    verticalArrangement = Arrangement.Center
-                                                ) {
-                                                    Text(
-                                                        modifier = Modifier
-                                                            .fillMaxWidth(),
-                                                        text = title,
-                                                        color = MaterialTheme.appColors.textPrimary,
-                                                        style = MaterialTheme.appTypography.titleLarge
-                                                    )
-                                                    Spacer(modifier = Modifier.height(20.dp))
-                                                    Icon(
-                                                        modifier = Modifier.size(100.dp),
-                                                        painter = painterResource(
-                                                            id = discussionR.drawable.discussion_ic_empty
-                                                        ),
-                                                        contentDescription = null,
-                                                        tint = MaterialTheme.appColors.textPrimary
-                                                    )
-                                                    Spacer(Modifier.height(36.dp))
-                                                    Text(
-                                                        modifier = Modifier.fillMaxWidth(),
-                                                        text = stringResource(discussionR.string.discussion_no_yet),
-                                                        style = MaterialTheme.appTypography.titleLarge,
-                                                        color = MaterialTheme.appColors.textPrimary,
-                                                        textAlign = TextAlign.Center
-                                                    )
-                                                    Spacer(Modifier.height(12.dp))
-                                                    Text(
-                                                        modifier = Modifier.fillMaxWidth(),
-                                                        text = stringResource(
-                                                            discussionR.string.discussion_click_button_create_discussion
-                                                        ),
-                                                        style = MaterialTheme.appTypography.bodyLarge,
-                                                        color = MaterialTheme.appColors.textPrimary,
-                                                        textAlign = TextAlign.Center
-                                                    )
-                                                    Spacer(Modifier.height(40.dp))
-                                                    OpenEdXOutlinedButton(
-                                                        modifier = Modifier
-                                                            .widthIn(184.dp, Dp.Unspecified),
-                                                        text = stringResource(
-                                                            id = discussionR.string.discussion_create_post
-                                                        ),
-                                                        onClick = {
-                                                            onCreatePostClick()
-                                                        },
-                                                        content = {
-                                                            Icon(
-                                                                painter = painterResource(
-                                                                    id = discussionR.drawable.discussion_ic_add_comment
-                                                                ),
-                                                                contentDescription = null,
-                                                                tint = MaterialTheme.appColors.primary
-                                                            )
-                                                            Spacer(modifier = Modifier.width(6.dp))
-                                                            Text(
-                                                                text = stringResource(
-                                                                    id = discussionR.string.discussion_create_post
-                                                                ),
-                                                                color = MaterialTheme.appColors.primary,
-                                                                style = MaterialTheme.appTypography.labelLarge
-                                                            )
-                                                        },
-                                                        borderColor = MaterialTheme.appColors.primary,
-                                                        textColor = MaterialTheme.appColors.primary
+                                                if (scrollState.shouldLoadMore(
+                                                        firstVisibleIndex,
+                                                        LOAD_MORE_THRESHOLD
                                                     )
+                                                ) {
+                                                    paginationCallback()
                                                 }
                                             }
+                                        } else {
+                                            val noDiscussionsScrollState = rememberScrollState()
+                                            Column(
+                                                modifier = Modifier
+                                                    .align(Alignment.CenterHorizontally)
+                                                    .verticalScroll(noDiscussionsScrollState)
+                                                    .padding(24.dp),
+                                                horizontalAlignment = Alignment.CenterHorizontally,
+                                                verticalArrangement = Arrangement.Center
+                                            ) {
+                                                Text(
+                                                    modifier = Modifier
+                                                        .fillMaxWidth(),
+                                                    text = title,
+                                                    color = MaterialTheme.appColors.textPrimary,
+                                                    style = MaterialTheme.appTypography.titleLarge
+                                                )
+                                                Spacer(modifier = Modifier.height(20.dp))
+                                                Icon(
+                                                    modifier = Modifier.size(100.dp),
+                                                    painter = painterResource(
+                                                        id = discussionR.drawable.discussion_ic_empty
+                                                    ),
+                                                    contentDescription = null,
+                                                    tint = MaterialTheme.appColors.textPrimary
+                                                )
+                                                Spacer(Modifier.height(36.dp))
+                                                Text(
+                                                    modifier = Modifier.fillMaxWidth(),
+                                                    text = stringResource(discussionR.string.discussion_no_yet),
+                                                    style = MaterialTheme.appTypography.titleLarge,
+                                                    color = MaterialTheme.appColors.textPrimary,
+                                                    textAlign = TextAlign.Center
+                                                )
+                                                Spacer(Modifier.height(12.dp))
+                                                Text(
+                                                    modifier = Modifier.fillMaxWidth(),
+                                                    text = stringResource(
+                                                        discussionR.string.discussion_click_button_create_discussion
+                                                    ),
+                                                    style = MaterialTheme.appTypography.bodyLarge,
+                                                    color = MaterialTheme.appColors.textPrimary,
+                                                    textAlign = TextAlign.Center
+                                                )
+                                                Spacer(Modifier.height(40.dp))
+                                                OpenEdXOutlinedButton(
+                                                    modifier = Modifier
+                                                        .widthIn(184.dp, Dp.Unspecified),
+                                                    text = stringResource(
+                                                        id = discussionR.string.discussion_create_post
+                                                    ),
+                                                    onClick = {
+                                                        onCreatePostClick()
+                                                    },
+                                                    content = {
+                                                        Icon(
+                                                            painter = painterResource(
+                                                                id = discussionR.drawable.discussion_ic_add_comment
+                                                            ),
+                                                            contentDescription = null,
+                                                            tint = MaterialTheme.appColors.primary
+                                                        )
+                                                        Spacer(modifier = Modifier.width(6.dp))
+                                                        Text(
+                                                            text = stringResource(
+                                                                id = discussionR.string.discussion_create_post
+                                                            ),
+                                                            color = MaterialTheme.appColors.primary,
+                                                            style = MaterialTheme.appTypography.labelLarge
+                                                        )
+                                                    },
+                                                    borderColor = MaterialTheme.appColors.primary,
+                                                    textColor = MaterialTheme.appColors.primary
+                                                )
+                                            }
                                         }
                                     }
                                 }
+                            }
 
-                                is DiscussionThreadsUIState.Loading -> {
-                                    Box(
-                                        Modifier
-                                            .fillMaxSize(),
-                                        contentAlignment = Alignment.Center
-                                    ) {
-                                        CircularProgressIndicator(color = MaterialTheme.appColors.primary)
-                                    }
+                            is DiscussionThreadsUIState.Loading -> {
+                                Box(
+                                    Modifier.fillMaxSize(),
+                                    contentAlignment = Alignment.Center
+                                ) {
+                                    CircularProgressIndicator(color = MaterialTheme.appColors.primary)
                                 }
                             }
-                            PullRefreshIndicator(
-                                refreshing,
-                                pullRefreshState,
-                                Modifier.align(Alignment.TopCenter)
-                            )
                         }
                     }
                 }
             }
         }
     }
+
+    if (showBottomSheet) {
+        ModalBottomSheet(
+            onDismissRequest = { showBottomSheet = false },
+            sheetState = sheetState,
+            shape = MaterialTheme.appShapes.screenBackgroundShape,
+            containerColor = MaterialTheme.appColors.background,
+            scrimColor = Color.Black.copy(alpha = 0.4f),
+        ) {
+            SheetContent(
+                searchValue = searchValue,
+                expandedList = expandedList,
+                onItemClick = { item ->
+                    when (currentSelectedList) {
+                        FilterType.type -> {
+                            filterType = item
+                            updatedFilter(filterType.second)
+                        }
+
+                        SortType.type -> {
+                            sortType = item
+                            updatedOrder(sortType.second)
+                        }
+                    }
+                    showBottomSheet = false
+                },
+                searchValueChanged = { searchValue = TextFieldValue(it) }
+            )
+        }
+    }
 }
 
 @Preview(uiMode = Configuration.UI_MODE_NIGHT_NO)
diff --git a/discussion/src/main/java/org/openedx/discussion/presentation/topics/DiscussionTopicsScreen.kt b/discussion/src/main/java/org/openedx/discussion/presentation/topics/DiscussionTopicsScreen.kt
index a5ffd0614..24c01a086 100644
--- a/discussion/src/main/java/org/openedx/discussion/presentation/topics/DiscussionTopicsScreen.kt
+++ b/discussion/src/main/java/org/openedx/discussion/presentation/topics/DiscussionTopicsScreen.kt
@@ -15,12 +15,13 @@ import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.layout.widthIn
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.itemsIndexed
-import androidx.compose.material.Divider
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Scaffold
-import androidx.compose.material.Surface
-import androidx.compose.material.Text
-import androidx.compose.material.rememberScaffoldState
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.SnackbarHost
+import androidx.compose.material3.SnackbarHostState
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
@@ -102,13 +103,13 @@ private fun DiscussionTopicsUI(
     onSearchClick: () -> Unit,
     onItemClick: (String, String, String) -> Unit
 ) {
-    val scaffoldState = rememberScaffoldState()
     val context = LocalContext.current
+    val snackbarHostState = remember { SnackbarHostState() }
 
     Scaffold(
-        scaffoldState = scaffoldState,
         modifier = Modifier.fillMaxSize(),
-        backgroundColor = MaterialTheme.appColors.background
+        containerColor = MaterialTheme.appColors.background,
+        snackbarHost = { SnackbarHost(snackbarHostState) }
     ) {
         val screenWidth by remember(key1 = windowSize) {
             mutableStateOf(
@@ -146,7 +147,7 @@ private fun DiscussionTopicsUI(
             )
         }
 
-        HandleUIMessage(uiMessage = uiMessage, scaffoldState = scaffoldState)
+        HandleUIMessage(uiMessage = uiMessage, snackbarHostState = snackbarHostState)
 
         Box(
             modifier = Modifier
@@ -251,7 +252,7 @@ private fun DiscussionTopicsUI(
                                                     )
                                                 })
                                                 if (uiState.data.getOrNull(index + 1)?.children?.isEmpty() == true) {
-                                                    Divider()
+                                                    HorizontalDivider()
                                                 }
                                             }
                                         }
diff --git a/discussion/src/main/java/org/openedx/discussion/presentation/ui/DiscussionUI.kt b/discussion/src/main/java/org/openedx/discussion/presentation/ui/DiscussionUI.kt
index 2527307af..bdf0b3faa 100644
--- a/discussion/src/main/java/org/openedx/discussion/presentation/ui/DiscussionUI.kt
+++ b/discussion/src/main/java/org/openedx/discussion/presentation/ui/DiscussionUI.kt
@@ -18,15 +18,16 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.material.Card
-import androidx.compose.material.Divider
-import androidx.compose.material.Icon
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Surface
-import androidx.compose.material.Text
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.KeyboardArrowRight
 import androidx.compose.material.icons.automirrored.outlined.HelpOutline
+import androidx.compose.material3.Card
+import androidx.compose.material3.CardDefaults
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -112,7 +113,7 @@ fun ThreadMainItem(
                 ),
                 modifier = Modifier
                     .size(48.dp)
-                    .clip(MaterialTheme.appShapes.material.medium)
+                    .clip(MaterialTheme.appShapes.material3.medium)
                     .clickable {
                         if (thread.author.isNotEmpty()) {
                             onUserPhotoClick(thread.author)
@@ -192,7 +193,7 @@ fun ThreadMainItem(
             )
         }
         Spacer(modifier = Modifier.height(16.dp))
-        Divider(color = MaterialTheme.appColors.cardViewBorder)
+        HorizontalDivider(color = MaterialTheme.appColors.cardViewBorder)
     }
 }
 
@@ -246,8 +247,8 @@ fun CommentItem(
                 shape
             )
         ),
-        backgroundColor = MaterialTheme.appColors.surface,
-        elevation = 0.dp
+        colors = CardDefaults.cardColors(containerColor = MaterialTheme.appColors.surface),
+        elevation = CardDefaults.cardElevation(defaultElevation = 0.dp)
     ) {
         Column(
             Modifier
@@ -609,7 +610,7 @@ fun ThreadItemCategory(
                 .clickable { onClick() }
         ),
         shape = MaterialTheme.appShapes.cardShape,
-        backgroundColor = MaterialTheme.appColors.surface
+        colors = CardDefaults.cardColors(containerColor = MaterialTheme.appColors.surface)
     ) {
         Column(
             modifier = Modifier
diff --git a/downloads/src/main/java/org/openedx/downloads/presentation/download/DownloadsScreen.kt b/downloads/src/main/java/org/openedx/downloads/presentation/download/DownloadsScreen.kt
index dafbde1b6..140f8ebfd 100644
--- a/downloads/src/main/java/org/openedx/downloads/presentation/download/DownloadsScreen.kt
+++ b/downloads/src/main/java/org/openedx/downloads/presentation/download/DownloadsScreen.kt
@@ -27,26 +27,27 @@ import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.Card
-import androidx.compose.material.CircularProgressIndicator
-import androidx.compose.material.Divider
-import androidx.compose.material.DropdownMenu
-import androidx.compose.material.ExperimentalMaterialApi
-import androidx.compose.material.Icon
-import androidx.compose.material.IconButton
-import androidx.compose.material.LinearProgressIndicator
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Scaffold
-import androidx.compose.material.Text
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Close
 import androidx.compose.material.icons.filled.CloudDone
 import androidx.compose.material.icons.filled.MoreHoriz
 import androidx.compose.material.icons.outlined.CloudDownload
-import androidx.compose.material.pullrefresh.PullRefreshIndicator
-import androidx.compose.material.pullrefresh.pullRefresh
-import androidx.compose.material.pullrefresh.rememberPullRefreshState
-import androidx.compose.material.rememberScaffoldState
+import androidx.compose.material3.Card
+import androidx.compose.material3.CardDefaults
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.DropdownMenu
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.LinearProgressIndicator
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.SnackbarHost
+import androidx.compose.material3.SnackbarHostState
+import androidx.compose.material3.Text
+import androidx.compose.material3.pulltorefresh.PullToRefreshBox
+import androidx.compose.material3.pulltorefresh.rememberPullToRefreshState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -57,6 +58,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.StrokeCap
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.platform.LocalContext
@@ -96,7 +98,7 @@ import org.openedx.foundation.presentation.UIMessage
 import org.openedx.foundation.presentation.rememberWindowSize
 import org.openedx.foundation.presentation.windowSizeValue
 
-@OptIn(ExperimentalMaterialApi::class)
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun DownloadsScreen(
     uiState: DownloadsUIState,
@@ -105,9 +107,9 @@ fun DownloadsScreen(
     hasInternetConnection: Boolean,
     onAction: (DownloadsViewActions) -> Unit,
 ) {
-    val scaffoldState = rememberScaffoldState()
     val windowSize = rememberWindowSize()
     val configuration = LocalConfiguration.current
+    val snackbarHostState = remember { SnackbarHostState() }
     val contentWidth by remember(key1 = windowSize) {
         mutableStateOf(
             windowSize.windowSizeValue(
@@ -116,19 +118,16 @@ fun DownloadsScreen(
             )
         )
     }
-    val pullRefreshState = rememberPullRefreshState(
-        refreshing = uiState.isRefreshing,
-        onRefresh = { onAction(DownloadsViewActions.SwipeRefresh) }
-    )
+    val pullToRefreshState = rememberPullToRefreshState()
     var isInternetConnectionShown by rememberSaveable {
         mutableStateOf(false)
     }
 
     Scaffold(
-        scaffoldState = scaffoldState,
         modifier = Modifier
             .fillMaxSize(),
-        backgroundColor = MaterialTheme.appColors.background,
+        containerColor = MaterialTheme.appColors.background,
+        snackbarHost = { SnackbarHost(snackbarHostState) },
         topBar = {
             MainScreenToolbar(
                 modifier = Modifier
@@ -144,46 +143,95 @@ fun DownloadsScreen(
             Box(
                 modifier = Modifier
                     .fillMaxSize()
-                    .pullRefresh(pullRefreshState)
             ) {
-                if (uiState.isLoading) {
-                    Box(
-                        modifier = Modifier.fillMaxSize(),
-                        contentAlignment = Alignment.Center
-                    ) {
-                        CircularProgressIndicator(color = MaterialTheme.appColors.primary)
-                    }
-                } else if (uiState.downloadCoursePreviews.isEmpty()) {
-                    EmptyState(
-                        modifier = Modifier
-                            .fillMaxSize()
-                            .verticalScroll(rememberScrollState())
-                    )
-                } else {
-                    Box(
-                        modifier = Modifier
-                            .fillMaxSize()
-                            .displayCutoutForLandscape()
-                            .padding(paddingValues)
-                            .padding(horizontal = 16.dp),
-                        contentAlignment = Alignment.TopCenter
-                    ) {
-                        if (configuration.orientation == ORIENTATION_LANDSCAPE || windowSize.isTablet) {
-                            LazyVerticalGrid(
-                                modifier = contentWidth.fillMaxHeight(),
-                                state = rememberLazyGridState(),
-                                columns = GridCells.Fixed(2),
-                                verticalArrangement = Arrangement.spacedBy(20.dp),
-                                horizontalArrangement = Arrangement.spacedBy(20.dp),
-                                contentPadding = PaddingValues(bottom = 46.dp, top = 12.dp),
-                                content = {
+                PullToRefreshBox(
+                    isRefreshing = uiState.isRefreshing,
+                    onRefresh = { onAction(DownloadsViewActions.SwipeRefresh) },
+                    state = pullToRefreshState,
+                    modifier = Modifier.fillMaxSize()
+                ) {
+                    if (uiState.isLoading) {
+                        Box(
+                            modifier = Modifier.fillMaxSize(),
+                            contentAlignment = Alignment.Center
+                        ) {
+                            CircularProgressIndicator(color = MaterialTheme.appColors.primary)
+                        }
+                    } else if (uiState.downloadCoursePreviews.isEmpty()) {
+                        EmptyState(
+                            modifier = Modifier
+                                .fillMaxSize()
+                                .verticalScroll(rememberScrollState())
+                        )
+                    } else {
+                        Box(
+                            modifier = Modifier
+                                .fillMaxSize()
+                                .displayCutoutForLandscape()
+                                .padding(paddingValues)
+                                .padding(horizontal = 16.dp),
+                            contentAlignment = Alignment.TopCenter
+                        ) {
+                            if (configuration.orientation == ORIENTATION_LANDSCAPE || windowSize.isTablet) {
+                                LazyVerticalGrid(
+                                    modifier = contentWidth.fillMaxHeight(),
+                                    state = rememberLazyGridState(),
+                                    columns = GridCells.Fixed(2),
+                                    verticalArrangement = Arrangement.spacedBy(20.dp),
+                                    horizontalArrangement = Arrangement.spacedBy(20.dp),
+                                    contentPadding = PaddingValues(bottom = 46.dp, top = 12.dp),
+                                    content = {
+                                        items(uiState.downloadCoursePreviews) { item ->
+                                            val downloadModels =
+                                                uiState.downloadModels.filter { it.courseId == item.id }
+                                            val downloadState = uiState.courseDownloadState[item.id]
+                                                ?: DownloadedState.NOT_DOWNLOADED
+                                            CourseItem(
+                                                modifier = Modifier.height(314.dp),
+                                                downloadCoursePreview = item,
+                                                downloadModels = downloadModels,
+                                                downloadedState = downloadState,
+                                                apiHostUrl = apiHostUrl,
+                                                onCourseClick = {
+                                                    onAction(DownloadsViewActions.OpenCourse(item.id))
+                                                },
+                                                onDownloadClick = {
+                                                    onAction(
+                                                        DownloadsViewActions.DownloadCourse(
+                                                            item.id
+                                                        )
+                                                    )
+                                                },
+                                                onCancelClick = {
+                                                    onAction(
+                                                        DownloadsViewActions.CancelDownloading(
+                                                            item.id
+                                                        )
+                                                    )
+                                                },
+                                                onRemoveClick = {
+                                                    onAction(
+                                                        DownloadsViewActions.RemoveDownloads(
+                                                            item.id
+                                                        )
+                                                    )
+                                                }
+                                            )
+                                        }
+                                    }
+                                )
+                            } else {
+                                LazyColumn(
+                                    modifier = contentWidth,
+                                    contentPadding = PaddingValues(bottom = 46.dp, top = 12.dp),
+                                    verticalArrangement = Arrangement.spacedBy(20.dp)
+                                ) {
                                     items(uiState.downloadCoursePreviews) { item ->
                                         val downloadModels =
                                             uiState.downloadModels.filter { it.courseId == item.id }
                                         val downloadState = uiState.courseDownloadState[item.id]
                                             ?: DownloadedState.NOT_DOWNLOADED
                                         CourseItem(
-                                            modifier = Modifier.height(314.dp),
                                             downloadCoursePreview = item,
                                             downloadModels = downloadModels,
                                             downloadedState = downloadState,
@@ -203,49 +251,12 @@ fun DownloadsScreen(
                                         )
                                     }
                                 }
-                            )
-                        } else {
-                            LazyColumn(
-                                modifier = contentWidth,
-                                contentPadding = PaddingValues(bottom = 46.dp, top = 12.dp),
-                                verticalArrangement = Arrangement.spacedBy(20.dp)
-                            ) {
-                                items(uiState.downloadCoursePreviews) { item ->
-                                    val downloadModels =
-                                        uiState.downloadModels.filter { it.courseId == item.id }
-                                    val downloadState = uiState.courseDownloadState[item.id]
-                                        ?: DownloadedState.NOT_DOWNLOADED
-                                    CourseItem(
-                                        downloadCoursePreview = item,
-                                        downloadModels = downloadModels,
-                                        downloadedState = downloadState,
-                                        apiHostUrl = apiHostUrl,
-                                        onCourseClick = {
-                                            onAction(DownloadsViewActions.OpenCourse(item.id))
-                                        },
-                                        onDownloadClick = {
-                                            onAction(DownloadsViewActions.DownloadCourse(item.id))
-                                        },
-                                        onCancelClick = {
-                                            onAction(DownloadsViewActions.CancelDownloading(item.id))
-                                        },
-                                        onRemoveClick = {
-                                            onAction(DownloadsViewActions.RemoveDownloads(item.id))
-                                        }
-                                    )
-                                }
                             }
                         }
                     }
                 }
 
-                HandleUIMessage(uiMessage = uiMessage, scaffoldState = scaffoldState)
-
-                PullRefreshIndicator(
-                    uiState.isRefreshing,
-                    pullRefreshState,
-                    Modifier.align(Alignment.TopCenter)
-                )
+                HandleUIMessage(uiMessage = uiMessage, snackbarHostState = snackbarHostState)
 
                 if (!isInternetConnectionShown && !hasInternetConnection) {
                     OfflineModeDialog(
@@ -266,7 +277,7 @@ fun DownloadsScreen(
     )
 }
 
-@OptIn(ExperimentalMaterialApi::class)
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 private fun CourseItem(
     modifier: Modifier = Modifier,
@@ -291,9 +302,9 @@ private fun CourseItem(
     Card(
         modifier = modifier
             .fillMaxWidth(),
-        backgroundColor = MaterialTheme.appColors.background,
+        colors = CardDefaults.cardColors(containerColor = MaterialTheme.appColors.background),
         shape = MaterialTheme.appShapes.courseImageShape,
-        elevation = 4.dp,
+        elevation = CardDefaults.cardElevation(defaultElevation = 4.dp),
         onClick = onCourseClick
     ) {
         Box {
@@ -336,9 +347,12 @@ private fun CourseItem(
                                 .fillMaxWidth()
                                 .height(8.dp)
                                 .clip(CircleShape),
-                            progress = progress,
+                            progress = { progress },
                             color = MaterialTheme.appColors.successGreen,
-                            backgroundColor = MaterialTheme.appColors.divider
+                            trackColor = MaterialTheme.appColors.divider,
+                            strokeCap = StrokeCap.Square,
+                            gapSize = 0.dp,
+                            drawStopIndicator = { }
                         )
                     }
                     if (downloadedSize != 0L) {
@@ -373,7 +387,7 @@ private fun CourseItem(
                             Box(contentAlignment = Alignment.Center) {
                                 CircularProgressIndicator(
                                     modifier = Modifier.size(36.dp),
-                                    backgroundColor = Color.LightGray,
+                                    trackColor = Color.LightGray,
                                     strokeWidth = 2.dp,
                                     color = MaterialTheme.appColors.primary
                                 )
@@ -450,7 +464,7 @@ private fun CourseItem(
                                     onRemoveClick()
                                 }
                             )
-                            Divider(
+                            HorizontalDivider(
                                 modifier = Modifier.padding(horizontal = 16.dp),
                                 color = MaterialTheme.appColors.divider
                             )
diff --git a/profile/src/main/java/org/openedx/profile/presentation/anothersaccount/AnothersProfileFragment.kt b/profile/src/main/java/org/openedx/profile/presentation/anothersaccount/AnothersProfileFragment.kt
index b65401dd2..b145eb840 100644
--- a/profile/src/main/java/org/openedx/profile/presentation/anothersaccount/AnothersProfileFragment.kt
+++ b/profile/src/main/java/org/openedx/profile/presentation/anothersaccount/AnothersProfileFragment.kt
@@ -17,11 +17,12 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.widthIn
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.CircularProgressIndicator
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Scaffold
-import androidx.compose.material.Text
-import androidx.compose.material.rememberScaffoldState
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.SnackbarHost
+import androidx.compose.material3.SnackbarHostState
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
@@ -114,7 +115,7 @@ private fun AnothersProfileScreen(
     uiMessage: UIMessage?,
     onBackClick: () -> Unit
 ) {
-    val scaffoldState = rememberScaffoldState()
+    val snackbarHostState = remember { SnackbarHostState() }
 
     val contentWidth by remember(key1 = windowSize) {
         mutableStateOf(
@@ -139,7 +140,7 @@ private fun AnothersProfileScreen(
 
     Scaffold(
         modifier = Modifier.fillMaxSize(),
-        scaffoldState = scaffoldState,
+        snackbarHost = { SnackbarHost(snackbarHostState) },
         topBar = {
             Column(
                 Modifier
@@ -165,7 +166,7 @@ private fun AnothersProfileScreen(
             }
         }
     ) { paddingValues ->
-        HandleUIMessage(uiMessage = uiMessage, scaffoldState = scaffoldState)
+        HandleUIMessage(uiMessage = uiMessage, snackbarHostState = snackbarHostState)
 
         Column(
             modifier = Modifier
diff --git a/profile/src/main/java/org/openedx/profile/presentation/calendar/CalendarAccessDialogFragment.kt b/profile/src/main/java/org/openedx/profile/presentation/calendar/CalendarAccessDialogFragment.kt
index c1dc22df2..42b49ce40 100644
--- a/profile/src/main/java/org/openedx/profile/presentation/calendar/CalendarAccessDialogFragment.kt
+++ b/profile/src/main/java/org/openedx/profile/presentation/calendar/CalendarAccessDialogFragment.kt
@@ -18,10 +18,10 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Text
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.OpenInNew
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
diff --git a/profile/src/main/java/org/openedx/profile/presentation/calendar/CalendarSetUpView.kt b/profile/src/main/java/org/openedx/profile/presentation/calendar/CalendarSetUpView.kt
index 2011d065c..df3618439 100644
--- a/profile/src/main/java/org/openedx/profile/presentation/calendar/CalendarSetUpView.kt
+++ b/profile/src/main/java/org/openedx/profile/presentation/calendar/CalendarSetUpView.kt
@@ -12,15 +12,15 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.widthIn
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.Card
-import androidx.compose.material.Icon
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Scaffold
-import androidx.compose.material.Text
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Autorenew
 import androidx.compose.material.icons.rounded.CalendarToday
-import androidx.compose.material.rememberScaffoldState
+import androidx.compose.material3.Card
+import androidx.compose.material3.CardDefaults
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -60,7 +60,6 @@ fun CalendarSetUpView(
     onRelativeDateSwitchClick: (Boolean) -> Unit,
     onBackClick: () -> Unit
 ) {
-    val scaffoldState = rememberScaffoldState()
     val scrollState = rememberScrollState()
 
     Scaffold(
@@ -68,8 +67,7 @@ fun CalendarSetUpView(
             .fillMaxSize()
             .semantics {
                 testTagsAsResourceId = true
-            },
-        scaffoldState = scaffoldState
+            }
     ) { paddingValues ->
 
         val contentWidth by remember(key1 = windowSize) {
@@ -137,8 +135,8 @@ fun CalendarSetUpView(
                         Spacer(modifier = Modifier.height(14.dp))
                         Card(
                             shape = MaterialTheme.appShapes.cardShape,
-                            elevation = 0.dp,
-                            backgroundColor = MaterialTheme.appColors.cardViewBackground
+                            elevation = CardDefaults.cardElevation(defaultElevation = 0.dp),
+                            colors = CardDefaults.cardColors(containerColor = MaterialTheme.appColors.cardViewBackground)
                         ) {
                             Column(
                                 modifier = Modifier
diff --git a/profile/src/main/java/org/openedx/profile/presentation/calendar/CalendarSettingsView.kt b/profile/src/main/java/org/openedx/profile/presentation/calendar/CalendarSettingsView.kt
index 8a78c6f12..fae8da473 100644
--- a/profile/src/main/java/org/openedx/profile/presentation/calendar/CalendarSettingsView.kt
+++ b/profile/src/main/java/org/openedx/profile/presentation/calendar/CalendarSettingsView.kt
@@ -16,17 +16,17 @@ import androidx.compose.foundation.layout.widthIn
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.Card
-import androidx.compose.material.CircularProgressIndicator
-import androidx.compose.material.ExperimentalMaterialApi
-import androidx.compose.material.Icon
-import androidx.compose.material.LocalMinimumInteractiveComponentEnforcement
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Scaffold
-import androidx.compose.material.Switch
-import androidx.compose.material.SwitchDefaults
-import androidx.compose.material.Text
-import androidx.compose.material.rememberScaffoldState
+import androidx.compose.material3.Card
+import androidx.compose.material3.CardDefaults
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
+import androidx.compose.material3.LocalMinimumInteractiveComponentSize
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Switch
+import androidx.compose.material3.SwitchDefaults
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.getValue
@@ -61,7 +61,7 @@ import org.openedx.foundation.presentation.windowSizeValue
 import org.openedx.profile.R
 import org.openedx.profile.presentation.ui.SettingsItem
 
-@OptIn(ExperimentalComposeUiApi::class)
+@OptIn(ExperimentalComposeUiApi::class, ExperimentalMaterial3Api::class)
 @Composable
 fun CalendarSettingsView(
     windowSize: WindowSize,
@@ -72,7 +72,6 @@ fun CalendarSettingsView(
     onCourseToSyncClick: () -> Unit,
     onBackClick: () -> Unit
 ) {
-    val scaffoldState = rememberScaffoldState()
     val scrollState = rememberScrollState()
 
     Scaffold(
@@ -80,8 +79,7 @@ fun CalendarSettingsView(
             .fillMaxSize()
             .semantics {
                 testTagsAsResourceId = true
-            },
-        scaffoldState = scaffoldState
+            }
     ) { paddingValues ->
 
         val contentWidth by remember(key1 = windowSize) {
@@ -168,7 +166,7 @@ fun CalendarSettingsView(
     }
 }
 
-@OptIn(ExperimentalMaterialApi::class)
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun CalendarSyncSection(
     isCourseCalendarSyncEnabled: Boolean,
@@ -234,7 +232,7 @@ fun CalendarSyncSection(
                 style = MaterialTheme.appTypography.titleMedium,
                 color = MaterialTheme.appColors.textDark
             )
-            CompositionLocalProvider(LocalMinimumInteractiveComponentEnforcement provides false) {
+            CompositionLocalProvider(LocalMinimumInteractiveComponentSize provides Dp.Unspecified) {
                 Switch(
                     modifier = Modifier
                         .padding(0.dp),
@@ -286,8 +284,8 @@ fun CoursesToSyncSection(
         Card(
             modifier = Modifier,
             shape = MaterialTheme.appShapes.cardShape,
-            elevation = 0.dp,
-            backgroundColor = MaterialTheme.appColors.cardViewBackground
+            elevation = CardDefaults.cardElevation(defaultElevation = 0.dp),
+            colors = CardDefaults.cardColors(containerColor = MaterialTheme.appColors.cardViewBackground)
         ) {
             SettingsItem(
                 text = stringResource(R.string.profile_syncing_courses, coursesSynced),
diff --git a/profile/src/main/java/org/openedx/profile/presentation/calendar/CalendarView.kt b/profile/src/main/java/org/openedx/profile/presentation/calendar/CalendarView.kt
index 4cc682dc7..08ff27fb1 100644
--- a/profile/src/main/java/org/openedx/profile/presentation/calendar/CalendarView.kt
+++ b/profile/src/main/java/org/openedx/profile/presentation/calendar/CalendarView.kt
@@ -5,18 +5,19 @@ import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
-import androidx.compose.material.ExperimentalMaterialApi
-import androidx.compose.material.LocalMinimumInteractiveComponentEnforcement
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Switch
-import androidx.compose.material.SwitchDefaults
-import androidx.compose.material.Text
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.LocalMinimumInteractiveComponentSize
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Switch
+import androidx.compose.material3.SwitchDefaults
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import org.openedx.core.ui.theme.appColors
 import org.openedx.core.ui.theme.appTypography
@@ -24,7 +25,7 @@ import org.openedx.core.utils.TimeUtils
 import org.openedx.profile.R
 import java.util.Date
 
-@OptIn(ExperimentalMaterialApi::class)
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun OptionsSection(
     isRelativeDatesEnabled: Boolean,
@@ -51,7 +52,7 @@ fun OptionsSection(
                 style = MaterialTheme.appTypography.titleMedium,
                 color = MaterialTheme.appColors.textDark
             )
-            CompositionLocalProvider(LocalMinimumInteractiveComponentEnforcement provides false) {
+            CompositionLocalProvider(LocalMinimumInteractiveComponentSize provides Dp.Unspecified) {
                 Switch(
                     modifier = Modifier
                         .padding(0.dp),
diff --git a/profile/src/main/java/org/openedx/profile/presentation/calendar/CoursesToSyncFragment.kt b/profile/src/main/java/org/openedx/profile/presentation/calendar/CoursesToSyncFragment.kt
index 6eb27762e..5e14ab1f1 100644
--- a/profile/src/main/java/org/openedx/profile/presentation/calendar/CoursesToSyncFragment.kt
+++ b/profile/src/main/java/org/openedx/profile/presentation/calendar/CoursesToSyncFragment.kt
@@ -19,20 +19,21 @@ import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.layout.widthIn
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
-import androidx.compose.material.Checkbox
-import androidx.compose.material.CheckboxDefaults
-import androidx.compose.material.CircularProgressIndicator
-import androidx.compose.material.ExperimentalMaterialApi
-import androidx.compose.material.Icon
-import androidx.compose.material.LocalMinimumInteractiveComponentEnforcement
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Scaffold
-import androidx.compose.material.Switch
-import androidx.compose.material.SwitchDefaults
-import androidx.compose.material.Tab
-import androidx.compose.material.TabRow
-import androidx.compose.material.Text
-import androidx.compose.material.rememberScaffoldState
+import androidx.compose.material3.Checkbox
+import androidx.compose.material3.CheckboxDefaults
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
+import androidx.compose.material3.LocalMinimumInteractiveComponentSize
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.SnackbarHost
+import androidx.compose.material3.SnackbarHostState
+import androidx.compose.material3.Switch
+import androidx.compose.material3.SwitchDefaults
+import androidx.compose.material3.Tab
+import androidx.compose.material3.TabRow
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.collectAsState
@@ -118,12 +119,12 @@ private fun CoursesToSyncView(
     onHideInactiveCoursesSwitchClick: (Boolean) -> Unit,
     onCourseSyncCheckChange: (Boolean, String) -> Unit
 ) {
-    val scaffoldState = rememberScaffoldState()
+    val snackbarHostState = remember { SnackbarHostState() }
 
     Scaffold(
         modifier = Modifier
             .fillMaxSize(),
-        scaffoldState = scaffoldState
+        snackbarHost = { SnackbarHost(snackbarHostState) }
     ) { paddingValues ->
 
         val contentWidth by remember(key1 = windowSize) {
@@ -149,7 +150,7 @@ private fun CoursesToSyncView(
 
         HandleUIMessage(
             uiMessage = uiMessage,
-            scaffoldState = scaffoldState
+            snackbarHostState = snackbarHostState
         )
 
         Box(
@@ -226,7 +227,7 @@ private fun SyncCourseTabRow(
                     MaterialTheme.appShapes.buttonShape
                 ),
             selectedTabIndex = selectedTabIndex,
-            backgroundColor = MaterialTheme.appColors.background,
+            containerColor = MaterialTheme.appColors.background,
             indicator = {}
         ) {
             SyncCourseTab.entries.forEachIndexed { index, tab ->
@@ -384,7 +385,7 @@ private fun EmptyListState(
     }
 }
 
-@OptIn(ExperimentalMaterialApi::class)
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 private fun HideInactiveCoursesView(
     isHideInactiveCourses: Boolean,
@@ -400,7 +401,7 @@ private fun HideInactiveCoursesView(
                 style = MaterialTheme.appTypography.titleMedium,
                 color = MaterialTheme.appColors.textDark
             )
-            CompositionLocalProvider(LocalMinimumInteractiveComponentEnforcement provides false) {
+            CompositionLocalProvider(LocalMinimumInteractiveComponentSize provides Dp.Unspecified) {
                 Switch(
                     modifier = Modifier
                         .padding(0.dp),
diff --git a/profile/src/main/java/org/openedx/profile/presentation/calendar/DisableCalendarSyncDialogFragment.kt b/profile/src/main/java/org/openedx/profile/presentation/calendar/DisableCalendarSyncDialogFragment.kt
index 4920360bc..721c1d88f 100644
--- a/profile/src/main/java/org/openedx/profile/presentation/calendar/DisableCalendarSyncDialogFragment.kt
+++ b/profile/src/main/java/org/openedx/profile/presentation/calendar/DisableCalendarSyncDialogFragment.kt
@@ -18,9 +18,9 @@ import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.CircularProgressIndicator
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Text
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
diff --git a/profile/src/main/java/org/openedx/profile/presentation/calendar/NewCalendarDialogFragment.kt b/profile/src/main/java/org/openedx/profile/presentation/calendar/NewCalendarDialogFragment.kt
index d52cca4ff..94d3ffa98 100644
--- a/profile/src/main/java/org/openedx/profile/presentation/calendar/NewCalendarDialogFragment.kt
+++ b/profile/src/main/java/org/openedx/profile/presentation/calendar/NewCalendarDialogFragment.kt
@@ -27,17 +27,17 @@ import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.Divider
-import androidx.compose.material.DropdownMenu
-import androidx.compose.material.DropdownMenuItem
-import androidx.compose.material.Icon
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.OutlinedTextField
-import androidx.compose.material.Text
-import androidx.compose.material.TextFieldDefaults
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Close
 import androidx.compose.material.icons.filled.ExpandMore
+import androidx.compose.material3.DropdownMenu
+import androidx.compose.material3.DropdownMenuItem
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedTextField
+import androidx.compose.material3.OutlinedTextFieldDefaults
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
@@ -344,54 +344,50 @@ private fun CalendarDropdown(
             )
         }
 
-        MaterialTheme(
-            colors = MaterialTheme.colors.copy(surface = MaterialTheme.appColors.background),
-            shapes = MaterialTheme.shapes.copy(MaterialTheme.appShapes.textFieldShape)
+        DropdownMenu(
+            modifier = Modifier
+                .crop(vertical = 8.dp)
+                .height(180.dp)
+                .width(dropdownWidth)
+                .background(MaterialTheme.appColors.background)
+                .border(
+                    1.dp,
+                    MaterialTheme.appColors.textFieldBorder,
+                    MaterialTheme.appShapes.textFieldShape
+                )
+                .crop(vertical = 8.dp),
+            expanded = expanded,
+            onDismissRequest = { expanded = false }
         ) {
-            DropdownMenu(
-                modifier = Modifier
-                    .crop(vertical = 8.dp)
-                    .height(180.dp)
-                    .width(dropdownWidth)
-                    .border(
-                        1.dp,
-                        MaterialTheme.appColors.textFieldBorder,
-                        MaterialTheme.appShapes.textFieldShape
-                    )
-                    .crop(vertical = 8.dp),
-                expanded = expanded,
-                onDismissRequest = { expanded = false }
-            ) {
-                if (showLocalCalendarOption) {
-                    CalendarOptionItem(
-                        text = stringResource(id = R.string.profile_local_calendar_option),
-                        contentColor = MaterialTheme.appColors.textDark
-                    ) {
-                        expanded = false
-                        onLocalCalendarClick()
-                    }
-                    Divider(
+            if (showLocalCalendarOption) {
+                CalendarOptionItem(
+                    text = stringResource(id = R.string.profile_local_calendar_option),
+                    contentColor = MaterialTheme.appColors.textDark
+                ) {
+                    expanded = false
+                    onLocalCalendarClick()
+                }
+                HorizontalDivider(
+                    modifier = Modifier.padding(horizontal = 16.dp),
+                    color = MaterialTheme.appColors.divider
+                )
+            }
+
+            calendars.forEachIndexed { index, calendar ->
+                CalendarOptionItem(
+                    text = calendar.title,
+                    contentColor = MaterialTheme.appColors.textDark,
+                    leadingColor = ComposeColor(calendar.color)
+                ) {
+                    expanded = false
+                    onGoogleCalendarClick(calendar)
+                }
+                if (index < calendars.lastIndex) {
+                    HorizontalDivider(
                         modifier = Modifier.padding(horizontal = 16.dp),
                         color = MaterialTheme.appColors.divider
                     )
                 }
-
-                calendars.forEachIndexed { index, calendar ->
-                    CalendarOptionItem(
-                        text = calendar.title,
-                        contentColor = MaterialTheme.appColors.textDark,
-                        leadingColor = ComposeColor(calendar.color)
-                    ) {
-                        expanded = false
-                        onGoogleCalendarClick(calendar)
-                    }
-                    if (index < calendars.lastIndex) {
-                        Divider(
-                            modifier = Modifier.padding(horizontal = 16.dp),
-                            color = MaterialTheme.appColors.divider
-                        )
-                    }
-                }
             }
         }
     }
@@ -426,9 +422,10 @@ private fun CalendarTitleTextField(
                 if (it.text.length <= MAX_CALENDAR_TITLE_LENGTH) textFieldValue = it
                 onValueChanged(it.text.trim())
             },
-            colors = TextFieldDefaults.outlinedTextFieldColors(
+            colors = OutlinedTextFieldDefaults.colors(
                 unfocusedBorderColor = MaterialTheme.appColors.textFieldBorder,
-                textColor = MaterialTheme.appColors.textPrimary
+                focusedTextColor = MaterialTheme.appColors.textPrimary,
+                unfocusedTextColor = MaterialTheme.appColors.textPrimary
             ),
             shape = MaterialTheme.appShapes.textFieldShape,
             placeholder = {
@@ -516,35 +513,32 @@ private fun ColorDropdown(
             )
         }
 
-        MaterialTheme(
-            colors = MaterialTheme.colors.copy(surface = MaterialTheme.appColors.background),
-            shapes = MaterialTheme.shapes.copy(MaterialTheme.appShapes.textFieldShape)
+        Spacer(modifier = Modifier.padding(top = 4.dp))
+        DropdownMenu(
+            modifier = Modifier
+                .crop(vertical = 8.dp)
+                .height(240.dp)
+                .width(dropdownWidth)
+                .background(MaterialTheme.appColors.background)
+                .border(
+                    1.dp,
+                    MaterialTheme.appColors.textFieldBorder,
+                    MaterialTheme.appShapes.textFieldShape
+                )
+                .crop(vertical = 8.dp),
+            expanded = expanded,
+            onDismissRequest = { expanded = false }
         ) {
-            Spacer(modifier = Modifier.padding(top = 4.dp))
-            DropdownMenu(
-                modifier = Modifier
-                    .crop(vertical = 8.dp)
-                    .height(240.dp)
-                    .width(dropdownWidth)
-                    .border(
-                        1.dp,
-                        MaterialTheme.appColors.textFieldBorder,
-                        MaterialTheme.appShapes.textFieldShape
-                    )
-                    .crop(vertical = 8.dp),
-                expanded = expanded,
-                onDismissRequest = { expanded = false }
-            ) {
-                for ((index, calendarColor) in CalendarColor.entries.withIndex()) {
-                    DropdownMenuItem(
-                        modifier = Modifier
-                            .background(MaterialTheme.appColors.background),
-                        onClick = {
-                            currentValue = calendarColor
-                            expanded = false
-                            onValueChanged(CalendarColor.entries[index])
-                        }
-                    ) {
+            for ((index, calendarColor) in CalendarColor.entries.withIndex()) {
+                DropdownMenuItem(
+                    modifier = Modifier
+                        .background(MaterialTheme.appColors.background),
+                    onClick = {
+                        currentValue = calendarColor
+                        expanded = false
+                        onValueChanged(CalendarColor.entries[index])
+                    },
+                    text = {
                         Row(
                             horizontalArrangement = Arrangement.spacedBy(12.dp)
                         ) {
@@ -558,12 +552,12 @@ private fun ColorDropdown(
                             )
                         }
                     }
-                    if (index < CalendarColor.entries.lastIndex) {
-                        Divider(
-                            modifier = Modifier.padding(horizontal = 16.dp),
-                            color = MaterialTheme.appColors.divider
-                        )
-                    }
+                )
+                if (index < CalendarColor.entries.lastIndex) {
+                    HorizontalDivider(
+                        modifier = Modifier.padding(horizontal = 16.dp),
+                        color = MaterialTheme.appColors.divider
+                    )
                 }
             }
         }
@@ -592,21 +586,22 @@ private fun CalendarOptionItem(
 ) {
     DropdownMenuItem(
         modifier = Modifier.background(MaterialTheme.appColors.background),
-        onClick = onClick
-    ) {
-        Row(
-            modifier = Modifier.padding(vertical = 4.dp),
-            horizontalArrangement = Arrangement.spacedBy(12.dp),
-            verticalAlignment = Alignment.CenterVertically
-        ) {
-            leadingColor?.let { ColorCircle(color = it) }
-            Text(
-                text = text,
-                style = MaterialTheme.appTypography.titleSmall,
-                color = contentColor
-            )
+        onClick = onClick,
+        text = {
+            Row(
+                modifier = Modifier.padding(vertical = 4.dp),
+                horizontalArrangement = Arrangement.spacedBy(12.dp),
+                verticalAlignment = Alignment.CenterVertically
+            ) {
+                leadingColor?.let { ColorCircle(color = it) }
+                Text(
+                    text = text,
+                    style = MaterialTheme.appTypography.titleSmall,
+                    color = contentColor
+                )
+            }
         }
-    }
+    )
 }
 
 private sealed class SelectedCalendar {
diff --git a/profile/src/main/java/org/openedx/profile/presentation/delete/DeleteProfileFragment.kt b/profile/src/main/java/org/openedx/profile/presentation/delete/DeleteProfileFragment.kt
index fa0bbdd25..b9d529769 100644
--- a/profile/src/main/java/org/openedx/profile/presentation/delete/DeleteProfileFragment.kt
+++ b/profile/src/main/java/org/openedx/profile/presentation/delete/DeleteProfileFragment.kt
@@ -18,10 +18,11 @@ import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.widthIn
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Scaffold
-import androidx.compose.material.Text
-import androidx.compose.material.rememberScaffoldState
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.SnackbarHost
+import androidx.compose.material3.SnackbarHostState
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
@@ -135,7 +136,7 @@ fun DeleteProfileScreen(
     onDeleteClick: (String) -> Unit,
     onBackClick: () -> Unit
 ) {
-    val scaffoldState = rememberScaffoldState()
+    val snackbarHostState = remember { SnackbarHostState() }
     val scrollState = rememberScrollState()
 
     val errorText = if (uiState is DeleteProfileFragmentUIState.Error) {
@@ -153,7 +154,7 @@ fun DeleteProfileScreen(
             .fillMaxSize()
             .navigationBarsPadding()
             .semantics { testTagsAsResourceId = true },
-        scaffoldState = scaffoldState
+        snackbarHost = { SnackbarHost(snackbarHostState) }
     ) { paddingValues ->
 
         val topBarWidth by remember(key1 = windowSize) {
@@ -177,7 +178,7 @@ fun DeleteProfileScreen(
             )
         }
 
-        HandleUIMessage(uiMessage = uiMessage, scaffoldState = scaffoldState)
+        HandleUIMessage(uiMessage = uiMessage, snackbarHostState = snackbarHostState)
 
         Box(
             modifier = Modifier.fillMaxSize(),
diff --git a/profile/src/main/java/org/openedx/profile/presentation/edit/EditProfileFragment.kt b/profile/src/main/java/org/openedx/profile/presentation/edit/EditProfileFragment.kt
index b95663681..cb86c1150 100644
--- a/profile/src/main/java/org/openedx/profile/presentation/edit/EditProfileFragment.kt
+++ b/profile/src/main/java/org/openedx/profile/presentation/edit/EditProfileFragment.kt
@@ -38,24 +38,26 @@ import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.Card
-import androidx.compose.material.Divider
-import androidx.compose.material.Icon
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.ModalBottomSheetLayout
-import androidx.compose.material.ModalBottomSheetValue
-import androidx.compose.material.OutlinedTextField
-import androidx.compose.material.Scaffold
-import androidx.compose.material.Surface
-import androidx.compose.material.Text
-import androidx.compose.material.TextFieldDefaults
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Close
 import androidx.compose.material.icons.filled.Done
 import androidx.compose.material.icons.filled.ExpandMore
 import androidx.compose.material.icons.outlined.Report
-import androidx.compose.material.rememberModalBottomSheetState
-import androidx.compose.material.rememberScaffoldState
+import androidx.compose.material3.Card
+import androidx.compose.material3.CardDefaults
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.ModalBottomSheet
+import androidx.compose.material3.OutlinedTextField
+import androidx.compose.material3.OutlinedTextFieldDefaults
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.SnackbarHost
+import androidx.compose.material3.SnackbarHostState
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.material3.rememberModalBottomSheetState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
@@ -98,6 +100,7 @@ import androidx.compose.ui.window.Dialog
 import androidx.compose.ui.window.DialogProperties
 import androidx.compose.ui.window.DialogWindowProvider
 import androidx.core.content.FileProvider
+import androidx.core.graphics.scale
 import androidx.core.os.bundleOf
 import androidx.fragment.app.Fragment
 import coil.compose.AsyncImage
@@ -116,7 +119,6 @@ import org.openedx.core.ui.OpenEdXButton
 import org.openedx.core.ui.OpenEdXOutlinedButton
 import org.openedx.core.ui.SheetContent
 import org.openedx.core.ui.displayCutoutForLandscape
-import org.openedx.core.ui.isImeVisibleState
 import org.openedx.core.ui.noRippleClickable
 import org.openedx.core.ui.rememberSaveableMap
 import org.openedx.core.ui.statusBarsInset
@@ -252,8 +254,7 @@ class EditProfileFragment : Fragment() {
         )
 
         val ratio: Float = originalBitmap.width.toFloat() / TARGET_IMAGE_WIDTH
-        val newBitmap = Bitmap.createScaledBitmap(
-            originalBitmap,
+        val newBitmap = originalBitmap.scale(
             TARGET_IMAGE_WIDTH,
             (originalBitmap.height.toFloat() / ratio).toInt(),
             false
@@ -287,7 +288,7 @@ class EditProfileFragment : Fragment() {
     }
 }
 
-@OptIn(ExperimentalComposeUiApi::class)
+@OptIn(ExperimentalComposeUiApi::class, ExperimentalMaterial3Api::class)
 @Composable
 private fun EditProfileScreen(
     windowSize: WindowSize,
@@ -304,27 +305,15 @@ private fun EditProfileScreen(
     onSelectImageClick: () -> Unit,
     onDeleteImageClick: () -> Unit,
 ) {
-    val scaffoldState = rememberScaffoldState()
+    val snackbarHostState = remember { SnackbarHostState() }
     val coroutine = rememberCoroutineScope()
     val focusManager = LocalFocusManager.current
-
-    val bottomSheetScaffoldState = rememberModalBottomSheetState(
-        initialValue = ModalBottomSheetValue.Hidden,
-        skipHalfExpanded = true
-    )
+    val sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true)
     val keyboardController = LocalSoftwareKeyboardController.current
-
-    var expandedList by rememberSaveable {
-        mutableStateOf(emptyList<RegistrationField.Option>())
-    }
-    var openWarningMessageDialog by rememberSaveable {
-        mutableStateOf(false)
-    }
-
-    var bottomDialogTitle by rememberSaveable {
-        mutableStateOf("")
-    }
-
+    var showBottomSheet by rememberSaveable { mutableStateOf(false) }
+    var expandedList by rememberSaveable { mutableStateOf(emptyList<RegistrationField.Option>()) }
+    var openWarningMessageDialog by rememberSaveable { mutableStateOf(false) }
+    var bottomDialogTitle by rememberSaveable { mutableStateOf("") }
     var searchValue by rememberSaveable(stateSaver = TextFieldValue.Saver) {
         mutableStateOf(TextFieldValue())
     }
@@ -376,14 +365,10 @@ private fun EditProfileScreen(
     }
 
     val modalListState = rememberLazyListState()
-    var isOpenChangeImageDialogState by rememberSaveable {
-        mutableStateOf(false)
-    }
+    var isOpenChangeImageDialogState by rememberSaveable { mutableStateOf(false) }
 
-    val isImeVisible by isImeVisibleState()
-
-    LaunchedEffect(bottomSheetScaffoldState.isVisible) {
-        if (!bottomSheetScaffoldState.isVisible) {
+    LaunchedEffect(showBottomSheet) {
+        if (!showBottomSheet) {
             focusManager.clearFocus()
             searchValue = TextFieldValue()
         }
@@ -396,7 +381,7 @@ private fun EditProfileScreen(
             .semantics {
                 testTagsAsResourceId = true
             },
-        scaffoldState = scaffoldState
+        snackbarHost = { SnackbarHost(snackbarHostState) }
     ) { paddingValues ->
 
         val contentWidth by remember(key1 = windowSize) {
@@ -434,303 +419,281 @@ private fun EditProfileScreen(
             )
         }
 
-        ModalBottomSheetLayout(
-            modifier = Modifier
-                .testTag("btn_bottom_sheet_edit_profile")
-                .padding(bottom = if (isImeVisible && bottomSheetScaffoldState.isVisible) 120.dp else 0.dp)
-                .noRippleClickable {
-                    if (bottomSheetScaffoldState.isVisible) {
-                        coroutine.launch {
-                            bottomSheetScaffoldState.hide()
-                        }
-                    }
+        HandleUIMessage(uiMessage = uiMessage, snackbarHostState = snackbarHostState)
+
+        if (isOpenChangeImageDialogState && uiState.account.isOlderThanMinAge()) {
+            ChangeImageDialog(
+                onSelectFromGalleryClick = {
+                    isOpenChangeImageDialogState = false
+                    onSelectImageClick()
                 },
-            sheetShape = MaterialTheme.appShapes.screenBackgroundShape,
-            sheetState = bottomSheetScaffoldState,
-            scrimColor = Color.Black.copy(alpha = 0.4f),
-            sheetBackgroundColor = MaterialTheme.appColors.background,
-            sheetContent = {
-                SheetContent(
-                    title = bottomDialogTitle,
-                    searchValue = searchValue,
-                    expandedList = expandedList,
-                    listState = modalListState,
-                    onItemClick = { item ->
-                        if (serverFieldName.value == LANGUAGE) {
-                            mapFields[serverFieldName.value] =
-                                listOf(LanguageProficiency(item.value))
-                        } else {
-                            mapFields[serverFieldName.value] = item.value
-                        }
-                        coroutine.launch {
-                            bottomSheetScaffoldState.hide()
-                            modalListState.scrollToItem(0)
-                        }
-                    },
-                    searchValueChanged = {
-                        searchValue = TextFieldValue(it)
-                    }
-                )
-            }
-        ) {
-            HandleUIMessage(uiMessage = uiMessage, scaffoldState = scaffoldState)
+                onRemoveImageClick = {
+                    onDeleteImageClick()
+                    isOpenChangeImageDialogState = false
+                },
+                onCancelClick = {
+                    isOpenChangeImageDialogState = false
+                }
+            )
+        } else {
+            isOpenChangeImageDialogState = false
+        }
 
-            if (isOpenChangeImageDialogState && uiState.account.isOlderThanMinAge()) {
-                ChangeImageDialog(
-                    onSelectFromGalleryClick = {
-                        isOpenChangeImageDialogState = false
-                        onSelectImageClick()
-                    },
-                    onRemoveImageClick = {
-                        onDeleteImageClick()
-                        isOpenChangeImageDialogState = false
-                    },
-                    onCancelClick = {
-                        isOpenChangeImageDialogState = false
-                    }
+        if (leaveDialog) {
+            val configuration = LocalConfiguration.current
+            if (configuration.orientation == Configuration.ORIENTATION_PORTRAIT || windowSize.isTablet) {
+                LeaveProfile(
+                    onDismissRequest = { onKeepEdit() },
+                    onLeaveClick = { onBackClick(false) }
                 )
             } else {
-                isOpenChangeImageDialogState = false
+                LeaveProfileLandscape(
+                    onDismissRequest = { onKeepEdit() },
+                    onLeaveClick = { onBackClick(false) }
+                )
             }
+        }
 
-            if (leaveDialog) {
-                val configuration = LocalConfiguration.current
-                if (configuration.orientation == Configuration.ORIENTATION_PORTRAIT || windowSize.isTablet) {
-                    LeaveProfile(
-                        onDismissRequest = {
-                            onKeepEdit()
-                        },
-                        onLeaveClick = {
-                            onBackClick(false)
-                        }
-                    )
-                } else {
-                    LeaveProfileLandscape(
-                        onDismissRequest = {
-                            onKeepEdit()
-                        },
-                        onLeaveClick = {
-                            onBackClick(false)
-                        }
-                    )
+        Column(
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(paddingValues)
+                .statusBarsInset()
+                .displayCutoutForLandscape(),
+            horizontalAlignment = Alignment.CenterHorizontally
+        ) {
+            Box(
+                modifier = topBarWidth,
+                contentAlignment = Alignment.CenterStart
+            ) {
+                Text(
+                    modifier = Modifier
+                        .testTag("txt_edit_profile_title")
+                        .fillMaxWidth(),
+                    text = stringResource(id = R.string.profile_edit_profile),
+                    color = MaterialTheme.appColors.textPrimary,
+                    textAlign = TextAlign.Center,
+                    style = MaterialTheme.appTypography.titleMedium
+                )
+                Row(
+                    modifier = Modifier.fillMaxWidth(),
+                    horizontalArrangement = Arrangement.SpaceBetween,
+                    verticalAlignment = Alignment.Top
+                ) {
+                    BackBtn(modifier = Modifier.padding(end = 16.dp)) {
+                        onBackClick(saveButtonEnabled)
+                    }
+                    if (saveButtonEnabled) {
+                        IconText(
+                            modifier = Modifier
+                                .height(48.dp)
+                                .padding(end = 24.dp),
+                            text = stringResource(id = R.string.profile_done),
+                            icon = Icons.Filled.Done,
+                            color = MaterialTheme.appColors.primary,
+                            textStyle = MaterialTheme.appTypography.labelLarge,
+                            onClick = {
+                                onSaveClick(mapFields.toMap())
+                            }
+                        )
+                    }
                 }
             }
 
-            Column(
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .padding(paddingValues)
-                    .statusBarsInset()
-                    .displayCutoutForLandscape(),
-                horizontalAlignment = Alignment.CenterHorizontally
+            Surface(
+                modifier = Modifier,
+                color = MaterialTheme.appColors.background,
+                shape = MaterialTheme.appShapes.screenBackgroundShape
             ) {
                 Box(
-                    modifier = topBarWidth,
-                    contentAlignment = Alignment.CenterStart
+                    modifier = Modifier.fillMaxSize(),
+                    contentAlignment = Alignment.BottomCenter
                 ) {
-                    Text(
-                        modifier = Modifier
-                            .testTag("txt_edit_profile_title")
-                            .fillMaxWidth(),
-                        text = stringResource(id = R.string.profile_edit_profile),
-                        color = MaterialTheme.appColors.textPrimary,
-                        textAlign = TextAlign.Center,
-                        style = MaterialTheme.appTypography.titleMedium
-                    )
-                    Row(
-                        modifier = Modifier.fillMaxWidth(),
-                        horizontalArrangement = Arrangement.SpaceBetween,
-                        verticalAlignment = Alignment.Top
+                    Column(
+                        Modifier
+                            .fillMaxHeight()
+                            .then(contentWidth)
+                            .verticalScroll(rememberScrollState()),
+                        horizontalAlignment = Alignment.CenterHorizontally
                     ) {
-                        BackBtn(modifier = Modifier.padding(end = 16.dp)) {
-                            onBackClick(saveButtonEnabled)
-                        }
-                        if (saveButtonEnabled) {
-                            IconText(
-                                modifier = Modifier
-                                    .height(48.dp)
-                                    .padding(end = 24.dp),
-                                text = stringResource(id = R.string.profile_done),
-                                icon = Icons.Filled.Done,
-                                color = MaterialTheme.appColors.primary,
-                                textStyle = MaterialTheme.appTypography.labelLarge,
-                                onClick = {
-                                    onSaveClick(mapFields.toMap())
+                        Text(
+                            modifier = Modifier.testTag("txt_edit_profile_type_label"),
+                            text = stringResource(
+                                if (uiState.isLimited) {
+                                    R.string.profile_limited_profile
+                                } else {
+                                    R.string.profile_full_profile
                                 }
-                            )
-                        }
-                    }
-                }
-
-                Surface(
-                    modifier = Modifier,
-                    color = MaterialTheme.appColors.background,
-                    shape = MaterialTheme.appShapes.screenBackgroundShape
-                ) {
-                    Box(
-                        modifier = Modifier.fillMaxSize(),
-                        contentAlignment = Alignment.BottomCenter
-                    ) {
-                        Column(
-                            Modifier
-                                .fillMaxHeight()
-                                .then(contentWidth)
-                                .verticalScroll(rememberScrollState()),
-                            horizontalAlignment = Alignment.CenterHorizontally
-                        ) {
-                            Text(
-                                modifier = Modifier.testTag("txt_edit_profile_type_label"),
-                                text = stringResource(
-                                    if (uiState.isLimited) {
-                                        R.string.profile_limited_profile
-                                    } else {
-                                        R.string.profile_full_profile
-                                    }
+                            ),
+                            color = MaterialTheme.appColors.textSecondary,
+                            style = MaterialTheme.appTypography.titleSmall
+                        )
+                        Spacer(modifier = Modifier.height(32.dp))
+                        Box(contentAlignment = Alignment.BottomEnd) {
+                            AsyncImage(
+                                model = ImageRequest.Builder(LocalContext.current)
+                                    .data(imageRes)
+                                    .error(coreR.drawable.core_ic_default_profile_picture)
+                                    .placeholder(coreR.drawable.core_ic_default_profile_picture)
+                                    .build(),
+                                contentScale = ContentScale.Crop,
+                                contentDescription = stringResource(
+                                    id = coreR.string.core_accessibility_user_profile_image,
+                                    uiState.account.username
                                 ),
-                                color = MaterialTheme.appColors.textSecondary,
-                                style = MaterialTheme.appTypography.titleSmall
-                            )
-                            Spacer(modifier = Modifier.height(32.dp))
-                            Box(contentAlignment = Alignment.BottomEnd) {
-                                AsyncImage(
-                                    model = ImageRequest.Builder(LocalContext.current)
-                                        .data(imageRes)
-                                        .error(coreR.drawable.core_ic_default_profile_picture)
-                                        .placeholder(coreR.drawable.core_ic_default_profile_picture)
-                                        .build(),
-                                    contentScale = ContentScale.Crop,
-                                    contentDescription = stringResource(
-                                        id = coreR.string.core_accessibility_user_profile_image,
-                                        uiState.account.username
-                                    ),
-                                    modifier = Modifier
-                                        .testTag("img_edit_profile_user_image")
-                                        .border(
-                                            2.dp,
-                                            MaterialTheme.appColors.onSurface,
-                                            CircleShape
-                                        )
-                                        .padding(2.dp)
-                                        .size(100.dp)
-                                        .clip(CircleShape)
-                                        .noRippleClickable {
-                                            isOpenChangeImageDialogState = true
-                                            if (!uiState.account.isOlderThanMinAge()) {
-                                                openWarningMessageDialog = true
-                                            }
+                                modifier = Modifier
+                                    .testTag("img_edit_profile_user_image")
+                                    .border(
+                                        2.dp,
+                                        MaterialTheme.appColors.onSurface,
+                                        CircleShape
+                                    )
+                                    .padding(2.dp)
+                                    .size(100.dp)
+                                    .clip(CircleShape)
+                                    .noRippleClickable {
+                                        isOpenChangeImageDialogState = true
+                                        if (!uiState.account.isOlderThanMinAge()) {
+                                            openWarningMessageDialog = true
                                         }
-                                )
-                                Icon(
-                                    modifier = Modifier
-                                        .size(32.dp)
-                                        .clip(CircleShape)
-                                        .background(MaterialTheme.appColors.primary)
-                                        .padding(5.dp)
-                                        .clickable {
-                                            isOpenChangeImageDialogState = true
-                                            if (!uiState.account.isOlderThanMinAge()) {
-                                                openWarningMessageDialog = true
-                                            }
-                                        },
-                                    painter = painterResource(id = R.drawable.profile_ic_edit_image),
-                                    contentDescription = null,
-                                    tint = MaterialTheme.appColors.onPrimary
-                                )
-                            }
-                            Spacer(modifier = Modifier.height(20.dp))
-                            Text(
-                                modifier = Modifier.testTag("txt_edit_profile_user_name"),
-                                text = uiState.account.name,
-                                style = MaterialTheme.appTypography.headlineSmall,
-                                color = MaterialTheme.appColors.textPrimary
+                                    }
                             )
-                            Spacer(modifier = Modifier.height(24.dp))
-                            Text(
+                            Icon(
                                 modifier = Modifier
-                                    .testTag("txt_edit_profile_limited_profile_label")
+                                    .size(32.dp)
+                                    .clip(CircleShape)
+                                    .background(MaterialTheme.appColors.primary)
+                                    .padding(5.dp)
                                     .clickable {
-                                        if (!LocaleUtils.isProfileLimited(mapFields[YEAR_OF_BIRTH].toString())) {
-                                            val privacy = if (uiState.isLimited) {
-                                                Account.Privacy.ALL_USERS
-                                            } else {
-                                                Account.Privacy.PRIVATE
-                                            }
-                                            mapFields[ACCOUNT_PRIVACY] = privacy
-                                            onLimitedProfileChange(!uiState.isLimited)
-                                        } else {
+                                        isOpenChangeImageDialogState = true
+                                        if (!uiState.account.isOlderThanMinAge()) {
                                             openWarningMessageDialog = true
                                         }
                                     },
-                                text = stringResource(
-                                    if (uiState.isLimited) {
-                                        R.string.profile_switch_to_full
-                                    } else {
-                                        R.string.profile_switch_to_limited
-                                    }
-                                ),
-                                color = MaterialTheme.appColors.textAccent,
-                                style = MaterialTheme.appTypography.labelLarge
+                                painter = painterResource(id = R.drawable.profile_ic_edit_image),
+                                contentDescription = null,
+                                tint = MaterialTheme.appColors.onPrimary
                             )
-                            Spacer(modifier = Modifier.height(20.dp))
-                            ProfileFields(
-                                disabled = uiState.isLimited,
-                                onFieldClick = { field, title ->
-                                    when (field) {
-                                        YEAR_OF_BIRTH -> {
-                                            serverFieldName.value = YEAR_OF_BIRTH
-                                            expandedList = LocaleUtils.getBirthYearsRange()
+                        }
+                        Spacer(modifier = Modifier.height(20.dp))
+                        Text(
+                            modifier = Modifier.testTag("txt_edit_profile_user_name"),
+                            text = uiState.account.name,
+                            style = MaterialTheme.appTypography.headlineSmall,
+                            color = MaterialTheme.appColors.textPrimary
+                        )
+                        Spacer(modifier = Modifier.height(24.dp))
+                        Text(
+                            modifier = Modifier
+                                .testTag("txt_edit_profile_limited_profile_label")
+                                .clickable {
+                                    if (!LocaleUtils.isProfileLimited(mapFields[YEAR_OF_BIRTH].toString())) {
+                                        val privacy = if (uiState.isLimited) {
+                                            Account.Privacy.ALL_USERS
+                                        } else {
+                                            Account.Privacy.PRIVATE
                                         }
+                                        mapFields[ACCOUNT_PRIVACY] = privacy
+                                        onLimitedProfileChange(!uiState.isLimited)
+                                    } else {
+                                        openWarningMessageDialog = true
+                                    }
+                                },
+                            text = stringResource(
+                                if (uiState.isLimited) {
+                                    R.string.profile_switch_to_full
+                                } else {
+                                    R.string.profile_switch_to_limited
+                                }
+                            ),
+                            color = MaterialTheme.appColors.textAccent,
+                            style = MaterialTheme.appTypography.labelLarge
+                        )
+                        Spacer(modifier = Modifier.height(20.dp))
+                        ProfileFields(
+                            disabled = uiState.isLimited,
+                            onFieldClick = { field, title ->
+                                when (field) {
+                                    YEAR_OF_BIRTH -> {
+                                        serverFieldName.value = YEAR_OF_BIRTH
+                                        expandedList = LocaleUtils.getBirthYearsRange()
+                                    }
 
-                                        COUNTRY -> {
-                                            serverFieldName.value = COUNTRY
-                                            expandedList = LocaleUtils.getCountries()
-                                        }
+                                    COUNTRY -> {
+                                        serverFieldName.value = COUNTRY
+                                        expandedList = LocaleUtils.getCountries()
+                                    }
 
-                                        LANGUAGE -> {
-                                            serverFieldName.value = LANGUAGE
-                                            expandedList = LocaleUtils.getLanguages()
-                                        }
+                                    LANGUAGE -> {
+                                        serverFieldName.value = LANGUAGE
+                                        expandedList = LocaleUtils.getLanguages()
                                     }
-                                    bottomDialogTitle = title
-                                    keyboardController?.hide()
-                                    coroutine.launch {
-                                        val index = expandedList.indexOfFirst { option ->
-                                            if (serverFieldName.value == LANGUAGE) {
-                                                option.value ==
-                                                        (mapFields[serverFieldName.value] as List<LanguageProficiency>)
-                                                            .getOrNull(0)?.code
-                                            } else {
-                                                option.value == mapFields[serverFieldName.value]
-                                            }
-                                        }
-                                        modalListState.scrollToItem(if (index > 0) index else 0)
-                                        if (bottomSheetScaffoldState.isVisible) {
-                                            bottomSheetScaffoldState.hide()
+                                }
+                                bottomDialogTitle = title
+                                keyboardController?.hide()
+                                coroutine.launch {
+                                    val index = expandedList.indexOfFirst { option ->
+                                        if (serverFieldName.value == LANGUAGE) {
+                                            option.value ==
+                                                    (mapFields[serverFieldName.value] as List<LanguageProficiency>)
+                                                        .getOrNull(0)?.code
                                         } else {
-                                            bottomSheetScaffoldState.show()
+                                            option.value == mapFields[serverFieldName.value]
                                         }
                                     }
-                                },
-                                onValueChanged = {
-                                    mapFields[BIO] = it
-                                },
-                                mapFields = mapFields,
-                                onDoneClick = { onSaveClick(mapFields.toMap()) }
-                            )
-                            Spacer(Modifier.height(52.dp))
-                        }
-                        if (openWarningMessageDialog) {
-                            LimitedProfileDialog(
-                                modifier = popUpModifier
-                            ) {
-                                openWarningMessageDialog = false
-                            }
+                                    modalListState.scrollToItem(if (index > 0) index else 0)
+                                    showBottomSheet = true
+                                }
+                            },
+                            onValueChanged = {
+                                mapFields[BIO] = it
+                            },
+                            mapFields = mapFields,
+                            onDoneClick = { onSaveClick(mapFields.toMap()) }
+                        )
+                        Spacer(Modifier.height(52.dp))
+                    }
+                    if (openWarningMessageDialog) {
+                        LimitedProfileDialog(
+                            modifier = popUpModifier
+                        ) {
+                            openWarningMessageDialog = false
                         }
                     }
                 }
             }
         }
     }
+
+    if (showBottomSheet) {
+        ModalBottomSheet(
+            onDismissRequest = { showBottomSheet = false },
+            sheetState = sheetState,
+            shape = MaterialTheme.appShapes.screenBackgroundShape,
+            containerColor = MaterialTheme.appColors.background,
+            scrimColor = Color.Black.copy(alpha = 0.4f),
+        ) {
+            SheetContent(
+                title = bottomDialogTitle,
+                searchValue = searchValue,
+                expandedList = expandedList,
+                listState = modalListState,
+                onItemClick = { item ->
+                    if (serverFieldName.value == LANGUAGE) {
+                        mapFields[serverFieldName.value] = listOf(LanguageProficiency(item.value))
+                    } else {
+                        mapFields[serverFieldName.value] = item.value
+                    }
+                    coroutine.launch {
+                        sheetState.hide()
+                        modalListState.scrollToItem(0)
+                        showBottomSheet = false
+                    }
+                },
+                searchValueChanged = { searchValue = TextFieldValue(it) }
+            )
+        }
+    }
 }
 
 @Composable
@@ -743,11 +706,11 @@ private fun LimitedProfileDialog(
         modifier
             .shadow(
                 2.dp,
-                MaterialTheme.appShapes.material.medium
+                MaterialTheme.appShapes.material3.medium
             )
             .background(
                 MaterialTheme.appColors.warning,
-                MaterialTheme.appShapes.material.medium
+                MaterialTheme.appShapes.material3.medium
             )
     ) {
         Row(
@@ -809,14 +772,14 @@ private fun ChangeImageDialog(
                 horizontalAlignment = Alignment.CenterHorizontally
             ) {
                 Spacer(Modifier.height(4.dp))
-                Divider(
+                HorizontalDivider(
                     modifier = Modifier
                         .width(32.dp)
                         .background(
                             MaterialTheme.appColors.bottomSheetToggle,
-                            MaterialTheme.appShapes.material.small
+                            MaterialTheme.appShapes.material3.small
                         )
-                        .clip(MaterialTheme.appShapes.material.small),
+                        .clip(MaterialTheme.appShapes.material3.small),
                     thickness = 4.dp
                 )
                 Spacer(Modifier.height(14.dp))
@@ -935,14 +898,16 @@ private fun SelectableField(
     onClick: () -> Unit,
 ) {
     val colors = if (disabled) {
-        TextFieldDefaults.outlinedTextFieldColors(
+        OutlinedTextFieldDefaults.colors(
             unfocusedBorderColor = MaterialTheme.appColors.textFieldBorder,
-            backgroundColor = MaterialTheme.appColors.textFieldBackground
+            unfocusedContainerColor = MaterialTheme.appColors.textFieldBackground
         )
     } else {
-        TextFieldDefaults.outlinedTextFieldColors(
-            textColor = MaterialTheme.appColors.textFieldText,
-            backgroundColor = MaterialTheme.appColors.textFieldBackground,
+        OutlinedTextFieldDefaults.colors(
+            focusedTextColor = MaterialTheme.appColors.textFieldText,
+            unfocusedTextColor = MaterialTheme.appColors.textFieldText,
+            unfocusedContainerColor = MaterialTheme.appColors.textFieldBackground,
+            focusedContainerColor = MaterialTheme.appColors.textFieldBackground,
             unfocusedBorderColor = MaterialTheme.appColors.textFieldBorder,
             cursorColor = MaterialTheme.appColors.textFieldText,
             disabledBorderColor = MaterialTheme.appColors.textFieldBorder,
@@ -1022,9 +987,11 @@ private fun InputEditField(
             onValueChange = {
                 onValueChanged(it)
             },
-            colors = TextFieldDefaults.outlinedTextFieldColors(
-                textColor = MaterialTheme.appColors.textFieldText,
-                backgroundColor = MaterialTheme.appColors.textFieldBackground,
+            colors = OutlinedTextFieldDefaults.colors(
+                focusedTextColor = MaterialTheme.appColors.textFieldText,
+                unfocusedTextColor = MaterialTheme.appColors.textFieldText,
+                unfocusedContainerColor = MaterialTheme.appColors.textFieldBackground,
+                focusedContainerColor = MaterialTheme.appColors.textFieldBackground,
                 unfocusedBorderColor = MaterialTheme.appColors.textFieldBorder,
                 cursorColor = MaterialTheme.appColors.textFieldText,
             ),
@@ -1157,7 +1124,7 @@ private fun LeaveProfileLandscape(
                     .width(screenWidth * LEAVE_PROFILE_WIDTH_FACTOR)
                     .clip(MaterialTheme.appShapes.courseImageShape)
                     .semantics { testTagsAsResourceId = true },
-                backgroundColor = MaterialTheme.appColors.background,
+                colors = CardDefaults.cardColors(containerColor = MaterialTheme.appColors.background),
                 shape = MaterialTheme.appShapes.courseImageShape
             ) {
                 Row(
diff --git a/profile/src/main/java/org/openedx/profile/presentation/manageaccount/compose/ManageAccountView.kt b/profile/src/main/java/org/openedx/profile/presentation/manageaccount/compose/ManageAccountView.kt
index 92a86155e..8b2d9037d 100644
--- a/profile/src/main/java/org/openedx/profile/presentation/manageaccount/compose/ManageAccountView.kt
+++ b/profile/src/main/java/org/openedx/profile/presentation/manageaccount/compose/ManageAccountView.kt
@@ -13,15 +13,15 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.widthIn
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.CircularProgressIndicator
-import androidx.compose.material.ExperimentalMaterialApi
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Scaffold
-import androidx.compose.material.Surface
-import androidx.compose.material.pullrefresh.PullRefreshIndicator
-import androidx.compose.material.pullrefresh.pullRefresh
-import androidx.compose.material.pullrefresh.rememberPullRefreshState
-import androidx.compose.material.rememberScaffoldState
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.SnackbarHost
+import androidx.compose.material3.SnackbarHostState
+import androidx.compose.material3.Surface
+import androidx.compose.material3.pulltorefresh.PullToRefreshBox
+import androidx.compose.material3.pulltorefresh.rememberPullToRefreshState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -58,7 +58,7 @@ import org.openedx.profile.presentation.manageaccount.ManageAccountUIState
 import org.openedx.profile.presentation.ui.ProfileTopic
 import org.openedx.profile.R as ProfileR
 
-@OptIn(ExperimentalMaterialApi::class, ExperimentalComposeUiApi::class)
+@OptIn(ExperimentalMaterial3Api::class, ExperimentalComposeUiApi::class)
 @Composable
 internal fun ManageAccountView(
     windowSize: WindowSize,
@@ -67,12 +67,8 @@ internal fun ManageAccountView(
     refreshing: Boolean,
     onAction: (ManageAccountViewAction) -> Unit
 ) {
-    val scaffoldState = rememberScaffoldState()
-
-    val pullRefreshState = rememberPullRefreshState(
-        refreshing = refreshing,
-        onRefresh = { onAction(ManageAccountViewAction.SwipeRefresh) }
-    )
+    val snackbarHostState = remember { SnackbarHostState() }
+    val pullRefreshState = rememberPullToRefreshState()
 
     Scaffold(
         modifier = Modifier
@@ -80,7 +76,7 @@ internal fun ManageAccountView(
             .semantics {
                 testTagsAsResourceId = true
             },
-        scaffoldState = scaffoldState
+        snackbarHost = { SnackbarHost(snackbarHostState) }
     ) { paddingValues ->
 
         val contentWidth by remember(key1 = windowSize) {
@@ -104,7 +100,7 @@ internal fun ManageAccountView(
             )
         }
 
-        HandleUIMessage(uiMessage = uiMessage, scaffoldState = scaffoldState)
+        HandleUIMessage(uiMessage = uiMessage, snackbarHostState = snackbarHostState)
 
         Column(
             modifier = Modifier
@@ -132,10 +128,11 @@ internal fun ManageAccountView(
                 color = MaterialTheme.appColors.background,
                 shape = MaterialTheme.appShapes.screenBackgroundShape,
             ) {
-                Box(
-                    modifier = Modifier
-                        .pullRefresh(pullRefreshState),
-                    contentAlignment = Alignment.TopCenter
+                PullToRefreshBox(
+                    modifier = Modifier,
+                    state = pullRefreshState,
+                    isRefreshing = refreshing,
+                    onRefresh = { onAction(ManageAccountViewAction.SwipeRefresh) }
                 ) {
                     Column(
                         modifier = Modifier
@@ -193,11 +190,6 @@ internal fun ManageAccountView(
                             }
                         }
                     }
-                    PullRefreshIndicator(
-                        refreshing,
-                        pullRefreshState,
-                        Modifier.align(Alignment.TopCenter)
-                    )
                 }
             }
         }
diff --git a/profile/src/main/java/org/openedx/profile/presentation/profile/compose/ProfileView.kt b/profile/src/main/java/org/openedx/profile/presentation/profile/compose/ProfileView.kt
index 975939902..c823cff6a 100644
--- a/profile/src/main/java/org/openedx/profile/presentation/profile/compose/ProfileView.kt
+++ b/profile/src/main/java/org/openedx/profile/presentation/profile/compose/ProfileView.kt
@@ -13,15 +13,15 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.widthIn
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.CircularProgressIndicator
-import androidx.compose.material.ExperimentalMaterialApi
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Scaffold
-import androidx.compose.material.Surface
-import androidx.compose.material.pullrefresh.PullRefreshIndicator
-import androidx.compose.material.pullrefresh.pullRefresh
-import androidx.compose.material.pullrefresh.rememberPullRefreshState
-import androidx.compose.material.rememberScaffoldState
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.SnackbarHost
+import androidx.compose.material3.SnackbarHostState
+import androidx.compose.material3.Surface
+import androidx.compose.material3.pulltorefresh.PullToRefreshBox
+import androidx.compose.material3.pulltorefresh.rememberPullToRefreshState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -53,7 +53,7 @@ import org.openedx.profile.presentation.profile.ProfileUIState
 import org.openedx.profile.presentation.ui.ProfileInfoSection
 import org.openedx.profile.presentation.ui.ProfileTopic
 
-@OptIn(ExperimentalMaterialApi::class, ExperimentalComposeUiApi::class)
+@OptIn(ExperimentalMaterial3Api::class, ExperimentalComposeUiApi::class)
 @Composable
 internal fun ProfileView(
     windowSize: WindowSize,
@@ -63,12 +63,8 @@ internal fun ProfileView(
     onAction: (ProfileViewAction) -> Unit,
     onSettingsClick: () -> Unit
 ) {
-    val scaffoldState = rememberScaffoldState()
-
-    val pullRefreshState = rememberPullRefreshState(
-        refreshing = refreshing,
-        onRefresh = { onAction(ProfileViewAction.SwipeRefresh) }
-    )
+    val snackbarHostState = remember { SnackbarHostState() }
+    val pullRefreshState = rememberPullToRefreshState()
 
     Scaffold(
         modifier = Modifier
@@ -76,7 +72,7 @@ internal fun ProfileView(
             .semantics {
                 testTagsAsResourceId = true
             },
-        scaffoldState = scaffoldState
+        snackbarHost = { SnackbarHost(snackbarHostState) }
     ) { paddingValues ->
 
         val contentWidth by remember(key1 = windowSize) {
@@ -90,7 +86,7 @@ internal fun ProfileView(
             )
         }
 
-        HandleUIMessage(uiMessage = uiMessage, scaffoldState = scaffoldState)
+        HandleUIMessage(uiMessage = uiMessage, snackbarHostState = snackbarHostState)
 
         Column(
             modifier = Modifier
@@ -108,9 +104,11 @@ internal fun ProfileView(
             Surface(
                 color = MaterialTheme.appColors.background
             ) {
-                Box(
-                    modifier = Modifier.pullRefresh(pullRefreshState),
-                    contentAlignment = Alignment.TopCenter
+                PullToRefreshBox(
+                    modifier = Modifier,
+                    state = pullRefreshState,
+                    isRefreshing = refreshing,
+                    onRefresh = { onAction(ProfileViewAction.SwipeRefresh) }
                 ) {
                     Column(
                         modifier = Modifier
@@ -158,11 +156,6 @@ internal fun ProfileView(
                             }
                         }
                     }
-                    PullRefreshIndicator(
-                        refreshing,
-                        pullRefreshState,
-                        Modifier.align(Alignment.TopCenter)
-                    )
                 }
             }
         }
diff --git a/profile/src/main/java/org/openedx/profile/presentation/settings/SettingsScreenUI.kt b/profile/src/main/java/org/openedx/profile/presentation/settings/SettingsScreenUI.kt
index f949291aa..0d7fcfbad 100644
--- a/profile/src/main/java/org/openedx/profile/presentation/settings/SettingsScreenUI.kt
+++ b/profile/src/main/java/org/openedx/profile/presentation/settings/SettingsScreenUI.kt
@@ -19,15 +19,16 @@ import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.layout.widthIn
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.Card
-import androidx.compose.material.CircularProgressIndicator
-import androidx.compose.material.Icon
-import androidx.compose.material.IconButton
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Surface
-import androidx.compose.material.Text
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Close
+import androidx.compose.material3.Card
+import androidx.compose.material3.CardDefaults
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -222,8 +223,8 @@ private fun SettingsSection(
         Card(
             modifier = Modifier,
             shape = MaterialTheme.appShapes.cardShape,
-            elevation = 0.dp,
-            backgroundColor = MaterialTheme.appColors.cardViewBackground
+            elevation = CardDefaults.cardElevation(defaultElevation = 0.dp),
+            colors = CardDefaults.cardColors(containerColor = MaterialTheme.appColors.cardViewBackground)
         ) {
             Column(Modifier.fillMaxWidth()) {
                 SettingsItem(
@@ -245,8 +246,8 @@ private fun ManageAccountSection(onManageAccountClick: () -> Unit) {
     Column {
         Card(
             shape = MaterialTheme.appShapes.cardShape,
-            elevation = 0.dp,
-            backgroundColor = MaterialTheme.appColors.cardViewBackground
+            elevation = CardDefaults.cardElevation(defaultElevation = 0.dp),
+            colors = CardDefaults.cardColors(containerColor = MaterialTheme.appColors.cardViewBackground)
         ) {
             Column(Modifier.fillMaxWidth()) {
                 SettingsItem(
@@ -274,8 +275,8 @@ private fun SupportInfoSection(
         Card(
             modifier = Modifier,
             shape = MaterialTheme.appShapes.cardShape,
-            elevation = 0.dp,
-            backgroundColor = MaterialTheme.appColors.cardViewBackground
+            elevation = CardDefaults.cardElevation(defaultElevation = 0.dp),
+            colors = CardDefaults.cardColors(containerColor = MaterialTheme.appColors.cardViewBackground)
         ) {
             Column(Modifier.fillMaxWidth()) {
                 if (uiState.configuration.supportEmail.isNotBlank()) {
@@ -337,8 +338,8 @@ private fun LogoutButton(onClick: () -> Unit) {
             .testTag("btn_logout")
             .fillMaxWidth(),
         shape = MaterialTheme.appShapes.cardShape,
-        elevation = 0.dp,
-        backgroundColor = MaterialTheme.appColors.cardViewBackground
+        elevation = CardDefaults.cardElevation(defaultElevation = 0.dp),
+        colors = CardDefaults.cardColors(containerColor = MaterialTheme.appColors.cardViewBackground)
     ) {
         Row(
             modifier = Modifier
diff --git a/profile/src/main/java/org/openedx/profile/presentation/ui/ProfileUI.kt b/profile/src/main/java/org/openedx/profile/presentation/ui/ProfileUI.kt
index dcaa2f945..e47982cb0 100644
--- a/profile/src/main/java/org/openedx/profile/presentation/ui/ProfileUI.kt
+++ b/profile/src/main/java/org/openedx/profile/presentation/ui/ProfileUI.kt
@@ -10,9 +10,10 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.material.Card
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Text
+import androidx.compose.material3.Card
+import androidx.compose.material3.CardDefaults
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -87,8 +88,8 @@ fun ProfileInfoSection(account: Account) {
             Card(
                 modifier = Modifier,
                 shape = MaterialTheme.appShapes.cardShape,
-                elevation = 0.dp,
-                backgroundColor = MaterialTheme.appColors.cardViewBackground
+                elevation = CardDefaults.cardElevation(defaultElevation = 0.dp),
+                colors = CardDefaults.cardColors(containerColor = MaterialTheme.appColors.cardViewBackground)
             ) {
                 Column(
                     Modifier
diff --git a/profile/src/main/java/org/openedx/profile/presentation/ui/SettingsUI.kt b/profile/src/main/java/org/openedx/profile/presentation/ui/SettingsUI.kt
index 7a41a916e..f02cf820b 100644
--- a/profile/src/main/java/org/openedx/profile/presentation/ui/SettingsUI.kt
+++ b/profile/src/main/java/org/openedx/profile/presentation/ui/SettingsUI.kt
@@ -6,13 +6,13 @@ import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
-import androidx.compose.material.Divider
-import androidx.compose.material.Icon
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Text
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.KeyboardArrowRight
 import androidx.compose.material.icons.automirrored.filled.OpenInNew
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -66,7 +66,7 @@ fun SettingsItem(
 
 @Composable
 fun SettingsDivider() {
-    Divider(
+    HorizontalDivider(
         modifier = Modifier
             .padding(
                 horizontal = 20.dp
diff --git a/profile/src/main/java/org/openedx/profile/presentation/video/VideoSettingsFragment.kt b/profile/src/main/java/org/openedx/profile/presentation/video/VideoSettingsFragment.kt
index 5cbfc0635..d4b8d6876 100644
--- a/profile/src/main/java/org/openedx/profile/presentation/video/VideoSettingsFragment.kt
+++ b/profile/src/main/java/org/openedx/profile/presentation/video/VideoSettingsFragment.kt
@@ -17,16 +17,15 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.widthIn
-import androidx.compose.material.Divider
-import androidx.compose.material.Icon
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Scaffold
-import androidx.compose.material.Switch
-import androidx.compose.material.SwitchDefaults
-import androidx.compose.material.Text
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.KeyboardArrowRight
-import androidx.compose.material.rememberScaffoldState
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Switch
+import androidx.compose.material3.SwitchDefaults
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
@@ -118,8 +117,6 @@ private fun VideoSettingsScreen(
     videoDownloadQualityClick: () -> Unit,
     onBackClick: () -> Unit,
 ) {
-    val scaffoldState = rememberScaffoldState()
-
     var wifiDownloadOnly by rememberSaveable {
         mutableStateOf(videoSettings.wifiDownloadOnly)
     }
@@ -129,8 +126,7 @@ private fun VideoSettingsScreen(
             .fillMaxSize()
             .semantics {
                 testTagsAsResourceId = true
-            },
-        scaffoldState = scaffoldState
+            }
     ) { paddingValues ->
 
         val contentWidth by remember(key1 = windowSize) {
@@ -223,12 +219,12 @@ private fun VideoSettingsScreen(
                                     wifiDownloadChanged(wifiDownloadOnly)
                                 },
                                 colors = SwitchDefaults.colors(
-                                    checkedThumbColor = MaterialTheme.appColors.primary,
+                                    checkedThumbColor = MaterialTheme.appColors.primaryButtonBackground,
                                     checkedTrackColor = MaterialTheme.appColors.primary
                                 )
                             )
                         }
-                        Divider()
+                        HorizontalDivider()
                         Row(
                             Modifier
                                 .fillMaxWidth()
@@ -258,7 +254,7 @@ private fun VideoSettingsScreen(
                                 contentDescription = stringResource(CoreR.string.core_accessibility_expandable_arrow)
                             )
                         }
-                        Divider()
+                        HorizontalDivider()
                         Row(
                             Modifier
                                 .testTag("btn_video_quality")
@@ -289,7 +285,7 @@ private fun VideoSettingsScreen(
                                 contentDescription = stringResource(CoreR.string.core_accessibility_expandable_arrow)
                             )
                         }
-                        Divider()
+                        HorizontalDivider()
                     }
                 }
             }
diff --git a/settings.gradle b/settings.gradle
index eccc1db15..b7e4e47f1 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -21,6 +21,7 @@ dependencyResolutionManagement {
     repositories {
         google()
         mavenCentral()
+        mavenLocal()
         maven {
             url "http://appboy.github.io/appboy-android-sdk/sdk"
             allowInsecureProtocol = true
diff --git a/whatsnew/src/main/java/org/openedx/whatsnew/presentation/ui/WhatsNewUI.kt b/whatsnew/src/main/java/org/openedx/whatsnew/presentation/ui/WhatsNewUI.kt
index 2c2765619..3da4bd704 100644
--- a/whatsnew/src/main/java/org/openedx/whatsnew/presentation/ui/WhatsNewUI.kt
+++ b/whatsnew/src/main/java/org/openedx/whatsnew/presentation/ui/WhatsNewUI.kt
@@ -13,15 +13,15 @@ import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
-import androidx.compose.material.Button
-import androidx.compose.material.ButtonDefaults
-import androidx.compose.material.Icon
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.OutlinedButton
-import androidx.compose.material.Text
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material.icons.automirrored.filled.ArrowForward
+import androidx.compose.material3.Button
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedButton
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
@@ -78,10 +78,9 @@ fun PrevButton(
             .height(42.dp)
             .alpha(prevButtonAnimationFactor),
         colors = ButtonDefaults.outlinedButtonColors(
-            backgroundColor = MaterialTheme.appColors.background
+            containerColor = MaterialTheme.appColors.background
         ),
         border = BorderStroke(1.dp, MaterialTheme.appColors.primary),
-        elevation = null,
         shape = MaterialTheme.appShapes.navigationButtonShape,
         onClick = onPrevClick,
     ) {
@@ -114,9 +113,8 @@ fun NextFinishButton(
             .testTag("btn_next")
             .height(42.dp),
         colors = ButtonDefaults.buttonColors(
-            backgroundColor = MaterialTheme.appColors.primaryButtonBackground
+            containerColor = MaterialTheme.appColors.primaryButtonBackground
         ),
-        elevation = null,
         shape = MaterialTheme.appShapes.navigationButtonShape,
         onClick = onNextClick
     ) {
diff --git a/whatsnew/src/main/java/org/openedx/whatsnew/presentation/whatsnew/WhatsNewFragment.kt b/whatsnew/src/main/java/org/openedx/whatsnew/presentation/whatsnew/WhatsNewFragment.kt
index 22dc96737..1071284bc 100644
--- a/whatsnew/src/main/java/org/openedx/whatsnew/presentation/whatsnew/WhatsNewFragment.kt
+++ b/whatsnew/src/main/java/org/openedx/whatsnew/presentation/whatsnew/WhatsNewFragment.kt
@@ -21,14 +21,13 @@ import androidx.compose.foundation.layout.widthIn
 import androidx.compose.foundation.pager.HorizontalPager
 import androidx.compose.foundation.pager.PagerState
 import androidx.compose.foundation.pager.rememberPagerState
-import androidx.compose.material.Icon
-import androidx.compose.material.IconButton
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Scaffold
-import androidx.compose.material.Text
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Close
-import androidx.compose.material.rememberScaffoldState
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -132,7 +131,6 @@ fun WhatsNewScreen(
 ) {
     whatsNewItem?.let { item ->
         OpenEdXTheme {
-            val scaffoldState = rememberScaffoldState()
             val pagerState = rememberPagerState {
                 whatsNewItem.messages.size
             }
@@ -144,7 +142,6 @@ fun WhatsNewScreen(
                     }
                     .navigationBarsPadding()
                     .fillMaxSize(),
-                scaffoldState = scaffoldState,
                 topBar = {
                     WhatsNewTopBar(
                         windowSize = windowSize,

From bd9f319cbd472af443742a82e45c68880b824520 Mon Sep 17 00:00:00 2001
From: PavloNetrebchuk <pavlo.netrebchuk@raccoongang.com>
Date: Thu, 29 Jan 2026 16:03:57 +0200
Subject: [PATCH 2/4] fix: status bar padding

---
 .../presentation/settings/video/VideoQualityFragment.kt  | 2 ++
 .../presentation/container/CourseContainerFragment.kt    | 2 ++
 .../discovery/presentation/NativeDiscoveryFragment.kt    | 4 +++-
 .../search/DiscussionSearchThreadFragment.kt             | 4 +++-
 .../presentation/calendar/CalendarSettingsView.kt        | 4 ----
 .../profile/presentation/calendar/CalendarView.kt        | 4 ----
 .../presentation/calendar/CoursesToSyncFragment.kt       | 4 ----
 .../profile/presentation/edit/EditProfileFragment.kt     | 6 ++++--
 .../manageaccount/compose/ManageAccountView.kt           | 4 +++-
 .../profile/presentation/profile/compose/ProfileView.kt  | 4 +++-
 .../profile/presentation/settings/SettingsScreenUI.kt    | 1 +
 .../profile/presentation/video/VideoSettingsFragment.kt  | 9 +++------
 12 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/core/src/main/java/org/openedx/core/presentation/settings/video/VideoQualityFragment.kt b/core/src/main/java/org/openedx/core/presentation/settings/video/VideoQualityFragment.kt
index 6f72776ec..94dbad546 100644
--- a/core/src/main/java/org/openedx/core/presentation/settings/video/VideoQualityFragment.kt
+++ b/core/src/main/java/org/openedx/core/presentation/settings/video/VideoQualityFragment.kt
@@ -10,6 +10,7 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
@@ -135,6 +136,7 @@ private fun VideoQualityScreen(
             .semantics {
                 testTagsAsResourceId = true
             },
+        contentWindowInsets = WindowInsets()
     ) { paddingValues ->
 
         val topBarWidth by remember(key1 = windowSize) {
diff --git a/course/src/main/java/org/openedx/course/presentation/container/CourseContainerFragment.kt b/course/src/main/java/org/openedx/course/presentation/container/CourseContainerFragment.kt
index ece0f29cc..d328ec9e4 100644
--- a/course/src/main/java/org/openedx/course/presentation/container/CourseContainerFragment.kt
+++ b/course/src/main/java/org/openedx/course/presentation/container/CourseContainerFragment.kt
@@ -14,6 +14,7 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.navigationBarsPadding
@@ -297,6 +298,7 @@ fun CourseDashboard(
                 .fillMaxSize()
                 .navigationBarsPadding(),
             containerColor = MaterialTheme.appColors.background,
+            contentWindowInsets = WindowInsets(),
             bottomBar = {
                 val currentPage = CourseContainerTab.entries[pagerState.currentPage]
                 Box {
diff --git a/discovery/src/main/java/org/openedx/discovery/presentation/NativeDiscoveryFragment.kt b/discovery/src/main/java/org/openedx/discovery/presentation/NativeDiscoveryFragment.kt
index e147f8293..792c02ab7 100644
--- a/discovery/src/main/java/org/openedx/discovery/presentation/NativeDiscoveryFragment.kt
+++ b/discovery/src/main/java/org/openedx/discovery/presentation/NativeDiscoveryFragment.kt
@@ -9,6 +9,7 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -235,7 +236,8 @@ internal fun DiscoveryScreen(
                     )
                 }
             }
-        }
+        },
+        contentWindowInsets = WindowInsets()
     ) {
         val searchTabWidth by remember(key1 = windowSize) {
             mutableStateOf(
diff --git a/discussion/src/main/java/org/openedx/discussion/presentation/search/DiscussionSearchThreadFragment.kt b/discussion/src/main/java/org/openedx/discussion/presentation/search/DiscussionSearchThreadFragment.kt
index ba431e348..10ea90e09 100644
--- a/discussion/src/main/java/org/openedx/discussion/presentation/search/DiscussionSearchThreadFragment.kt
+++ b/discussion/src/main/java/org/openedx/discussion/presentation/search/DiscussionSearchThreadFragment.kt
@@ -9,6 +9,7 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
@@ -187,7 +188,8 @@ private fun DiscussionSearchThreadScreen(
             .fillMaxSize()
             .navigationBarsPadding(),
         containerColor = MaterialTheme.appColors.background,
-        snackbarHost = { SnackbarHost(snackbarHostState) }
+        snackbarHost = { SnackbarHost(snackbarHostState) },
+        contentWindowInsets = WindowInsets()
     ) {
         val screenWidth by remember(key1 = windowSize) {
             mutableStateOf(
diff --git a/profile/src/main/java/org/openedx/profile/presentation/calendar/CalendarSettingsView.kt b/profile/src/main/java/org/openedx/profile/presentation/calendar/CalendarSettingsView.kt
index fae8da473..d67735161 100644
--- a/profile/src/main/java/org/openedx/profile/presentation/calendar/CalendarSettingsView.kt
+++ b/profile/src/main/java/org/openedx/profile/presentation/calendar/CalendarSettingsView.kt
@@ -25,7 +25,6 @@ import androidx.compose.material3.LocalMinimumInteractiveComponentSize
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Switch
-import androidx.compose.material3.SwitchDefaults
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
@@ -238,9 +237,6 @@ fun CalendarSyncSection(
                         .padding(0.dp),
                     checked = isCourseCalendarSyncEnabled,
                     onCheckedChange = onCalendarSyncSwitchClick,
-                    colors = SwitchDefaults.colors(
-                        checkedThumbColor = MaterialTheme.appColors.textAccent
-                    )
                 )
             }
         }
diff --git a/profile/src/main/java/org/openedx/profile/presentation/calendar/CalendarView.kt b/profile/src/main/java/org/openedx/profile/presentation/calendar/CalendarView.kt
index 08ff27fb1..836779e72 100644
--- a/profile/src/main/java/org/openedx/profile/presentation/calendar/CalendarView.kt
+++ b/profile/src/main/java/org/openedx/profile/presentation/calendar/CalendarView.kt
@@ -9,7 +9,6 @@ import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.LocalMinimumInteractiveComponentSize
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Switch
-import androidx.compose.material3.SwitchDefaults
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
@@ -58,9 +57,6 @@ fun OptionsSection(
                         .padding(0.dp),
                     checked = isRelativeDatesEnabled,
                     onCheckedChange = onRelativeDateSwitchClick,
-                    colors = SwitchDefaults.colors(
-                        checkedThumbColor = MaterialTheme.appColors.textAccent
-                    )
                 )
             }
         }
diff --git a/profile/src/main/java/org/openedx/profile/presentation/calendar/CoursesToSyncFragment.kt b/profile/src/main/java/org/openedx/profile/presentation/calendar/CoursesToSyncFragment.kt
index 5e14ab1f1..efb22e4ac 100644
--- a/profile/src/main/java/org/openedx/profile/presentation/calendar/CoursesToSyncFragment.kt
+++ b/profile/src/main/java/org/openedx/profile/presentation/calendar/CoursesToSyncFragment.kt
@@ -30,7 +30,6 @@ import androidx.compose.material3.Scaffold
 import androidx.compose.material3.SnackbarHost
 import androidx.compose.material3.SnackbarHostState
 import androidx.compose.material3.Switch
-import androidx.compose.material3.SwitchDefaults
 import androidx.compose.material3.Tab
 import androidx.compose.material3.TabRow
 import androidx.compose.material3.Text
@@ -407,9 +406,6 @@ private fun HideInactiveCoursesView(
                         .padding(0.dp),
                     checked = isHideInactiveCourses,
                     onCheckedChange = onHideInactiveCoursesSwitchClick,
-                    colors = SwitchDefaults.colors(
-                        checkedThumbColor = MaterialTheme.appColors.textAccent
-                    )
                 )
             }
         }
diff --git a/profile/src/main/java/org/openedx/profile/presentation/edit/EditProfileFragment.kt b/profile/src/main/java/org/openedx/profile/presentation/edit/EditProfileFragment.kt
index cb86c1150..9ddba9b2d 100644
--- a/profile/src/main/java/org/openedx/profile/presentation/edit/EditProfileFragment.kt
+++ b/profile/src/main/java/org/openedx/profile/presentation/edit/EditProfileFragment.kt
@@ -23,6 +23,7 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -381,7 +382,8 @@ private fun EditProfileScreen(
             .semantics {
                 testTagsAsResourceId = true
             },
-        snackbarHost = { SnackbarHost(snackbarHostState) }
+        snackbarHost = { SnackbarHost(snackbarHostState) },
+        contentWindowInsets = WindowInsets()
     ) { paddingValues ->
 
         val contentWidth by remember(key1 = windowSize) {
@@ -641,8 +643,8 @@ private fun EditProfileScreen(
                                             option.value == mapFields[serverFieldName.value]
                                         }
                                     }
-                                    modalListState.scrollToItem(if (index > 0) index else 0)
                                     showBottomSheet = true
+                                    modalListState.scrollToItem(if (index > 0) index else 0)
                                 }
                             },
                             onValueChanged = {
diff --git a/profile/src/main/java/org/openedx/profile/presentation/manageaccount/compose/ManageAccountView.kt b/profile/src/main/java/org/openedx/profile/presentation/manageaccount/compose/ManageAccountView.kt
index 8b2d9037d..0285448e4 100644
--- a/profile/src/main/java/org/openedx/profile/presentation/manageaccount/compose/ManageAccountView.kt
+++ b/profile/src/main/java/org/openedx/profile/presentation/manageaccount/compose/ManageAccountView.kt
@@ -5,6 +5,7 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -76,7 +77,8 @@ internal fun ManageAccountView(
             .semantics {
                 testTagsAsResourceId = true
             },
-        snackbarHost = { SnackbarHost(snackbarHostState) }
+        snackbarHost = { SnackbarHost(snackbarHostState) },
+        contentWindowInsets = WindowInsets()
     ) { paddingValues ->
 
         val contentWidth by remember(key1 = windowSize) {
diff --git a/profile/src/main/java/org/openedx/profile/presentation/profile/compose/ProfileView.kt b/profile/src/main/java/org/openedx/profile/presentation/profile/compose/ProfileView.kt
index c823cff6a..91fd10d9e 100644
--- a/profile/src/main/java/org/openedx/profile/presentation/profile/compose/ProfileView.kt
+++ b/profile/src/main/java/org/openedx/profile/presentation/profile/compose/ProfileView.kt
@@ -5,6 +5,7 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -72,7 +73,8 @@ internal fun ProfileView(
             .semantics {
                 testTagsAsResourceId = true
             },
-        snackbarHost = { SnackbarHost(snackbarHostState) }
+        snackbarHost = { SnackbarHost(snackbarHostState) },
+        contentWindowInsets = WindowInsets()
     ) { paddingValues ->
 
         val contentWidth by remember(key1 = windowSize) {
diff --git a/profile/src/main/java/org/openedx/profile/presentation/settings/SettingsScreenUI.kt b/profile/src/main/java/org/openedx/profile/presentation/settings/SettingsScreenUI.kt
index 0d7fcfbad..0c049bc68 100644
--- a/profile/src/main/java/org/openedx/profile/presentation/settings/SettingsScreenUI.kt
+++ b/profile/src/main/java/org/openedx/profile/presentation/settings/SettingsScreenUI.kt
@@ -343,6 +343,7 @@ private fun LogoutButton(onClick: () -> Unit) {
     ) {
         Row(
             modifier = Modifier
+                .fillMaxWidth()
                 .clickable {
                     onClick()
                 }
diff --git a/profile/src/main/java/org/openedx/profile/presentation/video/VideoSettingsFragment.kt b/profile/src/main/java/org/openedx/profile/presentation/video/VideoSettingsFragment.kt
index d4b8d6876..2fa1c6bca 100644
--- a/profile/src/main/java/org/openedx/profile/presentation/video/VideoSettingsFragment.kt
+++ b/profile/src/main/java/org/openedx/profile/presentation/video/VideoSettingsFragment.kt
@@ -12,6 +12,7 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
@@ -24,7 +25,6 @@ import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Switch
-import androidx.compose.material3.SwitchDefaults
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
@@ -126,7 +126,8 @@ private fun VideoSettingsScreen(
             .fillMaxSize()
             .semantics {
                 testTagsAsResourceId = true
-            }
+            },
+        contentWindowInsets = WindowInsets()
     ) { paddingValues ->
 
         val contentWidth by remember(key1 = windowSize) {
@@ -218,10 +219,6 @@ private fun VideoSettingsScreen(
                                     wifiDownloadOnly = !wifiDownloadOnly
                                     wifiDownloadChanged(wifiDownloadOnly)
                                 },
-                                colors = SwitchDefaults.colors(
-                                    checkedThumbColor = MaterialTheme.appColors.primaryButtonBackground,
-                                    checkedTrackColor = MaterialTheme.appColors.primary
-                                )
                             )
                         }
                         HorizontalDivider()

From 21236e96de8bdd628bc2263b00236df0daf9cbbe Mon Sep 17 00:00:00 2001
From: PavloNetrebchuk <pavlo.netrebchuk@raccoongang.com>
Date: Thu, 29 Jan 2026 16:03:57 +0200
Subject: [PATCH 3/4] fix: status bar padding

---
 .../presentation/logistration/LogistrationFragment.kt     | 8 +++++---
 .../auth/presentation/restore/RestorePasswordFragment.kt  | 4 +++-
 .../auth/presentation/signin/compose/SignInView.kt        | 4 +++-
 .../auth/presentation/signup/compose/SignUpView.kt        | 4 +++-
 core/src/main/java/org/openedx/core/ui/ComposeCommon.kt   | 6 ++++--
 .../src/main/java/org/openedx/core/ui/WebContentScreen.kt | 4 +++-
 .../container/NoAccessCourseContainerFragment.kt          | 4 +++-
 .../course/presentation/dates/CourseDatesScreen.kt        | 4 +++-
 .../course/presentation/handouts/HandoutsScreen.kt        | 4 +++-
 .../presentation/handouts/HandoutsWebViewFragment.kt      | 4 +++-
 .../course/presentation/section/CourseSectionFragment.kt  | 4 +++-
 .../course/settings/download/DownloadQueueFragment.kt     | 4 +++-
 .../courses/presentation/AllEnrolledCoursesView.kt        | 4 +++-
 .../dashboard/presentation/DashboardListFragment.kt       | 4 +++-
 .../discovery/presentation/WebViewDiscoveryFragment.kt    | 2 ++
 .../presentation/detail/CourseDetailsFragment.kt          | 2 ++
 .../discovery/presentation/info/CourseInfoFragment.kt     | 2 ++
 .../discovery/presentation/program/ProgramFragment.kt     | 4 +++-
 .../discovery/presentation/search/CourseSearchFragment.kt | 2 ++
 .../presentation/comments/DiscussionCommentsFragment.kt   | 4 +++-
 .../presentation/responses/DiscussionResponsesFragment.kt | 4 +++-
 .../presentation/threads/DiscussionAddThreadFragment.kt   | 4 +++-
 .../presentation/threads/DiscussionThreadsFragment.kt     | 4 +++-
 .../presentation/topics/DiscussionTopicsScreen.kt         | 4 +++-
 .../anothersaccount/AnothersProfileFragment.kt            | 2 ++
 .../profile/presentation/calendar/CalendarSetUpView.kt    | 4 +++-
 .../profile/presentation/calendar/CalendarSettingsView.kt | 4 +++-
 .../presentation/calendar/CoursesToSyncFragment.kt        | 4 +++-
 .../profile/presentation/delete/DeleteProfileFragment.kt  | 4 +++-
 .../whatsnew/presentation/whatsnew/WhatsNewFragment.kt    | 2 ++
 30 files changed, 87 insertions(+), 27 deletions(-)

diff --git a/auth/src/main/java/org/openedx/auth/presentation/logistration/LogistrationFragment.kt b/auth/src/main/java/org/openedx/auth/presentation/logistration/LogistrationFragment.kt
index 523240f50..fc82eb886 100644
--- a/auth/src/main/java/org/openedx/auth/presentation/logistration/LogistrationFragment.kt
+++ b/auth/src/main/java/org/openedx/auth/presentation/logistration/LogistrationFragment.kt
@@ -6,6 +6,7 @@ import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
@@ -123,15 +124,16 @@ private fun LogistrationScreen(
             .semantics {
                 testTagsAsResourceId = true
             }
-            .fillMaxSize()
-            .navigationBarsPadding(),
-        containerColor = MaterialTheme.appColors.background
+            .fillMaxSize(),
+        containerColor = MaterialTheme.appColors.background,
+        contentWindowInsets = WindowInsets()
     ) {
         Surface(
             modifier = Modifier
                 .padding(it)
                 .fillMaxSize()
                 .verticalScroll(scrollState)
+                .navigationBarsPadding()
                 .displayCutoutForLandscape(),
             color = MaterialTheme.appColors.background
         ) {
diff --git a/auth/src/main/java/org/openedx/auth/presentation/restore/RestorePasswordFragment.kt b/auth/src/main/java/org/openedx/auth/presentation/restore/RestorePasswordFragment.kt
index c1bb6461e..beebf4eaa 100644
--- a/auth/src/main/java/org/openedx/auth/presentation/restore/RestorePasswordFragment.kt
+++ b/auth/src/main/java/org/openedx/auth/presentation/restore/RestorePasswordFragment.kt
@@ -10,6 +10,7 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -142,7 +143,8 @@ private fun RestorePasswordScreen(
             .fillMaxSize()
             .navigationBarsPadding(),
         containerColor = MaterialTheme.appColors.background,
-        snackbarHost = { SnackbarHost(snackbarHostState) }
+        snackbarHost = { SnackbarHost(snackbarHostState) },
+        contentWindowInsets = WindowInsets()
     ) { paddingValues ->
 
         val contentPaddings by remember {
diff --git a/auth/src/main/java/org/openedx/auth/presentation/signin/compose/SignInView.kt b/auth/src/main/java/org/openedx/auth/presentation/signin/compose/SignInView.kt
index 831000b67..69e3af16d 100644
--- a/auth/src/main/java/org/openedx/auth/presentation/signin/compose/SignInView.kt
+++ b/auth/src/main/java/org/openedx/auth/presentation/signin/compose/SignInView.kt
@@ -8,6 +8,7 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -100,7 +101,8 @@ internal fun LoginScreen(
             .fillMaxSize()
             .navigationBarsPadding(),
         containerColor = MaterialTheme.appColors.background,
-        snackbarHost = { SnackbarHost(snackbarHostState) }
+        snackbarHost = { SnackbarHost(snackbarHostState) },
+        contentWindowInsets = WindowInsets()
     ) {
         val contentPaddings by remember {
             mutableStateOf(
diff --git a/auth/src/main/java/org/openedx/auth/presentation/signup/compose/SignUpView.kt b/auth/src/main/java/org/openedx/auth/presentation/signup/compose/SignUpView.kt
index 14b1226bb..5354a081a 100644
--- a/auth/src/main/java/org/openedx/auth/presentation/signup/compose/SignUpView.kt
+++ b/auth/src/main/java/org/openedx/auth/presentation/signup/compose/SignUpView.kt
@@ -9,6 +9,7 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -166,7 +167,8 @@ internal fun SignUpView(
             .fillMaxSize()
             .navigationBarsPadding(),
         containerColor = MaterialTheme.appColors.background,
-        snackbarHost = { SnackbarHost(snackbarHostState) }
+        snackbarHost = { SnackbarHost(snackbarHostState) },
+        contentWindowInsets = WindowInsets()
     ) {
         val topBarPadding by remember {
             mutableStateOf(
diff --git a/core/src/main/java/org/openedx/core/ui/ComposeCommon.kt b/core/src/main/java/org/openedx/core/ui/ComposeCommon.kt
index a63e130f3..734e7c951 100644
--- a/core/src/main/java/org/openedx/core/ui/ComposeCommon.kt
+++ b/core/src/main/java/org/openedx/core/ui/ComposeCommon.kt
@@ -1137,14 +1137,16 @@ fun AuthButtonsPanel(
     onSignInClick: () -> Unit,
     showRegisterButton: Boolean,
 ) {
-    Row {
+    Row(
+        verticalAlignment = Alignment.CenterVertically
+    ) {
         OpenEdXOutlinedButton(
             modifier = Modifier
                 .testTag("btn_sign_in")
                 .then(
                     if (showRegisterButton) {
                         Modifier
-                            .width(100.dp)
+                            .width(120.dp)
                             .padding(end = 16.dp)
                     } else {
                         Modifier.weight(1f)
diff --git a/core/src/main/java/org/openedx/core/ui/WebContentScreen.kt b/core/src/main/java/org/openedx/core/ui/WebContentScreen.kt
index dead1913a..7bec499c7 100644
--- a/core/src/main/java/org/openedx/core/ui/WebContentScreen.kt
+++ b/core/src/main/java/org/openedx/core/ui/WebContentScreen.kt
@@ -9,6 +9,7 @@ import android.webkit.WebViewClient
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
@@ -60,7 +61,8 @@ fun WebContentScreen(
             .semantics {
                 testTagsAsResourceId = true
             },
-        containerColor = MaterialTheme.appColors.background
+        containerColor = MaterialTheme.appColors.background,
+        contentWindowInsets = WindowInsets()
     ) {
         val screenWidth by remember(key1 = windowSize) {
             mutableStateOf(
diff --git a/course/src/main/java/org/openedx/course/presentation/container/NoAccessCourseContainerFragment.kt b/course/src/main/java/org/openedx/course/presentation/container/NoAccessCourseContainerFragment.kt
index bc998861b..c322b3284 100644
--- a/course/src/main/java/org/openedx/course/presentation/container/NoAccessCourseContainerFragment.kt
+++ b/course/src/main/java/org/openedx/course/presentation/container/NoAccessCourseContainerFragment.kt
@@ -8,6 +8,7 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
@@ -95,7 +96,8 @@ private fun NoAccessCourseContainerScreen(
     Scaffold(
         modifier = Modifier
             .fillMaxSize(),
-        containerColor = MaterialTheme.appColors.background
+        containerColor = MaterialTheme.appColors.background,
+        contentWindowInsets = WindowInsets()
     ) {
         val screenWidth by remember(key1 = windowSize) {
             mutableStateOf(
diff --git a/course/src/main/java/org/openedx/course/presentation/dates/CourseDatesScreen.kt b/course/src/main/java/org/openedx/course/presentation/dates/CourseDatesScreen.kt
index f909ef58e..ef74a4acb 100644
--- a/course/src/main/java/org/openedx/course/presentation/dates/CourseDatesScreen.kt
+++ b/course/src/main/java/org/openedx/course/presentation/dates/CourseDatesScreen.kt
@@ -19,6 +19,7 @@ import androidx.compose.foundation.layout.IntrinsicSize
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -183,7 +184,8 @@ private fun CourseDatesUI(
 
     Scaffold(
         modifier = Modifier.fillMaxSize(),
-        containerColor = MaterialTheme.appColors.background
+        containerColor = MaterialTheme.appColors.background,
+        contentWindowInsets = WindowInsets()
     ) {
         val modifierScreenWidth by remember(key1 = windowSize) {
             mutableStateOf(
diff --git a/course/src/main/java/org/openedx/course/presentation/handouts/HandoutsScreen.kt b/course/src/main/java/org/openedx/course/presentation/handouts/HandoutsScreen.kt
index 7d947ab21..14d7a8072 100644
--- a/course/src/main/java/org/openedx/course/presentation/handouts/HandoutsScreen.kt
+++ b/course/src/main/java/org/openedx/course/presentation/handouts/HandoutsScreen.kt
@@ -8,6 +8,7 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
@@ -52,7 +53,8 @@ fun HandoutsScreen(
     Scaffold(
         modifier = Modifier
             .fillMaxSize(),
-        containerColor = MaterialTheme.appColors.background
+        containerColor = MaterialTheme.appColors.background,
+        contentWindowInsets = WindowInsets()
     ) {
         val screenWidth by remember(key1 = windowSize) {
             mutableStateOf(
diff --git a/course/src/main/java/org/openedx/course/presentation/handouts/HandoutsWebViewFragment.kt b/course/src/main/java/org/openedx/course/presentation/handouts/HandoutsWebViewFragment.kt
index a01235bc5..9350f94bd 100644
--- a/course/src/main/java/org/openedx/course/presentation/handouts/HandoutsWebViewFragment.kt
+++ b/course/src/main/java/org/openedx/course/presentation/handouts/HandoutsWebViewFragment.kt
@@ -6,6 +6,7 @@ import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
@@ -174,7 +175,8 @@ fun HandoutsEmptyScreen(
             .semantics {
                 testTagsAsResourceId = true
             },
-        containerColor = MaterialTheme.appColors.background
+        containerColor = MaterialTheme.appColors.background,
+        contentWindowInsets = WindowInsets()
     ) {
         val screenWidth by remember(key1 = windowSize) {
             mutableStateOf(
diff --git a/course/src/main/java/org/openedx/course/presentation/section/CourseSectionFragment.kt b/course/src/main/java/org/openedx/course/presentation/section/CourseSectionFragment.kt
index 8e06ee10c..277d66db0 100644
--- a/course/src/main/java/org/openedx/course/presentation/section/CourseSectionFragment.kt
+++ b/course/src/main/java/org/openedx/course/presentation/section/CourseSectionFragment.kt
@@ -11,6 +11,7 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -185,7 +186,8 @@ private fun CourseSectionScreen(
         modifier = Modifier
             .fillMaxSize()
             .navigationBarsPadding(),
-        containerColor = MaterialTheme.appColors.background
+        containerColor = MaterialTheme.appColors.background,
+        contentWindowInsets = WindowInsets()
     ) { paddingValues ->
 
         val contentWidth by remember(key1 = windowSize) {
diff --git a/course/src/main/java/org/openedx/course/settings/download/DownloadQueueFragment.kt b/course/src/main/java/org/openedx/course/settings/download/DownloadQueueFragment.kt
index 08b6d6072..7e10f8f54 100644
--- a/course/src/main/java/org/openedx/course/settings/download/DownloadQueueFragment.kt
+++ b/course/src/main/java/org/openedx/course/settings/download/DownloadQueueFragment.kt
@@ -7,6 +7,7 @@ import android.view.ViewGroup
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
@@ -117,7 +118,8 @@ private fun DownloadQueueScreen(
         modifier = Modifier
             .fillMaxSize()
             .navigationBarsPadding(),
-        containerColor = MaterialTheme.appColors.background
+        containerColor = MaterialTheme.appColors.background,
+        contentWindowInsets = WindowInsets()
     ) { paddingValues ->
 
         val contentWidth by remember(key1 = windowSize) {
diff --git a/dashboard/src/main/java/org/openedx/courses/presentation/AllEnrolledCoursesView.kt b/dashboard/src/main/java/org/openedx/courses/presentation/AllEnrolledCoursesView.kt
index 38d4506c3..2a5245235 100644
--- a/dashboard/src/main/java/org/openedx/courses/presentation/AllEnrolledCoursesView.kt
+++ b/dashboard/src/main/java/org/openedx/courses/presentation/AllEnrolledCoursesView.kt
@@ -7,6 +7,7 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.calculateEndPadding
 import androidx.compose.foundation.layout.calculateStartPadding
 import androidx.compose.foundation.layout.fillMaxHeight
@@ -183,7 +184,8 @@ private fun AllEnrolledCoursesView(
             .semantics {
                 testTagsAsResourceId = true
             },
-        containerColor = MaterialTheme.appColors.background
+        containerColor = MaterialTheme.appColors.background,
+        contentWindowInsets = WindowInsets()
     ) { paddingValues ->
         val contentPaddings by remember(key1 = windowSize) {
             mutableStateOf(
diff --git a/dashboard/src/main/java/org/openedx/dashboard/presentation/DashboardListFragment.kt b/dashboard/src/main/java/org/openedx/dashboard/presentation/DashboardListFragment.kt
index 402fc81ad..abbf2d784 100644
--- a/dashboard/src/main/java/org/openedx/dashboard/presentation/DashboardListFragment.kt
+++ b/dashboard/src/main/java/org/openedx/dashboard/presentation/DashboardListFragment.kt
@@ -13,6 +13,7 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -188,7 +189,8 @@ internal fun DashboardListView(
             .semantics {
                 testTagsAsResourceId = true
             },
-        containerColor = MaterialTheme.appColors.background
+        containerColor = MaterialTheme.appColors.background,
+        contentWindowInsets = WindowInsets()
     ) { paddingValues ->
 
         val contentPaddings by remember(key1 = windowSize) {
diff --git a/discovery/src/main/java/org/openedx/discovery/presentation/WebViewDiscoveryFragment.kt b/discovery/src/main/java/org/openedx/discovery/presentation/WebViewDiscoveryFragment.kt
index 35f90f11f..a7f15d4da 100644
--- a/discovery/src/main/java/org/openedx/discovery/presentation/WebViewDiscoveryFragment.kt
+++ b/discovery/src/main/java/org/openedx/discovery/presentation/WebViewDiscoveryFragment.kt
@@ -11,6 +11,7 @@ import androidx.activity.compose.LocalOnBackPressedDispatcherOwner
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -214,6 +215,7 @@ private fun WebViewDiscoveryScreen(
                 testTagsAsResourceId = true
             },
         containerColor = MaterialTheme.appColors.background,
+        contentWindowInsets = WindowInsets(),
         bottomBar = {
             if (isPreLogin) {
                 Box(
diff --git a/discovery/src/main/java/org/openedx/discovery/presentation/detail/CourseDetailsFragment.kt b/discovery/src/main/java/org/openedx/discovery/presentation/detail/CourseDetailsFragment.kt
index 7e84a9167..de05864cc 100644
--- a/discovery/src/main/java/org/openedx/discovery/presentation/detail/CourseDetailsFragment.kt
+++ b/discovery/src/main/java/org/openedx/discovery/presentation/detail/CourseDetailsFragment.kt
@@ -20,6 +20,7 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.aspectRatio
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxSize
@@ -238,6 +239,7 @@ internal fun CourseDetailsScreen(
             },
         containerColor = MaterialTheme.appColors.background,
         snackbarHost = { SnackbarHost(snackbarHostState) },
+        contentWindowInsets = WindowInsets(),
         bottomBar = {
             if (!isUserLoggedIn) {
                 Box(modifier = Modifier.padding(horizontal = 16.dp, vertical = 32.dp)) {
diff --git a/discovery/src/main/java/org/openedx/discovery/presentation/info/CourseInfoFragment.kt b/discovery/src/main/java/org/openedx/discovery/presentation/info/CourseInfoFragment.kt
index 45c82c6d5..a1e4135d1 100644
--- a/discovery/src/main/java/org/openedx/discovery/presentation/info/CourseInfoFragment.kt
+++ b/discovery/src/main/java/org/openedx/discovery/presentation/info/CourseInfoFragment.kt
@@ -8,6 +8,7 @@ import android.view.ViewGroup
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -262,6 +263,7 @@ private fun CourseInfoScreen(
         modifier = Modifier.fillMaxSize(),
         containerColor = MaterialTheme.appColors.background,
         snackbarHost = { SnackbarHost(snackbarHostState) },
+        contentWindowInsets = WindowInsets(),
         bottomBar = {
             if ((uiState as CourseInfoUIState.CourseInfo).isPreLogin) {
                 Box(
diff --git a/discovery/src/main/java/org/openedx/discovery/presentation/program/ProgramFragment.kt b/discovery/src/main/java/org/openedx/discovery/presentation/program/ProgramFragment.kt
index a72d9e6a5..1731db73a 100644
--- a/discovery/src/main/java/org/openedx/discovery/presentation/program/ProgramFragment.kt
+++ b/discovery/src/main/java/org/openedx/discovery/presentation/program/ProgramFragment.kt
@@ -7,6 +7,7 @@ import android.view.ViewGroup
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -269,7 +270,8 @@ private fun ProgramInfoScreen(
             .fillMaxSize()
             .semantics { testTagsAsResourceId = true },
         containerColor = MaterialTheme.appColors.background,
-        snackbarHost = { SnackbarHost(snackbarHostState) }
+        snackbarHost = { SnackbarHost(snackbarHostState) },
+        contentWindowInsets = WindowInsets()
     ) { paddingValues ->
         val modifierScreenWidth by remember(key1 = windowSize) {
             mutableStateOf(
diff --git a/discovery/src/main/java/org/openedx/discovery/presentation/search/CourseSearchFragment.kt b/discovery/src/main/java/org/openedx/discovery/presentation/search/CourseSearchFragment.kt
index 3b1e243ec..5f201ee5b 100644
--- a/discovery/src/main/java/org/openedx/discovery/presentation/search/CourseSearchFragment.kt
+++ b/discovery/src/main/java/org/openedx/discovery/presentation/search/CourseSearchFragment.kt
@@ -9,6 +9,7 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
@@ -213,6 +214,7 @@ private fun CourseSearchScreen(
             .semantics { testTagsAsResourceId = true },
         containerColor = MaterialTheme.appColors.background,
         snackbarHost = { SnackbarHost(snackbarHostState) },
+        contentWindowInsets = WindowInsets(),
         bottomBar = {
             if (!isUserLoggedIn) {
                 Box(
diff --git a/discussion/src/main/java/org/openedx/discussion/presentation/comments/DiscussionCommentsFragment.kt b/discussion/src/main/java/org/openedx/discussion/presentation/comments/DiscussionCommentsFragment.kt
index 2ac05b85c..922946cbd 100644
--- a/discussion/src/main/java/org/openedx/discussion/presentation/comments/DiscussionCommentsFragment.kt
+++ b/discussion/src/main/java/org/openedx/discussion/presentation/comments/DiscussionCommentsFragment.kt
@@ -15,6 +15,7 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
@@ -240,7 +241,8 @@ private fun DiscussionCommentsScreen(
             .fillMaxSize()
             .navigationBarsPadding(),
         containerColor = MaterialTheme.appColors.background,
-        snackbarHost = { SnackbarHost(snackbarHostState) }
+        snackbarHost = { SnackbarHost(snackbarHostState) },
+        contentWindowInsets = WindowInsets()
     ) {
         val keyboardController = LocalSoftwareKeyboardController.current
         val focusManager = LocalFocusManager.current
diff --git a/discussion/src/main/java/org/openedx/discussion/presentation/responses/DiscussionResponsesFragment.kt b/discussion/src/main/java/org/openedx/discussion/presentation/responses/DiscussionResponsesFragment.kt
index 4b8fb4b72..89a97eaa5 100644
--- a/discussion/src/main/java/org/openedx/discussion/presentation/responses/DiscussionResponsesFragment.kt
+++ b/discussion/src/main/java/org/openedx/discussion/presentation/responses/DiscussionResponsesFragment.kt
@@ -15,6 +15,7 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
@@ -244,7 +245,8 @@ private fun DiscussionResponsesScreen(
             .fillMaxSize()
             .navigationBarsPadding(),
         containerColor = MaterialTheme.appColors.background,
-        snackbarHost = { SnackbarHost(snackbarHostState) }
+        snackbarHost = { SnackbarHost(snackbarHostState) },
+        contentWindowInsets = WindowInsets()
     ) {
         val screenWidth by remember(key1 = windowSize) {
             mutableStateOf(
diff --git a/discussion/src/main/java/org/openedx/discussion/presentation/threads/DiscussionAddThreadFragment.kt b/discussion/src/main/java/org/openedx/discussion/presentation/threads/DiscussionAddThreadFragment.kt
index 8cfa2fa59..052064828 100644
--- a/discussion/src/main/java/org/openedx/discussion/presentation/threads/DiscussionAddThreadFragment.kt
+++ b/discussion/src/main/java/org/openedx/discussion/presentation/threads/DiscussionAddThreadFragment.kt
@@ -12,6 +12,7 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
@@ -199,7 +200,8 @@ private fun DiscussionAddThreadScreen(
             .fillMaxSize()
             .navigationBarsPadding(),
         containerColor = MaterialTheme.appColors.background,
-        snackbarHost = { SnackbarHost(snackbarHostState) }
+        snackbarHost = { SnackbarHost(snackbarHostState) },
+        contentWindowInsets = WindowInsets()
     ) { paddingValues ->
         val screenWidth by remember(key1 = windowSize) {
             mutableStateOf(
diff --git a/discussion/src/main/java/org/openedx/discussion/presentation/threads/DiscussionThreadsFragment.kt b/discussion/src/main/java/org/openedx/discussion/presentation/threads/DiscussionThreadsFragment.kt
index a5685f457..8c3e77ab1 100644
--- a/discussion/src/main/java/org/openedx/discussion/presentation/threads/DiscussionThreadsFragment.kt
+++ b/discussion/src/main/java/org/openedx/discussion/presentation/threads/DiscussionThreadsFragment.kt
@@ -12,6 +12,7 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
@@ -282,7 +283,8 @@ private fun DiscussionThreadsScreen(
     Scaffold(
         modifier = scaffoldModifier,
         containerColor = MaterialTheme.appColors.background,
-        snackbarHost = { SnackbarHost(snackbarHostState) }
+        snackbarHost = { SnackbarHost(snackbarHostState) },
+        contentWindowInsets = WindowInsets()
     ) {
         val contentWidth by remember(key1 = windowSize) {
             mutableStateOf(
diff --git a/discussion/src/main/java/org/openedx/discussion/presentation/topics/DiscussionTopicsScreen.kt b/discussion/src/main/java/org/openedx/discussion/presentation/topics/DiscussionTopicsScreen.kt
index 24c01a086..4b97ac1f9 100644
--- a/discussion/src/main/java/org/openedx/discussion/presentation/topics/DiscussionTopicsScreen.kt
+++ b/discussion/src/main/java/org/openedx/discussion/presentation/topics/DiscussionTopicsScreen.kt
@@ -7,6 +7,7 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
@@ -109,7 +110,8 @@ private fun DiscussionTopicsUI(
     Scaffold(
         modifier = Modifier.fillMaxSize(),
         containerColor = MaterialTheme.appColors.background,
-        snackbarHost = { SnackbarHost(snackbarHostState) }
+        snackbarHost = { SnackbarHost(snackbarHostState) },
+        contentWindowInsets = WindowInsets()
     ) {
         val screenWidth by remember(key1 = windowSize) {
             mutableStateOf(
diff --git a/profile/src/main/java/org/openedx/profile/presentation/anothersaccount/AnothersProfileFragment.kt b/profile/src/main/java/org/openedx/profile/presentation/anothersaccount/AnothersProfileFragment.kt
index b145eb840..a9da35f61 100644
--- a/profile/src/main/java/org/openedx/profile/presentation/anothersaccount/AnothersProfileFragment.kt
+++ b/profile/src/main/java/org/openedx/profile/presentation/anothersaccount/AnothersProfileFragment.kt
@@ -9,6 +9,7 @@ import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -141,6 +142,7 @@ private fun AnothersProfileScreen(
     Scaffold(
         modifier = Modifier.fillMaxSize(),
         snackbarHost = { SnackbarHost(snackbarHostState) },
+        contentWindowInsets = WindowInsets(),
         topBar = {
             Column(
                 Modifier
diff --git a/profile/src/main/java/org/openedx/profile/presentation/calendar/CalendarSetUpView.kt b/profile/src/main/java/org/openedx/profile/presentation/calendar/CalendarSetUpView.kt
index df3618439..37d73ad05 100644
--- a/profile/src/main/java/org/openedx/profile/presentation/calendar/CalendarSetUpView.kt
+++ b/profile/src/main/java/org/openedx/profile/presentation/calendar/CalendarSetUpView.kt
@@ -5,6 +5,7 @@ import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
@@ -67,7 +68,8 @@ fun CalendarSetUpView(
             .fillMaxSize()
             .semantics {
                 testTagsAsResourceId = true
-            }
+            },
+        contentWindowInsets = WindowInsets()
     ) { paddingValues ->
 
         val contentWidth by remember(key1 = windowSize) {
diff --git a/profile/src/main/java/org/openedx/profile/presentation/calendar/CalendarSettingsView.kt b/profile/src/main/java/org/openedx/profile/presentation/calendar/CalendarSettingsView.kt
index d67735161..842ea9373 100644
--- a/profile/src/main/java/org/openedx/profile/presentation/calendar/CalendarSettingsView.kt
+++ b/profile/src/main/java/org/openedx/profile/presentation/calendar/CalendarSettingsView.kt
@@ -7,6 +7,7 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
@@ -78,7 +79,8 @@ fun CalendarSettingsView(
             .fillMaxSize()
             .semantics {
                 testTagsAsResourceId = true
-            }
+            },
+        contentWindowInsets = WindowInsets()
     ) { paddingValues ->
 
         val contentWidth by remember(key1 = windowSize) {
diff --git a/profile/src/main/java/org/openedx/profile/presentation/calendar/CoursesToSyncFragment.kt b/profile/src/main/java/org/openedx/profile/presentation/calendar/CoursesToSyncFragment.kt
index efb22e4ac..8dcb86a22 100644
--- a/profile/src/main/java/org/openedx/profile/presentation/calendar/CoursesToSyncFragment.kt
+++ b/profile/src/main/java/org/openedx/profile/presentation/calendar/CoursesToSyncFragment.kt
@@ -10,6 +10,7 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
@@ -123,7 +124,8 @@ private fun CoursesToSyncView(
     Scaffold(
         modifier = Modifier
             .fillMaxSize(),
-        snackbarHost = { SnackbarHost(snackbarHostState) }
+        snackbarHost = { SnackbarHost(snackbarHostState) },
+        contentWindowInsets = WindowInsets()
     ) { paddingValues ->
 
         val contentWidth by remember(key1 = windowSize) {
diff --git a/profile/src/main/java/org/openedx/profile/presentation/delete/DeleteProfileFragment.kt b/profile/src/main/java/org/openedx/profile/presentation/delete/DeleteProfileFragment.kt
index b9d529769..0c0e8826e 100644
--- a/profile/src/main/java/org/openedx/profile/presentation/delete/DeleteProfileFragment.kt
+++ b/profile/src/main/java/org/openedx/profile/presentation/delete/DeleteProfileFragment.kt
@@ -9,6 +9,7 @@ import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
@@ -154,7 +155,8 @@ fun DeleteProfileScreen(
             .fillMaxSize()
             .navigationBarsPadding()
             .semantics { testTagsAsResourceId = true },
-        snackbarHost = { SnackbarHost(snackbarHostState) }
+        snackbarHost = { SnackbarHost(snackbarHostState) },
+        contentWindowInsets = WindowInsets()
     ) { paddingValues ->
 
         val topBarWidth by remember(key1 = windowSize) {
diff --git a/whatsnew/src/main/java/org/openedx/whatsnew/presentation/whatsnew/WhatsNewFragment.kt b/whatsnew/src/main/java/org/openedx/whatsnew/presentation/whatsnew/WhatsNewFragment.kt
index 1071284bc..27e2f77c7 100644
--- a/whatsnew/src/main/java/org/openedx/whatsnew/presentation/whatsnew/WhatsNewFragment.kt
+++ b/whatsnew/src/main/java/org/openedx/whatsnew/presentation/whatsnew/WhatsNewFragment.kt
@@ -10,6 +10,7 @@ import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -142,6 +143,7 @@ fun WhatsNewScreen(
                     }
                     .navigationBarsPadding()
                     .fillMaxSize(),
+                contentWindowInsets = WindowInsets(),
                 topBar = {
                     WhatsNewTopBar(
                         windowSize = windowSize,

From 6e88d81610c12e88110100d50c152ed9c779f35f Mon Sep 17 00:00:00 2001
From: PavloNetrebchuk <pavlo.netrebchuk@raccoongang.com>
Date: Thu, 29 Jan 2026 19:07:44 +0200
Subject: [PATCH 4/4] fix: detekt wangs fix

---
 core/src/main/java/org/openedx/core/ui/theme/AppColors.kt   | 1 +
 .../presentation/comments/DiscussionCommentsFragment.kt     | 6 ++++--
 .../presentation/responses/DiscussionResponsesFragment.kt   | 6 ++++--
 .../presentation/threads/DiscussionThreadsFragment.kt       | 2 --
 .../profile/presentation/calendar/CalendarSetUpView.kt      | 4 +++-
 settings.gradle                                             | 1 -
 6 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/core/src/main/java/org/openedx/core/ui/theme/AppColors.kt b/core/src/main/java/org/openedx/core/ui/theme/AppColors.kt
index 58da9beac..daf1e649e 100644
--- a/core/src/main/java/org/openedx/core/ui/theme/AppColors.kt
+++ b/core/src/main/java/org/openedx/core/ui/theme/AppColors.kt
@@ -128,6 +128,7 @@ data class AppColors(
         val r = red
         val g = green
         val b = blue
+        @Suppress("MagicNumber")
         return 0.299f * r + 0.587f * g + 0.114f * b
     }
 }
diff --git a/discussion/src/main/java/org/openedx/discussion/presentation/comments/DiscussionCommentsFragment.kt b/discussion/src/main/java/org/openedx/discussion/presentation/comments/DiscussionCommentsFragment.kt
index 922946cbd..90551238a 100644
--- a/discussion/src/main/java/org/openedx/discussion/presentation/comments/DiscussionCommentsFragment.kt
+++ b/discussion/src/main/java/org/openedx/discussion/presentation/comments/DiscussionCommentsFragment.kt
@@ -438,8 +438,10 @@ private fun DiscussionCommentsScreen(
                                                 )
                                             },
                                             colors = OutlinedTextFieldDefaults.colors(
-                                                unfocusedContainerColor = MaterialTheme.appColors.textFieldBackgroundVariant,
-                                                focusedContainerColor = MaterialTheme.appColors.textFieldBackgroundVariant,
+                                                unfocusedContainerColor =
+                                                    MaterialTheme.appColors.textFieldBackgroundVariant,
+                                                focusedContainerColor =
+                                                    MaterialTheme.appColors.textFieldBackgroundVariant,
                                                 unfocusedBorderColor = MaterialTheme.appColors.textFieldBorder,
                                                 unfocusedTextColor = MaterialTheme.appColors.textFieldText,
                                                 focusedTextColor = MaterialTheme.appColors.textFieldText
diff --git a/discussion/src/main/java/org/openedx/discussion/presentation/responses/DiscussionResponsesFragment.kt b/discussion/src/main/java/org/openedx/discussion/presentation/responses/DiscussionResponsesFragment.kt
index 89a97eaa5..6ac21c832 100644
--- a/discussion/src/main/java/org/openedx/discussion/presentation/responses/DiscussionResponsesFragment.kt
+++ b/discussion/src/main/java/org/openedx/discussion/presentation/responses/DiscussionResponsesFragment.kt
@@ -472,8 +472,10 @@ private fun DiscussionResponsesScreen(
                                                 )
                                             },
                                             colors = OutlinedTextFieldDefaults.colors(
-                                                unfocusedContainerColor = MaterialTheme.appColors.textFieldBackgroundVariant,
-                                                focusedContainerColor = MaterialTheme.appColors.textFieldBackgroundVariant,
+                                                unfocusedContainerColor =
+                                                    MaterialTheme.appColors.textFieldBackgroundVariant,
+                                                focusedContainerColor =
+                                                    MaterialTheme.appColors.textFieldBackgroundVariant,
                                                 unfocusedBorderColor = MaterialTheme.appColors.textFieldBorder,
                                                 unfocusedTextColor = MaterialTheme.appColors.textFieldText,
                                                 focusedTextColor = MaterialTheme.appColors.textFieldText
diff --git a/discussion/src/main/java/org/openedx/discussion/presentation/threads/DiscussionThreadsFragment.kt b/discussion/src/main/java/org/openedx/discussion/presentation/threads/DiscussionThreadsFragment.kt
index 8c3e77ab1..1c015dd52 100644
--- a/discussion/src/main/java/org/openedx/discussion/presentation/threads/DiscussionThreadsFragment.kt
+++ b/discussion/src/main/java/org/openedx/discussion/presentation/threads/DiscussionThreadsFragment.kt
@@ -48,7 +48,6 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
@@ -230,7 +229,6 @@ private fun DiscussionThreadsScreen(
     val focusManager = LocalFocusManager.current
     val pullToRefreshState = rememberPullToRefreshState()
     val snackbarHostState = remember { SnackbarHostState() }
-    val coroutine = rememberCoroutineScope()
     val scrollState = rememberLazyListState()
     val firstVisibleIndex = remember { mutableStateOf(scrollState.firstVisibleItemIndex) }
     val context = LocalContext.current
diff --git a/profile/src/main/java/org/openedx/profile/presentation/calendar/CalendarSetUpView.kt b/profile/src/main/java/org/openedx/profile/presentation/calendar/CalendarSetUpView.kt
index 37d73ad05..2677756d3 100644
--- a/profile/src/main/java/org/openedx/profile/presentation/calendar/CalendarSetUpView.kt
+++ b/profile/src/main/java/org/openedx/profile/presentation/calendar/CalendarSetUpView.kt
@@ -138,7 +138,9 @@ fun CalendarSetUpView(
                         Card(
                             shape = MaterialTheme.appShapes.cardShape,
                             elevation = CardDefaults.cardElevation(defaultElevation = 0.dp),
-                            colors = CardDefaults.cardColors(containerColor = MaterialTheme.appColors.cardViewBackground)
+                            colors = CardDefaults.cardColors(
+                                containerColor = MaterialTheme.appColors.cardViewBackground
+                            )
                         ) {
                             Column(
                                 modifier = Modifier
diff --git a/settings.gradle b/settings.gradle
index b7e4e47f1..eccc1db15 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -21,7 +21,6 @@ dependencyResolutionManagement {
     repositories {
         google()
         mavenCentral()
-        mavenLocal()
         maven {
             url "http://appboy.github.io/appboy-android-sdk/sdk"
             allowInsecureProtocol = true