diff --git a/package.json b/package.json
index cb81f4f58..29aad21d0 100644
--- a/package.json
+++ b/package.json
@@ -90,7 +90,7 @@
     "@react-navigation/stack": "6.2.2",
     "@reduxjs/toolkit": "1.9.1",
     "@rnmapbox/maps": "10.0.7-rc.0",
-    "@shopify/restyle": "^2.4.2",
+    "@shopify/restyle": "1.8.0",
     "@solana/spl-account-compression": "0.1.4",
     "@solana/spl-memo": "0.2.3",
     "@solana/spl-token": "0.3.6",
diff --git a/src/components/TextTransform.tsx b/src/components/TextTransform.tsx
index 6a6eb482a..9c1582c45 100644
--- a/src/components/TextTransform.tsx
+++ b/src/components/TextTransform.tsx
@@ -36,6 +36,7 @@ type Props = TextProps<Theme> & {
   maxFontSizeMultiplier?: number
   colorTextVariant?: ResponsiveValue<TextVariant, Theme>
 }
+
 const TextTransform = ({
   i18nKey,
   values,
diff --git a/src/features/governance/DelegateTokensModal.tsx b/src/features/governance/DelegateTokensModal.tsx
index 54ede427d..d76910ab6 100644
--- a/src/features/governance/DelegateTokensModal.tsx
+++ b/src/features/governance/DelegateTokensModal.tsx
@@ -107,14 +107,15 @@ export const DelegateTokensModal = ({
                   </Text>
                 </Box>
               )}
-              <Box gap="m">
-                {subDaos?.map((subDao) => {
+              <Box>
+                {subDaos?.map((subDao, idx) => {
                   const isSelected = selectedSubDaoPk?.equals(subDao.pubkey)
 
                   return (
                     <TouchableOpacityBox
                       key={subDao.pubkey.toString()}
                       borderRadius="l"
+                      marginBottom={idx > 0 ? 'm' : 'none'}
                       backgroundColor={
                         isSelected ? 'secondaryBackground' : 'secondary'
                       }
diff --git a/src/features/governance/LockTokensModal.tsx b/src/features/governance/LockTokensModal.tsx
index a53c5c01f..8ef65162b 100644
--- a/src/features/governance/LockTokensModal.tsx
+++ b/src/features/governance/LockTokensModal.tsx
@@ -289,8 +289,8 @@ export const LockTokensModal = ({
                                   <InfoIcon width={20} />
                                 </TouchableOpacityBox>
                               </Box>
-                              <Box flexDirection="row" gap="ms">
-                                {lockupKindOptions.map((option) => {
+                              <Box flexDirection="row">
+                                {lockupKindOptions.map((option, idx) => {
                                   const isActive =
                                     option.value === lockupKind.value
 
@@ -301,6 +301,7 @@ export const LockTokensModal = ({
                                       padding="s"
                                       alignItems="center"
                                       borderRadius="m"
+                                      marginLeft={idx > 0 ? 'ms' : 'none'}
                                       backgroundColor={
                                         isActive
                                           ? 'surfaceSecondary'
@@ -388,11 +389,11 @@ export const LockTokensModal = ({
                               </TouchableOpacityBox>
                             </Box>
                           ) : null}
-                          <Box flexDirection="row" flexWrap="wrap" gap="ms">
+                          <Box flexDirection="row" flexWrap="wrap">
                             {(hasMinLockup
                               ? [...lockupPeriodOptions.splice(1)]
                               : lockupPeriodOptions
-                            ).map((option) => {
+                            ).map((option, idx) => {
                               const isActive =
                                 option.value === lockupPeriod.value
 
@@ -403,6 +404,7 @@ export const LockTokensModal = ({
                                   padding="s"
                                   alignItems="center"
                                   borderRadius="m"
+                                  marginLeft={idx > 0 ? 'ms' : 'none'}
                                   backgroundColor={
                                     isActive ? 'surfaceSecondary' : 'black500'
                                   }
diff --git a/src/features/governance/PositionsList.tsx b/src/features/governance/PositionsList.tsx
index 38406e21e..8dcb6dff9 100644
--- a/src/features/governance/PositionsList.tsx
+++ b/src/features/governance/PositionsList.tsx
@@ -68,11 +68,12 @@ export const PositionsList = ({
           </Text>
         </Box>
       </Box>
-      <Box gap="m">
-        {sortedPositions?.map((p) => (
+      <Box>
+        {sortedPositions?.map((p, idx) => (
           <PositionCard
             key={`${p.pubkey.toBase58()}`}
             position={p}
+            marginTop={idx > 0 ? 'm' : 'none'}
             subDaos={subDaos}
           />
         ))}
diff --git a/src/features/governance/ProposalCard.tsx b/src/features/governance/ProposalCard.tsx
index b33cc500a..924c09994 100644
--- a/src/features/governance/ProposalCard.tsx
+++ b/src/features/governance/ProposalCard.tsx
@@ -157,24 +157,24 @@ export const ProposalCard = ({
                 {proposal?.name}
               </Text>
             </Box>
-            <Box flexDirection="row" marginLeft="s" gap="s">
+            <Box flexDirection="row">
               {proposal?.tags
                 .filter((tag) => tag !== 'tags')
                 .map((tag) => (
-                  <Box key={tag}>
-                    <Box
-                      padding="s"
-                      backgroundColor={
-                        tag.toLowerCase().includes('temp check')
-                          ? 'orange500'
-                          : 'surfaceSecondary'
-                      }
-                      borderRadius="m"
-                    >
-                      <Text fontSize={10} color="secondaryText">
-                        {tag.toUpperCase()}
-                      </Text>
-                    </Box>
+                  <Box
+                    key={tag}
+                    marginLeft="s"
+                    padding="s"
+                    backgroundColor={
+                      tag.toLowerCase().includes('temp check')
+                        ? 'orange500'
+                        : 'surfaceSecondary'
+                    }
+                    borderRadius="m"
+                  >
+                    <Text fontSize={10} color="secondaryText">
+                      {tag.toUpperCase()}
+                    </Text>
                   </Box>
                 ))}
             </Box>
diff --git a/src/features/governance/ProposalScreen.tsx b/src/features/governance/ProposalScreen.tsx
index c3483433b..d8c523027 100644
--- a/src/features/governance/ProposalScreen.tsx
+++ b/src/features/governance/ProposalScreen.tsx
@@ -220,12 +220,13 @@ export const ProposalScreen = () => {
               borderRadius="l"
               padding="m"
             >
-              <Box flexDirection="row" gap="s">
+              <Box flexDirection="row">
                 {proposal?.tags
                   .filter((tag) => tag !== 'tags')
-                  .map((tag) => (
+                  .map((tag, idx) => (
                     <Box
                       key={tag}
+                      marginLeft={idx > 0 ? 's' : 'none'}
                       padding="s"
                       backgroundColor={
                         tag.toLowerCase().includes('temp check')
@@ -286,10 +287,13 @@ export const ProposalScreen = () => {
                     backgroundColor="secondaryBackground"
                     borderRadius="l"
                     paddingTop="m"
-                    gap="s"
                   >
-                    {votingResults.results?.map((r) => (
-                      <Box key={r.name} flex={1}>
+                    {votingResults.results?.map((r, idx) => (
+                      <Box
+                        key={r.name}
+                        flex={1}
+                        marginTop={idx > 0 ? 's' : 'none'}
+                      >
                         <Text
                           variant="body2"
                           color="primaryText"
@@ -367,10 +371,11 @@ export const ProposalScreen = () => {
                       </Text>
                     </Box>
                   )}
-                  <Box flex={1} flexDirection="row" flexWrap="wrap" gap="s">
-                    {votingResults.results?.map((r) => (
+                  <Box flex={1} flexDirection="row" flexWrap="wrap">
+                    {votingResults.results?.map((r, idx) => (
                       <VoteOption
                         key={r.name}
+                        marginLeft={idx % 2 === 0 ? 's' : 'none'}
                         voting={
                           currVote === r.index && (voting || relinquishing)
                         }
diff --git a/src/features/governance/ProposalsList.tsx b/src/features/governance/ProposalsList.tsx
index f9da94d24..3fcf8f310 100644
--- a/src/features/governance/ProposalsList.tsx
+++ b/src/features/governance/ProposalsList.tsx
@@ -88,24 +88,23 @@ export const ProposalsList = ({ ...boxProps }: IProposalsListProps) => {
           </TouchableOpacityBox>
         </Box>
         {loading && <ProposalCardSkeleton backgroundColor="transparent" />}
-        <Box gap="m">
-          {!loading &&
-            proposals
-              ?.filter((p) => Boolean(p.info))
-              .map((proposal) => (
-                <ProposalCard
-                  key={proposal.publicKey.toBase58()}
-                  filter={filter}
-                  proposal={proposal.info as ProposalV0}
-                  proposalKey={proposal.publicKey}
-                  onPress={async (p) =>
-                    navigation.push('ProposalScreen', {
-                      proposal: p.toBase58(),
-                    })
-                  }
-                />
-              ))}
-        </Box>
+        {!loading &&
+          proposals
+            ?.filter((p) => Boolean(p.info))
+            .map((proposal, idx) => (
+              <ProposalCard
+                key={proposal.publicKey.toBase58()}
+                filter={filter}
+                marginTop={idx > 0 ? 'm' : 'none'}
+                proposal={proposal.info as ProposalV0}
+                proposalKey={proposal.publicKey}
+                onPress={async (p) =>
+                  navigation.push('ProposalScreen', {
+                    proposal: p.toBase58(),
+                  })
+                }
+              />
+            ))}
       </Box>
       <BlurActionSheet
         title={t('gov.proposals.filterTitle')}
diff --git a/src/features/governance/TransferTokensModal.tsx b/src/features/governance/TransferTokensModal.tsx
index 5934a6b02..678da0052 100644
--- a/src/features/governance/TransferTokensModal.tsx
+++ b/src/features/governance/TransferTokensModal.tsx
@@ -206,117 +206,111 @@ export const TransferTokensModal = ({
                             </Text>
                           </Box>
 
-                          <Box gap="m">
-                            {positions.map((pos) => {
-                              const { lockup } = pos
-                              const lockupKind = Object.keys(
-                                lockup.kind,
-                              )[0] as string
-                              const isConstant = lockupKind === 'constant'
-                              const isSelected = selectedPosPk?.equals(
-                                pos.pubkey,
-                              )
+                          {positions.map((pos, idx) => {
+                            const { lockup } = pos
+                            const lockupKind = Object.keys(
+                              lockup.kind,
+                            )[0] as string
+                            const isConstant = lockupKind === 'constant'
+                            const isSelected = selectedPosPk?.equals(pos.pubkey)
 
-                              return (
-                                <TouchableOpacityBox
-                                  key={pos.pubkey.toString()}
-                                  flex={1}
-                                  borderRadius="l"
-                                  backgroundColor={
-                                    isSelected
-                                      ? 'secondaryBackground'
-                                      : 'secondary'
-                                  }
-                                  onPress={() => setSelectedPosPk(pos.pubkey)}
-                                >
-                                  <Box flexDirection="row" padding="ms">
-                                    <Box flex={1}>
-                                      <Text
-                                        variant="body2"
-                                        color="secondaryText"
-                                      >
-                                        {t('gov.positions.lockupType')}
-                                      </Text>
-                                      <Text variant="body2" color="primaryText">
-                                        {isConstant ? 'Constant' : 'Decaying'}
-                                      </Text>
-                                    </Box>
-                                    <Box flex={1}>
-                                      <Text
-                                        variant="body2"
-                                        color="secondaryText"
-                                        textAlign="center"
-                                      >
-                                        {t('gov.positions.voteMult')}
-                                      </Text>
-                                      <Text
-                                        variant="body2"
-                                        color="primaryText"
-                                        textAlign="center"
-                                      >
-                                        {(
-                                          (pos.votingPower.isZero()
-                                            ? 0
-                                            : // Mul by 100 to get 2 decimal places
-                                              pos.votingPower
-                                                .mul(new BN(100))
-                                                .div(pos.amountDepositedNative)
-                                                .toNumber() / 100) /
-                                          (pos.genesisEnd.gt(new BN(unixNow))
-                                            ? pos.votingMint
-                                                .genesisVotePowerMultiplier
-                                            : 1)
-                                        ).toFixed(2)}
-                                      </Text>
-                                    </Box>
-                                    <Box flex={1} alignContent="center">
-                                      <Text
-                                        variant="body2"
-                                        color="secondaryText"
-                                        textAlign="right"
-                                      >
-                                        {isConstant
-                                          ? 'Min. Duration'
-                                          : 'Time left'}
-                                      </Text>
-                                      <Text
-                                        variant="body2"
-                                        color="primaryText"
-                                        textAlign="right"
-                                      >
-                                        {isConstant
-                                          ? getMinDurationFmt(
-                                              pos.lockup.startTs,
-                                              pos.lockup.endTs,
-                                            )
-                                          : getTimeLeftFromNowFmt(
-                                              pos.lockup.endTs,
-                                            )}
-                                      </Text>
-                                    </Box>
-                                  </Box>
-                                  <Box
-                                    borderTopColor="black200"
-                                    borderTopWidth={1}
-                                    paddingVertical="s"
-                                    paddingHorizontal="ms"
-                                  >
+                            return (
+                              <TouchableOpacityBox
+                                key={pos.pubkey.toString()}
+                                marginTop={idx > 0 ? 'm' : 'none'}
+                                flex={1}
+                                borderRadius="l"
+                                backgroundColor={
+                                  isSelected
+                                    ? 'secondaryBackground'
+                                    : 'secondary'
+                                }
+                                onPress={() => setSelectedPosPk(pos.pubkey)}
+                              >
+                                <Box flexDirection="row" padding="ms">
+                                  <Box flex={1}>
+                                    <Text variant="body2" color="secondaryText">
+                                      {t('gov.positions.lockupType')}
+                                    </Text>
                                     <Text variant="body2" color="primaryText">
-                                      {t('gov.positions.lockedAmount', {
-                                        amount:
-                                          mintAcc &&
-                                          humanReadable(
-                                            new BN(pos.amountDepositedNative),
-                                            mintAcc.decimals,
-                                          ),
-                                        symbol,
-                                      })}
+                                      {isConstant ? 'Constant' : 'Decaying'}
                                     </Text>
                                   </Box>
-                                </TouchableOpacityBox>
-                              )
-                            })}
-                          </Box>
+                                  <Box flex={1}>
+                                    <Text
+                                      variant="body2"
+                                      color="secondaryText"
+                                      textAlign="center"
+                                    >
+                                      {t('gov.positions.voteMult')}
+                                    </Text>
+                                    <Text
+                                      variant="body2"
+                                      color="primaryText"
+                                      textAlign="center"
+                                    >
+                                      {(
+                                        (pos.votingPower.isZero()
+                                          ? 0
+                                          : // Mul by 100 to get 2 decimal places
+                                            pos.votingPower
+                                              .mul(new BN(100))
+                                              .div(pos.amountDepositedNative)
+                                              .toNumber() / 100) /
+                                        (pos.genesisEnd.gt(new BN(unixNow))
+                                          ? pos.votingMint
+                                              .genesisVotePowerMultiplier
+                                          : 1)
+                                      ).toFixed(2)}
+                                    </Text>
+                                  </Box>
+                                  <Box flex={1} alignContent="center">
+                                    <Text
+                                      variant="body2"
+                                      color="secondaryText"
+                                      textAlign="right"
+                                    >
+                                      {isConstant
+                                        ? 'Min. Duration'
+                                        : 'Time left'}
+                                    </Text>
+                                    <Text
+                                      variant="body2"
+                                      color="primaryText"
+                                      textAlign="right"
+                                    >
+                                      {isConstant
+                                        ? getMinDurationFmt(
+                                            pos.lockup.startTs,
+                                            pos.lockup.endTs,
+                                          )
+                                        : getTimeLeftFromNowFmt(
+                                            pos.lockup.endTs,
+                                          )}
+                                    </Text>
+                                  </Box>
+                                </Box>
+                                <Box
+                                  borderTopColor="black200"
+                                  borderTopWidth={1}
+                                  paddingVertical="s"
+                                  paddingHorizontal="ms"
+                                >
+                                  <Text variant="body2" color="primaryText">
+                                    {t('gov.positions.lockedAmount', {
+                                      amount:
+                                        mintAcc &&
+                                        humanReadable(
+                                          new BN(pos.amountDepositedNative),
+                                          mintAcc.decimals,
+                                        ),
+                                      symbol,
+                                    })}
+                                  </Text>
+                                </Box>
+                              </TouchableOpacityBox>
+                            )
+                          })}
                         </>
                       )}
                     </Box>
diff --git a/src/features/governance/VoteOption.tsx b/src/features/governance/VoteOption.tsx
index fdff94d8f..8edebdf33 100644
--- a/src/features/governance/VoteOption.tsx
+++ b/src/features/governance/VoteOption.tsx
@@ -5,7 +5,8 @@ import React from 'react'
 import Box from '@components/Box'
 import CircleLoader from '@components/CircleLoader'
 import { useColors } from '@theme/themeHooks'
-import { Color } from '@theme/theme'
+import { Color, Theme } from '@theme/theme'
+import { BoxProps } from '@shopify/restyle'
 import { VoteChoiceWithMeta, VotingResultColors } from './governanceTypes'
 
 export const VoteOption = ({
@@ -16,6 +17,7 @@ export const VoteOption = ({
   voting,
   onVote,
   onRelinquishVote,
+  ...boxProps
 }: {
   option: VoteChoiceWithMeta
   myWeight?: BN
@@ -24,17 +26,17 @@ export const VoteOption = ({
   voting: boolean
   onVote?: () => Promise<void>
   onRelinquishVote?: () => Promise<void>
-}) => {
+} & BoxProps<Theme>) => {
   const colors = useColors()
 
   return (
     <TouchableOpacityBox
       flexGrow={1}
       flexDirection="row"
-      gap="ms"
       padding="ms"
       borderRadius="m"
       backgroundColor="surfaceSecondary"
+      {...boxProps}
       onPress={
         // eslint-disable-next-line no-nested-ternary
         canVote ? onVote : canRelinquishVote ? onRelinquishVote : undefined
@@ -45,6 +47,7 @@ export const VoteOption = ({
           width={20}
           height={20}
           borderRadius="round"
+          marginRight="ms"
           borderWidth={2}
           borderColor={VotingResultColors[option.index]}
           backgroundColor={
@@ -52,7 +55,7 @@ export const VoteOption = ({
           }
         />
       ) : (
-        <Box>
+        <Box marginRight="ms">
           <CircleLoader
             color={colors[VotingResultColors[option.index]] as Color}
             loaderSize={20}
diff --git a/src/theme/theme.ts b/src/theme/theme.ts
index c443ac1e5..0f499a8a9 100644
--- a/src/theme/theme.ts
+++ b/src/theme/theme.ts
@@ -10,9 +10,6 @@ export const Font = {
 }
 
 const textVariants = {
-  defaults: {
-    color: 'primaryText',
-  },
   h0: {
     fontFamily: Font.regular,
     fontSize: 42,
diff --git a/yarn.lock b/yarn.lock
index 4b744fc8d..04b56bc97 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4088,10 +4088,10 @@
     component-type "^1.2.1"
     join-component "^1.1.0"
 
-"@shopify/restyle@^2.4.2":
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/@shopify/restyle/-/restyle-2.4.2.tgz#bffb5cec619d6ea61e1fab1ec40dec9482946460"
-  integrity sha512-r01j9bbXkhZZkGkLnE6jsJvSCkcjwXBySfe8bQCB7duEfQn36mU6WumNc2pndzXpZhPSevppyXzFZ2jY3XUakw==
+"@shopify/restyle@1.8.0":
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/@shopify/restyle/-/restyle-1.8.0.tgz#77451232f88124aad03b54c9e3a222e7f604b886"
+  integrity sha512-p1MB7+R54eYNFe76kEmStxyW0Jm6bKOR70fv+VwVpYw2040Y1+IaL6Xwa7mlUg2X5CngwW+OxZytXDd5QcZOIQ==
 
 "@sideway/address@^4.1.3":
   version "4.1.4"