diff --git a/.changeset/cool-pans-lie.md b/.changeset/cool-pans-lie.md
new file mode 100644
index 0000000000..c5b298fd85
--- /dev/null
+++ b/.changeset/cool-pans-lie.md
@@ -0,0 +1,5 @@
+---
+'@graphcommerce/magento-store': minor
+---
+
+Added support for multiple display currencies in the frontend. Multiple currencies were already supported, but this introduces Display Currencies for viewing the cart in different currencies.
diff --git a/.changeset/lemon-ads-rescue.md b/.changeset/lemon-ads-rescue.md
new file mode 100644
index 0000000000..97b8fd8936
--- /dev/null
+++ b/.changeset/lemon-ads-rescue.md
@@ -0,0 +1,5 @@
+---
+'@graphcommerce/magento-store': minor
+---
+
+Refactored the Store Selector to be more of a form and have multiple nested toggles to switch groups, then stores and then currencies. It automatically hides features that aren't used: If only a single group is used with multiple stores only the store selector is shown. If multiple groups are used with each a single store is used, only the group selector is shown. If only a single currency is used, there is no currency selector. If multiple currencies are used, the currency selector is shown. This makes the selector more user-friendly and less cluttered.
diff --git a/docs/roadmap.md b/docs/roadmap.md
index 3075ccdff3..5bdfc4e8ff 100644
--- a/docs/roadmap.md
+++ b/docs/roadmap.md
@@ -17,6 +17,7 @@ roadmap.
 - [x] Adobe Commerce: Store credit functionality
 - [x] Adobe Commerce: Gift card functionality
 - [ ] Adobe Commerce: Content staging functionality in preview mode.
+- [ ] Custom options pricing on product page
 - [ ] Storelocator UI. Generic Store Locator UI to allow for any datasource to
       be used. Integrate with Magento's pickupLocations functionality.
 - [ ] Store inventory on product pages UI and Magento's pickupLocations
@@ -30,6 +31,11 @@ roadmap.
       GraphCommerce integration.
 - [ ] GraphCommerce Pro: Cache Notifier module + GraphCommerce Integration to
       revalidate the frontend on backend changes.
+- [ ] GraphCommerce: Video support
+- [ ] GraphCommerce: Product List Gallery
+- [ ] GraphCommerce: Product List Configurable Image Toggle
+- [x] Magento: Implement currency query and switch frontend to different
+      currency with usePrivateQuery
 
 ## Researching / Considering
 
@@ -69,6 +75,13 @@ roadmap.
       integration)
 - [ ] GraphCommerce Pro: Shop in shop functionality
 - [ ] GraphCommerce POS: Create a light POS integration for GraphCommerce
+- [ ] Magento customerDownloadableProducts
+- [ ] Magento: customerPaymentTokens + deletePaymentToken
+- [ ] Magento: customerDownloadableProducts
+- [ ] Magento 2.4.7: recaptchaV3Config
+- [ ] Magento: downloadable products
+- [ ] Magento: Migrate to createCustomerV2
+- [ ] Magento 2.4.7: createGuestCart migration
 
 ## Released
 
diff --git a/examples/magento-graphcms/pages/switch-stores.tsx b/examples/magento-graphcms/pages/switch-stores.tsx
index 8d735e50be..1b02dec290 100644
--- a/examples/magento-graphcms/pages/switch-stores.tsx
+++ b/examples/magento-graphcms/pages/switch-stores.tsx
@@ -1,53 +1,92 @@
-import { PageOptions } from '@graphcommerce/framer-next-pages'
+import { PageOptions, usePrevPageRouter } from '@graphcommerce/framer-next-pages'
 import {
   PageMeta,
   StoreConfigDocument,
-  StoreSwitcherList,
+  StoreSwitcherApplyButton,
+  StoreSwitcherCurrencySelector,
+  StoreSwitcherFormProvider,
+  StoreSwitcherGroupSelector,
+  StoreSwitcherLinkOrButton,
   StoreSwitcherListDocument,
   StoreSwitcherListQuery,
+  StoreSwitcherStoreSelector,
+  storeToLocale,
 } from '@graphcommerce/magento-store'
 import {
+  FormActions,
   GetStaticProps,
   iconLanguage,
   LayoutOverlayHeader,
   LayoutTitle,
+  OverlayStickyBottom,
+  SectionHeader,
 } from '@graphcommerce/next-ui'
 import { i18n } from '@lingui/core'
 import { Trans } from '@lingui/react'
 import { Container } from '@mui/material'
-import { useRouter } from 'next/router'
-import { LayoutOverlay, LayoutOverlayProps } from '../components'
+import { LayoutDocument, LayoutOverlay, LayoutOverlayProps } from '../components'
 import { graphqlSsrClient, graphqlSharedClient } from '../lib/graphql/graphqlSsrClient'
+import { useRouter } from 'next/router'
 
 type RouteProps = { country?: string[] }
 type Props = StoreSwitcherListQuery
 type GetPageStaticProps = GetStaticProps<LayoutOverlayProps, Props, RouteProps>
 
 function StoresIndexPage({ availableStores }: Props) {
-  const { locale } = useRouter()
+  const prev = usePrevPageRouter()
+  const router = useRouter()
 
   return (
-    <>
+    <StoreSwitcherFormProvider
+      availableStores={availableStores}
+      onSubmit={async (data) => {
+        await router.push(prev?.asPath ?? '/', undefined, {
+          locale: storeToLocale(data.storeCode),
+          scroll: false,
+        })
+      }}
+    >
       <PageMeta title={i18n._(/* i18n */ 'Switch stores')} metaRobots={['noindex']} />
-      <LayoutOverlayHeader>
+      <LayoutOverlayHeader
+        primary={
+          <StoreSwitcherLinkOrButton color='secondary' button={{ variant: 'pill' }}>
+            <Trans id='Switch' />
+          </StoreSwitcherLinkOrButton>
+        }
+      >
         <LayoutTitle size='small' component='span' icon={iconLanguage}>
-          <Trans id='Country' />
+          <Trans id='Switch Stores' />
         </LayoutTitle>
       </LayoutOverlayHeader>
-      <Container maxWidth='md'>
+      <Container maxWidth='sm' sx={(theme) => ({ mb: theme.spacings.lg })}>
         <LayoutTitle icon={iconLanguage}>
-          <Trans id='Country' />
+          <Trans id='Switch Stores' />
         </LayoutTitle>
-        <StoreSwitcherList availableStores={availableStores} locale={locale} />
+        <StoreSwitcherGroupSelector
+          // header={<SectionHeader labelLeft='Country' />}
+          showStores={1}
+          showCurrencies={1}
+        />
+        <StoreSwitcherStoreSelector
+          header={<SectionHeader labelLeft='Store' />}
+          showCurrencies={1}
+        />
+        <StoreSwitcherCurrencySelector header={<SectionHeader labelLeft='Currency' />} />
+
+        <FormActions>
+          <StoreSwitcherApplyButton color='secondary' variant='pill' size='large'>
+            <Trans id='Switch' />
+          </StoreSwitcherApplyButton>
+        </FormActions>
       </Container>
-    </>
+    </StoreSwitcherFormProvider>
   )
 }
 
 const pageOptions: PageOptions<LayoutOverlayProps> = {
   overlayGroup: 'left',
   Layout: LayoutOverlay,
-  layoutProps: { variantMd: 'left' },
+  layoutProps: { variantMd: 'right', sizeMd: 'floating', justifyMd: 'start' },
 }
 StoresIndexPage.pageOptions = pageOptions
 
