diff --git a/app/src/main/java/com/escodro/alkaa/presentation/home/Home.kt b/app/src/main/java/com/escodro/alkaa/presentation/home/Home.kt
index c2f03fd2f..877f2114b 100644
--- a/app/src/main/java/com/escodro/alkaa/presentation/home/Home.kt
+++ b/app/src/main/java/com/escodro/alkaa/presentation/home/Home.kt
@@ -119,8 +119,9 @@ private fun AlkaaTopBar(currentSection: HomeSection) {
     CenterAlignedTopAppBar(
         title = {
             Text(
-                style = MaterialTheme.typography.headlineSmall.copy(fontWeight = FontWeight.Thin),
-                text = stringResource(currentSection.title)
+                style = MaterialTheme.typography.headlineMedium.copy(fontWeight = FontWeight.Light),
+                text = stringResource(currentSection.title),
+                color = MaterialTheme.colorScheme.tertiary
             )
         }
     )
diff --git a/features/category/src/main/java/com/escodro/category/presentation/bottomsheet/CategoryBottomSheet.kt b/features/category/src/main/java/com/escodro/category/presentation/bottomsheet/CategoryBottomSheet.kt
index 41b59b062..14bba6957 100644
--- a/features/category/src/main/java/com/escodro/category/presentation/bottomsheet/CategoryBottomSheet.kt
+++ b/features/category/src/main/java/com/escodro/category/presentation/bottomsheet/CategoryBottomSheet.kt
@@ -139,6 +139,7 @@ private fun CategorySheetContent(
         modifier = Modifier
             .fillMaxWidth()
             .height(256.dp)
+            .background(MaterialTheme.colorScheme.surface) // Accompanist does not support M3 yet
             .padding(16.dp),
         verticalArrangement = Arrangement.SpaceAround
     ) {
diff --git a/features/task/src/main/java/com/escodro/task/presentation/category/CategorySelection.kt b/features/task/src/main/java/com/escodro/task/presentation/category/CategorySelection.kt
index dc0acd9a0..1037a9dd1 100644
--- a/features/task/src/main/java/com/escodro/task/presentation/category/CategorySelection.kt
+++ b/features/task/src/main/java/com/escodro/task/presentation/category/CategorySelection.kt
@@ -114,6 +114,7 @@ private fun CategoryItemChip(
                         onCategoryChange(newCategory?.id)
                     }
                 )
+                .padding(horizontal = 8.dp)
         ) {
             Text(
                 modifier = Modifier.padding(8.dp),
diff --git a/features/task/src/main/java/com/escodro/task/presentation/detail/main/TaskDetail.kt b/features/task/src/main/java/com/escodro/task/presentation/detail/main/TaskDetail.kt
index 065b15039..75495fb08 100644
--- a/features/task/src/main/java/com/escodro/task/presentation/detail/main/TaskDetail.kt
+++ b/features/task/src/main/java/com/escodro/task/presentation/detail/main/TaskDetail.kt
@@ -200,7 +200,7 @@ private fun TaskDescriptionTextField(text: String?, onDescriptionChange: (String
             onDescriptionChange(it.text)
             textState.value = it
         },
-        textStyle = MaterialTheme.typography.bodyMedium,
+        textStyle = MaterialTheme.typography.bodyLarge,
         colors = TextFieldDefaults.textFieldColors(
             containerColor = MaterialTheme.colorScheme.surface
         )
diff --git a/features/tracker/src/main/java/com/escodro/tracker/presentation/TrackerSection.kt b/features/tracker/src/main/java/com/escodro/tracker/presentation/TrackerSection.kt
index 4bd3d26a5..7b1c419ed 100644
--- a/features/tracker/src/main/java/com/escodro/tracker/presentation/TrackerSection.kt
+++ b/features/tracker/src/main/java/com/escodro/tracker/presentation/TrackerSection.kt
@@ -3,6 +3,7 @@ package com.escodro.tracker.presentation
 import androidx.compose.animation.Crossfade
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
@@ -47,8 +48,8 @@ internal fun TrackerLoader(viewModel: TrackerViewModel = getViewModel(), onUpPre
         viewModel.loadTracker()
     }.collectAsState(initial = TrackerViewState.Loading)
 
-    Scaffold(topBar = { AlkaaToolbar(onUpPress = onUpPress) }) {
-        Crossfade(data) { state ->
+    Scaffold(topBar = { AlkaaToolbar(onUpPress = onUpPress) }) { paddingValues ->
+        Crossfade(targetState = data, modifier = Modifier.padding(paddingValues)) { state ->
             when (state) {
                 TrackerViewState.Empty -> TrackerEmpty()
                 is TrackerViewState.Error -> TrackerError()
@@ -115,7 +116,7 @@ private fun TaskTrackerInfoCard(list: List<Tracker.CategoryInfo>, modifier: Modi
         .getQuantityString(R.plurals.tracker_message_title, taskCount, taskCount)
 
     ElevatedCard(modifier = modifier.fillMaxWidth()) {
-        Row(verticalAlignment = Alignment.CenterVertically) {
+        Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.fillMaxSize()) {
             Icon(
                 imageVector = Icons.Default.DynamicFeed,
                 contentDescription = stringResource(id = R.string.tracker_cp_info_icon),