diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/appbar/AppBarWithSearch.kt b/core/ui/src/main/java/com/tangem/core/ui/components/appbar/AppBarWithSearch.kt
index 867774adfb..4dfd01d36d 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/appbar/AppBarWithSearch.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/appbar/AppBarWithSearch.kt
@@ -95,7 +95,6 @@ private fun CollapsedSearchView(
         modifier = Modifier
             .background(TangemTheme.colors.background.secondary)
             .fillMaxWidth(),
-        horizontalArrangement = Arrangement.spacedBy(TangemTheme.dimens.spacing16),
         verticalAlignment = Alignment.CenterVertically,
     ) {
         Icon(
diff --git a/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/ChooseProviderBottomSheet.kt b/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/ChooseProviderBottomSheet.kt
index c77ff9d577..07091dfb12 100644
--- a/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/ChooseProviderBottomSheet.kt
+++ b/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/ChooseProviderBottomSheet.kt
@@ -36,14 +36,13 @@ fun ChooseProviderBottomSheet(config: TangemBottomSheetConfig) {
 
 @Composable
 private fun ChooseProviderBottomSheetContent(content: ChooseProviderBottomSheetConfig) {
-    Column {
+    Column(horizontalAlignment = Alignment.CenterHorizontally) {
         Text(
             text = stringResource(R.string.express_choose_providers_title),
             style = TangemTheme.typography.subtitle1,
             color = TangemTheme.colors.text.primary1,
             modifier = Modifier
                 .padding(top = TangemTheme.dimens.spacing10)
-                .align(Alignment.CenterHorizontally),
         )
         Text(
             text = stringResource(R.string.express_choose_providers_subtitle),
@@ -51,8 +50,7 @@ private fun ChooseProviderBottomSheetContent(content: ChooseProviderBottomSheetC
             color = TangemTheme.colors.text.secondary,
             modifier = Modifier
                 .padding(top = TangemTheme.dimens.spacing10)
-                .padding(horizontal = TangemTheme.dimens.spacing56)
-                .align(Alignment.CenterHorizontally),
+                .padding(horizontal = TangemTheme.dimens.spacing56),
             textAlign = TextAlign.Center,
         )
         Column(
@@ -91,8 +89,6 @@ private fun ChooseProviderBottomSheetContent(content: ChooseProviderBottomSheetC
             painterResource(id = R.drawable.ic_lightning_16),
             contentDescription = null,
             tint = TangemTheme.colors.icon.informative,
-            modifier = Modifier
-                .align(Alignment.CenterHorizontally),
         )
         Text(
             text = stringResource(R.string.express_more_providers_soon),
@@ -100,8 +96,7 @@ private fun ChooseProviderBottomSheetContent(content: ChooseProviderBottomSheetC
             color = TangemTheme.colors.icon.informative,
             modifier = Modifier
                 .padding(top = TangemTheme.dimens.spacing6, bottom = TangemTheme.dimens.spacing16)
-                .padding(horizontal = TangemTheme.dimens.spacing56)
-                .align(Alignment.CenterHorizontally),
+                .padding(horizontal = TangemTheme.dimens.spacing56),
             textAlign = TextAlign.Center,
         )
     }
diff --git a/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/SwapSelectTokenScreen.kt b/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/SwapSelectTokenScreen.kt
index 87a82413f1..ed54834868 100644
--- a/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/SwapSelectTokenScreen.kt
+++ b/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/SwapSelectTokenScreen.kt
@@ -127,8 +127,6 @@ private fun ListOfTokens(state: SwapSelectTokenStateHolder, modifier: Modifier =
             .imePadding(),
         horizontalAlignment = Alignment.CenterHorizontally,
     ) {
-        item { SpacerH8() }
-
         tokensToSelectItems(state.availableTokens, state.onTokenSelected)
 
         item { SpacerH12() }