diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/lists/CustomListsScreen.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/lists/CustomListsScreen.kt
index 26f2a4dc3..6c350dfda 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/lists/CustomListsScreen.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/lists/CustomListsScreen.kt
@@ -32,7 +32,6 @@ import androidx.compose.foundation.pager.rememberPagerState
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.Button
-import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.FloatingActionButton
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
@@ -246,7 +245,7 @@ private fun FollowSetFabsAndMenu(
                 isSetAdditionDialogOpen.value = true
             },
             shape = CircleShape,
-            containerColor = ButtonDefaults.filledTonalButtonColors().containerColor,
+            containerColor = MaterialTheme.colorScheme.primary,
         ) {
             Icon(
                 painter = painterResource(R.drawable.lock_plus),
@@ -259,7 +258,7 @@ private fun FollowSetFabsAndMenu(
                 isSetAdditionDialogOpen.value = true
             },
             shape = CircleShape,
-            containerColor = ButtonDefaults.filledTonalButtonColors().containerColor,
+            containerColor = MaterialTheme.colorScheme.primary,
         ) {
             Icon(
                 painter = painterResource(R.drawable.earth_plus),
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/lists/followsets/FollowSetsManagementDialog.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/lists/followsets/FollowSetsManagementDialog.kt
index 5b3839880..47039c36b 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/lists/followsets/FollowSetsManagementDialog.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/lists/followsets/FollowSetsManagementDialog.kt
@@ -245,10 +245,11 @@ fun BackActionButton(
     OutlinedButton(
         onClick = onBack,
         shape = ButtonBorder,
-        colors = ButtonDefaults.filledTonalButtonColors(),
+        colors = ButtonDefaults.buttonColors(),
+        border = ButtonDefaults.outlinedButtonBorder(false),
         elevation = ButtonDefaults.elevatedButtonElevation(defaultElevation = 6.0.dp),
     ) {
-        Text(text = stringRes(R.string.back), fontWeight = FontWeight.SemiBold)
+        Text(text = stringRes(R.string.back), fontWeight = FontWeight.Bold, color = Color.White)
     }
 }
 
@@ -399,7 +400,7 @@ fun FollowSetItem(
                                 if (isUserInList) {
                                     MaterialTheme.colorScheme.errorContainer
                                 } else {
-                                    ButtonDefaults.filledTonalButtonColors().containerColor
+                                    MaterialTheme.colorScheme.primary
                                 },
                             shape = RoundedCornerShape(percent = 80),
                         ),