diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/drawer/DrawerContent.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/drawer/DrawerContent.kt
index 5f15a1604e..ff9c8cf4d4 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/drawer/DrawerContent.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/drawer/DrawerContent.kt
@@ -62,7 +62,6 @@ import androidx.compose.material.icons.outlined.Photo
 import androidx.compose.material.icons.outlined.PlayCircle
 import androidx.compose.material.icons.outlined.Settings
 import androidx.compose.material.icons.outlined.SmartDisplay
-import androidx.compose.material.icons.outlined.Sync
 import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
@@ -627,22 +626,6 @@ fun ListContent(
             )
         }
 
-        NavigationRow(
-            title = R.string.event_sync_title,
-            icon = Icons.Outlined.Sync,
-            tint = MaterialTheme.colorScheme.onBackground,
-            nav = nav,
-            route = Route.EventSync,
-        )
-
-        NavigationRow(
-            title = R.string.route_import_follows,
-            icon = Icons.Outlined.GroupAdd,
-            tint = MaterialTheme.colorScheme.onBackground,
-            nav = nav,
-            route = Route.ImportFollowsSelectUser,
-        )
-
         IconRowRelays(
             accountViewModel = accountViewModel,
             onClick = {
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/settings/AllSettingsScreen.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/settings/AllSettingsScreen.kt
index 4af68a1744..fad9ebf31b 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/settings/AllSettingsScreen.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/settings/AllSettingsScreen.kt
@@ -34,11 +34,13 @@ import androidx.compose.material.icons.outlined.Bolt
 import androidx.compose.material.icons.outlined.CloudUpload
 import androidx.compose.material.icons.outlined.DeleteForever
 import androidx.compose.material.icons.outlined.FavoriteBorder
+import androidx.compose.material.icons.outlined.GroupAdd
 import androidx.compose.material.icons.outlined.History
 import androidx.compose.material.icons.outlined.Key
 import androidx.compose.material.icons.outlined.Search
 import androidx.compose.material.icons.outlined.Security
 import androidx.compose.material.icons.outlined.Settings
+import androidx.compose.material.icons.outlined.Sync
 import androidx.compose.material.icons.outlined.ThumbUp
 import androidx.compose.material.icons.outlined.Translate
 import androidx.compose.material3.HorizontalDivider
@@ -99,6 +101,20 @@ fun AllSettingsScreen(
                 onClick = { nav.nav(Route.EditRelays) },
             )
             HorizontalDivider()
+            SettingsNavigationRow(
+                title = R.string.event_sync_title,
+                icon = Icons.Outlined.Sync,
+                tint = tint,
+                onClick = { nav.nav(Route.EventSync) },
+            )
+            HorizontalDivider()
+            SettingsNavigationRow(
+                title = R.string.route_import_follows,
+                icon = Icons.Outlined.GroupAdd,
+                tint = tint,
+                onClick = { nav.nav(Route.ImportFollowsSelectUser) },
+            )
+            HorizontalDivider()
             SettingsNavigationRow(
                 title = R.string.media_servers,
                 icon = Icons.Outlined.CloudUpload,