diff --git a/app/src/main/java/com/podometer/ui/activities/ActivitiesScreen.kt b/app/src/main/java/com/podometer/ui/activities/ActivitiesScreen.kt
index 7d6e7ee..4554cf3 100644
--- a/app/src/main/java/com/podometer/ui/activities/ActivitiesScreen.kt
+++ b/app/src/main/java/com/podometer/ui/activities/ActivitiesScreen.kt
@@ -17,7 +17,7 @@ import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.DatePicker
 import androidx.compose.material3.DatePickerDialog
 import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.FloatingActionButton
+import androidx.compose.material3.FilledTonalButton
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.ModalBottomSheet
@@ -74,25 +74,6 @@ fun ActivitiesScreen(
                 title = { Text(text = stringResource(R.string.screen_activities)) },
             )
         },
-        floatingActionButton = {
-            if (!uiState.isLoading && uiState.windows.isNotEmpty()) {
-                FloatingActionButton(
-                    onClick = {
-                        val dayStart = DateTimeUtils.startOfDayMillis(uiState.selectedDate)
-                        val noon = dayStart + 12 * 3_600_000L
-                        editingSession = ActivitySession(
-                            activity = ActivityState.WALKING,
-                            startTime = noon,
-                            endTime = noon + ActivitySession.DEFAULT_DURATION_MS,
-                            startTransitionId = 0,
-                            isManualOverride = false,
-                        )
-                    },
-                ) {
-                    Icon(Icons.Default.Add, contentDescription = "Add activity")
-                }
-            }
-        },
         modifier = modifier,
     ) { innerPadding ->
         if (uiState.isLoading) {
@@ -182,6 +163,29 @@ fun ActivitiesScreen(
                         nowMillis = if (uiState.isToday) nowMillis else dayEndMillis,
                     )
 
+                    Spacer(modifier = Modifier.height(8.dp))
+                }
+
+                if (uiState.windows.isNotEmpty()) {
+                    FilledTonalButton(
+                        onClick = {
+                            val dayStart = DateTimeUtils.startOfDayMillis(uiState.selectedDate)
+                            val noon = dayStart + 12 * 3_600_000L
+                            editingSession = ActivitySession(
+                                activity = ActivityState.WALKING,
+                                startTime = noon,
+                                endTime = noon + ActivitySession.DEFAULT_DURATION_MS,
+                                startTransitionId = 0,
+                                isManualOverride = false,
+                            )
+                        },
+                        modifier = Modifier.fillMaxWidth(),
+                    ) {
+                        Icon(Icons.Default.Add, contentDescription = null)
+                        Spacer(modifier = Modifier.padding(horizontal = 4.dp))
+                        Text(text = stringResource(R.string.add_activity))
+                    }
+
                     Spacer(modifier = Modifier.height(16.dp))
                 }
             }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index af1548b..a6c59a6 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -41,6 +41,7 @@
     <string name="activities_no_data">No sensor data available for this date</string>
     <string name="activities_previous_day">Previous day</string>
     <string name="activities_next_day">Next day</string>
+    <string name="add_activity">Add activity</string>
 
     <!-- ActivityTimeline accessibility -->
     <string name="cd_timeline_no_data">Activity timeline: no activity data available.</string>