From ba7a09cd794174b317d3bea3accf6aef1a5fd393 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20V=C3=A1clav=C3=ADk?= <jvaclavik@gmail.com>
Date: Thu, 28 Nov 2024 09:05:06 +0100
Subject: [PATCH] refactor(suite): Change alignItems default value (#15609)

---
 .../components/src/components/Banner/Banner.tsx  |  5 ++---
 packages/components/src/components/Flex/Flex.tsx |  4 ++--
 .../src/components/Tabs/Tabs.stories.tsx         |  2 +-
 .../src/components/form/FormCell/FormCell.tsx    |  2 +-
 .../Passphrase/PassphraseTypeCardContent.tsx     |  2 +-
 .../Passphrase/PassphraseTypeCardHeading.tsx     |  2 +-
 .../PassphraseTypeCardContent.tsx                |  2 +-
 .../PassphraseTypeCardHeading.tsx                |  2 +-
 .../components/SelectAssetModal/AssetItem.tsx    |  2 +-
 .../SelectAssetModal/SelectAssetModal.tsx        |  2 +-
 .../components/backup/AfterBackupCheckboxes.tsx  |  2 +-
 .../components/backup/PreBackupCheckboxes.tsx    |  2 +-
 .../components/dashboard/DashboardSection.tsx    |  2 +-
 .../firmware/ReconnectDevicePrompt.tsx           |  4 ++--
 packages/suite/src/components/guide/Guide.tsx    |  2 +-
 .../src/components/settings/SettingsSection.tsx  |  2 +-
 .../components/suite/StakingProcess/InfoRow.tsx  |  2 +-
 .../modals/ModalSwitcher/DiscoveryLoader.tsx     |  1 +
 .../ConfirmValueModal/ConfirmValueModal.tsx      | 11 +++--------
 .../DeviceContextModal/PassphraseModal.tsx       |  4 ++--
 .../PassphraseWalletConfirmationStep1.tsx        |  4 ++--
 .../PassphraseWalletConfirmationStep2.tsx        |  2 +-
 .../PassphraseWalletConfirmationStep3.tsx        |  2 +-
 .../AccountTypeSelect/AccountTypeSelect.tsx      |  2 +-
 .../UserContextModal/ClaimModal/ClaimModal.tsx   |  2 +-
 .../DeviceAuthenticityOptOutModal.tsx            |  2 +-
 .../FirmwareRevisionOptOutModal.tsx              |  2 +-
 .../PassphraseDuplicateModal.tsx                 |  4 ++--
 .../UserContextModal/PassphraseMismatchModal.tsx |  6 +-----
 .../UserContextModal/QrScannerModal.tsx          | 11 ++++++++---
 .../StakeEthInANutshellModal.tsx                 |  2 +-
 .../StakeEthForm/ConfirmStakeEthModal.tsx        |  6 +-----
 .../StakeModal/StakeEthForm/Inputs.tsx           |  2 +-
 .../StakeModal/StakeEthForm/StakeEthForm.tsx     |  2 +-
 .../StakingInfoCards/EstimatedGains.tsx          |  6 +++---
 .../StakingInfoCards/StakingInfoCards.tsx        |  2 +-
 .../TxDetailModal/AdvancedTxDetails/Data.tsx     |  2 +-
 .../IODetails/AnalyzeInExplorerBanner.tsx        |  2 +-
 .../AdvancedTxDetails/IODetails/IODetails.tsx    | 16 +++++++---------
 .../TxDetailModal/ChangeFee/GreyCard.tsx         |  2 +-
 .../TxDetailModal/TxDetailModal.tsx              |  2 +-
 .../UnstakeModal/EverstakeModal.tsx              |  6 +-----
 .../UnstakeModal/UnstakeEthForm/Options.tsx      |  4 ++--
 .../UnstakeEthForm/UnstakeEthForm.tsx            |  4 ++--
 .../UnstakeModal/UnstakeModal.tsx                |  2 +-
 .../UserContextModal/WipeDeviceModal.tsx         |  2 +-
 .../NotificationGroup/NotificationGroup.tsx      |  8 ++++----
 .../NotificationList/NotificationList.tsx        |  2 +-
 .../NotificationList/NotificationView.tsx        |  2 +-
 .../components/wallet/AccountExceptionLayout.tsx |  2 +-
 .../src/components/wallet/Fees/CustomFee.tsx     |  2 +-
 .../suite/src/components/wallet/Fees/Fees.tsx    |  2 +-
 .../AccountException/AccountException.tsx        |  8 ++++++--
 .../WalletLayout/AccountsMenu/AccountGroup.tsx   |  1 -
 .../WalletLayout/AccountsMenu/AccountItem.tsx    |  6 +++---
 .../AccountsMenu/AccountItemsGroup.tsx           |  2 +-
 .../WalletLayout/AccountsMenu/AccountsList.tsx   |  2 +-
 packages/suite/src/views/backup/index.tsx        |  2 +-
 .../AssetCard/AssetCardTokensAndStakingInfo.tsx  |  2 +-
 .../dashboard/PortfolioCard/EmptyWallet.tsx      |  2 +-
 .../dashboard/PortfolioCard/PortfolioCard.tsx    |  1 -
 .../PortfolioCard/PortfolioCardException.tsx     |  2 +-
 .../dashboard/StakeEthCard/StakeEthCard.tsx      |  2 +-
 .../steps/SecurityCheck/SecurityCheck.tsx        |  2 +-
 .../SelectBackupType/FloatingSelections.tsx      |  2 +-
 .../SwitchDevice/DeviceItem/AddWalletButton.tsx  |  2 +-
 .../suite/SwitchDevice/DeviceItem/DeviceItem.tsx |  4 ++--
 .../SwitchDevice/DeviceItem/ViewOnlyRadios.tsx   |  2 +-
 .../SwitchDevice/DeviceItem/WalletInstance.tsx   |  2 +-
 .../views/suite/SwitchDevice/SwitchDevice.tsx    |  2 +-
 .../src/views/view-only/ViewOnlyPromoContent.tsx |  2 +-
 .../CoinmarketFormSwitcherExchangeRates.tsx      |  2 +-
 .../CoinmarketForm/CoinmarketFormInputs.tsx      |  4 ++--
 .../CoinmarketForm/CoinmarketFormLayout.tsx      |  2 +-
 .../CoinmarketForm/CoinmarketFormOffer.tsx       |  6 +++---
 .../CoinmarketFormOffersSwitcher.tsx             |  1 -
 .../common/CoinmarketLayout/CoinmarketLayout.tsx |  2 +-
 .../CoinmarketOfferExchangeSend.tsx              |  2 +-
 .../CoinmarketOfferExchangeSendApproval.tsx      |  5 +++--
 .../CoinmarketOfferExchangeSendSwap.tsx          |  6 +++---
 .../CoinmarketSelectedOfferInfo.tsx              |  2 +-
 .../CoinmarketVerify/CoinmarketVerify.tsx        |  6 +++---
 .../suite/src/views/wallet/details/index.tsx     |  2 +-
 .../wallet/receive/components/UsedAddresses.tsx  |  2 +-
 .../src/views/wallet/send/Outputs/Outputs.tsx    |  2 +-
 .../views/wallet/send/TotalSent/TotalSent.tsx    |  2 +-
 .../staking/components/CardanoRedelegate.tsx     |  2 +-
 .../wallet/staking/components/CardanoRewards.tsx |  2 +-
 .../wallet/staking/components/CardanoStake.tsx   |  2 +-
 .../EthStakingDashboard/components/ApyCard.tsx   |  2 +-
 .../EthStakingDashboard/components/ClaimCard.tsx |  2 +-
 .../components/EmptyStakingCard.tsx              |  2 +-
 .../components/PayoutCard.tsx                    |  2 +-
 .../components/StakingCard.tsx                   |  2 +-
 .../components/StakingDashboard.tsx              |  4 ++--
 .../hooks/useProgressLabelsData.tsx              |  2 +-
 .../tokens/hidden-tokens/HiddenTokensTable.tsx   |  4 ++--
 .../CoinjoinSummary/CoinjoinBalanceSection.tsx   |  2 +-
 .../TransactionList/NoSearchResults.tsx          |  2 +-
 99 files changed, 143 insertions(+), 155 deletions(-)

diff --git a/packages/components/src/components/Banner/Banner.tsx b/packages/components/src/components/Banner/Banner.tsx
index ff54cef1d6d..f42a145ac7c 100755
--- a/packages/components/src/components/Banner/Banner.tsx
+++ b/packages/components/src/components/Banner/Banner.tsx
@@ -110,14 +110,13 @@ export const Banner = ({
     const ContentComponent = ({ children }: { children: ReactNode }) => {
         const commonProps = {
             justifyContent: 'space-between' as const,
+            alignItems: 'center' as const,
             gap: spacings.lg,
             flex: '1' as const,
         };
 
         return isMobile ? (
-            <Column {...commonProps} alignItems="stretch">
-                {children}
-            </Column>
+            <Column {...commonProps}>{children}</Column>
         ) : (
             <Row {...commonProps}>{children}</Row>
         );
diff --git a/packages/components/src/components/Flex/Flex.tsx b/packages/components/src/components/Flex/Flex.tsx
index 8fec08e74ae..0b33d68dab1 100644
--- a/packages/components/src/components/Flex/Flex.tsx
+++ b/packages/components/src/components/Flex/Flex.tsx
@@ -160,7 +160,7 @@ export type FlexProps = AllowedFrameProps & {
 export const Flex = ({
     gap = 0,
     justifyContent = 'flex-start',
-    alignItems = 'center',
+    alignItems = 'normal',
     children,
     direction = 'row',
     flex = 'initial',
@@ -207,4 +207,4 @@ export const Flex = ({
 };
 
 export const Column = (props: FlexProps) => <Flex {...props} direction="column" />;
-export const Row = (props: FlexProps) => <Flex {...props} direction="row" />;
+export const Row = (props: FlexProps) => <Flex alignItems="center" {...props} direction="row" />;
diff --git a/packages/components/src/components/Tabs/Tabs.stories.tsx b/packages/components/src/components/Tabs/Tabs.stories.tsx
index a066a06f1a6..f745e162f30 100644
--- a/packages/components/src/components/Tabs/Tabs.stories.tsx
+++ b/packages/components/src/components/Tabs/Tabs.stories.tsx
@@ -79,7 +79,7 @@ const TabsApp = (props: Partial<TabsProps>) => {
     };
 
     return (
-        <Column alignItems="normal" gap={spacings.md}>
+        <Column gap={spacings.md}>
             <TabsComponent activeItemId={items[selectedTab].id} {...props}>
                 {items.map(item => (
                     <TabsComponent.Item key={item.id} {...item}>
diff --git a/packages/components/src/components/form/FormCell/FormCell.tsx b/packages/components/src/components/form/FormCell/FormCell.tsx
index 09cae3415cd..e03ca652993 100644
--- a/packages/components/src/components/form/FormCell/FormCell.tsx
+++ b/packages/components/src/components/form/FormCell/FormCell.tsx
@@ -84,7 +84,7 @@ export const FormCell = ({
             onMouseEnter={() => setIsHovered(true)}
             onMouseLeave={() => setIsHovered(false)}
         >
-            <Column alignItems="stretch" gap={spacings.xs}>
+            <Column gap={spacings.xs}>
                 <TopAddons
                     isHovered={isHovered}
                     addonLeft={labelLeft}
diff --git a/packages/connect-ui/src/components/Passphrase/PassphraseTypeCardContent.tsx b/packages/connect-ui/src/components/Passphrase/PassphraseTypeCardContent.tsx
index f7402bf914e..9bd650eeff7 100644
--- a/packages/connect-ui/src/components/Passphrase/PassphraseTypeCardContent.tsx
+++ b/packages/connect-ui/src/components/Passphrase/PassphraseTypeCardContent.tsx
@@ -127,7 +127,7 @@ export const PassphraseTypeCardContent = ({
 
     return (
         <Card paddingType="small">
-            <Column gap={spacings.sm} alignItems="stretch">
+            <Column gap={spacings.sm}>
                 {type === 'hidden' && (
                     <>
                         <Row flex="1">
diff --git a/packages/connect-ui/src/components/Passphrase/PassphraseTypeCardHeading.tsx b/packages/connect-ui/src/components/Passphrase/PassphraseTypeCardHeading.tsx
index af064f26daa..586eafc4778 100644
--- a/packages/connect-ui/src/components/Passphrase/PassphraseTypeCardHeading.tsx
+++ b/packages/connect-ui/src/components/Passphrase/PassphraseTypeCardHeading.tsx
@@ -68,7 +68,7 @@ export const PassphraseTypeCardHeading = ({
                     <Icon size={24} name="lock" color={theme.iconSubdued} />
                 )}
             </IconWrapper>
-            <Column justifyContent="center" flex="1">
+            <Column justifyContent="center" flex="1" alignItems="center">
                 <WalletTitle
                     $withMargin={type === 'hidden'}
                     data-testid={type === 'hidden' && '@tooltip/passphrase-tooltip'}
diff --git a/packages/product-components/src/components/PassphraseTypeCard/PassphraseTypeCardContent.tsx b/packages/product-components/src/components/PassphraseTypeCard/PassphraseTypeCardContent.tsx
index de26963b575..fdb0d97fb15 100644
--- a/packages/product-components/src/components/PassphraseTypeCard/PassphraseTypeCardContent.tsx
+++ b/packages/product-components/src/components/PassphraseTypeCard/PassphraseTypeCardContent.tsx
@@ -136,7 +136,7 @@ export const PassphraseTypeCardContent = ({
 
     return (
         <Card paddingType="small">
-            <Column gap={spacings.sm} alignItems="stretch">
+            <Column gap={spacings.sm}>
                 {type === 'hidden' && (
                     <>
                         <Row flex="1">
diff --git a/packages/product-components/src/components/PassphraseTypeCard/PassphraseTypeCardHeading.tsx b/packages/product-components/src/components/PassphraseTypeCard/PassphraseTypeCardHeading.tsx
index 4b7607f5313..8574cb22ee3 100644
--- a/packages/product-components/src/components/PassphraseTypeCard/PassphraseTypeCardHeading.tsx
+++ b/packages/product-components/src/components/PassphraseTypeCard/PassphraseTypeCardHeading.tsx
@@ -68,7 +68,7 @@ export const PassphraseTypeCardHeading = ({
                     <Icon size={24} name="lock" color={theme.iconSubdued} />
                 )}
             </IconWrapper>
-            <Column justifyContent="center" flex="1">
+            <Column justifyContent="center" flex="1" alignItems="center">
                 <WalletTitle
                     $withMargin={type === 'hidden'}
                     data-testid={type === 'hidden' && '@tooltip/passphrase-tooltip'}
diff --git a/packages/product-components/src/components/SelectAssetModal/AssetItem.tsx b/packages/product-components/src/components/SelectAssetModal/AssetItem.tsx
index fbb9e7853b8..2d4bb85cdac 100644
--- a/packages/product-components/src/components/SelectAssetModal/AssetItem.tsx
+++ b/packages/product-components/src/components/SelectAssetModal/AssetItem.tsx
@@ -72,7 +72,7 @@ export const AssetItem = ({
                 ) : (
                     symbol && <CoinLogo size={24} symbol={symbol} />
                 )}
-                <Column flex="1" alignItems="stretch">
+                <Column flex="1">
                     <Row gap={spacings.xs} alignItems="center">
                         <TextWrapper>
                             <Text typographyStyle="body" textWrap="nowrap">
diff --git a/packages/product-components/src/components/SelectAssetModal/SelectAssetModal.tsx b/packages/product-components/src/components/SelectAssetModal/SelectAssetModal.tsx
index 150955b7084..6d65f35b045 100644
--- a/packages/product-components/src/components/SelectAssetModal/SelectAssetModal.tsx
+++ b/packages/product-components/src/components/SelectAssetModal/SelectAssetModal.tsx
@@ -62,7 +62,7 @@ export const SelectAssetModal = ({
             onCancel={onClose}
             size="small"
         >
-            <Column gap={spacings.md} alignItems="stretch">
+            <Column gap={spacings.md}>
                 {searchInput}
 
                 {filterTabs}
diff --git a/packages/suite/src/components/backup/AfterBackupCheckboxes.tsx b/packages/suite/src/components/backup/AfterBackupCheckboxes.tsx
index 5f43007379f..8d2bb9fae80 100644
--- a/packages/suite/src/components/backup/AfterBackupCheckboxes.tsx
+++ b/packages/suite/src/components/backup/AfterBackupCheckboxes.tsx
@@ -13,7 +13,7 @@ export const AfterBackupCheckboxes = () => {
 
     return (
         <Card>
-            <Column alignItems="stretch" gap={spacings.xl}>
+            <Column gap={spacings.xl} alignItems="center">
                 <CheckItem
                     data-testid="@backup/check-item/wrote-seed-properly"
                     onClick={() => dispatch(toggleCheckboxByKey('wrote-seed-properly'))}
diff --git a/packages/suite/src/components/backup/PreBackupCheckboxes.tsx b/packages/suite/src/components/backup/PreBackupCheckboxes.tsx
index 58859f487cf..e3828faf90d 100644
--- a/packages/suite/src/components/backup/PreBackupCheckboxes.tsx
+++ b/packages/suite/src/components/backup/PreBackupCheckboxes.tsx
@@ -13,7 +13,7 @@ export const PreBackupCheckboxes = () => {
 
     return (
         <Card>
-            <Column alignItems="stretch" gap={spacings.xl}>
+            <Column gap={spacings.xl}>
                 <CheckItem
                     data-testid="@backup/check-item/has-enough-time"
                     onClick={() => dispatch(toggleCheckboxByKey('has-enough-time'))}
diff --git a/packages/suite/src/components/dashboard/DashboardSection.tsx b/packages/suite/src/components/dashboard/DashboardSection.tsx
index 0d688597f82..ba58d38ac45 100644
--- a/packages/suite/src/components/dashboard/DashboardSection.tsx
+++ b/packages/suite/src/components/dashboard/DashboardSection.tsx
@@ -15,7 +15,7 @@ export const DashboardSection = forwardRef(
         ref: Ref<HTMLDivElement>,
     ) => (
         <div ref={ref} {...rest}>
-            <Column alignItems="normal" data-testid={dataTestId}>
+            <Column data-testid={dataTestId}>
                 <Row as="header" justifyContent="space-between" margin={{ bottom: spacings.lg }}>
                     {heading && (
                         <H3>
diff --git a/packages/suite/src/components/firmware/ReconnectDevicePrompt.tsx b/packages/suite/src/components/firmware/ReconnectDevicePrompt.tsx
index afbc8a49c81..6276ef71eaf 100644
--- a/packages/suite/src/components/firmware/ReconnectDevicePrompt.tsx
+++ b/packages/suite/src/components/firmware/ReconnectDevicePrompt.tsx
@@ -164,7 +164,7 @@ export const ReconnectDevicePrompt = ({ onClose, onSuccess }: ReconnectDevicePro
                 }
             >
                 {!isRebootDone && (
-                    <Column margin={{ bottom: spacings.md }}>
+                    <Column margin={{ bottom: spacings.md }} alignItems="center">
                         <RebootDeviceGraphics
                             device={uiEvent?.payload.device}
                             isManualRebootRequired={isManualRebootRequired}
@@ -175,7 +175,7 @@ export const ReconnectDevicePrompt = ({ onClose, onSuccess }: ReconnectDevicePro
                     <Translation id={getHeading()} />
                 </H2>
                 {!isRebootDone && (
-                    <Column alignItems="stretch" gap={spacings.lg}>
+                    <Column gap={spacings.lg}>
                         {isManualRebootRequired ? (
                             <List isOrdered margin={{ top: spacings.md }}>
                                 {/* First step asks for disconnecting a device */}
diff --git a/packages/suite/src/components/guide/Guide.tsx b/packages/suite/src/components/guide/Guide.tsx
index 7636ec73778..9095fc845c7 100644
--- a/packages/suite/src/components/guide/Guide.tsx
+++ b/packages/suite/src/components/guide/Guide.tsx
@@ -77,7 +77,7 @@ export const Guide = () => {
     return (
         <GuideViewWrapper>
             <GuideHeader label={<Translation id="TR_GUIDE_VIEW_HEADLINE_LEARN_AND_DISCOVER" />} />
-            <Column justifyContent="space-between" alignItems="stretch" height="100%">
+            <Column justifyContent="space-between" height="100%">
                 <GuideContent>
                     <GuideSearch pageRoot={indexNode} setSearchActive={setSearchActive} />
                     {!searchActive && <GuideCategories node={indexNode} />}
diff --git a/packages/suite/src/components/settings/SettingsSection.tsx b/packages/suite/src/components/settings/SettingsSection.tsx
index 68684f25675..0aff6bd93d9 100644
--- a/packages/suite/src/components/settings/SettingsSection.tsx
+++ b/packages/suite/src/components/settings/SettingsSection.tsx
@@ -86,7 +86,7 @@ export const SettingsSection = ({
 
             <Content>
                 <Card className={className}>
-                    <Column gap={spacings.xxl} flex="1" alignItems="normal">
+                    <Column gap={spacings.xxl} flex="1">
                         {children}
                     </Column>
                 </Card>
diff --git a/packages/suite/src/components/suite/StakingProcess/InfoRow.tsx b/packages/suite/src/components/suite/StakingProcess/InfoRow.tsx
index 6f7ecd6ff5c..75a0aaf2971 100644
--- a/packages/suite/src/components/suite/StakingProcess/InfoRow.tsx
+++ b/packages/suite/src/components/suite/StakingProcess/InfoRow.tsx
@@ -22,7 +22,7 @@ export const InfoRow = ({ heading, subheading, content, isExpanded = false }: In
     return (
         <List.Item>
             <Row justifyContent="space-between">
-                <Column alignItems="normal">
+                <Column>
                     {heading}
                     <Subheading isExpanded={isExpanded} subheading={subheading} />
                 </Column>
diff --git a/packages/suite/src/components/suite/modals/ModalSwitcher/DiscoveryLoader.tsx b/packages/suite/src/components/suite/modals/ModalSwitcher/DiscoveryLoader.tsx
index 642adb33a3e..10375f97191 100644
--- a/packages/suite/src/components/suite/modals/ModalSwitcher/DiscoveryLoader.tsx
+++ b/packages/suite/src/components/suite/modals/ModalSwitcher/DiscoveryLoader.tsx
@@ -16,6 +16,7 @@ export const DiscoveryLoader = () => {
             <CardWithDevice device={device} isFullHeaderVisible={false}>
                 <Column
                     justifyContent="center"
+                    alignItems="center"
                     margin={{ top: spacings.xxxl, bottom: spacings.xl }}
                 >
                     <Spinner size={80} isGrey={false} />
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/ConfirmValueModal/ConfirmValueModal.tsx b/packages/suite/src/components/suite/modals/ReduxModal/ConfirmValueModal/ConfirmValueModal.tsx
index 076227fbcd8..22a184c9e39 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/ConfirmValueModal/ConfirmValueModal.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/ConfirmValueModal/ConfirmValueModal.tsx
@@ -114,7 +114,7 @@ export const ConfirmValueModal = ({
                 description={showTokensSubheading && <Translation id="TR_INCLUDING_TOKENS" />}
                 onCancel={isCancelable ? onCancel : undefined}
             >
-                <Column alignItems="stretch" gap={spacings.xl}>
+                <Column gap={spacings.xl} alignItems="center">
                     {!device?.connected && (
                         <Banner icon="warningTriangle" variant="warning">
                             <Paragraph typographyStyle="hint">
@@ -129,7 +129,7 @@ export const ConfirmValueModal = ({
                         </Banner>
                     )}
                     <Row gap={spacings.xl} alignItems="stretch">
-                        <Column flex="1 1 50%">
+                        <Column flex="1 1 50%" alignItems="center">
                             <Card>
                                 <QrCode
                                     value={value}
@@ -139,12 +139,7 @@ export const ConfirmValueModal = ({
                                 />
                             </Card>
                         </Column>
-                        <Column
-                            flex="1 1 50%"
-                            justifyContent="space-between"
-                            alignItems="stretch"
-                            gap={spacings.lg}
-                        >
+                        <Column flex="1 1 50%" justifyContent="space-between" gap={spacings.lg}>
                             <TransactionReviewOutputElement
                                 indicator={
                                     <TransactionReviewStepIndicator state={state} size={16} />
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/DeviceContextModal/PassphraseModal.tsx b/packages/suite/src/components/suite/modals/ReduxModal/DeviceContextModal/PassphraseModal.tsx
index da98a08d265..d5575a44f55 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/DeviceContextModal/PassphraseModal.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/DeviceContextModal/PassphraseModal.tsx
@@ -87,7 +87,7 @@ export const PassphraseModal = ({ device }: PassphraseModalProps) => {
                     isFullHeaderVisible
                     icon="x"
                 >
-                    <Column gap={spacings.sm} margin={{ top: spacings.xxs }} alignItems="stretch">
+                    <Column gap={spacings.sm} margin={{ top: spacings.xxs }}>
                         <H3>
                             <Translation id="TR_CONFIRM_PASSPHRASE" />
                         </H3>
@@ -119,7 +119,7 @@ export const PassphraseModal = ({ device }: PassphraseModalProps) => {
                     onBackButtonClick={onEnterPassphraseDialogBack}
                     isFullHeaderVisible
                 >
-                    <Column gap={spacings.sm} margin={{ top: spacings.xxs }} alignItems="stretch">
+                    <Column gap={spacings.sm} margin={{ top: spacings.xxs }}>
                         <H3>
                             <Translation id="TR_PASSPHRASE_HIDDEN_WALLET" />
                         </H3>
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/DeviceContextModal/PassphraseWalletConfirmationStep1.tsx b/packages/suite/src/components/suite/modals/ReduxModal/DeviceContextModal/PassphraseWalletConfirmationStep1.tsx
index a70f5317bfc..3617a89b11b 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/DeviceContextModal/PassphraseWalletConfirmationStep1.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/DeviceContextModal/PassphraseWalletConfirmationStep1.tsx
@@ -36,7 +36,7 @@ export const PassphraseWalletConfirmationStep1 = ({
     );
 
     return (
-        <Column gap={spacings.sm} margin={{ top: spacings.xxs }} alignItems="stretch">
+        <Column gap={spacings.sm} margin={{ top: spacings.xxs }}>
             <H3>
                 <Translation id="TR_PASSPHRASE_WALLET_CONFIRMATION_STEP1_TITLE" />
             </H3>
@@ -61,7 +61,7 @@ export const PassphraseWalletConfirmationStep1 = ({
                     </Row>
                 }
             >
-                <Column gap={spacings.sm}>
+                <Column gap={spacings.sm} alignItems="center">
                     <Paragraph typographyStyle="highlight">
                         <Translation id="TR_PASSPHRASE_WALLET_CONFIRMATION_STEP1_OPEN_UNUSED_WALLET_DESCRIPTION" />
                     </Paragraph>
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/DeviceContextModal/PassphraseWalletConfirmationStep2.tsx b/packages/suite/src/components/suite/modals/ReduxModal/DeviceContextModal/PassphraseWalletConfirmationStep2.tsx
index 84006102d63..2054bd3bc49 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/DeviceContextModal/PassphraseWalletConfirmationStep2.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/DeviceContextModal/PassphraseWalletConfirmationStep2.tsx
@@ -14,7 +14,7 @@ type PassphraseWalletConfirmationStep2Props = {
 export const PassphraseWalletConfirmationStep2 = ({
     setContentType,
 }: PassphraseWalletConfirmationStep2Props) => (
-    <Column gap={spacings.sm} margin={{ top: spacings.xxs }} alignItems="stretch">
+    <Column gap={spacings.sm} margin={{ top: spacings.xxs }}>
         <H3>
             <Translation id="TR_PASSPHRASE_WALLET_CONFIRMATION_STEP2_TITLE" />
         </H3>
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/DeviceContextModal/PassphraseWalletConfirmationStep3.tsx b/packages/suite/src/components/suite/modals/ReduxModal/DeviceContextModal/PassphraseWalletConfirmationStep3.tsx
index 9310dc69f55..412d8b03231 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/DeviceContextModal/PassphraseWalletConfirmationStep3.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/DeviceContextModal/PassphraseWalletConfirmationStep3.tsx
@@ -20,7 +20,7 @@ export const PassphraseWalletConfirmationStep3 = ({
     const deviceFeatures = useSelector(selectDeviceFeatures);
 
     return (
-        <Column gap={spacings.sm} margin={{ top: spacings.xxs }} alignItems="stretch">
+        <Column gap={spacings.sm} margin={{ top: spacings.xxs }}>
             <H3>
                 <Translation id="TR_PASSPHRASE_WALLET_CONFIRMATION_STEP3_TITLE" />
             </H3>
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/AddAccountModal/AccountTypeSelect/AccountTypeSelect.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/AddAccountModal/AccountTypeSelect/AccountTypeSelect.tsx
index 7a2caf35f7a..9f82204829c 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/AddAccountModal/AccountTypeSelect/AccountTypeSelect.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/AddAccountModal/AccountTypeSelect/AccountTypeSelect.tsx
@@ -68,7 +68,7 @@ export const AccountTypeSelect = ({
     const bip43PathToDescribe = selectedAccountType?.bip43Path ?? defaultAccountType.bip43Path;
 
     return (
-        <Column gap={spacings.md}>
+        <Column alignItems="center" gap={spacings.md}>
             <Select
                 data-testid="@add-account-type/select"
                 label={<Translation id="TR_ACCOUNT_TYPE" />}
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/ClaimModal/ClaimModal.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/ClaimModal/ClaimModal.tsx
index 18b9aea8c58..004ad7c9078 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/ClaimModal/ClaimModal.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/ClaimModal/ClaimModal.tsx
@@ -86,7 +86,7 @@ export const ClaimModal = ({ onCancel }: ClaimModalModalProps) => {
             }
         >
             <form onSubmit={handleSubmit(signTx)}>
-                <Column alignItems="normal" gap={spacings.lg}>
+                <Column gap={spacings.lg}>
                     <InfoItem direction="column" label={<Translation id="AMOUNT" />}>
                         <Paragraph typographyStyle="titleSmall">
                             <FormattedCryptoAmount
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/DeviceAuthenticityOptOutModal.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/DeviceAuthenticityOptOutModal.tsx
index f2fd15d65d2..a37f0afcfc9 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/DeviceAuthenticityOptOutModal.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/DeviceAuthenticityOptOutModal.tsx
@@ -47,7 +47,7 @@ export const DeviceAuthenticityOptOutModal = ({ onCancel }: DeviceAuthenticityOp
             <Paragraph variant="tertiary" typographyStyle="hint">
                 <Translation id="TR_DEVICE_AUTHENTICITY_OPT_OUT_MODAL_DESCRIPTION_3" />
             </Paragraph>
-            <Column gap={spacings.sm} margin={{ top: spacings.xl }}>
+            <Column gap={spacings.sm} margin={{ top: spacings.xl }} alignItems="center">
                 <Banner icon="questionFilled">
                     <Translation id="TR_DEVICE_AUTHENTICITY_OPT_OUT_MODAL_DESCRIPTION_1" />
                 </Banner>
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/FirmwareRevisionOptOutModal.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/FirmwareRevisionOptOutModal.tsx
index aaac59499de..82701d30d3e 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/FirmwareRevisionOptOutModal.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/FirmwareRevisionOptOutModal.tsx
@@ -47,7 +47,7 @@ export const FirmwareRevisionOptOutModal = ({ onCancel }: DeviceAuthenticityOptO
             <Paragraph variant="tertiary" typographyStyle="hint">
                 <Translation id="TR_DEVICE_FIRMWARE_REVISION_CHECK_MODAL_DESCRIPTION_3" />
             </Paragraph>
-            <Column gap={spacings.sm} margin={{ top: spacings.xl }}>
+            <Column gap={spacings.sm} margin={{ top: spacings.xl }} alignItems="center">
                 <Banner icon="questionFilled">
                     <Translation id="TR_DEVICE_FIRMWARE_REVISION_CHECK_MODAL_DESCRIPTION_1" />
                 </Banner>
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/PassphraseDuplicateModal.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/PassphraseDuplicateModal.tsx
index fa905b01333..d6e7b47ea51 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/PassphraseDuplicateModal.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/PassphraseDuplicateModal.tsx
@@ -25,14 +25,14 @@ export const PassphraseDuplicateModal = ({ device, duplicate }: PassphraseDuplic
     return (
         <SwitchDeviceModal>
             <CardWithDevice device={device} isFullHeaderVisible={false}>
-                <Column gap={spacings.xs} margin={{ top: spacings.xxs }} alignItems="stretch">
+                <Column gap={spacings.xs} margin={{ top: spacings.xxs }}>
                     <H3 data-testid="@passphrase-duplicate-header">
                         <Translation id="TR_WALLET_DUPLICATE_TITLE" />
                     </H3>
                     <Text variant="tertiary">
                         <Translation id="TR_WALLET_DUPLICATE_DESC" />
                     </Text>
-                    <Column gap={spacings.xs} margin={{ top: spacings.lg }}>
+                    <Column gap={spacings.xs} margin={{ top: spacings.lg }} alignItems="center">
                         <Button
                             variant="primary"
                             onClick={handleSwitchDevice}
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/PassphraseMismatchModal.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/PassphraseMismatchModal.tsx
index c09273e6559..59cbb19e6ba 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/PassphraseMismatchModal.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/PassphraseMismatchModal.tsx
@@ -33,11 +33,7 @@ export const PassphraseMismatchModal = ({ onCancel }: { onCancel: () => void })
     return (
         <SwitchDeviceModal data-testid="@passphrase-mismatch">
             <CardWithDevice device={selectDevice} isFullHeaderVisible={false}>
-                <Column
-                    gap={spacings.xs}
-                    margin={{ top: spacings.xxs, bottom: spacings.lg }}
-                    alignItems="stretch"
-                >
+                <Column gap={spacings.xs} margin={{ top: spacings.xxs, bottom: spacings.lg }}>
                     <H3>
                         <Translation id="TR_PASSPHRASE_MISMATCH" />
                     </H3>
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/QrScannerModal.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/QrScannerModal.tsx
index 66b5bc015ab..0e851115062 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/QrScannerModal.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/QrScannerModal.tsx
@@ -76,11 +76,11 @@ export const QrScannerModal = ({ decision, onCancel }: QrScannerModalProps) => {
 
     return (
         <NewModal onCancel={onCancel} heading={<Translation id="TR_SCAN_QR_CODE" />}>
-            <Column gap={spacings.md} alignItems="stretch">
+            <Column gap={spacings.md} alignItems="center">
                 <ContentWrapper>
                     {error && (
                         <Card height="100%">
-                            <Column height="100%" justifyContent="center">
+                            <Column height="100%" justifyContent="center" alignItems="center">
                                 <Paragraph variant="destructive">
                                     <Translation id="TR_GENERIC_ERROR_TITLE" />
                                 </Paragraph>
@@ -90,7 +90,12 @@ export const QrScannerModal = ({ decision, onCancel }: QrScannerModalProps) => {
                     )}
                     {!readerLoaded && !error && (
                         <Card height="100%">
-                            <Column height="100%" justifyContent="center" gap={spacings.xxxl}>
+                            <Column
+                                height="100%"
+                                justifyContent="center"
+                                gap={spacings.xxxl}
+                                alignItems="center"
+                            >
                                 <Icon name="qrCode" size={100} />
                                 <Translation id="TR_PLEASE_ALLOW_YOUR_CAMERA" />
                             </Column>
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/StakeEthInANutshellModal/StakeEthInANutshellModal.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/StakeEthInANutshellModal/StakeEthInANutshellModal.tsx
index 36cefc901ab..af32c823c73 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/StakeEthInANutshellModal/StakeEthInANutshellModal.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/StakeEthInANutshellModal/StakeEthInANutshellModal.tsx
@@ -117,7 +117,7 @@ export const StakeEthInANutshellModal = ({ onCancel }: StakeEthInANutshellModalP
                 ))}
             </List>
             <Divider margin={{ top: spacings.xl, bottom: spacings.md }} />
-            <Column alignItems="stretch" gap={spacings.lg}>
+            <Column gap={spacings.lg}>
                 {processes.map(({ heading, badge, content }, index) => (
                     <CollapsibleBox
                         key={index}
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/StakeModal/StakeEthForm/ConfirmStakeEthModal.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/StakeModal/StakeEthForm/ConfirmStakeEthModal.tsx
index ee2d773325d..3917e5b1348 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/StakeModal/StakeEthForm/ConfirmStakeEthModal.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/StakeModal/StakeEthForm/ConfirmStakeEthModal.tsx
@@ -57,11 +57,7 @@ export const ConfirmStakeEthModal = ({
                 </>
             }
         >
-            <Column
-                gap={spacings.sm}
-                margin={{ top: spacings.xxs, bottom: spacings.lg }}
-                alignItems="stretch"
-            >
+            <Column gap={spacings.sm} margin={{ top: spacings.xxs, bottom: spacings.lg }}>
                 <Banner icon="clock">
                     <Translation
                         id="TR_STAKE_ENTERING_POOL_MAY_TAKE"
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/StakeModal/StakeEthForm/Inputs.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/StakeModal/StakeEthForm/Inputs.tsx
index 940c855b284..d15dde2e1d3 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/StakeModal/StakeEthForm/Inputs.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/StakeModal/StakeEthForm/Inputs.tsx
@@ -72,7 +72,7 @@ export const Inputs = () => {
         isLessAmountForWithdrawalWarningShown || isAmountForWithdrawalWarningShown;
 
     return (
-        <Column alignItems="normal" gap={spacings.sm}>
+        <Column gap={spacings.sm}>
             <NumberInput
                 name={CRYPTO_INPUT}
                 labelLeft={
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/StakeModal/StakeEthForm/StakeEthForm.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/StakeModal/StakeEthForm/StakeEthForm.tsx
index 4efa96378d4..aea033b6a82 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/StakeModal/StakeEthForm/StakeEthForm.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/StakeModal/StakeEthForm/StakeEthForm.tsx
@@ -38,7 +38,7 @@ export const StakeEthForm = () => {
                 />
             )}
 
-            <Column gap={spacings.xxl} alignItems="stretch" margin={{ bottom: spacings.lg }}>
+            <Column gap={spacings.xxl} margin={{ bottom: spacings.lg }}>
                 <AvailableBalance formattedBalance={formattedBalance} symbol={symbol} />
 
                 <Inputs />
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/StakeModal/StakingInfoCards/EstimatedGains.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/StakeModal/StakingInfoCards/EstimatedGains.tsx
index f5fb7e2612e..9f65c58fa24 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/StakeModal/StakingInfoCards/EstimatedGains.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/StakeModal/StakingInfoCards/EstimatedGains.tsx
@@ -42,8 +42,8 @@ export const EstimatedGains = () => {
     ];
 
     return (
-        <Column alignItems="normal" gap={spacings.lg}>
-            <Column alignItems="normal">
+        <Column gap={spacings.lg}>
+            <Column>
                 <Paragraph variant="primary" typographyStyle="titleMedium">
                     {ethApy}%
                 </Paragraph>
@@ -56,7 +56,7 @@ export const EstimatedGains = () => {
                 </Paragraph>
                 <Image image="GAINS_GRAPH" width="100%" />
             </Column>
-            <Column gap={spacings.sm} alignItems="normal" hasDivider>
+            <Column gap={spacings.sm} hasDivider>
                 {gains.map(({ label, value }, index) => (
                     <Grid key={index} columns={3}>
                         <Paragraph variant="tertiary">{label}</Paragraph>
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/StakeModal/StakingInfoCards/StakingInfoCards.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/StakeModal/StakingInfoCards/StakingInfoCards.tsx
index 38eb1449c6d..dc110772060 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/StakeModal/StakingInfoCards/StakingInfoCards.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/StakeModal/StakingInfoCards/StakingInfoCards.tsx
@@ -21,7 +21,7 @@ export const StakingInfoCards = () => {
     ];
 
     return (
-        <Column alignItems="stretch" gap={spacings.lg} margin={{ bottom: spacings.lg }}>
+        <Column gap={spacings.lg} margin={{ bottom: spacings.lg }}>
             {cards.map((card, index) => (
                 <CollapsibleBox
                     heading={<H3 typographyStyle="highlight">{card.heading}</H3>}
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/AdvancedTxDetails/Data.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/AdvancedTxDetails/Data.tsx
index a6ef94b135b..8e979113f82 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/AdvancedTxDetails/Data.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/AdvancedTxDetails/Data.tsx
@@ -39,7 +39,7 @@ export const Data = ({ tx }: DataProps) => {
     const { function: fn, methodId, name, params } = parsedData || {};
 
     return (
-        <Column alignItems="normal" gap={spacings.lg}>
+        <Column gap={spacings.lg}>
             {methodId && name && (
                 <DataRow translationId="TR_TX_DATA_METHOD_NAME" content={`${name} (${methodId})`} />
             )}
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/AdvancedTxDetails/IODetails/AnalyzeInExplorerBanner.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/AdvancedTxDetails/IODetails/AnalyzeInExplorerBanner.tsx
index 5c3f7bade86..06016ee1255 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/AdvancedTxDetails/IODetails/AnalyzeInExplorerBanner.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/AdvancedTxDetails/IODetails/AnalyzeInExplorerBanner.tsx
@@ -28,7 +28,7 @@ export const AnalyzeInExplorerBanner = ({ txid, symbol }: AnalyzeInExplorerBanne
                 </Banner.Button>
             }
         >
-            <Column alignItems="normal">
+            <Column alignItems="center">
                 <H4>
                     <Translation id="TR_ANALYZE_IN_EXPLORER" />
                 </H4>
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/AdvancedTxDetails/IODetails/IODetails.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/AdvancedTxDetails/IODetails/IODetails.tsx
index 8931607c947..bb284eb2c02 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/AdvancedTxDetails/IODetails/IODetails.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/AdvancedTxDetails/IODetails/IODetails.tsx
@@ -53,7 +53,7 @@ const IOItem = ({ anonymitySet, address, symbol, amount, isPhishingTransaction }
     const anonymity = address && anonymitySet?.[address];
 
     return (
-        <Column alignItems="normal">
+        <Column>
             <IOAddress
                 txAddress={address ?? ''}
                 explorerUrl={network?.explorer.address}
@@ -101,7 +101,7 @@ const IOGroup = ({ tx, inputs, outputs, isPhishingTransaction }: IOGroupProps) =
             </IconWrapper>
             <Grid columns={2} gap={spacings.xxxxl}>
                 {hasInputs && (
-                    <Column alignItems="normal" gap={spacings.xs} margin={{ right: spacings.xl }}>
+                    <Column gap={spacings.xs} margin={{ right: spacings.xl }}>
                         <InfoPair
                             leftContent={
                                 <Text typographyStyle="callout" variant="default">
@@ -125,7 +125,7 @@ const IOGroup = ({ tx, inputs, outputs, isPhishingTransaction }: IOGroupProps) =
                     </Column>
                 )}
                 {hasOutputs && (
-                    <Column alignItems="normal" gap={spacings.xs} margin={{ left: spacings.xl }}>
+                    <Column gap={spacings.xs} margin={{ left: spacings.xl }}>
                         <InfoPair
                             leftContent={
                                 <Text typographyStyle="callout" variant="default">
@@ -186,7 +186,7 @@ const EthereumSpecificBalanceDetailsRow = ({
     return (
         <>
             {tx.internalTransfers?.length ? (
-                <Column alignItems="normal" gap={spacings.xs}>
+                <Column gap={spacings.xs}>
                     <H4>
                         <Translation id="TR_INTERNAL_TRANSACTIONS" />
                     </H4>
@@ -203,7 +203,7 @@ const EthereumSpecificBalanceDetailsRow = ({
             ) : null}
 
             {Object.entries(tokensByStandard).map(([key, tokens]) => (
-                <Column key={key} alignItems="normal" gap={spacings.xs}>
+                <Column key={key} gap={spacings.xs}>
                     <H4>
                         <Translation
                             id="TR_TOKEN_TRANSFERS"
@@ -366,11 +366,9 @@ export const IODetails = ({ tx, isPhishingTransaction }: IODetailsProps) => {
     };
 
     return (
-        <Column alignItems="normal" gap={spacings.xxl}>
+        <Column gap={spacings.xxl}>
             <AnalyzeInExplorerBanner txid={tx.txid} symbol={tx.symbol} />
-            <Column alignItems="normal" gap={spacings.lg}>
-                {getContent()}
-            </Column>
+            <Column gap={spacings.lg}>{getContent()}</Column>
         </Column>
     );
 };
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/ChangeFee/GreyCard.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/ChangeFee/GreyCard.tsx
index 6f9870587ef..066747b2198 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/ChangeFee/GreyCard.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/ChangeFee/GreyCard.tsx
@@ -15,6 +15,6 @@ const Wrapper = styled(Card)`
 
 export const GreyCard = (props: { children?: ReactNode }) => (
     <Wrapper>
-        <Column>{props.children}</Column>
+        <Column alignItems="center">{props.children}</Column>
     </Wrapper>
 );
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/TxDetailModal.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/TxDetailModal.tsx
index b0b55ffaa6c..62ad5ade280 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/TxDetailModal.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/TxDetailModal.tsx
@@ -103,7 +103,7 @@ export const TxDetailModal = ({ tx, rbfForm, onCancel }: TxDetailModalProps) =>
             bottomContent={getBottomContent()}
             onBackClick={section === 'CHANGE_FEE' ? onBackClick : undefined}
         >
-            <Column alignItems="normal" gap={spacings.lg}>
+            <Column gap={spacings.lg}>
                 <BasicTxDetails
                     explorerUrl={blockchain.explorer.tx}
                     explorerUrlQueryString={blockchain.explorer.queryString}
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/UnstakeModal/EverstakeModal.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/UnstakeModal/EverstakeModal.tsx
index 5a8db6bacc0..18aab999bb4 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/UnstakeModal/EverstakeModal.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/UnstakeModal/EverstakeModal.tsx
@@ -39,11 +39,7 @@ export const EverstakeModal = ({ onCancel }: EverstakeModalProps) => {
                 </>
             }
         >
-            <Column
-                gap={spacings.sm}
-                margin={{ top: spacings.xs, bottom: spacings.lg }}
-                alignItems="stretch"
-            >
+            <Column gap={spacings.sm} margin={{ top: spacings.xs, bottom: spacings.lg }}>
                 <Banner icon="fileFilled" variant="info">
                     <Translation
                         id="TR_STAKE_EVERSTAKE_MANAGES"
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/UnstakeModal/UnstakeEthForm/Options.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/UnstakeModal/UnstakeEthForm/Options.tsx
index 70a5b137fc5..821c91748a2 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/UnstakeModal/UnstakeEthForm/Options.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/UnstakeModal/UnstakeEthForm/Options.tsx
@@ -73,8 +73,8 @@ export const Options = ({ symbol }: OptionsProps) => {
     } = getAccountEverstakeStakingPool(selectedAccount) ?? {};
 
     return (
-        <Column alignItems="stretch" gap={spacings.sm}>
-            <Column alignItems="stretch" gap={spacings.md} hasDivider>
+        <Column gap={spacings.sm}>
+            <Column gap={spacings.md} hasDivider>
                 {new BigNumber(restakedReward).gt(0) && (
                     <Radio
                         isChecked={isRewardsSelected}
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/UnstakeModal/UnstakeEthForm/UnstakeEthForm.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/UnstakeModal/UnstakeEthForm/UnstakeEthForm.tsx
index 83da3406508..e5d5b5373e2 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/UnstakeModal/UnstakeEthForm/UnstakeEthForm.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/UnstakeModal/UnstakeEthForm/UnstakeEthForm.tsx
@@ -49,7 +49,7 @@ export const UnstakeEthForm = () => {
 
     return (
         <form onSubmit={handleSubmit(signTx)}>
-            <Column alignItems="stretch" gap={spacings.xxl} margin={{ bottom: spacings.lg }}>
+            <Column gap={spacings.xxl} margin={{ bottom: spacings.lg }}>
                 {canClaim && (
                     <Banner variant="info">
                         <Translation
@@ -63,7 +63,7 @@ export const UnstakeEthForm = () => {
                     </Banner>
                 )}
 
-                <Column alignItems="stretch" gap={spacings.lg}>
+                <Column gap={spacings.lg}>
                     <Options symbol={symbol} />
                     {showError && <Banner variant="destructive">{inputError?.message}</Banner>}
                 </Column>
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/UnstakeModal/UnstakeModal.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/UnstakeModal/UnstakeModal.tsx
index 44b79ec0542..29d824450ed 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/UnstakeModal/UnstakeModal.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/UnstakeModal/UnstakeModal.tsx
@@ -45,7 +45,7 @@ export const UnstakeModal = ({ onCancel }: UnstakeModalModalProps) => {
             >
                 <Grid columns={isBelowTablet ? 1 : 2} gap={spacings.xxl}>
                     <UnstakeEthForm />
-                    <Column alignItems="stretch" gap={spacings.lg}>
+                    <Column gap={spacings.lg}>
                         <CollapsibleBox
                             heading={
                                 <H3 typographyStyle="highlight">
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/WipeDeviceModal.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/WipeDeviceModal.tsx
index 02671cd3864..8114bb6cc3f 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/WipeDeviceModal.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/WipeDeviceModal.tsx
@@ -50,7 +50,7 @@ export const WipeDeviceModal = ({ onCancel }: WipeDeviceModalProps) => {
                 <Translation id="TR_WIPE_DEVICE_TEXT" />
             </Paragraph>
             <Card margin={{ top: spacings.lg }}>
-                <Column gap={spacings.xs}>
+                <Column gap={spacings.xs} alignItems="center">
                     <CheckItem
                         title={<Translation id="TR_WIPE_DEVICE_CHECKBOX_1_TITLE" />}
                         description={<Translation id="TR_WIPE_DEVICE_CHECKBOX_1_DESCRIPTION" />}
diff --git a/packages/suite/src/components/suite/notifications/Notifications/NotificationGroup/NotificationGroup.tsx b/packages/suite/src/components/suite/notifications/Notifications/NotificationGroup/NotificationGroup.tsx
index 64dbbfa2366..6565c8ad469 100644
--- a/packages/suite/src/components/suite/notifications/Notifications/NotificationGroup/NotificationGroup.tsx
+++ b/packages/suite/src/components/suite/notifications/Notifications/NotificationGroup/NotificationGroup.tsx
@@ -20,7 +20,7 @@ export const NotificationGroup = (props: NotificationGroupProps) => {
 
     if (unseenCount === 0 && seenCount === 0) {
         return (
-            <Column alignItems="normal" gap={spacings.xs}>
+            <Column gap={spacings.xs}>
                 <H4>
                     <Translation id="NOTIFICATIONS_EMPTY_TITLE" />
                 </H4>
@@ -32,9 +32,9 @@ export const NotificationGroup = (props: NotificationGroupProps) => {
     }
 
     return (
-        <Column alignItems="normal" gap={spacings.xl}>
+        <Column gap={spacings.xl}>
             {unseenCount > 0 && (
-                <Column alignItems="normal" gap={spacings.md}>
+                <Column gap={spacings.md}>
                     <H4>
                         <Translation
                             id="NOTIFICATIONS_UNSEEN_TITLE"
@@ -46,7 +46,7 @@ export const NotificationGroup = (props: NotificationGroupProps) => {
             )}
 
             {seenCount > 0 && (
-                <Column alignItems="normal" gap={spacings.md}>
+                <Column gap={spacings.md}>
                     <H4>
                         <Translation id="NOTIFICATIONS_SEEN_TITLE" />
                     </H4>
diff --git a/packages/suite/src/components/suite/notifications/Notifications/NotificationGroup/NotificationList/NotificationList.tsx b/packages/suite/src/components/suite/notifications/Notifications/NotificationGroup/NotificationList/NotificationList.tsx
index 835369d8016..54d37a38b0a 100644
--- a/packages/suite/src/components/suite/notifications/Notifications/NotificationGroup/NotificationList/NotificationList.tsx
+++ b/packages/suite/src/components/suite/notifications/Notifications/NotificationGroup/NotificationList/NotificationList.tsx
@@ -11,7 +11,7 @@ interface NotificationListProps {
 }
 
 export const NotificationList = ({ notifications }: NotificationListProps) => (
-    <Column flex="1" alignItems="normal" hasDivider gap={spacings.xl}>
+    <Column flex="1" hasDivider gap={spacings.xl}>
         {notifications.map(n => (
             <NotificationRenderer key={n.id} notification={n} render={NotificationView} />
         ))}
diff --git a/packages/suite/src/components/suite/notifications/Notifications/NotificationGroup/NotificationList/NotificationView.tsx b/packages/suite/src/components/suite/notifications/Notifications/NotificationGroup/NotificationList/NotificationView.tsx
index fa2b661b19f..ccbf8fbbeff 100644
--- a/packages/suite/src/components/suite/notifications/Notifications/NotificationGroup/NotificationList/NotificationView.tsx
+++ b/packages/suite/src/components/suite/notifications/Notifications/NotificationGroup/NotificationList/NotificationView.tsx
@@ -41,7 +41,7 @@ export const NotificationView = ({
                 ) : (
                     defaultIcon
                 ))}
-            <Column alignItems="normal" gap={spacings.xxs} margin={{ right: 'auto' }}>
+            <Column gap={spacings.xxs} margin={{ right: 'auto' }}>
                 <Paragraph typographyStyle={seen ? 'hint' : 'callout'} variant={colorVariant}>
                     <Translation id={message} values={messageValues} />
                 </Paragraph>
diff --git a/packages/suite/src/components/wallet/AccountExceptionLayout.tsx b/packages/suite/src/components/wallet/AccountExceptionLayout.tsx
index 654f958b42c..58fab226287 100644
--- a/packages/suite/src/components/wallet/AccountExceptionLayout.tsx
+++ b/packages/suite/src/components/wallet/AccountExceptionLayout.tsx
@@ -25,7 +25,7 @@ interface AccountExceptionLayoutProps {
 
 export const AccountExceptionLayout = (props: AccountExceptionLayoutProps) => (
     <Card>
-        <Column>
+        <Column alignItems="center">
             {props.iconName && props.iconVariant && (
                 <IconCircle
                     name={props.iconName}
diff --git a/packages/suite/src/components/wallet/Fees/CustomFee.tsx b/packages/suite/src/components/wallet/Fees/CustomFee.tsx
index 2007dd54f58..80557bce6d3 100644
--- a/packages/suite/src/components/wallet/Fees/CustomFee.tsx
+++ b/packages/suite/src/components/wallet/Fees/CustomFee.tsx
@@ -139,7 +139,7 @@ export const CustomFee = <TFieldValues extends FormState>({
         feeLimitError?.type === 'feeLimit' ? feeLimitValidationProps : undefined;
 
     return (
-        <Column gap={spacings.xs} alignItems="stretch">
+        <Column gap={spacings.xs}>
             <Banner
                 icon
                 variant="warning"
diff --git a/packages/suite/src/components/wallet/Fees/Fees.tsx b/packages/suite/src/components/wallet/Fees/Fees.tsx
index 3727692cc08..79322b6702c 100644
--- a/packages/suite/src/components/wallet/Fees/Fees.tsx
+++ b/packages/suite/src/components/wallet/Fees/Fees.tsx
@@ -99,7 +99,7 @@ export const Fees = <TFieldValues extends FormState>({
     const shouldAnimateNormalFee = showNormalFee && !isCustomLevel;
 
     return (
-        <Column alignItems="stretch" gap={spacings.xs}>
+        <Column gap={spacings.xs}>
             <InfoItem
                 direction="row"
                 labelTypographyStyle="body"
diff --git a/packages/suite/src/components/wallet/WalletLayout/AccountException/AccountException.tsx b/packages/suite/src/components/wallet/WalletLayout/AccountException/AccountException.tsx
index 4927086eb9c..1bf593f0505 100644
--- a/packages/suite/src/components/wallet/WalletLayout/AccountException/AccountException.tsx
+++ b/packages/suite/src/components/wallet/WalletLayout/AccountException/AccountException.tsx
@@ -38,11 +38,15 @@ export const AccountException = ({ loader, network }: AccountExceptionProps) =>
     const page = getExceptionPage(loader, network);
 
     if (page) {
-        return <Column height="100%">{page}</Column>;
+        return (
+            <Column alignItems="center" height="100%">
+                {page}
+            </Column>
+        );
     }
 
     return (
-        <Column height="100%">
+        <Column alignItems="center" height="100%">
             <H2 align="center">Exception {loader} not implemented</H2>
         </Column>
     );
diff --git a/packages/suite/src/components/wallet/WalletLayout/AccountsMenu/AccountGroup.tsx b/packages/suite/src/components/wallet/WalletLayout/AccountsMenu/AccountGroup.tsx
index 4aa1242f81b..210112465b9 100644
--- a/packages/suite/src/components/wallet/WalletLayout/AccountsMenu/AccountGroup.tsx
+++ b/packages/suite/src/components/wallet/WalletLayout/AccountsMenu/AccountGroup.tsx
@@ -133,7 +133,6 @@ export const AccountGroup = ({
 
             <AnimationWrapper opened={isOpen} onUpdate={onUpdate}>
                 <Column
-                    alignItems="stretch"
                     gap={spacings.xxs}
                     margin={{ left: spacings.xs, right: spacings.xs }}
                     data-testid={`@account-menu/${type}/group`}
diff --git a/packages/suite/src/components/wallet/WalletLayout/AccountsMenu/AccountItem.tsx b/packages/suite/src/components/wallet/WalletLayout/AccountsMenu/AccountItem.tsx
index ff766f1a413..cad37305bca 100644
--- a/packages/suite/src/components/wallet/WalletLayout/AccountsMenu/AccountItem.tsx
+++ b/packages/suite/src/components/wallet/WalletLayout/AccountsMenu/AccountItem.tsx
@@ -140,7 +140,7 @@ export const AccountItem = forwardRef(
             switch (type) {
                 case 'coin':
                     return (
-                        <Column>
+                        <Column alignItems="center">
                             <CoinLogo size={ICON_SIZE} symbol={symbol} />
                         </Column>
                     );
@@ -160,7 +160,7 @@ export const AccountItem = forwardRef(
         const isBalanceShown = account.backendType !== 'coinjoin' || account.status !== 'initial';
 
         const ItemContent = () => (
-            <Column flex="1" alignItems="stretch" overflow="hidden" gap={spacings.xxxs}>
+            <Column flex="1" overflow="hidden" gap={spacings.xxxs}>
                 <Row
                     gap={spacings.md}
                     margin={{ right: spacings.xxs }}
@@ -210,7 +210,7 @@ export const AccountItem = forwardRef(
                     <CoinBalance value={formattedBalance} symbol={symbol} />
                 )}
                 {!isBalanceShown && (
-                    <Column alignItems="stretch" gap={spacings.xs}>
+                    <Column gap={spacings.xs}>
                         <SkeletonRectangle width="100px" height="16px" animate={shouldAnimate} />
 
                         {!isTestnet(account.symbol) && (
diff --git a/packages/suite/src/components/wallet/WalletLayout/AccountsMenu/AccountItemsGroup.tsx b/packages/suite/src/components/wallet/WalletLayout/AccountsMenu/AccountItemsGroup.tsx
index a6a2d65e5d1..6abf07521c1 100644
--- a/packages/suite/src/components/wallet/WalletLayout/AccountsMenu/AccountItemsGroup.tsx
+++ b/packages/suite/src/components/wallet/WalletLayout/AccountsMenu/AccountItemsGroup.tsx
@@ -65,7 +65,7 @@ export const AccountItemsGroup = ({
 
     return (
         <Section $selected={selected}>
-            <Column alignItems="stretch" gap={spacings.xxs}>
+            <Column gap={spacings.xxs}>
                 <AccountItem
                     type="coin"
                     account={account}
diff --git a/packages/suite/src/components/wallet/WalletLayout/AccountsMenu/AccountsList.tsx b/packages/suite/src/components/wallet/WalletLayout/AccountsMenu/AccountsList.tsx
index 18b78cf3163..f8a942d5a01 100644
--- a/packages/suite/src/components/wallet/WalletLayout/AccountsMenu/AccountsList.tsx
+++ b/packages/suite/src/components/wallet/WalletLayout/AccountsMenu/AccountsList.tsx
@@ -142,7 +142,7 @@ export const AccountsList = ({ onItemClick }: AccountListProps) => {
 
     if (filteredAccounts.length > 0) {
         return (
-            <Column gap={spacings.xs} alignItems="stretch" margin={{ bottom: spacings.lg }}>
+            <Column gap={spacings.xs} margin={{ bottom: spacings.lg }}>
                 {buildGroup('coinjoin', coinjoinAccounts)}
                 {buildGroup('normal', normalAccounts, coinjoinAccounts.length === null)}
                 {buildGroup('taproot', taprootAccounts)}
diff --git a/packages/suite/src/views/backup/index.tsx b/packages/suite/src/views/backup/index.tsx
index d2821237966..6cf9ec7915d 100644
--- a/packages/suite/src/views/backup/index.tsx
+++ b/packages/suite/src/views/backup/index.tsx
@@ -97,7 +97,7 @@ export const Backup = ({ onCancel }: ForegroundAppProps) => {
                 onCancel={onCancel}
                 data-testid="@backup/no-device"
             >
-                <Column>
+                <Column alignItems="center">
                     <Image image="CONNECT_DEVICE" width="360" />
                 </Column>
             </NewModal>
diff --git a/packages/suite/src/views/dashboard/AssetsView/AssetCard/AssetCardTokensAndStakingInfo.tsx b/packages/suite/src/views/dashboard/AssetsView/AssetCard/AssetCardTokensAndStakingInfo.tsx
index b6964372a1f..815b177e1d3 100644
--- a/packages/suite/src/views/dashboard/AssetsView/AssetCard/AssetCardTokensAndStakingInfo.tsx
+++ b/packages/suite/src/views/dashboard/AssetsView/AssetCard/AssetCardTokensAndStakingInfo.tsx
@@ -23,7 +23,7 @@ export const AssetCardTokensAndStakingInfo = ({
     shouldRenderTokens,
     accounts,
 }: AssetCardTokensAndStakingInfoProps) => (
-    <Column alignItems="stretch">
+    <Column>
         <Divider strokeWidth={1} margin={{ top: spacings.xs, bottom: spacings.xs }} />
         {shouldRenderStaking && (
             <Row
diff --git a/packages/suite/src/views/dashboard/PortfolioCard/EmptyWallet.tsx b/packages/suite/src/views/dashboard/PortfolioCard/EmptyWallet.tsx
index 335769a1618..41438377112 100644
--- a/packages/suite/src/views/dashboard/PortfolioCard/EmptyWallet.tsx
+++ b/packages/suite/src/views/dashboard/PortfolioCard/EmptyWallet.tsx
@@ -20,7 +20,7 @@ export const EmptyWallet = () => {
     );
 
     return (
-        <Column gap={spacings.xxs} data-testid="@dashboard/wallet-ready">
+        <Column gap={spacings.xxs} data-testid="@dashboard/wallet-ready" alignItems="center">
             <IconCircle name="check" size="extraLarge" variant="primary" />
             <H3 margin={{ top: spacings.md }}>
                 <Translation id="TR_YOUR_WALLET_IS_READY_WHAT" />
diff --git a/packages/suite/src/views/dashboard/PortfolioCard/PortfolioCard.tsx b/packages/suite/src/views/dashboard/PortfolioCard/PortfolioCard.tsx
index 22cba834436..126e5508509 100644
--- a/packages/suite/src/views/dashboard/PortfolioCard/PortfolioCard.tsx
+++ b/packages/suite/src/views/dashboard/PortfolioCard/PortfolioCard.tsx
@@ -161,7 +161,6 @@ export const PortfolioCard = memo(() => {
                 {body && (
                     <Column
                         justifyContent="center"
-                        alignItems="stretch"
                         minHeight={329}
                         flex="1"
                         margin={{ left: spacings.lg, right: spacings.lg }}
diff --git a/packages/suite/src/views/dashboard/PortfolioCard/PortfolioCardException.tsx b/packages/suite/src/views/dashboard/PortfolioCard/PortfolioCardException.tsx
index 6bb95f43595..b9bff95ae67 100644
--- a/packages/suite/src/views/dashboard/PortfolioCard/PortfolioCardException.tsx
+++ b/packages/suite/src/views/dashboard/PortfolioCard/PortfolioCardException.tsx
@@ -37,7 +37,7 @@ const Container = ({ title, description, cta, dataTestBase }: ContainerProps) =>
     const actions = Array.isArray(cta) ? cta : [cta];
 
     return (
-        <Column gap={spacings.xxs} data-testid={`@exception/${dataTestBase}`}>
+        <Column gap={spacings.xxs} data-testid={`@exception/${dataTestBase}`} alignItems="center">
             <IconCircle name="warning" size="extraLarge" variant="warning" />
             <H3 margin={{ top: spacings.md }}>
                 <Translation id={title} />
diff --git a/packages/suite/src/views/dashboard/StakeEthCard/StakeEthCard.tsx b/packages/suite/src/views/dashboard/StakeEthCard/StakeEthCard.tsx
index e1be8539240..d390fca2e26 100644
--- a/packages/suite/src/views/dashboard/StakeEthCard/StakeEthCard.tsx
+++ b/packages/suite/src/views/dashboard/StakeEthCard/StakeEthCard.tsx
@@ -108,7 +108,7 @@ export const StakeEthCard = () => {
         <>
             <DashboardSection heading={<Translation id="TR_STAKE_ETH" />}>
                 <Card>
-                    <Column alignItems="stretch">
+                    <Column>
                         <Column alignItems="flex-start">
                             <H3>
                                 <Translation
diff --git a/packages/suite/src/views/onboarding/steps/SecurityCheck/SecurityCheck.tsx b/packages/suite/src/views/onboarding/steps/SecurityCheck/SecurityCheck.tsx
index 8f99a68265d..13724024679 100644
--- a/packages/suite/src/views/onboarding/steps/SecurityCheck/SecurityCheck.tsx
+++ b/packages/suite/src/views/onboarding/steps/SecurityCheck/SecurityCheck.tsx
@@ -254,7 +254,7 @@ const SecurityCheckContent = ({
                             isFullWidth
                             size="large"
                         >
-                            <Column>
+                            <Column alignItems="center">
                                 <Translation id={primaryButtonTopText} />
                                 <TimeEstimateWrapper>
                                     <Icon size={12} name="clock" color={theme.iconOnPrimary} />
diff --git a/packages/suite/src/views/onboarding/steps/SelectBackupType/FloatingSelections.tsx b/packages/suite/src/views/onboarding/steps/SelectBackupType/FloatingSelections.tsx
index c903e3516dc..eb524c2402a 100644
--- a/packages/suite/src/views/onboarding/steps/SelectBackupType/FloatingSelections.tsx
+++ b/packages/suite/src/views/onboarding/steps/SelectBackupType/FloatingSelections.tsx
@@ -146,7 +146,7 @@ export const FloatingSelections = forwardRef<HTMLDivElement, FloatingSelectionsP
                                 });
                             }}
                         >
-                            <Column gap={spacings.md} flex="1" alignItems="stretch">
+                            <Column gap={spacings.md} flex="1">
                                 <LegacyWarning />
                                 <div>
                                     <LegacyOptions
diff --git a/packages/suite/src/views/suite/SwitchDevice/DeviceItem/AddWalletButton.tsx b/packages/suite/src/views/suite/SwitchDevice/DeviceItem/AddWalletButton.tsx
index e4ee4a8a4b3..01ee3be5e54 100644
--- a/packages/suite/src/views/suite/SwitchDevice/DeviceItem/AddWalletButton.tsx
+++ b/packages/suite/src/views/suite/SwitchDevice/DeviceItem/AddWalletButton.tsx
@@ -37,7 +37,7 @@ export const AddWalletButton = ({ device, instances, onCancel }: AddWalletButton
             cursor="pointer"
             placement="bottom"
         >
-            <Column flex="1" gap={spacings.xs}>
+            <Column flex="1" gap={spacings.xs} alignItems="center">
                 {!emptyPassphraseWalletExists && (
                     <Button
                         data-testid="@switch-device/add-wallet-button"
diff --git a/packages/suite/src/views/suite/SwitchDevice/DeviceItem/DeviceItem.tsx b/packages/suite/src/views/suite/SwitchDevice/DeviceItem/DeviceItem.tsx
index 724fbbf37a5..d95dfdb625a 100644
--- a/packages/suite/src/views/suite/SwitchDevice/DeviceItem/DeviceItem.tsx
+++ b/packages/suite/src/views/suite/SwitchDevice/DeviceItem/DeviceItem.tsx
@@ -72,9 +72,9 @@ export const DeviceItem = ({
             isFullHeaderVisible={isFullHeaderVisible}
         >
             <WalletsWrapper $enabled>
-                <Column gap={spacings.xs} margin={{ top: spacings.xxs }} alignItems="stretch">
+                <Column gap={spacings.xs} margin={{ top: spacings.xxs }}>
                     {instancesWithState.length > 0 && (
-                        <Column gap={spacings.xs} alignItems="stretch">
+                        <Column gap={spacings.xs}>
                             {instancesWithState.map((instance, index) => (
                                 <WalletInstance
                                     key={`${instance.id}-${instance.instance}-${instance.state}`}
diff --git a/packages/suite/src/views/suite/SwitchDevice/DeviceItem/ViewOnlyRadios.tsx b/packages/suite/src/views/suite/SwitchDevice/DeviceItem/ViewOnlyRadios.tsx
index fcc46a09f6e..cd2704fc0d8 100644
--- a/packages/suite/src/views/suite/SwitchDevice/DeviceItem/ViewOnlyRadios.tsx
+++ b/packages/suite/src/views/suite/SwitchDevice/DeviceItem/ViewOnlyRadios.tsx
@@ -82,7 +82,7 @@ export const ViewOnlyRadios = ({
     };
 
     return (
-        <Column gap={spacings.xs} alignItems="stretch">
+        <Column gap={spacings.xs}>
             <ViewOnlyRadio
                 title={<Translation id="TR_VIEW_ONLY_RADIOS_ENABLED_TITLE" />}
                 onClick={() => handleConfirm(true)}
diff --git a/packages/suite/src/views/suite/SwitchDevice/DeviceItem/WalletInstance.tsx b/packages/suite/src/views/suite/SwitchDevice/DeviceItem/WalletInstance.tsx
index 771d8ea89d1..0ddcb4393c2 100644
--- a/packages/suite/src/views/suite/SwitchDevice/DeviceItem/WalletInstance.tsx
+++ b/packages/suite/src/views/suite/SwitchDevice/DeviceItem/WalletInstance.tsx
@@ -116,7 +116,7 @@ export const WalletInstance = ({
             isHiglighted={isSelected}
             {...rest}
         >
-            <Column alignItems="stretch">
+            <Column>
                 <Text
                     as="div"
                     variant={isSelected ? 'default' : 'tertiary'}
diff --git a/packages/suite/src/views/suite/SwitchDevice/SwitchDevice.tsx b/packages/suite/src/views/suite/SwitchDevice/SwitchDevice.tsx
index ab370ad2b8a..64cc08a0b33 100644
--- a/packages/suite/src/views/suite/SwitchDevice/SwitchDevice.tsx
+++ b/packages/suite/src/views/suite/SwitchDevice/SwitchDevice.tsx
@@ -26,7 +26,7 @@ export const SwitchDevice = ({ onCancel }: ForegroundAppProps) => {
 
     return (
         <SwitchDeviceModal isAnimationEnabled onCancel={onCancel}>
-            <Column gap={spacings.xs} alignItems="stretch">
+            <Column gap={spacings.xs}>
                 {sortedDevices.map((device, index) => (
                     <DeviceItem
                         key={`${device.id}-${device.instance}`}
diff --git a/packages/suite/src/views/view-only/ViewOnlyPromoContent.tsx b/packages/suite/src/views/view-only/ViewOnlyPromoContent.tsx
index f164c080e45..849f9f0127b 100644
--- a/packages/suite/src/views/view-only/ViewOnlyPromoContent.tsx
+++ b/packages/suite/src/views/view-only/ViewOnlyPromoContent.tsx
@@ -258,7 +258,7 @@ export const ViewOnlyPromoContent = () => {
 
     return (
         <Card paddingType="small" maxWidth={476}>
-            <Column gap={spacings.md} alignItems="stretch">
+            <Column gap={spacings.md}>
                 <ElevationContext baseElevation={elevation}>
                     <Top />
                 </ElevationContext>
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormInput/CoinmarketFormSwitcherExchangeRates.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormInput/CoinmarketFormSwitcherExchangeRates.tsx
index 289df2fb1c9..d1e8abd4a98 100644
--- a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormInput/CoinmarketFormSwitcherExchangeRates.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormInput/CoinmarketFormSwitcherExchangeRates.tsx
@@ -63,7 +63,7 @@ export const CoinmarketFormSwitcherExchangeRates = ({
     const floatingRateSelected = rateType === FORM_RATE_FLOATING;
 
     return (
-        <Column alignItems="stretch" gap={spacings.xs}>
+        <Column gap={spacings.xs}>
             <Translation id="TR_COINMARKET_RATE" />
             <Card paddingType="none">
                 <Grid
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormInputs.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormInputs.tsx
index fcd6e98e2dd..00314d88f34 100644
--- a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormInputs.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormInputs.tsx
@@ -67,7 +67,7 @@ export const CoinmarketFormInputs = () => {
                     label="TR_COINMARKET_YOU_SELL"
                     methods={{ ...context }}
                 />
-                <Column alignItems="stretch" gap={spacings.xs}>
+                <Column gap={spacings.xs}>
                     <CoinmarketFormInputFiatCrypto<CoinmarketSellFormProps>
                         cryptoInputName={FORM_OUTPUT_AMOUNT}
                         fiatInputName={FORM_OUTPUT_FIAT}
@@ -148,7 +148,7 @@ export const CoinmarketFormInputs = () => {
                     label="TR_FROM"
                     methods={{ ...context }}
                 />
-                <Column alignItems="stretch" gap={spacings.xs}>
+                <Column gap={spacings.xs}>
                     <CoinmarketFormInputFiatCrypto<CoinmarketExchangeFormProps>
                         cryptoInputName={FORM_OUTPUT_AMOUNT}
                         fiatInputName={FORM_OUTPUT_FIAT}
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormLayout.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormLayout.tsx
index 9e2e90103c5..d685e152735 100644
--- a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormLayout.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormLayout.tsx
@@ -16,7 +16,7 @@ export const CoinmarketFormLayout = () => (
     <>
         <CoinmarketFormLayoutWrapper>
             <Card>
-                <Column alignItems="stretch" gap={spacings.lg}>
+                <Column gap={spacings.lg}>
                     <CoinmarketFormInputs />
                 </Column>
             </Card>
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormOffer.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormOffer.tsx
index 54265fba271..20a62826784 100644
--- a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormOffer.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormOffer.tsx
@@ -75,8 +75,8 @@ export const CoinmarketFormOffer = () => {
     const network = selectedCrypto?.value ? cryptoIdToPlatformName(networkId) : undefined;
 
     return (
-        <Column alignItems="stretch" gap={spacings.lg}>
-            <Column alignItems="stretch" gap={spacings.xs}>
+        <Column gap={spacings.lg}>
+            <Column gap={spacings.xs}>
                 <Translation id={amountLabels.offerLabel} />
                 {shouldDisplayFiatAmount ? (
                     <CoinmarketFormOfferFiatAmount
@@ -107,7 +107,7 @@ export const CoinmarketFormOffer = () => {
                     </Paragraph>
                 )}
             </Column>
-            <Column alignItems="stretch" gap={spacings.xxs} margin={{ vertical: spacings.md }}>
+            <Column gap={spacings.xxs} margin={{ vertical: spacings.md }}>
                 <Row justifyContent="space-between">
                     <Translation id="TR_COINMARKET_YOUR_BEST_OFFER" />
                     <TextButton
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormOffersSwitcher.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormOffersSwitcher.tsx
index 3149c276a72..46d5e261e50 100644
--- a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormOffersSwitcher.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormOffersSwitcher.tsx
@@ -79,7 +79,6 @@ export const CoinmarketFormOffersSwitcher = ({
     return (
         <Card paddingType="none">
             <Column
-                alignItems="stretch"
                 margin={{ horizontal: spacings.xxs, vertical: spacings.xxs }}
                 gap={spacings.xxs}
             >
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketLayout/CoinmarketLayout.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketLayout/CoinmarketLayout.tsx
index 6db4321e9f8..68518dbe2a2 100644
--- a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketLayout/CoinmarketLayout.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketLayout/CoinmarketLayout.tsx
@@ -13,7 +13,7 @@ export const CoinmarketLayout = ({ children }: CoinmarketLayoutProps) => {
     const routeName = useSelector(selectRouteName);
 
     return (
-        <Column gap={spacings.xl} alignItems="stretch">
+        <Column gap={spacings.xl}>
             {!routeName?.includes(`wallet-coinmarket-exchange`) && <CoinmarketLayoutNavigation />}
             {children}
         </Column>
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketOfferExchange/CoinmarketOfferExchangeSend.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketOfferExchange/CoinmarketOfferExchangeSend.tsx
index 227c1623a69..7492c021b74 100644
--- a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketOfferExchange/CoinmarketOfferExchangeSend.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketOfferExchange/CoinmarketOfferExchangeSend.tsx
@@ -15,7 +15,7 @@ export const CoinmarketOfferExchangeSend = () => {
         exchangeInfo?.providerInfos[exchange]?.companyName || selectedQuote.exchange;
 
     return (
-        <Column gap={spacings.lg} alignItems="stretch" flex="1">
+        <Column gap={spacings.lg} flex="1">
             <InfoItem label={<Translation id="TR_EXCHANGE_SEND_FROM" />} typographyStyle="hint">
                 <AccountLabeling account={account} />
             </InfoItem>
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketOfferExchange/CoinmarketOfferExchangeSendApproval.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketOfferExchange/CoinmarketOfferExchangeSendApproval.tsx
index 9567245eb6b..7ad5f56316e 100644
--- a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketOfferExchange/CoinmarketOfferExchangeSendApproval.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketOfferExchange/CoinmarketOfferExchangeSendApproval.tsx
@@ -120,7 +120,7 @@ export const CoinmarketOfferExchangeSendApproval = () => {
     };
 
     return (
-        <Column gap={spacings.lg} alignItems="stretch" flex="1">
+        <Column gap={spacings.lg} flex="1">
             <InfoItem label={<Translation id="TR_EXCHANGE_SEND_FROM" />} typographyStyle="hint">
                 <AccountLabeling account={account} />
             </InfoItem>
@@ -149,6 +149,7 @@ export const CoinmarketOfferExchangeSendApproval = () => {
             )}
             {selectedQuote.status === 'APPROVAL_PENDING' && (
                 <Column
+                    alignItems="center"
                     justifyContent="center"
                     margin={{ top: spacings.xxxxl, bottom: spacings.md }}
                 >
@@ -280,7 +281,7 @@ export const CoinmarketOfferExchangeSendApproval = () => {
                 </InfoItem>
             )}
 
-            <Column>
+            <Column alignItems="center">
                 <Divider margin={{ top: spacings.xxs, bottom: spacings.lg }} />
                 {(selectedQuote.status === 'APPROVAL_REQ' ||
                     (selectedQuote.status === 'CONFIRM' && approvalType === 'ZERO')) && (
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketOfferExchange/CoinmarketOfferExchangeSendSwap.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketOfferExchange/CoinmarketOfferExchangeSendSwap.tsx
index 0cf1cba22e2..647ab29eab6 100644
--- a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketOfferExchange/CoinmarketOfferExchangeSendSwap.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketOfferExchange/CoinmarketOfferExchangeSendSwap.tsx
@@ -174,7 +174,7 @@ export const CoinmarketOfferExchangeSendSwap = () => {
     };
 
     return (
-        <Column gap={spacings.lg} alignItems="stretch" flex="1">
+        <Column gap={spacings.lg} flex="1">
             <InfoItem label={<Translation id="TR_EXCHANGE_SEND_FROM" />} typographyStyle="hint">
                 <AccountLabeling account={account} />
             </InfoItem>
@@ -191,7 +191,7 @@ export const CoinmarketOfferExchangeSendSwap = () => {
                 label={<Translation id="TR_EXCHANGE_SWAP_SLIPPAGE" />}
             >
                 <ElevationContext baseElevation={0}>
-                    <Column gap={spacings.lg} alignItems="stretch">
+                    <Column gap={spacings.lg}>
                         <InfoItem
                             label={
                                 <Tooltip
@@ -277,7 +277,7 @@ export const CoinmarketOfferExchangeSendSwap = () => {
                 <BreakableValue>{dexTx.data}</BreakableValue>
             </InfoItem>
 
-            <Column>
+            <Column alignItems="center">
                 <Divider margin={{ top: spacings.xs, bottom: spacings.lg }} />
                 <Button
                     isLoading={callInProgress}
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketSelectedOfferInfo.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketSelectedOfferInfo.tsx
index 58188288a7f..208b05c75ef 100644
--- a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketSelectedOfferInfo.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketSelectedOfferInfo.tsx
@@ -30,7 +30,7 @@ export const CoinmarketSelectedOfferInfo = ({
     const amountLabels = coinmarketGetAmountLabels({ type, amountInCrypto: true });
 
     return (
-        <Column gap={spacings.xl} alignItems="stretch" data-testid="@coinmarket/form/info">
+        <Column gap={spacings.xl} data-testid="@coinmarket/form/info">
             {type !== 'exchange' && (
                 <>
                     <CoinmarketInfoHeader receiveCurrency={quoteAmounts?.receiveCurrency} />
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketVerify/CoinmarketVerify.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketVerify/CoinmarketVerify.tsx
index 76f388fde62..d9e0e4c817c 100644
--- a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketVerify/CoinmarketVerify.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketVerify/CoinmarketVerify.tsx
@@ -98,7 +98,7 @@ export const CoinmarketVerify = ({ coinmarketVerifyAccount, currency }: Coinmark
     }, [device?.connected, dispatch]);
 
     return (
-        <Column gap={spacings.xl} alignItems="stretch">
+        <Column gap={spacings.xl}>
             <Paragraph typographyStyle="hint" variant="tertiary">
                 <Translation
                     id="TR_EXCHANGE_RECEIVING_ADDRESS_INFO"
@@ -119,7 +119,7 @@ export const CoinmarketVerify = ({ coinmarketVerifyAccount, currency }: Coinmark
                     onChangeAccount={onChangeAccount}
                 />
             </Column>
-            <Column gap={spacings.xxs} alignItems="stretch">
+            <Column gap={spacings.xxs}>
                 {selectedAccountOption?.type === 'SUITE' &&
                     selectedAccountOption?.account?.networkType === 'bitcoin' && (
                         <>
@@ -179,7 +179,7 @@ export const CoinmarketVerify = ({ coinmarketVerifyAccount, currency }: Coinmark
                 )}
             </Column>
             {selectedAccountOption && (
-                <Column>
+                <Column alignItems="center">
                     <Divider margin={{ top: spacings.xs, bottom: spacings.lg }} />
                     {(!addressVerified || addressVerified !== address) &&
                         selectedAccountOption.account && (
diff --git a/packages/suite/src/views/wallet/details/index.tsx b/packages/suite/src/views/wallet/details/index.tsx
index 1c85062612e..082d8ca4079 100644
--- a/packages/suite/src/views/wallet/details/index.tsx
+++ b/packages/suite/src/views/wallet/details/index.tsx
@@ -87,7 +87,7 @@ const Details = () => {
                 )}
 
                 <Card>
-                    <Column gap={spacings.md} hasDivider>
+                    <Column alignItems="center" gap={spacings.md} hasDivider>
                         <Row>
                             <TextColumn
                                 title={<Translation id="TR_ACCOUNT_DETAILS_TYPE_HEADER" />}
diff --git a/packages/suite/src/views/wallet/receive/components/UsedAddresses.tsx b/packages/suite/src/views/wallet/receive/components/UsedAddresses.tsx
index 0e2df8a850c..b377f4120ba 100644
--- a/packages/suite/src/views/wallet/receive/components/UsedAddresses.tsx
+++ b/packages/suite/src/views/wallet/receive/components/UsedAddresses.tsx
@@ -166,7 +166,7 @@ export const UsedAddresses = ({
 
     return (
         <Card overflow="hidden" paddingType="none">
-            <Column alignItems="stretch" gap={spacings.md}>
+            <Column gap={spacings.md}>
                 <Table margin={{ top: spacings.xs, bottom: spacings.xs }}>
                     <Table.Header>
                         <Table.Row>
diff --git a/packages/suite/src/views/wallet/send/Outputs/Outputs.tsx b/packages/suite/src/views/wallet/send/Outputs/Outputs.tsx
index 6cd5aeb4472..d0d3f1c227b 100644
--- a/packages/suite/src/views/wallet/send/Outputs/Outputs.tsx
+++ b/packages/suite/src/views/wallet/send/Outputs/Outputs.tsx
@@ -81,7 +81,7 @@ export const Outputs = ({ disableAnim }: OutputsProps) => {
                             {output.type === 'opreturn' ? (
                                 <OpReturn outputId={index} />
                             ) : (
-                                <Column gap={spacings.md} alignItems="stretch">
+                                <Column gap={spacings.md}>
                                     <Address
                                         output={outputs[index]}
                                         outputId={index}
diff --git a/packages/suite/src/views/wallet/send/TotalSent/TotalSent.tsx b/packages/suite/src/views/wallet/send/TotalSent/TotalSent.tsx
index cc6ca9a3873..646e7dcc14f 100644
--- a/packages/suite/src/views/wallet/send/TotalSent/TotalSent.tsx
+++ b/packages/suite/src/views/wallet/send/TotalSent/TotalSent.tsx
@@ -30,7 +30,7 @@ export const TotalSent = () => {
     return (
         <Container>
             <Card height="min-content" fillType="none">
-                <Column gap={spacings.xxs} alignItems="stretch" margin={{ bottom: spacings.xl }}>
+                <Column gap={spacings.xxs} margin={{ bottom: spacings.xl }}>
                     <InfoItem
                         label={
                             <Text variant="default" typographyStyle="body">
diff --git a/packages/suite/src/views/wallet/staking/components/CardanoRedelegate.tsx b/packages/suite/src/views/wallet/staking/components/CardanoRedelegate.tsx
index dcacbc77287..345b8b632bf 100644
--- a/packages/suite/src/views/wallet/staking/components/CardanoRedelegate.tsx
+++ b/packages/suite/src/views/wallet/staking/components/CardanoRedelegate.tsx
@@ -38,7 +38,7 @@ export const CardanoRedelegate = ({ deviceModel }: CardanoRedelegateProps) => {
 
     return (
         <Card>
-            <Column gap={spacings.xs}>
+            <Column gap={spacings.xs} alignItems="center">
                 <Title>
                     <Icon name="info" size={18} />
                     <Heading>
diff --git a/packages/suite/src/views/wallet/staking/components/CardanoRewards.tsx b/packages/suite/src/views/wallet/staking/components/CardanoRewards.tsx
index 31193518c7d..2d3d61b6b3e 100644
--- a/packages/suite/src/views/wallet/staking/components/CardanoRewards.tsx
+++ b/packages/suite/src/views/wallet/staking/components/CardanoRewards.tsx
@@ -54,7 +54,7 @@ export const CardanoRewards = ({ account, deviceModel }: CardanoRewardsProps) =>
 
     return (
         <Card>
-            <Column gap={spacings.xs}>
+            <Column gap={spacings.xs} alignItems="center">
                 <StyledH2>
                     <Icon name="check" size={25} />
                     <Heading>
diff --git a/packages/suite/src/views/wallet/staking/components/CardanoStake.tsx b/packages/suite/src/views/wallet/staking/components/CardanoStake.tsx
index 8acfac87534..0786642a96b 100644
--- a/packages/suite/src/views/wallet/staking/components/CardanoStake.tsx
+++ b/packages/suite/src/views/wallet/staking/components/CardanoStake.tsx
@@ -55,7 +55,7 @@ export const CardanoStake = ({ account, deviceModel }: CardanoStakeProps) => {
 
     return (
         <Card>
-            <Column gap={spacings.xs}>
+            <Column gap={spacings.xs} alignItems="center">
                 <StyledH2>
                     <Icon name="close" size={25} />
                     <Heading>
diff --git a/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/components/ApyCard.tsx b/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/components/ApyCard.tsx
index ec2d7489302..aff04f94c89 100644
--- a/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/components/ApyCard.tsx
+++ b/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/components/ApyCard.tsx
@@ -12,7 +12,7 @@ export const ApyCard = ({ apy }: ApyCardProps) => (
         <Column alignItems="flex-start" flex="1" gap={spacings.lg}>
             <Icon name="percent" variant="tertiary" />
 
-            <Column alignItems="normal" margin={{ top: 'auto' }}>
+            <Column margin={{ top: 'auto' }}>
                 <Paragraph typographyStyle="titleMedium">{`${apy}%`}</Paragraph>
                 <Paragraph typographyStyle="hint" variant="tertiary">
                     <Translation id="TR_STAKE_APY" />
diff --git a/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/components/ClaimCard.tsx b/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/components/ClaimCard.tsx
index 4ba229a4ea5..f5b4a868cea 100644
--- a/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/components/ClaimCard.tsx
+++ b/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/components/ClaimCard.tsx
@@ -78,7 +78,7 @@ export const ClaimCard = () => {
         </Card>
     ) : (
         <Card isHiglighted>
-            <Column flex="1" alignItems="normal" gap={spacings.xl}>
+            <Column flex="1" gap={spacings.xl}>
                 <InfoItem
                     label={<Translation id="TR_STAKE_UNSTAKED_AND_READY_TO_CLAIM" />}
                     iconName="confirmation"
diff --git a/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/components/EmptyStakingCard.tsx b/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/components/EmptyStakingCard.tsx
index 3dd408a3386..7a712d7cc2d 100644
--- a/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/components/EmptyStakingCard.tsx
+++ b/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/components/EmptyStakingCard.tsx
@@ -80,7 +80,7 @@ export const EmptyStakingCard = () => {
     return (
         <DashboardSection heading={<Translation id="TR_STAKE_ETH" />}>
             <Card>
-                <Column alignItems="stretch">
+                <Column>
                     <section>
                         <Text typographyStyle="highlight">
                             <Translation id="TR_STAKE_WHAT_IS_STAKING" />
diff --git a/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/components/PayoutCard.tsx b/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/components/PayoutCard.tsx
index 54b0f44f014..35e5a935727 100644
--- a/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/components/PayoutCard.tsx
+++ b/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/components/PayoutCard.tsx
@@ -41,7 +41,7 @@ export const PayoutCard = ({
             <Column alignItems="flex-start" flex="1" gap={spacings.lg}>
                 <Icon name="calendar" variant="tertiary" />
 
-                <Column alignItems="normal" margin={{ top: 'auto' }}>
+                <Column margin={{ top: 'auto' }}>
                     <Paragraph typographyStyle="titleMedium">
                         {payout === undefined ? (
                             <Translation
diff --git a/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/components/StakingCard.tsx b/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/components/StakingCard.tsx
index 655e1fdb902..01d8fde76a0 100644
--- a/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/components/StakingCard.tsx
+++ b/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/components/StakingCard.tsx
@@ -134,7 +134,7 @@ export const StakingCard = ({
 
     return (
         <Card>
-            <Column flex="1" alignItems="normal" gap={spacings.xxxxl}>
+            <Column flex="1" gap={spacings.xxxxl}>
                 {(isStakeConfirming || isTxStatusShown) && (
                     <ProgressLabels labels={progressLabelsData} />
                 )}
diff --git a/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/components/StakingDashboard.tsx b/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/components/StakingDashboard.tsx
index c90e407dc52..b7ba6c2cc47 100644
--- a/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/components/StakingDashboard.tsx
+++ b/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/components/StakingDashboard.tsx
@@ -62,9 +62,9 @@ export const StakingDashboard = () => {
     const { canClaim = false } = getAccountEverstakeStakingPool(account) ?? {};
 
     return (
-        <Column alignItems="normal" gap={spacings.xxxxl}>
+        <Column gap={spacings.xxxxl}>
             <DashboardSection heading={<Translation id="TR_STAKE_ETH" />}>
-                <Column alignItems="normal" gap={spacings.sm}>
+                <Column gap={spacings.sm}>
                     <InstantStakeBanner
                         txs={txs}
                         daysToAddToPool={daysToAddToPool}
diff --git a/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/hooks/useProgressLabelsData.tsx b/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/hooks/useProgressLabelsData.tsx
index ae3c8d715d3..8a0c1b463b5 100644
--- a/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/hooks/useProgressLabelsData.tsx
+++ b/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/hooks/useProgressLabelsData.tsx
@@ -43,7 +43,7 @@ export const useProgressLabelsData = ({
                     return 'stale';
                 })(),
                 children: (
-                    <Column alignItems="normal">
+                    <Column>
                         <Translation id="TR_STAKE_ADDING_TO_POOL" />
                         {isDaysToAddToPoolShown && (
                             <Paragraph typographyStyle="label" variant="tertiary">
diff --git a/packages/suite/src/views/wallet/tokens/hidden-tokens/HiddenTokensTable.tsx b/packages/suite/src/views/wallet/tokens/hidden-tokens/HiddenTokensTable.tsx
index a23265a9784..6fcc6f21e55 100644
--- a/packages/suite/src/views/wallet/tokens/hidden-tokens/HiddenTokensTable.tsx
+++ b/packages/suite/src/views/wallet/tokens/hidden-tokens/HiddenTokensTable.tsx
@@ -35,7 +35,7 @@ export const HiddenTokensTable = ({ selectedAccount, searchQuery }: HiddenTokens
         tokens.unverifiedWithBalance.length + tokens.unverifiedWithoutBalance.length;
 
     return (
-        <Column gap={spacings.xxl} alignItems="stretch">
+        <Column gap={spacings.xxl}>
             {hiddenTokensCount === 0 && unverifiedTokensCount === 0 && (
                 <NoTokens title={<Translation id="TR_HIDDEN_TOKENS_EMPTY" />} />
             )}
@@ -51,7 +51,7 @@ export const HiddenTokensTable = ({ selectedAccount, searchQuery }: HiddenTokens
                 />
             )}
             {unverifiedTokensCount > 0 && (
-                <Column alignItems="stretch" gap={spacings.sm}>
+                <Column gap={spacings.sm}>
                     <H3>
                         <Translation id="TR_TOKEN_UNRECOGNIZED_BY_TREZOR" />
                     </H3>
diff --git a/packages/suite/src/views/wallet/transactions/CoinjoinSummary/CoinjoinBalanceSection.tsx b/packages/suite/src/views/wallet/transactions/CoinjoinSummary/CoinjoinBalanceSection.tsx
index d208348bb60..946ea84d8f8 100644
--- a/packages/suite/src/views/wallet/transactions/CoinjoinSummary/CoinjoinBalanceSection.tsx
+++ b/packages/suite/src/views/wallet/transactions/CoinjoinSummary/CoinjoinBalanceSection.tsx
@@ -51,7 +51,7 @@ export const CoinjoinBalanceSection = ({ accountKey }: CoinjoinBalanceSectionPro
     return (
         <Container>
             <Card width="100%" height="100%">
-                <Column justifyContent="center" flex="1">
+                <Column justifyContent="center" alignItems="center" flex="1">
                     {errorMessageConfig ? (
                         <CoinjoinBalanceError {...errorMessageConfig} />
                     ) : (
diff --git a/packages/suite/src/views/wallet/transactions/TransactionList/NoSearchResults.tsx b/packages/suite/src/views/wallet/transactions/TransactionList/NoSearchResults.tsx
index 691592e1fd2..49dad581c28 100644
--- a/packages/suite/src/views/wallet/transactions/TransactionList/NoSearchResults.tsx
+++ b/packages/suite/src/views/wallet/transactions/TransactionList/NoSearchResults.tsx
@@ -54,7 +54,7 @@ export const NoSearchResults = () => {
     return (
         <Card>
             <NoResults>
-                <Column>
+                <Column alignItems="center">
                     <Translation id="TR_NO_SEARCH_RESULTS" />
 
                     <Examples>