@@ -56,13 +95,14 @@ export default StoresIndexPage
 export const getStaticProps: GetPageStaticProps = async (context) => {
   const client = graphqlSharedClient(context)
   const staticClient = graphqlSsrClient(context)
-
   const conf = client.query({ query: StoreConfigDocument })
+  const layout = staticClient.query({ query: LayoutDocument })
   const stores = staticClient.query({ query: StoreSwitcherListDocument })
 
   return {
     props: {
       ...(await stores).data,
+      ...(await layout).data,
       apolloState: await conf.then(() => client.cache.extract()),
     },
   }
diff --git a/examples/magento-open-source/pages/switch-stores.tsx b/examples/magento-open-source/pages/switch-stores.tsx
index 56c416f237..f7515dcd41 100644
--- a/examples/magento-open-source/pages/switch-stores.tsx
+++ b/examples/magento-open-source/pages/switch-stores.tsx
@@ -1,51 +1,94 @@
-import type { PageOptions } from '@graphcommerce/framer-next-pages'
+import { usePrevPageRouter, type PageOptions } from '@graphcommerce/framer-next-pages'
 import type { StoreSwitcherListQuery } from '@graphcommerce/magento-store'
 import {
   PageMeta,
   StoreConfigDocument,
-  StoreSwitcherList,
+  StoreSwitcherApplyButton,
+  StoreSwitcherCurrencySelector,
+  StoreSwitcherFormProvider,
+  StoreSwitcherGroupSelector,
+  StoreSwitcherLinkOrButton,
   StoreSwitcherListDocument,
+  StoreSwitcherStoreSelector,
+  storeToLocale,
 } from '@graphcommerce/magento-store'
 import type { GetStaticProps } from '@graphcommerce/next-ui'
-import { iconLanguage, LayoutOverlayHeader, LayoutTitle } from '@graphcommerce/next-ui'
+import {
+  FormActions,
+  iconLanguage,
+  LayoutOverlayHeader,
+  LayoutTitle,
+  OverlayStickyBottom,
+  SectionHeader,
+} from '@graphcommerce/next-ui'
 import { i18n } from '@lingui/core'
 import { Trans } from '@lingui/react'
 import { Container } from '@mui/material'
 import { useRouter } from 'next/router'
 import type { LayoutOverlayProps } from '../components'
-import { LayoutOverlay } from '../components'
+import { LayoutDocument, LayoutOverlay } from '../components'
 import { graphqlSharedClient, graphqlSsrClient } from '../lib/graphql/graphqlSsrClient'
 
-type RouteProps = { country?: string[] }
+type RouteProps = Record<string, unknown>
 type Props = StoreSwitcherListQuery
 type GetPageStaticProps = GetStaticProps<LayoutOverlayProps, Props, RouteProps>
 
 function StoresIndexPage({ availableStores }: Props) {
-  const { locale } = useRouter()
+  const prev = usePrevPageRouter()
+  const router = useRouter()
 
   return (
-    <>
+    <StoreSwitcherFormProvider
+      availableStores={availableStores}
+      onSubmit={async (data) => {
+        await router.push(prev?.asPath ?? '/', undefined, {
+          locale: storeToLocale(data.storeCode),
+          scroll: false,
+        })
+      }}
+    >
       <PageMeta title={i18n._(/* i18n */ 'Switch stores')} metaRobots={['noindex']} />
-      <LayoutOverlayHeader>
+      <LayoutOverlayHeader
+        primary={
+          <StoreSwitcherLinkOrButton color='secondary' button={{ variant: 'pill' }}>
+            <Trans id='Switch' />
+          </StoreSwitcherLinkOrButton>
+        }
+      >
         <LayoutTitle size='small' component='span' icon={iconLanguage}>
-          <Trans id='Country' />
+          <Trans id='Switch Stores' />
         </LayoutTitle>
       </LayoutOverlayHeader>
-      <Container maxWidth='md'>
+      <Container maxWidth='sm' sx={(theme) => ({ mb: theme.spacings.lg })}>
         <LayoutTitle icon={iconLanguage}>
-          <Trans id='Country' />
+          <Trans id='Switch Stores' />
         </LayoutTitle>
-        <StoreSwitcherList availableStores={availableStores} locale={locale} />
+        <StoreSwitcherGroupSelector
+          // header={<SectionHeader labelLeft='Country' />}
+          showStores={1}
+          showCurrencies={1}
+        />
+        <StoreSwitcherStoreSelector
+          header={<SectionHeader labelLeft='Store' />}
+          showCurrencies={1}
+        />
+        <StoreSwitcherCurrencySelector header={<SectionHeader labelLeft='Currency' />} />
+        <FormActions>
+          <StoreSwitcherApplyButton color='secondary' variant='pill' size='large'>
+            <Trans id='Switch' />
+          </StoreSwitcherApplyButton>
+        </FormActions>
       </Container>
-    </>
+    </StoreSwitcherFormProvider>
   )
 }
 
 const pageOptions: PageOptions<LayoutOverlayProps> = {
   overlayGroup: 'left',
   Layout: LayoutOverlay,
-  layoutProps: { variantMd: 'left' },
+  layoutProps: { variantMd: 'right', sizeMd: 'floating', justifyMd: 'start' },
 }
+
 StoresIndexPage.pageOptions = pageOptions
 
 export default StoresIndexPage
@@ -53,13 +96,14 @@ export default StoresIndexPage
 export const getStaticProps: GetPageStaticProps = async (context) => {
   const client = graphqlSharedClient(context)
   const staticClient = graphqlSsrClient(context)
-
   const conf = client.query({ query: StoreConfigDocument })
+  const layout = staticClient.query({ query: LayoutDocument })
   const stores = staticClient.query({ query: StoreSwitcherListDocument })
 
   return {
     props: {
       ...(await stores).data,
+      ...(await layout).data,
       apolloState: await conf.then(() => client.cache.extract()),
     },
   }
diff --git a/packages/graphql-mesh/index.ts b/packages/graphql-mesh/index.ts
index 2b36f9aa37..7b3fe6116a 100644
--- a/packages/graphql-mesh/index.ts
+++ b/packages/graphql-mesh/index.ts
@@ -5,3 +5,4 @@ export * from './.mesh'
 // @ts-expect-error getBuiltMesh and createBuiltMeshHTTPHandler are re-exported here and override the export from .mesh
 export * from './api/globalThisMesh'
 export * from './utils/traverseSelectionSet'
+export * from './utils/storefrontFromContext'
diff --git a/packages/graphql-mesh/utils/storefrontFromContext.ts b/packages/graphql-mesh/utils/storefrontFromContext.ts
new file mode 100644
index 0000000000..a1c8ed57c1
--- /dev/null
+++ b/packages/graphql-mesh/utils/storefrontFromContext.ts
@@ -0,0 +1,10 @@
+import type { GraphCommerceStorefrontConfig } from '@graphcommerce/next-config'
+import type { MeshContext } from '@graphql-mesh/runtime'
+
+export function storefrontFromContext(
+  context: MeshContext & { headers?: Record<string, string> },
+): GraphCommerceStorefrontConfig | undefined {
+  const storefrontAll = import.meta.graphCommerce.storefront
+  const store = context.headers?.store
+  return storefrontAll.find((s) => s.magentoStoreCode === store)
+}
diff --git a/packages/graphql/components/GraphQLProvider/persistenceMapper.ts b/packages/graphql/components/GraphQLProvider/persistenceMapper.ts
index a02ccd4d98..d3cea10683 100644
--- a/packages/graphql/components/GraphQLProvider/persistenceMapper.ts
+++ b/packages/graphql/components/GraphQLProvider/persistenceMapper.ts
@@ -33,7 +33,9 @@ export const persistenceMapper = (data: string): Promise<string> => {
     'ROOT_QUERY.countries',
     'ROOT_QUERY.checkoutAgreements',
     'ROOT_QUERY.storeConfig',
+    'ROOT_QUERY.currency',
     'ROOT_QUERY.guestOrder',
+    'ROOT_QUERY.cmsBlocks',
     'ROOT_QUERY.__type*',
     '*Product:{"uid":"*"}.crosssell_products',
     'ROOT_QUERY.recaptchaV3Config',
diff --git a/packages/magento-store/README.md b/packages/magento-store/README.md
new file mode 100644
index 0000000000..b2dc970051
--- /dev/null
+++ b/packages/magento-store/README.md
@@ -0,0 +1,8 @@
+# @graphcommerce/magento-store
+
+## Store Switcher
+
+![](./docs/store-switcher-single-group-multiple-stores-single-currency.png)
+![](./docs/store-switcher-single-group-multiple-stores-multiple-currencies.png)
+![](./docs/store-switcher-multiple-groups-one-store-single-currency.png)
+![](./docs/store-switcher-multiple-groups-one-store-multiple-currency.png)
diff --git a/packages/magento-store/StoreConfig.graphql b/packages/magento-store/StoreConfig.graphql
deleted file mode 100644
index 5157adf8ae..0000000000
--- a/packages/magento-store/StoreConfig.graphql
+++ /dev/null
@@ -1,5 +0,0 @@
-query StoreConfig {
-  storeConfig {
-    ...StoreConfigFragment
-  }
-}
diff --git a/packages/magento-store/components/CurrencySymbol/CurrencySymbol.tsx b/packages/magento-store/components/CurrencySymbol/CurrencySymbol.tsx
index 009581be1e..b7aa33dac0 100644
--- a/packages/magento-store/components/CurrencySymbol/CurrencySymbol.tsx
+++ b/packages/magento-store/components/CurrencySymbol/CurrencySymbol.tsx
@@ -3,10 +3,11 @@ import {
   CurrencySymbol as CurrencySymbolBase,
   type CurrencySymbolProps,
 } from '@graphcommerce/next-ui'
-import { StoreConfigDocument } from '../../StoreConfig.gql'
+import { StoreConfigDocument } from '../../queries/StoreConfig.gql'
 
 export function CurrencySymbol(props: CurrencySymbolProps) {
+  const { currency } = props
   const baseCurrencyCode = useQuery(StoreConfigDocument).data?.storeConfig?.base_currency_code ?? ''
 
-  return <CurrencySymbolBase {...props} currency={baseCurrencyCode} />
+  return <CurrencySymbolBase {...props} currency={currency || baseCurrencyCode} />
 }
diff --git a/packages/magento-store/components/GlobalHead/GlobalHead.tsx b/packages/magento-store/components/GlobalHead/GlobalHead.tsx
index de5763483f..26245115cb 100644
--- a/packages/magento-store/components/GlobalHead/GlobalHead.tsx
+++ b/packages/magento-store/components/GlobalHead/GlobalHead.tsx
@@ -1,7 +1,7 @@
 import { useQuery } from '@graphcommerce/graphql'
 import type { GlobalHeadProps as GlobalHeadPropsBase } from '@graphcommerce/next-ui'
 import { GlobalHead as GlobalHeadBase } from '@graphcommerce/next-ui'
-import { StoreConfigDocument } from '../../StoreConfig.gql'
+import { StoreConfigDocument } from '../../queries/StoreConfig.gql'
 
 export type GlobalHeadProps = Omit<GlobalHeadPropsBase, 'name'>
 
diff --git a/packages/magento-store/Money.graphql b/packages/magento-store/components/Money/Money.graphql
similarity index 100%
rename from packages/magento-store/Money.graphql
rename to packages/magento-store/components/Money/Money.graphql
diff --git a/packages/magento-store/Money.tsx b/packages/magento-store/components/Money/Money.tsx
similarity index 94%
rename from packages/magento-store/Money.tsx
rename to packages/magento-store/components/Money/Money.tsx
index 5f040a6f89..e2644edc7a 100644
--- a/packages/magento-store/Money.tsx
+++ b/packages/magento-store/components/Money/Money.tsx
@@ -2,8 +2,8 @@ import { useQuery } from '@graphcommerce/graphql'
 import type { CurrencyFormatProps } from '@graphcommerce/next-ui'
 import { CurrencyFormat } from '@graphcommerce/next-ui'
 import type { SxProps, Theme } from '@mui/material'
+import { StoreConfigDocument } from '../../queries/StoreConfig.gql'
 import type { MoneyFragment } from './Money.gql'
-import { StoreConfigDocument } from './StoreConfig.gql'
 
 type OverridableProps = {
   round?: boolean
diff --git a/packages/magento-store/PageMeta.tsx b/packages/magento-store/components/PageMeta/PageMeta.tsx
similarity index 93%
rename from packages/magento-store/PageMeta.tsx
rename to packages/magento-store/components/PageMeta/PageMeta.tsx
index 4edf72fd87..16491272b2 100644
--- a/packages/magento-store/PageMeta.tsx
+++ b/packages/magento-store/components/PageMeta/PageMeta.tsx
@@ -1,7 +1,7 @@
 import { useQuery } from '@graphcommerce/graphql'
 import type { PageMetaProps as NextPageMetaProps } from '@graphcommerce/next-ui'
 import { PageMeta as NextPageMeta } from '@graphcommerce/next-ui'
-import { StoreConfigDocument } from './StoreConfig.gql'
+import { StoreConfigDocument } from '../../queries/StoreConfig.gql'
 
 export type PageMetaProps = Omit<NextPageMetaProps, 'canonical'> & {
   canonical?: string
diff --git a/packages/magento-store/components/StoreSwitcher/StoreSwitcherApply.tsx b/packages/magento-store/components/StoreSwitcher/StoreSwitcherApply.tsx
new file mode 100644
index 0000000000..736d7ed3de
--- /dev/null
+++ b/packages/magento-store/components/StoreSwitcher/StoreSwitcherApply.tsx
@@ -0,0 +1,16 @@
+import { useFormState } from '@graphcommerce/ecommerce-ui'
+import type { ButtonProps, LinkOrButtonProps } from '@graphcommerce/next-ui'
+import { Button, LinkOrButton } from '@graphcommerce/next-ui'
+import { useStoreSwitcherForm } from './useStoreSwitcher'
+
+export function StoreSwitcherApplyButton(props: ButtonProps<'button'>) {
+  const { control } = useStoreSwitcherForm()
+  const formState = useFormState({ control })
+  return <Button type='submit' loading={formState.isSubmitting} {...props} />
+}
+
+export function StoreSwitcherLinkOrButton(props: LinkOrButtonProps) {
+  const { control } = useStoreSwitcherForm()
+  const formState = useFormState({ control })
+  return <LinkOrButton type='submit' loading={formState.isSubmitting} {...props} />
+}
diff --git a/packages/magento-store/components/StoreSwitcher/StoreSwitcherCurrencySelector.tsx b/packages/magento-store/components/StoreSwitcher/StoreSwitcherCurrencySelector.tsx
new file mode 100644
index 0000000000..48f829575b
--- /dev/null
+++ b/packages/magento-store/components/StoreSwitcher/StoreSwitcherCurrencySelector.tsx
@@ -0,0 +1,54 @@
+import type { ActionCardListFormProps } from '@graphcommerce/ecommerce-ui'
+import { ActionCardListForm, useWatch } from '@graphcommerce/ecommerce-ui'
+import { useIsomorphicLayoutEffect } from '@graphcommerce/framer-utils'
+import type { ActionCardProps } from '@graphcommerce/next-ui'
+import { ActionCard, CurrencySymbol, nonNullable, sxx } from '@graphcommerce/next-ui'
+import type { StoreSwitcherFormValues } from './useStoreSwitcher'
+import { useSelectedStore, useStoreSwitcherForm } from './useStoreSwitcher'
+
+export type StoreSwitcherCurrencySelectorProps = {
+  header?: React.ReactNode
+} & Omit<
+  ActionCardListFormProps<ActionCardProps, StoreSwitcherFormValues>,
+  'name' | 'control' | 'items' | 'required' | 'render'
+>
+
+export function StoreSwitcherCurrencySelector(props: StoreSwitcherCurrencySelectorProps) {
+  const { header, ...actionCardList } = props
+  const { control } = useStoreSwitcherForm()
+  const store = useSelectedStore()
+
+  const currencies = store?.currency?.available_currency_codes?.filter(nonNullable) ?? []
+  const defaultValue = store?.currency?.default_display_currency_code ?? currencies?.[0] ?? ''
+
+  // Make sure the default currency is the first in the list
+  currencies.sort((a, b) => {
+    if (a === defaultValue) return -1
+    if (b === defaultValue) return 1
+    return 0
+  })
+
+  const hidden = currencies.length === 1
+
+  return (
+    <>
+      {!hidden && header}
+      <ActionCardListForm<ActionCardProps, StoreSwitcherFormValues>
+        control={control}
+        defaultValue={defaultValue}
+        name='currency'
+        layout='stack'
+        size='responsive'
+        required
+        color='secondary'
+        render={ActionCard}
+        sx={sxx(hidden && { display: 'none !important' })}
+        items={currencies.map((currency) => ({
+          value: currency,
+          title: <CurrencySymbol currency={currency} variant='full' />,
+        }))}
+        {...actionCardList}
+      />
+    </>
+  )
+}
diff --git a/packages/magento-store/components/StoreSwitcher/StoreSwitcherGroupSelector.tsx b/packages/magento-store/components/StoreSwitcher/StoreSwitcherGroupSelector.tsx
new file mode 100644
index 0000000000..5fedcd4148
--- /dev/null
+++ b/packages/magento-store/components/StoreSwitcher/StoreSwitcherGroupSelector.tsx
@@ -0,0 +1,74 @@
+import type { ActionCardListFormProps } from '@graphcommerce/ecommerce-ui'
+import { ActionCardListForm } from '@graphcommerce/ecommerce-ui'
+import type { ActionCardProps } from '@graphcommerce/next-ui'
+import { ActionCard, FlagAvatar, ListFormat, sxx } from '@graphcommerce/next-ui'
+import React from 'react'
+import type { StoreSwitcherStoreCurrenciesProps } from './StoreSwitcherStoreCurrencies'
+import { StoreSwitcherStoreCurrencies } from './StoreSwitcherStoreCurrencies'
+import type { StoreSwitcherFormValues, StoreSwitcherGroup } from './useStoreSwitcher'
+import { useStoreSwitcherForm } from './useStoreSwitcher'
+
+export type StoreSwitcherGroupSelectorProps = {
+  header?: React.ReactNode
+  showStores?: number
+} & Omit<StoreSwitcherStoreCurrenciesProps, 'store'> &
+  Omit<
+    ActionCardListFormProps<
+      ActionCardProps & { group?: StoreSwitcherGroup },
+      StoreSwitcherFormValues
+    >,
+    'name' | 'control' | 'items' | 'required' | 'render'
+  >
+
+export function StoreSwitcherGroupSelector(props: StoreSwitcherGroupSelectorProps) {
+  const { header, showStores = 0, showCurrencies, ...actionCardList } = props
+  const { control, storeGroups } = useStoreSwitcherForm()
+
+  const hidden = storeGroups.length === 1 && storeGroups[0].stores.length > 1
+
+  return (
+    <>
+      {!hidden && header}
+      <ActionCardListForm<ActionCardProps, StoreSwitcherFormValues>
+        control={control}
+        name='storeGroupCode'
+        layout='stack'
+        size='responsive'
+        required
+        color='secondary'
+        render={ActionCard}
+        sx={sxx(hidden && { display: 'none !important' })}
+        items={storeGroups.map((group) => ({
+          group,
+          image: group.country ? <FlagAvatar country={group.country} size='40px' /> : undefined,
+          title: <>{group.store_group_name}</>,
+          details: showStores && (
+            <>
+              {group.stores.length <= showStores && (
+                <ListFormat listStyle='short' type='unit'>
+                  {group.stores.map((store) => (
+                    <React.Fragment key={store.store_code}>
+                      {store.store_name}
+                      <StoreSwitcherStoreCurrencies
+                        store={store}
+                        showCurrencies={group.stores.length > 1 ? 0 : showCurrencies}
+                        brackets
+                      />
+                    </React.Fragment>
+                  ))}
+                </ListFormat>
+              )}
+            </>
+          ),
+          disabled: group.disabled,
+          value: group.store_group_code,
+          slotProps: {
+            title: { sx: { typography: 'subtitle1' } },
+            details: { sx: { typography: 'body1', color: 'text.secondary' } },
+          },
+        }))}
+        {...actionCardList}
+      />
+    </>
+  )
+}
diff --git a/packages/magento-store/components/StoreSwitcher/StoreSwitcherList.graphql b/packages/magento-store/components/StoreSwitcher/StoreSwitcherList.graphql
new file mode 100644
index 0000000000..ba9f4c6ab1
--- /dev/null
+++ b/packages/magento-store/components/StoreSwitcher/StoreSwitcherList.graphql
@@ -0,0 +1,21 @@
+query StoreSwitcherList {
+  availableStores {
+    store_name
+    store_code
+    locale
+    base_currency_code
+    store_group_name
+    store_group_code
+    currency {
+      available_currency_codes
+      base_currency_code
+      base_currency_symbol
+      default_display_currency_code
+      default_display_currency_symbol
+      exchange_rates {
+        currency_to
+        rate
+      }
+    }
+  }
+}
diff --git a/packages/magento-store/components/StoreSwitcherList/StoreSwitcherList.tsx b/packages/magento-store/components/StoreSwitcher/StoreSwitcherList.tsx
similarity index 98%
rename from packages/magento-store/components/StoreSwitcherList/StoreSwitcherList.tsx
rename to packages/magento-store/components/StoreSwitcher/StoreSwitcherList.tsx
index c54abffe45..2dba7b940a 100644
--- a/packages/magento-store/components/StoreSwitcherList/StoreSwitcherList.tsx
+++ b/packages/magento-store/components/StoreSwitcher/StoreSwitcherList.tsx
@@ -3,7 +3,7 @@ import { extendableComponent, FlagAvatar, NextLink } from '@graphcommerce/next-u
 import type { SxProps, Theme } from '@mui/material'
 import { Collapse, List, ListItemAvatar, ListItemButton, ListItemText } from '@mui/material'
 import React from 'react'
-import { localeToStore, storeToLocale } from '../../localeToStore'
+import { localeToStore, storeToLocale } from '../../utils/localeToStore'
 import type { StoreSwitcherListQuery } from './StoreSwitcherList.gql'
 
 type Store = NonNullable<NonNullable<StoreSwitcherListQuery['availableStores']>[0]>
diff --git a/packages/magento-store/components/StoreSwitcher/StoreSwitcherStoreCurrencies.tsx b/packages/magento-store/components/StoreSwitcher/StoreSwitcherStoreCurrencies.tsx
new file mode 100644
index 0000000000..57657a0f7a
--- /dev/null
+++ b/packages/magento-store/components/StoreSwitcher/StoreSwitcherStoreCurrencies.tsx
@@ -0,0 +1,34 @@
+import type { CurrencySymbolProps } from '@graphcommerce/next-ui'
+import { CurrencySymbol, ListFormat, nonNullable } from '@graphcommerce/next-ui'
+import type { StoreSwitcherStore } from './useStoreSwitcher'
+
+export type StoreSwitcherStoreCurrenciesProps = {
+  showCurrencies?: number
+  store: StoreSwitcherStore
+  brackets?: boolean
+  variant?: CurrencySymbolProps['variant']
+}
+
+export function StoreSwitcherStoreCurrencies(props: StoreSwitcherStoreCurrenciesProps) {
+  const { store, showCurrencies = 0, brackets = false, variant } = props
+
+  const currencies = (store.currency?.available_currency_codes ?? [])?.filter(nonNullable)
+
+  const show = currencies.length <= showCurrencies
+  const list = (
+    <ListFormat listStyle='short' type='unit'>
+      {currencies.map((currency) => (
+        <CurrencySymbol
+          key={currency}
+          compactDisplay='short'
+          variant={variant}
+          currency={currency}
+        />
+      ))}
+    </ListFormat>
+  )
+
+  if (!show) return null
+  if (!brackets) return list
+  return <> ({list})</>
+}
diff --git a/packages/magento-store/components/StoreSwitcher/StoreSwitcherStoreSelector.tsx b/packages/magento-store/components/StoreSwitcher/StoreSwitcherStoreSelector.tsx
new file mode 100644
index 0000000000..0189167803
--- /dev/null
+++ b/packages/magento-store/components/StoreSwitcher/StoreSwitcherStoreSelector.tsx
@@ -0,0 +1,64 @@
+import type { ActionCardListFormProps } from '@graphcommerce/ecommerce-ui'
+import { ActionCardListForm } from '@graphcommerce/ecommerce-ui'
+import type { ActionCardProps } from '@graphcommerce/next-ui'
+import { ActionCard, sxx } from '@graphcommerce/next-ui'
+import type { StoreSwitcherStoreCurrenciesProps } from './StoreSwitcherStoreCurrencies'
+import { StoreSwitcherStoreCurrencies } from './StoreSwitcherStoreCurrencies'
+import type { StoreSwitcherFormValues, StoreSwitcherStore } from './useStoreSwitcher'
+import { useSelectedStoreGroup, useStoreSwitcherForm } from './useStoreSwitcher'
+
+export type StoreSwitcherSelectorProps = { header?: React.ReactNode } & Omit<
+  StoreSwitcherStoreCurrenciesProps,
+  'store'
+> &
+  Omit<
+    ActionCardListFormProps<
+      ActionCardProps & { store?: StoreSwitcherStore },
+      StoreSwitcherFormValues
+    >,
+    'name' | 'control' | 'items' | 'required' | 'render'
+  >
+
+export function StoreSwitcherStoreSelector(props: StoreSwitcherSelectorProps) {
+  const { header, showCurrencies, ...actionCardProps } = props
+  const { control } = useStoreSwitcherForm()
+  const selectedGroup = useSelectedStoreGroup()
+
+  const hidden = selectedGroup?.stores.length === 1
+
+  return (
+    <>
+      {!hidden && header}
+      <ActionCardListForm<ActionCardProps, StoreSwitcherFormValues>
+        control={control}
+        defaultValue={selectedGroup?.stores?.[0].store_code ?? undefined}
+        shouldUnregister
+        name='storeCode'
+        layout='stack'
+        size='responsive'
+        required
+        render={ActionCard}
+        color='secondary'
+        sx={sxx(hidden && { display: 'none !important' })}
+        items={(selectedGroup?.stores ?? []).map((store) => ({
+          store,
+          title: store.store_name,
+          details: (
+            <StoreSwitcherStoreCurrencies
+              store={store}
+              showCurrencies={showCurrencies}
+              variant='full'
+            />
+          ),
+          value: store.store_code,
+          disabled: store.disabled,
+          slotProps: {
+            title: { sx: { typography: 'subtitle1' } },
+            details: { sx: { typography: 'body1', color: 'text.secondary' } },
+          },
+        }))}
+        {...actionCardProps}
+      />
+    </>
+  )
+}
diff --git a/packages/magento-store/components/StoreSwitcher/index.ts b/packages/magento-store/components/StoreSwitcher/index.ts
new file mode 100644
index 0000000000..6a1da2287c
--- /dev/null
+++ b/packages/magento-store/components/StoreSwitcher/index.ts
@@ -0,0 +1,7 @@
+export * from './StoreSwitcherApply'
+export * from './StoreSwitcherCurrencySelector'
+export * from './StoreSwitcherGroupSelector'
+export * from './StoreSwitcherList'
+export * from './StoreSwitcherList.gql'
+export * from './StoreSwitcherStoreSelector'
+export * from './useStoreSwitcher'
diff --git a/packages/magento-store/components/StoreSwitcher/useStoreSwitcher.tsx b/packages/magento-store/components/StoreSwitcher/useStoreSwitcher.tsx
new file mode 100644
index 0000000000..7ebcd46f22
--- /dev/null
+++ b/packages/magento-store/components/StoreSwitcher/useStoreSwitcher.tsx
@@ -0,0 +1,203 @@
+import type { SubmitHandler } from '@graphcommerce/ecommerce-ui'
+import { useForm, useWatch, type UseFormReturn } from '@graphcommerce/ecommerce-ui'
+import { useIsomorphicLayoutEffect } from '@graphcommerce/framer-utils'
+import {
+  cookie,
+  filterNonNullableKeys,
+  storefrontAll,
+  useStorefrontConfig,
+  type RequiredKeys,
+} from '@graphcommerce/next-ui'
+import { useRouter } from 'next/router'
+import { createContext, useContext, useEffect, useLayoutEffect, useMemo } from 'react'
+import { storeToLocale } from '../../utils/localeToStore'
+import { type StoreSwitcherListQuery } from './StoreSwitcherList.gql'
+
+export type StoreSwitcherStore = RequiredKeys<
+  NonNullable<NonNullable<StoreSwitcherListQuery['availableStores']>[0]>,
+  'store_code' | 'store_name' | 'store_group_name' | 'store_group_code'
+> & {
+  country: string
+  disabled: boolean
+}
+
+export type StoreSwitcherGroup = Pick<
+  StoreSwitcherStore,
+  'store_group_code' | 'store_group_name'
+> & {
+  stores: StoreSwitcherStore[]
+  country?: string
+  disabled: boolean
+}
+
+export type StoreSwitcherFormValues = {
+  storeGroupCode: string
+  storeCode: string
+  currency: string
+}
+
+type StoreSwitcherFormContextType = {
+  stores: StoreSwitcherStore[]
+  storeGroups: StoreSwitcherGroup[]
+} & UseFormReturn<StoreSwitcherFormValues>
+
+const StoreSwitcherFormContext = createContext<StoreSwitcherFormContextType | null>(null)
+
+export function useStoreSwitcherForm(
+  context?: StoreSwitcherFormContextType,
+): StoreSwitcherFormContextType {
+  const ctx = useContext(StoreSwitcherFormContext) ?? context
+  if (!ctx) throw new Error('useStoreSwitcherForm must be used within a StoreSwitcherFormProvider')
+  return ctx
+}
+
+export function useSelectedStoreGroup(
+  context?: StoreSwitcherFormContextType,
+): StoreSwitcherGroup | null {
+  const { storeGroups, control } = useStoreSwitcherForm(context)
+
+  const selectedStoreGroupCode = useWatch({ control, name: 'storeGroupCode' })
+  const selectedStoreGroup = storeGroups.find(
+    (group) => group.store_group_code === selectedStoreGroupCode,
+  )
+
+  return selectedStoreGroup ?? null
+}
+
+export function useSelectedStore(
+  context?: StoreSwitcherFormContextType,
+): StoreSwitcherStore | null {
+  const { control } = useStoreSwitcherForm(context)
+
+  const selectedStoreGroup = useSelectedStoreGroup(context)
+
+  const selectedStoreCode = useWatch({ control, name: 'storeCode' })
+  const selectedStore = selectedStoreGroup?.stores?.find(
+    (store) => store.store_code === selectedStoreCode,
+  )
+  return selectedStore ?? null
+}
+
+export function useSelectedCurrency(context?: StoreSwitcherFormContextType): string | null {
+  const { control } = useStoreSwitcherForm(context)
+
+  const selectedStore = useSelectedStore(context)
+  const selectedCurrencyCode = useWatch({ control, name: 'currency' })
+
+  return selectedStore?.currency?.available_currency_codes?.includes(selectedCurrencyCode)
+    ? selectedCurrencyCode
+    : null
+}
+
+export function useStoreSwitcher({
+  availableStores,
+}: StoreSwitcherListQuery): StoreSwitcherFormContextType {
+  const stores: StoreSwitcherStore[] = useMemo(
+    () =>
+      filterNonNullableKeys(availableStores, [
+        'store_name',
+        'store_code',
+        'store_group_code',
+        'store_group_name',
+        'base_currency_code',
+        'locale',
+      ])
+        .map((store) => ({
+          ...store,
+          country: store.locale.split('_')[1]?.toLowerCase(),
+          disabled: !storefrontAll.find((l) => l.magentoStoreCode === store.store_code),
+        }))
+        .filter((store) => !store.disabled),
+    [availableStores],
+  )
+
+  const storeGroups = Object.values(
+    stores.reduce<{
+      [group: string]: StoreSwitcherGroup
+    }>((storesGrouped, store) => {
+      if (!storesGrouped[store.store_group_code]) {
+        const group: StoreSwitcherGroup = {
+          store_group_code: store.store_group_code,
+          store_group_name: store.store_group_name,
+          stores: [],
+          disabled: true,
+          country: store.country,
+        }
+        storesGrouped[store.store_group_code] = group
+      }
+      if (!store.disabled) storesGrouped[store.store_group_code].disabled = false
+      if (storesGrouped[store.store_group_code].country !== store.country) {
+        storesGrouped[store.store_group_code].country = undefined
+      }
+
+      storesGrouped[store.store_group_code].stores.push(store)
+      return storesGrouped
+    }, {}),
+  )
+
+  const storeCode = useStorefrontConfig().magentoStoreCode
+
+  const form = useForm<StoreSwitcherFormValues>({
+    defaultValues: {
+      storeCode,
+      storeGroupCode:
+        stores.find((store) => store.store_code === storeCode)?.store_group_code ?? '',
+    },
+  })
+
+  return { storeGroups, stores, ...form }
+}
+
+export function StoreSwitcherFormProvider(
+  props: {
+    children?: React.ReactNode
+    onSubmit?: SubmitHandler<StoreSwitcherFormValues>
+  } & StoreSwitcherListQuery,
+) {
+  const { children, onSubmit, availableStores } = props
+  const context = useStoreSwitcher({ availableStores })
+  const { setValue, storeGroups } = context
+
+  const selectedStoreGroup = useSelectedStoreGroup(context) ?? storeGroups[0]
+  const selectedStore = useSelectedStore(context)
+  const selectedCurrency = useSelectedCurrency(context)
+
+  useIsomorphicLayoutEffect(() => {
+    const currency = cookie('Magento-Content-Currency')
+    if (currency) setValue('currency', currency)
+  }, [setValue])
+
+  useIsomorphicLayoutEffect(() => {
+    const defaultStore = selectedStoreGroup.stores[0]
+    if (!selectedStore) {
+      setValue('storeCode', defaultStore.store_code)
+    }
+
+    const currencyCode =
+      selectedStore?.currency?.default_display_currency_code ??
+      defaultStore.currency?.default_display_currency_code
+
+    if (!selectedCurrency && currencyCode) {
+      setValue('currency', currencyCode)
+    }
+  }, [selectedCurrency, selectedStore, selectedStoreGroup.stores, setValue])
+
+  const submit = context.handleSubmit(async (data, event) => {
+    if (
+      data.currency ===
+      context.stores.find((store) => store.store_code === data.storeCode)?.base_currency_code
+    ) {
+      cookie('Magento-Content-Currency', null)
+    } else {
+      cookie('Magento-Content-Currency', data.currency)
+    }
+
+    onSubmit?.(data, event)
+  })
+
+  return (
+    <StoreSwitcherFormContext.Provider value={context}>
+      <form onSubmit={submit}>{children}</form>
+    </StoreSwitcherFormContext.Provider>
+  )
+}
diff --git a/packages/magento-store/components/StoreSwitcherButton/StoreSwitcherButton.tsx b/packages/magento-store/components/StoreSwitcherButton/StoreSwitcherButton.tsx
index 4c2b644396..1985665e54 100644
--- a/packages/magento-store/components/StoreSwitcherButton/StoreSwitcherButton.tsx
+++ b/packages/magento-store/components/StoreSwitcherButton/StoreSwitcherButton.tsx
@@ -1,9 +1,10 @@
 import { useQuery } from '@graphcommerce/graphql'
-import { extendableComponent, FlagAvatar } from '@graphcommerce/next-ui'
+import { cookie, extendableComponent, FlagAvatar } from '@graphcommerce/next-ui'
 import type { SxProps, Theme } from '@mui/material'
 import { Button } from '@mui/material'
 import { useRouter } from 'next/router'
-import { StoreConfigDocument } from '../../StoreConfig.gql'
+import { useMemo } from 'react'
+import { StoreConfigDocument } from '../../queries/StoreConfig.gql'
 
 export type StoreSwitcherButtonProps = { sx?: SxProps<Theme> }
 
@@ -13,10 +14,16 @@ const { classes } = extendableComponent(name, parts)
 
 export function StoreSwitcherButton(props: StoreSwitcherButtonProps) {
   const { sx } = props
+
   const config = useQuery(StoreConfigDocument)
   const country = config.data?.storeConfig?.locale?.split('_')?.[1]?.toLowerCase() ?? ''
   const router = useRouter()
 
+  const currency = useMemo(
+    () => cookie('Magento-Content-Currency') ?? config.data?.storeConfig?.base_currency_code,
+    [config.data?.storeConfig?.base_currency_code],
+  )
+
   return (
     <Button
       variant='text'
@@ -28,9 +35,10 @@ export function StoreSwitcherButton(props: StoreSwitcherButtonProps) {
       <FlagAvatar
         country={country}
         className={classes.avatar}
-        sx={{ height: 20, width: 20, marginRight: '10px' }}
+        size='20px'
+        sx={{ marginRight: '10px' }}
       />
-      {config.data?.storeConfig?.store_name} - {config.data?.storeConfig?.base_currency_code}
+      {config.data?.storeConfig?.store_name} – {currency}
     </Button>
   )
 }
diff --git a/packages/magento-store/components/StoreSwitcherList/StoreSwitcherList.graphql b/packages/magento-store/components/StoreSwitcherList/StoreSwitcherList.graphql
deleted file mode 100644
index 6c5ef39d2d..0000000000
--- a/packages/magento-store/components/StoreSwitcherList/StoreSwitcherList.graphql
+++ /dev/null
@@ -1,10 +0,0 @@
-query StoreSwitcherList {
-  availableStores {
-    store_name
-    store_code
-    locale
-    base_currency_code
-    store_group_name
-    store_group_code
-  }
-}
diff --git a/packages/magento-store/docs/store-switcher-multiple-groups-one-store-multiple-currency.png b/packages/magento-store/docs/store-switcher-multiple-groups-one-store-multiple-currency.png
new file mode 100644
index 0000000000..d5d250aee2
Binary files /dev/null and b/packages/magento-store/docs/store-switcher-multiple-groups-one-store-multiple-currency.png differ
diff --git a/packages/magento-store/docs/store-switcher-multiple-groups-one-store-single-currency.png b/packages/magento-store/docs/store-switcher-multiple-groups-one-store-single-currency.png
new file mode 100644
index 0000000000..16e58328c0
Binary files /dev/null and b/packages/magento-store/docs/store-switcher-multiple-groups-one-store-single-currency.png differ
diff --git a/packages/magento-store/docs/store-switcher-single-group-multiple-stores-multiple-currencies.png b/packages/magento-store/docs/store-switcher-single-group-multiple-stores-multiple-currencies.png
new file mode 100644
index 0000000000..cc83ad4101
Binary files /dev/null and b/packages/magento-store/docs/store-switcher-single-group-multiple-stores-multiple-currencies.png differ
diff --git a/packages/magento-store/docs/store-switcher-single-group-multiple-stores-single-currency.png b/packages/magento-store/docs/store-switcher-single-group-multiple-stores-single-currency.png
new file mode 100644
index 0000000000..0b64c66c1a
Binary files /dev/null and b/packages/magento-store/docs/store-switcher-single-group-multiple-stores-single-currency.png differ
diff --git a/packages/magento-store/index.ts b/packages/magento-store/index.ts
index aaa4c20d3f..256dfe17e2 100644
--- a/packages/magento-store/index.ts
+++ b/packages/magento-store/index.ts
@@ -1,14 +1,13 @@
+export * from './components/CurrencySymbol/CurrencySymbol'
 export * from './components/GlobalHead/GlobalHead'
+export * from './components/Money/Money'
+export * from './components/Money/Money.gql'
+export * from './components/PageMeta/PageMeta'
+export * from './components/StoreSwitcherButton/StoreSwitcherButton'
 export * from './hooks/useFindCountry'
 export * from './hooks/useFindRegion'
-export * from './localeToStore'
-export * from './Money'
-export * from './Money.gql'
-export * from './PageMeta'
 export * from './queries/CountryRegions.gql'
-export * from './StoreConfig.gql'
-export * from './components/StoreSwitcherButton/StoreSwitcherButton'
-export * from './components/StoreSwitcherList/StoreSwitcherList'
-export * from './components/StoreSwitcherList/StoreSwitcherList.gql'
+export * from './queries/StoreConfig.gql'
+export * from './utils/localeToStore'
 export * from './utils/redirectOrNotFound'
-export * from './components/CurrencySymbol/CurrencySymbol'
+export * from './components/StoreSwitcher'
diff --git a/packages/magento-store/mesh/resolvers.ts b/packages/magento-store/mesh/resolvers.ts
new file mode 100644
index 0000000000..425e4e8871
--- /dev/null
+++ b/packages/magento-store/mesh/resolvers.ts
@@ -0,0 +1,14 @@
+import type { Resolvers } from '@graphcommerce/graphql-mesh'
+
+export const resolvers: Resolvers = {
+  StoreConfig: {
+    currency: {
+      selectionSet: '{ store_code }',
+      resolve: (parent, args, ctx, info) => {
+        if (!parent.store_code) return null
+        const context = { ...ctx, headers: { store: parent.store_code } }
+        return context.m2.Query.currency({ context, info }) ?? null
+      },
+    },
+  },
+}
diff --git a/packages/magento-store/package.json b/packages/magento-store/package.json
index 818d5647cc..eb2503a75b 100644
--- a/packages/magento-store/package.json
+++ b/packages/magento-store/package.json
@@ -12,7 +12,9 @@
     }
   },
   "peerDependencies": {
+    "@graphcommerce/ecommerce-ui": "^9.1.0-canary.16",
     "@graphcommerce/eslint-config-pwa": "^9.1.0-canary.16",
+    "@graphcommerce/framer-utils": "^9.1.0-canary.16",
     "@graphcommerce/graphql": "^9.1.0-canary.16",
     "@graphcommerce/graphql-mesh": "^9.1.0-canary.16",
     "@graphcommerce/image": "^9.1.0-canary.16",
diff --git a/packages/magento-store/plugins/magentoCurrencyCode.ts b/packages/magento-store/plugins/magentoCurrencyCode.ts
new file mode 100644
index 0000000000..266d2763a5
--- /dev/null
+++ b/packages/magento-store/plugins/magentoCurrencyCode.ts
@@ -0,0 +1,35 @@
+import {
+  type getPrivateQueryContext as getPrivateQueryContextType,
+  type usePrivateQueryContext as usePrivateQueryContextType,
+} from '@graphcommerce/graphql'
+import type { PrivateContext } from '@graphcommerce/graphql-mesh'
+import type { FunctionPlugin, PluginConfig } from '@graphcommerce/next-config'
+import { cookie } from '@graphcommerce/next-ui'
+
+export const config: PluginConfig = {
+  type: 'function',
+  module: '@graphcommerce/graphql',
+}
+
+export const getPrivateQueryContext: FunctionPlugin<typeof getPrivateQueryContextType> = (
+  prev,
+  client,
+  ...args
+) => {
+  const currencyCode = cookie('Magento-Content-Currency')
+
+  const res = prev(client, ...args)
+  if (!currencyCode) return res
+  return { ...res, currencyCode } satisfies PrivateContext
+}
+
+export const usePrivateQueryContext: FunctionPlugin<typeof usePrivateQueryContextType> = (
+  prev,
+  ...args
+) => {
+  const currencyCode = cookie('Magento-Content-Currency')
+
+  const res = prev(...args)
+  if (!currencyCode) return res
+  return { ...res, currencyCode }
+}
diff --git a/packages/magento-store/plugins/magentoStoreGraphqlConfig.ts b/packages/magento-store/plugins/magentoStoreGraphqlConfig.ts
index 271b7cc2bf..cf5258b272 100644
--- a/packages/magento-store/plugins/magentoStoreGraphqlConfig.ts
+++ b/packages/magento-store/plugins/magentoStoreGraphqlConfig.ts
@@ -1,5 +1,6 @@
 import { setContext, type graphqlConfig as graphqlConfigType } from '@graphcommerce/graphql'
 import type { FunctionPlugin, PluginConfig } from '@graphcommerce/next-config'
+import { cookie } from '@graphcommerce/next-ui'
 
 export const config: PluginConfig = {
   type: 'function',
@@ -15,7 +16,13 @@ export const graphqlConfig: FunctionPlugin<typeof graphqlConfigType> = (prev, co
       ...results.links,
       setContext((_, context) => {
         if (!context.headers) context.headers = {}
-        context.headers.store = conf.storefront.magentoStoreCode
+        if (!context.headers.store) {
+          context.headers.store = conf.storefront.magentoStoreCode
+        }
+
+        const contentCurrency = cookie('Magento-Content-Currency')
+        if (contentCurrency && typeof context.headers['content-currency'] === 'undefined')
+          context.headers['content-currency'] = contentCurrency
 
         if (conf.preview) {
           // To disable caching from the backend, we provide a bogus cache ID.
diff --git a/packages/magento-store/plugins/meshMagentoStore.ts b/packages/magento-store/plugins/meshMagentoStore.ts
new file mode 100644
index 0000000000..cc2e463552
--- /dev/null
+++ b/packages/magento-store/plugins/meshMagentoStore.ts
@@ -0,0 +1,23 @@
+import type { meshConfig as meshConfigBase } from '@graphcommerce/graphql-mesh/meshConfig'
+import type { FunctionPlugin, PluginConfig } from '@graphcommerce/next-config'
+
+export const config: PluginConfig = {
+  module: '@graphcommerce/graphql-mesh/meshConfig',
+  type: 'function',
+}
+
+export const meshConfig: FunctionPlugin<typeof meshConfigBase> = (
+  prev,
+  baseConfig,
+  graphCommerceConfig,
+) =>
+  prev(
+    {
+      ...baseConfig,
+      additionalResolvers: [
+        ...(baseConfig.additionalResolvers ?? []),
+        '@graphcommerce/magento-store/mesh/resolvers.ts',
+      ],
+    },
+    graphCommerceConfig,
+  )
diff --git a/packages/magento-store/queries/StoreConfig.graphql b/packages/magento-store/queries/StoreConfig.graphql
new file mode 100644
index 0000000000..c5a4b83ec4
--- /dev/null
+++ b/packages/magento-store/queries/StoreConfig.graphql
@@ -0,0 +1,3 @@
+query StoreConfig {
+  ...StoreConfigQueryFragment
+}
diff --git a/packages/magento-store/StoreConfigFragment.graphql b/packages/magento-store/queries/StoreConfigFragment.graphql
similarity index 100%
rename from packages/magento-store/StoreConfigFragment.graphql
rename to packages/magento-store/queries/StoreConfigFragment.graphql
diff --git a/packages/magento-store/queries/StoreConfigQueryFragment.graphql b/packages/magento-store/queries/StoreConfigQueryFragment.graphql
new file mode 100644
index 0000000000..a956a6c395
--- /dev/null
+++ b/packages/magento-store/queries/StoreConfigQueryFragment.graphql
@@ -0,0 +1,6 @@
+fragment StoreConfigQueryFragment on Query {
+  __typename
+  storeConfig {
+    ...StoreConfigFragment
+  }
+}
diff --git a/packages/magento-store/schema/PrivateContext.graphqls b/packages/magento-store/schema/PrivateContext.graphqls
new file mode 100644
index 0000000000..d9155e5357
--- /dev/null
+++ b/packages/magento-store/schema/PrivateContext.graphqls
@@ -0,0 +1,4 @@
+input PrivateContext {
+  storeCode: String
+  currencyCode: String
+}
diff --git a/packages/magento-store/schema/StoreConfig-currency.graphqls b/packages/magento-store/schema/StoreConfig-currency.graphqls
new file mode 100644
index 0000000000..53cd37b3e6
--- /dev/null
+++ b/packages/magento-store/schema/StoreConfig-currency.graphqls
@@ -0,0 +1,3 @@
+extend type StoreConfig {
+  currency: Currency
+}
diff --git a/packages/magento-store/test/apolloClientStore.fixture.ts b/packages/magento-store/test/apolloClientStore.fixture.ts
index 5b3a8a798a..3d045e6a1c 100644
--- a/packages/magento-store/test/apolloClientStore.fixture.ts
+++ b/packages/magento-store/test/apolloClientStore.fixture.ts
@@ -4,7 +4,7 @@
 import type { NormalizedCacheObject } from '@graphcommerce/graphql'
 import { ApolloClient, InMemoryCache } from '@graphcommerce/graphql'
 import { test as base } from '@playwright/test'
-import { localeToStore } from '../localeToStore'
+import { localeToStore } from '../utils/localeToStore'
 
 type ApolloClientStoreTest = {
   apolloClient: ApolloClient<NormalizedCacheObject>
diff --git a/packages/magento-store/localeToStore.ts b/packages/magento-store/utils/localeToStore.ts
similarity index 100%
rename from packages/magento-store/localeToStore.ts
rename to packages/magento-store/utils/localeToStore.ts
diff --git a/packages/magento-store/utils/redirectOrNotFound.ts b/packages/magento-store/utils/redirectOrNotFound.ts
index 9863c0dfde..93b8ca8ff0 100644
--- a/packages/magento-store/utils/redirectOrNotFound.ts
+++ b/packages/magento-store/utils/redirectOrNotFound.ts
@@ -3,10 +3,10 @@ import type { ApolloClient, ApolloQueryResult, NormalizedCacheObject } from '@gr
 import { flushMeasurePerf } from '@graphcommerce/graphql'
 import { isTypename, nonNullable, storefrontConfig } from '@graphcommerce/next-ui'
 import type { Redirect } from 'next'
-import { defaultLocale } from '../localeToStore'
-import type { StoreConfigQuery } from '../StoreConfig.gql'
+import type { StoreConfigQuery } from '../queries/StoreConfig.gql'
 import type { HandleRedirectQuery } from './HandleRedirect.gql'
 import { HandleRedirectDocument } from './HandleRedirect.gql'
+import { defaultLocale } from './localeToStore'
 
 export type RedirectOr404Return = Promise<
   | { redirect: Redirect; revalidate?: number | boolean }
diff --git a/packages/next-ui/ActionCard/ActionCard.tsx b/packages/next-ui/ActionCard/ActionCard.tsx
index 4372bf4211..369fa8755e 100644
--- a/packages/next-ui/ActionCard/ActionCard.tsx
+++ b/packages/next-ui/ActionCard/ActionCard.tsx
@@ -186,9 +186,9 @@ export function ActionCard<C extends React.ElementType = typeof Box>(props: Acti
           '&.variantOutlined': {
             backgroundColor: theme.palette.background.paper,
             boxShadow: `inset 0 0 0 1px ${theme.palette.divider}`,
-            '&:not(:last-of-type)': {
-              marginBottom: '-2px',
-            },
+            // '&:not(:last-of-type)': {
+            //   marginBottom: '-2px',
+            // },
             '&.layoutList': {
               borderRadius: 0,
               '&:first-of-type': {
@@ -296,6 +296,7 @@ export function ActionCard<C extends React.ElementType = typeof Box>(props: Acti
               display: 'flex',
               flexDirection: 'column',
               alignItems: 'flex-start',
+              justifyContent: 'center',
             }}
           >
             {title && (
@@ -348,7 +349,7 @@ export function ActionCard<C extends React.ElementType = typeof Box>(props: Acti
           )}
           {...slotProps.end}
         >
-          {action && (
+          {(action || reset) && (
             <Box
               className={classes.action}
               sx={sxx(
diff --git a/packages/next-ui/FlagAvatar/FlagAvatar.tsx b/packages/next-ui/FlagAvatar/FlagAvatar.tsx
index cc1cf43778..c2e0c1ee07 100644
--- a/packages/next-ui/FlagAvatar/FlagAvatar.tsx
+++ b/packages/next-ui/FlagAvatar/FlagAvatar.tsx
@@ -1,19 +1,29 @@
-import type { AvatarProps } from '@mui/material'
-import { Avatar } from '@mui/material'
+import type { BoxProps } from '@mui/material'
+import { Box } from '@mui/material'
+import { useIntlDisplayNames } from '../Intl'
+import { sxx } from '../utils/sxx'
 
-export type FlagAvatarProps = { country: string } & Omit<AvatarProps, 'src'>
+export type FlagAvatarProps = { country: string; size: string } & Omit<BoxProps<'img'>, 'src'>
 
 export function FlagAvatar(props: FlagAvatarProps) {
-  const { country, ...avatarProps } = props
+  const { country, size, sx, ...avatarProps } = props
+
+  const displayName = useIntlDisplayNames({ type: 'region' })
 
   return (
-    <Avatar
+    <Box
+      component='img'
       {...avatarProps}
-      imgProps={{ loading: 'lazy' }}
-      alt={country}
-      src={`https://cdnjs.cloudflare.com/ajax/libs/flag-icon-css/3.4.3/flags/1x1/${country}.svg`}
-    >
-      {country.toLocaleUpperCase()}
-    </Avatar>
+      src={`https://flagcdn.com/${country}.svg`}
+      alt={displayName.of(country)}
+      sx={sxx(
+        {
+          width: size,
+          borderRadius: '2px',
+          height: size,
+        },
+        sx,
+      )}
+    />
   )
 }
diff --git a/packages/next-ui/Intl/CurrencySymbol/CurrencySymbol.tsx b/packages/next-ui/Intl/CurrencySymbol/CurrencySymbol.tsx
index 07e94b2017..e8e22220c1 100644
--- a/packages/next-ui/Intl/CurrencySymbol/CurrencySymbol.tsx
+++ b/packages/next-ui/Intl/CurrencySymbol/CurrencySymbol.tsx
@@ -1,5 +1,6 @@
 import { Box, type SxProps, type Theme } from '@mui/material'
 import { forwardRef } from 'react'
+import { DisplayNames } from '../DisplayNames'
 import {
   useIntlNumberFormat,
   type UseIntlNumberFormatOptions,
@@ -7,16 +8,23 @@ import {
 
 export type CurrencySymbolProps = Omit<UseIntlNumberFormatOptions, 'numberStyle'> & {
   sx?: SxProps<Theme>
+  variant?: 'symbol' | 'full'
 }
 
 /** @public */
 export const CurrencySymbol = forwardRef<HTMLSpanElement, CurrencySymbolProps>((props, ref) => {
-  const { sx, ...options } = props
+  const { sx, variant = 'symbol', ...options } = props
   const formatter = useIntlNumberFormat({ ...options, numberStyle: 'currency' })
 
   return (
     <Box component='span' suppressHydrationWarning ref={ref} sx={sx}>
       {formatter.formatToParts(1).find((part) => part.type === 'currency')?.value}
+      {options.currency && variant === 'full' && (
+        <>
+          {' – '}
+          {options.currency} – <DisplayNames type='currency' code={options.currency} />
+        </>
+      )}
     </Box>
   )
 })
diff --git a/packages/next-ui/Intl/ListFormat/useIntlListFormat.ts b/packages/next-ui/Intl/ListFormat/useIntlListFormat.ts
index 5c8fb9398c..b9457c3378 100644
--- a/packages/next-ui/Intl/ListFormat/useIntlListFormat.ts
+++ b/packages/next-ui/Intl/ListFormat/useIntlListFormat.ts
@@ -9,7 +9,7 @@ export type UseIntlListFormatOptions = {
   UseIntlLocalesArgumentOptions
 
 export function useIntlListFormat(props: UseIntlListFormatOptions) {
-  const [locales, options] = useIntlLocalesArgument(props)
-  const memoOptions = useMemoObject({ ...options })
+  const [locales, { listStyle: style, ...options }] = useIntlLocalesArgument(props)
+  const memoOptions = useMemoObject({ style, ...options })
   return useMemo(() => new Intl.ListFormat(locales, memoOptions), [locales, memoOptions])
 }
diff --git a/packages/next-ui/hooks/useStorefrontConfig.ts b/packages/next-ui/hooks/useStorefrontConfig.ts
index 4c1c1cc29a..3716096e3b 100644
--- a/packages/next-ui/hooks/useStorefrontConfig.ts
+++ b/packages/next-ui/hooks/useStorefrontConfig.ts
@@ -5,6 +5,6 @@ import { storefrontConfig } from '../utils/storefrontConfig'
 export function useStorefrontConfig(locale?: string | undefined) {
   const routerLocale = useRouter().locale
   const config = storefrontConfig(locale ?? routerLocale)
-  if (!config) throw Error(`No storefront config found for locale ${locale}`)
+  if (!config) throw Error(`No storefront config found for locale '${locale}'`)
   return config
 }